diff --git a/README.md b/README.md
index 49b11a2..bde3b49 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 + Editor: emacs
 + Image-Viewer: sxiv
 + Launcher: [dmenu](https://github.com/crammk/dmenu)
-+ Lock: [slock](https://github.com/crammk/slock)
++ Lock: i3lock-color
 + Mouse-Settings: piper
 + Pdf-Viewer: zathura with mupdf
 + Screenshots: flameshot
diff --git a/files/.config/i3/config b/files/.config/i3/config
index 190f57b..dba7db9 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -1,6 +1,10 @@
 set $mod Mod4
 font pango:SFMono Nerd Font Mono 10
 
+# correct locking
+exec --no-startup-id xss-lock --transfer-sleep-lock -- lock.sh
+bindsym $mod+Shift+BackSpace exec "loginctl lock-session"
+
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
diff --git a/files/scripts/lock.sh b/files/scripts/lock.sh
new file mode 100755
index 0000000..1b9bf47
--- /dev/null
+++ b/files/scripts/lock.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ `hostname` == "nazarick" ];then
+    pic=$HOME/data/nextcloud/wallpaper/lock219.png
+else
+    pic=$HOME/data/nextcloud/wallpaper/lock169.png
+fi
+
+if [ $USER == "marc" ];then
+    i3lock --nofork \
+	   -i ${pic} \
+	   --inside-color=#373445ff --ring-color=ffffffff --line-uses-inside \
+	   --keyhl-color=d23c3dff --bshl-color=d23c3dff --separator-color=00000000 \
+	   --insidever-color=fecf4dff --insidewrong-color=d23c3dff \
+	   --ringver-color=ffffffff --ringwrong-color=ffffffff --ind-pos="x+86:y+1003" \
+	   --radius=15 --verif-text="" --wrong-text="" --noinput-text=""
+else
+   xlock -mode blank
+fi