diff --git a/hyprland.conf b/hyprland.conf
index 8e5131d..aad65a3 100644
--- a/hyprland.conf
+++ b/hyprland.conf
@@ -31,11 +31,11 @@ xwayland {
 # See https://wiki.hyprland.org/Configuring/Keywords/
 
 # Set programs that you use
-$terminal = ghostty
-$fileManager = dolphin
-$menu = rofi -show drun
+$terminal = uwsm app -- ghostty
+$fileManager = uwsm app -- dolphin
+$menu = rofi -show drun -run-command "uwsm app -- {cmd}"
 # $notification_daemon = dunst
-$notification_daemon = swaync
+$notification_daemon = uwsm app -- swaync
 
 
 #################
@@ -47,11 +47,12 @@ $notification_daemon = swaync
 
 exec-once = $notification_daemon
 exec-once = $terminal
-exec-once = hyprpm reload -n
-exec-once = nm-applet &
-exec-once = waybar
-exec-once = hyprsunset
-exec-once = /usr/lib/polkit-kde-authentication-agent-1
+exec-once = uwsm app -sb -S both -t scope -- hyprpm update -nn
+exec-once = uwsm app -sb -S both -t scope -- hyprpm reload -nn
+exec-once = uwsm app -sb -t service -- nm-applet
+exec-once = uwsm app -sb -t service -- waybar
+exec-once = uwsm app -sb -t service -- hyprsunset
+exec-once = uwsm app -sb -t service -- polkit-kde-authentication-agent-1.desktop
 
 
 #############################
diff --git a/keybindings.conf b/keybindings.conf
index a55f738..2c706bf 100644
--- a/keybindings.conf
+++ b/keybindings.conf
@@ -1,8 +1,9 @@
 # Set programs that you use
-$terminal = ghostty
-$fileManager = dolphin
-# $menu = wofi --show drun
-$menu = rofi -show drun
+$terminal = uwsm app -sa -- ghostty
+$fileManager = uwsm app -sa -- dolphin
+# $menu = rofi -show drun
+# https://github.com/Vladimir-csp/uwsm#2-service-startup-notification-and-vars-set-by-compositor
+$menu = rofi -show drun -run-command "uwsm app -- {cmd}"
 # See https://wiki.hyprland.org/Configuring/Keywords/
 $mainMod = ALT # Sets "Windows" key as main modifier
 
@@ -10,7 +11,7 @@ $mainMod = ALT # Sets "Windows" key as main modifier
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, RETURN, exec, $terminal
 bind = $mainMod, Q, killactive,
-# bind = $mainMod, M, exex uswm stop,
+bind = $mainMod, M, exec, uwsm stop,
 bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, V, togglefloating,
 bind = $mainMod, d, exec, $menu
@@ -23,6 +24,12 @@ bind = $mainMod, l, movefocus, r
 bind = $mainMod, k, movefocus, u
 bind = $mainMod, j, movefocus, d
 
+bind = $mainMod SHIFT, j, movewindow, d
+bind = $mainMod SHIFT, k, movewindow, u
+bind = $mainMod SHIFT, h, movewindow, l
+bind = $mainMod SHIFT, l, movewindow, r
+
+
 # Move focus to next monitor
 bind = CTRL+ALT, j, focusmonitor, r
 bind = CTRL+ALT, k, focusmonitor, l
@@ -78,7 +85,7 @@ bindl = , XF86AudioPlay, exec, playerctl play-pause
 bindl = , XF86AudioPrev, exec, playerctl previous
 
 # rofi
-bind = $mainMod SHIFT, v, exec, rofi-rbw
+bind = $mainMod SHIFT, v, exec, uwsm app -sb -- rofi-rbw
 
 # ncmcppp
-bind = $mainMod, n, exec, ghostty --command=/usr/bin/ncmpcpp
+bind = $mainMod, n, exec, uwsm app -sb -- ghostty --command=/usr/bin/ncmpcpp