diff --git a/desktop/.config/waybar/config b/desktop/.config/waybar/config
index 6ead0b9..54794f6 100644
--- a/desktop/.config/waybar/config
+++ b/desktop/.config/waybar/config
@@ -1,13 +1,13 @@
 {
     "layer": "top",
-    "modules-left": ["river/tags", "custom/events", "custom/vidl"],
+    "modules-left": ["river/tags", "custom/events", "custom/vidl", "river/window"],
     "modules-center": ["clock", "custom/media"],
-    "modules-right": ["custom/wireguard", "custom/archupdates", "pulseaudio", "backlight", "network", "cpu", "memory", "temperature", "battery", "tray"],
+    "modules-right": ["river/mode", "custom/wireguard", "custom/archupdates", "pulseaudio", "backlight", "network", "cpu", "memory", "temperature", "battery", "tray"],
     "custom/archupdates": {
         "format": "{} {icon}",
         "format-alt-click": "right",
         "format-icons": {
-            "default": ""
+            "default": ""
         },
         "return-type": "json",
         "exec": "~/.config/waybar/modules/archupdates 5 json",
@@ -56,7 +56,8 @@
         },
         "exec": "~/.config/waybar/modules/khal.py 2>/dev/null",
         "exec-if": "command -v khal >/dev/null 2>&1",
-        "return-type": "json"
+        "return-type": "json",
+        "on-click": "$TERMINAL start --class float ikhal"
     },
     "memory": {
         "interval": 30,
@@ -105,14 +106,13 @@
         "on-click-right": "playerctl stop",
     },
     "network": {
-        "interface": "wlp58s0",
         "format": "{ifname}",
         "format-wifi": "{signalStrength}% ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
-        "format-disconnected": "睊", 
-        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-ethernet": "{ipaddr}/{cidr} 󰈀",
+        "format-disconnected": "󰖪", 
+        "tooltip-format": "{ifname} via {gwaddr} 󰈁",
         "tooltip-format-wifi": "{essid}: {bandwidthDownBits}-{bandwidthUpBits} ({signalStrength}%)  {ifname}",
-        "tooltip-format-ethernet": "{ifname} ",
+        "tooltip-format-ethernet": "{ifname} 󰈀",
         "tooltip-format-disconnected": "Disconnected",
         "max-length": 50,
         "on-click": "$TERMINAL start --class float nmtui",
@@ -140,6 +140,13 @@
         "num-tags": 10,
         "tag-labels": [ "", "", "", "", "", "", "", "", "", "" ]
     },
+    "river/mode": {
+        "format": "{} 󱐁",
+    },
+    "river/window": {
+        "format": " {}",
+        "max-length": 70
+    },
     "temperature": {
         // "thermal-zone": 2,
         "hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
@@ -171,7 +178,7 @@
         "format": "{} {icon}",
         "format-alt-click": "right",
         "format-icons": {
-            "default": ""
+            "default": ""
         },
         "exec": "wc -l ~/.local/share/vidl/vidl_queue | cut -d' ' -f1",
         "exec-if": "[ -f ~/.local/share/vidl/vidl_queue ]",
diff --git a/desktop/.config/waybar/style.css b/desktop/.config/waybar/style.css
index 9ec5143..465be18 100644
--- a/desktop/.config/waybar/style.css
+++ b/desktop/.config/waybar/style.css
@@ -2,6 +2,7 @@
     border: none;
     border-radius: 0;
     min-height: 0;
+    font-family: Iosevka Nerd Font, Iosevka, monospace;
 }
 
 window#waybar {
@@ -57,6 +58,7 @@ window#waybar.hidden {
 #mode,
 #idle_inhibitor,
 #mpd,
+#window,
 #custom-archupdates,
 #custom-wireguard,
 #custom-events,
@@ -82,6 +84,14 @@ window#waybar.hidden {
     background-color: @base02;
 }
 
+/* Mark active output through highlighted window background */
+#window {
+    background-color: transparent;
+}
+#window.focused {
+    background-color: @base01;
+}
+
 #battery.warning {
     background-color: @base09;
     color: @base00;