diff --git a/home/programs/games.nix b/home/programs/games.nix
index ad099da..4dd1347 100644
--- a/home/programs/games.nix
+++ b/home/programs/games.nix
@@ -5,7 +5,8 @@
   lib,
   ...
 }: let
-  inherit (osConfig.niksos) games bluetooth;
+  inherit (osConfig.niksos) desktop bluetooth;
+  inherit (desktop) games;
 in {
   # Also look at system/programs/games.nix (some programs have to be overlayed or have systemwide modules that have to be installed.)
   home.packages = lib.mkIf games ([
diff --git a/home/wayland/hyprland/binds.nix b/home/wayland/hyprland/binds.nix
index 69d0e0c..ff8b519 100644
--- a/home/wayland/hyprland/binds.nix
+++ b/home/wayland/hyprland/binds.nix
@@ -8,7 +8,8 @@
 }: let
   inherit (lib) getExe;
   inherit (config.lib.stylix.colors) base0D;
-  inherit (osConfig.niksos) games portable;
+  inherit (osConfig.niksos) desktop portable bluetooth;
+  inherit (desktop) games;
 
   runOnce = program: "pgrep ${program} || uwsm app -- ${program}";
   uwsm = getExe pkgs.uwsm;
@@ -86,7 +87,7 @@ in {
         "$m, Escape, exec, ${hyprlock}"
 
         "$m, A, exec, ${pulsemixer}"
-        "$m, B, exec, ${bluetui}"
+
         "$m, N, exec, ${nmtui}"
         ''
           $m, S, exec, bash -c 'hyprctl notify -1 5000 "rgb(${base0D})" "$(${getExe (import ./scripts.nix {inherit pkgs;}).statusnotify})"'
@@ -106,6 +107,7 @@ in {
         "$m SHIFT, j, movewindow, d"
       ]
       ++ workspaces
+      ++ lib.optional bluetooth "$m, B, exec, ${bluetui}"
       ++ lib.optionals games (let
         torzu = "${
           appE inputs.nixpkgs-torzu.legacyPackages.${pkgs.system}.torzu
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 3b8f8aa..42e9511 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -39,8 +39,8 @@
     };
 
     neovim = true;
-    games = true;
     desktop = {
+      games = true;
       enable = true;
       hyprland = true;
       kde = true;
diff --git a/hosts/minimal/default.nix b/hosts/minimal/default.nix
index 4d05acd..db7e1de 100644
--- a/hosts/minimal/default.nix
+++ b/hosts/minimal/default.nix
@@ -14,9 +14,10 @@
       enable = false;
       hyprland = false;
       kde = false;
+      apps = false;
+      games = false;
     };
     fingerprint = false;
-    games = false;
     graphics = {
       enable = false;
       intel = false;
diff --git a/system/desktop/default.nix b/system/desktop/default.nix
index db4f920..2fe689e 100644
--- a/system/desktop/default.nix
+++ b/system/desktop/default.nix
@@ -18,7 +18,9 @@ in {
   ];
 
   options.niksos.desktop = {
-    enable = mkEO "enable desktop related programs.";
+    enable = mkEO "enable desktop related programs (+home manager).";
+    apps = mkEO "extra bloat.";
+    games = mkEO "gaming related programs";
     hyprland = mkEO "enable hyprland related programs.";
     kde = mkEO "enable kde specialisation.";
   };
@@ -29,5 +31,9 @@ in {
       assertion = cfg.enable;
       message = "You need to enable desktop for the hyprland/kde module to work";
     }
+    {
+      assertion = config.niksos.desktop.enable;
+      message = "The games option needs desktop to be enabled for it to work properly (it enables home-manager).";
+    }
   ];
 }
diff --git a/system/programs/games.nix b/system/programs/games.nix
index e4ee0d3..05f61f1 100644
--- a/system/programs/games.nix
+++ b/system/programs/games.nix
@@ -4,16 +4,9 @@
   lib,
   ...
 }: let
-  cfg = config.niksos.games;
+  cfg = config.niksos.desktop.games;
 in {
-  options.niksos.games = lib.mkEnableOption "gaming related stuff.";
   config = lib.mkIf cfg {
-    assertions = [
-      {
-        assertion = config.niksos.desktop.enable;
-        message = "The games option needs desktop to be enabled for it to work properly (it enables home-manager).";
-      }
-    ];
     # nixpkgs.overlays = [
     #   (final: prev: let
     #     version = "1.4.2";