diff --git a/home/system/hyprland/hyprpanel.nix b/home/system/hyprland/hyprpanel.nix
index b7f26cb..f002f06 100644
--- a/home/system/hyprland/hyprpanel.nix
+++ b/home/system/hyprland/hyprpanel.nix
@@ -76,6 +76,9 @@
           "theme.bar.buttons.padding_x": "0.8rem",
           "theme.bar.buttons.padding_y": "0.4rem",
 
+          "theme.bar.buttons.workspaces.hover": "#${config.var.theme.colors.accentalt}",
+          "theme.bar.buttons.workspaces.active": "#${config.var.theme.colors.accent}",
+          "theme.bar.buttons.workspaces.available": "#${config.var.theme.colors.bg}",
 
           "theme.bar.margin_top": "1.0em",
           "theme.bar.margin_sides": "${toString config.var.theme.gaps-out}px",
diff --git a/hosts/themes/windows.nix b/hosts/themes/windows.nix
new file mode 100644
index 0000000..64a60bd
--- /dev/null
+++ b/hosts/themes/windows.nix
@@ -0,0 +1,52 @@
+{
+  wallpaper = "moutains_black.png";
+
+  font = "SFProDisplay Nerd Font";
+  font-mono = "FiraCode Nerd Font Mono";
+  font-size = 14;
+
+  rounding = 10;
+  gaps-in = 6;
+  gaps-out = 6 * 2;
+  border-size = 1;
+  animation-speed = "medium"; # "fast" | "medium" | "slow"
+  fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
+
+  bar = {
+    transparent = false;
+    floating = false;
+    font-size = 16;
+  };
+
+  colors = {
+    c0 = "1e1e2e"; # black
+    c1 = "f38ba8"; # red
+    c2 = "a6e3a1"; # green
+    c3 = "fab387"; # yellow
+    c4 = "89b4fa"; # blue
+    c5 = "A594FD"; # magenta
+    c6 = "74c7ec"; # cyan
+    c7 = "cdd6f4"; # white
+    c8 = "313244"; # bright black
+    c9 = "eba0ac"; # bright red
+    c10 = "94e2d5"; # bright green
+    c11 = "f9e2af"; # bright yellow
+    c12 = "b4befe"; # bright blue
+    c13 = "f5c2e7"; # bright magenta
+    c14 = "94e2d5"; # bright cyan
+    c15 = "bac2de"; # bright white
+
+    bg = "0B0B1B";
+    fg = "EAF0F5";
+    bgalt = "121222";
+    fgalt = "EAF0F5";
+
+    accent = "74c7ec";
+    accentFg = "1E1E2E";
+    accentalt = "94e2d5";
+
+    # Should make those automtic
+    accentName = "cyan";
+    accentNumber = "6";
+  };
+}