diff --git a/flake.nix b/flake.nix
index 82516c8b..752f2025 100644
--- a/flake.nix
+++ b/flake.nix
@@ -281,6 +281,12 @@
           system = "x86_64-linux";
         in systemConfig { inherit hostName user system; };
 
+        Scorch = let
+          hostName = "Scorch";
+          user = "elitherl";
+          system = "x86_64-linux";
+        in systemConfig { inherit hostName user system; };
+
         Vanguard = let
           hostName = "Vanguard";
           user = "xenia";
diff --git a/home/ssh.nix b/home/ssh.nix
index e2095bc9..95f31a3f 100644
--- a/home/ssh.nix
+++ b/home/ssh.nix
@@ -1,4 +1,6 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }:
+
+{
   home.packages = with pkgs; [ sshfs ];
   programs = {
     ssh = {
@@ -25,6 +27,21 @@
           user = "root";
           hostname = "77.68.67.133";
         };
+        "freia".hostname = "freia020.hpc.l";
+        "freia???" =
+          lib.hm.dag.entryAfter [ "freia" ] { hostname = "%h.hpc.l"; };
+        "heimdall".hostname = "heimdall003.jet.uk";
+        "heimdall???" =
+          lib.hm.dag.entryAfter [ "heimdall" ] { hostname = "%h.jet.uk"; };
+        "freia* heimdall*" = lib.hm.dag.entryAfter [
+          "freia"
+          "freia???"
+          "heimdall"
+          "heimdall???"
+        ] {
+          user = "elitherl";
+          compression = true;
+        };
         "git*".user = "git";
       };
     };
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index 9925d1e9..58349d29 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -1,22 +1,9 @@
-{ config, pkgs, lib, user, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   home.packages = with pkgs; [ openfortivpn nomachine-client ];
   programs = {
     git.userEmail = "evie.litherland-smith@ukaea.uk";
-    ssh.matchBlocks = {
-      "git.ccfe.ac.uk" = { user = "git"; };
-      "freia".hostname = "freia020.hpc.l";
-      "freia???" = lib.hm.dag.entryAfter [ "freia" ] { hostname = "%h.hpc.l"; };
-      "heimdall".hostname = "heimdall003.jet.uk";
-      "heimdall???" =
-        lib.hm.dag.entryAfter [ "heimdall" ] { hostname = "%h.jet.uk"; };
-      "freia* heimdall*" =
-        lib.hm.dag.entryAfter [ "freia" "freia???" "heimdall" "heimdall???" ] {
-          user = "elitherl";
-          compression = true;
-        };
-    };
     firefox.profiles.default.settings."browser.startup.homepage" =
       "https://nucleus.ukaea.uk";
   };
diff --git a/hosts/Scorch/home.nix b/hosts/Scorch/home.nix
new file mode 100644
index 00000000..afc2bf94
--- /dev/null
+++ b/hosts/Scorch/home.nix
@@ -0,0 +1,36 @@
+{ config, pkgs, lib, ... }:
+
+{
+  home.packages = with pkgs; [ nomachine-client ];
+  programs = {
+    git.userEmail = "evie.litherland-smith@ukaea.uk";
+    firefox.profiles.default.settings."browser.startup.homepage" =
+      "https://nucleus.ukaea.uk";
+  };
+  programs.mbsync.groups.inboxes.ukaea = [ "INBOX" ];
+  accounts = {
+    email.accounts = {
+      proton.primary = false;
+      ukaea = {
+        primary = true;
+        imapnotify.enable = true;
+        mbsync.enable = true;
+        msmtp.enable = true;
+        mu.enable = true;
+      };
+    };
+    calendar.accounts.nextcloud.vdirsyncer.enable = false; # TEMP until fixed
+  };
+  services.vdirsyncer.enable = lib.mkForce false; # TEMP until fixed
+  xdg.configFile."hypr/extra.conf".text = ''
+    misc {
+        disable_hyprland_logo = true
+        disable_splash_rendering = true
+    }
+
+    # monitor=eDP-1,preferred,auto,1
+    # monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,0x185,1
+    # monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,1920x0,1,transform,1
+    # monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1
+  '';
+}