diff --git a/home-environments/radio/manifests/emacs.scm b/home-environments/radio/manifests/emacs.scm
index 82cbe26..9c95b27 100644
--- a/home-environments/radio/manifests/emacs.scm
+++ b/home-environments/radio/manifests/emacs.scm
@@ -1,32 +1,74 @@
-(use-modules (guix profiles)
-             (gnu packages emacs)
-             (gnu packages emacs-xyz)
-             (gnu packages guile-xyz))
+(define-module (home-environments radio manifests emacs)
+  #:use-module (guix profiles)
+  #:use-module (gnu packages emacs)
+  #:use-module (gnu packages emacs-xyz)
+  #:use-module (gnu packages guile-xyz)
+  #:export (packages:emacs
+            packages:all
+            packages:blogging
+            packages:completion
+            packages:configuration
+            packages:file-managing
+            packages:guile
+            packages:guix
+            packages:misc
+            packages:modal-editing
+            packages:terminal
+            packages:writing))
 
-(packages->manifest
-  (list #|emacs           |# emacs
-        #|emacs-xyz       |#
-        #| • completion   |# emacs-cape emacs-corfu emacs-corfu-doc
-                             emacs-consult-lsp emacs-vertico
-        #| • centering    |# emacs-olivetti
-        #| • file manager |# emacs-dirvish
-        #| • fuzzy-finder |# emacs-orderless
-        #| • guile        |# emacs-arei guile-ares-rs
-                             emacs-macrostep-geiser emacs-geiser-eros
-        #| • guix         |# emacs-guix emacs-direnv
-        #| • haunt        |# emacs-ox-haunt
-        #| • icons        |# emacs-all-the-icons
-        #| • irc          |# emacs-circe
-        #| • kakoune      |# emacs-kakoune emacs-phi-search-mc emacs-ryo-modal
-        #| • latex        |# emacs-auctex emacs-latex-preview-pane
-        #| • linter       |# emacs-flycheck emacs-flycheck-guile
-        #| • maps         |# emacs-osm
-        #| • music player |# emacs-emms
-        #| • org          |# emacs-org-bullets emacs-org-fragtog
-                             emacs-org-present emacs-org-roam emacs-org-modern
-        #| • pulsar       |# emacs-pulsar
-        #| • rss          |# emacs-elfeed emacs-elfeed-org
-        #| • s-exps       |# emacs-lispy emacs-rainbow-delimiters
-        #| • ease config  |# emacs-setup
-        #| • typing       |# emacs-typing
-        #| • terminal     |# emacs-eat))
+(define packages:emacs
+  (list emacs-next))
+
+(define packages:completion
+  (list emacs-cape emacs-corfu emacs-corfu-doc emacs-consult-lsp emacs-vertico))
+
+(define packages:file-managing
+  (list emacs-dirvish emacs-orderless))
+
+(define packages:guile
+  (list emacs-arei guile-ares-rs emacs-macrostep-geiser emacs-geiser-eros
+        emacs-flycheck emacs-flycheck-guile emacs-lispy emacs-rainbow-delimiters))
+
+(define packages:guix
+  (cons emacs-guix packages:guile))
+
+(define packages:terminal
+  (list emacs-eat))
+
+(define packages:modal-editing
+  (list emacs-meow))
+
+(define packages:misc
+  (list #|maps     |# emacs-osm
+        #|pulsar   |# emacs-pulsar
+        #|centering|# emacs-olivetti
+        #|typing   |# emacs-typing
+        #|icons    |# emacs-all-the-icons
+        #|irc      |# emacs-circe))
+
+(define packages:writing
+  (list #|org|# emacs-org-bullets emacs-org-fragtog emacs-org-present
+                emacs-org-roam emacs-org-modern
+        #|tex|# emacs-auctex emacs-latex-preview-pane))
+
+(define packages:blogging
+  (cons* emacs-ox-haunt
+         packages:writing))
+
+(define packages:configuration
+  (list emacs-setup))
+
+(define packages:all
+  (append packages:emacs
+          packages:blogging
+          packages:completion
+          packages:configuration
+          packages:file-managing
+          packages:guile
+          packages:guix
+          packages:misc
+          packages:modal-editing
+          packages:terminal
+          packages:writing))
+
+(packages->manifest packages:all)