diff --git a/modules/home/waybar/settings.nix b/modules/home/waybar/settings.nix
index 15d4037..919fecd 100644
--- a/modules/home/waybar/settings.nix
+++ b/modules/home/waybar/settings.nix
@@ -29,20 +29,28 @@
         tooltip-format= "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
         format-alt= " {:%d/%m}";
     };
-    "wlr/workspaces"= {
+    "hyprland/workspaces"= {
         active-only= false;
-        all-outputs= false;
-        disable-scroll= false;
-        on-scroll-up= "hyprctl dispatch workspace e-1";
-        on-scroll-down= "hyprctl dispatch workspace e+1";
-        format = "{name}";
+        disable-scroll= true;
+        format = "{icon}";
         on-click= "activate";
         format-icons= {
-            urgent= "";
-            active= "";
-            default = "";
+            "1"= "󰈹";
+            "2"= "";
+            "3"= "󰙯";
+            "4"= "󰘙";
+            "5"= "";
+            urgent= "";
+            default = "";
             sort-by-number= true;
         };
+        persistent-workspaces = {
+            "1"= [];
+            "2"= [];
+            "3"= [];
+            "4"= [];
+            "5"= [];
+        };
     };
     memory= {
         format= "󰟜 {}%";
diff --git a/modules/home/waybar/style.nix b/modules/home/waybar/style.nix
index eb0d95d..db32a12 100644
--- a/modules/home/waybar/style.nix
+++ b/modules/home/waybar/style.nix
@@ -21,8 +21,6 @@ in
         min-height: 0px;
         font-family: ${custom.font};
         font-weight: ${custom.font_weight};
-        font-size: ${custom.font_size};
-        color: ${custom.text_color};
         opacity: ${custom.opacity};
     }
 
@@ -31,12 +29,25 @@ in
     }
 
     #workspaces {
+        font-size: 18px;
+        padding-left: 15px;
+        
     }
     #workspaces button {
+        color: ${custom.text_color};
+        padding-left:  6px;
+        padding-right: 6px;
+    }
+    #workspaces button.empty {
+        color: #6c7086;
     }
     #workspaces button.active {
+        color: #b4befe;
     }
-    #workspaces button:hover {
+
+    #tray, #pulseaudio, #network, #cpu, #memory, #disk, #clock {
+        font-size: ${custom.font_size};
+        color: ${custom.text_color};
     }
 
     #cpu {
@@ -72,9 +83,13 @@ in
         padding-left: 9px;
         padding-right: 15px;
     }
+
     #custom-launcher {
-        margin-left: 10px;
-        font-size: 22px;
+        font-size: 20px;
+        color: #b4befe;
+        font-weight: ${custom.font_weight};
+        padding-left: 10px;
+        padding-right: 15px;
     }
   '';
 }