diff --git a/flake.nix b/flake.nix
index 602b9a0..ba8b8ec 100755
--- a/flake.nix
+++ b/flake.nix
@@ -480,6 +480,8 @@
           specialArgs = inputs;
           system = "aarch64-linux";
           modules = [
+            ./base/base-nogui
+            ./base/base-gui
             pi5-impermanence.nixosModules.impermanence
             pi5-sops-nix.nixosModules.sops
             ./hosts/pi5/configuration.nix
@@ -526,6 +528,7 @@
           };
           system = "aarch64-linux";
           modules = [
+            ./base/base-nogui
             pi4-disko.nixosModules.disko
             ./share/disko/pi-uefi-disko.nix
             pi4-nixos-hardware.nixosModules.raspberry-pi-4
diff --git a/hosts/pi4/configuration.nix b/hosts/pi4/configuration.nix
index 48c9ec2..a53c655 100755
--- a/hosts/pi4/configuration.nix
+++ b/hosts/pi4/configuration.nix
@@ -5,7 +5,7 @@
 { config, pkgs, ... }:
 let
   user = "matt";
-  password = config.sops.secrets."desktop/matt_password".path;
+  password = config.sops.secrets."pi4/matt-password".path;
 in
 {
   imports = [
@@ -16,7 +16,6 @@ in
     ./networking.nix
     ./pi4-hw.nix
     ./sops.nix
-    ../default.nix
   ];
 
   nix = {
diff --git a/hosts/pi5/configuration.nix b/hosts/pi5/configuration.nix
index 26fa76e..f6a47cf 100755
--- a/hosts/pi5/configuration.nix
+++ b/hosts/pi5/configuration.nix
@@ -5,7 +5,7 @@
 { config, lib, pkgs, ... }:
 let
   user = "matt";
-  password = config.sops.secrets."desktop/matt_password".path;
+  password = config.sops.secrets."pi5/matt-password".path;
   kernelBundle = pkgs.linuxAndFirmware.v6_6_31;
 in
 {
@@ -16,8 +16,6 @@ in
     ./networking.nix
     ./services.nix
     ./sops.nix
-    ../default.nix
-#    ../../modules/desktop-environments/cosmic/default.nix
   ];
 
   # Enable nix flakes and nix-command tools
diff --git a/test.sh b/test.sh
deleted file mode 100755
index e99d085..0000000
--- a/test.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-      #!/usr/bin/env bash
-      
-      # Pull latest changes if in a git repo
-      if [ -d .git ]; then
-        git pull || echo "Warning: Could not pull latest changes"
-      fi
-      
-      echo "Starting build of matt-nixos at $(date)"
-      if nix flake update desktop-nixpkgs desktop-chaotic desktop-home-manager desktop-impermanence desktop-lanzaboote desktop-nixos-hardware desktop-sops-nix desktop-steam-rom-manager nixpkgs-unstable nixpkgs-stable nix-darwin; then
-        echo "matt-nixos flake updated successfully at $(date)"
-      else
-        echo "matt-nixos failed to build at $(date)"
-      fi
-      if nix build .\#nixosConfigurations.matt-nixos.config.system.build.toplevel --no-link; then
-        echo "matt-nixos built successfully at $(date)"
-        git add .
-        git commit -m "Desktop Updates $(date)"
-      else
-        echo "matt-nixos failed to build at $(date)"
-        git reset --hard
-      fi
-      
-      echo "Starting build of steamdeck at $(date)"
-      if nix flake update steamdeck-nixpkgs steamdeck-chaotic steamdeck-home-manager steamdeck-impermanence steamdeck-jovian steamdeck-lanzaboote steamdeck-nixos-hardware steamdeck-sops-nix steamdeck-steam-rom-manager; then
-        echo "steamdeck flake updated successfully at $(date)"
-      else
-        echo "steamdeck flake failed to update at $(date)"
-        git reset --hard
-      fi
-      if nix build .\#nixosConfigurations.steamdeck.config.system.build.toplevel --no-link; then
-        echo "steamdeck built successfully at $(date)"
-        git add .
-        git commit -m "Dteamdeck Updates $(date)"
-      else
-        echo "steamdeck failed to build at $(date)"
-        git reset --hard
-      fi
-      
-      echo "Starting build of pi4 at $(date)"
-      if nix flake update pi4-nixpkgs pi4-home-manager pi4-impermanence pi4-sops-nix pi4-nixos-hardware pi4-nixos-raspberrypi pi4-disko; then
-        echo "pi4 flake updated successfully at $(date)"
-      else
-        echo "pif flake failed to update at $(date)"
-      fi
-      if nix build .\#nixosConfigurations.pi4.config.system.build.toplevel --no-link --impure; then
-        echo "pi4 built successfully at $(date)"
-        git add .
-        git commit -m "Pi4 Updates $(date)"
-      else
-        echo "pi4 failed to build at $(date)"
-        git reset --hard
-      fi
-      
-      echo "Starting build of pi5 at $(date)"
-      if nix flake update pi5-nixpkgs pi5-home-manager pi5-impermanence pi5-nixos-hardware pi5-sops-nix nixos-raspberrypi; then
-        echo "pi5 flake updated successfully at $(date)"
-      else
-        echo "pi5 flake failed to update at $(date)"
-      fi
-      if nix build .\#nixosConfigurations.pi5.config.system.build.toplevel --no-link; then
-        echo "pi5 built successfully at $(date)"
-        git add .
-        git commit -m "Pi5 Updates $(date)"
-      else
-        echo "pi5 failed to build at $(date)"
-        git reset --hard
-      fi
-      
-      echo "Starting build of jallen-nas at $(date)"
-      if nix flake update nas-nixpkgs nas-authentik-nix nas-cosmic nas-crowdsec nas-home-manager nas-impermanence nas-lanzaboote nas-nixos-hardware nas-sops-nix; then
-        echo "jallen-nas flake updated successfully at $(date)"
-      else
-        echo "jallen-nas flake failed to update at $(date)"
-      fi
-      export NIXPKGS_ALLOW_UNFREE=1
-      if nix build .\#nixosConfigurations.jallen-nas.config.system.build.toplevel --no-link --impure; then
-        echo "jallen-nas built successfully at $(date)"
-        git add .
-        git commit -m "Jallen-NAS Updates $(date)"
-      else
-        echo "jallen-nas failed to build at $(date)"
-        git reset --hard
-      fi