diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 34326e0..ab6c741 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -35,7 +35,8 @@ env = XDG_SESSION_DESKTOP,hyprland
 env = XDG_SESSION_TYPE,hyprland
 env = GDK_BACKEND,wayland,x11,*
 env = GTK_THEME,cachyos-nord:dark
-env = PATH,$HOME/bin:$PATH
+env = PATH,$HOME/.local/bin:$PATH
+env = TERM, terminator
 env = HYPRSHOT_DIR,/home/siren/Pictures/Screenshots
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
@@ -167,7 +168,7 @@ misc {
 $mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, alacritty
+bind = $mainMod, Q, exec, $TERM
 bind = $mainMod, C, killactive,
 bind = $mainMod SHIFT, M, exit,
 bind = $mainMod, E, exec, nemo
@@ -177,7 +178,7 @@ bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
 bind = $mainMod, F, fullscreen, # dwindle
 bind = $mainMod, N, exec, swaync-client -t -sw # swaync
-bind = $mainMod SHIFT, S, exec, systemctl suspend
+bindl = $mainMod SHIFT, S, exec, pidof hyprlock || hyprlock & sleep 1; systemctl suspend
 
 # Move focus with mainMod + arrow keys
 #bind = $mainMod, left, movefocus, l
@@ -242,7 +243,7 @@ bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
 # Suspend
-bind = , XF86Sleep, exec, systemctl suspend
+bindl = , XF86Sleep, exec, pidof hyprlock || hyprlock & sleep 1; systemctl suspend
 bind = $mainMod, L, exec, hyprlock
 
 # Brightness
@@ -268,13 +269,14 @@ bind = $mainMod SHIFT, PRINT, exec, hyprshot -m region # screenshot a region
 
 # Autolaunch
 #exec-once = hyprpaper
-exec-once = swaybg -o \* -i /home/siren/Pictures/wallpaper/cachy_btw_swirl.jpg -m fill &
-exec-once = hypridle &
-exec-once = waybar -c .config/waybar/config-hypr &
-exec-once = swaync &
-exec-once = copyq --start-server &
-#exec-once = gammastep-indicator
+exec-once = /usr/lib/geoclue-2.0/demos/agent
+exec-once = swaybg -o \* -i /home/siren/Pictures/wallpaper/cachy_btw_swirl.jpg -m fill
+exec-once = hypridle
+exec-once = waybar -c .config/waybar/config-hypr
+exec-once = swaync
+exec-once = copyq --start-server
+exec-once = gammastep-indicator
 #exec-once = nextcloud
-exec-once = swayosd-server &
-exec-once = systemctl --user start hyprpolkitagent &
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
+exec-once = swayosd-server
+exec-once = systemctl --user start hyprpolkitagent
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP