diff --git a/init.el b/init.el
index 3e6db86..cd3d98e 100644
--- a/init.el
+++ b/init.el
@@ -39,6 +39,25 @@
 (use-package f
   :demand t)
 
+(use-package diminish)
+
+(use-package moody
+  :demand t
+  :config
+  (moody-replace-mode-line-front-space)
+  (moody-replace-mode-line-buffer-identification)
+  (moody-replace-vc-mode)
+  (with-eval-after-load 'eldoc
+    (moody-replace-eldoc-minibuffer-message-function))
+  ;; Prevent weird colors in the ribbons on solaire buffers at the cost of
+  ;; everything looking the same (worth it IMO)
+  (with-eval-after-load 'solaire-mode
+    (face-spec-set 'mode-line `((t (:background ,(catppuccin-get-color 'crust)))))
+    ;; NOTE: Technically this line is unnnecessary because of the previous but
+    ;; I'll keep it here in case it ever becomes relevant
+    (dolist (face '(mode-line mode-line-active mode-line-inactive))
+      (setf (alist-get face solaire-mode-remap-alist) nil))))
+
 (use-package undo-fu
   :demand t
   :config
@@ -71,6 +90,7 @@
   (god-mode-alist '((nil . "C-")
                     ("g" . "M-")
                     ("m" . "C-M-")))
+  (god-mode-lighter-string nil)
   :config
   (defun my--god-c-q ()
     (interactive)
@@ -170,6 +190,7 @@
 
 (use-package goggles
   :hook prog-mode
+  :diminish " O-O"
   :config
   (setq-default goggles-pulse t)
   (with-eval-after-load 'catppuccin-theme
@@ -177,8 +198,7 @@
       (dolist (f '(goggles-added
                    goggles-removed
                    goggles-changed))
-        (face-spec-set f new-spec))))
-  (setcar (cdr (assq 'goggles-mode minor-mode-alist)) " O-O"))
+        (face-spec-set f new-spec)))))
 
 (defun my--set-tab-width-2 ()
   (setq tab-width 2))
@@ -217,8 +237,8 @@
 
 (use-package dtrt-indent
   :demand t
+  :diminish " dtrt"
   :config
-  (setcar (cdr (assq 'dtrt-indent-mode minor-mode-alist)) " dtrt")
   (dtrt-indent-global-mode))
 
 (use-package aggressive-indent
@@ -240,6 +260,7 @@
   :custom
   (highlight-indent-guides-auto-enabled nil)
   (highlight-indent-guides-method 'character)
+  :diminish
   :config
   (defun my-maybe-highlight-indent-guides ()
     (interactive)
@@ -250,6 +271,7 @@
   :demand t
   :custom
   (which-key-idle-delay 0.2)
+  :diminish
   :config
   (with-eval-after-load 'god-mode
     (which-key-enable-god-mode-support))
@@ -413,23 +435,6 @@
   :config
   (treemacs-load-theme 'all-the-icons))
 
-(use-package moody
-  :demand t
-  :config
-  (moody-replace-mode-line-front-space)
-  (moody-replace-mode-line-buffer-identification)
-  (moody-replace-vc-mode)
-  (with-eval-after-load 'eldoc
-    (moody-replace-eldoc-minibuffer-message-function))
-  ;; Prevent weird colors in the ribbons on solaire buffers at the cost of
-  ;; everything looking the same (worth it IMO)
-  (with-eval-after-load 'solaire-mode
-    (face-spec-set 'mode-line `((t (:background ,(catppuccin-get-color 'crust)))))
-    ;; NOTE: Technically this line is unnnecessary because of the previous but
-    ;; I'll keep it here in case it ever becomes relevant
-    (dolist (face '(mode-line mode-line-active mode-line-inactive))
-      (setf (alist-get face solaire-mode-remap-alist) nil))))
-
 (use-package dirvish
   :after dired
   :demand t
@@ -648,13 +653,17 @@ This function is called by `org-babel-execute-src-block'."
 
 (use-package editorconfig
   :demand t
+  :diminish " EdConf"
   :config
-  (editorconfig-mode)
-  (setcar (cdr (assq 'editorconfig-mode minor-mode-alist)) " EdConf"))
+  (editorconfig-mode))
 
 (use-package envrc
   :bind ("C-c v" . envrc-command-map)
-  :hook (after-init . envrc-global-mode))
+  :hook (after-init . envrc-global-mode)
+  :custom
+  (envrc-none-lighter nil)
+  (envrc-on-lighter '(" envrc"))
+  (envrc-error-lighter '(" envrc[" (:propertize "!" face envrc-mode-line-error-face)) "]"))
 
 (use-package sly
   :custom