diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index b91523495b2..f4619b22189 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -20,8 +20,5 @@
 
 
 (use-package! solaire-mode
-  :when (or (daemonp) (display-graphic-p))
   :hook (doom-load-theme . solaire-global-mode)
-  :hook (+popup-buffer-mode . solaire-mode)
-  :hook (which-key-init-buffer . solaire-mode)
-  :config (advice-add #'transient--insert-groups :before #'solaire-mode))
+  :hook (+popup-buffer-mode . turn-on-solaire-mode))
diff --git a/modules/ui/doom/packages.el b/modules/ui/doom/packages.el
index e2243e21a24..5ef16ca7de5 100644
--- a/modules/ui/doom/packages.el
+++ b/modules/ui/doom/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/doom/packages.el
 
-(package! doom-themes :pin "13d23777d43624e261742ac6911db874a095d31c")
-(package! solaire-mode :pin "186f97d7dddc85131fb1e7be5f89de226f26ae51")
+(package! doom-themes :pin "b2c0ea0f0778a6ea85b87e1b87916572e98e1fe7")
+(package! solaire-mode :pin "2298fd806d28daf511eb7836b23775e7df1f65e2")