diff --git a/etc/skel/.config/swayidle/config b/etc/skel/.config/swayidle/config
index 36c92e1..e6f2d8b 100644
--- a/etc/skel/.config/swayidle/config
+++ b/etc/skel/.config/swayidle/config
@@ -1,6 +1,8 @@
-timeout 240 'light -G > /tmp/brightness && light -S 10' resume 'light -S $([ -f /tmp/brightness ] && cat /tmp/brightness || echo 100%)'
-timeout 300 ~/.config/swaylock/lock.sh
-timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"'
+timeout 240 'brightnessctl -s && brightnessctl set 10' resume 'brightnessctl -r'
+timeout 300 '/usr/share/river/scripts/lock.sh'
+timeout 600 '/usr/share/river/scripts/kbd-backlight.sh off && timeout 600 'wlopm --off \*' resume '/usr/share/river/scripts/kbd-backlight.sh on && 'wlopm --on \*'
+timeout 900 '[ "$(acpi -b | grep Discharging)" != "" ] && systemctl suspend'
+timeout 3600 '[ "$(acpi -b | grep Discharging)" = "" ] && systemctl suspend'
 before-sleep 'playerctl pause'
-before-sleep ~/.config/swaylock/lock.sh
-lock ~/.config/swaylock/lock.sh
+before-sleep '/usr/share/river/scripts/lock.sh && sleep 2'
+after-resume '/usr/share/river/scripts/kbd-backlight.sh on && 'wlopm --on \*' && brightnessctl -r'
diff --git a/usr/share/river/scripts/kbd-backlight.sh b/usr/share/river/scripts/kbd-backlight.sh
new file mode 100755
index 0000000..14cbab7
--- /dev/null
+++ b/usr/share/river/scripts/kbd-backlight.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+set -x
+
+case $1'' in
+'on')
+    brightnessctl -r -d "*kbd_backlight"
+    ;;
+'off')
+    brightnessctl -s -d "*kbd_backlight" && brightnessctl -d "*kbd_backlight" set 0
+    ;;
+esac
diff --git a/usr/share/river/scripts/lock.sh b/usr/share/river/scripts/lock.sh
index 170253f..13da2d8 100755
--- a/usr/share/river/scripts/lock.sh
+++ b/usr/share/river/scripts/lock.sh
@@ -1,10 +1,15 @@
 #!/bin/bash
 
-USER_SCRIPT="$HOME/.config/swaylock/lock.sh"
-GLOB_SCRIPT="/usr/share/sway/scripts/swaylock.sh"
+# Swaylock run's with additional features, e.g. adding screenshot to background
+SWAYLOCK_USER_SCRIPT="$HOME/.config/swaylock/lock.sh"
+SWAYLOCK_GLOB_SCRIPT="/usr/share/river/scripts/swaylock.sh"
 
-if [[ -x "$USER_SCRIPT" ]]; then
-    "$USER_SCRIPT"
-else 
-    "$GLOB_SCRIPT"
+if [ -x "$(command -v gtklock)" ]; then
+    gtklock --daemonize --follow-focus --idle-hide --start-hidden
+elif [ -x "$(command -v swaylock)" ]; then
+    if [[ -x "$SWAYLOCK_USER_SCRIPT" ]]; then
+        "$SWAYLOCK_USER_SCRIPT"
+    else
+        "$SWAYLOCK_GLOB_SCRIPT"
+    fi
 fi