diff --git a/home/desktop/config/waybar/modules.json b/home/desktop/config/waybar/modules.json
index 0d53cc4e..6f98548d 100644
--- a/home/desktop/config/waybar/modules.json
+++ b/home/desktop/config/waybar/modules.json
@@ -171,31 +171,13 @@
         "disable-scroll": true,
         "all-outputs": false,
         "sort-by-number": true,
-        "format": "{name}:{icon}",
-        "format-icons": {
-            "1": "󰅴",
-            "2": "󰈹",
-            "3": "󰻞",
-            "4": "󰒍",
-            "urgent": "",
-            "focused": "",
-            "default": ""
-        }
+        "format": "{name}"
     },
     "sway/workspaces": {
         "on-click": "activate",
         "disable-scroll": true,
         "all-outputs": false,
         "sort-by-number": true,
-        "format": "{name}:{icon}",
-        "format-icons": {
-            "1": "󰅴",
-            "2": "󰈹",
-            "3": "󰻞",
-            "4": "󰒍",
-            "urgent": "",
-            "focused": "",
-            "default": ""
-        }
+        "format": "{name}"
     }
 }
diff --git a/home/desktop/config/waybar/style.css b/home/desktop/config/waybar/style.css
index e9a21cc5..6aa32280 100644
--- a/home/desktop/config/waybar/style.css
+++ b/home/desktop/config/waybar/style.css
@@ -46,12 +46,12 @@ window#waybar.hidden {
 }
 
 /* left section */
-#workspaces,
+#clock,
 #cpu,
 #memory,
 #temperature,
 /* centre section */
-#clock,
+#workspaces,
 /* right section */
 #pulseaudio,
 #bluetooth,
@@ -70,10 +70,9 @@ window#waybar.hidden {
     background: @lavender;
 }
 
-#workspaces {
+#clock {
     background: @lavender;
 }
-
 #cpu {
     background: @pink;
 }
@@ -83,7 +82,7 @@ window#waybar.hidden {
 #temperature {
     background: @red;
 }
-#clock {
+#workspaces {
     background: @yellow;
 }
 #pulseaudio {
diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix
index 8311d56a..f4d0acb0 100644
--- a/home/desktop/hyprland.nix
+++ b/home/desktop/hyprland.nix
@@ -180,9 +180,6 @@
     windowrule = center, ^(pavucontrol)$
     windowrule = center, ^(.blueman-manager-wrapped)$
     windowrule = move 2% 6%, ^(otpclient)$
-
-    windowrule = workspace 2, ^(firefox)$
-    windowrule = workspace 3 silent, ^(Signal|fractal|discord|teams-for-linux)$
   '';
   xdg.configFile."hypr/macchiato.conf".text = ''
     $rosewaterAlpha = f4dbd6
diff --git a/home/desktop/waybar.nix b/home/desktop/waybar.nix
index 4adc9d09..93b840b2 100644
--- a/home/desktop/waybar.nix
+++ b/home/desktop/waybar.nix
@@ -1,4 +1,8 @@
-{pkgs, lib, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   home.packages = with pkgs; [
     (nerdfonts.override {fonts = ["FiraCode"];})
     bluez
@@ -15,13 +19,13 @@
         "~/.config/waybar/layout.json"
       ];
       "modules-left" = lib.mkDefault [
-        "wlr/workspaces"
+        "clock"
         "cpu"
         "memory"
         "temperature"
       ];
       "modules-center" = lib.mkDefault [
-        "clock"
+        "wlr/workspaces"
       ];
       "modules-right" = lib.mkDefault [
         "pulseaudio"
diff --git a/users/elitherl/Ronin.nix b/users/elitherl/Ronin.nix
index b85653e9..dff10fea 100644
--- a/users/elitherl/Ronin.nix
+++ b/users/elitherl/Ronin.nix
@@ -36,9 +36,9 @@ in {
           "~/.config/waybar/layout.json"
         ];
         "output" = "DP-4";
-        "modules-left" = ["wlr/workspaces"];
-        "modules-center" = ["clock#compact"];
-        "modules-right" = ["tray"];
+        "modules-left" = [];
+        "modules-center" = ["wlr/workspaces"];
+        "modules-right" = [];
       };
     };
   };