diff --git a/.config/.wallpaper/wall.png b/.config/.wallpaper/wall.png
index 1594eaa..9adab77 100644
Binary files a/.config/.wallpaper/wall.png and b/.config/.wallpaper/wall.png differ
diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
index 86c3e13..1bd13a9 100644
--- a/.config/hypr/hypridle.conf
+++ b/.config/hypr/hypridle.conf
@@ -1,41 +1,34 @@
-#  _                      _     _ _
-# | |__  _   _ _ __  _ __(_) __| | | ___
-# | '_ \| | | | '_ \| '__| |/ _` | |/ _ \
-# | | | | |_| | |_) | |  | | (_| | |  __/
-# |_| |_|\__, | .__/|_|  |_|\__,_|_|\___|
-#        |___/|_|
-#
-
 general {
-    ignore_dbus_inhibit = false
-}
-
-# Screenlock
-listener {
-    # HYPRLOCK TIMEOUT
-    timeout =  180
-    # HYPRLOCK ONTIMEOUT
-    on-timeout = hyprlock
-}
-
-# screen brightness
-listener {
-    timeout = 240
-    on-timeout =  brightnessctl -s set 10
-    on-resume = brightnessctl -r
-}
-
-# dpms
-listener {
-    # DPMS TIMEOUT
-    timeout = 300
-    # DPMS ONTIMEOUT
-    on-timeout = hyprctl dispatch dpms off
-    # DPMS ONRESUME
-    on-resume = hyprctl dispatch dpms on
+    lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
+    before_sleep_cmd = loginctl lock-session    # lock before suspend.
+    after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
 }
 
 listener {
-    timeout = 600
+    timeout = 300                            # 5min.
+    on-timeout = brightnessctl -s set 10         # set monitor backlight to minimum, avoid 0 on OLED monitor.
+    on-resume = brightnessctl -r                 # monitor backlight restore.
+}
+
+# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight.
+#listener { 
+#    timeout = 2                                          # 2.5min.
+#    on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight.
+#    on-resume = brightnessctl -rd rgb:kbd_backlight        # turn on keyboard backlight.
+#}
+
+listener {
+    timeout = 180                                 # 3min
+    on-timeout = loginctl lock-session            # lock screen when timeout has passed
+}
+
+listener {
+    timeout = 320                                 # 5.2min
+    on-timeout = hyprctl dispatch dpms off        # screen off when timeout has passed
+    on-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
+}
+
+listener {
+    timeout =    1800                             # 30min
     on-timeout = systemctl suspend                # suspend pc
 }
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 1d19dfd..13e9f55 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -190,7 +190,7 @@ bind = $mainMod, F, fullscreen, 1
 bind = $mainMod SHIFT, F, fullscreen, 0
 bind = $mainMod CTRL, F, fakefullscreen
 bind = $mainMod, L, exec, hyprlock
-bind = CTRL ALT, S , exec, systemctl suspend; hyprlock
+bind = CTRL ALT, S , exec, systemctl suspend
 
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, A, workspace, 1
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index af64af4..0e3e2d9 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -143,7 +143,7 @@
     "custom/sleep": {
         "format": " 󰤄 ",
         "tooltip": false,
-        "on-triple-click": "systemctl suspend; hyprlock"
+        "on-triple-click": "systemctl suspend"
     },
     "custom/reboot": {
         "format": "   ",