diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 401b7c0..d58657f 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -20,7 +20,22 @@
         "tray"
     ],
     "hyprland/workspaces": {
-        "format": "{id}"
+        "all-outputs": true,
+        "format": "{id} {windows}",
+        "format-window-separator": "",
+        "window-rewrite-default": "󰘔",
+        "window-rewrite": {
+            "class<firefox>": "",
+            "class<org\.wezfurlong\.wezterm>": "",
+            "class<Alacritty>": "",
+            "class<code|Code|codium|VSCodium>": "󰨞",
+            "class<thunar>": "",
+            "class<org\.kde\.dolphin>": "",
+            "class<discord>": "",
+            "class<vesktop>": "",
+            "class<spotify>": "",
+            "class<steam>": ""
+        }
     },
     "custom/screenshot": {
         "exec": "printf '{\"text\": \"󰄀\", \"tooltip\": \"Area screenshot: edit in Swappy, copy to clipboard, save to NAS pictures if mounted\"}'",
@@ -34,6 +49,16 @@
             "activated": "",
             "deactivated": ""
         }
+        "hyprland/window": {
+            "format": "{class}: {title}",
+            "icon": true,
+            "icon-size": 16,
+            "max-length": 80,
+            "separate-outputs": true,
+            "rewrite": {
+                "^(.*)$": "$1"
+            }
+        },
     },
     "tray": {
         "spacing": 10
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 6cf9cc2..8c63a5b 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -30,6 +30,10 @@ tooltip {
   margin: 0 2px;
 }
 
+#workspaces button label {
+  font-weight: 600;
+}
+
 #workspaces button:hover {
   background: alpha(#4c566a, 0.55);
 }
@@ -39,6 +43,11 @@ tooltip {
   background: #88c0d0;
 }
 
+#workspaces button.visible {
+  color: #eceff4;
+  background: alpha(#5e81ac, 0.28);
+}
+
 #workspaces button.urgent {
   color: #eceff4;
   background: #bf616a;