diff --git a/init.el b/init.el
index 3f6cd47..d7ca28a 100644
--- a/init.el
+++ b/init.el
@@ -29,7 +29,8 @@
 
 (setq backup-by-copying t
       inhibit-splash-screen t
-      custom-file (expand-file-name "custom.el" temporary-file-directory))
+      custom-file (expand-file-name "custom.el" temporary-file-directory)
+      custom-safe-themes t)
 
 (defun my-inhibit-hl-line-mode ()
   "Disable `gobal-hl-line-mode' for the current buffer."
@@ -413,6 +414,23 @@
   :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
@@ -1013,7 +1031,6 @@ This function is called by `org-babel-execute-src-block'."
       read-buffer-completion-ignore-case t
       completion-ignore-case t
       sentence-end-double-space nil
-      custom-safe-themes t
       x-stretch-cursor t)
 
 (setq-default c-basic-offset 4