diff --git a/.install/cleanup.sh b/.install/cleanup.sh
index 436a9a1..aa517f3 100644
--- a/.install/cleanup.sh
+++ b/.install/cleanup.sh
@@ -51,6 +51,16 @@ if [ -d ~/dotfiles/hypr/settings/modules/system/swaylock ] ;then
     echo "~/dotfiles/hypr/settings/modules/system/swaylock removed."
 fi
 
+# Remove Swayidle
+if [[ $(_isInstalledPacman "swayidle") == 0 ]]; then
+    sudo pacman --noconfirm -Rns swayidle
+fi
+
+# Remove Swaylock
+if [[ $(_isInstalledYay "swaylock-effects-git") == 0 ]]; then
+    yay --noconfirm -Rns swaylock-effects-git
+fi
+
 # Create default folder structure
 xdg-user-dirs-update
 echo "Default folders created..."
diff --git a/.install/packages/hyprland-packages.sh b/.install/packages/hyprland-packages.sh
index 66a1a49..1d80eba 100644
--- a/.install/packages/hyprland-packages.sh
+++ b/.install/packages/hyprland-packages.sh
@@ -4,14 +4,14 @@ packagesPacman=(
     "waybar" 
     "grim" 
     "slurp"
-    "swayidle"
     "swappy"
     "cliphist"
 );
 
 packagesYay=(
     "swww" 
-    "swaylock-effects-git" 
+    "hypridle-git"
+    "hyprlock-git"
     "wlogout"
     "nwg-look"
     "emote"
diff --git a/.settings/lockscreen.png b/.settings/lockscreen.png
new file mode 100644
index 0000000..73bdeef
Binary files /dev/null and b/.settings/lockscreen.png differ
diff --git a/.settings/swayidle.sh b/.settings/swayidle.sh
deleted file mode 100644
index df3e065..0000000
--- a/.settings/swayidle.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-timeswaylock=600
-timeoff=660
\ No newline at end of file
diff --git a/CHANGELOG b/CHANGELOG
index 17c47e3..dc93ca3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@ Version 2.8.1
 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8
 --------------------------------------------------------
 General:
+- Swayidle replaced with hypridle (config in dotfiles/hypr/hypridle.conf)
+- Swaylock replaced with hyprlock (config in dotfiles/hypr/hyprlock.conf)
 - New default wallpaper in Hyprland style
 - xarchiver and zip added for thunar
 - Rofi border width can be adjusted in dotfiles/.settings/rofi-border.rasi
diff --git a/hypr/conf/autostart.conf b/hypr/conf/autostart.conf
index 1f3b399..7b75407 100644
--- a/hypr/conf/autostart.conf
+++ b/hypr/conf/autostart.conf
@@ -14,8 +14,9 @@ exec-once = dunst
 # Load GTK settings
 exec-once = ~/dotfiles/hypr/scripts/gtk.sh
 
-# Load swayidle and define the lock screen time
-exec-once = ~/dotfiles/hypr/scripts/lockscreentime.sh
+# Using hypridle to start hyprlock
+exec-once = hypridle
+# exec-once = swayidle -w timeout 600 'swaylock -f' timeout 660 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f'
 
 # Load network manager applet
 # START NM APPLET
diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf
new file mode 100644
index 0000000..d57c492
--- /dev/null
+++ b/hypr/hypridle.conf
@@ -0,0 +1,13 @@
+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 = notify-send "Zzz"    # 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)
+}
+
+listener {
+    timeout = 600                            # in seconds
+    on-timeout = hyprlock # 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.
+}
\ No newline at end of file
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
new file mode 100644
index 0000000..2b609b0
--- /dev/null
+++ b/hypr/hyprlock.conf
@@ -0,0 +1,44 @@
+background {
+    monitor =
+    path = $HOME/dotfiles/.settings/lockscreen.png   # only png supported for now
+    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 = 4 # 0 disables blurring
+    blur_size = 2
+    noise = 0.0117
+    contrast = 0.8916
+    brightness = 0.8172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0.0
+}
+
+input-field {
+    monitor =
+    size = 200, 50
+    outline_thickness = 1
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = rgb(000000)
+    inner_color = rgb(200, 200, 200)
+    font_color = rgb(10, 10, 10)
+    fade_on_empty = true
+    placeholder_text = <i>Input Password...</i> # Text rendered in the input box when it's empty.
+    hide_input = false
+    position = 0, -20
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = Enter your password to unlock
+    color = rgba(200, 200, 200, 1.0)
+    font_size = 25
+    font_family = Noto Sans
+
+    position = 0, 200
+    halign = center
+    valign = center
+}
\ No newline at end of file
diff --git a/hypr/scripts/lockscreentime.sh b/hypr/scripts/lockscreentime.sh
deleted file mode 100755
index 5cf27ea..0000000
--- a/hypr/scripts/lockscreentime.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#/bin/bash
-#  ___    _ _      _   _                 
-# |_ _|__| | | ___| |_(_)_ __ ___   ___  
-#  | |/ _` | |/ _ \ __| | '_ ` _ \ / _ \ 
-#  | | (_| | |  __/ |_| | | | | | |  __/ 
-# |___\__,_|_|\___|\__|_|_| |_| |_|\___| 
-#                                        
-#  
-# by Stephan Raabe (2023) 
-# ----------------------------------------------------- 
-
-# START SWAYIDLE    
-# exit
-# END SWAYIDLE    
-source ~/dotfiles/.settings/swayidle.sh
-if [ -f "/usr/bin/swayidle" ]; then
-    echo "swayidle is installed."
-    swayidle -w timeout $timeswaylock 'swaylock -f' timeout $timeoff 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f'
-else
-    echo "swayidle not installed."
-fi;
diff --git a/swaylock/config b/swaylock/config
deleted file mode 100644
index 3333079..0000000
--- a/swaylock/config
+++ /dev/null
@@ -1,76 +0,0 @@
-#  ____                     _            _     
-# / ___|_      ____ _ _   _| | ___   ___| | __ 
-# \___ \ \ /\ / / _` | | | | |/ _ \ / __| |/ / 
-#  ___) \ V  V / (_| | |_| | | (_) | (__|   <  
-# |____/ \_/\_/ \__,_|\__, |_|\___/ \___|_|\_\ 
-#                     |___/                    
-#  
-# by Stephan Raabe (2023) 
-# ----------------------------------------------------- 
-
-ignore-empty-password
-font="Fira Sans Semibold"
-
-clock
-timestr=%R
-datestr=%a, %e of %B
-
-# Add current screenshot as wallpaper
-screenshots
-
-# Add an image as a background 
-# image=~/.cache/current_wallpaper.jpg
-
-# Fade in time
-fade-in=1
-
-# Effect for background
-effect-blur=5x2
-# effect-greyscale
-# effect-pixelate=5
-
-# Show/Hide indicator circle
-indicator
-
-# smaller indicator
-indicator-radius=200
-
-# bigger indicator
-# indicator-radius=300
-
-indicator-thickness=20
-indicator-caps-lock
-
-# Define all colors
-
-key-hl-color=00000066
-separator-color=00000000
-
-inside-color=00000033
-inside-clear-color=ffffff00
-inside-caps-lock-color=ffffff00
-inside-ver-color=ffffff00
-inside-wrong-color=ffffff00
-
-ring-color=ffffff
-ring-clear-color=ffffff
-ring-caps-lock-color=ffffff
-ring-ver-color=ffffff
-ring-wrong-color=ffffff
-
-line-color=00000000
-line-clear-color=ffffffFF
-line-caps-lock-color=ffffffFF
-line-ver-color=ffffffFF
-line-wrong-color=ffffffFF
-
-text-color=ffffff
-text-clear-color=ffffff
-text-ver-color=ffffff
-text-wrong-color=ffffff
-
-bs-hl-color=ffffff
-caps-lock-key-hl-color=ffffffFF
-caps-lock-bs-hl-color=ffffffFF
-disable-caps-lock-text
-text-caps-lock-color=ffffff
diff --git a/waybar/modules.json b/waybar/modules.json
index 19bc8c9..551a3a3 100644
--- a/waybar/modules.json
+++ b/waybar/modules.json
@@ -369,6 +369,6 @@
             "activated": "",
             "deactivated": ""
         },
-        "on-click-right": "swaylock"        
+        "on-click-right": "hyprlock"        
     }
 }
diff --git a/waybar/themes/starter/modules.json b/waybar/themes/starter/modules.json
index 593d16e..66d9c1d 100644
--- a/waybar/themes/starter/modules.json
+++ b/waybar/themes/starter/modules.json
@@ -324,6 +324,6 @@
             "activated": "",
             "deactivated": ""
         },
-        "on-click-right": "swaylock"        
+        "on-click-right": "hyprlock"        
     }
 }