diff --git a/flake.lock b/flake.lock
index d6dfadc..edfeb71 100755
--- a/flake.lock
+++ b/flake.lock
@@ -294,11 +294,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754842705,
-        "narHash": "sha256-2vvncPLsBWV6dRM5LfGHMGYZ+vzqRDqSPBzxPAS0R/A=",
+        "lastModified": 1754886238,
+        "narHash": "sha256-LTQomWOwG70lZR+78ZYSZ9sYELWNq3HJ7/tdHzfif/s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "91586008a23c01cc32894ee187dca8c0a7bd20a4",
+        "rev": "0d492b89d1993579e63b9dbdaed17fd7824834da",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e6e69a1..03d8cba 100755
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # walker = {
+    #   url = "github:abenz1267/walker";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
+
     # hyprdots = {
     #  url = "github:JaKooLit/Hyprland-Dots";
     #  flake = false;
@@ -87,8 +92,8 @@
           specialArgs = { inherit inputs; };
           modules = [
             inputs.stylix.nixosModules.stylix
-            ./system/default.nix
             lanzaboote.nixosModules.lanzaboote
+            ./system/default.nix
             (
               { pkgs, lib, ... }:
               {
@@ -119,7 +124,9 @@
           inherit pkgs;
           extraSpecialArgs = { inherit inputs; };
           modules = [
+            # inputs.walker.homeManagerModules.default
             inputs.hyprshell.homeManagerModules.default
+            inputs.stylix.homeModules.stylix
             ./home/default.nix
           ];
         };
diff --git a/home/btop.nix b/home/btop.nix
new file mode 100644
index 0000000..a26004e
--- /dev/null
+++ b/home/btop.nix
@@ -0,0 +1,9 @@
+{ pkgs, ...}:
+
+{
+  programs.btop = {
+    enable = true;
+    # color_theme = "tokyo-night";
+    # theme_background = false;
+  };
+}
\ No newline at end of file
diff --git a/home/default.nix b/home/default.nix
index e55cf7c..d2a1b35 100755
--- a/home/default.nix
+++ b/home/default.nix
@@ -24,7 +24,8 @@
     # ./dconf.nix
     # ./quickshell.nix
     # ./hyprpanel.nix
-    ./hyprpanel3.nix
+    ./hyprpanel2.nix
+    ./wofi.nix
     ./hyprpaper.nix
     ./git.nix
     ./hyprland.nix
diff --git a/home/gtk.nix b/home/gtk.nix
index 1b0e6aa..a44774c 100644
--- a/home/gtk.nix
+++ b/home/gtk.nix
@@ -9,14 +9,14 @@
 {
   gtk = {
     enable = true;
-    theme = {
-      name = "Adwaita-dark";
-      package = pkgs.gnome-themes-extra;
-    };
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
+    # theme = {
+    #   name = "Adwaita-dark";
+    #   package = pkgs.gnome-themes-extra;
+    # };
+    # iconTheme = {
+    #   name = "Papirus-Dark";
+    #   package = pkgs.papirus-icon-theme;
+    # };
   };
 
   # Make Qt apps follow dark mode
diff --git a/home/home.nix b/home/home.nix
index 5a3828e..174d036 100755
--- a/home/home.nix
+++ b/home/home.nix
@@ -12,6 +12,16 @@
 
   wayland.windowManager.hyprland.enable = true;
 
+  stylix = {
+    enable = true;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-storm.yaml";
+    targets = {
+      btop.enable = true;
+      kitty.enable = true;
+      # kitty.enable = true;
+    };
+  };
+
   programs.command-not-found.enable = false;
 
   # Let Home Manager install and manage itself.
diff --git a/home/hyprland.nix b/home/hyprland.nix
index aa68419..2f1b714 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -52,6 +52,8 @@
         # Dwindle
         "$mod, p, layoutmsg, togglesplit"
         "$mod, 0, layoutmsg, swapsplit"
+        "$mod, o, layoutmsg, movetoroot"
+
         "$mod, a, layoutmsg, preselect l"
         "$mod SHIFT, a, layoutmsg, preselect u"
 
@@ -66,6 +68,7 @@
         "$mod, f, fullscreen, 0"
 
         "$mod, d, exec, wofi --show drun"
+        "$mod, SPACE, exec, ${pkgs.wofi-emoji}/bin/wofi-emoji"
 
         "$mod, t, exec, kitty --single-instance"
 
@@ -73,7 +76,6 @@
         "$mod SHIFT, l, movewindow, mon:-1"
         "$mod SHIFT, h, movewindow, mon:+1"
 
-
         "$mod, e, exec, thunderbird"
         "$mod, r, exec, kitty -- zsh -c 'exec yazi; exec zsh'"
         "$mod, b, exec, kitty -- zsh -c 'exec btop; exec zsh'"
@@ -178,15 +180,15 @@
 
         blurls = "^(popup|menu)$";
 
-        shadow = {
-          enabled = true;
+        # shadow = {
+        #   enabled = true;
 
-          ignore_window = true;
-          offset = "0 2";
-          range = 20;
-          render_power = 3;
-          color = "rgba(00000055)";
-        };
+        #   ignore_window = true;
+        #   offset = "0 2";
+        #   range = 20;
+        #   render_power = 3;
+        #   color = "rgba(00000055)";
+        # };
       };
 
       animations = {
diff --git a/home/hyprlock.nix b/home/hyprlock.nix
index 6116a0a..c59e1a9 100644
--- a/home/hyprlock.nix
+++ b/home/hyprlock.nix
@@ -15,17 +15,17 @@
         fractional_scaling = 0;
       };
 
-      background = [
-        {
-          monitor = "";
-          path = "${config.home.homeDirectory}/Pictures/wallpapers/City-Night.png";
-          blur_passes = 2;
-          contrast = 0.8916;
-          brightness = 0.8172;
-          vibrancy = 0.1696;
-          vibrancy_darkness = 0.0;
-        }
-      ];
+      # background = [
+      #   {
+      #     monitor = "";
+      #     path = "${config.home.homeDirectory}/Pictures/wallpapers/City-Night.png";
+      #     blur_passes = 2;
+      #     contrast = 0.8916;
+      #     brightness = 0.8172;
+      #     vibrancy = 0.1696;
+      #     vibrancy_darkness = 0.0;
+      #   }
+      # ];
 
       shape = [
         # User box
@@ -80,29 +80,29 @@
         }
       ];
 
-      input-field = [
-        {
-          monitor = "";
-          size = "300, 50";
-          outline_thickness = 1;
-          rounding = 10;
-          dots_size = 0.25;
-          dots_spacing = 0.4;
-          dots_center = true;
-          outer_color = "rgba(102, 92, 84, 0.33)";
-          inner_color = "rgba(102, 92, 84, 0.33)";
-          color = "rgba(235, 219, 178, 0.9)";
-          font_color = "rgba(235, 219, 178, 0.9)";
-          font_size = 14;
-          font_family = "Maple Mono Bold";
-          fade_on_empty = false;
-          placeholder_text = ''<i><span foreground="##fbf1c7">Enter Password</span></i>'';
-          hide_input = false;
-          position = "0, 281";
-          halign = "center";
-          valign = "bottom";
-        }
-      ];
+      # input-field = [
+      #   {
+      #     monitor = "";
+      #     size = "300, 50";
+      #     outline_thickness = 1;
+      #     rounding = 10;
+      #     dots_size = 0.25;
+      #     dots_spacing = 0.4;
+      #     dots_center = true;
+      #     outer_color = "rgba(102, 92, 84, 0.33)";
+      #     inner_color = "rgba(102, 92, 84, 0.33)";
+      #     color = "rgba(235, 219, 178, 0.9)";
+      #     font_color = "rgba(235, 219, 178, 0.9)";
+      #     font_size = 14;
+      #     font_family = "Maple Mono Bold";
+      #     fade_on_empty = false;
+      #     placeholder_text = ''<i><span foreground="##fbf1c7">Enter Password</span></i>'';
+      #     hide_input = false;
+      #     position = "0, 281";
+      #     halign = "center";
+      #     valign = "bottom";
+      #   }
+      # ];
     };
   };
 }
diff --git a/home/hyprpanel.nix b/home/hyprpanel.nix
index 3b10296..64c24bc 100644
--- a/home/hyprpanel.nix
+++ b/home/hyprpanel.nix
@@ -6,44 +6,151 @@
     # See 'https://hyprpanel.com/configuration/settings.html'.
     # Default: <same as gui>
     settings = {
+      bar = {
+        autoHide = "never";
+        location = "bottom";
 
-      # system = { bluetoothAgent = { enable = false; }; };
-
-      # Configure bar layouts for monitors.
-      # See 'https://hyprpanel.com/configuration/panel.html'.
-      # Default: null
-      layout = {
-        bar.layouts = {
-          "0" = {
-            left = [ "dashboard" "workspaces" ];
-            middle = [ "media" ];
-            right = [ "volume" "systray" "notifications" ];
+        customModules = {
+          hypridle = {
+            isActiveCommand = "systemctl --user status hypridle.service | grep -q 'Active: active (running)' && echo 'yes' || echo 'no'";
+            startCommand    = "systemctl --user start hypridle.service";
+            stopCommand     = "systemctl --user stop hypridle.service";
+          };
+          storage.paths = [ "/" ];
+          hyprsunset = { };
+          netstat = {
+            networkInterface = "enp6s0f0";
+            label            = true;
+            leftClick        = "nm-applet";
           };
         };
-      };
 
-      bar.launcher.autoDetectIcon = true;
-      bar.workspaces.show_icons = true;
+        launcher.autoDetectIcon = true;
 
-      # menus.bluetooth = { enable = false; };
-      menus.clock = {
-        time = {
-          military = true;
-          hideSeconds = true;
+        layouts = {
+          "0" = { left = [ ]; middle = [ ]; right = [ ]; };
+          "1" = { left = [ ]; middle = [ ]; right = [ ]; };
+          "2" = {
+            left   = [ "dashboard" "workspaces" "media" ];
+            middle = [ "clock" ];
+            right  = [
+              "volume"
+              "systray"
+              "notifications"
+              # "network"
+              "hyprsunset"
+              "netstat"
+              "systray"
+              "updates"
+              "notifications"
+              "notifications"
+              "notifications"
+            ];
+          };
         };
-        weather.unit = "metric";
+
+        network = {
+          label           = true;
+          showWifiInfo    = true;
+          truncation_size = 6;
+          truncation      = true;
+        };
+
+        workspaces = {
+          showAllActive        = true;
+          showApplicationIcons = true;
+          showWsIcons          = true;
+          show_icons           = true;
+          show_numbered        = false;
+          workspaceMask        = false;
+        };
+
+        clock.format = "%a %b %d  %I:%M:%S %p";
       };
 
-      menus.dashboard.directories.enabled = false;
-      menus.dashboard.stats.enable_gpu = true;
-
-      theme.bar.transparent = false;
-
-      theme.font = {
-        name = "CaskaydiaCove NF";
-        # name = "fira-code";
-        size = "16px";
+    menus = {
+      clock.time = {
+        hideSeconds = false;
+        military    = true;
       };
+      dashboard.controls.enabled = true;
+      media = {
+        displayTimeTooltip = true;
+        noMediaText        = "Nathan rn";
+      };
+    };
+
+
+      theme = import ./hyprpanel/tokyo-night.nix;
+
+      # theme = {
+      #   matugen = false;
+
+      #   font = {
+      #     name  = "Monaspace Krypton";
+      #     label = "Monaspace Krypton Medium";
+      #   };
+
+      #   osd.enable = true;
+
+      #   bar = {
+      #     background  = "#241f31";
+      #     floating    = false;
+      #     location    = "bottom";
+      #     opacity     = 90;
+      #     transparent = false;
+
+      #     border = {
+      #       location = "none";
+      #       width    = "0.15em";
+      #     };
+
+      #     buttons = {
+      #       style = "wave";
+      #       # background = "#282828";
+      #       # icon_background = "#242438";
+      #       # hover = "#504945";
+      #       # text = "#83a598";
+      #       # icon = "#83a598";
+      #       # borderColor = "#83a598";
+      #       borderSize    = "0.02em";
+      #       enableBorders = false;
+      #       monochrome    = false;
+
+      #       network.enableBorder = true;     # last value wins
+
+      #       systray.enableBorder = false;
+      #       clock.enableBorder   = false;
+
+      #       windowtitle = {
+      #         icon = "#00ff19";
+      #         text = "#00d0d0";
+      #       };
+
+      #       workspaces = {
+      #         active                          = "#05ff00";
+      #         numbered_active_underline_color = "#00d0d0";
+      #         occupied                        = "#00d0d0";
+      #       };
+
+      #       modules = {
+      #         hypridle.enableBorder = true;
+      #         cava.enableBorder     = true;
+
+      #         netstat = {
+      #           enableBorder = false;        # last value wins
+      #           spacing      = "0.45em";
+      #         };
+      #       };
+      #     };
+
+      #     menus.menu.media = {
+      #       artist         = "#50ff00";
+      #       slider.primary = "#00e2c5";
+      #     };
+      #   };
+      # };
+
     };
   };
 }
\ No newline at end of file
diff --git a/home/hyprpanel/tokyo-night.nix b/home/hyprpanel/tokyo-night.nix
new file mode 100644
index 0000000..c2add95
--- /dev/null
+++ b/home/hyprpanel/tokyo-night.nix
@@ -0,0 +1,376 @@
+{
+  "theme.bar.menus.background" = "#2e3440";
+  "theme.bar.background" = "#2e3440";
+  "theme.bar.buttons.media.icon" = "#3b4252";
+  "theme.bar.buttons.media.text" = "#3b4252";
+  "theme.bar.buttons.icon" = "#88c0d0";
+  "theme.bar.buttons.text" = "#88c0d0";
+  "theme.bar.buttons.hover" = "#434c53";
+  "theme.bar.buttons.background" = "#3b4252";
+  "theme.bar.menus.text" = "#d8dee9";
+  "theme.bar.menus.border.color" = "#434c53";
+  "theme.bar.buttons.media.background" = "#88c0d0";
+  "theme.bar.menus.menu.volume.text" = "#d8dee9";
+  "theme.bar.menus.menu.volume.card.color" = "#3b4252";
+  "theme.bar.menus.menu.volume.label.color" = "#81a1c1";
+  "theme.bar.menus.popover.text" = "#88c0d0";
+  "theme.bar.menus.popover.background" = "#2e3440";
+  "theme.bar.menus.menu.dashboard.powermenu.shutdown" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text" = "#2e3440";
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body" = "#d8dee9";
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label" = "#88c0d0";
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border" = "#434c53";
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background" = "#2e3440";
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card" = "#3b4252";
+  "theme.bar.menus.menu.notifications.switch.puck" = "#434c53";
+  "theme.bar.menus.menu.notifications.switch.disabled" = "#434c53";
+  "theme.bar.menus.menu.notifications.switch.enabled" = "#88c0d0";
+  "theme.bar.menus.menu.notifications.clear" = "#8fbcbb";
+  "theme.bar.menus.menu.notifications.switch_divider" = "#434c53";
+  "theme.bar.menus.menu.notifications.border" = "#434c53";
+  "theme.bar.menus.menu.notifications.card" = "#3b4252";
+  "theme.bar.menus.menu.notifications.background" = "#2e3440";
+  "theme.bar.menus.menu.notifications.no_notifications_label" = "#434c53";
+  "theme.bar.menus.menu.notifications.label" = "#88c0d0";
+  "theme.bar.menus.menu.dashboard.monitors.disk.label" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.monitors.disk.bar" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.monitors.disk.icon" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.monitors.gpu.label" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.monitors.gpu.bar" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.monitors.gpu.icon" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.monitors.ram.label" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.monitors.ram.bar" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.monitors.ram.icon" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.monitors.cpu.label" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.monitors.cpu.bar" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.monitors.cpu.icon" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.monitors.bar_background" = "#434c53";
+  "theme.bar.menus.menu.dashboard.directories.right.bottom.color" = "#88c0d0";
+  "theme.bar.menus.menu.dashboard.directories.right.middle.color" = "#88c0d0";
+  "theme.bar.menus.menu.dashboard.directories.right.top.color" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.directories.left.bottom.color" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.directories.left.middle.color" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.directories.left.top.color" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.controls.input.text" = "#2e3440";
+  "theme.bar.menus.menu.dashboard.controls.input.background" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.controls.volume.text" = "#2e3440";
+  "theme.bar.menus.menu.dashboard.controls.volume.background" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.controls.notifications.text" = "#2e3440";
+  "theme.bar.menus.menu.dashboard.controls.notifications.background" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.controls.bluetooth.text" = "#2e3440";
+  "theme.bar.menus.menu.dashboard.controls.bluetooth.background" = "#88c0d0";
+  "theme.bar.menus.menu.dashboard.controls.wifi.text" = "#2e3440";
+  "theme.bar.menus.menu.dashboard.controls.wifi.background" = "#88c0d0";
+  "theme.bar.menus.menu.dashboard.controls.disabled" = "#434c53";
+  "theme.bar.menus.menu.dashboard.shortcuts.recording" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.shortcuts.text" = "#2e3440";
+  "theme.bar.menus.menu.dashboard.shortcuts.background" = "#88c0d0";
+  "theme.bar.menus.menu.dashboard.powermenu.sleep" = "#88c0d0";
+  "theme.bar.menus.menu.dashboard.powermenu.logout" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.powermenu.restart" = "#81a1c1";
+  "theme.bar.menus.menu.dashboard.profile.name" = "#8fbcbb";
+  "theme.bar.menus.menu.dashboard.border.color" = "#434c53";
+  "theme.bar.menus.menu.dashboard.background.color" = "#2e3440";
+  "theme.bar.menus.menu.dashboard.card.color" = "#3b4252";
+  "theme.bar.menus.menu.clock.weather.hourly.temperature" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.weather.hourly.icon" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.weather.hourly.time" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.weather.thermometer.extremelycold" = "#88c0d0";
+  "theme.bar.menus.menu.clock.weather.thermometer.cold" = "#88c0d0";
+  "theme.bar.menus.menu.clock.weather.thermometer.moderate" = "#88c0d0";
+  "theme.bar.menus.menu.clock.weather.thermometer.hot" = "#81a1c1";
+  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.weather.stats" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.weather.status" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.weather.temperature" = "#d8dee9";
+  "theme.bar.menus.menu.clock.weather.icon" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.calendar.contextdays" = "#434c53";
+  "theme.bar.menus.menu.clock.calendar.days" = "#d8dee9";
+  "theme.bar.menus.menu.clock.calendar.currentday" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.calendar.paginator" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.calendar.weekdays" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.calendar.yearmonth" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.time.timeperiod" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.time.time" = "#8fbcbb";
+  "theme.bar.menus.menu.clock.text" = "#d8dee9";
+  "theme.bar.menus.menu.clock.border.color" = "#434c53";
+  "theme.bar.menus.menu.clock.background.color" = "#2e3440";
+  "theme.bar.menus.menu.clock.card.color" = "#3b4252";
+  "theme.bar.menus.menu.battery.slider.puck" = "#4c566a";
+  "theme.bar.menus.menu.battery.slider.backgroundhover" = "#434c53";
+  "theme.bar.menus.menu.battery.slider.background" = "#434c53";
+  "theme.bar.menus.menu.battery.slider.primary" = "#81a1c1";
+  "theme.bar.menus.menu.battery.icons.active" = "#81a1c1";
+  "theme.bar.menus.menu.battery.icons.passive" = "#5e81ac";
+  "theme.bar.menus.menu.battery.listitems.active" = "#81a1c1";
+  "theme.bar.menus.menu.battery.listitems.passive" = "#d8dee9";
+  "theme.bar.menus.menu.battery.text" = "#d8dee9";
+  "theme.bar.menus.menu.battery.label.color" = "#81a1c1";
+  "theme.bar.menus.menu.battery.border.color" = "#434c53";
+  "theme.bar.menus.menu.battery.background.color" = "#2e3440";
+  "theme.bar.menus.menu.battery.card.color" = "#3b4252";
+  "theme.bar.menus.menu.systray.dropdownmenu.divider" = "#3b4252";
+  "theme.bar.menus.menu.systray.dropdownmenu.text" = "#d8dee9";
+  "theme.bar.menus.menu.systray.dropdownmenu.background" = "#2e3440";
+  "theme.bar.menus.menu.bluetooth.iconbutton.active" = "#88c0d0";
+  "theme.bar.menus.menu.bluetooth.iconbutton.passive" = "#d8dee9";
+  "theme.bar.menus.menu.bluetooth.icons.active" = "#88c0d0";
+  "theme.bar.menus.menu.bluetooth.icons.passive" = "#5e81ac";
+  "theme.bar.menus.menu.bluetooth.listitems.active" = "#88c0d0";
+  "theme.bar.menus.menu.bluetooth.listitems.passive" = "#d8dee9";
+  "theme.bar.menus.menu.bluetooth.switch.puck" = "#434c53";
+  "theme.bar.menus.menu.bluetooth.switch.disabled" = "#434c53";
+  "theme.bar.menus.menu.bluetooth.switch.enabled" = "#88c0d0";
+  "theme.bar.menus.menu.bluetooth.switch_divider" = "#434c53";
+  "theme.bar.menus.menu.bluetooth.status" = "#4c566a";
+  "theme.bar.menus.menu.bluetooth.text" = "#d8dee9";
+  "theme.bar.menus.menu.bluetooth.label.color" = "#88c0d0";
+  "theme.bar.menus.menu.bluetooth.border.color" = "#434c53";
+  "theme.bar.menus.menu.bluetooth.background.color" = "#2e3440";
+  "theme.bar.menus.menu.bluetooth.card.color" = "#3b4252";
+  "theme.bar.menus.menu.network.iconbuttons.active" = "#88c0d0";
+  "theme.bar.menus.menu.network.iconbuttons.passive" = "#d8dee9";
+  "theme.bar.menus.menu.network.icons.active" = "#88c0d0";
+  "theme.bar.menus.menu.network.icons.passive" = "#5e81ac";
+  "theme.bar.menus.menu.network.listitems.active" = "#88c0d0";
+  "theme.bar.menus.menu.network.listitems.passive" = "#d8dee9";
+  "theme.bar.menus.menu.network.status.color" = "#4c566a";
+  "theme.bar.menus.menu.network.text" = "#d8dee9";
+  "theme.bar.menus.menu.network.label.color" = "#88c0d0";
+  "theme.bar.menus.menu.network.border.color" = "#434c53";
+  "theme.bar.menus.menu.network.background.color" = "#2e3440";
+  "theme.bar.menus.menu.network.card.color" = "#3b4252";
+  "theme.bar.menus.menu.volume.input_slider.puck" = "#434c53";
+  "theme.bar.menus.menu.volume.input_slider.backgroundhover" = "#434c53";
+  "theme.bar.menus.menu.volume.input_slider.background" = "#434c53";
+  "theme.bar.menus.menu.volume.input_slider.primary" = "#81a1c1";
+  "theme.bar.menus.menu.volume.audio_slider.puck" = "#434c53";
+  "theme.bar.menus.menu.volume.audio_slider.backgroundhover" = "#434c53";
+  "theme.bar.menus.menu.volume.audio_slider.background" = "#434c53";
+  "theme.bar.menus.menu.volume.audio_slider.primary" = "#81a1c1";
+  "theme.bar.menus.menu.volume.icons.active" = "#81a1c1";
+  "theme.bar.menus.menu.volume.icons.passive" = "#5e81ac";
+  "theme.bar.menus.menu.volume.iconbutton.active" = "#81a1c1";
+  "theme.bar.menus.menu.volume.iconbutton.passive" = "#d8dee9";
+  "theme.bar.menus.menu.volume.listitems.active" = "#81a1c1";
+  "theme.bar.menus.menu.volume.listitems.passive" = "#d8dee9";
+  "theme.bar.menus.menu.volume.border.color" = "#434c53";
+  "theme.bar.menus.menu.volume.background.color" = "#2e3440";
+  "theme.bar.menus.menu.media.slider.puck" = "#4c566a";
+  "theme.bar.menus.menu.media.slider.backgroundhover" = "#434c53";
+  "theme.bar.menus.menu.media.slider.background" = "#434c53";
+  "theme.bar.menus.menu.media.slider.primary" = "#8fbcbb";
+  "theme.bar.menus.menu.media.buttons.text" = "#2e3440";
+  "theme.bar.menus.menu.media.buttons.background" = "#88c0d0";
+  "theme.bar.menus.menu.media.buttons.enabled" = "#8fbcbb";
+  "theme.bar.menus.menu.media.buttons.inactive" = "#434c53";
+  "theme.bar.menus.menu.media.border.color" = "#434c53";
+  "theme.bar.menus.menu.media.background.color" = "#2e3440";
+  "theme.bar.menus.menu.media.album" = "#8fbcbb";
+  "theme.bar.menus.menu.media.artist" = "#8fbcbb";
+  "theme.bar.menus.menu.media.song" = "#88c0d0";
+  "theme.bar.menus.tooltip.text" = "#d8dee9";
+  "theme.bar.menus.tooltip.background" = "#2e3440";
+  theme.bar.location = "#2e3440";
+  "theme.bar.menus.dropdownmenu.divider" = "#3b4252";
+  "theme.bar.menus.dropdownmenu.text" = "#d8dee9";
+  "theme.bar.menus.dropdownmenu.background" = "#2e3440";
+  "theme.bar.menus.slider.puck" = "#4c566a";
+  "theme.bar.menus.slider.backgroundhover" = "#434c53";
+  "theme.bar.menus.slider.background" = "#434c53";
+  "theme.bar.menus.slider.primary" = "#88c0d0";
+  "theme.bar.menus.progressbar.background" = "#434c53";
+  "theme.bar.menus.progressbar.foreground" = "#88c0d0";
+  "theme.bar.menus.iconbuttons.active" = "#88c0d0";
+  "theme.bar.menus.iconbuttons.passive" = "#d8dee9";
+  "theme.bar.menus.buttons.text" = "#2e3440";
+  "theme.bar.menus.buttons.disabled" = "#434c53";
+  "theme.bar.menus.buttons.active" = "#8fbcbb";
+  "theme.bar.menus.buttons.default" = "#88c0d0";
+  "theme.bar.menus.switch.puck" = "#434c53";
+  "theme.bar.menus.switch.disabled" = "#434c53";
+  "theme.bar.menus.switch.enabled" = "#88c0d0";
+  "theme.bar.menus.icons.active" = "#88c0d0";
+  "theme.bar.menus.icons.passive" = "#434c53";
+  "theme.bar.menus.listitems.active" = "#88c0d0";
+  "theme.bar.menus.listitems.passive" = "#d8dee9";
+  "theme.bar.menus.label" = "#88c0d0";
+  "theme.bar.menus.feinttext" = "#434c53";
+  "theme.bar.menus.dimtext" = "#6272a4";
+  "theme.bar.menus.cards" = "#3b4252";
+  "theme.bar.buttons.notifications.total" = "#3b4252";
+  "theme.bar.buttons.notifications.icon" = "#3b4252";
+  "theme.bar.buttons.notifications.background" = "#88c0d0";
+  "theme.bar.buttons.clock.icon" = "#3b4252";
+  "theme.bar.buttons.clock.text" = "#3b4252";
+  "theme.bar.buttons.clock.background" = "#8fbcbb";
+  "theme.bar.buttons.battery.icon" = "#3b4252";
+  "theme.bar.buttons.battery.text" = "#3b4252";
+  "theme.bar.buttons.battery.background" = "#81a1c1";
+  "theme.bar.buttons.systray.background" = "#3b4252";
+  "theme.bar.buttons.bluetooth.icon" = "#3b4252";
+  "theme.bar.buttons.bluetooth.text" = "#3b4252";
+  "theme.bar.buttons.bluetooth.background" = "#88c0d0";
+  "theme.bar.buttons.network.icon" = "#3b4252";
+  "theme.bar.buttons.network.text" = "#3b4252";
+  "theme.bar.buttons.network.background" = "#88c0d0";
+  "theme.bar.buttons.volume.icon" = "#3b4252";
+  "theme.bar.buttons.volume.text" = "#3b4252";
+  "theme.bar.buttons.volume.background" = "#81a1c1";
+  "theme.bar.buttons.windowtitle.icon" = "#3b4252";
+  "theme.bar.buttons.windowtitle.text" = "#3b4252";
+  "theme.bar.buttons.windowtitle.background" = "#8fbcbb";
+  "theme.bar.buttons.workspaces.active" = "#8fbcbb";
+  "theme.bar.buttons.workspaces.occupied" = "#81a1c1";
+  "theme.bar.buttons.workspaces.available" = "#88c0d0";
+  "theme.bar.buttons.workspaces.hover" = "#434c53";
+  "theme.bar.buttons.workspaces.background" = "#3b4252";
+  "theme.bar.buttons.dashboard.icon" = "#3b4252";
+  "theme.bar.buttons.dashboard.background" = "#81a1c1";
+  "theme.osd.label" = "#88c0d0";
+  "theme.osd.icon" = "#2e3440";
+  "theme.osd.bar_overflow_color" = "#8fbcbb";
+  "theme.osd.bar_empty_color" = "#434c53";
+  "theme.osd.bar_color" = "#88c0d0";
+  "theme.osd.icon_container" = "#88c0d0";
+  "theme.osd.bar_container" = "#2e3440";
+  "theme.notification.close_button.label" = "#2e3440";
+  "theme.notification.close_button.background" = "#8fbcbb";
+  "theme.notification.labelicon" = "#88c0d0";
+  "theme.notification.text" = "#d8dee9";
+  "theme.notification.time" = "#4c566a";
+  "theme.notification.border" = "#434c53";
+  "theme.notification.label" = "#88c0d0";
+  "theme.notification.actions.text" = "#2e3440";
+  "theme.notification.actions.background" = "#88c0d0";
+  "theme.notification.background" = "#2e3440";
+  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color" = "#21252b";
+  "theme.bar.buttons.workspaces.numbered_active_underline_color" = "#ffffff";
+  "theme.bar.menus.menu.media.card.color" = "#3b4252";
+  "theme.bar.menus.check_radio_button.background" = "#2e3440";
+  "theme.bar.menus.check_radio_button.active" = "#88c0d0";
+  "theme.bar.buttons.style" = "default";
+  "theme.bar.menus.menu.notifications.pager.button" = "#88c0d0";
+  "theme.bar.menus.menu.notifications.scrollbar.color" = "#88c0d0";
+  "theme.bar.menus.menu.notifications.pager.label" = "#5e81ac";
+  "theme.bar.menus.menu.notifications.pager.background" = "#2e3440";
+  "theme.bar.buttons.clock.icon_background" = "#8fbcbb";
+  "theme.bar.buttons.modules.ram.icon" = "#3b4252";
+  "theme.bar.buttons.modules.storage.icon_background" = "#8fbcbb";
+  "theme.bar.menus.popover.border" = "#2e3440";
+  "theme.bar.buttons.volume.icon_background" = "#81a1c1";
+  "theme.bar.menus.menu.power.buttons.sleep.icon_background" = "#88c0d0";
+  "theme.bar.menus.menu.power.buttons.restart.text" = "#81a1c1";
+  "theme.bar.buttons.modules.updates.background" = "#88c0d0";
+  "theme.bar.buttons.modules.storage.icon" = "#3b4252";
+  "theme.bar.buttons.modules.netstat.background" = "#8fbcbb";
+  "theme.bar.buttons.modules.weather.icon" = "#3b4252";
+  "theme.bar.buttons.modules.netstat.text" = "#3b4252";
+  "theme.bar.buttons.modules.storage.background" = "#8fbcbb";
+  "theme.bar.buttons.modules.power.icon" = "#3b4252";
+  "theme.bar.buttons.modules.storage.text" = "#3b4252";
+  "theme.bar.buttons.modules.cpu.background" = "#8fbcbb";
+  "theme.bar.menus.menu.power.border.color" = "#434c53";
+  "theme.bar.buttons.network.icon_background" = "#caa6f7";
+  "theme.bar.buttons.modules.power.icon_background" = "#8fbcbb";
+  "theme.bar.menus.menu.power.buttons.logout.icon" = "#2e3440";
+  "theme.bar.menus.menu.power.buttons.restart.icon_background" = "#81a1c1";
+  "theme.bar.menus.menu.power.buttons.restart.icon" = "#2e3440";
+  "theme.bar.buttons.modules.cpu.icon" = "#3b4252";
+  "theme.bar.buttons.battery.icon_background" = "#81a1c1";
+  "theme.bar.buttons.modules.kbLayout.icon_background" = "#88c0d0";
+  "theme.bar.buttons.modules.weather.text" = "#3b4252";
+  "theme.bar.menus.menu.power.buttons.shutdown.icon" = "#2e3440";
+  "theme.bar.menus.menu.power.buttons.sleep.text" = "#88c0d0";
+  "theme.bar.buttons.modules.weather.icon_background" = "#88c0d0";
+  "theme.bar.menus.menu.power.buttons.shutdown.background" = "#3b4252";
+  "theme.bar.buttons.media.icon_background" = "#88c0d0";
+  "theme.bar.menus.menu.power.buttons.logout.background" = "#3b4252";
+  "theme.bar.buttons.modules.kbLayout.icon" = "#3b4252";
+  "theme.bar.buttons.modules.ram.icon_background" = "#81a1c1";
+  "theme.bar.menus.menu.power.buttons.shutdown.icon_background" = "#8fbcbb";
+  "theme.bar.menus.menu.power.buttons.shutdown.text" = "#8fbcbb";
+  "theme.bar.menus.menu.power.buttons.sleep.background" = "#3b4252";
+  "theme.bar.buttons.modules.ram.text" = "#3b4252";
+  "theme.bar.menus.menu.power.buttons.logout.text" = "#8fbcbb";
+  "theme.bar.buttons.modules.updates.icon_background" = "#88c0d0";
+  "theme.bar.buttons.modules.kbLayout.background" = "#88c0d0";
+  "theme.bar.buttons.modules.power.background" = "#8fbcbb";
+  "theme.bar.buttons.modules.weather.background" = "#88c0d0";
+  "theme.bar.buttons.icon_background" = "#3b4252";
+  "theme.bar.menus.menu.power.background.color" = "#2e3440";
+  "theme.bar.buttons.modules.ram.background" = "#81a1c1";
+  "theme.bar.buttons.modules.netstat.icon" = "#3b4252";
+  "theme.bar.buttons.windowtitle.icon_background" = "#8fbcbb";
+  "theme.bar.buttons.modules.cpu.icon_background" = "#8fbcbb";
+  "theme.bar.menus.menu.power.buttons.logout.icon_background" = "#8fbcbb";
+  "theme.bar.buttons.modules.updates.text" = "#3b4252";
+  "theme.bar.menus.menu.power.buttons.sleep.icon" = "#2e3440";
+  "theme.bar.buttons.bluetooth.icon_background" = "#89dbeb";
+  "theme.bar.menus.menu.power.buttons.restart.background" = "#3b4252";
+  "theme.bar.buttons.modules.updates.icon" = "#3b4252";
+  "theme.bar.buttons.modules.cpu.text" = "#3b4252";
+  "theme.bar.buttons.modules.netstat.icon_background" = "#8fbcbb";
+  "theme.bar.buttons.modules.kbLayout.text" = "#3b4252";
+  "theme.bar.buttons.notifications.icon_background" = "#88c0d0";
+  "theme.bar.buttons.modules.power.border" = "#8fbcbb";
+  "theme.bar.buttons.modules.weather.border" = "#88c0d0";
+  "theme.bar.buttons.modules.updates.border" = "#88c0d0";
+  "theme.bar.buttons.modules.kbLayout.border" = "#88c0d0";
+  "theme.bar.buttons.modules.netstat.border" = "#8fbcbb";
+  "theme.bar.buttons.modules.storage.border" = "#8fbcbb";
+  "theme.bar.buttons.modules.cpu.border" = "#8fbcbb";
+  "theme.bar.buttons.modules.ram.border" = "#81a1c1";
+  "theme.bar.buttons.notifications.border" = "#88c0d0";
+  "theme.bar.buttons.clock.border" = "#8fbcbb";
+  "theme.bar.buttons.battery.border" = "#81a1c1";
+  "theme.bar.buttons.systray.border" = "#434c53";
+  "theme.bar.buttons.bluetooth.border" = "#88c0d0";
+  "theme.bar.buttons.network.border" = "#88c0d0";
+  "theme.bar.buttons.volume.border" = "#81a1c1";
+  "theme.bar.buttons.media.border" = "#88c0d0";
+  "theme.bar.buttons.windowtitle.border" = "#8fbcbb";
+  "theme.bar.buttons.workspaces.border" = "#2e3440";
+  "theme.bar.buttons.dashboard.border" = "#81a1c1";
+  "theme.bar.buttons.modules.submap.background" = "#8fbcbb";
+  "theme.bar.buttons.modules.submap.text" = "#3b4252";
+  "theme.bar.buttons.modules.submap.border" = "#8fbcbb";
+  "theme.bar.buttons.modules.submap.icon" = "#3b4252";
+  "theme.bar.buttons.modules.submap.icon_background" = "#3b4252";
+  "theme.bar.menus.menu.network.switch.puck" = "#434c53";
+  "theme.bar.menus.menu.network.switch.disabled" = "#434c53";
+  "theme.bar.menus.menu.network.switch.enabled" = "#88c0d0";
+  "theme.bar.buttons.systray.customIcon" = "#d8dee9";
+  "theme.bar.border.color" = "#88c0d0";
+  "theme.bar.menus.menu.media.timestamp" = "#d8dee9";
+  "theme.bar.buttons.borderColor" = "#88c0d0";
+  "theme.bar.buttons.modules.hyprsunset.icon" = "#3b4252";
+  "theme.bar.buttons.modules.hyprsunset.background" = "#8fbcbb";
+  "theme.bar.buttons.modules.hyprsunset.icon_background" = "#8fbcbb";
+  "theme.bar.buttons.modules.hyprsunset.text" = "#3b4252";
+  "theme.bar.buttons.modules.hyprsunset.border" = "#8fbcbb";
+  "theme.bar.buttons.modules.hypridle.icon" = "#3b4252";
+  "theme.bar.buttons.modules.hypridle.background" = "#8fbcbb";
+  "theme.bar.buttons.modules.hypridle.icon_background" = "#8fbcbb";
+  "theme.bar.buttons.modules.hypridle.text" = "#3b4252";
+  "theme.bar.buttons.modules.hypridle.border" = "#8fbcbb";
+  "theme.bar.menus.menu.network.scroller.color" = "#88c0d0";
+  "theme.bar.menus.menu.bluetooth.scroller.color" = "#88c0d0";
+  "theme.bar.buttons.modules.cava.background" = "#8fbcbb";
+  "theme.bar.buttons.modules.cava.text" = "#3b4252";
+  "theme.bar.buttons.modules.cava.icon" = "#3b4252";
+  "theme.bar.buttons.modules.cava.icon_background" = "#3b4252";
+  "theme.bar.buttons.modules.cava.border" = "#8fbcbb";
+  "theme.bar.buttons.modules.microphone.border" = "#8fbcbb";
+  "theme.bar.buttons.modules.microphone.text" = "#3b4252";
+  "theme.bar.buttons.modules.microphone.background" = "#8fbcbb";
+  "theme.bar.buttons.modules.microphone.icon" = "#3b4252";
+  "theme.bar.buttons.modules.microphone.icon_background" = "#8fbcbb";
+  "theme.bar.buttons.modules.worldclock.background" = "#8fbcbb";
+  "theme.bar.buttons.modules.worldclock.text" = "#3b4252";
+  "theme.bar.buttons.modules.worldclock.icon" = "#3b4252";
+  "theme.bar.buttons.modules.worldclock.icon_background" = "#8fbcbb";
+  "theme.bar.buttons.modules.worldclock.border" = "#8fbcbb";
+}
diff --git a/home/hyprpanel2.nix b/home/hyprpanel2.nix
index aca7e03..a29d18d 100644
--- a/home/hyprpanel2.nix
+++ b/home/hyprpanel2.nix
@@ -1,47 +1,179 @@
-{ inputs, ... }:
-{
-  programs.hyprpanel = {
-    enable = false;
-    settings = {
-      bar = {
-        customModules.hypridle = {
+{ lib, ... }:
+let
+  tokyo = lib.importJSON (builtins.fetchurl {
+    url = "https://raw.githubusercontent.com/Jas-SinghFSU/HyprPanel/master/themes/tokyo_night.json";
+    sha256 = "0fpl12109cim5nfm9kx5zcd50i3avzvh2sl4syb40q12k2wi7ibj"; # nix-prefetch-url <url>
+  });
+  tokyo-moon = lib.importJSON (builtins.fetchurl {
+    url = "https://raw.githubusercontent.com/Jas-SinghFSU/HyprPanel/master/themes/tokyo_night_moon.json";
+    sha256 = "14wmf4zv28zkkjswr5iy56imxfjyyp9aw624m19aigx9qckqi2p9"; # nix-prefetch-url <url>
+  });
+  cyberpunk = lib.importJSON (builtins.fetchurl {
+    url = "https://raw.githubusercontent.com/Jas-SinghFSU/HyprPanel/refs/heads/master/themes/cyberpunk_vivid.json";
+    sha256 = "0wvx49zyka84wwzi8mxnvgjb5zbb41z1lw0asbj15yyi6k4d38ws"; # nix-prefetch-url <url>
+  });
+  nord = lib.importJSON (builtins.fetchurl {
+    url = "https://raw.githubusercontent.com/Jas-SinghFSU/HyprPanel/refs/heads/master/themes/nord.json";
+    sha256 = "1gm1lbjrmah4ji8zvfz5dpsbfk0la2a1r431fynnafbnwb3mwxj8"; # nix-prefetch-url <url>
+  });
+  nord-vivid = lib.importJSON (builtins.fetchurl {
+    url = "https://raw.githubusercontent.com/Jas-SinghFSU/HyprPanel/refs/heads/master/themes/nord_vivid.json";
+    sha256 = "05qdkvkqf58bgnibc54sfvmw210adi7h2hczjz6b1vx043wxgxan"; # nix-prefetch-url <url>
+  });
+  tokyo-vivid = lib.importJSON (builtins.fetchurl {
+    url = "https://raw.githubusercontent.com/Jas-SinghFSU/HyprPanel/refs/heads/master/themes/tokyo_night_vivid.json";
+    sha256 = "09mhl9lkqya5lf306h6ynmfaxqngv9f1q1c27lmrwx0vriv97vkq"; # nix-prefetch-url <url>
+  });
+  one_dark = lib.importJSON (builtins.fetchurl {
+    url = "https://raw.githubusercontent.com/Jas-SinghFSU/HyprPanel/refs/heads/master/themes/one_dark.json";
+    sha256 = "0034jb14fxfhm7669kp0ik0jgn7j7glyimsyvksxb88y6lpgqjw9"; # nix-prefetch-url <url>
+  });
+
+  mySettings = {
+    bar = {
+      autoHide = "never";
+
+      customModules = {
+        hypridle = {
           isActiveCommand = "systemctl --user status hypridle.service | grep -q 'Active: active (running)' && echo 'yes' || echo 'no'";
           startCommand    = "systemctl --user start hypridle.service";
           stopCommand     = "systemctl --user stop hypridle.service";
         };
-
-        launcher.autoDetectIcon = true;
-        workspaces.show_icons   = true;
+        storage.paths = [ "/" ];
+        hyprsunset = {
+          temperature = "4000K";
+        };
+        hypridle = {
+        };
+        netstat = {
+          networkInterface = "enp6s0f0";
+          label            = true;
+          leftClick        = "nm-applet";
+        };
       };
 
-      layout.bar.layouts."0" = {
-        left   = [ "dashboard" "workspaces" ];
-        middle = [ "media" ];
-        right  = [ "volume" "systray" "notifications" ];
+      launcher.autoDetectIcon = true;
+
+      layouts = {
+        "0" = { left = [ ]; middle = [ ]; right = [ ]; };
+        "1" = { left = [ ]; middle = [ ]; right = [ ]; };
+        "2" = {
+          left   = [ "dashboard" "workspaces" "media" ];
+          middle = [ 
+            "clock"
+            "volume"
+          ];
+          right  = [
+            "hyprsunset"
+            "hypridle"
+            "netstat"
+            "systray"
+            "updates"
+            "notifications"
+          ];
+        };
       };
 
-      menus = {
-        clock = {
-          time = {
-            hideSeconds = true;
-            military    = true;
+      network = {
+        label           = true;
+        showWifiInfo    = true;
+        truncation_size = 6;
+        truncation      = true;
+      };
+
+      workspaces = {
+        showAllActive        = true;
+        showApplicationIcons = true;
+        showWsIcons          = true;
+        show_icons           = true;
+        show_numbered        = false;
+        workspaceMask        = false;
+      };
+
+      clock.format = "%a %b %d  %I:%M:%S %p";
+    };
+
+    menus = {
+      clock.time = {
+        hideSeconds = false;
+        military    = true;
+      };
+      dashboard.controls.enabled = true;
+      media = {
+        displayTimeTooltip = true;
+        noMediaText        = "Nathan rn";
+      };
+    };
+
+    theme = {
+      matugen = false;
+
+      font = {
+        name  = "Monaspace Krypton";
+        label = "Monaspace Krypton Medium";
+      };
+
+      osd.enable = true;
+
+      bar = {
+        floating    = false;
+        location    = "bottom";
+        opacity     = 90;
+        transparent = false;
+
+        border = {
+          location = "none";
+          width    = "0.15em";
+        };
+
+        buttons = {
+          style = "wave";
+          borderSize    = "0.02em";
+          enableBorders = false;
+          monochrome    = false;
+
+          network.enableBorder = true;
+          systray.enableBorder = false;
+          clock.enableBorder   = false;
+
+          windowtitle = {
+            icon = "#00ff19";
+            text = "#00d0d0";
+          };
+
+          workspaces = {
+            active                          = "#05ff00";
+            numbered_active_underline_color = "#00d0d0";
+            occupied                        = "#00d0d0";
+          };
+
+          modules = {
+            hypridle.enableBorder = true;
+            cava.enableBorder     = true;
+            netstat = {
+              enableBorder = false;
+              spacing      = "0.45em";
+            };
           };
-          weather.unit = "metric";
         };
 
-        dashboard = {
-          directories.enabled = false;
-          stats.enable_gpu    = true;
-        };
-      };
-
-      theme = {
-        bar.transparent = false;
-        font = {
-          name = "Monaspace Krypton"; # likely "CaskaydiaCove Nerd Font" in fontconfig
-          size = "16px";
+        menus.menu.media = {
+          artist         = "#50ff00";
+          slider.primary = "#00e2c5";
         };
       };
     };
   };
-}
\ No newline at end of file
+
+  myOverrides = mySettings // {
+    "theme.bar.buttons.style" = "wave";
+    "theme.bar.opacity"     = "95";
+    "theme.bar.transparent"     = "false";
+        # transparent = false;
+  };
+
+  merged = lib.recursiveUpdate nord-vivid myOverrides;
+in {
+  programs.hyprpanel.enable = true;
+  programs.hyprpanel.settings = merged;
+}
diff --git a/home/hyprpanel3.nix b/home/hyprpanel3.nix
index 20f395b..ae24628 100644
--- a/home/hyprpanel3.nix
+++ b/home/hyprpanel3.nix
@@ -1,95 +1,148 @@
-{ inputs, ... }:
+{ lib, ... }:
+
+let
+  tokyo = lib.importJSON (builtins.fetchurl {
+    url = "https://raw.githubusercontent.com/Jas-SinghFSU/HyprPanel/master/themes/tokyo_night_moon.json";
+    sha256 = "14wmf4zv28zkkjswr5iy56imxfjyyp9aw624m19aigx9qckqi2p9"; # nix-prefetch-url <url>
+  });
+
+  mySettings = {
+    bar = {
+      autoHide = "never";
+
+      customModules = {
+        hypridle = {
+          isActiveCommand = "systemctl --user status hypridle.service | grep -q 'Active: active (running)' && echo 'yes' || echo 'no'";
+          startCommand    = "systemctl --user start hypridle.service";
+          stopCommand     = "systemctl --user stop hypridle.service";
+        };
+        storage.paths = [ "/" ];
+        hyprsunset = { };
+        netstat = {
+          networkInterface = "enp6s0f0";
+          label            = true;
+          leftClick        = "nm-applet";
+        };
+      };
+
+      launcher.autoDetectIcon = true;
+
+      layouts = {
+        "0" = { left = [ ]; middle = [ ]; right = [ ]; };
+        "1" = { left = [ ]; middle = [ ]; right = [ ]; };
+        "2" = {
+          left   = [ "dashboard" "workspaces" "media" ];
+          middle = [ "clock" ];
+          right  = [
+            "volume"
+            "systray"
+            "notifications"
+            # "network"
+            "hyprsunset"
+            "netstat"
+            "systray"
+            "updates"
+            "notifications"
+          ];
+        };
+      };
+
+      network = {
+        label           = true;
+        showWifiInfo    = true;
+        truncation_size = 6;
+        truncation      = true;
+      };
+
+      workspaces = {
+        showAllActive        = true;
+        showApplicationIcons = true;
+        showWsIcons          = true;
+        show_icons           = true;
+        show_numbered        = false;
+        workspaceMask        = false;
+      };
+
+      clock.format = "%a %b %d  %I:%M:%S %p";
+    };
+
+    menus = {
+      clock.time = {
+        hideSeconds = false;
+        military    = true;
+      };
+      dashboard.controls.enabled = true;
+      media = {
+        displayTimeTooltip = true;
+        noMediaText        = "Nathan rn";
+      };
+    };
+
+    theme = {
+      matugen = false;
+
+      font = {
+        name  = "Monaspace Krypton";
+        label = "Monaspace Krypton Medium";
+      };
+
+      osd.enable = true;
 
-{
-  programs.hyprpanel = {
-    enable = true;
-    settings = {
       bar = {
-        layouts = {
-          "0" = {
-            left = [ "dashboard" "workspaces" ];
-            middle = [ "media" ];
-            right = [ "volume" "systray" "notifications" ];
-          };
+        background  = "#241f31";
+        floating    = false;
+        location    = "bottom";
+        opacity     = 90;
+        transparent = false;
+
+        border = {
+          location = "none";
+          width    = "0.15em";
         };
 
-        launcher.autoDetectIcon = true;
-        customModules.storage.paths = [ "/" ];
-        autoHide = "never";
+        buttons = {
+          borderSize    = "0.02em";
+          enableBorders = false;
+          monochrome    = false;
 
-        workspaces = {
-          show_icons = true;
-          show_numbered = false;
-          workspaceMask = false;
-          showWsIcons = true;
-          showApplicationIcons = true;
-          showAllActive = true;
-        };
+          network.enableBorder = true;
+          systray.enableBorder = false;
+          clock.enableBorder   = false;
 
-        network = {
-          showWifiInfo   = true;
-          truncation_size = 6;
-          label          = true;
-        };
-      };
-
-      menus = {
-        media = {
-          displayTimeTooltip = true;
-          noMediaText = "Nathan rn";
-        };
-        clock.time = {
-          military    = true;
-          hideSeconds = false;
-        };
-        dashboard.controls.enabled = true;
-      };
-
-      theme = {
-        matugen = false;
-
-        font = {
-          name  = "Monaspace Krypton";
-          label = "Monaspace Krypton Medium";
-        };
-
-        bar = {
-          floating    = false;
-          location    = "bottom";
-          transparent = false;
-          opacity     = 90;
-          background  = "#241f31";
-
-          buttons = {
-            enableBorders = true;
-            borderSize    = "0.02em";
-            monochrome    = false;
-
-            workspaces = {
-              occupied                        = "#00d0d0";
-              active                          = "#05ff00";
-              numbered_active_underline_color = "#00d0d0";
-            };
-
-            windowtitle = {
-              text = "#00d0d0";
-              icon = "#00ff19";
-            };
-
-            network.enableBorder = false;
-
-            modules = {
-              hypridle.enableBorder = true;
-              cava.enableBorder     = true;
-            };
+          windowtitle = {
+            icon = "#00ff19";
+            text = "#00d0d0";
           };
 
-          menus.menu.media = {
-            slider.primary = "#00e2c5";
-            artist         = "#50ff00";
+          workspaces = {
+            active                          = "#05ff00";
+            numbered_active_underline_color = "#00d0d0";
+            occupied                        = "#00d0d0";
           };
+
+          modules = {
+            hypridle.enableBorder = true;
+            cava.enableBorder     = true;
+            netstat = {
+              enableBorder = false;
+              spacing      = "0.45em";
+            };
+          };
+        };
+
+        menus.menu.media = {
+          artist         = "#50ff00";
+          slider.primary = "#00e2c5";
         };
       };
     };
   };
-}
\ No newline at end of file
+
+  base = lib.recursiveUpdate tokyo mySettings;
+  withAppends = base // {
+    bar.layouts."2".right =
+      (base.bar.layouts."2".right or []) ++ [ "hyprsunset" "netstat" "updates" ];
+  };
+in {
+  programs.hyprpanel.settings = withAppends;
+}
diff --git a/home/hyprpaper.nix b/home/hyprpaper.nix
index 81b49a6..1ad6ae4 100644
--- a/home/hyprpaper.nix
+++ b/home/hyprpaper.nix
@@ -14,11 +14,12 @@
       ipc = "on";
       splash = false;
       preload = [
-        "/home/xbazzi/Pictures/wallpapers/cities"
+        "/home/xbazzi/Pictures/wallpapers/cities/sanfran.jpg"
+        "/home/xbazzi/Pictures/wallpapers/cities/dubai.jpg"
       ];
 
       wallpaper = [
-        ",/home/xbazzi/Pictures/wallpapers/Fantasy-Lake1.png"
+        ",/home/xbazzi/Pictures/wallpapers/cities/dubai.jpg"
       ];
     };
   };
diff --git a/home/kitty.nix b/home/kitty.nix
index 2429b12..90a72ba 100755
--- a/home/kitty.nix
+++ b/home/kitty.nix
@@ -7,18 +7,18 @@
 }:
 
 {
-  programs.kitty = lib.mkForce {
+  programs.kitty =  {
     enable = true;
     shellIntegration.enableZshIntegration = true;
     settings = {
       confirm_os_window_close = 0;
-      dynamic_background_opacity = true;
+      # dynamic_background_opacity = true;
       enable_audio_bell = false;
       mouse_hide_wait = "-1.0";
       window_padding_width = 5;
       # background_opacity = "0.95";
       # background_blur = 5;
-      background = "#17041c";
+      # background = "#ff00ff";
       hide_window_decorations = true;
       # themeFile = "Alucard";
       symbol_map =
@@ -48,3 +48,34 @@
     };
   };
 }
+
+# {
+#   config,
+#   lib,
+#   pkgs,
+#   ...
+# }:
+# let
+#   kittyConfig = ''
+#     font_size 16.0
+
+#     background_opacity 0.7
+#     background_blur 1
+
+#     hide_window_decorations yes
+
+#     map ctrl+shift+t new_tab_with_cwd
+#   '';
+# in
+# {
+#   home.packages = with pkgs; [
+#     kitty
+#   ];
+
+#   programs.kitty = {
+#      shellIntegration.enableZshIntegration = true;
+#     enable = true;
+
+#     extraConfig = kittyConfig;
+#   };
+# }
diff --git a/home/packages.nix b/home/packages.nix
index 251f077..fc1881b 100755
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -2,6 +2,8 @@
 
 {
   home.packages = with pkgs; [
+    kitty
+    btop
     hello
     tmux
     gnome-keyring
@@ -19,6 +21,9 @@
     hyprpanel
     wofi
 
+    # Python
+    python3Packages.gpustat
+
     # Old stuff for documentation
     # gnomeExtensions.appindicator
     # waybar
diff --git a/home/variables.nix b/home/variables.nix
index 8e8dba1..0598ec9 100755
--- a/home/variables.nix
+++ b/home/variables.nix
@@ -25,7 +25,7 @@
   #
   home.sessionVariables = {
     EDITOR = "nvim";
-    TERM = "xterm-kitty";
+    # TERM = "xterm-kitty";
   };
 
   home.sessionPath = [
diff --git a/home/walker.nix b/home/walker.nix
new file mode 100644
index 0000000..7b601dd
--- /dev/null
+++ b/home/walker.nix
@@ -0,0 +1,198 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+
+{
+  programs.walker = {
+    enable = true;
+    runAsService = true;
+    config = {
+      cache = false;
+      websearch = {
+        prefix = ":";
+      };
+
+      theme = "nixos";
+    };
+    theme.style = ''
+      @define-color selected-text #7dcfff;
+      @define-color text #cfc9c2;
+      @define-color base #1a1b26;
+      @define-color border #33ccff;
+      @define-color foreground #cfc9c2;
+      @define-color background #1a1b26;
+
+      /* Reset all elements */
+      #window,
+      #box,
+      #search,
+      #password,
+      #input,
+      #prompt,
+      #clear,
+      #typeahead,
+      #list,
+      child,
+      scrollbar,
+      slider,
+      #item,
+      #text,
+      #label,
+      #sub,
+      #activationlabel {
+        all: unset;
+      }
+
+      * {
+        font-family: 'CaskaydiaMono Nerd Font', monospace;
+        font-size: 18px;
+      }
+
+      /* Window */
+      #window {
+        background: transparent;
+        color: @text;
+      }
+
+      /* Main box container */
+      #box {
+        background: alpha(@base, 0.95);
+        padding: 20px;
+        border: 2px solid @border;
+        border-radius: 0px;
+      }
+
+      /* Search container */
+      #search {
+        background: @base;
+        padding: 10px;
+        margin-bottom: 0;
+      }
+
+      /* Hide prompt icon */
+      #prompt {
+        opacity: 0;
+        min-width: 0;
+        margin: 0;
+      }
+
+      /* Hide clear button */
+      #clear {
+        opacity: 0;
+        min-width: 0;
+      }
+
+      /* Input field */
+      #input {
+        background: none;
+        color: @text;
+        padding: 0;
+      }
+
+      #input placeholder {
+        opacity: 0.5;
+        color: @text;
+      }
+
+      /* Hide typeahead */
+      #typeahead {
+        opacity: 0;
+      }
+
+      /* List */
+      #list {
+        background: transparent;
+      }
+
+      /* List items */
+      child {
+        padding: 0px 12px;
+        background: transparent;
+        border-radius: 0;
+      }
+
+      child:selected,
+      child:hover {
+        background: transparent;
+      }
+
+      /* Item layout */
+      #item {
+        padding: 0;
+      }
+
+      #item.active {
+        font-style: italic;
+      }
+
+      /* Icon */
+      #icon {
+        margin-right: 10px;
+        -gtk-icon-transform: scale(0.7);
+      }
+
+      /* Text */
+      #text {
+        color: @text;
+        padding: 14px 0;
+      }
+
+      #label {
+        font-weight: normal;
+      }
+
+      /* Selected state */
+      child:selected #text,
+      child:selected #label,
+      child:hover #text,
+      child:hover #label {
+        color: @selected-text;
+      }
+
+      /* Hide sub text */
+      #sub {
+        opacity: 0;
+        font-size: 0;
+        min-height: 0;
+      }
+
+      /* Hide activation label */
+      #activationlabel {
+        opacity: 0;
+        min-width: 0;
+      }
+
+      /* Scrollbar styling */
+      scrollbar {
+        opacity: 0;
+      }
+
+      /* Hide spinner */
+      #spinner {
+        opacity: 0;
+      }
+
+      /* Hide AI elements */
+      #aiScroll,
+      #aiList,
+      .aiItem {
+        opacity: 0;
+        min-height: 0;
+      }
+
+      /* Bar entry (switcher) */
+      #bar {
+        opacity: 0;
+        min-height: 0;
+      }
+
+      .barentry {
+        opacity: 0;
+      }
+
+    '';
+  };
+}
\ No newline at end of file
diff --git a/home/wofi.nix b/home/wofi.nix
new file mode 100644
index 0000000..7fb7375
--- /dev/null
+++ b/home/wofi.nix
@@ -0,0 +1,114 @@
+# Wofi is a launcher for Wayland, inspired by rofi.
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  background = "#${config.lib.stylix.colors.base00}";
+  background-alt = "#${config.lib.stylix.colors.base01}";
+  foreground = "#${config.lib.stylix.colors.base05}";
+  # font = config.stylix.fonts.serif.name;
+  font = "Monaspace Krypton";
+  rounding = "5px";#config.theme.rounding;
+  font-size = config.stylix.fonts.sizes.popups;
+in {
+  home.packages = with pkgs; [wofi-emoji];
+
+  programs.wofi = {
+    enable = true;
+
+    settings = {
+      allow_markup = true;
+      width = 650;
+      show = "drun";
+      prompt = "Apps";
+      normal_window = true;
+      layer = "top";
+      height = "325px";
+      orientation = "vertical";
+      halign = "fill";
+      line_wrap = "off";
+      dynamic_lines = false;
+      allow_images = true;
+      image_size = 52;
+      exec_search = false;
+      hide_search = false;
+      parse_search = false;
+      insensitive = true;
+      hide_scroll = true;
+      no_actions = true;
+      sort_order = "default";
+      gtk_dark = true;
+      filter_rate = 100;
+      key_expand = "Tab";
+      key_exit = "Escape";
+    };
+
+    style =
+      lib.mkForce
+      # css
+      ''
+        * {
+          font-family: "${font}";
+          font-weight: 600;
+          font-size: ${toString font-size}px;
+        }
+
+        #window {
+          background-color: ${background};
+          color: ${foreground};
+          border-radius: ${rounding};
+        }
+
+        #outer-box {
+          padding: 20px;
+        }
+
+        #input {
+          background-color: ${background-alt};
+          border: 0px solid ${accent};
+          color: ${foreground};
+          padding: 8px 12px;
+        }
+
+        #scroll {
+          margin-top: 20px;
+        }
+
+        #inner-box {}
+
+        #img {
+          padding-right: 8px;
+        }
+
+        #text {
+          color: ${foreground};
+        }
+
+        #text:selected {
+          color: ${foreground};
+        }
+
+        #entry {
+          padding: 6px;
+        }
+
+        #entry:selected {
+          /*background-color: ${accent};*/
+          background-color: #11111;
+          color: #11111;
+        }
+
+        #unselected {}
+
+        #selected {}
+
+        #input,
+        #entry:selected {
+          border-radius: ${rounding};
+        }
+      '';
+  };
+}
\ No newline at end of file
diff --git a/system/cachix.nix b/system/cachix.nix
index 338e8f2..a4b3301 100755
--- a/system/cachix.nix
+++ b/system/cachix.nix
@@ -9,5 +9,16 @@ let
 in
 {
   inherit imports;
-  nix.settings.substituters = [ "https://cache.nixos.org/" ];
+  nix.settings = {
+    substituters = [ 
+      "https://hyprland.cachix.org"
+      "https://walker-git.cachix.org"
+      "https://walker.cachix.org"
+    ];
+    trusted-public-keys = [ 
+      "walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM="
+      "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+    ];
+  };
 }
diff --git a/system/configuration.nix b/system/configuration.nix
index 7edb4a9..388fbea 100755
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -43,10 +43,13 @@
     };
   };
 
-  nix.settings = {
-    substituters = [ "https://hyprland.cachix.org" ];
-    trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
-  };
+  # nix.settings = {
+  #   substituters = [ 
+  #     "https://hyprland.cachix.org"
+  #     "https://walker.cachix.org"
+  #   ];
+  #   trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
+  # };
 
   xdg.portal = {
     enable = true;
diff --git a/system/default.nix b/system/default.nix
index eb0dc8e..2e3043b 100755
--- a/system/default.nix
+++ b/system/default.nix
@@ -6,7 +6,7 @@
     ./fonts.nix
     ./ssh.nix
     # ./openrgb.nix
-    # ./stylix.nix
+    ./stylix.nix
     # ./gnome.nix
     # ./lanzaboote.nix
     ./nvidia.nix
diff --git a/system/packages.nix b/system/packages.nix
index 14c4f30..f30e07d 100755
--- a/system/packages.nix
+++ b/system/packages.nix
@@ -14,7 +14,7 @@
     libreoffice-qt
     hunspell
     hunspellDicts.en_US
-    kitty
+    # kitty
     git
     fastfetch
     wget
@@ -27,7 +27,6 @@
     xclip
     gparted
     htop
-    btop
     dig
     # netstat-net-tools
     prismlauncher
diff --git a/system/stylix.nix b/system/stylix.nix
index b88ef16..058ee1c 100644
--- a/system/stylix.nix
+++ b/system/stylix.nix
@@ -3,7 +3,10 @@
 {
   stylix = {
     enable = true;
-    image = ./forest.png;
+    # base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-storm.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";
+    # base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light.yaml";
+    # image = ./forest.png;
     polarity = "dark";
   };
 }