diff --git a/modules/hyprland/home.nix b/modules/hyprland/home.nix
index 16722c7..9b76cae 100644
--- a/modules/hyprland/home.nix
+++ b/modules/hyprland/home.nix
@@ -45,6 +45,48 @@ in
       hyprlock = {
         enable = true;
       };
+      wlogout = {
+        enable = true;
+        layout = [
+          {
+            "label" = "lock";
+            "action" = "hyprlock";
+            "text" = "Lock";
+            "keybind" = "l";
+          }
+          {
+            "label" = "hibernate";
+            "action" = "systemctl hibernate";
+            "text" = "Hibernate";
+            "keybind" = "h";
+          }
+          {
+            "label" = "logout";
+            "action" = "uwsm stop";
+            "text" = "Logout";
+            "keybind" = "e";
+          }
+          {
+            # TODO add hypr shutdown
+            "label" = "shutdown";
+            "action" = "systemctl poweroff";
+            "text" = "Shutdown";
+            "keybind" = "s";
+          }
+          {
+            "label" = "suspend";
+            "action" = "systemctl suspend";
+            "text" = "Suspend";
+            "keybind" = "u";
+          }
+          {
+            "label" = "reboot";
+            "action" = "systemctl reboot";
+            "text" = "Reboot";
+            "keybind" = "r";
+          }
+        ];
+      };
     };
     systemd.user.services."hyprland_suspend" = lib.mkIf cfg.suspend-on-hibernate {
       Unit = {
diff --git a/modules/hyprland/runner.nix b/modules/hyprland/runner.nix
index 4a859a2..d40ebd6 100644
--- a/modules/hyprland/runner.nix
+++ b/modules/hyprland/runner.nix
@@ -1,21 +1,21 @@
 { inputs, pkgs, ... }:
 {
   home.packages = [
-    pkgs.hyprlauncher
+    pkgs.kickoff
   ];
   wayland.windowManager.hyprland.settings = {
     bind = [
-      "$mainMod, R, exec, hyprlauncher"
+      "$mainMod, R, exec, kickoff"
     ];
   };
-  systemd.user.services.hyprlauncher-deamon = {
-    Install = {
-      WantedBy = [ "hyprland-session.target" ];
-    };
-    Service = {
-      ExecStart = "${pkgs.writeShellScript "watch-store" ''
-        hyprlauncher -d 
-      ''}";
-    };
-  };
+  # systemd.user.services.hyprlauncher-deamon = {
+  #   Install = {
+  #     WantedBy = [ "hyprland-session.target" ];
+  #   };
+  #   Service = {
+  #     ExecStart = "${pkgs.writeShellScript "watch-store" ''
+  #       hyprlauncher -d
+  #     ''}";
+  #   };
+  # };
 }
diff --git a/modules/hyprland/settings.nix b/modules/hyprland/settings.nix
index bac78e1..b3f3fb1 100644
--- a/modules/hyprland/settings.nix
+++ b/modules/hyprland/settings.nix
@@ -102,7 +102,7 @@ in
     "$mainMod" = "SUPER";
     bind = [
       "$mainMod, C, killactive"
-      "$mainMod, M, exit"
+      "$mainMod, M, exec, uwsm stop"
       "$mainMod, E, exec, $fileManager"
       "$mainMod, V, togglefloating,"
       "$mainMod, P, pseudo, # dwindle"