diff --git a/init.el b/init.el
index d9c86a2..d90da84 100644
--- a/init.el
+++ b/init.el
@@ -1014,17 +1014,6 @@ Calls `project-remember-projects-under' for ~/Projects/"
                             ("\\`\\(?:sourcehut:\\|sh:\\)\\([^:]+\\)\\'" "git.sr.ht" "sourcehut.user")
                             ("\\`\\(?:gitea:\\|gt:\\)\\([^:]+\\)\\'" "git.xenia.me.uk" "gitea.user"))))
 
-(use-package treemacs
-  :functions (treemacs treemacs-load-theme)
-  :bind (("M-g t" . treemacs-select-window))
-  :hook (treemacs-mode . (lambda () (visual-line-mode -1)))
-  :config
-  (when (require 'treemacs-nerd-icons nil :noerror)
-    (treemacs-load-theme "nerd-icons")))
-
-(use-package treemacs-nerd-icons
-  :requires nerd-icons)
-
 (use-package aggressive-indent
   :hook (elisp-mode
          lisp-mode
@@ -1194,33 +1183,10 @@ Calls `project-remember-projects-under' for ~/Projects/"
   :config
   (elfeed-org))
 
-(use-package elfeed-tube
-  :after elfeed
-  :defines (elfeed-show-mode-map
-            elfeed-search-mode-map)
-  :functions elfeed-tube-setup
-  :bind ( :map elfeed-show-mode-map
-          ("F" . elfeed-tube-fetch)
-          ([remap save-buffer] . elfeed-tube-save)
-          :map elfeed-search-mode-map
-          ("F" . elfeed-tube-fetch)
-          ([remap save-buffer] . elfeed-tube-save))
-  :custom
-  (elfeed-tube-auto-save-p nil)
-  (elfeed-tube-auto-fetch-p t)
-  :config
-  (elfeed-tube-setup))
-
 (use-package password-store
   :defer t
   :functions password-store-get)
 
-(use-package pass
-  :bind (("C-c P" . pass))
-  :custom
-  (pass-show-keybindings nil)
-  (pass-username-field "login"))
-
 ;; Scratch buffer shortcut
 (keymap-global-set "C-c w x" #'scratch-buffer)
 
diff --git a/lib/my-packages.el b/lib/my-packages.el
index 6d72366..ab37f4a 100644
--- a/lib/my-packages.el
+++ b/lib/my-packages.el
@@ -11,29 +11,17 @@
      all-the-icons nerd-icons nerd-icons-completion nerd-icons-corfu nerd-icons-dired nerd-icons-ibuffer
      minions ligature page-break-lines helpful which-key ace-window link-hint diff-hl
      ;; Completion
-     cape 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
+     vertico orderless marginalia cape corfu corfu-terminal
+     consult consult-eglot consult-flyspell embark embark-consult
+     flyspell-correct tempel
      ;; IDE
-     treesit-auto flymake-popon flymake-shellcheck flymake-yamllint flymake-eslint apheleia envrc rainbow-delimiters aggressive-indent python-docstring nix-mode lua-mode
-     ;; Media
-     emms
-     ;; org-mode
-     org-roam org-noter citar citar-embark
-     ;; org-mode HTML export
-     htmlize
-     ;; Projects
-     magit forge treemacs treemacs-nerd-icons
+     treesit-auto magit forge flymake-popon flymake-shellcheck flymake-yamllint flymake-eslint
+     apheleia envrc rainbow-delimiters aggressive-indent python-docstring nix-mode lua-mode
      ;; Writing
-     markdown-mode pandoc-mode auctex auctex-latexmk latex-preview-pane
-     ;; Contacts
-     bbdb ement
-     ;; RSS feeds
-     elfeed elfeed-org elfeed-tube))
+     org-roam org-noter citar citar-embark
+     markdown-mode pandoc-mode auctex htmlize
+     ;; Other
+     password-store emms bbdb ement elfeed elfeed-org))
   :config
   (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
   (add-to-list 'package-archives '("stable" . "https://stable.melpa.org/packages/"))