diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index 16c3895a..40eab97c 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -18,7 +18,6 @@ alias \
 	ffmpeg="ffmpeg -hide_banner" \
 	exa="exa -abghHliS" \
   duf="duf -all" \
-	lock='slock -m "$(cowsay "$(fortune)" | lolcat -ft)"' \
   ls="ls -hN --color=auto --group-directories-first" \
 	grep="grep --color=auto" \
 	diff="diff --color=auto" \
@@ -47,7 +46,7 @@ alias \
 # Misc.
 alias \
 	ref="shortcuts >/dev/null; source ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ; source ${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc" \
-	weath="less -S ${XDG_DATA_HOME:-$HOME/.local/share}/weatherreport" \
+	weath="less -S ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport" \
 	remvirt="virt-manager -c 'qemu+ssh://luca@192.168.178.200/system'" \
 	vim="lvim" \
   wikidown='rclone sync cloud:files/luca/Notes ~/Documents/vimwiki' \
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index 9c9d9469..7242b8fd 100755
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -15,31 +15,49 @@ else
 fi
 
 # Start gpg-agent if not already running
-if ! pgrep -x -u "${USER}" gpg-agent &> /dev/null; then
-     gpg-connect-agent /bye &> /dev/null
+if ! pgrep -x -u "${USER}" gpg-agent 1> /dev/null 2>&1; then
+     gpg-connect-agent /bye 1> /dev/null 2>&1
 fi
 
 # Set SSH to use gpg-agent (see 'man gpg-agent', section EXAMPLES)
 unset SSH_AGENT_PID
 if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
     # export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
-    export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+    SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+    export SSH_AUTH_SOCK
 fi
 
 # Set GPG TTY as stated in 'man gpg-agent'
-export GPG_TTY=$(tty)
+GPG_TTY="$(tty)"
+export GPG_TTY
 
 # Refresh gpg-agent tty
 gpg-connect-agent updatestartuptty /bye > /dev/null
 
-# Set lock screen on x screensaver
-xautolock -time 10 -locker 'slock -m "$(cowsay -f octopus "$(fortune)" | lolcat -ft)"' &
-
-# Check for updates
-checkup &>/dev/null &
+export XSECURELOCK_AUTH_BACKGROUND_COLOR="#24283b"
+export XSECURELOCK_AUTH_FOREGROUND_COLOR="#c0caf5"
+export XSECURELOCK_AUTH_WARNING_COLOR="#f7768e"
+export XSECURELOCK_BACKGROUND_COLOR="#15161E"
+export XSECURELOCK_DATETIME_FORMAT="%d.%m.%Y %H:%M"
+export XSECURELOCK_PASSWORD_PROMPT="time_hex"
+export XSECURELOCK_AUTH_TIMEOUT=10
+export XSECURELOCK_SHOW_DATETIME=1
+export XSECURELOCK_SAVER="saver_xscreensaver"
+export XSECURELOCK_COMPOSITE_OBSCURER=0
+xset s 300
+xss-lock -- xsecurelock &
 
 # Set GPU settings
 # gwe --hide-window &
 
+xset r rate 300 50
+killall xcape 2>/dev/null ; xcape -e 'Super_L=Escape'
+xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock
+setxkbmap -layout de -variant nodeadkeys -option caps:super
+
+setsid -f dwmblocks
+setsid -f picom --experimental-backends
+
 # Start Console TDM
 exec dwm
+