diff --git a/nix/modules/home/desktop/addons/waybar/default.nix b/nix/modules/home/desktop/addons/waybar/default.nix
index 0c25f03..f9200ad 100644
--- a/nix/modules/home/desktop/addons/waybar/default.nix
+++ b/nix/modules/home/desktop/addons/waybar/default.nix
@@ -68,57 +68,13 @@ in {
           };
 
           "hyprland/workspaces" = {
-            format = "{icon} {windows}";
+            format = "{icon}";
             on-click = "activate";
-            all-outputs = false;
-            active-only = "false";
+            all-outputs = true;
             format-icons = {
-              "1" = "󰎤";
-              "2" = "󰎧";
-              "3" = "󰎪";
-              "4" = "󰎭";
-              "5" = "󰎱";
-              "6" = "󰎳";
-              "7" = "󰎶";
-              "8" = "󰎹";
-              "9" = "󰎼";
-              "10" = "󰽽";
-              "urgent" = "󱨇";
-              "default" = "";
-              "empty" = "󱓼";
-            };
-            window-rewrite-default = "";
-            window-rewrite = {
-              "class<1Password>" = "󰢁";
-              "class<Caprine>" = "󰈎";
-              "class<Github Desktop>" = "󰊤";
-              "class<Godot>" = "";
-              "class<Mysql-workbench-bin>" = "";
-              "class<Slack>" = "󰒱";
-              "class<code>" = "󰨞";
-              "code-url-handler" = "󰨞";
-              "class<discord>" = "󰙯";
-              "class<firefox>" = "";
-              "class<firefox> title<.*github.*>" = "";
-              "class<firefox> title<.*twitch|youtube|plex|tntdrama|bally sports.*>" = "";
-              "class<kitty>" = "";
-              "class<org.wezfurlong.wezterm>" = "";
-              "class<mediainfo-gui>" = "󱂷";
-              "class<org.kde.digikam>" = "󰄄";
-              "class<org.telegram.desktop>" = "";
-              "class<.pitivi-wrapped>" = "󱄢";
-              "class<steam>" = "";
-              "class<thunderbird>" = "";
-              "class<virt-manager>" = "󰢹";
-              "class<vlc>" = "󰕼";
-              "class<thunar>" = "󰉋";
-              "class<org.gnome.Nautilus>" = "󰉋";
-              "class<Spotify>" = "";
-              "title<Spotify Free>" = "";
-              "class<libreoffice-draw>" = "󰽉";
-              "class<libreoffice-writer>" = "";
-              "class<libreoffice-calc>" = "󱎏";
-              "class<libreoffice-impress>" = "󱎐";
+              "urgent" = " ";
+              "active" = " ";
+              "default" = " ";
             };
           };
 
diff --git a/nix/modules/home/desktop/addons/waybar/style.css b/nix/modules/home/desktop/addons/waybar/style.css
index 47da4e0..ee4c409 100644
--- a/nix/modules/home/desktop/addons/waybar/style.css
+++ b/nix/modules/home/desktop/addons/waybar/style.css
@@ -1,39 +1,3 @@
-/*
-*
-* Catppuccin Macchiato palette
-*
-*/
-
-@define-color base   #24273a;
-@define-color mantle #1e2030;
-@define-color crust  #181926;
-
-@define-color text     #cad3f5;
-@define-color subtext0 #b8c0e0;
-@define-color subtext1 #a5adcb;
-
-@define-color surface0 #363a4f;
-@define-color surface1 #494d64;
-@define-color surface2 #5b6078;
-
-@define-color overlay0 #6e738d;
-@define-color overlay1 #8087a2;
-@define-color overlay2 #939ab7;
-
-@define-color blue      #8aadf4;
-@define-color lavender  #b7bdf8;
-@define-color sapphire  #7dc4e4;
-@define-color sky       #91d7e3;
-@define-color teal      #8bd5ca;
-@define-color green     #a6da95;
-@define-color yellow    #eed49f;
-@define-color peach     #f5a97f;
-@define-color maroon    #ee99a0;
-@define-color red       #ed8796;
-@define-color mauve     #c6a0f6;
-@define-color pink      #f5bde6;
-@define-color flamingo  #f0c6c6;
-@define-color rosewater #f4dbd6;
 * {
   border: none;
   border-radius: 0;
@@ -44,7 +8,7 @@
 
 window#waybar {
   background: rgba(0, 0, 0, 0.4);
-  /* background: rgba(30, 32, 48, 0.5); */
+  background: rgba(30, 32, 48, 0.5);
   /* background: rgba(0, 0, 0, 0.4); */
   color: rgba(255, 255, 255, 1);
   border-bottom: 1px solid rgba(255, 255, 255, 0.2);
@@ -78,6 +42,25 @@ widget image {
   /* padding: 0 8px; */
 }
 
+#workspaces {
+  color: white;
+  background: rgba(255, 255, 255, 0.2);
+  margin-right: 8px;
+}
+
+#workspaces button {
+  padding: 0;
+}
+#workspaces button label {
+  padding: 0 6px 0 8px;
+  color: white;
+  font-size: 14px;
+}
+
+#workspaces button.focused {
+  background: rgba(255, 255, 255, 0.3);
+}
+
 @keyframes blink {
   to {
     background-color: #ffffff;
@@ -94,39 +77,3 @@ widget image {
   animation-iteration-count: infinite;
   animation-direction: alternate;
 }
-
-
-#workspaces {
-  color: white;
-  /* background: rgba(255, 255, 255, 0.2); */
-  margin-right: 8px;
-}
-
-#workspaces label {
-  padding: 0 6px 0 8px;
-  font-size: 14px;
-}
-
-#workspaces button {
-  color: white;
-  padding: 0; 
-}
-
-#workspaces button.empty {
-  color: @overlay0;
-}
-
-#workspaces button.visible {
-  color: @blue;
-}
-
-#workspaces button.active {
-  background-color: @surface0;
-  color: @sapphire;
-}
-
-#workspaces button.urgent {
-  box-shadow: 2px 2px 2px 2px;
-  border-radius: 1em;
-  color: @red;
-}