diff --git a/home/profiles/grovetender.nix b/home/profiles/grovetender.nix
index a6820a9e..76d9d196 100644
--- a/home/profiles/grovetender.nix
+++ b/home/profiles/grovetender.nix
@@ -21,10 +21,10 @@
       spicetify.enable = true;
     };
     launcher = {
-      anyrun.enable = true;
+      anyrun.enable = false;
     };
     lock = {
-      hyprlock.enable = true;
+      hyprlock.enable = false;
     };
     services = {
       ags.enable = true;
diff --git a/modules/home/opt/services/hypridle/default.nix b/modules/home/opt/services/hypridle/default.nix
index f49c225e..bc9f756b 100644
--- a/modules/home/opt/services/hypridle/default.nix
+++ b/modules/home/opt/services/hypridle/default.nix
@@ -12,7 +12,7 @@ in
       enable = true;
       settings = {
         general = {
-          lock_cmd = "pidof hyprlock || hyprlock";
+          lock_cmd = "ags run ~/.config/ags/src/lockscreen";
           before_sleep_cmd = "loginctl lock-session";
           after_sleep_cmd = "hyprctl dispatch dpms on";
         };
@@ -25,7 +25,7 @@ in
           }
           {
             timeout = 600;
-            on-timeout = "hyprlock";
+            on-timeout = "ags run ~/.config/ags/src/lockscreen";
           }
           {
             timeout = 1800;
diff --git a/modules/home/opt/wayland/hyprland/config/binds.nix b/modules/home/opt/wayland/hyprland/config/binds.nix
index 1ac1fea9..7f30fe7e 100644
--- a/modules/home/opt/wayland/hyprland/config/binds.nix
+++ b/modules/home/opt/wayland/hyprland/config/binds.nix
@@ -95,7 +95,7 @@ in
           "SUPER, Return, exec, run-as-service ${terminal}"
           "SUPERSHIFT, Z, exec, ${getExe zellij-attach}"
           "SUPER, B, exec, firefox"
-          "SUPER, L, exec, hyprlock"
+          "SUPER, L, exec, ags run ~/.config/ags/src/lockscreen"
           "SUPER, O, exec, run-as-service wl-ocr"
 
           # Screenshot
@@ -107,7 +107,7 @@ in
 
       bindr = [
         # Launchers
-        " SUPER, D, exec, pkill anyrun || run-as-service anyrun "
+        " SUPER, D, exec, astal -i shell toggle-popup app-launcher"
         " SUPERSHIFT, p, exec, rofi-rbw --no-help --clipboarder wl-copy --keybindings Alt+x:type:password "
         " SUPERSHIFT, e, exec, bemoji -t "
         " SUPERSHIFT, o, exec, wezterm start --class clipse clipse "