diff --git a/machines/luna/modules.nix b/machines/luna/modules.nix
index 45a9a10..0db268c 100644
--- a/machines/luna/modules.nix
+++ b/machines/luna/modules.nix
@@ -1,7 +1,6 @@
 {...}: {
   imports = [
     ../../modules
-    ../../modules/boot/loader/systemd.nix
   ];
 
   config.horseman = {
@@ -48,11 +47,10 @@
     apps = {
       dev.enable = true;
       visual.enable = true;
-      terminal.enable = true;
-    };
-
-    terminal = {
-      zsh.enable = true;
+      terminal = {
+        enable = true;
+        zsh.enable = true;
+      };
     };
   };
 }
diff --git a/machines/solis/modules.nix b/machines/solis/modules.nix
index a1540b9..8c93918 100644
--- a/machines/solis/modules.nix
+++ b/machines/solis/modules.nix
@@ -1,7 +1,6 @@
 {...}: {
   imports = [
     ../../modules
-    ../../modules/boot/loader/grub.nix
   ];
 
   config.horseman = {
diff --git a/machines/terra/modules.nix b/machines/terra/modules.nix
index f9fb013..bce392e 100644
--- a/machines/terra/modules.nix
+++ b/machines/terra/modules.nix
@@ -57,11 +57,11 @@
     apps = {
       dev.enable = true;
       visual.enable = true;
-      terminal.enable = true;
-    };
-
-    terminal = {
-      zsh.enable = true;
+      gaming.enable = true;
+      terminal = {
+        enable = true;
+        zsh.enable = true;
+      };
     };
 
     timers = {
diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index c83ec2d..a5f32af 100644
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -3,10 +3,13 @@
     ./dev.nix
 
     ./terminal.nix
+    ./terminal/zsh.nix
 
     ./visual.nix
     ./visual/firefox.nix
 
     ./server.nix
+
+    ./gaming.nix
   ];
 }
diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix
new file mode 100644
index 0000000..a88704f
--- /dev/null
+++ b/modules/apps/gaming.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf;
+  cfg = config.horseman.apps.gaming;
+in {
+  options = {
+    horseman.apps.gaming = {
+      enable = mkEnableOption "Games and things for games";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.steam = {
+      enable = true;
+      remotePlay.openFirewall = false; # Open ports in the firewall for Steam Remote Play
+      dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+      localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
+    };
+  };
+}
diff --git a/modules/terminal/zsh.nix b/modules/apps/terminal/zsh.nix
similarity index 94%
rename from modules/terminal/zsh.nix
rename to modules/apps/terminal/zsh.nix
index 95cf38c..5c5642f 100644
--- a/modules/terminal/zsh.nix
+++ b/modules/apps/terminal/zsh.nix
@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.horseman.terminal.zsh;
+  cfg = config.horseman.apps.terminal.zsh;
 in {
   options = {
-    horseman.terminal.zsh = {
+    horseman.apps.terminal.zsh = {
       enable = mkEnableOption "The ZSH shell and plugins for it";
     };
   };
diff --git a/modules/default.nix b/modules/default.nix
index ed09c87..650757a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -3,7 +3,6 @@
     ./apps
     ./hardware
     ./network
-    ./terminal
     ./wm
     ./users
     ./boot
diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix
deleted file mode 100644
index da14057..0000000
--- a/modules/terminal/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./zsh.nix
-  ];
-}
diff --git a/modules/wm/hyprland/keybindings.nix b/modules/wm/hyprland/keybindings.nix
index 42dd1e6..26b50b4 100644
--- a/modules/wm/hyprland/keybindings.nix
+++ b/modules/wm/hyprland/keybindings.nix
@@ -32,7 +32,7 @@ in {
           mods = ["SUPER"];
           key = "SPACE";
           dispatcher = "exec";
-          params = "pkill wofi || wofi --show drun";
+          params = "pkill wofi || wofi -i -S drun -M multi-contains";
         }
 
         {