diff --git a/.config/river/init b/.config/river/init
index f612124..1ebfb6b 100755
--- a/.config/river/init
+++ b/.config/river/init
@@ -7,12 +7,14 @@
 export XDG_CURRENT_DESKTOP=river
 export XDG_SESSION_TYPE=wayland
 
+export MOZ_ENABLE_WAYLAND=1
+
 export XCURSOR_SIZE=36
 
 ## Start portals
 dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-xdg-desktop-portal-wlr &
-xdg-desktop-portal &
+/usr/libexec/xdg-desktop-portal-wlr &
+/usr/libexec/xdg-desktop-portal &
 
 ## Start easyeffects
 #flatpak run com.github.wwmm.easyeffects --gapplication-service &
@@ -126,36 +128,8 @@ riverctl map passthrough Mod1 F11 enter-mode normal
 
 # Lock screen
 #riverctl map normal Mod1+Shift L spawn waylock
-riverctl map normal Mod1+Shift L spawn 'swaylock \
-	--clock \
-	--indicator-idle-visible \
-	--indicator-radius 100 \
-	--indicator-thickness 7 \
-	--ring-color 2D464D \
-	--key-hl-color be5046 \
-	--text-color ffffff \
-	--line-color 00000000 \
-	--inside-color 00000088 \
-	--separator-color 00000000 \
-	--fade-in 0.2 \
-	--effect-blur 7x1 \
-	--image ~/Pictures/bg-astronaut.jpg'
-
-swayidle \
-  timeout 300 'swaylock \
-	--clock \
-	--indicator-idle-visible \
-	--indicator-radius 100 \
-	--indicator-thickness 7 \
-	--ring-color 2D464D \
-	--key-hl-color be5046 \
-	--text-color ffffff \
-	--line-color 00000000 \
-	--inside-color 00000088 \
-	--separator-color 00000000 \
-	--fade-in 0.2 \
-	--effect-blur 7x1 \
-	--image ~/Pictures/bg-astronaut.jpg' &
+riverctl map normal Mod1+Shift L spawn lockscreen
+swayidle timeout 300 lockscreen &
 
 # Various media key mapping examples for both normal and locked mode which do
 # not have a modifier
@@ -194,8 +168,9 @@ riverctl border-width 1
 riverctl set-repeat 30 200
 
 # Keyboard layouts
-riverctl keyboard-layout -options "grp:win_space_toggle" "us,cz(qwerty)"
-#riverctl keyboard-layout CShack
+riverctl map normal Mod1 c spawn 'riverctl keyboard-layout "cz(qwerty)"'
+riverctl map normal Mod1 u spawn 'riverctl keyboard-layout "us"'
+riverctl keyboard-layout "us" # default layout
 
 # Make all views with an app-id that starts with "float" and title "foo" start floating.
 riverctl rule-add -app-id 'float*' -title 'foo' float
@@ -259,3 +234,5 @@ filtile \
 	smart-padding 0, \
 	main-ratio 55, \
 	main-location left
+
+riverctl spawn ssh-agent