diff --git a/.config/fish/functions/menu.fish b/.config/fish/functions/menu.fish
index 04df272..ac9af13 100644
--- a/.config/fish/functions/menu.fish
+++ b/.config/fish/functions/menu.fish
@@ -21,5 +21,5 @@ function menu --description 'Opens a menu of a list of Strings and writes the re
 		set -a fuzzel_args "--index"
 	end
 
-	string join -- \n $argv | fuzzel --dmenu $fuzzel_args
+	string unescape (string join -- \n $argv) | fuzzel --dmenu $fuzzel_args
 end
diff --git a/.config/fuzzel/fuzzel.ini b/.config/fuzzel/fuzzel.ini
index fd3c3d7..3003129 100644
--- a/.config/fuzzel/fuzzel.ini
+++ b/.config/fuzzel/fuzzel.ini
@@ -51,7 +51,7 @@ inner-pad=4
 
 [colors]
 background=191919ff
-text=ffffffff
+text=999999ff
 message=7f7f7fff
 prompt=999999ff
 placeholder=505050ff
diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl
index 48c6e27..38a71af 100644
--- a/.config/niri/config.kdl
+++ b/.config/niri/config.kdl
@@ -387,6 +387,7 @@ binds {
 	// Suggested binds for running programs: terminal, app launcher, screen locker.
 	Mod+Return hotkey-overlay-title="Open a Terminal: alacritty" { spawn-sh "alacritty msg create-window"; }
 	Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
+	Mod+Shift+D hotkey-overlay-title="Switch to Window: fuzzel" { spawn "windowmenu.fish"; }
 	Mod+B hotkey-overlay-title="Search the Web: fuzzel" { spawn "browserprompt.fish"; }
 	Mod+E hotkey-overlay-title="Open Email Client: evolution" { spawn "evolution"; }
 	Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 3175bab..1c2dc24 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -76,7 +76,7 @@
         "format": "{icon}",
         "format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
         "format-charging": "󰂄",
-        "tooltip-format": "Battery ({capacity}%)\n{power}W {time}"
+        "tooltip-format": "Battery ({capacity}%)\n{time}\n{power}W"
     },
 
     "clock": {
@@ -91,9 +91,9 @@
             "on-click-right": "mode",
             "format": {
                 "months":     "<span color='#ffffff'><b>{}</b></span>",
-                "days":       "<span color='#999999'>{}</span>",
-                "weeks":      "<span color='#505050'>W{}</span>",
-                "weekdays":   "<span color='#7f7f7f'>{}</span>",
+                "days":       "<span color='#ffffff'>{}</span>",
+                "weeks":      "<span color='#7f7f7f'>W{}</span>",
+                "weekdays":   "<span color='#999999'>{}</span>",
                 "today":      "<span color='#7fc8ff'><b>{}</b></span>"
             }
         },
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index a203a68..c9160e0 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,7 +1,6 @@
 * {
 	/* `otf-font-awesome` is required to be installed for icons */
-	font-family: Symbols Nerd Font, Adwaita Sans, sans-serif;
-	font-weight: 600;
+	font-family: Symbols Nerd Font, sans-serif;
 	font-size: 14px;
 }
 
diff --git a/.local/scripts/windowmenu.fish b/.local/scripts/windowmenu.fish
new file mode 100755
index 0000000..877a631
--- /dev/null
+++ b/.local/scripts/windowmenu.fish
@@ -0,0 +1,21 @@
+#!/usr/bin/env fish
+
+set windows
+
+# while read i; do
+#   declare -a line_array="($i)"
+#   window_ids+=(${line_array[0]})
+#   window_titles+=("${line_array[1]} - ${line_array[2]} \0icon\x1f${line_array[1]}")
+# done <<<$(niri msg --json windows | jq -r '.[] | [ .id, .app_id, .title] | "\""+join ("\" \"")+"\""')
+#
+set windows (niri msg --json windows | jq -r '.[] | [ .id, .app_id, .title] | join(" ")')
+
+set ids (string split --max 2 --field 1 " " $windows)
+
+for window in $windows
+    set -a options (string join -- ' ' (string split --max 1 --fields 2 ' ' $window) "\0icon\x1f$(string split --max 2 --field 2 ' ' $window)" )
+end
+
+set input (menu --index $options)
+
+niri msg action focus-window --id $ids[(math "$input+1")]
diff --git a/.local/share/applications/ardour8.desktop b/.local/share/applications/ardour8.desktop
index 10758aa..934ff95 100644
--- a/.local/share/applications/ardour8.desktop
+++ b/.local/share/applications/ardour8.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Ardour 8.12.0
 Comment=Record, mix and master audio
-Exec=systemd-inhibit --what=idle --who=ardour8 --why=Idle breaks audio --mode=block ardour8
+Exec=ardour8
 Icon=ardour8
 Terminal=false
 MimeType=application/x-ardour;