diff --git a/modules/config/theming/catppuccin-frappe.nix b/modules/config/theming/catppuccin-frappe.nix
index b7d8169..8be760f 100644
--- a/modules/config/theming/catppuccin-frappe.nix
+++ b/modules/config/theming/catppuccin-frappe.nix
@@ -5,7 +5,7 @@ let
   cfg = config.my.theming;
 in
 {
-  config = mkIf (cfg.scheme == "catppuccin-frappe")
+  config = mkIf (cfg.enable && cfg.scheme == "catppuccin-frappe")
     (import ./catppuccin.nix
       {
         inherit config lib pkgs;
diff --git a/modules/config/theming/catppuccin-latte.nix b/modules/config/theming/catppuccin-latte.nix
index 6743ed9..3cf64d8 100644
--- a/modules/config/theming/catppuccin-latte.nix
+++ b/modules/config/theming/catppuccin-latte.nix
@@ -5,7 +5,7 @@ let
   cfg = config.my.theming;
 in
 {
-  config = mkIf (cfg.scheme == "catppuccin-latte")
+  config = mkIf (cfg.enable && cfg.scheme == "catppuccin-latte")
     (import ./catppuccin.nix
       {
         inherit config lib pkgs;
diff --git a/modules/config/theming/catppuccin-macchiato.nix b/modules/config/theming/catppuccin-macchiato.nix
index 70b4dd8..f4f02f6 100644
--- a/modules/config/theming/catppuccin-macchiato.nix
+++ b/modules/config/theming/catppuccin-macchiato.nix
@@ -5,7 +5,7 @@ let
   cfg = config.my.theming;
 in
 {
-  config = mkIf (cfg.scheme == "catppuccin-macchiato")
+  config = mkIf (cfg.enable && cfg.scheme == "catppuccin-macchiato")
     (import ./catppuccin.nix
       {
         inherit config lib pkgs;
diff --git a/modules/config/theming/catppuccin-mocha.nix b/modules/config/theming/catppuccin-mocha.nix
index ab35068..6b39aa6 100644
--- a/modules/config/theming/catppuccin-mocha.nix
+++ b/modules/config/theming/catppuccin-mocha.nix
@@ -5,7 +5,7 @@ let
   cfg = config.my.theming;
 in
 {
-  config = mkIf (cfg.scheme == "catppuccin-mocha")
+  config = mkIf (cfg.enable && cfg.scheme == "catppuccin-mocha")
     (import ./catppuccin.nix
       {
         inherit config lib pkgs;
diff --git a/modules/config/theming/dracula.nix b/modules/config/theming/dracula.nix
index 235e0c3..22ef8e6 100644
--- a/modules/config/theming/dracula.nix
+++ b/modules/config/theming/dracula.nix
@@ -17,7 +17,7 @@ let
   yellow = "#f1fa8c";
 in
 {
-  config = mkIf (cfg.scheme == "dracula") {
+  config = mkIf (cfg.enable && cfg.scheme == "dracula") {
     home-manager.users.moritz = {
       programs = {
         kitty.extraConfig =
diff --git a/modules/programs/bspwm/default.nix b/modules/programs/bspwm/default.nix
index 78c64a6..ba50a96 100644
--- a/modules/programs/bspwm/default.nix
+++ b/modules/programs/bspwm/default.nix
@@ -37,7 +37,7 @@ in
           "feh".state = "floating";
           "Vampire_Survivors".state = "fullscreen";
         };
-        settings = with config.scheme.withHashtag; {
+        settings = {
           border_width = 2;
           window_gap = 5;
           borderless_monocle = true;