diff --git a/desktop/dev.nix b/desktop/dev.nix
index c8f8778..659bcbc 100644
--- a/desktop/dev.nix
+++ b/desktop/dev.nix
@@ -9,12 +9,12 @@
   environment.systemPackages = with pkgs; [
    (python3.withPackages(ps: with ps; [ pandas requests python-dotenv pip uv ]))
   nodejs
-  rpi-imager
+#  rpi-imager
   putty                   # SSH/Telnet client
   pkgs-unstable.windsurf  # Use windsurf from unstable packages
   ];
 
-programs.nix-ld.enable = true;
+  programs.nix-ld.enable = true;
 
   # Android Development
   programs.adb.enable = true;
diff --git a/desktop/plasma.nix b/desktop/plasma.nix
index 39914d7..99cee9b 100644
--- a/desktop/plasma.nix
+++ b/desktop/plasma.nix
@@ -35,7 +35,6 @@
       pinentry         # GUI pinentry for GPG
       tigervnc         # VNC client/server
       firefox          # Web browser
-      rustdesk
     ];
 
     # GNUPG Stuff 
diff --git a/flake.lock b/flake.lock
index 2fb97da..cd69a69 100644
--- a/flake.lock
+++ b/flake.lock
@@ -166,11 +166,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1761129162,
-        "narHash": "sha256-vJYlThaqdSYRKn1HcaMbkHeB95bXQwgG1ugrlSKQjHg=",
+        "lastModified": 1761869718,
+        "narHash": "sha256-jLfwwlPGpnGRAtVDyoGj9FgH2D9hWwyEu0yHkflG2EI=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "057695bc3f7de5e8841c15252fc51029590895e4",
+        "rev": "8e9add2afda58d233a75e4c5ce8503b24fa59ceb",
         "type": "github"
       },
       "original": {
@@ -353,11 +353,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1760958188,
-        "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
+        "lastModified": 1762179181,
+        "narHash": "sha256-T4+TNfXlF/gHbcNCC2HY7sMGBKgqNzyYeMBWmcbH7/o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
+        "rev": "256770618502d2eda892af3ae91da5e386ce9586",
         "type": "github"
       },
       "original": {
@@ -369,11 +369,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760878510,
-        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
+        "lastModified": 1761114652,
+        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
+        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
         "type": "github"
       },
       "original": {
@@ -385,11 +385,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1761114652,
-        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "lastModified": 1761907660,
+        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
         "type": "github"
       },
       "original": {
@@ -400,11 +400,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1761016216,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
+        "lastModified": 1761999846,
+        "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+        "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31",
         "type": "github"
       },
       "original": {
@@ -423,11 +423,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761078382,
-        "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=",
+        "lastModified": 1762115864,
+        "narHash": "sha256-KREKZiBAkAnqJC+jvY+vSbLlrg8j6DFEU7Lv+tgOlHI=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c",
+        "rev": "8e9e76efa3cc811c230512b40d8cfde06e40da5b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 6f6654e..1f179af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,6 @@
         specialArgs = commonSpecialArgs;
         modules = [
           home-manager.nixosModules.home-manager
-          hyprland.nixosModules.default
         ] ++ hardware ++ modules;
       };
       
@@ -51,31 +50,14 @@
         ./desktop/virtualization.nix
       ];
       
-      # Hyprland desktop modules (for transition)
-      hyprlandDesktopModules = [
-        ./systems/common.nix
-        ./users/jsutter.nix
-        ./desktop/hyprland.nix
-        ./desktop/dev.nix
-        ./desktop/office.nix
-        ./desktop/gaming.nix
-        ./desktop/media.nix
-        ./desktop/virtualization.nix
-      ];
     in {
     nixosConfigurations = {
       framework = mkSystem {
-        hardware = [ nixos-hardware.nixosModules.framework-16-7040-amd ];
+        hardware = [ nixos-hardware.nixosModules.framework-13-ai-300-amd ];
         modules = commonDesktopModules ++ [
           ./systems/framework.nix
         ];
       };
-      framework-hyprland = mkSystem {
-        hardware = [ nixos-hardware.nixosModules.framework-16-7040-amd ];
-        modules = hyprlandDesktopModules ++ [
-          ./systems/framework.nix
-        ];
-      };
       aurora = mkSystem {
         modules = commonDesktopModules ++ [
           ./systems/aurora.nix
@@ -92,14 +74,6 @@
           ./users/jsutter.nix
         ];
       };
-      skip01 = mkSystem {
-        modules = [
-          ./systems/common-headless.nix
-          ./systems/skip01.nix
-          ./users/jsutter.nix
-          ./servers/common.nix
-        ];
-      };
     };
   };
 }
diff --git a/systems/labrizor.nix b/systems/labrizor.nix
index f5cb2e0..34418ee 100644
--- a/systems/labrizor.nix
+++ b/systems/labrizor.nix
@@ -18,9 +18,9 @@
 #    rocm-opencl-runtime
 #  ];
 
-  networking.bridges = {
-    "br0" = {
-      interfaces = [ "eth0" ];
-    };
-  };
+#  networking.bridges = {
+#    "br0" = {
+#      interfaces = [ "eth0" ];
+#    };
+#  };
 }
diff --git a/users/jsutter.nix b/users/jsutter.nix
index 3c43f37..e218974 100644
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -14,7 +14,6 @@
       # GUI applications have been moved to appropriate desktop modules
       direnv        # Development environment management
       appimage-run  # System utility for AppImages
-      cloudflared   # Cloudflare tunnel CLI
     ];
   };