diff --git a/dotfiles/doom/config.org b/dotfiles/doom/config.org
index 3f579fc..6c9e51e 100755
--- a/dotfiles/doom/config.org
+++ b/dotfiles/doom/config.org
@@ -299,15 +299,17 @@ Setting the theme to doom-one.  To try out new themes, I set a keybinding for
 counsel-load-theme with 'SPC h t'.
 
 #+begin_src emacs-lisp :tangle ./config.el
-(use-package! base16-stylix-theme
-  :ensure nil  ;; Ensures it won't be installed if missing
-  :config
-  (setq doom-theme 'base16-stylix))
+(unless (string= my/org-device "galaxy")
+  (ignore-errors
+    (require 'base16-stylix-theme)))
 
-;; Check if base16-stylix-theme is available, otherwise fallback to doom-opera-light
-(setq doom-theme (if (featurep 'base16-stylix-theme)
-                     'base16-stylix
-                   'doom-opera-light))
+(setq doom-theme
+      (cond
+       ((string= my/org-device "galaxy")
+        'doom-opera-light)
+       ((featurep 'base16-stylix-theme)
+        'base16-stylix)
+       (t 'doom-one)))
 #+end_src
 
 * EVALUATE ELISP EXPRESSIONS