diff --git a/.config/river/keys b/.config/river/keys
index 9477d5a..9331f9b 100755
--- a/.config/river/keys
+++ b/.config/river/keys
@@ -8,9 +8,23 @@ riverctl map normal $mod+Shift E exit
 
 riverctl map normal $mod J focus-view next
 riverctl map normal $mod K focus-view previous
+riverctl map normal $mod Down focus-view next
+riverctl map normal $mod Up focus-view previous
 
 riverctl map normal $mod+Shift J swap next
 riverctl map normal $mod+Shift K swap previous
+riverctl map normal $mod+Shift Down swap next
+riverctl map normal $mod+Shift Up swap previous
+
+riverctl map normal $mod H send-layout-cmd stacktile "primary_ratio -0.05"
+riverctl map normal $mod L send-layout-cmd stacktile "primary_ratio +0.05"
+riverctl map normal $mod Left send-layout-cmd stacktile "primary_ratio -0.05"
+riverctl map normal $mod Right send-layout-cmd stacktile "primary_ratio +0.05"
+
+riverctl map normal $mod+Shift H send-layout-cmd stacktile "primary_count +1"
+riverctl map normal $mod+Shift L send-layout-cmd stacktile "primary_count -1"
+riverctl map normal $mod+Shift Left send-layout-cmd stacktile "primary_count +1"
+riverctl map normal $mod+Shift Right send-layout-cmd stacktile "primary_count -1"
 
 riverctl map normal None Super_L spawn "killall -SIGUSR1 river-tag-overlay"
 
@@ -24,11 +38,6 @@ riverctl map normal None Super_L spawn "killall -SIGUSR1 river-tag-overlay"
 
 riverctl map normal $mod Return zoom
 
-riverctl map normal $mod H send-layout-cmd stacktile "primary_ratio -0.05"
-riverctl map normal $mod L send-layout-cmd stacktile "primary_ratio +0.05"
-riverctl map normal $mod+Shift H send-layout-cmd stacktile "primary_count +1"
-riverctl map normal $mod+Shift L send-layout-cmd stacktile "primary_count -1"
-
 riverctl declare-mode move-resize
 riverctl map normal $mod R enter-mode move-resize
 
@@ -61,28 +70,25 @@ define_tag() {
     riverctl map normal $mod+Shift+Alt $2 toggle-view-tags $1
 }
 
-define_tag $((1 << 0)) Z
-define_tag $((1 << 1)) X
-define_tag $((1 << 2)) C
-define_tag $((1 << 3)) B
-define_tag $((1 << 4)) N
+define_tag $((1 << 0)) U
+define_tag $((1 << 1)) I
+define_tag $((1 << 2)) O
+define_tag $((1 << 3)) P
+define_tag $((1 << 4)) Y
 define_tag $((1 << 5)) M
-define_tag $((1 << 6)) less
-define_tag $((1 << 7)) greater
-define_tag $((1 << 8)) question
 
 all_tags=$(((1 << 32) - 1))
 riverctl map normal $mod 0 set-focused-tags $all_tags
 riverctl map normal $mod+Shift 0 set-view-tags $all_tags
 
 riverctl map normal $mod Space toggle-float
-riverctl map normal $mod G toggle-fullscreen
+riverctl map normal $mod F toggle-fullscreen
 
-riverctl map normal $mod Up    send-layout-cmd stacktile "primary_position top"
-riverctl map normal $mod Right send-layout-cmd stacktile "primary_position right"
-riverctl map normal $mod Down  send-layout-cmd stacktile "primary_position bottom"
-riverctl map normal $mod Left  send-layout-cmd stacktile "primary_position left"
-riverctl map normal $mod H     send-layout-cmd stacktile "all_primary toggle"
+# riverctl map normal $mod Up    send-layout-cmd stacktile "primary_position top"
+# riverctl map normal $mod Right send-layout-cmd stacktile "primary_position right"
+# riverctl map normal $mod Down  send-layout-cmd stacktile "primary_position bottom"
+# riverctl map normal $mod Left  send-layout-cmd stacktile "primary_position left"
+riverctl map normal $mod A     send-layout-cmd stacktile "all_primary toggle"
 
 riverctl declare-mode passthrough
 riverctl map normal $mod F11 enter-mode passthrough