diff --git a/dot_config/hypr/hyprland.d/70-keybinds.conf.tmpl b/dot_config/hypr/hyprland.d/70-keybinds.conf.tmpl
index 4ed9136..9e1775f 100644
--- a/dot_config/hypr/hyprland.d/70-keybinds.conf.tmpl
+++ b/dot_config/hypr/hyprland.d/70-keybinds.conf.tmpl
@@ -36,44 +36,39 @@ $lockcmd = swaylock -f
 
 $mainMod = SUPER
 
-# Ghostty quick terminal via GlobalShortcuts portal.
-bind = $mainMod, Backspace, global, com.mitchellh.ghostty:LOGO+BackSpace
-
-# Launchers
+# First-class launchers
 bind = $mainMod, Return, exec, $terminal
 bind = $mainMod SHIFT, Return, exec, $term_tmux
-bind = $mainMod ALT_L, Return, exec, $term_tmux_append
-bind = $mainMod CTRL, Return, exec, $terminal
+bind = $mainMod CTRL, Return, exec, $term_tmux_append
 bind = $mainMod, E, exec, $filemanager
+bind = $mainMod, W, exec, $browser
+bind = $mainMod, Space, exec, $launcher
+
+# Secondary app launchers
 bind = $mainMod SHIFT, E, exec, $editor
 bind = $mainMod CTRL, E, exec, $alteditor
-bind = $mainMod, W, exec, $browser
 bind = $mainMod SHIFT, W, exec, $browserprv
 bind = $mainMod CTRL, W, exec, $altbrowser
 bind = $mainMod ALT, W, exec, $browsernewinst
-bind = $mainMod, Space, exec, $launcher
 bind = $mainMod, X, exec, $taskman
 bind = $mainMod, C, exec, $clipman
-bind = $mainMod, R, exec, $pwdmgr
 bind = $mainMod, F4, exec, $soundctl
-bind = $mainMod, backslash, exec, mic-toggle-usb
+bind = $mainMod, A, submap, quickws
 
-# Communication
-bind = $mainMod, A, exec, hypr-element-toggle
-bind = $mainMod, D, exec, hypr-comms-toggle
-
-# Mail
-bind = $mainMod SHIFT, A, exec, hypr-mail-toggle
-
-# Notes
-bind = $mainMod SHIFT, D, exec, hypr-joplin-toggle
-
-# Gaming
-bind = $mainMod, S, exec, hypr-steam-toggle
+submap = quickws
+bind = , a, exec, hypr-element-toggle
+bind = , s, exec, hypr-steam-toggle
+bind = , d, exec, hypr-comms-toggle
+bind = , z, exec, hypr-mail-toggle
+bind = , x, exec, hypr-joplin-toggle
+bind = , Escape, submap, reset
+bind = , Return, submap, reset
+submap = reset
 
 # Notifications
 bind = $mainMod, Grave, exec, $notcenter
 bind = $mainMod SHIFT, Grave, exec, $notdnd
+bind = $mainMod CTRL, Grave, exec, $nothide
 
 # Session
 bind = $mainMod, Pause, exec, $lockcmd
@@ -82,29 +77,32 @@ bind = $mainMod SHIFT, Escape, exec, $lockcmd
 
 # Window management
 bind = $mainMod, Q, killactive,
+bind = $mainMod SHIFT, Q, forcekillactive,
 bind = $mainMod, F, togglefloating,
 bind = $mainMod SHIFT, F, fullscreen
-bind = $mainMod, I, pin
+bind = $mainMod, P, pin
+bind = $mainMod, U, focusurgentorlast
+bind = $mainMod, V, centerwindow
 
 # Special workspaces
 bind = $mainMod SHIFT, Space, togglespecialworkspace          # show/hide special workspace
 bind = $mainMod CTRL, Space, movetoworkspace, special          # move to the special workspace
 bind = $mainMod, N, togglespecialworkspace, passwordmgr
 
-# Master layout
-bind = $mainMod, Tab, layoutmsg, swapwithmaster
-bind = $mainMod SHIFT, Tab, layoutmsg, addmaster
-bind = $mainMod CTRL, Tab, layoutmsg, removemaster
-bind = $mainMod CTRL SHIFT, Tab, layoutmsg, rollnext
-
-# Scrolling layout
-bind = $mainMod, comma, layoutmsg, move -col
-bind = $mainMod, period, layoutmsg, move +col
+# Layout switching
+bind = $mainMod, comma, exec, hypr-workspace-layout toggle-ms
+bind = $mainMod, period, exec, hypr-workspace-layout cycle
+bind = $mainMod SHIFT, comma, layoutmsg, fit active
+bind = $mainMod SHIFT, period, layoutmsg, togglefit
 bind = $mainMod CTRL, comma, layoutmsg, colresize 0.9
-bind = $mainMod CTRL, period, layoutmsg, fit active
-bind = $mainMod CTRL SHIFT, period, layoutmsg, togglefit
-bind = $mainMod ALT, comma, exec, hypr-workspace-layout toggle-ms
-bind = $mainMod ALT, period, exec, hypr-workspace-layout cycle
+
+# Layout-aware navigation (ALT layer)
+bind = $mainMod ALT, Tab, exec, hypr-workspace-layout nav-next
+bind = $mainMod ALT SHIFT, Tab, exec, hypr-workspace-layout nav-prev
+bind = $mainMod ALT, H, exec, hypr-workspace-layout nav-prev
+bind = $mainMod ALT, L, exec, hypr-workspace-layout nav-next
+bind = $mainMod ALT, J, exec, hypr-workspace-layout nav-down
+bind = $mainMod ALT, K, exec, hypr-workspace-layout nav-up
 
 # MOVE FOCUS with mainMod + vim keys
 bind = $mainMod, H, movefocus, l
@@ -118,11 +116,25 @@ bind = $mainMod SHIFT, L, movewindow, r
 bind = $mainMod SHIFT, K, movewindow, u
 bind = $mainMod SHIFT, J, movewindow, d
 
-# Resize window with mainMod + CTRL + vim keys
-bind = $mainMod CTRL, h, resizeactive,-25 0
-bind = $mainMod CTRL, l, resizeactive,25 0
-bind = $mainMod CTRL, k, resizeactive,0 -25
-bind = $mainMod CTRL, j, resizeactive,0 25
+# Resize submap
+bind = $mainMod, R, submap, resize
+
+submap = resize
+bind = , h, resizeactive, -25 0
+bind = , l, resizeactive, 25 0
+bind = , k, resizeactive, 0 -25
+bind = , j, resizeactive, 0 25
+bind = SHIFT, h, resizeactive, -60 0
+bind = SHIFT, l, resizeactive, 60 0
+bind = SHIFT, k, resizeactive, 0 -60
+bind = SHIFT, j, resizeactive, 0 60
+bind = , Escape, submap, reset
+bind = , Return, submap, reset
+submap = reset
+
+# Workspace cycling (per-monitor)
+bind = $mainMod, Tab, workspace, m+1
+bind = $mainMod SHIFT, Tab, workspace, m-1
 
 # SWITCH WORKSPACES with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
@@ -136,9 +148,15 @@ bind = $mainMod, 8, workspace, 8
 bind = $mainMod, 9, workspace, 9
 bind = $mainMod, 0, workspace, 10
 
-# MOVE CURRENT WORKSPACE TO A MONITOR with mainMod + SHIFT + [,/.]
-bind = $mainMod SHIFT, comma, movecurrentworkspacetomonitor, l
-bind = $mainMod SHIFT, period, movecurrentworkspacetomonitor, r
+# Monitor focus / workspace move
+bind = $mainMod, O, focusmonitor, l
+bind = $mainMod, I, focusmonitor, r
+bind = $mainMod SHIFT, O, movecurrentworkspacetomonitor, l
+bind = $mainMod SHIFT, I, movecurrentworkspacetomonitor, r
+bind = $mainMod ALT SHIFT, H, movecurrentworkspacetomonitor, l
+bind = $mainMod ALT SHIFT, J, movecurrentworkspacetomonitor, d
+bind = $mainMod ALT SHIFT, K, movecurrentworkspacetomonitor, u
+bind = $mainMod ALT SHIFT, L, movecurrentworkspacetomonitor, r
 
 # MOVE ACTIVE WINDOW TO A WORKSPACE with mainMod + SHIFT + [0-9]
 bind = $mainMod SHIFT, 1, movetoworkspace, 1
@@ -164,14 +182,35 @@ bind = $mainMod CTRL SHIFT, 8, movetoworkspacesilent, 8
 bind = $mainMod CTRL SHIFT, 9, movetoworkspacesilent, 9
 bind = $mainMod CTRL SHIFT, 0, movetoworkspacesilent, 10
 
+# Group tab switching
 bind = $mainMod, Z, changegroupactive, f
 bind = $mainMod SHIFT, Z, changegroupactive, b
-bind = $mainMod CTRL, Z, togglegroup
+bind = $mainMod, G, submap, group
 
-bind = $mainMod ALT_L, H, movewindoworgroup, l
-bind = $mainMod ALT_L, J, movewindoworgroup, d
-bind = $mainMod ALT_L, K, movewindoworgroup, u
-bind = $mainMod ALT_L, L, movewindoworgroup, r
+submap = group
+bind = , h, moveintogroup, l
+bind = , j, moveintogroup, d
+bind = , k, moveintogroup, u
+bind = , l, moveintogroup, r
+bind = , o, moveoutofgroup
+bind = , t, togglegroup
+bind = , d, denywindowfromgroup, toggle
+bind = , f, lockactivegroup, toggle
+bind = SHIFT, f, lockgroups, toggle
+bind = , Escape, submap, reset
+bind = , Return, submap, reset
+submap = reset
+
+# Zoom submap
+bind = $mainMod, M, submap, zoom
+
+submap = zoom
+bind = , equal, exec, hypr-zoom-step +0.2
+bind = , minus, exec, hypr-zoom-step -0.2
+bind = , 0, exec, hypr-zoom-step reset
+bind = , Escape, submap, reset
+bind = , Return, submap, reset
+submap = reset
 
 # MOVE/RESIZE WINDOWS with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
@@ -193,10 +232,6 @@ bindel = SHIFT, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SOUR
 bindel = SHIFT, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-
 bindel = SHIFT, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
 
-# Zoom control
-bind = $mainMod, M, exec, hyprctl keyword cursor:zoom_factor 2
-bind = $mainMod SHIFT, M, exec, hyprctl keyword cursor:zoom_factor 1
-
 # Requires playerctl
 bindl = , XF86AudioNext, exec, playerctl next
 bindl = , XF86AudioPause, exec, playerctl play-pause
diff --git a/dot_local/bin/executable_hypr-workspace-layout b/dot_local/bin/executable_hypr-workspace-layout
index 2644439..d25947f 100644
--- a/dot_local/bin/executable_hypr-workspace-layout
+++ b/dot_local/bin/executable_hypr-workspace-layout
@@ -2,8 +2,8 @@
 set -euo pipefail
 
 mode="${1:-}"
-if [[ "$mode" != "toggle-ms" && "$mode" != "cycle" ]]; then
-  printf 'Usage: %s {toggle-ms|cycle}\n' "${0##*/}" >&2
+if [[ "$mode" != "toggle-ms" && "$mode" != "cycle" && "$mode" != "nav-next" && "$mode" != "nav-prev" && "$mode" != "nav-up" && "$mode" != "nav-down" ]]; then
+  printf 'Usage: %s {toggle-ms|cycle|nav-next|nav-prev|nav-up|nav-down}\n' "${0##*/}" >&2
   exit 2
 fi
 
@@ -81,7 +81,7 @@ if [[ "$mode" == "toggle-ms" ]]; then
   else
     next_layout="master"
   fi
-else
+elif [[ "$mode" == "cycle" ]]; then
   layouts=(dwindle master scrolling monocle)
   next_layout="${layouts[0]}"
 
@@ -91,6 +91,38 @@ else
       break
     fi
   done
+elif [[ "$mode" == "nav-next" ]]; then
+  if [[ "$current_layout" == "scrolling" ]]; then
+    hyprctl dispatch layoutmsg "focus r" >/dev/null
+  else
+    hyprctl dispatch cyclenext >/dev/null
+  fi
+  exit 0
+elif [[ "$mode" == "nav-prev" ]]; then
+  if [[ "$current_layout" == "scrolling" ]]; then
+    hyprctl dispatch layoutmsg "focus l" >/dev/null
+  else
+    hyprctl dispatch cyclenext prev >/dev/null
+  fi
+  exit 0
+elif [[ "$mode" == "nav-down" ]]; then
+  if [[ "$current_layout" == "scrolling" ]]; then
+    hyprctl dispatch layoutmsg "focus d" >/dev/null
+  elif [[ "$current_layout" == "master" ]]; then
+    hyprctl dispatch layoutmsg addmaster >/dev/null
+  else
+    hyprctl dispatch cyclenext >/dev/null
+  fi
+  exit 0
+elif [[ "$mode" == "nav-up" ]]; then
+  if [[ "$current_layout" == "scrolling" ]]; then
+    hyprctl dispatch layoutmsg "focus u" >/dev/null
+  elif [[ "$current_layout" == "master" ]]; then
+    hyprctl dispatch layoutmsg removemaster >/dev/null
+  else
+    hyprctl dispatch cyclenext prev >/dev/null
+  fi
+  exit 0
 fi
 
 hyprctl keyword workspace "$ws_selector,layout:$next_layout" >/dev/null
diff --git a/dot_local/bin/executable_hypr-zoom-step b/dot_local/bin/executable_hypr-zoom-step
new file mode 100644
index 0000000..509903c
--- /dev/null
+++ b/dot_local/bin/executable_hypr-zoom-step
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+step="${1:-}"
+if [[ -z "$step" ]]; then
+  printf 'Usage: %s {+FLOAT|-FLOAT|reset}\n' "${0##*/}" >&2
+  exit 2
+fi
+
+if ! command -v hyprctl >/dev/null 2>&1; then
+  echo "hyprctl not found" >&2
+  exit 1
+fi
+
+current=""
+if command -v jq >/dev/null 2>&1; then
+  if json="$(hyprctl -j getoption cursor:zoom_factor 2>/dev/null)"; then
+    current="$(printf '%s' "$json" | jq -r '.float // .value // empty')"
+  fi
+fi
+
+if [[ -z "$current" ]]; then
+  current="$(hyprctl getoption cursor:zoom_factor 2>/dev/null | sed -n 's/.*float:[[:space:]]*\([-0-9.]*\).*/\1/p' | head -n1)"
+fi
+
+if [[ -z "$current" ]]; then
+  current="1.0"
+fi
+
+if [[ "$step" == "reset" ]]; then
+  next="1.0"
+else
+  next="$(awk -v c="$current" -v s="$step" 'BEGIN { printf "%.3f", c + s }')"
+  next="$(awk -v n="$next" 'BEGIN {
+    if (n < 1.0) n = 1.0;
+    if (n > 5.0) n = 5.0;
+    printf "%.3f", n;
+  }')"
+fi
+
+hyprctl keyword cursor:zoom_factor "$next" >/dev/null
+hyprctl notify -1 1200 "rgb(a6da95)" "Zoom: ${next}" >/dev/null 2>&1 || true
+