diff --git a/mods/graphical-xfce4/data/etc/skel/.config/autostart/Lock screen on standby.desktop b/mods/graphical-xfce4/data/etc/skel/.config/autostart/Lock screen on standby.desktop
deleted file mode 100644
index 7e1c7b5..0000000
--- a/mods/graphical-xfce4/data/etc/skel/.config/autostart/Lock screen on standby.desktop	
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=Lock screen on standby
-Comment=
-Exec=wdvn-lock
-OnlyShowIn=XFCE;
-RunHook=4
-StartupNotify=false
-Terminal=false
-Hidden=false
-
diff --git a/mods/graphical-xfce4/data/etc/skel/.config/autostart/lockscreen.desktop b/mods/graphical-xfce4/data/etc/skel/.config/autostart/lockscreen.desktop
index a70c685..a869c1e 100644
--- a/mods/graphical-xfce4/data/etc/skel/.config/autostart/lockscreen.desktop
+++ b/mods/graphical-xfce4/data/etc/skel/.config/autostart/lockscreen.desktop
@@ -4,7 +4,7 @@ Version=0.9.4
 Type=Application
 Name=lockscreen
 Comment=
-Exec=xautolock -time 15 -corners 0-00 -locker wdvn-lock
+Exec=bash -c 'xset s 900 5; XSECURELOCK_BLANK_DPMS_STATE="off" XSECURELOCK_SHOW_DATETIME=1 XSECURELOCK_DATETIME_FORMAT="%%A - %%d.%%m.%%Y, %%H:%%M:%%S" XSECURELOCK_DISCARD_FIRST_KEYPRESS=0 XSECURELOCK_BLANK_TIMEOUT=5 XSECURELOCK_AUTH_TIMEOUT=20 xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock'
 OnlyShowIn=XFCE;
 RunHook=0
 StartupNotify=false
diff --git a/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
index 5342b1f..113f3ac 100644
--- a/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
@@ -50,7 +50,7 @@
       <property name="HomePage" type="string" value="exo-open --launch WebBrowser"/>
       <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
       <property name="override" type="bool" value="true"/>
-      <property name="&lt;Super&gt;l" type="string" value="wdvn-lock"/>
+      <property name="&lt;Super&gt;l" type="string" value="xset s activate"/>
       <property name="&lt;Super&gt;x" type="string" value="exo-open --launch TerminalEmulator"/>
       <property name="&lt;Alt&gt;F1" type="string" value="xfce4-popup-whiskermenu"/>
     </property>
diff --git a/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
index abf64e2..830f75c 100644
--- a/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
@@ -3,7 +3,7 @@
 <channel name="xfce4-session" version="1.0">
   <property name="general" type="empty">
     <property name="FailsafeSessionName" type="empty"/>
-    <property name="LockCommand" type="string" value="wdvn-lock"/>
+    <property name="LockCommand" type="string" value="xset s activate"/>
     <property name="SessionName" type="string" value="Default"/>
     <property name="SaveOnExit" type="bool" value="false"/>
   </property>
diff --git a/mods/graphical-xfce4/data/usr/local/bin/wdvn-lock b/mods/graphical-xfce4/data/usr/local/bin/wdvn-lock
deleted file mode 100755
index 596114d..0000000
--- a/mods/graphical-xfce4/data/usr/local/bin/wdvn-lock
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-XSECURELOCK_BLANK_DPMS_STATE="off" XSECURELOCK_SHOW_DATETIME=1 XSECURELOCK_DATETIME_FORMAT="%A - %d.%m.%Y, %H:%M:%S" XSECURELOCK_DISCARD_FIRST_KEYPRESS=0 XSECURELOCK_BLANK_TIMEOUT=5 XSECURELOCK_AUTH_TIMEOUT=20 xsecurelock
diff --git a/mods/graphical-xfce4/modscript b/mods/graphical-xfce4/modscript
index a888793..b2c26fc 100755
--- a/mods/graphical-xfce4/modscript
+++ b/mods/graphical-xfce4/modscript
@@ -1,2 +1,2 @@
 #!/bin/bash
-export WDVN_PACKAGES_DL="$WDVN_PACKAGES_DL xinit xorg xfce4 xfce4-*-plugin xfce4-power-manager gvfs gvfs-backends gvfs-fuse unifont scrot xclip netsurf-gtk xautolock xsecurelock qt5-style-plugins alsa-utils network-manager-gnome xfce4-terminal mousepad synaptic catfish galculator celluloid gpicview xpdf unrar-free engrampa blueman xscreensaver- lightdm-"
+export WDVN_PACKAGES_DL="$WDVN_PACKAGES_DL xinit xorg xfce4 xfce4-*-plugin xfce4-power-manager gvfs gvfs-backends gvfs-fuse unifont scrot xclip netsurf-gtk x11-xserver-utils xss-lock xsecurelock qt5-style-plugins alsa-utils network-manager-gnome xfce4-terminal mousepad synaptic catfish galculator celluloid gpicview xpdf unrar-free engrampa blueman xscreensaver- lightdm-"