diff --git a/base.nix b/base.nix
index 6e6574b..b75b8af 100644
--- a/base.nix
+++ b/base.nix
@@ -8,7 +8,6 @@
 {
   imports = [
     inputs.home-manager.nixosModules.home-manager
-    ./stylix.nix
     ./jawz.nix
     ./modules/modules.nix
   ];
diff --git a/dotfiles/doom/config.org b/dotfiles/doom/config.org
index f630fce..6307dd3 100755
--- a/dotfiles/doom/config.org
+++ b/dotfiles/doom/config.org
@@ -262,13 +262,15 @@ 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)
-(require 'base16-stylix-theme)
-(setq doom-theme 'base16-stylix)
-;; (setq doom-theme 'doom-opera-light)
-;; ;; (setq doom-theme 'doom-dark+)
-;; (map! :leader
-;;       :desc "Load new theme" "h t" #'counsel-load-theme)
+(use-package! base16-stylix-theme
+  :ensure nil  ;; Ensures it won't be installed if missing
+  :config
+  (setq doom-theme 'base16-stylix))
+
+;; 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))
 #+end_src
 
 * EMMS