diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix
index 58439da1..c59e3d86 100644
--- a/hosts/sakotop/configuration.nix
+++ b/hosts/sakotop/configuration.nix
@@ -21,6 +21,14 @@
       apps = {
         keepassxc.enable = true;
       };
+      chat = {
+        discord.enable = true;
+      };
+      game = {
+        wine.enable = true;
+        lutris.enable = true;
+        steam.enable = true;
+      };
     };
     hardware = {
       nvidia.enable = true;
@@ -51,12 +59,6 @@
     isNormalUser = true;
     extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
     packages = with pkgs; [
-      tree
-      steam
-      winetricks
-      wineWowPackages.staging
-      lutris
-      discord
       networkmanagerapplet
       gcc
       python3
diff --git a/modules/desktop/chat/default.nix b/modules/desktop/chat/default.nix
new file mode 100644
index 00000000..862de57a
--- /dev/null
+++ b/modules/desktop/chat/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./discord
+  ]; 
+}
diff --git a/modules/desktop/chat/discord/default.nix b/modules/desktop/chat/discord/default.nix
new file mode 100644
index 00000000..96521558
--- /dev/null
+++ b/modules/desktop/chat/discord/default.nix
@@ -0,0 +1,16 @@
+{ outputs, options, config, lib, pkgs, ...}:
+with lib;
+let
+  cfg = config.modules.desktop.chat.discord;
+in
+{
+  options.modules.desktop.chat.discord = {
+    enable = mkEnableOption false;
+  };
+
+  config = mkIf cfg.enable {
+    users.users.sako.packages = with pkgs; [
+      discord
+    ];
+  };
+}
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 9959bf56..df47ceab 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -4,5 +4,7 @@
     ./bspwm
     ./browsers
     ./apps
+    ./game
+    ./chat
   ];
 }
diff --git a/modules/desktop/game/default.nix b/modules/desktop/game/default.nix
new file mode 100644
index 00000000..1001f998
--- /dev/null
+++ b/modules/desktop/game/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./steam
+    ./lutris
+    ./wine
+  ];
+}
diff --git a/modules/desktop/game/lutris/default.nix b/modules/desktop/game/lutris/default.nix
new file mode 100644
index 00000000..d5404d34
--- /dev/null
+++ b/modules/desktop/game/lutris/default.nix
@@ -0,0 +1,16 @@
+{ outputs, options, config, lib, pkgs, ...}:
+with lib;
+let
+  cfg = config.modules.desktop.game.lutris;
+in
+{
+  options.modules.desktop.game.lutris = {
+    enable = mkEnableOption false;
+  };
+
+  config = mkIf cfg.enable {
+    users.users.sako.packages = with pkgs; [
+      lutris
+    ];
+  };
+}
diff --git a/modules/desktop/game/steam/default.nix b/modules/desktop/game/steam/default.nix
new file mode 100644
index 00000000..53338c28
--- /dev/null
+++ b/modules/desktop/game/steam/default.nix
@@ -0,0 +1,16 @@
+{ outputs, options, config, lib, pkgs, ...}:
+with lib;
+let
+  cfg = config.modules.desktop.game.steam;
+in
+{
+  options.modules.desktop.game.steam = {
+    enable = mkEnableOption false;
+  };
+
+  config = mkIf cfg.enable {
+    users.users.sako.packages = with pkgs; [
+      steam
+    ];
+  };
+}
diff --git a/modules/desktop/game/wine/default.nix b/modules/desktop/game/wine/default.nix
new file mode 100644
index 00000000..84ea1ecb
--- /dev/null
+++ b/modules/desktop/game/wine/default.nix
@@ -0,0 +1,17 @@
+{ outputs, options, config, lib, pkgs, ...}:
+with lib;
+let
+  cfg = config.modules.desktop.game.wine;
+in
+{
+  options.modules.desktop.game.wine = {
+    enable = mkEnableOption false;
+  };
+
+  config = mkIf cfg.enable {
+    users.users.sako.packages = with pkgs; [
+      winetricks
+      wineWowPackages.staging
+    ];
+  };
+}