diff --git a/flake.lock b/flake.lock
index 7d9b5de..4af7240 100644
--- a/flake.lock
+++ b/flake.lock
@@ -151,11 +151,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743711701,
-        "narHash": "sha256-8gNZoO5wAF/cArOqtjMh6dESs1xrTV4h9XFl5m/CHqA=",
+        "lastModified": 1744072099,
+        "narHash": "sha256-a5WYMu48IVhwS+FzpNfPvCfD/dYB9fuWWhT+EmlINrY=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "1e9e28d19c4f92a7f43c9ff5eabfab0e332e7f22",
+        "rev": "8db6da4c0a0c5763261dcfbf57311dbc5e52e6c9",
         "type": "github"
       },
       "original": {
@@ -708,11 +708,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743660830,
-        "narHash": "sha256-ezJqPIuB25iMJeugwHKWnB1DjMvrdpkrPxE3TCULjGk=",
+        "lastModified": 1743879910,
+        "narHash": "sha256-jAr345BODeDluX6DfO3TdY7pB77olVOcYFYjxz6rPxo=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "c7ade1c8fe2bdb70d38b3b9a97b874dcaf33b755",
+        "rev": "96a7fbb4a892696ff89d3d42fc743ab5d6714222",
         "type": "github"
       },
       "original": {
@@ -939,11 +939,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743306489,
-        "narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=",
+        "lastModified": 1743911143,
+        "narHash": "sha256-4j4JPwr0TXHH4ZyorXN5yIcmqIQr0WYacsuPA4ktONo=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d",
+        "rev": "a36f6a7148aec2c77d78e4466215cceb2f5f4bfb",
         "type": "github"
       },
       "original": {
@@ -1024,11 +1024,11 @@
         "nixos-unstable": "nixos-unstable"
       },
       "locked": {
-        "lastModified": 1743642538,
-        "narHash": "sha256-3XqdzKyVmpD2a6ogHeEOMjE/k+QrZRaw25TphLDDNb4=",
+        "lastModified": 1743988375,
+        "narHash": "sha256-aSgNesq082wmJU/CAfy+jTYffI0Vq+O6OwOflZSOOtc=",
         "owner": "nix-community",
         "repo": "nixos-images",
-        "rev": "f14aab87fcac7a8e00ff5af83bc8645154d3919a",
+        "rev": "2dd67fe0898826b2f64fc6777f133a2594b9c0d3",
         "type": "github"
       },
       "original": {
@@ -1039,10 +1039,10 @@
     },
     "nixos-stable": {
       "locked": {
-        "lastModified": 1743576891,
-        "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
+        "lastModified": 1743813633,
+        "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
         "ref": "nixos-24.11",
-        "rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
+        "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
         "shallow": true,
         "type": "git",
         "url": "https://github.com/NixOS/nixpkgs"
@@ -1056,10 +1056,10 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1743568003,
-        "narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=",
+        "lastModified": 1743814133,
+        "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=",
         "ref": "nixpkgs-unstable",
-        "rev": "b7ba7f9f45c5cd0d8625e9e217c28f8eb6a19a76",
+        "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b",
         "shallow": true,
         "type": "git",
         "url": "https://github.com/NixOS/nixpkgs"
@@ -1133,11 +1133,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1743576891,
-        "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
+        "lastModified": 1743975612,
+        "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
+        "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928",
         "type": "github"
       },
       "original": {
@@ -1181,11 +1181,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1743583204,
-        "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
+        "lastModified": 1743964447,
+        "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
+        "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8",
         "type": "github"
       },
       "original": {
@@ -1224,11 +1224,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743719676,
-        "narHash": "sha256-8m//1A4NY/6DsWCicCr6xqFZ+H8ZiZ/qbm67gv6nhNg=",
+        "lastModified": 1744108015,
+        "narHash": "sha256-v0dibSQd9dZ5mL9WF7uYVfRv2vRpeiVU8Z66m0ptACw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "38a990eb85757350938e08a7ee6cd5ca0bd9a9e8",
+        "rev": "4554f5ad4e3cb4c37610361e16f597dab6d43ce4",
         "type": "github"
       },
       "original": {
@@ -1638,11 +1638,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743677901,
-        "narHash": "sha256-eWZln+k+L/VHO69tUTzEmgeDWNQNKIpSUa9nqQgBrSE=",
+        "lastModified": 1743748085,
+        "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "57dabe2a6255bd6165b2437ff6c2d1f6ee78421a",
+        "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
         "type": "github"
       },
       "original": {
@@ -1694,11 +1694,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1743696590,
-        "narHash": "sha256-ydcWFtnW8rzol6Dpp8wplJZ025nbaEGjr1gYwrr2Hog=",
+        "lastModified": 1743849404,
+        "narHash": "sha256-Yr6L33A9l6DW4IGBXKpPCUcA69XATxrYanwOBupSdPs=",
         "owner": "winapps-org",
         "repo": "winapps",
-        "rev": "e5929a134db28cbc28de9e349795f0213798be06",
+        "rev": "f6d56fdf50f3b801d03f8dca2cca2246485cb793",
         "type": "github"
       },
       "original": {
diff --git a/os-mods/amdgpu/default.nix b/os-mods/amdgpu/default.nix
index e5a9e36..e33d2a8 100644
--- a/os-mods/amdgpu/default.nix
+++ b/os-mods/amdgpu/default.nix
@@ -18,9 +18,9 @@
   ];
 
   chaotic.mesa-git = {
-    enable = false;
+    enable = true;
     extraPackages = with pkgs; [
-      mesa_git.openclmesa
+      mesa_git.opencl
       libva-vdpau-driver
       obs-studio-plugins.obs-vaapi # TODO check if obs is enabled
       gst_all_1.gstreamer
diff --git a/os-mods/desktop/gaming.nix b/os-mods/desktop/gaming.nix
index aa4c92e..9d57305 100644
--- a/os-mods/desktop/gaming.nix
+++ b/os-mods/desktop/gaming.nix
@@ -54,7 +54,7 @@
   ];
 
   # hardware.xone.enable = true; # USB only, not needed ATM, and incompatible with recent kernels, bluetooth FTW
-  # hardware.xpadneo.enable = true; # Wireless # Needed to up to nixos-small to fix
+  hardware.xpadneo.enable = true; # Wireless # Needed to up to nixos-small to fix
   hardware.bluetooth.enable = true;
   hardware.steam-hardware.enable = true;
 }
diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix
index 488590c..d7bc3b5 100644
--- a/systems/nixos-fw16/default.nix
+++ b/systems/nixos-fw16/default.nix
@@ -212,6 +212,10 @@
       192.168.0.180   vewasmb.oekonzept.de
       192.168.0.91    puppet.oekonzept.de
       100.64.0.1   oekonzept.net
+      100.64.0.1   draw.oekonzept.net
+      100.64.0.1   bw.oekonzept.net
+      100.64.0.1   passwords.oekonzept.net
+      100.64.0.1   bitwarden.oekonzept.net
       100.64.0.1   camt.oekonzept.net
       100.64.0.1   camt-cbg.oekonzept.net
       100.64.0.1   camt-eth.oekonzept.net