diff --git a/early-init.el b/early-init.el
index 579fda0..3096cef 100644
--- a/early-init.el
+++ b/early-init.el
@@ -23,3 +23,6 @@
 
 ;; Annoyoing comp errors
 (setq native-comp-async-report-warnings-errors 'silent)
+
+;; Annoying dialog boxes
+(setq use-dialog-box nil)
diff --git a/init.el b/init.el
index 7d83e75..5fb505e 100644
--- a/init.el
+++ b/init.el
@@ -553,12 +553,12 @@
   :custom
   (catppuccin-flavor 'mocha))
 
-(defun load-theme-with-solaire ()
+(defun my-load-theme-with-solaire ()
   (load-theme 'catppuccin t)
   (catppuccin-reload)
   (solaire-global-mode)
   (when (daemonp)
-    (remove-hook 'server-after-make-frame-hook #'load-theme-with-solaire)))
+    (remove-hook 'server-after-make-frame-hook #'my-load-theme-with-solaire)))
 
 (use-package solaire-mode
   :demand t
@@ -566,12 +566,12 @@
   (solaire-mode-real-buffer-fn (lambda ()
                                  (and (solaire-mode-real-buffer-p)
                                       (or (custom-theme-enabled-p 'gruvbox)
-                                          (not (member 'minimap-sb-mode
-                                                       local-minor-modes))))))
+                                          (not (memq 'minimap-sb-mode
+                                                     local-minor-modes))))))
   :config
   (if (daemonp)
-      (add-hook 'server-after-make-frame-hook #'load-theme-with-solaire)
-    (load-theme-with-solaire)))
+      (add-hook 'server-after-make-frame-hook #'my-load-theme-with-solaire)
+    (my-load-theme-with-solaire)))
 
 (use-package emacs-everywhere
   :load-path "~/emacs-everywhere"