diff --git a/.config/river/init b/.config/river/init
index b2c80a7..b9ad543 100755
--- a/.config/river/init
+++ b/.config/river/init
@@ -35,5 +35,5 @@ riverctl csd-filter-add app-id org.pwmt.zathura
 
 ~/.config/river/keys
 
-riverctl default-layout stacktile
-exec stacktile --per-tag-config --drop-empty-configs --outer-padding=0 --inner-padding=6 --primary-sublayout=stack
+riverctl default-layout rivertile
+exec rivertile
diff --git a/.config/river/keys b/.config/river/keys
index 8511fcb..99128a7 100755
--- a/.config/river/keys
+++ b/.config/river/keys
@@ -22,10 +22,10 @@ riverctl map normal $mod+Shift K swap previous
 
 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 map normal $mod H send-layout-cmd rivertile "main-ratio -0.05"
+riverctl map normal $mod L send-layout-cmd rivertile "main-ratio +0.05"
+riverctl map normal $mod+Shift H send-layout-cmd rivertile "main-count +1"
+riverctl map normal $mod+Shift L send-layout-cmd rivertile "main-count -1"
 
 riverctl declare-mode move-resize
 riverctl map normal $mod R enter-mode move-resize
@@ -84,11 +84,10 @@ riverctl map normal $mod+Shift 0 set-view-tags $all_tags
 riverctl map normal $mod Space toggle-float
 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 M     send-layout-cmd stacktile "all_primary toggle"
+riverctl map normal $mod Up    send-layout-cmd rivertile "main-location top"
+riverctl map normal $mod Right send-layout-cmd rivertile "main-location right"
+riverctl map normal $mod Down  send-layout-cmd rivertile "main-location bottom"
+riverctl map normal $mod Left  send-layout-cmd rivertile "main-location left"
 
 riverctl declare-mode passthrough
 riverctl map normal $mod F11 enter-mode passthrough