diff --git a/river/init b/river/init
index 51db493..0638935 100755
--- a/river/init
+++ b/river/init
@@ -25,8 +25,8 @@ riverctl map -repeat normal Super K focus-view previous
 
 # Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous
 # view in the layout stack
-riverctl map -repeat normal Super+Shift J swap next
-riverctl map -repeat normal Super+Shift K swap previous
+riverctl map -repeat normal Super N swap next
+riverctl map -repeat normal Super P swap previous
 
 # Super+Period and Super+Comma to focus the next/previous output
 riverctl map normal Super Period focus-output next
@@ -58,7 +58,7 @@ riverctl map normal Super+Alt+Control H snap left
 riverctl map normal Super+Alt+Control J snap down
 riverctl map normal Super+Alt+Control K snap up
 riverctl map normal Super+Alt+Control L snap right
-
+ 
 # Super+Alt+Shift+{H,J,K,L} to resize views
 riverctl map -repeat normal Super+Alt+Shift H resize horizontal -100
 riverctl map -repeat normal Super+Alt+Shift J resize vertical 100
@@ -77,8 +77,7 @@ riverctl map-pointer normal Super BTN_MIDDLE toggle-float
 #
 riverctl map-pointer normal Super BTN_GEAR_DOWN focus-view next
 
-for i in $(seq 1 9)
-do
+for i in $(seq 1 9) ; do
     tags=$((1 << ($i - 1)))
 
     # Super+[1-9] to focus tag [0-8]
@@ -88,10 +87,10 @@ do
     riverctl map normal Super+Shift $i set-view-tags $tags
 
     # Super+Control+[1-9] to toggle focus of tag [0-8]
-    riverctl map normal Super+Control $i toggle-focused-tags $tags
+    riverctl map normal Super+Alt $i toggle-focused-tags $tags
 
     # Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view
-    riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
+    riverctl map normal Super+Shift+Alt $i toggle-view-tags $tags
 done
 
 # Super+0 to focus all tags
@@ -107,10 +106,10 @@ riverctl map normal Super F toggle-float
 riverctl map normal Super+Shift F toggle-fullscreen
 
 # Super+{Up,Right,Down,Left} to change layout orientation
-riverctl map normal Super Up    send-layout-cmd rivertile "main-location top"
-riverctl map normal Super Right send-layout-cmd rivertile "main-location right"
-riverctl map normal Super Down  send-layout-cmd rivertile "main-location bottom"
-riverctl map normal Super Left  send-layout-cmd rivertile "main-location left"
+riverctl map normal Super+Shift K    send-layout-cmd rivertile "main-location top"
+riverctl map normal Super+Shift L send-layout-cmd rivertile "main-location right"
+riverctl map normal Super+Shift J  send-layout-cmd rivertile "main-location bottom"
+riverctl map normal Super+Shift H   send-layout-cmd rivertile "main-location left"
 
 # Terminal.
 riverctl map normal Super+Alt T spawn "$XTERMINAL"
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 5f7195b..550bb09 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -15,8 +15,10 @@
 
 	"river/mode" : {
 		"format": " {} ",
-		"on-click" : "riverctl send-layout-cmd rivertile 'main-ratio -0.05'",
-		"on-click-right" : "riverctl send-layout-cmd rivertile 'main-ratio +0.05'"
+		"on-scroll-down" : "riverctl send-layout-cmd rivertile 'main-ratio -0.05'",
+		"on-scroll-up" : "riverctl send-layout-cmd rivertile 'main-ratio +0.05'",
+		"on-click" : "riverctl send-layout-cmd rivertile 'main-count +1'",
+		"on-click-right" : "riverctl send-layout-cmd rivertile 'main-count -1'",
 	},
 	"privacy": {
 		"icon-spacing": 4,