diff --git a/home/.config/river/init b/home/.config/river/init
index e985f8f..27b121f 100755
--- a/home/.config/river/init
+++ b/home/.config/river/init
@@ -104,15 +104,13 @@ riverctl map normal $mod+Shift Comma send-to-output previous
 # Mod+E to bump the focused view to the top of the layout stack
 riverctl map normal $mod E zoom
 
-# Mod+H and Mod+L to decrease/increase the main factor by 2%
-# If using rivertile(1) this determines the width of the main stack.
-riverctl map normal $mod H spawn riverctl mod-option -focused-output main_factor -0.02
-riverctl map normal $mod L spawn riverctl mod-option -focused-output main_factor +0.02
+# Mod+H and Mod+L to decrease/increase the main_factor value of rivertile by 0.02
+riverctl map normal $mod H mod-layout-value rivertile fixed main_factor -0.02
+riverctl map normal $mod L mod-layout-value rivertile fixed main_factor +0.02
 
-# Mod+Shift+H and Mod+Shift+L to increment/decrement the number of
-# main views in the layout
-riverctl map normal $mod+Shift H spawn riverctl mod-option -focused-output main_count +1
-riverctl map normal $mod+Shift L spawn riverctl mod-option -focused-output main_count -1
+# Mod+Shift+H and Mod+Shift+L to increment/decrement the main_count value of rivertile
+riverctl map normal $mod+Shift H mod-layout-value rivertile int main_count +1
+riverctl map normal $mod+Shift L mod-layout-value rivertile int main_count -1
 
 # Mod+Alt+{H,J,K,L} to move views
 riverctl map normal $mod+Mod1 H move left 100
@@ -194,10 +192,10 @@ riverctl map normal $mod Space toggle-float
 riverctl map normal $mod F toggle-fullscreen
 
 # Control+Alt+{H,J,K,L} to change layout orientation
-riverctl map normal Mod1+Control H spawn riverctl set-option -focused-output main_location left
-riverctl map normal Mod1+Control J spawn riverctl set-option -focused-output main_location bottom
-riverctl map normal Mod1+Control K spawn riverctl set-option -focused-output main_location top
-riverctl map normal Mod1+Control L spawn riverctl set-option -focused-output main_location right
+riverctl map normal Mod1+Control H set-layout-value rivertile string main_location left
+riverctl map normal Mod1+Control J set-layout-value rivertile string main_location bottom
+riverctl map normal Mod1+Control K set-layout-value rivertile string main_location top
+riverctl map normal Mod1+Control L set-layout-value rivertile string main_location right
 
 # Declare a passthrough mode. This mode has only a single mapping to return to
 # normal mode. This makes it useful for testing a nested wayland compositor
@@ -249,16 +247,6 @@ riverctl float-filter-add "info.febvre.Komikku"
 # Set app-ids of views which should use client side decorations
 riverctl csd-filter-add "swappy"
 
-## Layout ───────────────────────────────────────────────────────────────────────
-
 # Default layout
-riverctl set-option layout rivertile
-
-# Settings (need to be declared since we do this before starting `rivertile`)
-riverctl declare-option main_factor fixed 0.54
-riverctl declare-option main_count uint 1
-riverctl declare-option main_location string "left"
-riverctl declare-option view_padding uint 4
-riverctl declare-option outer_padding uint 4
-
-exec rivertile
+riverctl default-layout rivertile
+exec rivertile -view-padding 4 -outer-padding 4 -main-location left -main-count 1 -main-factor 0.54
diff --git a/setup/Anime4K.sh b/setup/Anime4K.sh
index 82f37a2..c430b44 100755
--- a/setup/Anime4K.sh
+++ b/setup/Anime4K.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 
+echo "Number of make jobs: " | tr -d '\n' # 4
+read -r mj
+
 # ------------------ Anime4KCPP -------------------------- #
 # Need cmake, libopencv4-devel, ocl-icd-devel, libgomp-devel
 git clone https://github.com/TianZerl/Anime4KCPP.git
 cd Anime4KCPP || exit 1
 mkdir build && cd build
 cmake ..
-make -j4
+make -j${mj}
 cp -f bin/Anime4KCPP_CLI ~/.local/bin/
 cd ../..
 
@@ -30,7 +33,7 @@ git clone https://github.com/DeadSix27/waifu2x-converter-cpp
 cd waifu2x-converter-cpp || exit 1
 mkdir build && cd build
 cmake ..
-make -j4
+make -j${mj}
 cp -f waifu2x-converter-cpp ~/.local/bin/
 cd ../..