diff --git a/README.org b/README.org
index 3e4067e..999a11a 100644
--- a/README.org
+++ b/README.org
@@ -138,6 +138,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
 #+begin_src emacs-lisp
   (use-package avy
     :ensure t
+    :diminish
     :bind (("C-c j w" . avy-goto-word-0)
            ("C-c j c" . avy-goto-char)
            ("C-c j l" . avy-goto-line)
@@ -158,9 +159,6 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
 
   (use-package eshell
     :bind (("C-c t e" . eshell)))
-
-  (use-package vterm
-    :bind (("C-c t v" . vterm)))
 #+end_src
 * UI
 #+begin_src emacs-lisp
@@ -271,6 +269,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
   (use-package windmove
     :ensure t
     :demand
+    :diminish
     :config (windmove-mode +1)
     :bind (("C-c w k" . windmove-up)
            ("C-c w C-k" . windmove-display-up)
@@ -292,6 +291,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
   (use-package winner
     :ensure t
     :demand
+    :diminish
     :bind (("C-c w u" . winner-undo)
            ("C-c w r" . winner-redo))
     :config
@@ -301,6 +301,8 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
 *** ediff
 #+begin_src emacs-lisp :tangle yes
   (use-package ediff
+    :ensure t
+    :diminish
     :bind (("C-c d f" . ediff-files)
            ("C-c d b" . ediff-buffers)
            ("C-c d 3 f" . ediff-files3)
@@ -375,6 +377,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
 #+begin_src emacs-lisp
   (use-package alert
     :ensure t
+    :diminish
     :custom
     (alert-default-style 'libnotify))
 #+end_src
@@ -392,6 +395,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
 #+begin_src emacs-lisp
   (use-package darkroom
     :ensure t
+    :diminish
     :defer t)
 #+end_src
 
@@ -399,6 +403,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
 #+begin_src emacs-lisp :tangle yes
   (use-package zone
     :ensure t
+    :diminish
     :config (zone-when-idle (* 60 60 2))) ; 2 hours
 #+end_src
 
@@ -406,6 +411,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
 #+begin_src emacs-lisp
   (use-package diff-hl
     :ensure t
+    :diminish
     :init
     (add-hook 'magit-pre-refresh-hook 'diff-hl-magit-pre-refresh)
     (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)
@@ -421,6 +427,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
   (use-package treemacs
     :ensure t
     :defer t
+    :diminish
     :custom
     (treemacs-follow-mode t)
     (treemacs-filewatch-mode t)
@@ -433,10 +440,6 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
     ("C-x t C-t" . treemacs-find-file)
     ("C-x t M-t" . treemacs-find-tag))
 
-  ;; (use-package treemacs-icons-dired
-  ;;   :hook (dired-mode . treemacs-icons-dired-enable-once)
-  ;;   :ensure t)
-
   (use-package treemacs-magit
     :after (treemacs magit)
     :ensure t)
@@ -566,6 +569,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
           citar-notes-paths (list (expand-file-name "notes" citar-base-directory))))
   (use-package citar
     :ensure t
+    :diminish
     :bind (("C-c r r" . citar-open)
            ("C-c r e" . citar-open-entry)
            ("C-c r f" . citar-open-files)
@@ -619,6 +623,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+begin_src emacs-lisp
   (use-package citar-embark
     :ensure t
+    :diminish
     :after (citar embark)
     :config
     (citar-embark-mode +1))
@@ -648,15 +653,18 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+begin_src emacs-lisp
   (use-package password-store
     :ensure t
-    :defer t)
+    :defer t
+    :diminish)
 
   (use-package password-store-otp
     :ensure t
-    :defer t)
+    :defer t
+    :diminish)
 
   (use-package pass
     :ensure t
     :defer t
+    :diminish
     :bind (("C-c P" . pass))
     :custom
     (pass-show-keybindings nil)
@@ -668,6 +676,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+begin_src emacs-lisp :tangle yes
   (use-package tramp
     :defer t
+    :diminish
     :config
     (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
 #+end_src
@@ -686,16 +695,14 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 
 * Development Environment
 #+begin_src emacs-lisp
-  (use-package vterm
-    :custom
-    (vterm-copy-mode-remove-fake-newlines t))
-
   (use-package rainbow-delimiters
     :ensure t
+    :diminish
     :hook (prog-mode))
 
   (use-package direnv
     :ensure t
+    :diminish
     :custom (direnv-always-show-summary nil)
     :config (direnv-mode +1))
 #+end_src
@@ -704,10 +711,12 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 Set treesit to fontify all elements, default was 3 (out of 4)
 #+begin_src emacs-lisp
   (use-package treesit
+    :diminish
     :custom
     (treesit-font-lock-level 4))
 
   (use-package treesit-auto
+    :diminish
     :config
     (treesit-auto-add-to-auto-mode-alist)
     (global-treesit-auto-mode +1))
@@ -786,7 +795,6 @@ Set treesit to fontify all elements, default was 3 (out of 4)
   (use-package flymake-popon
     :ensure t
     :after flymake
-    :diminish
     :config
     (global-flymake-popon-mode +1))
 #+end_src
@@ -804,6 +812,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 #+begin_src emacs-lisp
   (use-package magit
     :ensure t
+    :diminish
     :bind (("C-c g g" . magit-status)
            ("C-c g d" . magit-dispatch)
            ("C-c g f" . magit-file-dispatch)
@@ -827,6 +836,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 #+begin_src emacs-lisp
   (use-package vertico
     :ensure t
+    :diminish
     :custom
     (vertico-cycle t)
     :init
@@ -839,6 +849,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 #+begin_src emacs-lisp
   (use-package marginalia
     :ensure t
+    :diminish
     :custom
     (marginalia-annotators '(marginalia-annotators-heavy
                              marginalia-annotators-light
@@ -850,6 +861,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 #+begin_src emacs-lisp
   (use-package orderless
     :ensure t
+    :diminish
     :custom
     (completion-styles '(orderless basic))
     (completion-category-defaults nil)
@@ -860,6 +872,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 #+begin_src emacs-lisp
   (use-package corfu
     :ensure t
+    :diminish
     :demand
     :custom
     (corfu-cycle t)
@@ -913,6 +926,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 
   (use-package cape
     :ensure t
+    :diminish
     :demand
     :init
     (add-to-list 'completion-at-point-functions #'cape-emoji)
@@ -924,6 +938,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 #+begin_src emacs-lisp
   (use-package consult
     :ensure t
+    :diminish
     :bind (("<remap> <imenu>" . consult-imenu )
            ("<remap> <switch-to-buffer>" . consult-buffer)
            ("<remap> <project-switch-to-buffer>" . consult-project-buffer)
@@ -941,11 +956,13 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 
   (use-package consult-eglot
     :ensure t
+    :diminish
     :after (consult eglot)
     :bind (("C-c s s" . consult-eglot-symbols)))
 
   (use-package consult-yasnippet
     :ensure t
+    :diminish
     :after (consult yasnippet)
     :bind (("C-c s y" . consult-yasnippet)))
 #+end_src
@@ -954,12 +971,14 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 #+begin_src emacs-lisp
   (use-package embark
     :ensure t
+    :diminish
     :bind (("<remap> <describe-bindings>" . embark-bindings)
            ("C-." . embark-act))
     :config (setq prefix-help-command #'embark-prefix-help-command))
 
   (use-package embark-consult
     :ensure t
+    :diminish
     :after (embark consult)
     :hook (embark-collect-mode . consult-preview-at-point-mode))
 #+end_src
@@ -977,6 +996,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 
   (use-package yasnippet-capf
     :ensure t
+    :diminish
     :after yasnippet
     :init (add-to-list 'completion-at-point-functions #'yasnippet-capf))
 #+end_src
@@ -984,6 +1004,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 #+begin_src emacs-lisp
   (use-package aggressive-indent
     :ensure t
+    :diminish
     :hook (elisp-mode
            lisp-mode
            lisp-data-mode
@@ -994,6 +1015,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 #+begin_src emacs-lisp
   (use-package nix-mode
     :mode "\\.nix\\'"
+    :diminish
     :config
     (require 'nix)
     (require 'nix-flake))
@@ -1013,6 +1035,7 @@ Set fill column to 88 and enable display in python buffers
 #+begin_src emacs-lisp
   (use-package cargo
     :ensure t
+    :diminish
     :hook (rust-ts-mode . cargo-minor-mode))
 #+end_src