diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf
index 549f1b1..b71c21d 100644
--- a/config/hypr/hypridle.conf
+++ b/config/hypr/hypridle.conf
@@ -4,13 +4,21 @@
                                                       
 
 general {
-    # lock_cmd = notify-send "lock!"          # dbus/sysd lock command (loginctl lock-session) 
-    # unlock_cmd = notify-send "unlock!"      # same as above, but unlock
-    before_sleep_cmd = hyprlock    # command ran before sleep
-    # after_sleep_cmd = notify-send "Awake!"  # command ran after sleep
+    lock_cmd = pidof hyprlock || hyprlock # runs hyprlock if it is not already running (this is always run when "loginctl lock-session" is called) 
+    # unlock_cmd = killall hyprlock # kills hyprlock when unlocking (this is always run when "loginctl unlock-session" is called)
+    before_sleep_cmd = loginctl lock-session    # ensures that the session is locked before going to sleep
+    after_sleep_cmd = hyprctl dispatch dpms on # turn of screen after sleep (not strictly necessary, but just in case)
     ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
 }
 
+# turn off screen faster if session is already locked
+# (disabled by default)
+# listener {
+#     timeout = 30                            # 30 seconds
+#     on-timeout = pidof hyprlock && hyprctl dispatch dpms off # turns off the screen if hyprlock is active
+#     on-resume = pidof hyprlock && hyprctl dispatch dpms on    # command to run when activity is detected after timeout has fired.
+# }
+
 # Warn
 listener {
     timeout = 540                            # 9 min
@@ -21,10 +29,18 @@ listener {
 # Screenlock
 listener {
     timeout = 600                     # 10 min
-    on-timeout = hyprlock # command to run when timeout has passed
+    on-timeout = loginctl lock-session # command to run when timeout has passed
     # on-resume = notify-send "Welcome back to your desktop!"  # command to run when activity is detected after timeout has fired.
 }
 
+# Turn off screen 
+# (disabled by default)
+# listener {
+#     timeout = 630                            # 10.5 min
+#     on-timeout = hyprctl dispatch dpms off  # command to run when timeout has passed
+#     on-resume = hyprctl dispatch dpms on    # command to run when activity is detected after timeout has fired.
+# }
+
 # Suspend # disabled by default
 # listener {
    # timeout = 1200                            # 20 min
diff --git a/config/hypr/scripts/LockScreen.sh b/config/hypr/scripts/LockScreen.sh
index ce2320a..f8542f6 100755
--- a/config/hypr/scripts/LockScreen.sh
+++ b/config/hypr/scripts/LockScreen.sh
@@ -2,4 +2,4 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 
 # For Hyprlock
-hyprlock -q --immediate
\ No newline at end of file
+pidof hyprlock || hyprlock -q --immediate