diff --git a/common.nix b/common.nix
index 066d2e1..fc110fd 100644
--- a/common.nix
+++ b/common.nix
@@ -102,7 +102,8 @@ with builtins;
 
   security.rtkit.enable = true;
 
-  users.users.jade = {
+
+users.users.jade = {
     isNormalUser = true;
     extraGroups = [ "wheel" "input" "uinput" "libvirtd" "adbusers" "dialout" "plugdev" "wireshark" ];
     packages = [
diff --git a/flake.nix b/flake.nix
index 7ae3086..a1f7382 100644
--- a/flake.nix
+++ b/flake.nix
@@ -79,6 +79,40 @@
           nixos-hardware.nixosModules.apple-t2
         ];
       };
+      schrottserver = nixpkgs-stable.lib.nixosSystem {
+        specialArgs = {
+          inherit inputs;
+        };
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/schrottserver/configuration.nix
+          home-manager.nixosModules.home-manager {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.jade = { nixosConfig, pkgs, ... }: {
+              home.sessionVariables.TZ = nixosConfig.time.timeZone;
+              home.stateVersion = "${nixosConfig.system.stateVersion}";
+            };
+          }
+        ];
+      };
+      katzencafe = nixpkgs-stable.lib.nixosSystem {
+        specialArgs = {
+          inherit inputs;
+        };
+        system = "aarch64-linux";
+        modules = [
+          ./hosts/katzencafe/configuration.nix
+          home-manager.nixosModules.home-manager {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.jade = { nixosConfig, pkgs, ... }: {
+              home.sessionVariables.TZ = nixosConfig.time.timeZone;
+              home.stateVersion = "${nixosConfig.system.stateVersion}";
+            };
+          }
+        ];
+      };
     };
   };
 }
diff --git a/hosts/catbook-j/hardware-configuration.nix b/hosts/catbook-j/hardware-configuration.nix
index 4124bce..38a5aa6 100644
--- a/hosts/catbook-j/hardware-configuration.nix
+++ b/hosts/catbook-j/hardware-configuration.nix
@@ -40,7 +40,7 @@
 
   swapDevices = [{
     device = "/swap/swapfile";
-    size = (1024 * 24);
+    size = (1024 * 12);
   }];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/justfile b/justfile
index 2beea83..f68615b 100644
--- a/justfile
+++ b/justfile
@@ -1,8 +1,8 @@
-test:
-	sudo nixos-rebuild test --flake . --impure
-
 build: 
 	sudo nixos-rebuild switch --flake . --impure
 
+test:
+	sudo nixos-rebuild test --flake . --impure
+
 update:
-	nix flake update --commit-lock-file
+	nix flake update --commit-lock-file
\ No newline at end of file
diff --git a/modules/desktop/evremap.nix b/modules/desktop/evremap.nix
index dc9be06..183647c 100644
--- a/modules/desktop/evremap.nix
+++ b/modules/desktop/evremap.nix
@@ -21,8 +21,5 @@ in {
   systemd.services.evremap = {
     script = "${evremap}/bin/evremap remap ${../../other/remaps-${config.networking.hostName}.toml}";
     wantedBy = [ "multi-user.target" ];
-    unitConfig = {
-      Restart = "on-failure";
-    };
   };
 }
diff --git a/modules/desktop/gaming.nix b/modules/desktop/gaming.nix
index ff11744..79e262a 100644
--- a/modules/desktop/gaming.nix
+++ b/modules/desktop/gaming.nix
@@ -7,6 +7,9 @@ in with lib; {
     enable = mkEnableOption "Enable gaming stuff";
   };
   config = mkIf cfg.enable {
+    #nixpkgs.overlays = [
+      #(import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).overlay
+    #];
     programs.steam.enable = true;
     home-manager.users.jade = { pkgs, ... }: {
       home.packages = with pkgs; [
diff --git a/modules/desktop/polybar.nix b/modules/desktop/polybar.nix
index a989ac9..d50424c 100644
--- a/modules/desktop/polybar.nix
+++ b/modules/desktop/polybar.nix
@@ -87,54 +87,41 @@
           "network-base" = {
             type = "internal/network";
             interval = 5;
-            format-connected = "<ramp-signal> <label-connected>";
+            format-connected = "<label-connected>";
             format-disconnected = "<label-disconnected>";
-            label-disconnected = "󰣼";
-            label-disconnected-foreground = "#d65d0e";
-            ramp.signal = [ "󰣾" "󰣴" "󰣶" "󰣸" "󰣺" ];
-            ramp-signal-foreground = "#d65d0e";
-            ramp-signal-foreground-0 = "#cc241d";
-            ramp-signal-foreground-4 = "#bdae93";
+            label-disconnected = "%{F#F0C674}%ifname%%{F#707880} disconnected";
           };
 
           "module/wlan" = {
             "inherit" = "network-base";
             interface-type = "wireless";
-            label-connected = "%{F#F0C674}%{F-} %local_ip%";
+            label-connected = "%{F#F0C674}%ifname%%{F-} %essid% %local_ip%";
           };
 
           "module/battery" = {
             type = "internal/battery";
             poll-interval = 1;
+            full-at = 96;
             battery = "BAT0";
             adapter = "ADP1";
-            time-format = "%H%{F#7c6f64}:%{F#d5c4a1}%M";
-            label-charging = "%{F#98971a}󰚥 %{F#ebdbb2}%percentage%%%{F#d5c4a1} %time%";
-            format-charging = "<ramp-capacity> <label-charging>";
-            label-discharging = "%percentage%%%{F#bdae93} %time%";
+            time-format = "%H:%M";
+            label-charging = "%percentage%% %time%";
+            format-charging = "<ramp-capacity> 󰚥 <label-charging>";
+            label-discharging = "%percentage%% %time%";
             format-discharging = "<ramp-capacity> <label-discharging>";
-            label-full = "%{F#d65d0e}󰁹%{F#ebdbb2} %percentage%%";
-            format-full = "<label-full>";
-            label-low = "%{F#d65d0e}󰂎%{F#ebdbb2} %percentage%%";
-            format-low = "<label-low>";
+            label-full = "%percentage%%";
+            format-full = "󰁹 <label-full>";
+            label-low = "%percentage%%";
+            format-low = "󰂎 <label-low>";
             ramp.capacity = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
-            ramp-capacity-foreground = "#d65d0e";
-
-            ramp-capacity-foreground-0 = "#cc241d";
-            ramp-capacity-foreground-1 = "#cc241d";
-            ramp-capacity-foreground-2 = "#cc241d";
-
-            ramp-capacity-foreground-7 = "#bdae93";
-            ramp-capacity-foreground-8 = "#bdae93";
-            ramp-capacity-foreground-9 = "#bdae93";
           };
 
           "module/date" = {
             type = "internal/date";
             interval = 1;
-            date = "%Y%{F#7c6f64}-%{F#ebdbb2}%m%{F#7c6f64}-%{F#ebdbb2}%d";
-            time = "%H%{F#7c6f64}:%{F#ebdbb2}%M%{F#7c6f64}:%{F#ebdbb2}%S";
-            label = "%{F#d65d0e}󰃭%{F#ebdbb2} %date% %{F#d65d0e}󱑌%{F#ebdbb2} %time%";
+            date = "%Y-%m-%d %H:%M:%S";
+            label = "%date%";
+            label-foreground = "\${colors.foreground}";
           };
 
           "settings" = {
diff --git a/other/scripts/dispatcher.nu b/other/scripts/dispatcher.nu
index 30cc91b..f4e9f71 100755
--- a/other/scripts/dispatcher.nu
+++ b/other/scripts/dispatcher.nu
@@ -6,7 +6,7 @@ def main [
 
   let currentnet = ( 
     nmcli -m tabular connection show --active
-    | from ssv
+    | detect columns
     | first
     | get name
     );