diff --git a/modules/desktop/de/hyprland.nix b/modules/desktop/de/hyprland.nix
index 0d0ef11..241d33a 100644
--- a/modules/desktop/de/hyprland.nix
+++ b/modules/desktop/de/hyprland.nix
@@ -2,7 +2,6 @@
 
 {
   programs.hyprland.enable = true;
-  programs.hyprland.withUWSM = true;
   # Optional, hint electron apps to use wayland:
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
diff --git a/modules/desktop/login/autologin.nix b/modules/desktop/login/autologin.nix
index 7757fc2..0c1fa4d 100644
--- a/modules/desktop/login/autologin.nix
+++ b/modules/desktop/login/autologin.nix
@@ -6,7 +6,7 @@
     enable = true;
     settings = {
       initial_session = {
-        command = if (config.programs.uwsm.enable == true) then "${lib.getExe pkgs.uwsm} start default" else if (config.programs.niri.enable == true) then "${pkgs.niri}/bin/niri-session" else if (config.programs.hyprland.enable == true) then "${pkgs.hyprland}/bin/Hyprland" else "${pkgs.zsh}/bin/zsh";
+        command = if (config.programs.niri.enable == true) then "${pkgs.niri}/bin/niri-session" else if (config.programs.hyprland.enable == true) then "${pkgs.hyprland}/bin/Hyprland" else "${pkgs.zsh}/bin/zsh";
         user = "nico";
       };
       default_session = {
diff --git a/stow/.config/hypr/binds.conf b/stow/.config/hypr/binds.conf
index 77a11c4..b576c0b 100644
--- a/stow/.config/hypr/binds.conf
+++ b/stow/.config/hypr/binds.conf
@@ -5,18 +5,18 @@
 $mainMod = SUPER # Sets "Windows" key as main modifier
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, uwsm app -- ghostty
-bind = $mainMod, B, exec, uwsm app -- firefox
+bind = $mainMod, Q, exec, ghostty
+bind = $mainMod, B, exec, firefox
 bind = $mainMod, D, exec, vicinae toggle
-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 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, SPACE, togglefloating,
 bind = $mainMod, W, killactive,
-bind = $mainMod, M, exec, uwsm stop
+bind = $mainMod, M, dispatch, exit
 
 #bind = $mainMod, P, pseudo, # dwindle # have no clue what this does
 bind = $mainMod, F, fullscreen
diff --git a/stow/.config/hypr/hyprland.conf b/stow/.config/hypr/hyprland.conf
index c7c0914..474d34c 100755
--- a/stow/.config/hypr/hyprland.conf
+++ b/stow/.config/hypr/hyprland.conf
@@ -15,18 +15,18 @@ monitor=eDP-1,1920x1080@60,auto,1
 # autostart
 
 # desktop
-exec-once = uwsm app -- swww-daemon
-exec-once = uwsm app -- waybar
-exec-once = uwsm app -- swaync
-exec-once = uwsm app -- vicinae server
-exec-once = uwsm app -- fcitx5
+exec-once = swww-daemon
+exec-once = waybar
+exec-once = swaync
+exec-once = vicinae server
+exec-once = fcitx5
 exec-once = systemctl --user start hyprpolkitagent
 exec-once = hyprshade auto
 
 # apps
-exec-once = uwsm app -- opensnitch-ui || echo ""
-exec-once = uwsm app -- steam -silent || echo ""
-exec-once = uwsm app -- 1password --silent || echo ""
+exec-once = opensnitch-ui
+exec-once = steam -silent
+exec-once = 1password --silent
 
 #############################
 ### ENVIRONMENT VARIABLES ###
diff --git a/stow/.config/walker/config.toml b/stow/.config/walker/config.toml
index 303a415..01bbe34 100644
--- a/stow/.config/walker/config.toml
+++ b/stow/.config/walker/config.toml
@@ -266,7 +266,7 @@ Terminal = false
 
 [[builtins.custom_commands.commands]]
 name = "Logout"
-cmd = "uwsm stop"
+cmd = "hyprctl dispatch exit"
 Terminal = false
 
 # hypr