diff --git a/.install/cleanup.sh b/.install/cleanup.sh
index aa517f3..436a9a1 100644
--- a/.install/cleanup.sh
+++ b/.install/cleanup.sh
@@ -51,16 +51,6 @@ 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/screenlock.sh b/.install/screenlock.sh
index c53e172..3e9f46d 100755
--- a/.install/screenlock.sh
+++ b/.install/screenlock.sh
@@ -3,9 +3,25 @@ echo -e "${GREEN}"
 figlet "Screen lock"
 echo -e "${NONE}"
 if [[ $(_isInstalledYay "hypridle-git") == 1 ]] || [[ $(_isInstalledYay "hyprlock-git") == 1 ]]; then
-    echo "You can install hypridle and hyprlock lock your screen automatically."
+    echo "You can install hypridle and hyprlock to lock your screen automatically."
+    echo "These are the new standard screen locking packages of the ML4W dotfiles."
+    echo "Screenlocking will not work anymore if you keep swaylock."
+    echo "The installation is highly recommended."
     if gum confirm "Do you want to install hypridle and hyprlock?" ;then
+
+        # Install Hypridle and Hyprlock
         yay --noconfirm -S hypridle-git hyprlock-git
+
+        # 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
+        
     fi
 else
     echo ":: hypridle and hyprlock are already installed."
diff --git a/swaylock/config b/swaylock/config
new file mode 100644
index 0000000..3333079
--- /dev/null
+++ b/swaylock/config
@@ -0,0 +1,76 @@
+#  ____                     _            _     
+# / ___|_      ____ _ _   _| | ___   ___| | __ 
+# \___ \ \ /\ / / _` | | | | |/ _ \ / __| |/ / 
+#  ___) \ 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/wlogout/layout b/wlogout/layout
index eba9a46..2876b9a 100644
--- a/wlogout/layout
+++ b/wlogout/layout
@@ -1,6 +1,6 @@
 {
     "label" : "lock",
-    "action" : "sleep 1; swaylock",
+    "action" : "sleep 1; hyprlock",
     "text" : "Lock",
     "keybind" : "l"
 }