diff --git a/ext/doom/init.el b/ext/doom/init.el
index e45463c..833aaf5 100644
--- a/ext/doom/init.el
+++ b/ext/doom/init.el
@@ -31,7 +31,7 @@
        :ui
        ;;deft              ; notational velocity for Emacs
        doom                ; what makes DOOM look the way it does
-       doom-dashboard   ; a nifty splash screen for Emacs
+       ;; doom-dashboard   ; a nifty splash screen for Emacs
        doom-quit           ; DOOM quit-message prompts when you quit Emacs
        ;; (emoji +unicode) ; 🙂
        hl-todo             ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
diff --git a/flake.lock b/flake.lock
index fe21385..d4612fb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -277,9 +277,6 @@
     },
     "emacs-overlay": {
       "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -288,17 +285,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1730626539,
-        "narHash": "sha256-gAivT/gAHhzdRpB+4hBYhLBF51KIj+hvo9J9tbJ6VDU=",
+        "lastModified": 1741462424,
+        "narHash": "sha256-nZVbxj4JRfjaCwdvzHpmo8LfSX+roUuAs7A8o5cJ5hU=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "7cd35bfbe2fbb2906bc85803eab0bdc499b6f253",
+        "rev": "6e4d92e5c26dc81241d4c800531ad1f8ee68f213",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "7cd35bfbe2fbb2906bc85803eab0bdc499b6f253",
+        "rev": "6e4d92e5c26dc81241d4c800531ad1f8ee68f213",
         "type": "github"
       }
     },
@@ -673,15 +670,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1741393072,
-        "narHash": "sha256-+Su28oU1FBvptj1AO0geJP+BcIJghSVxaNFagvW5K2M=",
-        "owner": "nix-community",
+        "lastModified": 1739920383,
+        "narHash": "sha256-n5NYJvnQbIW3XbBohbQK4YfJ38GgyDWDu/XTw0FsuHs=",
+        "owner": "NovaViper",
         "repo": "home-manager",
-        "rev": "d2c014e1c73195d1958abec0c5ca6112b07b79da",
+        "rev": "fc592ef0edd0681c3f91a1083cef53ec630f1d5f",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "NovaViper",
+        "ref": "kde6-qt",
         "repo": "home-manager",
         "type": "github"
       }
@@ -1489,15 +1487,16 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1741392477,
-        "narHash": "sha256-6ySHuduGhlZBv1uxEOlOeHWDEkKuLQ/O63DI+ZRfAmg=",
-        "owner": "danth",
+        "lastModified": 1739742581,
+        "narHash": "sha256-0Ze86fzS6dzw/i0+egACKR7EGe9eoOriIHwKpTDQvTI=",
+        "owner": "brckd",
         "repo": "stylix",
-        "rev": "6eea250b10386be0fc23496d1039d76b3147680e",
+        "rev": "e3fe2c662862c2fbf09bfd9fc0556d0e4225298b",
         "type": "github"
       },
       "original": {
-        "owner": "danth",
+        "owner": "brckd",
+        "ref": "treewide/add-overlays-option",
         "repo": "stylix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 2e77c90..47eedc3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,12 +75,12 @@
       inputs.home-manager.follows = "home-manager";
     };
     home-manager = {
-      url = "github:nix-community/home-manager";
-      # url = "github:NovaViper/home-manager/kde6-qt"; # TODO Back to default after https://github.com/nix-community/home-manager/pull/6493
+      # url = "github:nix-community/home-manager";
+      url = "github:NovaViper/home-manager/kde6-qt"; # TODO Back to default after https://github.com/nix-community/home-manager/pull/6493
       inputs.nixpkgs.follows = "nixpkgs";
     };
     emacs-overlay = {
-      url = "github:nix-community/emacs-overlay/7cd35bfbe2fbb2906bc85803eab0bdc499b6f253";
+      url = "github:nix-community/emacs-overlay/6e4d92e5c26dc81241d4c800531ad1f8ee68f213";
       inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs-stable.follows = "nixpkgs-stable";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -128,8 +128,8 @@
       inputs.flake-compat.follows = "flake-compat";
     };
     stylix = {
-      url = "github:danth/stylix"; # TODO Switch to this once https://github.com/danth/stylix/pull/866 is merged
-      # url = "github:brckd/stylix/treewide/add-overlays-option";
+      # url = "github:danth/stylix"; # TODO Switch to this once https://github.com/danth/stylix/pull/866 is merged
+      url = "github:brckd/stylix/treewide/add-overlays-option";
       inputs.flake-compat.follows = "flake-compat";
       inputs.flake-utils.follows = "flake-utils";
       inputs.home-manager.follows = "home-manager";
@@ -196,7 +196,17 @@
           # "olm-3.2.16"
         ];
       };
-      pkgs = import nixpkgs {
+      pkgs' = (import nixpkgs { inherit config system overlays; }).applyPatches {
+        name = "nixpkgs-patched";
+        src = inputs.nixpkgs;
+        patches = [
+          (builtins.fetchurl {
+            url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/384669.patch";
+            sha256 = "sha256:0lnkxl83hlc4hsqv38ja8k4bwrylg1mkqrrmhj2cdqk3dk401ypb";
+          })
+        ];
+      };
+      pkgs = import pkgs' {
         inherit config system overlays;
       };
       lib = pkgs.lib;
diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix
index e4f27f3..6058f8e 100644
--- a/home-mods/shell/default.nix
+++ b/home-mods/shell/default.nix
@@ -10,7 +10,7 @@ let
   doomemacsSrc = builtins.fetchGit {
     url = "https://github.com/doomemacs/doomemacs";
     ref = "master";
-    rev = "56ce6cc284e8f4dd0cb0704dde6694a1b8e500ed";
+    rev = "8846d151814ebbf7fb90d9d5dd16cd737257408e";
   };
   neofetchThemesSrc = builtins.fetchGit {
     url = "https://github.com/Chick2D/neofetch-themes";
@@ -21,8 +21,8 @@ let
     with epkgs; [
       vterm
       treesit-grammars.with-all-grammars
-      inputs.nix-emacs-extra.packages."${system}".doom-dashboard
-      inputs.nix-emacs-extra.packages."${system}".ultra-scroll
+      # inputs.nix-emacs-extra.packages."${system}".doom-dashboard
+      # inputs.nix-emacs-extra.packages."${system}".ultra-scroll
     ]);
 in
 {
diff --git a/os-mods/ryzenapu/default.nix b/os-mods/ryzenapu/default.nix
index 8832390..f7e2878 100644
--- a/os-mods/ryzenapu/default.nix
+++ b/os-mods/ryzenapu/default.nix
@@ -17,9 +17,23 @@
       ${ryzenadj}/bin/ryzenadj --stapm-limit="$value" --fast-limit="$value" --slow-limit="$value" --tctl-temp=85
     '')
   ];
-
-  systemd = {
+  systemd = let 
+  tcl = "85";
+  coall = "1048561"; # 1048561 = 0x100000 - 15(mV) $ math "0x100000-15" # slight undervolt
+  defaults = "--tctl-temp=${tcl} --set-coall=${coall}";
+  in {
     services = {
+  	ryzenadj = {
+        enable = false;
+        description = "RyzenAdj Autoset";
+        serviceConfig = {
+          Type = "oneshot";
+          User = "root";
+          ExecStart = "${pkgs.ryzenadj}/bin/ryzenadj ${defaults}"; 
+        };
+        wantedBy = [ "multi-user.target" ];
+      };
+
       desktop-power-maximum-tdp = {
         description = "Change TDP to maximum TDP when on AC power";
         wantedBy = [ "ac.target" ];
@@ -33,7 +47,7 @@
         serviceConfig.Type = "oneshot";
         preStart = "sleep 2";
         script = ''
-          ryzenadj --stapm-limit=45000 --fast-limit=45000 --slow-limit=45000 --tctl-temp=85
+          ryzenadj --stapm-limit=50000 --slow-limit=54000 --fast-limit=55000 ${defaults}
         '';
       };
 
@@ -48,7 +62,7 @@
         serviceConfig.Type = "oneshot";
         preStart = "sleep 2";
         script = ''
-          ryzenadj --stapm-limit=10000 --fast-limit=10000 --slow-limit=10000 --tctl-temp=85
+          ryzenadj --stapm-limit=10000 --slow-limit=15000 --fast-limit=25000 ${defaults}
         '';
       };
 
diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix
index cdeda39..1e889b6 100644
--- a/systems/nixos-fw16/default.nix
+++ b/systems/nixos-fw16/default.nix
@@ -21,7 +21,7 @@
     ../../os-mods/desktop/printing.nix
     ../../os-mods/netdata/client.nix
     ../../os-mods/network
-    # ../../os-mods/ryzenapu
+    ../../os-mods/ryzenapu
     ../../os-mods/virt
     ../../users
     ./disks.nix
@@ -134,8 +134,8 @@
     # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos;
 
     # 6.14 rc wohooo
-    kernelPackages = pkgs.linuxPackages_cachyos-rc;
-    # kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc;
+    # kernelPackages = pkgs.linuxPackages_cachyos-rc;
+    kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc;
     # kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos;
     # kernelPackages = pkgs.linuxPackages_cachyos;
 
@@ -237,16 +237,6 @@
 
   systemd = {
     services = {
-      ryzenadj = {
-        enable = false;
-        description = "RyzenAdj Autoset";
-        serviceConfig = {
-          Type = "oneshot";
-          User = "root";
-          ExecStart = "${pkgs.ryzenadj}/bin/ryzenadj -f90 --set-coall=1048566"; # 1048566 = 0x100000 - 10(mV)
-        };
-        wantedBy = [ "multi-user.target" ];
-      };
 
       # Do not manage HID devices with powertop to prevent annoying keyboard/mouse sleeps
       # powertop.postStart = ''