diff --git a/colmena/remote.nix b/colmena/remote.nix
index 84c28bd..47191f7 100644
--- a/colmena/remote.nix
+++ b/colmena/remote.nix
@@ -7,5 +7,10 @@
     tags = [ "remote" ];
   };
 
+  # Required for remote builds
   security.sudo.wheelNeedsPassword = false;
+
+  imports = [
+    ../common/openssh.nix
+  ];
 }
diff --git a/common/steam.nix b/common/gaming.nix
similarity index 68%
rename from common/steam.nix
rename to common/gaming.nix
index d59135c..b58ffc5 100644
--- a/common/steam.nix
+++ b/common/gaming.nix
@@ -8,4 +8,9 @@
   };
 
   services.joycond.enable = true;
+
+  # Currently broken: 
+  # environment.systemPackages = with pkgs; [
+  #   itch
+  # ];
 }
\ No newline at end of file
diff --git a/common/ssh.nix b/common/openssh.nix
similarity index 80%
rename from common/ssh.nix
rename to common/openssh.nix
index d8dd364..6715088 100644
--- a/common/ssh.nix
+++ b/common/openssh.nix
@@ -10,4 +10,6 @@
   };
 
   services.fail2ban.enable = true;
+
+  networking.firewall.allowedTCPPorts = [ 22 ];
 }
\ No newline at end of file
diff --git a/hive.nix b/hive.nix
index 7251c01..e3ccd2b 100644
--- a/hive.nix
+++ b/hive.nix
@@ -23,7 +23,6 @@ in {
       (import "${sources.home-manager}/nixos")
       (import "${sources.agenix}/modules/age.nix")
       ./pinning.nix
-      ./common/ssh.nix
       ./common/sudo.nix
       ./common/utilities.nix
       ./users/qenya.nix
diff --git a/hosts/tohru/configuration.nix b/hosts/tohru/configuration.nix
index 47e8232..70865b3 100644
--- a/hosts/tohru/configuration.nix
+++ b/hosts/tohru/configuration.nix
@@ -6,8 +6,7 @@
       ./hardware-configuration.nix
       ./home.nix
       ../../common/fonts.nix
-      ../../common/steam.nix
-      ./syncthing.nix
+      ../../common/gaming.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
diff --git a/hosts/tohru/syncthing.nix b/hosts/tohru/syncthing.nix
deleted file mode 100644
index 0bd239c..0000000
--- a/hosts/tohru/syncthing.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.syncthing = {
-    enable = true;
-    user = "qenya";
-    dataDir = "/data/syncthing";
-    openDefaultPorts = true;
-    overrideDevices = true;
-    overrideFolders = true;
-    settings = {
-      devices = {
-        "kilgharrah" = { id = "RDT7IGD-76FZ6LY-37PPB2W-DWPQRPR-LZ4AXF7-4GIIHYJ-RVXUUSG-ZXPN3AZ"; };
-      };
-      folders = {
-        "Documents" = {
-          id = "alp59-7gs9s";
-          path = "~/Documents";
-          devices = [ "kilgharrah" ];
-        };
-      };
-    };
-  };
-}
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index a4a270a..15c6b9f 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,6 +1,5 @@
 let
-  tohru = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8wuGzF0Y7SaH9aimo3SmCz99MTQwL+rEVhx0jsueU root@tohru";
-  yevaud = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHUAgyQhl390yUObLUI+jEbuNrZ2U6+8px628DolD+T root@yevaud";
-  systems = [ tohru yevaud ];
+  yevaud = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHUAgyQhl390yUObLUI+jEbuNrZ2U6+8px628DolD+T";
+  systems = [ yevaud ];
 in
 { }