diff --git a/homes/x86_64-linux/admin@jallen-nas/default.nix b/homes/x86_64-linux/admin@jallen-nas/default.nix
index 0087fe4..960bb3f 100755
--- a/homes/x86_64-linux/admin@jallen-nas/default.nix
+++ b/homes/x86_64-linux/admin@jallen-nas/default.nix
@@ -1,6 +1,11 @@
 { pkgs, namespace, ... }:
 {
-  home.username = "admin";
+  home = {
+    username = "admin";
+    packages = with pkgs; [
+      heroic
+    ];
+  };
 
   ${namespace} = {
     sops.enable = true;
@@ -55,6 +60,23 @@
         }
       ];
     };
-  };
+    steam-rom-manager = {
+      enable = true;
+      steamUsername = "mjallen18";
 
+      # Optional: override default paths if needed
+      environmentVariables = {
+        romsDirectory = "/home/deck/Emulation/roms";
+        steamDirectory = "/home/deck/.local/share/Steam";
+      };
+
+      emulators = {
+        "Non-SRM Shortcuts" = {
+          enable = true;
+          parserType = "Non-SRM Shortcuts";
+          extraArgs = "";
+        };
+      };
+    };
+  };
 }
diff --git a/overlays/linux-cachyos/default.nix b/overlays/linux-cachyos/default.nix
index 5af3798..2917655 100644
--- a/overlays/linux-cachyos/default.nix
+++ b/overlays/linux-cachyos/default.nix
@@ -54,5 +54,11 @@ in
 
     uboot-pi5 = ubootPackages.ubootRaspberryPi5;
     uboot-pi4 = ubootPackages.ubootRaspberryPi4;
+    linuxPackages_rpi5 = final.linuxPackagesFor (final.${namespace}.linux-rpi);
+    linuxPackages_rpi4 = final.linuxPackagesFor (
+      final.${namespace}.linux-rpi.override {
+        rpiVersion = 4;
+      }
+    );
   };
 }
diff --git a/systems/aarch64-linux/pi5/adguard.nix b/systems/aarch64-linux/pi5/adguard.nix
deleted file mode 100644
index d4b78cb..0000000
--- a/systems/aarch64-linux/pi5/adguard.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ ... }:
-{
-  services.adguardhome = {
-    enable = true;
-    openFirewall = true;
-    allowDHCP = true;
-    mutableSettings = true;
-    settings = {
-      http.address = "0.0.0.0:0";
-      users = [
-        {
-          name = "mjallen";
-          password = "$2a$10$G07P7V1EnBQxWtMNGyfgTOTpAgr4d.uqYoG.cGSFCv9jQdiYWCsfq";
-        }
-      ];
-      dns = {
-        upstream_dns = [
-          "https://dns10.quad9.net/dns-query"
-          "1.1.1.1"
-          "8.8.8.8"
-        ];
-        bootstrap_dns = [
-          "9.9.9.10"
-          "149.112.112.10"
-          "2620:fe::10"
-          "2620:fe::fe:10"
-        ];
-        upstream_mode = "load_balance";
-        trusted_proxies = [
-          "127.0.0.0/8"
-          "::1/128"
-          "10.0.1.3"
-        ];
-        cache_optimistic = true;
-      };
-      dhcp = {
-        enabled = false;
-        interface_name = "end0";
-        local_domain_name = "lan";
-        dhcpv4 = {
-          gateway_ip = "10.0.1.1";
-          subnet_mask = "255.255.255.0";
-          range_start = "10.0.1.100";
-          range_end = "10.0.1.254";
-          lease_duration = 86400;
-          icmp_timeout_msec = 1000;
-        };
-        dhcpv6 = {
-          range_start = "2001::1";
-          lease_duration = 86400;
-          ra_slaac_only = false;
-          ra_allow_slaac = false;
-        };
-      };
-    };
-  };
-}
diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix
index 11eb870..a47920a 100755
--- a/systems/aarch64-linux/pi5/boot.nix
+++ b/systems/aarch64-linux/pi5/boot.nix
@@ -14,6 +14,16 @@
     #supportedFilesystems = lib.mkForce [ ];
   };
 
+
+  specialisation = {
+    "linux-rpi".configuration = {
+      boot = {
+        kernelPackages = lib.mkOverride 90 pkgs.${namespace}.linuxPackages_rpi5;
+        supportedFilesystems = lib.mkForce [ ];
+      };
+    };
+  };
+
   ${namespace}.hardware.raspberry-pi.config = {
     # extra-config = {
     #   armstub = "RPI_EFI.fd";
diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix
index 5d44044..5c6888d 100644
--- a/systems/aarch64-linux/pi5/default.nix
+++ b/systems/aarch64-linux/pi5/default.nix
@@ -8,18 +8,12 @@
 }:
 {
   imports = [
-    #    ./adguard.nix
     ./boot.nix
     ./sops.nix
   ];
 
   virtualisation.docker.enable = true;
 
-  #environment.systemPackages = with pkgs.${namespace}; [
-  #  ubootRaspberryPi5
-  #  ubootTools
-  #];
-
   ${namespace} = {
 
     # ###################################################