diff --git a/home/programs/graphical/wms/hyprland/config/keybinds.nix b/home/programs/graphical/wms/hyprland/config/keybinds.nix
index ce768bd..22b4f17 100644
--- a/home/programs/graphical/wms/hyprland/config/keybinds.nix
+++ b/home/programs/graphical/wms/hyprland/config/keybinds.nix
@@ -230,10 +230,10 @@
       #
 
       # Useful to prevent keybind capturing (for games, etc)
-      # SUPER + End
-      bind = SUPER, End, exec, hyprctl dispatch submap isolate && notify-send "Keybind isolation" "Keybind isolation on"
+      # SUPER + Fn + F12 (Favorites)
+      bind = SUPER, XF86Favorites, exec, hyprctl dispatch submap isolate && notify-send "Keybind isolation" "Keybind isolation on"
       submap = isolate
-      bind = SUPER, End, exec, hyprctl dispatch submap reset && notify-send "Keybind isolation" "Keybind isolation off"
+      bind = SUPER, XF86Favorites, exec, hyprctl dispatch submap reset && notify-send "Keybind isolation" "Keybind isolation off"
       submap = reset
 
       #
diff --git a/home/themes/gtk.nix b/home/themes/gtk.nix
index 9c882c6..b8c84e9 100644
--- a/home/themes/gtk.nix
+++ b/home/themes/gtk.nix
@@ -78,7 +78,7 @@ in {
   };
 
   dconf.settings = {
-    # This is like a system-wide dark mode switch that some apps respect it.
+    # This is like a system-wide dark mode swithc that some apps respect it.
     # Equivalent of the following dconf command:
     # `conf write /org/gnome/desktop/interface/color-scheme "'prefer-dark'"`
     "org/gnome/desktop/interface".color-scheme = "prefer-dark";
diff --git a/home/themes/qt.nix b/home/themes/qt.nix
index fadc173..c98753d 100644
--- a/home/themes/qt.nix
+++ b/home/themes/qt.nix
@@ -16,8 +16,8 @@ in {
       then "gtk"
       else "qtct";
     style = mkIf (!cfg.forceGtk) {
-      # sets QT_STYLE_OVERRIDE
-      name = "kvantum";
+      name = "Kvantum";
+      package = cfg.theme.package;
     };
   };
 
@@ -25,12 +25,10 @@ in {
     packages = with pkgs;
       mkMerge [
         [
-          # QT5 & QT6 configuration tools
+          # libraries and programs to ensure that qt applications load without issue
+          # breeze-icons is added as a fallback
           libsForQt5.qt5ct
           kdePackages.qt6ct
-
-          # Icon theme (here as fallback)
-          cfg.iconTheme.package
           breeze-icons
         ]
 
@@ -48,8 +46,8 @@ in {
           qt6Packages.qtstyleplugin-kvantum
           libsForQt5.qtstyleplugin-kvantum
 
-          # Also add the Kvantum theme package to path
-          cfg.kvantumTheme.package
+          # Also add the theme package to path just in case
+          cfg.theme.package
         ])
       ];
 
@@ -69,28 +67,10 @@ in {
       # tell calibre to use the dark theme, because the light one hurts my eyes
       CALIBRE_USE_DARK_PALETTE = "1";
     };
-  };
 
-  xdg.configFile = mkIf (!cfg.forceGtk) {
-    # Kvantum configuration
-    "Kvantum/kvantum.kvconfig" = {
-      text = lib.generators.toINI {} {
-        General.theme = cfg.kvantumTheme.name;
-      };
-    };
-    "Kvantum/${cfg.kvantumTheme.name}".source = "${cfg.kvantumTheme.package}/share/Kvantum/${cfg.kvantumTheme.name}";
-
-
-    # Set icon theme using qtct
-    "qt5ct/qt5ct.conf".text = lib.generators.toINI {} {
-      Appearance = {
-        icon_theme = cfg.iconTheme.name;
-      };
-    };
-
-    "qt6ct/qt6ct.conf".text = lib.generators.toINI {} {
-      Appearance = {
-        icon_theme = cfg.iconTheme.name;
+    xdg.configFile = mkIf (!cfg.forceGtk) {
+      "Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" {
+        General.theme = cfg.theme.name;
       };
     };
   };
diff --git a/options/home/theme.nix b/options/home/theme.nix
index 6677d9b..5d23c2a 100644
--- a/options/home/theme.nix
+++ b/options/home/theme.nix
@@ -69,15 +69,12 @@ in
         '';
       };
 
-      kvantumTheme = {
+      theme = {
         name = mkOption {
           type = types.str;
-          default = "Catppuccin-Mocha-Blue";
+          default = "Catppuccin-Mocha-Dark";
           description = ''
-            The name for the QT kvantum theme.
-
-            This needs to match the directory containing the kvconfig & svg files
-            for selected theme. The package should expose these in /share/Kvantum.
+            The name for the QT theme package.
 
             This has no effect if forceGtk is set.
           '';
@@ -86,42 +83,14 @@ in
         package = mkOption {
           type = types.package;
           description = ''
-            The theme package to be used for QT kvantum theme.
-
-            This needs to expose a directory in /share/Kvantum with the
-            kvconfig & svg files. The name of this directory should match
-            the kvantumTheme.name option.
+            The theme package to be used for QT programs.
 
             This has no effect if forceGtk is set.
           '';
-          default = pkgs.catppuccin-kvantum.override {
-            variant = "Mocha";
-            accent = "Blue";
-          };
-        };
-      };
-
-      iconTheme = {
-        name = mkOption {
-          type = types.str;
-          description = ''
-            The name for the icon theme that will be used for QT programs.
-
-            This has no effect if forceGtk is set.
-          '';
-          default = "Papirus-Dark";
-        };
-
-        package = mkOption {
-          type = types.package;
-          description = ''
-            The QT icon theme package to be used.
-
-            This has no effect if forceGtk is set.
-          '';
-          default = pkgs.catppuccin-papirus-folders.override {
-            accent = "blue";
-            flavor = "mocha";
+          default = pkgs.catppuccin-kde.override {
+            flavour = ["mocha"];
+            accents = ["blue"];
+            winDecStyles = ["modern"];
           };
         };
       };
diff --git a/options/system/default.nix b/options/system/default.nix
index eed9bcf..25cbfc2 100644
--- a/options/system/default.nix
+++ b/options/system/default.nix
@@ -21,5 +21,9 @@ in
     sound = {
       enable = mkEnableOption "sound related programs and audio-dependent programs";
     };
+
+    bluetooth = {
+      enable = mkEnableOption "bluetooth modules, drivers and configuration program(s)";
+    };
   };
 }