diff --git a/flake.nix b/flake.nix
index 24f9efa..a47a42f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,7 +81,6 @@
           name = "patched-nixpkgs-unstable";
           src = nixpkgs-unstable-raw;
           patches = [
-            ./nixpkgs-patches/0001-handheld-daemon-1.1.0-2.6.2.patch
           ];
         };
         nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix
index 13ad8f8..f8e13d9 100755
--- a/machines/WinMax2/configuration.nix
+++ b/machines/WinMax2/configuration.nix
@@ -49,8 +49,17 @@
   '';
 
   services.handheld-daemon = {
+    package = pkgs.handheld-daemon.overridePythonAttrs rec {
+      src = pkgs.fetchFromGitHub {
+        owner = "hhd-dev";
+        repo = "hhd";
+        rev = "v${version}";
+        hash = "sha256-Ujbou+f/EvHyqpp3FCNqIyZiCEFxSeQfflR3JmRxWFc=";
+      };
+      version = "1.3.13";
+    };
     enable = true;
-    user = "toast";
+    user = "root";
   };
 
   # Allow unfree packages
diff --git a/nixpkgs-patches/0001-handheld-daemon-1.1.0-2.6.2.patch b/nixpkgs-patches/0001-handheld-daemon-1.1.0-2.6.2.patch
deleted file mode 100644
index 278be1f..0000000
--- a/nixpkgs-patches/0001-handheld-daemon-1.1.0-2.6.2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d9e4af9ae8ed30a1ab860915c5c0ff9ae0c16dc1 Mon Sep 17 00:00:00 2001
-From: Toast <39011842+toast003@users.noreply.github.com>
-Date: Fri, 12 Apr 2024 13:32:24 +0200
-Subject: [PATCH 1/2] handheld-daemon: 1.1.0 -> 2.6.2
-
----
- pkgs/by-name/ha/handheld-daemon/package.nix | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
-index bb0c9d65bfe19d..b5f25f339ffb60 100644
---- a/pkgs/by-name/ha/handheld-daemon/package.nix
-+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
-@@ -8,14 +8,14 @@
- }:
- python3.pkgs.buildPythonApplication rec {
-   pname = "handheld-daemon";
--  version = "1.1.0";
-+  version = "2.6.2";
-   pyproject = true;
- 
-   src = fetchFromGitHub {
-     owner = "hhd-dev";
-     repo = "hhd";
-     rev = "v${version}";
--    hash = "sha256-ovLC1BQ98jUaDEMPBzWma4TYSzTF+yE/cMemFdJmqlE=";
-+    hash = "sha256-fsH8H6ZhiguOWI2t79GnxqAmqL/1m06RQzs+k8bUWcU=";
-   };
- 
-   propagatedBuildInputs = with python3.pkgs; [
-@@ -26,6 +26,7 @@ python3.pkgs.buildPythonApplication rec {
-     rich
-     setuptools
-     toybox
-+    xlib
-   ];
- 
-   # This package doesn't have upstream tests.
-
-From 2a8d54c511bda43bea18d35d2c08f224f3352a18 Mon Sep 17 00:00:00 2001
-From: Toast <39011842+toast003@users.noreply.github.com>
-Date: Sat, 13 Apr 2024 15:42:25 +0200
-Subject: [PATCH 2/2] handheld-daemon: update license
-
----
- pkgs/by-name/ha/handheld-daemon/package.nix | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
-index b5f25f339ffb60..f0ce6e9648e3e8 100644
---- a/pkgs/by-name/ha/handheld-daemon/package.nix
-+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
-@@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec {
-     homepage = "https://github.com/hhd-dev/hhd/";
-     description = "Linux support for handheld gaming devices like the Legion Go, ROG Ally, and GPD Win";
-     platforms = platforms.linux;
--    license = licenses.mit;
-+    license = licenses.gpl3Only;
-     maintainers = with maintainers; [ appsforartists ];
-     mainProgram = "hhd";
-   };
diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index b370073..8af3482 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -48,11 +48,6 @@
   # Set up localisation
   i18n = {
     defaultLocale = "en_US.UTF-8";
-    supportedLocales = [
-      "es_US.UTF-8/UTF-8"
-      "es_ES.UTF-8/UTF-8"
-      "en_US.UTF-8/UTF-8"
-    ];
     extraLocaleSettings = {
       LC_NUMERIC = "es_ES.UTF-8";
       # am/pm is nice but mm/dd/yy is yucky