diff --git a/init.el b/init.el
index 9bdf6a9..ffcd6ef 100644
--- a/init.el
+++ b/init.el
@@ -234,7 +234,6 @@
   (treemacs-load-theme 'all-the-icons))
 
 (use-package doom-modeline
-  :disabled t
   :demand t
   :custom
   (doom-modeline-fn-alist (--map
@@ -378,11 +377,12 @@
 
 (use-package gruvbox-theme)
 (use-package catppuccin-theme
-  :custom-face
-  (region ((t (:background "#5b6078"))))) ; surface2
+  :custom
+  (catppuccin-flavor 'macchiato))
 
 (defun load-theme-with-solaire ()
-  (load-theme 'catppuccin-macchiato t)
+  (load-theme 'catppuccin t)
+  (catppuccin-reload)
   (solaire-global-mode)
   (when (daemonp)
     (remove-hook 'server-after-make-frame-hook #'load-theme-with-solaire)))
@@ -404,6 +404,11 @@
   :load-path "~/emacs-everywhere"
   :commands emacs-everywhere)
 
+(use-package ffap
+  :demand t
+  :config
+  (ffap-bindings))
+
 (use-package tool-bar
   :ensure nil
   :config
@@ -460,8 +465,6 @@
 (add-hook 'prog-mode-hook #'electric-pair-local-mode)
 (add-hook 'eval-expression-minibuffer-setup-hook #'electric-pair-local-mode)
 
-(ffap-bindings)
-
 (defun scroll-down-3 ()
   "Scrolls down by 3"
   (interactive)
@@ -493,5 +496,6 @@
 (add-to-list 'auto-mode-alist '("\\.yuck\\'" . lisp-mode))
 (add-to-list 'auto-mode-alist '("flake\\.lock\\'" . js-json-mode))
 
-(with-current-buffer "*scratch*"
-  (cd "~/"))
+(when (daemonp)
+  (with-current-buffer "*scratch*"
+    (cd "~/")))