diff --git a/aspects/gaming/flatpak.nix b/aspects/gaming/flatpak.nix
deleted file mode 100644
index cc4d0ee..0000000
--- a/aspects/gaming/flatpak.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ ... }:
-
-{
-  flake.modules.nixos.gaming-flatpak =
-    { pkgs, ... }:
-    {
-      services.flatpak.packages = [
-        "com.github.k4zmu2a.spacecadetpinball"
-        "com.steamgriddb.SGDBoop"
-        "io.github.Foldex.AdwSteamGtk"
-        "io.itch.itch"
-        "io.mrarm.mcpelauncher"
-        "net.retrodeck.retrodeck"
-        "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/25.08"
-        rec {
-          appId = "com.hypixel.HytaleLauncher";
-          sha256 = "01307s44bklc1ldcigcn9n4lm8hf8q793v9fv7w4w04xd5zyh4rv";
-          bundle = "${pkgs.fetchurl {
-            url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-latest.flatpak";
-            inherit sha256;
-          }}";
-        }
-      ];
-    };
-}
diff --git a/aspects/gaming/hardware.nix b/aspects/gaming/hardware.nix
deleted file mode 100644
index e3b5c4b..0000000
--- a/aspects/gaming/hardware.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }:
-
-{
-  flake.modules.nixos.gaming-hardware =
-    { ... }:
-    {
-      hardware = {
-        xpadneo.enable = true;
-        steam-hardware.enable = true; # Allow steam client to manage controllers
-        graphics.enable32Bit = true; # For OpenGL games
-      };
-    };
-}
diff --git a/aspects/gaming/launchers.nix b/aspects/gaming/launchers.nix
deleted file mode 100644
index 1fd3bb4..0000000
--- a/aspects/gaming/launchers.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }:
-
-{
-  flake.modules.nixos.gaming-launchers =
-    { pkgs, ... }:
-    {
-      environment.systemPackages = with pkgs; [
-        clonehero
-        heroic
-        prismlauncher
-      ];
-    };
-}
diff --git a/aspects/gaming/mangohud.nix b/aspects/gaming/mangohud.nix
index 2856b8f..14a3df6 100644
--- a/aspects/gaming/mangohud.nix
+++ b/aspects/gaming/mangohud.nix
@@ -2,7 +2,7 @@
 
 {
   flake.modules = {
-    nixos.gaming-mangohud =
+    nixos.mangohud =
       { pkgs, ... }:
       {
         environment.systemPackages = with pkgs; [
@@ -10,7 +10,7 @@
         ];
       };
 
-    homeManager.gaming-mangohud =
+    homeManager.mangohud =
       { config, ... }:
       {
         programs.mangohud = {
diff --git a/aspects/gaming/steam.nix b/aspects/gaming/steam.nix
index 530c99b..a10d0e4 100644
--- a/aspects/gaming/steam.nix
+++ b/aspects/gaming/steam.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  flake.modules.nixos.gaming-steam =
+  flake.modules.nixos.steam =
     { pkgs, ... }:
     {
       environment.systemPackages = with pkgs; [
@@ -15,5 +15,10 @@
         };
         gamemode.enable = true;
       };
+
+      services.flatpak.packages = [
+        "com.steamgriddb.SGDBoop"
+        "io.github.Foldex.AdwSteamGtk"
+      ];
     };
 }
diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix
index d05639d..57fdf5f 100644
--- a/aspects/hosts/alexandria.nix
+++ b/aspects/hosts/alexandria.nix
@@ -19,17 +19,13 @@
       # system aspects
       base
       cli
+      server
 
       # user aspects
       user
       root
 
-      # Server aspects
-      server-boot
-      server-nix
-      server-tailscale
-
-      # Other aspects
+      # other aspects
       fwupd
     ]);
   };
diff --git a/aspects/hosts/rotterdam.nix b/aspects/hosts/rotterdam.nix
index ad4192e..1c177e4 100644
--- a/aspects/hosts/rotterdam.nix
+++ b/aspects/hosts/rotterdam.nix
@@ -23,20 +23,17 @@
       base
       cli
       desktop
+      gaming
 
       # user aspects
       user
       root
 
-      # Other aspects based on tags
+      # other aspects
       ai
       bluetooth
       dev
       fwupd
-      gaming-flatpak
-      gaming-hardware
-      gaming-launchers
-      gaming-steam
       libvirtd
       networkmanager
       niri
diff --git a/aspects/hosts/trantor.nix b/aspects/hosts/trantor.nix
index e7934ab..076672c 100644
--- a/aspects/hosts/trantor.nix
+++ b/aspects/hosts/trantor.nix
@@ -21,15 +21,11 @@
       # system aspects
       base
       cli
+      server
 
       # user aspects
       user
       root
-
-      # Server aspects
-      server-boot
-      server-nix
-      server-tailscale
     ]);
   };
 }
diff --git a/aspects/systems/cli.nix b/aspects/systems/cli.nix
index 1d379e8..2b95f0e 100644
--- a/aspects/systems/cli.nix
+++ b/aspects/systems/cli.nix
@@ -19,7 +19,7 @@
     homeManager.cli =
       { ... }:
       {
-        imports = with inputs.self.modules.nixos; [
+        imports = with inputs.self.modules.homeManager; [
           btop
           comma
           direnv
diff --git a/aspects/systems/gaming.nix b/aspects/systems/gaming.nix
new file mode 100644
index 0000000..e73a6fe
--- /dev/null
+++ b/aspects/systems/gaming.nix
@@ -0,0 +1,48 @@
+{ inputs, ... }:
+
+{
+  flake.modules = {
+    nixos.gaming =
+      { pkgs, ... }:
+      {
+        imports = with inputs.self.modules.nixos; [
+          mangohud
+          steam
+        ];
+        hardware = {
+          xpadneo.enable = true;
+          steam-hardware.enable = true; # Allow steam client to manage controllers
+          graphics.enable32Bit = true; # For OpenGL games
+        };
+
+        services.flatpak.packages = [
+          "com.github.k4zmu2a.spacecadetpinball"
+          "io.itch.itch"
+          "io.mrarm.mcpelauncher"
+          "net.retrodeck.retrodeck"
+          "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/25.08"
+          rec {
+            appId = "com.hypixel.HytaleLauncher";
+            sha256 = "01307s44bklc1ldcigcn9n4lm8hf8q793v9fv7w4w04xd5zyh4rv";
+            bundle = "${pkgs.fetchurl {
+              url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-latest.flatpak";
+              inherit sha256;
+            }}";
+          }
+        ];
+
+        environment.systemPackages = with pkgs; [
+          clonehero
+          heroic
+          prismlauncher
+        ];
+      };
+    homeManager.gaming =
+      { ... }:
+      {
+        imports = with inputs.self.modules.homeManager; [
+          mangohud
+        ];
+      };
+  };
+}
diff --git a/aspects/users/user.nix b/aspects/users/user.nix
index ca74e8d..e37c038 100644
--- a/aspects/users/user.nix
+++ b/aspects/users/user.nix
@@ -40,11 +40,13 @@
           ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user)
         ]
         ++ (with inputs.self.modules.homeManager; [
-          base # base aspect
-          cli # cli aspect
-          desktop # desktop aspect
+          # system aspects
+          base
+          cli
+          desktop
+          gaming
 
-          # other aspect
+          # other aspects
           stylix
           niri
         ]);
@@ -68,9 +70,10 @@
           ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user)
         ]
         ++ (with inputs.self.modules.homeManager; [
-          base # base aspect
-          cli # cli aspect
-          desktop # desktop aspect
+          # system aspects
+          base
+          cli
+          desktop
 
           # other aspect
           stylix