diff --git a/dot_config/hypr/hyprland.conf.tmpl b/dot_config/hypr/hyprland.conf.tmpl
index 7711319..c83f375 100644
--- a/dot_config/hypr/hyprland.conf.tmpl
+++ b/dot_config/hypr/hyprland.conf.tmpl
@@ -18,27 +18,26 @@ xwayland {
 ### MY PROGRAMS ###
 ###################
 
-$terminal = uwsm app -- kitty
-$browser = uwsm app -- zen-browser
-$hyprlock = uwsm app -- hyprlock
-$hyprshot = uwsm app -- hyprshot
-$menu = uwsm app -- fuzzel
+$terminal = uwsm-app -- kitty
+$browser = uwsm-app -- zen-browser
+$hyprlock = uwsm-app -- hyprlock
+$hyprshot = uwsm-app -- hyprshot
 
 #################
 ### AUTOSTART ###
 #################
 
-exec-once = uwsm app -- udiskie
-exec-once = uwsm app -- waybar
-exec-once = uwsm app -- dunst
-exec-once = uwsm app -- wl-paste --watch cliphist store
-exec-once = uwsm app -- hypridle
-exec-once = uwsm app -- hyprpaper
-exec-once = uwsm app -- hyprsunset
-exec-once = [workspace 1] $terminal
-exec-once = [workspace 2 silent] $browser
+exec-once = uwsm-app -- udiskie
+exec-once = uwsm-app -- waybar
+exec-once = uwsm-app -- dunst
+exec-once = uwsm-app -- wl-paste --watch cliphist store
+exec-once = uwsm-app -- hypridle
+exec-once = uwsm-app -- hyprpaper
+exec-once = uwsm-app -- hyprsunset
+exec-once = [workspace 1] uwsm-app -- $terminal
+exec-once = [workspace 2 silent] uwsm-app -- $browser
 {{- if eq .chezmoi.hostname "wkz-lapdog" }}
-exec-once = uwsm app -- iio-hyprland
+exec-once = uwsm-app -- iio-hyprland
 {{- end }}
 
 #############################
@@ -207,19 +206,19 @@ bind = $mainMod, Q, exec, $browser
 bind = $mainMod, W, killactive,
 bind = $mainMod CTRL SHIFT, Q, exit,
 bind = $mainMod, C, togglefloating,
-bind = $mainMod, SPACE, exec, $menu
+bind = $mainMod, SPACE, exec, uwsm-app -- fuzzel
 bind = $mainMod SHIFT, J, togglesplit, # dwindle
 bind = $mainMod, F, fullscreen, 1
 bind = $mainMod SHIFT, F, fullscreen, 0
 # Hyprlock
 bind = $mainMod SHIFT, L, exec, $hyprlock
 # Cliphist
-bind = $mainMod, V, exec, pkill fuzzel || cliphist list | fuzzel -d -w 75 --select-index 1 | cliphist decode | wl-copy
+bind = $mainMod, V, exec, pkill fuzzel || cliphist list | uwsm-app -- fuzzel -d -w 75 --select-index 1 | cliphist decode | wl-copy
 # Hyprshot
 bind = $mainMod SHIFT, S, exec, $hyprshot -m region --clipboard-only
 bind = $mainMod SHIFT CTRL, S, exec, $hyprshot -m window --clipboard-only
 bind = $mainMod SHIFT ALT, S, exec, $hyprshot -m output --clipboard-only
-bind = $mainMod SHIFT, B, exec, pkill fuzzel || bluetoothctl -- connect "$(bluetoothctl -- devices Paired | cut -f2- -d ' ' | fuzzel -d -l 8 | cut -f1 -d ' ')"
+bind = $mainMod SHIFT, B, exec, pkill fuzzel || bluetoothctl -- connect "$(bluetoothctl -- devices Paired | cut -f2- -d ' ' | uwsm-app -- fuzzel -d -l 8 | cut -f1 -d ' ')"
 bind = $mainMod SHIFT, A, exec, ~/scripts/select-audio-sink.sh
 
 # Move focus