diff --git a/modules/desktop/de/hyprland.nix b/modules/desktop/de/hyprland.nix
index e4e8e7a..6e9c3bd 100644
--- a/modules/desktop/de/hyprland.nix
+++ b/modules/desktop/de/hyprland.nix
@@ -2,6 +2,7 @@
 
 {
   programs.hyprland.enable = true;
+  programs.hyprland.withUWSM = true;
   # Optional, hint electron apps to use wayland:
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
diff --git a/stow/.config/hypr/hyprland.conf b/stow/.config/hypr/hyprland.conf
index b1cfc5f..518b0a9 100755
--- a/stow/.config/hypr/hyprland.conf
+++ b/stow/.config/hypr/hyprland.conf
@@ -13,17 +13,17 @@ monitor=eDP-1,1920x1080@60,auto,1
 # Autostart necessary processes (like notifications daemons, status bars, etc.)
 # Or execute your favorite apps at launch like this:
 
-exec-once = swww-daemon &
-exec-once = waybar &
-exec-once = swaync &
-exec-once = hyprshade auto &
-exec-once = walker --gapplication-service
+exec-once = uwsm app -- swww-daemon
+exec-once = uwsm app -- waybar
+exec-once = uwsm app -- swaync
+exec-once = hyprshade auto
+exec-once = walker -A
 
-exec-once = opensnitch-ui
+exec-once = uwsm app -- opensnitch-ui
 exec-once = systemctl start --user polkit-gnome-authentication-agent-1.service
-exec-once = fcitx5 &
-exec-once = steam -silent &
-exec-once = 1password --silent &
+exec-once = uwsm app -- fcitx5
+exec-once = uwsm app -- steam -silent
+exec-once = uwsm app -- 1password --silent
 
 #############################
 ### ENVIRONMENT VARIABLES ###
@@ -165,18 +165,18 @@ device {
 $mainMod = SUPER # Sets "Windows" key as main modifier
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, ghostty
-bind = $mainMod, B, exec, firefox
+bind = $mainMod, Q, exec, uwsm app -- ghostty
+bind = $mainMod, B, exec, uwsm app -- firefox
 bind = $mainMod, D, exec, walker
-bind = $mainMod shift, D, exec, 1password --quick-access
-bind = $mainMod, S, exec, hyprshot -z --clipboard-only -m region
-bind = $mainMod shift, S, exec, hyprshot -z --clipboard-only -m window
-bind = $mainMod control, S, exec, hyprshot -z --clipboard-only -m active
-bind = $mainMod, V, exec, sh ~/.config/hypr/hyprlock.sh
+bind = $mainMod shift, D, exec, uwsm app -- 1password --quick-access
+bind = $mainMod, S, exec, uwsm app -- hyprshot -z --clipboard-only -m region
+bind = $mainMod shift, S, exec, uwsm app -- hyprshot -z --clipboard-only -m window
+bind = $mainMod control, S, exec, uwsm app -- hyprshot -z --clipboard-only -m active
+bind = $mainMod, V, exec, uwsm app -- sh ~/.config/hypr/hyprlock.sh
 
 bind = $mainMod, SPACE, togglefloating,
 bind = $mainMod, W, killactive,
-bind = $mainMod, M, exit,
+bind = $mainMod, M, exec, uwsm stop
 
 #bind = $mainMod, P, pseudo, # dwindle # have no clue what this does
 bind = $mainMod, F, fullscreen