diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
new file mode 100644
index 0000000..b80e2ce
--- /dev/null
+++ b/.config/hypr/hypridle.conf
@@ -0,0 +1,14 @@
+general {
+    lock_cmd = hyprlock											# 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
+    ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
+    ignore_systemd_inhibit = false          # whether to ignore systemd-inhibit --what=idle inhibitors
+}
+
+listener {
+    timeout = 360                            # in seconds
+    on-timeout = hyprlock										 # command to run when timeout has passed
+    #on-resume = notify-send "Welcome back!"  # command to run when activity is detected after timeout has fired.
+}
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 6d2f189..6af2445 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -18,19 +18,15 @@ monitor=eDP-1,1920x1200,auto,1.25
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
 # Execute your favorite apps at launch
-# exec-once = waybar & hyprpaper & firefox
 exec-once = waybar
 exec-once=/usr/lib/polkit-kde-authentication-agent-1
-# exec-once = swaybg -i ~/.config/hypr/wallpapers/continental-top.jpg
 # Select random wallpaper from wallpaper folder
 exec-once = ~/.config/hypr/change_wallpaper.sh
 exec-once = dunst
 exec-once = batsignal -b -e -w 30 -c 20 -d 10 -f 100
 exec-once = nm-applet
-exec-once = ~/.config/hypr/sleep.sh
-# exec-once = swayidle -w timeout 300 'swaylock -f' timeout 360 'systemctl suspend' before-sleep 'playerctl pause'
 exec-once = sleep 1 && blueman-applet
-exec-once = swaylock -C ~/.config/swaylock/config-boot --image ~/.config/hypr/wallpapers/continental-top.jpg
+exec-once = hypridle
 exec-once = sleep 2 && udiskie --tray # automount external hdds or usbs
 exec-once = xwaylandvideobridge 
 
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
new file mode 100644
index 0000000..8bc2f3b
--- /dev/null
+++ b/.config/hypr/hyprlock.conf
@@ -0,0 +1,86 @@
+background {
+    monitor =
+    path = screenshot
+    color = rgba(25, 20, 20, 1.0)
+
+    # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+
+		blur_passes = 3
+		blur_size = 8
+		contrast = 0.8916
+    brightness = 0.7172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0
+}
+
+input-field {
+    monitor =
+    size = 300, 30
+    outline_thickness = 0
+    dots_size = 0.25 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.55 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    dots_rounding = -1
+    outer_color = rgba(242, 243, 244, 0)
+    inner_color = rgba(242, 243, 244, 0)
+    font_color = rgba(242, 243, 244, 0.75)
+    fade_on_empty = false
+    placeholder_text = # Text rendered in the input box when it's empty.
+    hide_input = false
+    check_color = rgba(204, 136, 34, 0)
+    fail_color = rgba(204, 34, 34, 0) # if authentication failed, changes outer_color and fail message color
+    fail_text = $FAIL <b>($ATTEMPTS)</b> # can be set to empty
+    fail_transition = 300 # transition time in ms between normal outer_color and fail_color
+    capslock_color = -1
+    numlock_color = -1
+    bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
+    invert_numlock = false # change color if numlock is off
+    swap_font_color = false # see below
+    position = 0, -470
+    halign = center
+    valign = center
+}
+
+label {
+  monitor =
+  text = cmd[update:1000] echo "$(date +"%A, %B %d")"
+  color = rgba(242, 243, 244, 0.75)
+  font_size = 20
+  font_family = SF Pro Display Bold
+  position = 0, 400
+  halign = center
+  valign = center
+}
+
+label {
+  monitor = 
+  text = $TIME
+  color = rgba(242, 243, 244, 0.75)
+  font_size = 93
+  font_family = SF Pro Display Bold
+  position = 0, 253
+  halign = center
+  valign = center
+}
+
+label {
+    monitor =
+    text = $USER
+    color = rgba(242, 243, 244, 0.75)
+    font_size = 12
+    font_family = SF Pro Display Bold
+    position = 0, -407
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = Enter Password
+    color = rgba(242, 243, 244, 0.75)
+    font_size = 10
+    font_family = SF Pro Display
+    position = 0, -440
+    halign = center
+    valign = center
+}
diff --git a/.config/hypr/sleep.sh b/.config/hypr/sleep.sh
deleted file mode 100755
index 41ee446..0000000
--- a/.config/hypr/sleep.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-swayidle -w timeout 300 'swaylock -f' \
-            timeout 360 'systemctl suspend' \
-            before-sleep 'swaylock -f;playerctl pause' &