diff --git a/desktop/.config/river/init b/desktop/.config/river/init
index 8a2bbf5..debf7fc 100755
--- a/desktop/.config/river/init
+++ b/desktop/.config/river/init
@@ -124,12 +124,6 @@ riverctl map normal $mod+Control L snap right
 
 # Mod+F to toggle fullscreen
 riverctl map normal $mod F toggle-fullscreen
-# if we are running filtile we also have access to monocle mode
-if  [ "$layout" = "filtile" ]; then
-    riverctl map normal $mod+Shift F spawn "riverctl send-layout-cmd $layout monocle"
-fi
-
-riverctl map normal $mod+Shift v toggle-float
 
 # shellcheck disable=SC2016
 # Make all connected outputs show the desktop and no windows at all
@@ -138,6 +132,8 @@ riverctl map normal $mod+Shift M spawn 'for i in $(wlopm | wc -l); do riverctl s
 riverctl map normal $mod+Shift F10 spawn "riverctl send-layout-cmd $layout '--tags all --output all view-padding 0'"
 riverctl map normal $mod F10 spawn "riverctl send-layout-cmd $layout '--tags all --output all view-padding 6'"
 
+# toggle float
+riverctl map normal $mod+Shift v toggle-float
 # Mod + Left Mouse Button to move views
 riverctl map-pointer normal $mod BTN_LEFT move-view
 # Mod + Right Mouse Button to resize views
@@ -147,39 +143,24 @@ riverctl map-pointer normal $mod BTN_RIGHT resize-view
 riverctl declare-mode interact_float
 riverctl map normal $modemod R enter-mode interact_float
 riverctl map interact_float $modemod R enter-mode normal
-riverctl map interact_float None Escape enter-mode normal
-# toggle float
-riverctl map interact_float $mod+Shift v toggle-float
-# move views around screen
-riverctl map -repeat interact_float None H move left 100
-riverctl map -repeat interact_float None J move down 100
-riverctl map -repeat interact_float None K move up 100
-riverctl map -repeat interact_float None L move right 100
 # resize views on screen
-riverctl map -repeat interact_float $mod H resize horizontal -100
-riverctl map -repeat interact_float $mod J resize vertical 100
-riverctl map -repeat interact_float $mod K resize vertical -100
-riverctl map -repeat interact_float $mod L resize horizontal 100
+riverctl map interact_float $mod H resize horizontal -100
+riverctl map interact_float $mod J resize vertical 100
+riverctl map interact_float $mod K resize vertical -100
+riverctl map interact_float $mod L resize horizontal 100
+# move views around screen
+riverctl map interact_float $mod+Shift H move left 100
+riverctl map interact_float $mod+Shift J move down 100
+riverctl map interact_float $mod+Shift K move up 100
+riverctl map interact_float $mod+Shift L move right 100
 # decrease/increase the main ratio of layout
-riverctl map interact_float $mod+Shift H send-layout-cmd $layout "main-ratio -0.05"
-riverctl map interact_float $mod+Shift L send-layout-cmd $layout "main-ratio +0.05"
+riverctl map interact_float None H send-layout-cmd $layout "main-ratio -0.05"
+riverctl map interact_float None L send-layout-cmd $layout "main-ratio +0.05"
 # increment/decrement the main layout
-riverctl map interact_float $mod+Shift J send-layout-cmd $layout "main-count +1"
-riverctl map interact_float $mod+Shift K send-layout-cmd $layout "main-count -1"
-# snap views to screen edges
-riverctl map interact_float $mod+Control H snap left
-riverctl map interact_float $mod+Control J snap down
-riverctl map interact_float $mod+Control K snap up
-riverctl map interact_float $mod+Control L snap right
+riverctl map interact_float None J send-layout-cmd $layout "main-count +1"
+riverctl map interact_float None K send-layout-cmd $layout "main-count -1"
 ### End resize and moving mode
 
-## Passthrough mode which disables all other mappings and only retains the single
-#  mapping to return to normal mode. Useful for some full screen applications
-#  which should capture everything, or for testing nested wayland compositors.
-riverctl declare-mode passthrough
-riverctl map normal $mod F11 enter-mode passthrough
-riverctl map passthrough $mod F11 enter-mode normal
-
 # focus the next/previous output
 riverctl map normal $mod Period focus-output next
 riverctl map normal $mod Comma focus-output previous
@@ -236,9 +217,9 @@ done
 # The scratchpad will live on an unused tag. Which tags are used depends on your
 # config, but rivers default uses the first 9 tags.
 scratch_tag=$((1 << 20))
-# Toggle showing the scratchpad
+# Toggle the scratchpad with Super+P
 riverctl map normal $mod grave toggle-focused-tags ${scratch_tag}
-# Send windows to the scratchpad
+# Send windows to the scratchpad with Super+Shift+P
 riverctl map normal $mod+Shift grave set-view-tags ${scratch_tag}
 # Set spawn tagmask to ensure new windows don't have the scratchpad tag unless
 # explicitly set.