diff --git a/.config/river/init b/.config/river/init
index ccbff70..9820000 100755
--- a/.config/river/init
+++ b/.config/river/init
@@ -32,5 +32,5 @@ riverctl float-filter-add title "Firefox — Sharing Indicator"
 
 ~/.config/river/keys
 
-riverctl spawn "pgrep -x rivertile >/dev/null || rivertile"
-riverctl default-layout rivertile
+riverctl spawn "pgrep -x stacktile >/dev/null || stacktile --per-tag-config --drop-empty-configs --outer-padding=0 --inner-padding=6 --primary-sublayout=stack"
+riverctl default-layout stacktile
diff --git a/.config/river/keys b/.config/river/keys
index 6038f03..57439c2 100755
--- a/.config/river/keys
+++ b/.config/river/keys
@@ -24,10 +24,10 @@ 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 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 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
@@ -78,10 +78,11 @@ 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 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 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 declare-mode passthrough
 riverctl map normal $mod F11 enter-mode passthrough