diff --git a/bin/omarchy-capture-screenrecording b/bin/omarchy-capture-screenrecording
index 1f8a169b3a6..aca3d451066 100755
--- a/bin/omarchy-capture-screenrecording
+++ b/bin/omarchy-capture-screenrecording
@@ -336,7 +336,8 @@ stop_screenrecording() {
     # Generate a preview thumbnail from the first frame
     ffmpeg -y -i "$filename" -ss 00:00:00.1 -vframes 1 -q:v 2 "$preview" -loglevel quiet 2>/dev/null
 
-    omarchy-notification-send "Screen recording saved" "Open with Super + Alt + , (or click this)" \
+    notification_shortcut=$(omarchy-keybinding-label 'Super + Alt + ,')
+    omarchy-notification-send "Screen recording saved" "Open with $notification_shortcut (or click this)" \
       -t 10000 --image "${preview:-$filename}" \
       --exec mpv -- "$filename"
 
diff --git a/bin/omarchy-capture-screenshot b/bin/omarchy-capture-screenshot
index 6f7b91bf537..93c18ee837e 100755
--- a/bin/omarchy-capture-screenshot
+++ b/bin/omarchy-capture-screenshot
@@ -68,7 +68,8 @@ case "$PROCESSING" in
 
     # Best-effort: the screenshot is already saved and on the clipboard, so a
     # notification outage must not report the capture itself as failed.
-    omarchy-notification-send "Screenshot saved to clipboard and file" "Edit with Super + Alt + , (or click this)" \
+    notification_shortcut=$(omarchy-keybinding-label 'Super + Alt + ,')
+    omarchy-notification-send "Screenshot saved to clipboard and file" "Edit with $notification_shortcut (or click this)" \
       --image "$FILEPATH" \
       --exec "$SCREENSHOT_EDITOR" "$FILEPATH" || true
     ;;
diff --git a/bin/omarchy-games-retro-install b/bin/omarchy-games-retro-install
index 9b30bb74c1b..29637daad7f 100755
--- a/bin/omarchy-games-retro-install
+++ b/bin/omarchy-games-retro-install
@@ -69,4 +69,5 @@ EOF
 chmod +x "$desktop_file"
 update-desktop-database "$desktop_dir" &>/dev/null || true
 
-omarchy-notification-send -g 󰯉 "$game_name installed" "Start it with Super + Space"
+menu_shortcut=$(omarchy-keybinding-label 'Super + Space')
+omarchy-notification-send -g 󰯉 "$game_name installed" "Start it with $menu_shortcut"
diff --git a/bin/omarchy-hw-apple-m1-air b/bin/omarchy-hw-apple-m1-air
new file mode 100755
index 00000000000..30b2def1bdc
--- /dev/null
+++ b/bin/omarchy-hw-apple-m1-air
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# omarchy:summary=Detect an Apple MacBook Air (M1, 2020).
+
+# OMARCHY_APPLE_COMPATIBLE and OMARCHY_APPLE_MODEL stub the device-tree files
+# for tests, following the Apple Silicon detector's override convention.
+compatible="${OMARCHY_APPLE_COMPATIBLE:-/proc/device-tree/compatible}"
+model="${OMARCHY_APPLE_MODEL:-/proc/device-tree/model}"
+
+architecture="${OMARCHY_UNAME_M:-$(uname -m)}" || exit 1
+case $architecture in
+aarch64 | arm64) ;;
+*) exit 1 ;;
+esac
+
+# Device-tree string properties are NUL-separated. Match complete records so a
+# future machine such as apple,j3130 cannot be mistaken for this M1 Air.
+grep -Fazqx 'apple,j313' "$compatible" 2>/dev/null &&
+  grep -Fazqx 'Apple MacBook Air (M1, 2020)' "$model" 2>/dev/null
diff --git a/bin/omarchy-hyprland-window-width b/bin/omarchy-hyprland-window-width
index 78bf5d89e54..7f0b7295f80 100755
--- a/bin/omarchy-hyprland-window-width
+++ b/bin/omarchy-hyprland-window-width
@@ -39,15 +39,19 @@ state_file_for() {
 notify_missing_width() {
   local key="$1"
   local workspace="$2"
+  local save_shortcut
 
-  omarchy-notification-send -g  "No saved width found for $key on workspace $workspace" "Use Super + Alt + Home to save one for this workspace."
+  save_shortcut=$(omarchy-keybinding-label 'Super + Alt + Home')
+  omarchy-notification-send -g  "No saved width found for $key on workspace $workspace" "Use $save_shortcut to save one for this workspace."
 }
 
 notify_saved_width() {
   local key="$1"
   local workspace="$2"
+  local restore_shortcut
 
-  omarchy-notification-send -g  "Saved width for $key on workspace $workspace" "Restore using Super + Home on this workspace."
+  restore_shortcut=$(omarchy-keybinding-label 'Super + Home')
+  omarchy-notification-send -g  "Saved width for $key on workspace $workspace" "Restore using $restore_shortcut on this workspace."
 }
 
 hypr_dispatch() {
diff --git a/bin/omarchy-keybinding-label b/bin/omarchy-keybinding-label
new file mode 100755
index 00000000000..d2419202fe9
--- /dev/null
+++ b/bin/omarchy-keybinding-label
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# omarchy:summary=Print a hardware-aware keybinding label for user-facing messages.
+# omarchy:hidden=true
+
+usage() {
+  echo "Usage: omarchy-keybinding-label [--embedded] [--m1-air <label>] <default-label>" >&2
+  exit 1
+}
+
+embedded=0
+if [[ ${1:-} == "--embedded" ]]; then
+  embedded=1
+  shift
+fi
+
+m1_air_label=""
+if [[ ${1:-} == "--m1-air" ]]; then
+  (( $# == 3 )) || usage
+  m1_air_label="$2"
+  shift 2
+else
+  (( $# == 1 )) || usage
+fi
+
+label="$1"
+detector="$OMARCHY_PATH/bin/omarchy-hw-apple-m1-air"
+
+if "$detector"; then
+  if [[ -n $m1_air_label ]]; then
+    label="$m1_air_label"
+  elif ((embedded)); then
+    # Notification text may contain arbitrary filenames and prose. In that
+    # context, change a modifier only when '+' makes it part of a shortcut;
+    # an ordinary sentence containing the standalone word "Super" stays data.
+    label=$(sed -E \
+      -e 's/\<Super\>([[:space:]]*\+)/Command\1/g' \
+      -e 's/\<SUPER\>([[:space:]]*\+)/COMMAND\1/g' \
+      -e 's/\<Alt\>([[:space:]]*\+)/Option\1/g' \
+      -e 's/\<ALT\>([[:space:]]*\+)/OPTION\1/g' \
+      -e 's/\<Ctrl\>([[:space:]]*\+)/Control\1/g' \
+      -e 's/\<CTRL\>([[:space:]]*\+)/CONTROL\1/g' <<<"$label")
+  else
+    # Replace key names as complete words. Notification text is not always a
+    # bare shortcut, so substring replacements must not turn words such as
+    # "Alternative" or "Superman" into corrupted prose.
+    label=$(sed \
+      -e 's/\<Super\>/Command/g' \
+      -e 's/\<SUPER\>/COMMAND/g' \
+      -e 's/\<Alt\>/Option/g' \
+      -e 's/\<ALT\>/OPTION/g' \
+      -e 's/\<Ctrl\>/Control/g' \
+      -e 's/\<CTRL\>/CONTROL/g' <<<"$label")
+  fi
+fi
+
+printf '%s\n' "$label"
diff --git a/bin/omarchy-notification-send b/bin/omarchy-notification-send
index 9e7fd049967..4ada3fdb6e9 100755
--- a/bin/omarchy-notification-send
+++ b/bin/omarchy-notification-send
@@ -136,6 +136,14 @@ while (($# > 0)); do
   fi
 done
 
+# This is the single path for Omarchy desktop notifications, so normalize both
+# visible text fields here. Callers with a hardware-specific top-row mapping can
+# still use omarchy-keybinding-label --m1-air before sending; this pass is
+# idempotent and guarantees generic modifier labels cannot leak from any other
+# caller.
+headline=$("$OMARCHY_PATH/bin/omarchy-keybinding-label" --embedded "$headline")
+description=$("$OMARCHY_PATH/bin/omarchy-keybinding-label" --embedded "$description")
+
 case $urgency in
 low) urgency_byte=0 ;;
 normal) urgency_byte=1 ;;
diff --git a/bin/omarchy-update-system-pkgs b/bin/omarchy-update-system-pkgs
index c22fa59b8e8..35ab974bf84 100755
--- a/bin/omarchy-update-system-pkgs
+++ b/bin/omarchy-update-system-pkgs
@@ -6,10 +6,30 @@
 set -e
 
 targets=()
+pacman_options=(--needed)
 if [[ $(uname -m) == "aarch64" ]]; then
   source "$OMARCHY_PATH/install/helpers/arm-package-sources.sh"
   omarchy_arm_prepare_package_sources
-  mapfile -t targets < <(omarchy_arm_package_targets)
+  mapfile -t arm_targets < <(omarchy_arm_package_targets)
+
+  # The edge repository is explicit-target-only. A current edge target must
+  # therefore be ignored during -Syu; otherwise --needed drops the explicit
+  # target and pacman can upgrade it from the regular repository instead.
+  sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Sy --noconfirm
+  for target in "${arm_targets[@]}"; do
+    package=${target#*/}
+    installed=$(pacman -Q "$package" 2>/dev/null | awk '{print $2}') || installed=""
+    available=$(pacman -Si "$target" 2>/dev/null | awk '/^Version[[:space:]]*:/ { sub(/^[^:]*:[[:space:]]*/, ""); print; exit }') || available=""
+    if [[ -n $installed && $installed == "$available" ]]; then
+      ignored_targets+=("$package")
+    else
+      targets+=("$target")
+    fi
+  done
+  if ((${#ignored_targets[@]} > 0)); then
+    ignore_list=$(IFS=,; echo "${ignored_targets[*]}")
+    pacman_options+=(--ignore "$ignore_list")
+  fi
 fi
 
 # The conflict handler's last resort: pacman puts its questions to the person
@@ -17,7 +37,7 @@ fi
 # a stream, because an upgrade without --noconfirm prompts on stderr. The
 # handler has already said why, so no heading here either.
 if [[ ${OMARCHY_UPDATE_CONFLICT:-} == 1 && ${OMARCHY_UPDATE_INTERACTIVE:-} == 1 ]]; then
-  exec sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syu --overwrite '/usr/share/omarchy/*' "${targets[@]}"
+  exec sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syu "${pacman_options[@]}" --overwrite '/usr/share/omarchy/*' "${targets[@]}"
 fi
 
 echo -e "\e[32m\nUpdate system packages\e[0m"
@@ -30,7 +50,7 @@ trap 'rm -f "$errors"' EXIT
 #
 # Progress bars stay on stdout. Errors are on stderr, kept for the conflict
 # handler below; LC_ALL=C is what keeps them parseable in any locale.
-if sudo env LC_ALL=C OMARCHY_UPDATE_PACMAN=1 pacman -Syu --noconfirm \
+if sudo env LC_ALL=C OMARCHY_UPDATE_PACMAN=1 pacman -Syu "${pacman_options[@]}" --noconfirm \
   --overwrite '/usr/share/omarchy/*' "${targets[@]}" 2>"$errors"; then
   cat "$errors" >&2
   exit 0
diff --git a/bin/omarchy-voxtype-install b/bin/omarchy-voxtype-install
index a527538fbb5..9b94420c70d 100755
--- a/bin/omarchy-voxtype-install
+++ b/bin/omarchy-voxtype-install
@@ -30,5 +30,12 @@ if gum confirm "Install Voxtype + AI model (~150MB) to enable dictation?"; then
 
   hyprctl reload >/dev/null
   omarchy-restart-shell
-  omarchy-notification-send -g  "Voxtype Dictation Ready" "Hold F9 to dictate (or toggle with Super + Ctrl + X)." -t 10000
+  dictation_shortcut=$(omarchy-keybinding-label --m1-air 'F5' 'F9')
+  dictation_toggle_shortcut=$(omarchy-keybinding-label 'Super + Ctrl + X')
+  if [[ $dictation_shortcut == "F5" ]]; then
+    dictation_hint="Press $dictation_shortcut to toggle dictation (or use $dictation_toggle_shortcut)."
+  else
+    dictation_hint="Hold $dictation_shortcut to dictate (or toggle with $dictation_toggle_shortcut)."
+  fi
+  omarchy-notification-send -g  "Voxtype Dictation Ready" "$dictation_hint" -t 10000
 fi
diff --git a/default/hypr/bindings/apple_m1_air.lua b/default/hypr/bindings/apple_m1_air.lua
new file mode 100644
index 00000000000..a814bcafba0
--- /dev/null
+++ b/default/hypr/bindings/apple_m1_air.lua
@@ -0,0 +1,22 @@
+-- Make the built-in top row match the legends on the M1 MacBook Air.
+
+o.bind("XF86LaunchA", "Apps menu (F3)", "omarchy-menu toggle apps")
+o.bind("XF86LaunchB", "Omarchy search (F4)", "omarchy-menu toggle root")
+o.bind("XF86Search", "Omarchy search (F4)", "omarchy-menu toggle root")
+
+-- Linux exposes F5/F6 on this model as keyboard-backlight keys. Keyboard
+-- brightness remains available through the default Shift+F1/F2 bindings.
+hl.unbind("XF86KbdBrightnessDown")
+hl.unbind("XF86KbdBrightnessUp")
+
+if o.cmd_present("voxtype") then
+  o.bind("XF86KbdBrightnessDown", "Toggle dictation (F5)", "voxtype record toggle")
+end
+o.bind_toggle("XF86KbdBrightnessUp", "Toggle Do Not Disturb (F6)", "notification-silencing", { locked = true })
+
+-- The built-in keyboard has no Print Screen key. Apple F10-F12 capture
+-- bindings are provided by media.lua and remain available.
+hl.unbind("PRINT")
+hl.unbind("ALT + PRINT")
+hl.unbind("SUPER + PRINT")
+hl.unbind("SUPER + CTRL + PRINT")
diff --git a/default/hypr/omarchy.lua b/default/hypr/omarchy.lua
index abc7c4e0888..bcae7f92607 100644
--- a/default/hypr/omarchy.lua
+++ b/default/hypr/omarchy.lua
@@ -2,6 +2,7 @@
 
 require("default.hypr.helpers")
 local require_optional = require("default.hypr.require_optional")
+local paths = require("default.hypr.paths")
 
 -- Use Omarchy defaults, but don't edit these directly.
 require("default.hypr.autostart")
@@ -12,6 +13,10 @@ if _G.omarchy_default_bindings ~= false then
   require("default.hypr.bindings.utilities")
   require("default.hypr.bindings.voxtype")
   require_optional.module("default.hypr.bindings.applications")
+  local apple_m1_air = paths.omarchy_path .. "/bin/omarchy-hw-apple-m1-air"
+  if o.shell_succeeds(o.shell_quote(apple_m1_air)) then
+    require("default.hypr.bindings.apple_m1_air")
+  end
 end
 require("default.hypr.envs")
 require("default.hypr.looknfeel")
diff --git a/docs/arm-package-sources.md b/docs/arm-package-sources.md
index 0d92d4514ce..a9c1ae63792 100644
--- a/docs/arm-package-sources.md
+++ b/docs/arm-package-sources.md
@@ -2,7 +2,7 @@
 
 Apple Silicon installations use the regular Arch Linux ARM, Asahi Alarm, and Mac package repositories. The official `https://pkgs.omarchy.org/edge/$arch` repository has `Usage = Sync`, so it is refreshed but excluded from automatic package selection and upgrades.
 
-The installer, system updater, and pacman channel refresh explicitly select `omarchy/hyprland`, `omarchy/hyprtoolkit`, and `omarchy/hyprland-guiutils` alongside a full system upgrade. Aquamarine and other dependencies resolve from the regular repositories. Dependency failures stop the transaction; no packages are ignored or dependencies bypassed.
+The installer, system updater, and pacman channel refresh explicitly select `omarchy/hyprland`, `omarchy/hyprtoolkit`, and `omarchy/hyprland-guiutils` alongside a full system upgrade. The system updater refreshes package metadata first, then ignores only edge targets already at the selected version so `--needed` cannot let a regular-repository build replace them. Aquamarine and other dependencies resolve from the regular repositories. Dependency failures stop the transaction; no dependencies are bypassed.
 
 The shared policy lives in `install/helpers/arm-package-sources.sh`. Package signatures are required and the existing Omarchy signing key is imported by its full fingerprint. Repository configuration preserves other repositories and mirror choices, saving `/etc/pacman.conf.bak` when it changes.
 
@@ -24,7 +24,7 @@ error: failed to prepare transaction (could not satisfy dependencies)
 curl -fsSL https://raw.githubusercontent.com/omarchy-mac/omarchy-mac/quattro/fix-arm-packages.sh | bash
 ```
 
-The transaction runs as `sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syu --noconfirm`, the same way `omarchy-update-system-pkgs` and `omarchy-refresh-pacman` do. The update guard hook aborts a `-Syu` that does not identify itself, and this is the update path arriving by another route rather than someone reaching past it. The transaction is noninteractive because the recommended pipe supplies the script itself on standard input.
+The transaction runs as an Omarchy-identified `pacman -Syu` update, the same way `omarchy-update-system-pkgs` and `omarchy-refresh-pacman` do. The update guard hook aborts a `-Syu` that does not identify itself, and this is the update path arriving by another route rather than someone reaching past it. The transaction is noninteractive because the recommended pipe supplies the script itself on standard input.
 
 `--dry-run` reports the configuration change and the transaction without applying either, and is the only mode that runs off Apple Silicon. Pass options after `bash -s --` when running the script through a pipe:
 
diff --git a/docs/update-process.md b/docs/update-process.md
index bec3350d1d4..46d49c445b0 100644
--- a/docs/update-process.md
+++ b/docs/update-process.md
@@ -272,7 +272,7 @@ scripts.
 | `omarchy-update-confirm` | Gum confirmation copy for `omarchy update`. | **Question.** Could be inlined into `omarchy-update`; separate file only helps keep copy isolated. |
 | `omarchy-update-dev` | Fast-forwards the active dev-linked checkout from its configured upstream; no-ops for package-backed installs. | **Keep.** Runs before package updates so a checkout conflict stops the update before system mutation. |
 | `omarchy-update-keyring` | Ensures Omarchy keyring and Arch keyring are current before the main transaction. | **Keep, but review.** It uses targeted `pacman -Sy` for keyring bootstrapping; acceptable for this special case but should remain tightly scoped. |
-| `omarchy-update-system-pkgs` | Runs `sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syu --noconfirm` with `--overwrite '/usr/share/omarchy/*'`, capturing stderr to a report file; on failure it execs `omarchy-update-system-pkgs-when-conflicted`. | **Keep for now.** Small leaf command, clear/testable. |
+| `omarchy-update-system-pkgs` | Runs `sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syu --needed --noconfirm` with `--overwrite '/usr/share/omarchy/*'`, capturing stderr to a report file; on failure it execs `omarchy-update-system-pkgs-when-conflicted`. | **Keep for now.** Small leaf command, clear/testable. |
 | `omarchy-update-system-pkgs-when-conflicted` | Hidden conflict handler: quarantines unowned conflicting files under `/var/lib/omarchy/replaced`, retries the upgrade once, restores files the upgrade didn't claim, and hands package-vs-package conflicts to an interactive pacman run (never under `-y`). | **Keep internal/hidden.** Keeps conflict recovery out of the happy path. |
 | `omarchy-update-pkg-prune` | Trims the pacman cache to two versions per package (`paccache -rk2`) before the snapshot, keeping the offline downgrade path while capping snapshot growth. | **Keep internal/hidden.** |
 | `omarchy-update-requires-free-space` | Aborts the update below a 10 GiB free-space threshold on `/`; silently skipped when free space cannot be determined; `OMARCHY_UPDATE_FORCE=1` bypasses. | **Keep internal/hidden.** |
diff --git a/install/user/first-run/welcome.sh b/install/user/first-run/welcome.sh
index 22e6629ef74..1287a2d8610 100644
--- a/install/user/first-run/welcome.sh
+++ b/install/user/first-run/welcome.sh
@@ -1,5 +1,7 @@
 # Real newlines, not a literal \n: the card renders the body as it arrives, and
 # elides past three lines.
+keybindings_shortcut=$(omarchy-keybinding-label 'Super + K')
+menu_shortcut=$(omarchy-keybinding-label 'Super + Space')
 omarchy-notification-send -u critical -g  "Learn Keybindings" \
-  $'Super + K for cheatsheet.\nSuper + Space for Omarchy Menu.' \
+  "$keybindings_shortcut for cheatsheet."$'\n'"$menu_shortcut for Omarchy Menu." \
   --exec omarchy-menu-keybindings
diff --git a/test/shell.d/apple-m1-air-bindings-test.sh b/test/shell.d/apple-m1-air-bindings-test.sh
new file mode 100755
index 00000000000..d648246ce0a
--- /dev/null
+++ b/test/shell.d/apple-m1-air-bindings-test.sh
@@ -0,0 +1,147 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+require_command lua
+lua_bin=$(command -v lua)
+
+tmp_dir=$(mktemp -d)
+trap 'rm -rf "$tmp_dir"' EXIT
+
+home="$tmp_dir/home"
+stub_bin="$tmp_dir/bin"
+compatible="$tmp_dir/compatible"
+model="$tmp_dir/model"
+mkdir -p "$home" "$stub_bin"
+touch "$stub_bin/voxtype"
+chmod +x "$stub_bin/voxtype"
+ln -s "$(command -v grep)" "$stub_bin/grep"
+ln -s "$(command -v sort)" "$stub_bin/sort"
+
+list_bindings() {
+  HOME="$home" \
+    XDG_CONFIG_HOME="$home/.config" \
+    XDG_STATE_HOME="$home/.local/state" \
+    OMARCHY_PATH="$ROOT" \
+    OMARCHY_UNAME_M=aarch64 \
+    OMARCHY_APPLE_COMPATIBLE="$compatible" \
+    OMARCHY_APPLE_MODEL="$model" \
+    PATH="$stub_bin:$ROOT/bin" \
+    "$lua_bin" <<'LUA'
+package.path = os.getenv("OMARCHY_PATH") .. "/?.lua;" .. package.path
+
+local function proxy()
+  return setmetatable({}, {
+    __index = function(self, key)
+      local value = proxy()
+      rawset(self, key, value)
+      return value
+    end,
+    __call = function()
+      return {}
+    end,
+  })
+end
+
+local bindings = {}
+
+hl = setmetatable({
+  dsp = proxy(),
+  bind = function(keys, dispatcher, opts)
+    opts = opts or {}
+    table.insert(bindings, { keys = keys, description = opts.description or "" })
+  end,
+  unbind = function(keys)
+    for index = #bindings, 1, -1 do
+      if bindings[index].keys == keys then
+        table.remove(bindings, index)
+      end
+    end
+  end,
+  config = function() end,
+  env = function() end,
+  monitor = function() end,
+  window_rule = function() end,
+  workspace_rule = function() end,
+  layer_rule = function() end,
+  gesture = function() end,
+  animation = function() end,
+  curve = function() end,
+  exec_cmd = function() end,
+  dispatch = function() end,
+  on = function() end,
+  timer = function() end,
+  get_config = function() return nil end,
+  get_active_window = function() return nil end,
+}, {
+  __index = function()
+    return function()
+      return {}
+    end
+  end,
+})
+
+require("default.hypr.omarchy")
+
+for _, binding in ipairs(bindings) do
+  print(binding.keys .. "\t" .. binding.description)
+end
+LUA
+}
+
+printf 'apple,j313\0apple,t8103\0' >"$compatible"
+printf 'Apple MacBook Air (M1, 2020)\0' >"$model"
+m1_bindings=$(list_bindings)
+
+grep -Fqx $'XF86LaunchA\tApps menu (F3)' <<<"$m1_bindings" ||
+  fail "the M1 Air F3 key opens the Apps menu"
+grep -Fqx $'XF86LaunchB\tOmarchy search (F4)' <<<"$m1_bindings" ||
+  fail "the M1 Air F4 key opens Omarchy search"
+grep -Fqx $'XF86Search\tOmarchy search (F4)' <<<"$m1_bindings" ||
+  fail "the alternate M1 Air F4 keysym opens Omarchy search"
+grep -Fqx $'XF86KbdBrightnessDown\tToggle dictation (F5)' <<<"$m1_bindings" ||
+  fail "the M1 Air F5 key toggles dictation"
+grep -Fqx $'XF86KbdBrightnessUp\tToggle Do Not Disturb (F6)' <<<"$m1_bindings" ||
+  fail "the M1 Air F6 key toggles Do Not Disturb"
+pass "the M1 Air physical F3-F6 keys run their labelled actions"
+
+grep -Fqx $'SHIFT + XF86MonBrightnessDown\tKeyboard brightness down' <<<"$m1_bindings" ||
+  fail "Shift+F1 retains keyboard-backlight control"
+grep -Fqx $'SHIFT + XF86MonBrightnessUp\tKeyboard brightness up' <<<"$m1_bindings" ||
+  fail "Shift+F2 retains keyboard-backlight control"
+grep -Fqx $'SUPER + F10\tScreenshot Window' <<<"$m1_bindings" ||
+  fail "the existing Apple F10 screenshot binding remains"
+grep -Fqx $'SUPER + F11\tScreenshot Region' <<<"$m1_bindings" ||
+  fail "the existing Apple F11 screenshot binding remains"
+grep -Fqx $'SUPER + F12\tScreenshot Display' <<<"$m1_bindings" ||
+  fail "the existing Apple F12 screenshot binding remains"
+pass "M1 overrides retain keyboard lighting and Apple capture bindings"
+
+for chord in PRINT 'ALT + PRINT' 'SUPER + PRINT' 'SUPER + CTRL + PRINT'; do
+  grep -Fq "$chord"$'\t' <<<"$m1_bindings" &&
+    fail "the M1 Air does not expose a dead $chord binding"
+done
+pass "the M1 Air omits dead Print Screen bindings"
+
+rm "$stub_bin/voxtype"
+without_voxtype=$(list_bindings)
+if grep -Fq $'XF86KbdBrightnessDown\t' <<<"$without_voxtype"; then
+  fail "F5 does not run a missing dictation command"
+fi
+grep -Fqx $'XF86KbdBrightnessUp\tToggle Do Not Disturb (F6)' <<<"$without_voxtype" ||
+  fail "F6 stays available without the optional dictation package"
+pass "the M1 top-row avoids a dead dictation binding when Voxtype is absent"
+
+printf 'Apple MacBook Pro (13-inch, M1, 2020)\0' >"$model"
+other_mac_bindings=$(list_bindings)
+
+if grep -Fq $'XF86LaunchA\tApps menu (F3)' <<<"$other_mac_bindings"; then
+  fail "M1 Air top-row overrides do not affect another Mac model"
+fi
+grep -Fqx $'XF86KbdBrightnessDown\tKeyboard brightness down' <<<"$other_mac_bindings" ||
+  fail "another Mac retains the default keyboard-brightness binding"
+grep -Fqx $'PRINT\tScreenshot' <<<"$other_mac_bindings" ||
+  fail "another Mac retains the default Print Screen binding"
+pass "M1 Air overrides are gated from other Mac models"
diff --git a/test/shell.d/hw-apple-m1-air-test.sh b/test/shell.d/hw-apple-m1-air-test.sh
new file mode 100755
index 00000000000..f0a1a7467fc
--- /dev/null
+++ b/test/shell.d/hw-apple-m1-air-test.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+tmp_dir=$(mktemp -d)
+trap 'rm -rf "$tmp_dir"' EXIT
+
+compatible="$tmp_dir/compatible"
+model="$tmp_dir/model"
+detector="$ROOT/bin/omarchy-hw-apple-m1-air"
+
+detect() {
+  OMARCHY_UNAME_M="${1:-aarch64}" \
+    OMARCHY_APPLE_COMPATIBLE="$compatible" \
+    OMARCHY_APPLE_MODEL="$model" \
+    "$detector"
+}
+
+printf 'apple,j313\0apple,t8103\0apple,arm-platform\0' >"$compatible"
+printf 'Apple MacBook Air (M1, 2020)\0' >"$model"
+
+detect || fail "the M1 MacBook Air device tree is detected"
+pass "the M1 MacBook Air device tree is detected"
+
+detect arm64 || fail "arm64 is accepted as an aarch64 alias"
+pass "arm64 is accepted as an aarch64 alias"
+
+detect x86_64 && fail "matching device-tree fixtures do not make x86 Apple Silicon" || true
+pass "matching device-tree fixtures do not make x86 Apple Silicon"
+
+uname() { printf '%s\n' aarch64; return 1; }
+export -f uname
+OMARCHY_UNAME_M= \
+  OMARCHY_APPLE_COMPATIBLE="$compatible" \
+  OMARCHY_APPLE_MODEL="$model" \
+  "$detector" && fail "a failed architecture probe cannot match the M1 Air" || true
+unset -f uname
+pass "a failed architecture probe cannot match the M1 Air"
+
+printf 'apple,j3130\0apple,t8103\0' >"$compatible"
+detect && fail "a compatible prefix does not match the M1 Air" || true
+pass "a compatible prefix does not match the M1 Air"
+
+printf 'apple,j313\0apple,t8103\0' >"$compatible"
+printf 'Apple MacBook Pro (13-inch, M1, 2020)\0' >"$model"
+detect && fail "another M1 Mac model is not detected as the M1 Air" || true
+pass "another M1 Mac model is not detected as the M1 Air"
+
+OMARCHY_UNAME_M=aarch64 \
+  OMARCHY_APPLE_COMPATIBLE="$tmp_dir/missing-compatible" \
+  OMARCHY_APPLE_MODEL="$tmp_dir/missing-model" \
+  "$detector" && fail "missing device-tree properties do not match" || true
+pass "missing device-tree properties do not match"
diff --git a/test/shell.d/hyprland-binding-conflicts-test.sh b/test/shell.d/hyprland-binding-conflicts-test.sh
index c34d4bfd6b0..ac4a43d45e1 100755
--- a/test/shell.d/hyprland-binding-conflicts-test.sh
+++ b/test/shell.d/hyprland-binding-conflicts-test.sh
@@ -40,6 +40,13 @@ hl = setmetatable({
       release = opts.release == true,
     })
   end,
+  unbind = function(keys)
+    for index = #bindings, 1, -1 do
+      if bindings[index].keys == keys then
+        table.remove(bindings, index)
+      end
+    end
+  end,
   config = function() end,
   env = function() end,
   monitor = function() end,
diff --git a/test/shell.d/keybinding-label-test.sh b/test/shell.d/keybinding-label-test.sh
new file mode 100755
index 00000000000..9adb3b365a6
--- /dev/null
+++ b/test/shell.d/keybinding-label-test.sh
@@ -0,0 +1,142 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+tmp_dir=$(mktemp -d)
+trap 'rm -rf "$tmp_dir"' EXIT
+
+compatible="$tmp_dir/compatible"
+model="$tmp_dir/model"
+helper="$ROOT/bin/omarchy-keybinding-label"
+
+printf 'apple,j313\0apple,t8103\0' >"$compatible"
+printf 'Apple MacBook Air (M1, 2020)\0' >"$model"
+
+label() {
+  OMARCHY_PATH="$ROOT" \
+    OMARCHY_UNAME_M=aarch64 \
+    OMARCHY_APPLE_COMPATIBLE="$compatible" \
+    OMARCHY_APPLE_MODEL="$model" \
+    "$helper" "$@"
+}
+
+[[ $(label 'Super + Alt + Ctrl + ,') == 'Command + Option + Control + ,' ]] ||
+  fail "M1 Air labels use the physical modifier names"
+[[ $(label 'Super + Alt + ,') == 'Command + Option + ,' ]] ||
+  fail "M1 Air capture notifications name Command+Option"
+[[ $(label 'SUPER + ALT + CTRL + K') == 'COMMAND + OPTION + CONTROL + K' ]] ||
+  fail "M1 Air labels preserve the caller's capitalization"
+[[ $(label 'Super+K, Alt+F4, and Ctrl+X') == 'Command+K, Option+F4, and Control+X' ]] ||
+  fail "M1 Air labels support compact shortcuts and punctuation"
+pass "M1 Air labels use Command, Option, and Control"
+
+[[ $(label 'Superman chose Alternative controls and AltGr') == 'Superman chose Alternative controls and AltGr' ]] ||
+  fail "key names embedded in prose words are not rewritten"
+pass "hardware-aware labels only replace complete key names"
+
+[[ $(label --embedded 'Super results; use Super + K or Ctrl+X') == 'Super results; use Command + K or Control+X' ]] ||
+  fail "embedded labels only rewrite shortcut-shaped text"
+[[ $(label --embedded 'C++ Super Resolution; A + Alt text') == 'C++ Super Resolution; A + Alt text' ]] ||
+  fail "plus signs before prose are not mistaken for shortcut modifiers"
+pass "embedded label conversion leaves standalone prose intact"
+
+[[ $(label --m1-air 'F5' 'F9') == 'F5' ]] ||
+  fail "the M1 Air dictation hint names its physical F5 key"
+[[ $(label --m1-air 'Command + F12' 'Print') == 'Command + F12' ]] ||
+  fail "the M1 Air screenshot hint replaces the unavailable Print key"
+[[ $(label --m1-air 'Command + Option + F12' 'Alt + Print') == 'Command + Option + F12' ]] ||
+  fail "the M1 Air screen-recording hint replaces the unavailable Print chord"
+pass "M1 Air labels support explicit top-row and capture mappings"
+
+printf 'Apple MacBook Pro (13-inch, M1, 2020)\0' >"$model"
+[[ $(label 'Super + Alt + Ctrl + ,') == 'Super + Alt + Ctrl + ,' ]] ||
+  fail "another Mac retains the existing modifier wording"
+[[ $(label 'Super + Alt + ,') == 'Super + Alt + ,' ]] ||
+  fail "another Mac retains the existing capture notification wording"
+[[ $(label --m1-air 'F5' 'F9') == 'F9' ]] ||
+  fail "another Mac retains the existing dictation key"
+[[ $(label --m1-air 'Command + F12' 'Print') == 'Print' ]] ||
+  fail "another Mac retains the existing screenshot key"
+pass "non-M1 systems retain their existing shortcut wording"
+
+notification_files=(
+  bin/omarchy-capture-screenrecording
+  bin/omarchy-capture-screenshot
+  bin/omarchy-games-retro-install
+  bin/omarchy-hyprland-window-width
+  bin/omarchy-voxtype-install
+  install/user/first-run/welcome.sh
+)
+
+for file in "${notification_files[@]}"; do
+  grep -Fq 'omarchy-keybinding-label' "$ROOT/$file" ||
+    fail "shortcut-bearing notification uses the shared label helper" "$file"
+done
+
+grep -Fq 'headline=$("$OMARCHY_PATH/bin/omarchy-keybinding-label" --embedded "$headline")' "$ROOT/bin/omarchy-notification-send" ||
+  fail "the notification sender normalizes headline labels centrally"
+grep -Fq 'description=$("$OMARCHY_PATH/bin/omarchy-keybinding-label" --embedded "$description")' "$ROOT/bin/omarchy-notification-send" ||
+  fail "the notification sender normalizes body labels centrally"
+
+grep -Fq '"Edit with $notification_shortcut (or click this)"' "$ROOT/bin/omarchy-capture-screenshot" ||
+  fail "the screenshot notification uses its hardware-aware shortcut"
+grep -Fq '"Open with $notification_shortcut (or click this)"' "$ROOT/bin/omarchy-capture-screenrecording" ||
+  fail "the screen-recording notification uses its hardware-aware shortcut"
+grep -Fq '"Start it with $menu_shortcut"' "$ROOT/bin/omarchy-games-retro-install" ||
+  fail "the retro-game notification uses its hardware-aware shortcut"
+grep -Fq '"Use $save_shortcut to save one for this workspace."' "$ROOT/bin/omarchy-hyprland-window-width" ||
+  fail "the window-width save notification uses its hardware-aware shortcut"
+grep -Fq '"Restore using $restore_shortcut on this workspace."' "$ROOT/bin/omarchy-hyprland-window-width" ||
+  fail "the window-width restore notification uses its hardware-aware shortcut"
+grep -Fq '"$dictation_hint"' "$ROOT/bin/omarchy-voxtype-install" ||
+  fail "the Voxtype notification uses its hardware-aware shortcut"
+grep -Fq '"$keybindings_shortcut for cheatsheet."' "$ROOT/install/user/first-run/welcome.sh" ||
+  fail "the welcome notification uses its hardware-aware cheatsheet shortcut"
+grep -Fq '"$menu_shortcut for Omarchy Menu."' "$ROOT/install/user/first-run/welcome.sh" ||
+  fail "the welcome notification uses its hardware-aware menu shortcut"
+
+if rg -n 'omarchy-notification-send.*(Super|Alt|Ctrl|Print|F9)' "${notification_files[@]/#/$ROOT/}"; then
+  fail "notification calls do not embed hardware-specific shortcut names"
+fi
+pass "shortcut-bearing notifications use hardware-aware labels"
+
+notification_log="$tmp_dir/notification"
+stub_bin="$tmp_dir/bin"
+mkdir -p "$stub_bin"
+cat >"$stub_bin/omarchy-notification-send" <<'SH'
+#!/bin/bash
+printf '%s\n' "$*" >"$OMARCHY_TEST_NOTIFICATION_LOG"
+SH
+chmod +x "$stub_bin/omarchy-notification-send"
+
+printf 'Apple MacBook Air (M1, 2020)\0' >"$model"
+OMARCHY_PATH="$ROOT" \
+  OMARCHY_UNAME_M=aarch64 \
+  OMARCHY_APPLE_COMPATIBLE="$compatible" \
+  OMARCHY_APPLE_MODEL="$model" \
+  OMARCHY_TEST_NOTIFICATION_LOG="$notification_log" \
+  PATH="$stub_bin:$ROOT/bin:$PATH" \
+  bash "$ROOT/install/user/first-run/welcome.sh"
+
+grep -Fq 'Command + K for cheatsheet.' "$notification_log" ||
+  fail "the M1 Air welcome notification names Command+K"
+grep -Fq 'Command + Space for Omarchy Menu.' "$notification_log" ||
+  fail "the M1 Air welcome notification names Command+Space"
+pass "the M1 Air welcome notification uses physical modifier names"
+
+printf 'Apple MacBook Pro (13-inch, M1, 2020)\0' >"$model"
+OMARCHY_PATH="$ROOT" \
+  OMARCHY_UNAME_M=aarch64 \
+  OMARCHY_APPLE_COMPATIBLE="$compatible" \
+  OMARCHY_APPLE_MODEL="$model" \
+  OMARCHY_TEST_NOTIFICATION_LOG="$notification_log" \
+  PATH="$stub_bin:$ROOT/bin:$PATH" \
+  bash "$ROOT/install/user/first-run/welcome.sh"
+
+grep -Fq 'Super + K for cheatsheet.' "$notification_log" ||
+  fail "another Mac keeps Super+K in the welcome notification"
+grep -Fq 'Super + Space for Omarchy Menu.' "$notification_log" ||
+  fail "another Mac keeps Super+Space in the welcome notification"
+pass "the non-M1 welcome notification retains its wording"
diff --git a/test/shell.d/notification-send-test.sh b/test/shell.d/notification-send-test.sh
index 6a8f8a217b7..caef89a81a2 100644
--- a/test/shell.d/notification-send-test.sh
+++ b/test/shell.d/notification-send-test.sh
@@ -26,6 +26,19 @@ tripwire="$tmpdir/notify-send-was-used"
 
 send() {
   OMARCHY_TEST_BUSCTL_ARGS="$args_file" OMARCHY_TEST_NOTIFY_TRIPWIRE="$tripwire" \
+    OMARCHY_PATH="$ROOT" OMARCHY_UNAME_M=x86_64 \
+    PATH="$tmpdir:$ROOT/bin:$PATH" omarchy-notification-send "$@"
+}
+
+compatible="$tmpdir/compatible"
+model="$tmpdir/model"
+printf 'apple,j313\0apple,t8103\0' >"$compatible"
+printf 'Apple MacBook Air (M1, 2020)\0' >"$model"
+
+send_m1() {
+  OMARCHY_TEST_BUSCTL_ARGS="$args_file" OMARCHY_TEST_NOTIFY_TRIPWIRE="$tripwire" \
+    OMARCHY_PATH="$ROOT" OMARCHY_UNAME_M=aarch64 \
+    OMARCHY_APPLE_COMPATIBLE="$compatible" OMARCHY_APPLE_MODEL="$model" \
     PATH="$tmpdir:$ROOT/bin:$PATH" omarchy-notification-send "$@"
 }
 
@@ -101,6 +114,32 @@ load
 [[ ${args[12]} == "Body" ]] || fail "notification wrapper keeps the body with an =value flag" "${args[12]}"
 pass "notification wrapper accepts the --flag=value form"
 
+# All Omarchy notifications pass through this command. Hardware-aware modifier
+# names therefore apply to both visible fields without every caller having to
+# remember to opt in.
+: >"$args_file"
+send_m1 "Use Super+K" "Alt + F12; Ctrl+X or SUPER + SPACE" >/dev/null
+load
+[[ ${args[11]} == "Use Command+K" ]] ||
+  fail "M1 Air notification summaries use physical modifier names" "${args[11]}"
+[[ ${args[12]} == "Option + F12; Control+X or COMMAND + SPACE" ]] ||
+  fail "M1 Air notification bodies use physical modifier names" "${args[12]}"
+pass "notification wrapper normalizes shortcut labels in the summary and body"
+
+: >"$args_file"
+send_m1 "C++ Super Resolution" "A + Alt text; AltGr, Alt, and Ctrl remain plain data" >/dev/null
+load
+[[ ${args[11]} == "C++ Super Resolution" && ${args[12]} == "A + Alt text; AltGr, Alt, and Ctrl remain plain data" ]] ||
+  fail "notification label normalization does not rewrite prose, standalone words, or AltGr" "summary=${args[11]} body=${args[12]}"
+pass "notification wrapper only normalizes shortcut-shaped modifier names"
+
+: >"$args_file"
+send "Use Super+K" "Alt + Ctrl + X" >/dev/null
+load
+[[ ${args[11]} == "Use Super+K" && ${args[12]} == "Alt + Ctrl + X" ]] ||
+  fail "non-M1 notification labels retain their existing wording" "summary=${args[11]} body=${args[12]}"
+pass "notification wrapper preserves shortcut labels on non-M1 systems"
+
 # ---------------------------------------------------------------- no click cmd
 : >"$args_file"
 send "Plain" >/dev/null
diff --git a/test/shell.d/update-package-conflict-test.sh b/test/shell.d/update-package-conflict-test.sh
index aeaaef03c41..6e4641772d6 100755
--- a/test/shell.d/update-package-conflict-test.sh
+++ b/test/shell.d/update-package-conflict-test.sh
@@ -36,6 +36,25 @@ STUB
 # for a person has to keep that stream.
 cat >"$stub_bin/pacman" <<'STUB'
 #!/bin/bash
+if [[ " $* " != *" -Syu "* ]]; then
+  case "$1" in
+    -Sy)
+      exit 0
+      ;;
+    -Q)
+      if [[ $2 == hyprtoolkit ]]; then
+        printf '%s %s\n' "$2" "0.5.4-5.0"
+      else
+        printf '%s %s\n' "$2" "0.5.4-5.1"
+      fi
+      exit 0
+      ;;
+    -Si)
+      printf 'Name            : %s\nVersion         : 0.5.4-5.1\n' "$2"
+      exit 0
+      ;;
+  esac
+fi
 attempt=$(($(cat "$PACMAN_ATTEMPTS") + 1))
 echo "$attempt" >"$PACMAN_ATTEMPTS"
 {
@@ -115,10 +134,15 @@ run_on_terminal || fail "a package conflict is not resolved on a terminal"
 pass "a package conflict is put back to the person running the update"
 
 for call in 1 2; do
-  [[ " $(call_line "$call" args) " == *" omarchy/hyprland omarchy/hyprtoolkit omarchy/hyprland-guiutils "* ]] ||
-    fail "the initial upgrade or interactive retry loses the ARM targets"
+  [[ " $(call_line "$call" args) " == *" --ignore hyprland,hyprland-guiutils "* ]] ||
+    fail "the initial upgrade or interactive retry loses the current ARM target pin"
+  [[ " $(call_line "$call" args) " == *" omarchy/hyprtoolkit "* ]] ||
+    fail "the initial upgrade or interactive retry loses an out-of-date ARM target"
+  [[ " $(call_line "$call" args) " == *" --needed "* ]] ||
+    fail "the initial upgrade or interactive retry reinstalls current ARM targets"
 done
-pass "the initial upgrade and interactive retry retain the ARM targets"
+pass "the initial upgrade and interactive retry retain the current ARM target pin"
+pass "the initial upgrade and interactive retry retain out-of-date ARM targets"
 
 [[ $(call_line 2 tty0) == "yes" && $(call_line 2 tty2) == "yes" ]] ||
   fail "the interactive retry cannot be answered: pacman has no terminal left"