diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix
index d457d11..d4c6d9d 100644
--- a/modules/home/home/default.nix
+++ b/modules/home/home/default.nix
@@ -4,10 +4,12 @@
   pkgs,
   namespace,
   hasDestopEnvironment ? true,
+  system,
   ...
 }:
 let
   inherit (lib.${namespace}) enabled;
+  isArm = ("aarch64-linux" == system) || ("aarch64-darwin" == system);
   # Non-login / system accounts (root, nixos installer, etc.) should not get
   # desktop packages, tmux, nh, kdeconnect, nextcloud-client, etc.
   # Detect them by username so individual host home files are not needed.
@@ -40,7 +42,6 @@ in
             nix-prefetch-scripts
             nixfmt
             pciutils
-            proton-pass
             proton-pass-cli
             proton-vpn-cli
             protonvpn-gui
@@ -67,7 +68,14 @@ in
                 mission-center
                 parted
                 vesktop
-              ]
+              ] ++ (
+                if isArm then 
+                  [ ]
+                else 
+                  [
+                    proton-pass
+                  ]
+              )
             else
               [ ]
           )
diff --git a/modules/nixos/gaming/default.nix b/modules/nixos/gaming/default.nix
index 56161a0..58fd34c 100755
--- a/modules/nixos/gaming/default.nix
+++ b/modules/nixos/gaming/default.nix
@@ -92,7 +92,7 @@ in
     # Hardware configs
     hardware = {
       # Xbox controllers
-      xpadneo.enable = false;
+      xone.enable = false;
 
       # Steam udev rules for remote play
       steam-hardware.enable = true;
diff --git a/packages/raspberrypi/ffmpeg-rpi/version.json b/packages/raspberrypi/ffmpeg-rpi/version.json
index 1d35ad6..130de70 100644
--- a/packages/raspberrypi/ffmpeg-rpi/version.json
+++ b/packages/raspberrypi/ffmpeg-rpi/version.json
@@ -10,7 +10,7 @@
       "owner": "jc-kynesim",
       "repo": "rpi-ffmpeg",
       "rev": "efa6cec759d7c692808a8cc43d610fe6b9fadfe1",
-      "hash": "sha256-2lOoKvXq5Dk84+d4lK/nVd0bmTP0hHTkHjJUR7x5hu0="
+      "hash": "sha256-ceRibwtV4Cmx+TiQ6N7VVx18E7YzocnrYbw1cDBC1AA="
     }
   }
 }
diff --git a/packages/raspberrypi/linux-rpi/version.json b/packages/raspberrypi/linux-rpi/version.json
index 44c2e06..9ce9e7a 100644
--- a/packages/raspberrypi/linux-rpi/version.json
+++ b/packages/raspberrypi/linux-rpi/version.json
@@ -25,12 +25,12 @@
     },
     "unstable": {
       "variables": {
-        "modDirVersion": "7.0.0-rc5"
+        "modDirVersion": "7.0.0-rc6"
       },
       "sources": {
         "unstable": {
-          "rev": "a7bc0f8cb48699767951c51872b90e0f9b7e643d",
-          "hash": "sha256-CxoPVxTSAzz1f5/ppfmJAs79T+GLuzLg4K+66rF7fXo="
+          "rev": "cab660d9a1cbe0098db32e660fadb051b5c7fc12",
+          "hash": "sha256-AAgvct6nGxZcCjkaS8fd/WYR22pj3mJheAj87ivovDE="
         }
       }
     }
diff --git a/packages/raspberrypi/raspberryPiWirelessFirmware/version.json b/packages/raspberrypi/raspberryPiWirelessFirmware/version.json
index 56aaaef..a14dbae 100644
--- a/packages/raspberrypi/raspberryPiWirelessFirmware/version.json
+++ b/packages/raspberrypi/raspberryPiWirelessFirmware/version.json
@@ -16,8 +16,8 @@
       "owner": "RPi-Distro",
       "repo": "firmware-nonfree",
       "branch": "trixie",
-      "rev": "40dea60e27078fac57a3fed51010e2c26865d49b",
-      "hash": "sha256-yXKzrkr7zdw/ba8GEi0r+XjnZEsQ59LPEuXj0HaKwxU="
+      "rev": "9794282eb9f4a2de1f23b41a738926740e975d83",
+      "hash": "sha256-OtA8yHvfusGP/ucf8Exzi+nSUmNoYp10u+luC2gbNZc="
     }
   }
 }
diff --git a/packages/raspberrypi/raspberrypi-utils/default.nix b/packages/raspberrypi/raspberrypi-utils/default.nix
index 5188ba2..4c8880a 100644
--- a/packages/raspberrypi/raspberrypi-utils/default.nix
+++ b/packages/raspberrypi/raspberrypi-utils/default.nix
@@ -5,6 +5,7 @@
   stdenv,
   cmake,
   dtc,
+  ncurses,
   namespace,
   pkgs,
 }:
@@ -26,7 +27,10 @@ stdenv.mkDerivation (_finalAttrs: {
     dtc # dtmerge depends on libfdt
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    ncurses
+  ];
 
   meta = with lib; {
     description = "A collection of scripts and simple applications for Raspberry Pi hardware";
diff --git a/packages/raspberrypi/raspberrypi-utils/version.json b/packages/raspberrypi/raspberrypi-utils/version.json
index 139d37e..dccb483 100644
--- a/packages/raspberrypi/raspberrypi-utils/version.json
+++ b/packages/raspberrypi/raspberrypi-utils/version.json
@@ -5,8 +5,8 @@
       "fetcher": "github",
       "owner": "raspberrypi",
       "repo": "utils",
-      "rev": "60ea0df9b7a43b4198c0def6355b600eb2cfbfb1",
-      "hash": "sha256-6librul3fq+QASZPGB3uGFMNEM1jn5IQN+yqLieBMJA="
+      "rev": "0504cf3ba3eb31fd00ae8df4358b48d700ffcd16",
+      "hash": "sha256-sPt/i2+IAs+a2nkIcbNAUrBMpJuRoBD9kU86RfIarxQ="
     }
   }
 }
diff --git a/packages/raspberrypi/raspberrypifw/version.json b/packages/raspberrypi/raspberrypifw/version.json
index a99d6aa..7dc2b99 100644
--- a/packages/raspberrypi/raspberrypifw/version.json
+++ b/packages/raspberrypi/raspberrypifw/version.json
@@ -16,8 +16,8 @@
       "owner": "raspberrypi",
       "repo": "firmware",
       "branch": "next",
-      "rev": "94a0176136cbb024858cf8debd547f3f233021b7",
-      "hash": "sha256-aVuAcRQl45/XjPBmEVaok8dc0sEwesmAv722kKEGCeI="
+      "rev": "81ecd84bed911f69e8116939ba02e53d5b53e532",
+      "hash": "sha256-OiqqGyCJWX2Ys78ptphA4lwFFb0xX2B+crcGZrJOxVY="
     }
   }
 }
diff --git a/systems/aarch64-linux/macbook-pro-nixos/default.nix b/systems/aarch64-linux/macbook-pro-nixos/default.nix
index 0b96e34..3a52dfa 100755
--- a/systems/aarch64-linux/macbook-pro-nixos/default.nix
+++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix
@@ -16,6 +16,8 @@
     ./services.nix
   ];
 
+  hardware.xone.enable = true;
+
   nix.settings.extra-platforms = [ "x86_64-linux" ];
   boot.binfmt.emulatedSystems = [ "x86_64-linux" ];