diff --git a/dot_config/river/executable_init.tmpl b/dot_config/river/executable_init.tmpl
index 62b7948..8c470e4 100644
--- a/dot_config/river/executable_init.tmpl
+++ b/dot_config/river/executable_init.tmpl
@@ -46,13 +46,16 @@ riverctl map normal Super P focus-view previous
 riverctl map normal Super+Alt N swap next
 riverctl map normal Super+Alt P swap previous
 
+# Switch back and forth between two tag groups
+riverctl map normal Super O focus-previous-tags
+
 # Focus the next/previous output
 riverctl map normal Super V focus-output next
 riverctl map normal Super+Alt V focus-output previous
 
 # Send the focused view to the next/previous output
-riverctl map normal Super+Shift Grave send-to-output next
-riverctl map normal Super Grave send-to-output previous
+riverctl map normal Super Grave send-to-output next
+riverctl map normal Super+Shift Grave send-to-output previous
 
 # Bump the focused view to the top of the layout stack
 riverctl map normal Super+Shift Return zoom
@@ -89,7 +92,7 @@ riverctl map normal Super+Shift F send-layout-cmd rivertile "main-location right
 riverctl map normal Super+Shift P send-layout-cmd rivertile "main-location top"
 riverctl map normal Super+Shift N send-layout-cmd rivertile "main-location bottom"
 
-# Vim-like keybinds for layouts/views
+## Vim-like keybinds for layouts/views
 
 # Focus the next/previous view in the layout stack
 riverctl map normal Super J focus-view next
@@ -254,6 +257,23 @@ riverctl map-switch normal lid close 'waylock-launcher'
 riverctl focus-output DP-1
 {{- end }}
 
+{{ if eq .chezmoi.hostname "helix" }}
+# Initial tags: $((1 << ("WORKSPACE" - 1)))
+riverctl rule-add -app-id 'firefox' tags 1
+riverctl rule-add -app-id 'chromium' tags 2
+riverctl rule-add -app-id 'thunar' tags $((1 << 2))
+riverctl rule-add -app-id 'evince' tags $((1 << 3))
+riverctl rule-add -app-id 'libreoffice*' tags $((1 << 3))
+riverctl rule-add -app-id 'Alacritty' tags $((1 << 5))
+riverctl rule-add -app-id 'foot' tags $((1 << 5))
+riverctl rule-add -app-id 'kitty' tags $((1 << 5))
+riverctl rule-add -app-id 'emacs' tags $((1 << 6))
+riverctl rule-add -app-id 'kitty' -title 'weechat' tags $((1 << 7))
+riverctl rule-add -app-id 'Mattermost' tags $((1 << 7))
+riverctl rule-add -app-id 'thunderbird' tags $((1 << 8))
+riverctl rule-add -app-id 'tutanota-desktop' tags $((1 << 8))
+{{- end }}
+
 # Start floating
 riverctl rule-add -app-id 'Bitwarden' float
 riverctl rule-add -app-id 'Blueman-manager' float