diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index df3ef641..b530d215 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -59,6 +59,8 @@
       with epkgs; [
         # Tree-sitter grammars, not a real Emacs package
         treesit-grammars.with-all-grammars
+        # Maildir utils with linked Emacs package
+        mu4e
         # Theme
         base16-theme
         # UI
@@ -77,28 +79,23 @@
         link-hint
         diff-hl
         # Completion
+        vertico
+        orderless
+        marginalia
         cape
+        corfu
+        corfu-terminal
         consult
         consult-eglot
         consult-flyspell
-        corfu
-        corfu-terminal
         embark
         embark-consult
-        marginalia
-        orderless
-        vertico
-        # Templates
-        tempel
-        license-templates
-        gitignore-templates
-        # spell-checking
         flyspell-correct
-        # password-store
-        pass
-        password-store
+        tempel
         # IDE
         treesit-auto
+        magit
+        forge
         flymake-popon
         flymake-shellcheck
         flymake-yamllint
@@ -110,35 +107,21 @@
         python-docstring
         nix-mode
         lua-mode
-        # Media
-        emms
-        # org-mode
+        # Writing
         org-roam
         org-noter
-        # org-cite
         citar
         citar-embark
-        # org-mode HTML export
-        htmlize
-        # Projects
-        magit
-        forge
-        treemacs
-        treemacs-nerd-icons
-        # Writing
         markdown-mode
         pandoc-mode
         auctex
-        auctex-latexmk
-        latex-preview-pane
-        # Contacts
-        mu4e
+        htmlize
+        # Other
+        emms
         bbdb
         ement
-        # RSS feeds
         elfeed
         elfeed-org
-        elfeed-tube
       ];
   };
   home.packages = with pkgs; [