diff --git a/hyprland/.config/waybar/config b/hyprland/.config/waybar/config
index 13bcd357..913c9ef3 100644
--- a/hyprland/.config/waybar/config
+++ b/hyprland/.config/waybar/config
@@ -6,7 +6,7 @@
 	"margin-top": 16,
 	"margin-left": 16,
 	"margin-right": 16,
-	"modules-left": ["hyprland/workspaces", "sway/mode"],
+	"modules-left": ["hyprland/workspaces", "hyprland/window", "sway/mode"],
 	"modules-right": ["tray"],
 	"hyprland/workspaces": {
 		"all-outputs": false,
@@ -18,6 +18,7 @@
 		}
 	},
 	"hyprland/window": {
+		"separate-outputs": true,
 		"format": "{}"
 	},
 	"tray": {
diff --git a/hyprland/.config/waybar/style.css b/hyprland/.config/waybar/style.css
index b434d7d7..62513066 100644
--- a/hyprland/.config/waybar/style.css
+++ b/hyprland/.config/waybar/style.css
@@ -24,7 +24,7 @@ window#waybar {
 	border-radius: 8px;
 }
 
-/* swaywm stuff */
+/* Hypr stuff */
 #workspaces {
 }
 #workspaces button {
@@ -61,17 +61,26 @@ window#waybar {
 	color: #fabd2f;
 	font-weight: bold;
 }
-#mode {
-	background: #fb4934;
-	color: rgba(235, 219, 178, 0.8);
+/* Window and mode display */
+#window {
+	color: rgba(235, 219, 178, 0.4);
 	padding: 0 1em;
+	border-radius: 8px;
+}
+window#waybar.empty #window {
+	/* We do this so it properly hides when on an empty workspace */
+	padding: 0;
+}
+window#waybar.solo #window {
+	/* Nothing */
+}
+window#waybar.floating #window {
+	/* Workspace contains only floating windows */
+	color: rgba(40, 40, 40, 0.8);
+	background: #8ec07c;
 }
 
 /* widgets */
-#window {
-	color: #ebdbb2;
-	padding: 0 1em;
-}
 #pulseaudio {
 	padding: 0 1em;
 	color: #ebdbb2;