diff --git a/river/init b/river/init
index e7385f8..9459d58 100755
--- a/river/init
+++ b/river/init
@@ -23,7 +23,7 @@ xrdb -merge "$HOME/.Xresources"
 DOTOOL_XKB_LAYOUT=be dotoold &
 
 wl-paste --watch clipman store &
-riverctl map normal $mod c spawn "clipman pick --tool rofi"
+riverctl map normal $mod C spawn "clipman pick --tool rofi"
 
 if $in_sway; then
 	mod=Alt
@@ -49,25 +49,25 @@ riverctl map normal $mod O spawn swaylock -c 000000 -l -f -i ~/img/bg/amy_sunflo
 riverctl map normal $mod D spawn "killall rofi || rofi -show combi"
 
 
-riverctl map normal $mod K focus-view previous
-riverctl map normal $mod J focus-view next
-riverctl map normal $mod H focus-output previous
-riverctl map normal $mod L focus-output next
+riverctl map normal $mod K focus-view up
+riverctl map normal $mod J focus-view down
+riverctl map normal $mod H focus-view left
+riverctl map normal $mod L focus-view right
 
-riverctl map normal $mod+Shift K swap previous
-riverctl map normal $mod+Shift J swap next
-riverctl map normal $mod+Shift H send-to-output -current-tags previous
-riverctl map normal $mod+Shift L send-to-output -current-tags next
+riverctl map normal $mod+Shift K swap up
+riverctl map normal $mod+Shift J swap down
+riverctl map normal $mod+Shift H swap left
+riverctl map normal $mod+Shift L swap right
 
-riverctl map normal $mod+Control K focus-view up
-riverctl map normal $mod+Control J focus-view down
-riverctl map normal $mod+Control H focus-view left
-riverctl map normal $mod+Control L focus-view right
+riverctl map normal $mod+Control K focus-output up
+riverctl map normal $mod+Control J focus-output down
+riverctl map normal $mod+Control H focus-output left
+riverctl map normal $mod+Control L focus-output right
 
-riverctl map normal $mod+Control+Shift K swap up
-riverctl map normal $mod+Control+Shift J swap down
-riverctl map normal $mod+Control+Shift H swap left
-riverctl map normal $mod+Control+Shift L swap right
+riverctl map normal $mod+Control+Shift K swap previous
+riverctl map normal $mod+Control+Shift J swap next
+riverctl map normal $mod+Control+Shift H send-to-output -current-tags previous
+riverctl map normal $mod+Control+Shift L send-to-output -current-tags next
 
 #riverctl map normal $mod X focus-output next
 #riverctl map normal $mod+Shift X send-to-output -current-tags next
@@ -140,7 +140,7 @@ riverctl map normal $mod Right send-layout-cmd river-ultitile "set string layout
 riverctl map normal $mod Down  send-layout-cmd river-ultitile "set string layout = monocle"
 riverctl map normal $mod Left  send-layout-cmd river-ultitile "set string layout = main"
 
-riverctl map normal $mod z spawn "riverctl send-layout-cmd river-ultitile 'unset-all-local layout'; riverctl send-layout-cmd river-ultitile 'set global string layout @ main hstack vstack'"
+riverctl map normal $mod E spawn "riverctl send-layout-cmd river-ultitile 'unset-all-local layout'; riverctl send-layout-cmd river-ultitile 'set global string layout @ main hstack vstack'"
 
 
 riverctl rule-add -app-id "Firefox" ssd