diff --git a/config.scm b/config.scm
index 0b75100..a2a7417 100644
--- a/config.scm
+++ b/config.scm
@@ -3,26 +3,10 @@
 (use-modules (gnu)
 	     (gnu system nss))
 (use-service-modules desktop docker)
-(use-package-modules admin
-		     bootloaders
-		     certs
-		     curl
-		     docker
-		     emacs
-		     engineering
-		     guile
-		     package-management
-		     pdf
-		     python-web
-		     ratpoison
-		     shells
-		     suckless
-		     terminals
-		     tmux
-		     version-control
-		     virtualization
-		     wm
-		     wm)
+(use-package-modules admin bootloaders certs curl docker
+		     emacs emacs-xyz engineering fonts fontutils gnuzilla guile graphviz image image-viewers
+		     networking mpd package-management pdf pulseaudio python-web ratpoison shells shellutils
+		     ssh suckless terminals tmux version-control virtualization wm)
 
 (operating-system
   (host-name "antelope")
@@ -51,17 +35,24 @@
 
   (packages (cons* ratpoison dmenu
                    nss-certs
-                   emacs
-		   zsh tmux kitty
+                   emacs emacs-guix emacs-magit
+		   zsh direnv tmux kitty
 		   docker docker-cli docker-compose
 		   kicad kicad-symbols kicad-library
                    ;; Broken:
-                   ;; skopeo
+                   ;; skopeo ncmpcpp
                    ;; Missing:
 		   ;; exa bat gtkwave terraform
-		   curl
+		   feh imlib2
+		   font-gnu-freefont-ttf
+		   mpd
+		   aircrack-ng
+		   pulseaudio pulsemixer
+		   icecat fontconfig
+		   curl openssh
 		   ansible awscli
 		   guile-readline
+		   graphviz
 		   zathura zathura-pdf-poppler zathura-ps zathura-djvu
 		   stow git
                    xmonad xmobar