diff --git a/private_dot_config/hypr/hypridle.conf b/private_dot_config/hypr/hypridle.conf
index 33bdb82..b19affe 100644
--- a/private_dot_config/hypr/hypridle.conf
+++ b/private_dot_config/hypr/hypridle.conf
@@ -1,13 +1,13 @@
 general {
     lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
-    before_sleep_cmd = loginctl lock-session    # lock before suspend.
+    before_sleep_cmd =  hyprlock   # 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 = 300                                 # 5min
-    on-timeout = loginctl lock-session            # lock screen when timeout has passed
+    on-timeout = hyprlock            # lock screen when timeout has passed
 }
 
 listener {
@@ -18,5 +18,5 @@ listener {
 
 listener {
     timeout = 1800                                # 30min
-    on-timeout = systemctl suspend                # suspend pc
+    on-timeout = systemctl sleep                # suspend pc
 }
diff --git a/private_dot_config/hypr/hyprland/binds/power.conf b/private_dot_config/hypr/hyprland/binds/power.conf
index cb1187e..898987c 100644
--- a/private_dot_config/hypr/hyprland/binds/power.conf
+++ b/private_dot_config/hypr/hyprland/binds/power.conf
@@ -1,4 +1,4 @@
 bind = $mainMod L_SHIFT ctrl, l, exec, hyprlock # lock
 bind = $mainMod L_SHIFT ctrl, r, exec, systemctl reboot
 bind = $mainMod L_SHIFT ctrl, p, exec, systemctl poweroff
-bind = $mainMod L_SHIFT ctrl, s, exec, systemctl suspend
+bind = $mainMod L_SHIFT ctrl, s, exec, pidof hyprlock || sleep 1 && systemctl sleep
diff --git a/private_dot_config/hypr/hyprland/workspaces.conf b/private_dot_config/hypr/hyprland/workspaces.conf
index 2e95da3..052a289 100644
--- a/private_dot_config/hypr/hyprland/workspaces.conf
+++ b/private_dot_config/hypr/hyprland/workspaces.conf
@@ -2,6 +2,8 @@ workspace = 1, monitor:DP-2
 workspace = 2, monitor:DP-1
 workspace = 3, monitor:DP-1
 workspace = 4, monitor:DP-1
+workspace = 5, monitor:DP-1
+workspace = 6, monitor:DP-1
 workspace = 7, monitor:HDMI-A-2
 workspace = 9, monitor:DP-2
 workspace = 10, monitor:DP-2