diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..8de9215b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+
+# Python bytecode (orchestrator)
+__pycache__/
+*.pyc
diff --git a/.luarc.json b/.luarc.json
new file mode 100644
index 00000000..ff0e3599
--- /dev/null
+++ b/.luarc.json
@@ -0,0 +1,11 @@
+{
+  "workspace": {
+    "library": [
+      "/usr/share/hypr/stubs"
+    ],
+    "checkThirdParty": false
+  },
+  "diagnostics": {
+    "globals": ["hl"]
+  }
+}
diff --git a/AGENTS.md b/AGENTS.md
index 7d61ac11..e2aee0d2 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -31,7 +31,7 @@ Common prefixes include:
 
 Other current prefixes include:
 
-- `ac-`, `audio-`, `battery-`, `branch-`, `brightness-`, `channel-`, `config-`, `debug-`, `dev-`, `drive-`, `first-`, `font-`, `haptic-`, `hibernation-`, `hook-`, `hyprland-`, `menu-`, `migrate-`, `notification-`, `npx-`, `plymouth-`, `powerprofiles-`, `reinstall-`, `remove-`, `screensaver-`, `show-`, `snapshot-`, `state-`, `sudo-`, `swayosd-`, `system-`, `transcode-`, `tui-`, `tz-`, `upload-`, `version-`, `voxtype-`, `webapp-`, `wifi-`, `windows-`
+- `ac-`, `audio-`, `battery-`, `branch-`, `brightness-`, `channel-`, `config-`, `debug-`, `dev-`, `drive-`, `first-`, `font-`, `haptic-`, `hibernation-`, `hook-`, `hyprland-`, `menu-`, `migrate-`, `notification-`, `npm-`, `plymouth-`, `powerprofiles-`, `reinstall-`, `remove-`, `screensaver-`, `show-`, `snapshot-`, `state-`, `sudo-`, `system-`, `transcode-`, `tui-`, `tz-`, `upload-`, `version-`, `voxtype-`, `webapp-`, `wifi-`, `windows-`
 
 # Command Metadata
 
@@ -40,61 +40,128 @@ Commands in `bin/` can declare CLI metadata in comments near the top of the file
 Supported metadata keys:
 
 - `# omarchy:summary=...` - short help text
-- `# omarchy:group=...` - command group when it differs from the filename-derived prefix
-- `# omarchy:name=...` - command name within the group
 - `# omarchy:args=...` - usage arguments
 - `# omarchy:examples=...` - examples separated with ` | `
 - `# omarchy:alias=...` / `# omarchy:aliases=...` - alternate routes
 - `# omarchy:hidden=true` - hide from default command listings
 - `# omarchy:requires-sudo=true` - mark commands that require sudo
 
+Only use `omarchy:examples` where there are args that need explaining.
+
 Prefer explicit metadata for user-facing commands. Keep routes consistent with the filename unless there is a deliberate alias or compatibility route.
 
 Example:
 
 ```bash
 # omarchy:summary=Take a screenshot
-# omarchy:group=capture
 # omarchy:args=[smart|region|windows|fullscreen] [slurp|copy]
 # omarchy:examples=omarchy screenshot | omarchy capture screenshot region
-# omarchy:aliases=omarchy screenshot
 ```
 
+# Runtime Environment
+
+- `$OMARCHY_PATH` is set at the top level by the uwsm session environment and is always available to Omarchy runtime code.
+- Commands in `bin/` and Quickshell QML should rely on `$OMARCHY_PATH` / `Quickshell.env("OMARCHY_PATH")`; do not derive fallback paths from `HOME`, `Quickshell.shellDir`, or re-export/default `OMARCHY_PATH` manually.
+
+# Privileged Commands
+
+- Whenever you need to trigger a sudo command, use `pkexec` so it results in a user prompt they can approve.
+
+# Git
+
+- Commits should be atomic: include only one coherent change or fix, and do not mix unrelated work.
+- Commit messages should be succinct and describe the change being made.
+
 # Install Scripts
 
-Install entry points (`install.sh`, `boot.sh`) use `#!/bin/bash`. Many scripts under `install/` are sourced via `run_logged` and intentionally do not have shebangs.
+The ISO owns installation orchestration. This repo ships target-side setup commands and reusable setup leaves:
 
-Install stage files follow this pattern:
+- `bin/omarchy-setup-system` runs root-owned system setup during ISO finalization.
+- `bin/omarchy-setup-hardware` runs idempotent hardware-specific setup and is called by `omarchy-setup-system`.
+- `bin/omarchy-finalize-user` runs the per-user runtime finalization (skill symlinks, xdg-user-dirs, mime defaults, `install/user/all.sh`). Shipped user defaults are seeded by `/etc/skel` from `omarchy-settings`, not by this command. `bin/omarchy-reinstall-configs` is the explicit destructive resync of those defaults into an existing user's `$HOME`.
+- leaf scripts under `install/` are sourced by `run_logged $OMARCHY_INSTALL/path/to/script.sh` and intentionally do not have shebangs.
+- avoid `exit` in sourced setup scripts unless intentionally aborting setup.
+- use `$OMARCHY_INSTALL` and `$OMARCHY_PATH` instead of hard-coded Omarchy paths.
+- keep root-scoped hardware setup under `install/hardware/` and orchestrate it through `install/hardware/all.sh`.
+- keep every per-user setup leaf under `install/user/` (including `install/user/hardware/` and `install/user/first-run/`) so it is clear what must run for each user.
+- prefer helper commands for package and command checks where available.
 
-- `install/*/all.sh` lists scripts in execution order
-- leaf scripts are sourced by `run_logged $OMARCHY_INSTALL/path/to/script.sh`
-- avoid `exit` in sourced install scripts unless intentionally aborting the install
-- use `$OMARCHY_INSTALL` and `$OMARCHY_PATH` instead of hard-coded Omarchy paths
-- keep hardware-specific logic under `install/config/hardware/`
-- prefer helper commands for package and command checks where available
-
-Raw `command -v`, `pacman`, and `pacman-key` are acceptable in bootstrap/preflight/package-helper contexts where the helper commands may not be available yet or where direct package-manager behavior is the point of the script.
+Raw `command -v`, `pacman`, and `pacman-key` are acceptable in package-helper contexts where direct package-manager behavior is the point of the script.
 
 # Helper Commands
 
 Use these instead of raw shell commands:
 
 - `omarchy-cmd-missing` / `omarchy-cmd-present` - check for commands
-- `omarchy-pkg-missing` / `omarchy-pkg-present` - check for packages
+- `omarchy-pkg-missing` / `omarchy-pkg-present` - check for packages (don't use these if you can just use `omarchy-pkg-add`/`omarchy-pkg-drop`)
 - `omarchy-pkg-add` - install packages (handles both pacman and AUR)
+- `omarchy-pkg-drop` - remove packages; use this instead of raw `pacman -R*`
+- `omarchy-notification-send` - send desktop notifications; do not call `notify-send` directly
 - `omarchy-hw-asus-rog` - detect ASUS ROG hardware (and similar `hw-*` commands)
 
-Exceptions are allowed for bootstrap, preflight, migration, and package-helper scripts where the helper may not be available yet, where the helper itself is being implemented, or where direct package-manager behavior is required.
+Exceptions are allowed for migration and package-helper scripts where the helper may not be available yet, where the helper itself is being implemented, or where direct package-manager behavior is required.
 
 # Config Structure
 
 - `config/` - default configs copied to `~/.config/`
 - `default/themed/*.tpl` - templates with `{{ variable }}` placeholders for theme colors
-- `themes/*/colors.toml` - theme color definitions (accent, background, foreground, color0-15)
+- `themes/*/colors.toml` - theme color definitions (accent, background, foreground, red/green/yellow/blue/magenta/cyan and bright_* variants)
 
-# Visual Changes
+# Tests
 
-When making visual changes, such as Waybar styles or desktop appearance, always take and analyze a screenshot after applying the change to verify the result. Use `omarchy capture screenshot fullscreen save` for fullscreen screenshots.
+Run focused automated tests for the area you changed. Current test entry points:
+
+- `./test/all` - aggregate runner for CLI and shell tests
+- `./test/cli` - CLI routing, command metadata, theme helpers, and safe dispatch coverage
+- `./test/shell` - all Omarchy shell tests under `test/shell.d/`
+
+New Omarchy shell tests should live in `test/shell.d/*-test.sh` so `./test/shell` picks them up automatically. Source `test/shell.d/base-test.sh` for shared root-path discovery, assertions, and Node test helpers.
+
+For visual changes, such as omarchy-shell styling, desktop appearance, screenshots, or screen recording flows, verify with the running UI in addition to automated tests. Take and analyze screenshots with `omarchy capture screenshot fullscreen save`. For animation, transitions, capture, or screen recording behavior, make a short recording with `omarchy screenrecord --fullscreen`, stop it with `omarchy screenrecord --stop-recording`, and review the output before finishing.
+
+For interactive UI work, use `wtype` to simulate keyboard input when available. Example: start the UI in the background, wait briefly for focus, then run `wtype -k Right -k Return` to exercise keyboard selection and confirm the resulting command output or state change. Prefer this over manual-only verification when a UI returns a selected value or changes a symlink/config.
+
+When testing layer-shell UI, capture the reference and candidate states as separate screenshots, then compare them visually before further edits. If a launched UI would otherwise remain open, keep track of its PID and stop it after the screenshot; avoid broad process kills unless checking with `ps` first.
+
+# Omarchy shell
+
+The Quickshell desktop runs as a single long-running process out of
+`shell/`. Hyprland autostart launches it directly with `quickshell -p`; do
+not start additional standalone `quickshell -p` instances for individual
+components.
+
+Run `omarchy-restart-shell` after making changes to QML files.
+
+Plugin contract:
+
+- Each plugin lives in its own directory under
+  `shell/plugins/<id>/` (first-party) or
+  `~/.config/omarchy/plugins/<id>/` (third-party).
+- Every plugin ships a `manifest.json` declaring `id`, `kinds`,
+  `activation`, and `entryPoints`. The full schema is in
+  [`docs/omarchy-shell.md`](docs/omarchy-shell.md).
+- Entry-point QML files are `Item`s (not `ShellRoot`), and accept the
+  shell-injected properties `omarchyPath`, `shell`, `manifest`, and
+  `pluginRegistry` / `barWidgetRegistry` as appropriate.
+- Panel / overlay / menu plugins must expose `open(payloadJson)` and
+  `close()` lifecycle methods for `shell summon` and `shell hide`.
+
+IPC:
+
+- `bin/omarchy-shell` is the canonical IPC entry point. It forwards to
+  the running shell and does not start it. Prefer it over re-implementing
+  direct Quickshell socket calls in every CLI.
+- The `shell` IPC target exposes `ping`, `summon`, `hide`, `toggle`,
+  `rescanPlugins`, `setPluginEnabled`, and `listPlugins`. Individual
+  plugins can register additional IPC targets (the bar registers `bar`,
+  the background switcher registers `image-selector`).
+
+Widget files in `shell/plugins/bar/widgets/` contain Nerd Font glyphs as raw
+unicode characters. The `Write` and `Edit` tools strip multi-byte
+codepoints in some positions — do **not** rewrite widget files wholesale
+through those tools. For glyph fixes, use the targeted `Edit` tool with
+the surrounding context, or a Python script that inserts codepoints via
+`chr(0xXXXXX)`.
 
 # Refresh Pattern
 
@@ -104,28 +171,26 @@ To copy a default config to user config with automatic backup:
 omarchy-refresh-config hypr/hyprlock.conf
 ```
 
-This copies `~/.local/share/omarchy/config/hypr/hyprlock.conf` to `~/.config/hypr/hyprlock.conf`.
+This copies `/etc/skel/.config/hypr/hyprlock.conf` to `~/.config/hypr/hyprlock.conf`.
 
 # Migrations
 
-To create a new migration, run `omarchy-dev-add-migration --no-edit`. This creates a migration file named after the unix timestamp of the last commit.
+Read `docs/migrations.md` before creating or changing migrations.
+
+Migrations are split by execution scope:
+
+- `migrations/system/<timestamp>.sh` — root, noninteractive, safe to run from pacman via `omarchy-migrate-system` (`omarchy` `post_upgrade` calls it). Use for `/etc`, `/usr`, `/boot`, services, hardware quirks, and other system state. Do not prompt.
+- `migrations/user/<timestamp>.sh` — current user/session, may touch `~/.config`, `~/.local`, user systemd, browser prefs, DBus/session state, and may prompt if necessary. Runs through `omarchy-migrate` / `omarchy-migrate-user`; pending state is per-user based on missing files under `~/.local/state/omarchy/migrations/user/`.
+
+To create a new migration, run `omarchy-dev-add-migration system --no-edit` or `omarchy-dev-add-migration user --no-edit` based on scope.
 
 New migration format:
-- File permissions must be `0644` (`-rw-r--r--`); migrations are sourced, not executed directly
+- File permissions must be `0644` (`-rw-r--r--`); migration runners execute them with `bash -euo pipefail`, not through executable bits
 - No shebang line
 - Start with an `echo` describing what the migration does
 - Use `$OMARCHY_PATH` to reference the omarchy directory
 - Prefer helper commands such as `omarchy-cmd-present`, `omarchy-cmd-missing`, `omarchy-pkg-present`, and `omarchy-pkg-missing`
 
-Some older migrations predate these rules. Do not copy older migrations that start with shebangs, omit the leading `echo`, or hard-code `~/.local/share/omarchy`.
+Omarchy 4.0 is upgraded through `bin/omarchy-upgrade-to-4`, not through the normal migration runner. Do not add compatibility migrations for old installer layouts; put pre-4 package-layout transition work in the upgrade command instead.
 
-Migrations may use raw `pacman`, `command -v`, or direct config edits when needed for historical compatibility or one-off repair work.
-
-Example:
-```bash
-echo "Disable fingerprint in hyprlock if fingerprint auth is not configured"
-
-if omarchy-cmd-missing fprintd-list || ! fprintd-list "$USER" 2>/dev/null | grep -q "finger"; then
-  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = false/' ~/.config/hypr/hyprlock.conf
-fi
-```
+Migrations may use raw `pacman`, `command -v`, or direct config edits when needed for one-off repair work.
diff --git a/README.md b/README.md
index a630d13c..4bd515f1 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,10 @@ Omarchy is a beautiful, modern & opinionated Linux distribution by DHH.
 
 Read more at [omarchy.org](https://omarchy.org).
 
+## Docs
+
+- [omarchy-shell](docs/omarchy-shell.md) — shell host, plugin manifest, IPC, `shell.json`, custom bar modules
+
 ## License
 
 Omarchy is released under the [MIT License](https://opensource.org/licenses/MIT).
diff --git a/applications/Basecamp.desktop b/applications/Basecamp.desktop
new file mode 100644
index 00000000..7c518ba4
--- /dev/null
+++ b/applications/Basecamp.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Basecamp
+Exec=omarchy-launch-webapp https://launchpad.37signals.com
+Terminal=false
+Type=Application
+Icon=basecamp
+StartupNotify=true
diff --git a/applications/ChatGPT.desktop b/applications/ChatGPT.desktop
new file mode 100644
index 00000000..2ec04673
--- /dev/null
+++ b/applications/ChatGPT.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=ChatGPT
+Exec=omarchy-launch-webapp https://chatgpt.com/
+Terminal=false
+Type=Application
+Icon=chatgpt
+StartupNotify=true
diff --git a/applications/Discord.desktop b/applications/Discord.desktop
new file mode 100644
index 00000000..6a2039ca
--- /dev/null
+++ b/applications/Discord.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Discord
+Exec=omarchy-launch-webapp https://discord.com/channels/@me
+Terminal=false
+Type=Application
+Icon=discord
+StartupNotify=true
diff --git a/applications/Disk Usage.desktop b/applications/Disk Usage.desktop
new file mode 100644
index 00000000..8a18c798
--- /dev/null
+++ b/applications/Disk Usage.desktop	
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Disk Usage
+Exec=xdg-terminal-exec --app-id=TUI.float -e bash -c "dust -r; read -n 1 -s"
+Terminal=false
+Type=Application
+Icon=disk-usage
+StartupNotify=true
diff --git a/applications/Docker.desktop b/applications/Docker.desktop
new file mode 100644
index 00000000..4f9831c0
--- /dev/null
+++ b/applications/Docker.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Docker
+Exec=xdg-terminal-exec --app-id=TUI.tile -e lazydocker
+Terminal=false
+Type=Application
+Icon=docker
+StartupNotify=true
diff --git a/applications/Figma.desktop b/applications/Figma.desktop
new file mode 100644
index 00000000..92be688a
--- /dev/null
+++ b/applications/Figma.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Figma
+Exec=omarchy-launch-webapp https://figma.com/
+Terminal=false
+Type=Application
+Icon=figma
+StartupNotify=true
diff --git a/applications/Fizzy.desktop b/applications/Fizzy.desktop
new file mode 100644
index 00000000..062d1870
--- /dev/null
+++ b/applications/Fizzy.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Fizzy
+Exec=omarchy-launch-webapp https://app.fizzy.do/
+Terminal=false
+Type=Application
+Icon=fizzy
+StartupNotify=true
diff --git a/applications/GitHub.desktop b/applications/GitHub.desktop
new file mode 100644
index 00000000..76d09b86
--- /dev/null
+++ b/applications/GitHub.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=GitHub
+Exec=omarchy-launch-webapp https://github.com/
+Terminal=false
+Type=Application
+Icon=github
+StartupNotify=true
diff --git a/applications/Google Contacts.desktop b/applications/Google Contacts.desktop
new file mode 100644
index 00000000..8f92c882
--- /dev/null
+++ b/applications/Google Contacts.desktop	
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Google Contacts
+Exec=omarchy-launch-webapp https://contacts.google.com/
+Terminal=false
+Type=Application
+Icon=google-contacts
+StartupNotify=true
diff --git a/applications/Google Maps.desktop b/applications/Google Maps.desktop
new file mode 100644
index 00000000..3cf546b6
--- /dev/null
+++ b/applications/Google Maps.desktop	
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Google Maps
+Exec=omarchy-launch-webapp https://maps.google.com
+Terminal=false
+Type=Application
+Icon=google-maps
+StartupNotify=true
diff --git a/applications/Google Messages.desktop b/applications/Google Messages.desktop
new file mode 100644
index 00000000..18474555
--- /dev/null
+++ b/applications/Google Messages.desktop	
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Google Messages
+Exec=omarchy-launch-webapp https://messages.google.com/web/conversations
+Terminal=false
+Type=Application
+Icon=google-messages
+StartupNotify=true
diff --git a/applications/Google Photos.desktop b/applications/Google Photos.desktop
new file mode 100644
index 00000000..44ccd254
--- /dev/null
+++ b/applications/Google Photos.desktop	
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Google Photos
+Exec=omarchy-launch-webapp https://photos.google.com/
+Terminal=false
+Type=Application
+Icon=google-photos
+StartupNotify=true
diff --git a/applications/HEY.desktop b/applications/HEY.desktop
new file mode 100644
index 00000000..e59bd0ea
--- /dev/null
+++ b/applications/HEY.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=HEY
+Exec=omarchy-webapp-handler-hey %u
+Terminal=false
+Type=Application
+Icon=hey
+StartupNotify=true
+MimeType=x-scheme-handler/mailto
diff --git a/applications/WhatsApp.desktop b/applications/WhatsApp.desktop
new file mode 100644
index 00000000..f193616d
--- /dev/null
+++ b/applications/WhatsApp.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=WhatsApp
+Exec=omarchy-launch-webapp https://web.whatsapp.com/
+Terminal=false
+Type=Application
+Icon=whatsapp
+StartupNotify=true
diff --git a/applications/X.desktop b/applications/X.desktop
new file mode 100644
index 00000000..02fe0424
--- /dev/null
+++ b/applications/X.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=X
+Exec=omarchy-launch-webapp https://x.com/
+Terminal=false
+Type=Application
+Icon=x
+StartupNotify=true
diff --git a/applications/YouTube.desktop b/applications/YouTube.desktop
new file mode 100644
index 00000000..d6659d75
--- /dev/null
+++ b/applications/YouTube.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=YouTube
+Exec=omarchy-launch-webapp https://youtube.com/
+Terminal=false
+Type=Application
+Icon=youtube
+StartupNotify=true
diff --git a/applications/Zoom.desktop b/applications/Zoom.desktop
new file mode 100644
index 00000000..227abaa8
--- /dev/null
+++ b/applications/Zoom.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=Zoom
+Exec=omarchy-webapp-handler-zoom %u
+Terminal=false
+Type=Application
+Icon=zoom
+StartupNotify=true
+MimeType=x-scheme-handler/zoommtg;x-scheme-handler/zoomus
diff --git a/applications/battlenet.desktop b/applications/battlenet.desktop
new file mode 100644
index 00000000..f1499c72
--- /dev/null
+++ b/applications/battlenet.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Battle.net
+GenericName=Game Launcher
+Comment=Blizzard game launcher (umu-launcher + GE-Proton)
+Exec=omarchy-launch-battlenet
+Icon=battle-net
+Terminal=false
+Categories=Game;
+StartupNotify=true
+StartupWMClass=battle.net.exe
diff --git a/default/foot/foot.desktop b/applications/foot.desktop
similarity index 100%
rename from default/foot/foot.desktop
rename to applications/foot.desktop
diff --git a/applications/hidden/avahi-discover.desktop b/applications/hidden/avahi-discover.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/avahi-discover.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/bssh.desktop b/applications/hidden/bssh.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/bssh.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/btop.desktop b/applications/hidden/btop.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/btop.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/bvnc.desktop b/applications/hidden/bvnc.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/bvnc.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/cmake-gui.desktop b/applications/hidden/cmake-gui.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/cmake-gui.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/cups.desktop b/applications/hidden/cups.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/cups.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/dropbox.desktop b/applications/hidden/dropbox.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/dropbox.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/electron34.desktop b/applications/hidden/electron34.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/electron34.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/electron36.desktop b/applications/hidden/electron36.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/electron36.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/electron37.desktop b/applications/hidden/electron37.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/electron37.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/fcitx5-configtool.desktop b/applications/hidden/fcitx5-configtool.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/fcitx5-configtool.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/fcitx5-wayland-launcher.desktop b/applications/hidden/fcitx5-wayland-launcher.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/fcitx5-wayland-launcher.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/foot-server.desktop b/applications/hidden/foot-server.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/foot-server.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/footclient.desktop b/applications/hidden/footclient.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/footclient.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/java-java-openjdk.desktop b/applications/hidden/java-java-openjdk.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/java-java-openjdk.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/jconsole-java-openjdk.desktop b/applications/hidden/jconsole-java-openjdk.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/jconsole-java-openjdk.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/jshell-java-openjdk.desktop b/applications/hidden/jshell-java-openjdk.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/jshell-java-openjdk.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/kbd-layout-viewer5.desktop b/applications/hidden/kbd-layout-viewer5.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/kbd-layout-viewer5.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/kcm_fcitx5.desktop b/applications/hidden/kcm_fcitx5.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/kcm_fcitx5.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/kcm_kaccounts.desktop b/applications/hidden/kcm_kaccounts.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/kcm_kaccounts.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/kvantummanager.desktop b/applications/hidden/kvantummanager.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/kvantummanager.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/limine-snapper-restore.desktop b/applications/hidden/limine-snapper-restore.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/limine-snapper-restore.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/lstopo.desktop b/applications/hidden/lstopo.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/lstopo.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/org.fcitx.Fcitx5.desktop b/applications/hidden/org.fcitx.Fcitx5.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/org.fcitx.Fcitx5.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/org.fcitx.fcitx5-config-qt.desktop b/applications/hidden/org.fcitx.fcitx5-config-qt.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/org.fcitx.fcitx5-config-qt.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/org.fcitx.fcitx5-migrator.desktop b/applications/hidden/org.fcitx.fcitx5-migrator.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/org.fcitx.fcitx5-migrator.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/org.fcitx.fcitx5-qt5-gui-wrapper.desktop b/applications/hidden/org.fcitx.fcitx5-qt5-gui-wrapper.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/org.fcitx.fcitx5-qt5-gui-wrapper.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/org.fcitx.fcitx5-qt6-gui-wrapper.desktop b/applications/hidden/org.fcitx.fcitx5-qt6-gui-wrapper.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/org.fcitx.fcitx5-qt6-gui-wrapper.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/qv4l2.desktop b/applications/hidden/qv4l2.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/qv4l2.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/qvidcap.desktop b/applications/hidden/qvidcap.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/qvidcap.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/uuctl.desktop b/applications/hidden/uuctl.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/uuctl.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/wiremix.desktop b/applications/hidden/wiremix.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/wiremix.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/xgps.desktop b/applications/hidden/xgps.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/xgps.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/hidden/xgpsspeed.desktop b/applications/hidden/xgpsspeed.desktop
deleted file mode 100644
index e1e3e173..00000000
--- a/applications/hidden/xgpsspeed.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/applications/icons/Battle.net.png b/applications/icons/Battle.net.png
new file mode 100644
index 00000000..a18e41c7
Binary files /dev/null and b/applications/icons/Battle.net.png differ
diff --git a/applications/icons/Retro Gaming.png b/applications/icons/Retro Gaming.png
new file mode 100644
index 00000000..313172bc
Binary files /dev/null and b/applications/icons/Retro Gaming.png differ
diff --git a/bin/omarchy b/bin/omarchy
index c23a6457..2c8433f9 100755
--- a/bin/omarchy
+++ b/bin/omarchy
@@ -27,19 +27,25 @@ declare -A BINARY_TO_KEY
 declare -A GROUP_DESCRIPTIONS
 
 GROUP_DESCRIPTIONS[ac]="AC power detection"
+GROUP_DESCRIPTIONS[audio]="Audio input and output controls"
 GROUP_DESCRIPTIONS[battery]="Battery status helpers"
+GROUP_DESCRIPTIONS[bluetooth]="Bluetooth device controls"
 GROUP_DESCRIPTIONS[branch]="Omarchy git branch management"
 GROUP_DESCRIPTIONS[branding]="About and screensaver branding"
 GROUP_DESCRIPTIONS[brightness]="Display and keyboard brightness"
 GROUP_DESCRIPTIONS[capture]="Screenshots and screen recording"
 GROUP_DESCRIPTIONS[channel]="Omarchy release channel management"
+GROUP_DESCRIPTIONS[clipboard]="Clipboard helpers"
 GROUP_DESCRIPTIONS[cmd]="Command and shortcut helpers"
 GROUP_DESCRIPTIONS[config]="System configuration helpers"
 GROUP_DESCRIPTIONS[debug]="Diagnostics and support logs"
+GROUP_DESCRIPTIONS[finalize]="Finalize user setup"
 GROUP_DESCRIPTIONS[default]="Default application selection"
 GROUP_DESCRIPTIONS[dev]="Omarchy development tools"
+GROUP_DESCRIPTIONS[dns]="DNS resolver configuration"
 GROUP_DESCRIPTIONS[drive]="Drive selection and encryption"
 GROUP_DESCRIPTIONS[font]="Font management"
+GROUP_DESCRIPTIONS[games]="Game launchers and helpers"
 GROUP_DESCRIPTIONS[hibernation]="Hibernation setup and removal"
 GROUP_DESCRIPTIONS[hook]="User hook runner"
 GROUP_DESCRIPTIONS[hw]="Hardware detection and controls"
@@ -48,9 +54,13 @@ GROUP_DESCRIPTIONS[install]="Optional software installers"
 GROUP_DESCRIPTIONS[launch]="Application launchers"
 GROUP_DESCRIPTIONS[menu]="Omarchy menu commands"
 GROUP_DESCRIPTIONS[migrate]="Migration runner"
+GROUP_DESCRIPTIONS[monitor]="Monitor status helpers"
+GROUP_DESCRIPTIONS[network]="Network status helpers"
 GROUP_DESCRIPTIONS[notification]="Notification helpers"
-GROUP_DESCRIPTIONS[npx]="NPX package wrappers"
+GROUP_DESCRIPTIONS[mise]="Mise tool wrappers"
+GROUP_DESCRIPTIONS[osd]="On-screen display status helpers"
 GROUP_DESCRIPTIONS[pkg]="Package management helpers"
+GROUP_DESCRIPTIONS[plugin]="Omarchy shell plugin and bar widget management"
 GROUP_DESCRIPTIONS[plymouth]="Plymouth boot theme management"
 GROUP_DESCRIPTIONS[powerprofiles]="Power profile management"
 GROUP_DESCRIPTIONS[refresh]="Reset config to defaults"
@@ -59,11 +69,12 @@ GROUP_DESCRIPTIONS[reminder]="Desktop notification reminders"
 GROUP_DESCRIPTIONS[remove]="Removal workflows"
 GROUP_DESCRIPTIONS[restart]="Restart Omarchy components"
 GROUP_DESCRIPTIONS[setup]="Interactive setup wizards"
+GROUP_DESCRIPTIONS[shell]="Omarchy shell IPC helpers"
 GROUP_DESCRIPTIONS[screensaver]="Screensaver branding and animation"
 GROUP_DESCRIPTIONS[snapshot]="System snapshots"
+GROUP_DESCRIPTIONS[style]="Global UI style controls"
 GROUP_DESCRIPTIONS[sudo]="Sudo configuration helpers"
-GROUP_DESCRIPTIONS[swayosd]="SwayOSD status display helpers"
-GROUP_DESCRIPTIONS[system]="Reboot, shutdown, logout, and lock"
+GROUP_DESCRIPTIONS[system]="System status, reboot, shutdown, logout, and lock"
 GROUP_DESCRIPTIONS[theme]="Theme management"
 GROUP_DESCRIPTIONS[toggle]="Toggle Omarchy features"
 GROUP_DESCRIPTIONS[transcode]="Image and video transcoding"
diff --git a/bin/omarchy-audio-input-mute b/bin/omarchy-audio-input-mute
index 19e12f23..554eae44 100755
--- a/bin/omarchy-audio-input-mute
+++ b/bin/omarchy-audio-input-mute
@@ -4,18 +4,10 @@
 
 wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle >/dev/null
 
-if pactl get-source-mute @DEFAULT_SOURCE@ | rg -q 'yes'; then
-  led=on
-  osd_message='Microphone muted'
-  osd_icon='microphone-sensitivity-muted-symbolic'
+if wpctl get-volume @DEFAULT_AUDIO_SOURCE@ | grep -q MUTED; then
+  omarchy-brightness-keyboard-mute on
+  omarchy-osd -i microphone-muted -m "Microphone muted"
 else
-  led=off
-  osd_message='Microphone on'
-  osd_icon='audio-input-microphone-symbolic'
+  omarchy-brightness-keyboard-mute off
+  omarchy-osd -i microphone -m "Microphone on"
 fi
-
-omarchy-brightness-keyboard-mute "$led"
-
-omarchy-swayosd-client \
-  --custom-message "$osd_message" \
-  --custom-icon "$osd_icon"
diff --git a/bin/omarchy-audio-input-set-default b/bin/omarchy-audio-input-set-default
new file mode 100755
index 00000000..280042d2
--- /dev/null
+++ b/bin/omarchy-audio-input-set-default
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# omarchy:summary=Set the default audio input and move active streams
+# omarchy:args=<node-id> <source-name>
+# omarchy:examples=omarchy audio input set default 43 alsa_input.pci-0000_00_1f.3.analog-stereo
+
+node_id=${1:-}
+source_name=${2:-}
+
+if [[ -z $node_id || -z $source_name ]]; then
+  echo "Usage: omarchy-audio-input-set-default <node-id> <source-name>" >&2
+  exit 1
+fi
+
+wpctl set-default "$node_id" 2>/dev/null || true
+pactl set-default-source "$source_name" 2>/dev/null || true
+
+pactl list short source-outputs 2>/dev/null | awk '{ print $1 }' | while read -r output; do
+  [[ -n $output ]] && pactl move-source-output "$output" "$source_name" 2>/dev/null || true
+done
diff --git a/bin/omarchy-audio-output-set-default b/bin/omarchy-audio-output-set-default
new file mode 100755
index 00000000..5f7d8f04
--- /dev/null
+++ b/bin/omarchy-audio-output-set-default
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# omarchy:summary=Set the default audio output and move active streams
+# omarchy:args=<node-id> <sink-name>
+# omarchy:examples=omarchy audio output set default 42 alsa_output.pci-0000_00_1f.3.analog-stereo
+
+node_id=${1:-}
+sink_name=${2:-}
+
+if [[ -z $node_id || -z $sink_name ]]; then
+  echo "Usage: omarchy-audio-output-set-default <node-id> <sink-name>" >&2
+  exit 1
+fi
+
+timeout 2 wpctl set-default "$node_id" 2>/dev/null || true
+timeout 2 pactl set-default-sink "$sink_name" 2>/dev/null || true
+
+timeout 2 pactl list short sink-inputs 2>/dev/null | awk '{ print $1 }' | while read -r input; do
+  [[ -n $input ]] && timeout 2 pactl move-sink-input "$input" "$sink_name" 2>/dev/null || true
+done
diff --git a/bin/omarchy-audio-output-switch b/bin/omarchy-audio-output-switch
index f5f94d44..73af2246 100755
--- a/bin/omarchy-audio-output-switch
+++ b/bin/omarchy-audio-output-switch
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-# omarchy:summary=Switch between audio outputs while preserving the mute status. By default mapped to Super + Mute.
+# omarchy:summary=Switch between audio outputs while preserving the mute status
 
-sinks=$(pactl -f json list sinks | jq '[.[] | select((.ports | length == 0) or ([.ports[]? | .availability != "not available"] | any))]')
-sinks_count=$(echo "$sinks" | jq '. | length')
+sinks=$(timeout 2 pactl -f json list sinks | jq '[.[] | select((.ports | length == 0) or ([.ports[]? | .availability != "not available"] | any))]')
+sinks_count=$(jq 'length' <<<"$sinks")
 
 if (( sinks_count == 0 )); then
-  omarchy-swayosd-client --custom-message "No audio devices found"
+  omarchy-osd -m "No audio devices found"
   exit 1
 fi
 
-current_sink_name=$(pactl get-default-sink)
-current_sink_index=$(echo "$sinks" | jq -r --arg name "$current_sink_name" 'map(.name) | index($name)')
+current_sink_name=$(timeout 2 pactl get-default-sink)
+current_sink_index=$(jq -r --arg name "$current_sink_name" 'map(.name) | index($name)' <<<"$sinks")
 
 if [[ $current_sink_index != "null" ]]; then
   next_sink_index=$(((current_sink_index + 1) % sinks_count))
@@ -19,28 +19,13 @@ else
   next_sink_index=0
 fi
 
-next_sink=$(echo "$sinks" | jq -r ".[$next_sink_index]")
-next_sink_name=$(echo "$next_sink" | jq -r '.name')
+next_sink=$(jq -c ".[$next_sink_index]" <<<"$sinks")
+next_sink_name=$(jq -r '.name' <<<"$next_sink")
+next_sink_description=$(jq -r '.description // .properties."device.description" // .name' <<<"$next_sink")
+next_sink_volume=$(jq -r '.volume | to_entries[0].value.value_percent | sub("%"; "") | tonumber' <<<"$next_sink")
+next_sink_is_muted=$(jq -r '.mute' <<<"$next_sink")
 
-next_sink_description=$(echo "$next_sink" | jq -r '.description')
-if [[ $next_sink_description == "(null)" ]] || [[ $next_sink_description == "null" ]] || [[ -z $next_sink_description ]]; then
-  # For Bluetooth devices, the friendly name is on the Device entry (device.id), not the Sink entry (object.id)
-  device_id=$(echo "$next_sink" | jq -r '.properties."device.id"')
-  if [[ $device_id != "null" ]] && [[ -n $device_id ]]; then
-    next_sink_description=$(wpctl status | grep -E "^\s*│?\s+${device_id}\." | sed -E 's/^.*[0-9]+\.\s+//' | sed -E 's/\s+\[.*$//')
-  fi
-  # Fall back to object.id lookup if device.id didn't yield a result
-  if [[ -z $next_sink_description ]]; then
-    sink_id=$(echo "$next_sink" | jq -r '.properties."object.id"')
-    next_sink_description=$(wpctl status | grep -E "\s+\*?\s+${sink_id}\." | sed -E 's/^.*[0-9]+\.\s+//' | sed -E 's/\s+\[.*$//')
-  fi
-fi
-
-next_sink_volume=$(echo "$next_sink" | jq -r \
-  '.volume | to_entries[0].value.value_percent | sub("%"; "")')
-next_sink_is_muted=$(echo "$next_sink" | jq -r '.mute')
-
-if [[ $next_sink_is_muted = "true" ]] || (( next_sink_volume == 0 )); then
+if [[ $next_sink_is_muted == "true" ]] || (( next_sink_volume == 0 )); then
   icon_state="muted"
 elif (( next_sink_volume <= 33 )); then
   icon_state="low"
@@ -50,13 +35,8 @@ else
   icon_state="high"
 fi
 
-next_sink_volume_icon="sink-volume-${icon_state}-symbolic"
-
 if [[ $next_sink_name != $current_sink_name ]]; then
-  next_sink_wpid=$(echo "$next_sink" | jq -r '.properties."object.id"')
-  wpctl set-default "$next_sink_wpid"
+  omarchy-audio-output-set-default "$(jq -r '.index' <<<"$next_sink")" "$next_sink_name"
 fi
 
-omarchy-swayosd-client \
-  --custom-message "$next_sink_description" \
-  --custom-icon "$next_sink_volume_icon"
+omarchy-osd -i "volume-${icon_state}" -m "$next_sink_description"
diff --git a/bin/omarchy-audio-output-volume b/bin/omarchy-audio-output-volume
new file mode 100755
index 00000000..cc9a02c2
--- /dev/null
+++ b/bin/omarchy-audio-output-volume
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# omarchy:summary=Adjust output volume and show the Omarchy OSD
+# omarchy:args=<raise|lower|mute-toggle|+N|-N>
+# omarchy:examples=omarchy audio output volume raise | omarchy audio output volume lower | omarchy audio output volume mute-toggle | omarchy audio output volume +1
+
+action="${1:-}"
+
+if [[ -z $action ]]; then
+  echo "Usage: omarchy-audio-output-volume <raise|lower|mute-toggle|+N|-N>"
+  exit 1
+fi
+
+volume_state() {
+  wpctl get-volume @DEFAULT_AUDIO_SINK@
+}
+
+volume_percent() {
+  volume_state | awk '{ for (i=1; i<=NF; i++) if ($i ~ /^[0-9.]+$/) print int($i * 100) }'
+}
+
+volume_muted() {
+  volume_state | grep -q MUTED
+}
+
+unmute_output() {
+  wpctl set-mute @DEFAULT_AUDIO_SINK@ 0 >/dev/null
+}
+
+case "$action" in
+  raise) action="+5" ;;
+  lower) action="-5" ;;
+esac
+
+if [[ $action == "mute-toggle" ]]; then
+  runtime_dir="${XDG_RUNTIME_DIR:-/tmp}"
+  debounce_file="$runtime_dir/omarchy-audio-output-volume-mute-toggle.last"
+  now=$(date +%s%3N)
+  last=0
+  [[ -r $debounce_file ]] && read -r last < "$debounce_file" || true
+  if (( now - last < 250 )); then
+    exit 0
+  fi
+  printf '%s\n' "$now" > "$debounce_file"
+
+  wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle >/dev/null
+elif [[ $action == +* ]]; then
+  step="${action#+}"
+  unmute_output
+  wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ "${step}%+"
+elif [[ $action == -* ]]; then
+  step="${action#-}"
+  unmute_output
+  wpctl set-volume @DEFAULT_AUDIO_SINK@ "${step}%-"
+else
+  echo "Unknown volume action: $action"
+  exit 1
+fi
+
+percent=$(volume_percent)
+if volume_muted || (( percent == 0 )); then
+  icon="volume-muted"
+else
+  icon="volume-high"
+fi
+
+omarchy-osd -i "$icon" -p "$percent"
diff --git a/bin/omarchy-audio-sink-availability b/bin/omarchy-audio-sink-availability
new file mode 100755
index 00000000..0f333e26
--- /dev/null
+++ b/bin/omarchy-audio-sink-availability
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# omarchy:summary=Print PulseAudio sink availability for the shell
+# omarchy:group=audio
+
+pactl list sinks 2>/dev/null | awk '
+  function emit_sink() {
+    if (name == "") return
+    print name "\t" ((port_count == 0 || available) ? 1 : 0)
+  }
+
+  /^Sink #/ {
+    emit_sink()
+    name = ""
+    in_ports = 0
+    port_count = 0
+    available = 0
+    next
+  }
+
+  /^[[:space:]]*Name:/ {
+    name = $2
+    next
+  }
+
+  /^[[:space:]]*Ports:$/ {
+    in_ports = 1
+    next
+  }
+
+  in_ports && /^\tActive Port:/ {
+    in_ports = 0
+    next
+  }
+
+  in_ports && /^\t\t/ {
+    port_count++
+    if ($0 !~ /not available/) available = 1
+    next
+  }
+
+  END {
+    emit_sink()
+  }
+'
diff --git a/bin/omarchy-audio-source-switch b/bin/omarchy-audio-source-switch
new file mode 100755
index 00000000..1b452133
--- /dev/null
+++ b/bin/omarchy-audio-source-switch
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# omarchy:summary=Cycle to the next media source and transfer playback when the current source is playing
+# omarchy:args=[next|previous]
+# omarchy:examples=omarchy audio source switch | omarchy-audio-source-switch previous
+
+direction="${1:-next}"
+
+case "$direction" in
+  next)
+    omarchy-shell media sourceSwitch
+    ;;
+  previous)
+    omarchy-shell media sourceSwitchPrevious
+    ;;
+  *)
+    echo "Usage: omarchy-audio-source-switch [next|previous]" >&2
+    exit 1
+    ;;
+esac
diff --git a/bin/omarchy-battery-low b/bin/omarchy-battery-low
new file mode 100755
index 00000000..d107d4f8
--- /dev/null
+++ b/bin/omarchy-battery-low
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# omarchy:summary=Send the low battery warning notification and run battery-low hooks.
+# omarchy:args=<percentage>
+# omarchy:hidden=true
+
+set -euo pipefail
+
+if (($# != 1)); then
+  echo "Usage: omarchy-battery-low <percentage>" >&2
+  exit 1
+fi
+
+level=$1
+
+omarchy-notification-send -g 󱐋 -u critical "Time to recharge!" "Battery is down to ${level}%" -i battery-caution -t 30000
+omarchy-hook battery-low "$level"
diff --git a/bin/omarchy-battery-monitor b/bin/omarchy-battery-monitor
deleted file mode 100755
index 1238791e..00000000
--- a/bin/omarchy-battery-monitor
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Designed to be run by systemd timer every 30 seconds and alerts if battery is low
-# omarchy:hidden=true
-
-BATTERY_THRESHOLD=10
-NOTIFICATION_FLAG="/run/user/$UID/omarchy_battery_notified"
-BATTERY_LEVEL=$(omarchy-battery-remaining)
-BATTERY_STATE=$(upower -i $(upower -e | grep 'BAT') | grep -E "state" | awk '{print $2}')
-
-send_notification() {
-  notify-send -u critical "󱐋 Time to recharge!" "Battery is down to ${1}%" -i battery-caution -t 30000
-  omarchy-hook battery-low "$1"
-}
-
-if [[ -n $BATTERY_LEVEL && $BATTERY_LEVEL =~ ^[0-9]+$ ]]; then
-  if [[ $BATTERY_STATE == "discharging" ]] && (( BATTERY_LEVEL <= BATTERY_THRESHOLD )); then
-    if [[ ! -f $NOTIFICATION_FLAG ]]; then
-      send_notification $BATTERY_LEVEL
-      touch $NOTIFICATION_FLAG
-    fi
-  else
-    rm -f $NOTIFICATION_FLAG
-  fi
-fi
diff --git a/bin/omarchy-battery-status b/bin/omarchy-battery-status
index 0390df1f..ac81e9d6 100755
--- a/bin/omarchy-battery-status
+++ b/bin/omarchy-battery-status
@@ -1,27 +1,108 @@
 #!/bin/bash
 
 # omarchy:summary=Returns a formatted battery status string with percentage and power draw/charge.
+# omarchy:args=[--shell]
 
-battery_info=$(upower -i $(upower -e | grep BAT))
+shell_output=false
 
-percentage=$(echo "$battery_info" | awk '/percentage/ {
-    print int($2)
-    exit
-}')
+case "${1:-}" in
+  "")
+    ;;
+  --shell)
+    shell_output=true
+    ;;
+  *)
+    echo "Usage: omarchy-battery-status [--shell]" >&2
+    exit 2
+    ;;
+esac
 
-power_rate=$(echo "$battery_info" | awk '/energy-rate/ {
-    rounded = sprintf("%.1f", $2)
-    sub(/\.0$/, "", rounded)
-    print rounded
-    exit
-}')
+battery=$(upower -e 2>/dev/null | grep BAT | head -n 1)
+[[ -z $battery ]] && exit 0
 
-state=$(echo "$battery_info" | awk '/state/ { print $2; exit }')
-time_remaining=$(omarchy-battery-remaining-time)
-capacity=$(omarchy-battery-capacity)
+battery_info=$(upower -i "$battery")
 
-if [[ $state == "charging" ]]; then
-    echo "󰁹    Battery ${percentage}%  ·  ${time_remaining} to full  ·   ${power_rate}W / ${capacity}Wh"
+percentage=$(awk '/percentage/ { print int($2); exit }' <<<"$battery_info")
+power_rate_raw=$(awk '/energy-rate/ { print $2; exit }' <<<"$battery_info")
+power_rate=$(awk '/energy-rate/ {
+  rounded = sprintf("%.1f", $2)
+  sub(/\.0$/, "", rounded)
+  print rounded
+  exit
+}' <<<"$battery_info")
+state=$(awk '/state/ { print $2; exit }' <<<"$battery_info")
+time_remaining=$(omarchy-battery-remaining-time 2>/dev/null)
+capacity=$(omarchy-battery-capacity 2>/dev/null)
+threshold_start=$(awk '/charge-start-threshold:/ { gsub(/%/, "", $2); print int($2); exit }' <<<"$battery_info")
+threshold_end=$(awk '/charge-end-threshold:/ { gsub(/%/, "", $2); print int($2); exit }' <<<"$battery_info")
+
+[[ -z $threshold_end ]] && threshold_end=$(cat /sys/class/power_supply/BAT*/charge_control_end_threshold 2>/dev/null | head -1)
+[[ -z $threshold_start ]] && threshold_start=$(cat /sys/class/power_supply/BAT*/charge_control_start_threshold 2>/dev/null | head -1)
+
+ac_online=false
+for supply in /sys/class/power_supply/*; do
+  [[ -r $supply/type ]] || continue
+  [[ $(<"$supply/type") == "Mains" ]] || continue
+  [[ -r $supply/online ]] || continue
+
+  if [[ $(<"$supply/online") == "1" ]]; then
+    ac_online=true
+    break
+  fi
+done
+
+charge_idle=false
+if awk -v rate="${power_rate_raw:-0}" 'BEGIN { exit !(rate <= 0.2) }'; then
+  charge_idle=true
+fi
+
+charge_holding=false
+if [[ $ac_online == "true" && -n $threshold_end ]]; then
+  if [[ $state == "pending-charge" ]]; then
+    charge_holding=true
+  elif [[ $state == "fully-charged" ]] && (( percentage < 99 )); then
+    charge_holding=true
+  elif [[ $state == "charging" && $charge_idle == "true" ]] && (( threshold_end < 99 && percentage >= threshold_end )); then
+    charge_holding=true
+  fi
+fi
+
+if [[ $shell_output == "true" ]]; then
+  printf 'percentage\t%s\n' "${percentage}%"
+  if [[ $charge_holding == "true" ]]; then
+    printf 'state\tholding\n'
+  else
+    printf 'state\t%s\n' "$state"
+  fi
+  printf 'rate\t%s\n' "${power_rate}W"
+  printf 'size\t%s\n' "${capacity}Wh"
+  printf 'time\t%s\n' "$time_remaining"
+
+  cycles=$(cat /sys/class/power_supply/BAT*/cycle_count 2>/dev/null | head -1)
+
+  [[ -n $cycles ]] && printf 'cycles\t%s\n' "$cycles"
+
+  if [[ -n $threshold_end ]]; then
+    if [[ -n $threshold_start && $threshold_start != $threshold_end ]]; then
+      printf 'threshold\t%s-%s%%\n' "$threshold_start" "$threshold_end"
+    else
+      printf 'threshold\t%s%%\n' "$threshold_end"
+    fi
+  fi
+
+  exit 0
+fi
+
+if [[ $charge_holding == "true" ]]; then
+  if [[ -n $threshold_start && $threshold_start != $threshold_end ]]; then
+    threshold_label="${threshold_start}-${threshold_end}%"
+  else
+    threshold_label="${threshold_end}%"
+  fi
+
+  echo "Battery ${percentage}%  ·  Holding at ${threshold_label}  ·  ${power_rate}W / ${capacity}Wh"
+elif [[ $state == "charging" ]]; then
+  echo "Battery ${percentage}%  ·  ${time_remaining} to full  ·   ${power_rate}W / ${capacity}Wh"
 else
-    echo "󰁹    Battery ${percentage}%  ·  ${time_remaining} left  ·   ${power_rate}W / ${capacity}Wh"
+  echo "Battery ${percentage}%  ·  ${time_remaining} left  ·   ${power_rate}W / ${capacity}Wh"
 fi
diff --git a/bin/omarchy-bluetooth-device b/bin/omarchy-bluetooth-device
new file mode 100755
index 00000000..d121b7c7
--- /dev/null
+++ b/bin/omarchy-bluetooth-device
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# omarchy:summary=Control a Bluetooth device
+# omarchy:group=bluetooth
+# omarchy:args=[pair|connect|disconnect|forget] <address>
+# omarchy:examples=omarchy bluetooth device connect 00:11:22:33:44:55
+
+set -e
+
+usage() {
+  echo "Usage: omarchy-bluetooth-device [pair|connect|disconnect|forget] <address>" >&2
+  exit 1
+}
+
+action=${1:-}
+address=${2:-}
+
+[[ $action == "pair" || $action == "connect" || $action == "disconnect" || $action == "forget" ]] || usage
+[[ $address =~ ^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$ ]] || usage
+
+power_on() {
+  bluetoothctl power on >/dev/null 2>&1 || true
+  sleep 0.5
+}
+
+trust_device() {
+  bluetoothctl trust "$address" >/dev/null 2>&1 || true
+}
+
+case "$action" in
+  pair)
+    power_on
+    timeout 20s bluetoothctl pair "$address" >/dev/null 2>&1 || true
+    trust_device
+    timeout 20s bluetoothctl connect "$address" >/dev/null 2>&1 || true
+    ;;
+  connect)
+    power_on
+    trust_device
+    timeout 20s bluetoothctl connect "$address" >/dev/null 2>&1 || true
+    ;;
+  disconnect)
+    timeout 10s bluetoothctl disconnect "$address" >/dev/null 2>&1 || true
+    ;;
+  forget)
+    power_on
+    timeout 10s bluetoothctl disconnect "$address" >/dev/null 2>&1 || true
+    timeout 10s bluetoothctl remove "$address" >/dev/null 2>&1 || true
+    ;;
+esac
diff --git a/bin/omarchy-branch-set b/bin/omarchy-branch-set
deleted file mode 100755
index 931bca25..00000000
--- a/bin/omarchy-branch-set
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set the branch for Omarchy's git repository.
-# omarchy:args=<master|rc|dev>
-
-if (($# == 0)); then
-  echo "Usage: omarchy-branch-set [master|rc|dev]"
-  exit 1
-else
-  branch="$1"
-fi
-
-if [[ $branch != "master" && $branch != "rc" && $branch != "dev" ]]; then
-  echo "Error: Invalid branch '$branch'. Must be one of: master, rc, dev"
-  exit 1
-fi
-
-git -C $OMARCHY_PATH switch $branch
diff --git a/bin/omarchy-branding-about b/bin/omarchy-branding-about
index aca234de..f8bfd966 100755
--- a/bin/omarchy-branding-about
+++ b/bin/omarchy-branding-about
@@ -8,10 +8,12 @@
 
 set -euo pipefail
 
+SOURCE_DIR="${XDG_PICTURES_DIR:-$HOME/Pictures}"
+
 case "${1:-}" in
 image)
-  image=$(omarchy-menu-file "Logo image" "$HOME" "svg png")
-  if [[ -n $image ]] && omarchy-transcode-ascii "$image" ~/.config/omarchy/branding/about.txt --width 54 --height 26 --mode block; then
+  image=$(omarchy-menu-file "Pick png/svg from $SOURCE_DIR" "${SOURCE_DIR}" "svg png")
+  if [[ -n $image ]] && omarchy-transcode-ascii "$image" ~/.config/omarchy/branding/about.txt --width 54 --height 26; then
     omarchy-launch-about >/dev/null 2>&1
   fi
   ;;
diff --git a/bin/omarchy-branding-screensaver b/bin/omarchy-branding-screensaver
index 57012af8..4aaafc58 100755
--- a/bin/omarchy-branding-screensaver
+++ b/bin/omarchy-branding-screensaver
@@ -8,9 +8,11 @@
 
 set -euo pipefail
 
+SOURCE_DIR="${XDG_PICTURES_DIR:-$HOME/Pictures}"
+
 case "${1:-}" in
 image)
-  image=$(omarchy-menu-file "Logo image" "$HOME" "svg png")
+  image=$(omarchy-menu-file "Pick png/svg from $SOURCE_DIR" "${SOURCE_DIR}" "svg png")
   if [[ -n $image ]] && omarchy-transcode-ascii "$image" ~/.config/omarchy/branding/screensaver.txt; then
     omarchy-launch-screensaver force >/dev/null 2>&1
   fi
diff --git a/bin/omarchy-brightness-display b/bin/omarchy-brightness-display
index 193bdb1b..f672b483 100755
--- a/bin/omarchy-brightness-display
+++ b/bin/omarchy-brightness-display
@@ -1,35 +1,67 @@
 #!/bin/bash
 
-# omarchy:summary=Adjust brightness on the most likely display device.
-# omarchy:args=<+N%|N%-|N%|off|on>
-# omarchy:examples=omarchy brightness display +5% | omarchy brightness display 5%- | omarchy brightness display 50% | omarchy brightness display off | omarchy brightness display on
+# omarchy:summary=Show or adjust brightness on the most likely display device.
+# omarchy:args=[--no-osd] [+N%|N%-|N%|off|on]
+# omarchy:examples=omarchy brightness display | omarchy brightness display +5% | omarchy brightness display --no-osd 50% | omarchy brightness display off | omarchy brightness display on
 
-step="${1:-+5%}"
+no_osd=0
+args=()
 
-# Start with the first possible output, then refine to the most likely given an order heuristic.
-device="$(ls -1 /sys/class/backlight 2>/dev/null | head -n1)"
-for candidate in amdgpu_bl* intel_backlight acpi_video*; do
-  if [[ -e /sys/class/backlight/$candidate ]]; then
-    device="$candidate"
-    break
+for arg in "$@"; do
+  if [[ $arg == "--no-osd" ]]; then
+    no_osd=1
+  else
+    args+=("$arg")
   fi
 done
 
-if [[ $step == "off" ]]; then
-  hyprctl dispatch dpms off >/dev/null 2>&1
-  exit 0
-elif [[ $step == "on" ]]; then
-  hyprctl dispatch dpms on >/dev/null 2>&1
-  exit 0
-fi
+set -- "${args[@]}"
 
-if omarchy-hyprland-monitor-focused-apple; then
-  omarchy-brightness-display-apple "$step"
+# Get the brightness of the passed display
+display_brightness() {
+  brightnessctl -d "$1" -m 2>/dev/null | awk -F, '{ gsub("%", "", $4); print $4; found=1 } END{ exit !found }'
+}
+
+if (( $# == 0 )); then
+  if omarchy-hyprland-monitor-focused-apple; then
+    omarchy-brightness-display-apple
+    exit
+  fi
+
+  device="$(omarchy-hw-display)" || exit 1
+  display_brightness "$device"
   exit
 fi
 
+step="$1"
+
+if [[ $step == "off" ]]; then
+  hyprctl dispatch 'hl.dsp.dpms({ action = "disable" })' >/dev/null 2>&1
+  exit 0
+elif [[ $step == "on" ]]; then
+  hyprctl dispatch 'hl.dsp.dpms({ action = "enable" })' >/dev/null 2>&1
+  exit 0
+fi
+
+# Drop overlapping brightness key events so concurrent invocations do not race.
+# Hardware key repeat present on some devices can otherwise glitch OSD rendering.
+exec {lock_fd}>"${XDG_RUNTIME_DIR:-/tmp}/omarchy-brightness-display.lock"
+flock -n "$lock_fd" || exit 0
+
+if omarchy-hyprland-monitor-focused-apple; then
+  if (( no_osd )); then
+    omarchy-brightness-display-apple --no-osd "$step"
+  else
+    omarchy-brightness-display-apple "$step"
+  fi
+  exit
+fi
+
+# Current device highlighted
+device="$(omarchy-hw-display)" || exit 1
+
 # Current brightness percentage
-current=$(brightnessctl -d "$device" -m | cut -d',' -f4 | tr -d '%')
+current=$(display_brightness "$device") || exit 1
 
 # Apply non-uniform step size: 1% steps if at or below 5%, otherwise set an
 # absolute target percentage to avoid raw backlight rounding causing uneven OSD steps.
@@ -53,8 +85,8 @@ elif [[ $step == "5%-" ]]; then
   step="$target%"
 fi
 
-# Set the actual brightness of the display device.
+# Set brightness of the display device.
 brightnessctl -d "$device" set "$step" >/dev/null
 
-# Use SwayOSD to display the new brightness setting.
-omarchy-swayosd-brightness "$(brightnessctl -d "$device" -m | cut -d',' -f4 | tr -d '%')"
+# Show the new brightness in OSD
+(( no_osd )) || omarchy-osd -i brightness -p "$(display_brightness "$device")"
diff --git a/bin/omarchy-brightness-display-apple b/bin/omarchy-brightness-display-apple
index 480b9fe7..3e0d5c8b 100755
--- a/bin/omarchy-brightness-display-apple
+++ b/bin/omarchy-brightness-display-apple
@@ -1,34 +1,101 @@
 #!/bin/bash
 
-# omarchy:summary=Adjust the brightness on Apple Studio Displays and Apple XDR Displays using asdcontrol.
-# omarchy:args=<+N%|N%-|N%>
-# omarchy:examples=omarchy brightness display apple +5% | omarchy brightness display apple 5%- | omarchy brightness display apple 50%
+# omarchy:summary=Show or adjust Apple Studio Display and Apple XDR Display brightness using asdcontrol.
+# omarchy:args=[--no-osd] [+N%|N%-|N%]
+# omarchy:examples=omarchy brightness display apple | omarchy brightness display apple +5% | omarchy brightness display apple --no-osd 50%
 
-if (( $# == 0 )); then
-  echo "Adjust Apple Display brightness by passing +5%, 5%-, or 100%"
-else
-  step="$1"
-  if [[ $step =~ ^([0-9]+)%-$ ]]; then
-    step="-${BASH_REMATCH[1]}%"
+device_cache="${XDG_RUNTIME_DIR:-/tmp}/omarchy-brightness-display-apple.device"
+no_osd=0
+args=()
+
+for arg in "$@"; do
+  if [[ $arg == "--no-osd" ]]; then
+    no_osd=1
+  else
+    args+=("$arg")
   fi
+done
+
+set -- "${args[@]}"
+
+detect_apple_display_device() {
+  local devices=()
+  local path=""
 
-  devices=()
   for path in /dev/usb/hiddev* /dev/hiddev*; do
     [[ -e $path ]] && devices+=("$path")
   done
 
-  if (( ${#devices[@]} == 0 )); then
-    echo "No Apple Display HID device found"
-    exit 1
+  (( ${#devices[@]} > 0 )) || return 1
+
+  sudo asdcontrol --detect "${devices[@]}" 2>/dev/null | awk -F: '/^\/dev\/(usb\/)?hiddev/{ print $1; exit }'
+}
+
+find_apple_display_device() {
+  local cached=""
+  local device=""
+
+  if [[ -r $device_cache ]]; then
+    read -r cached <"$device_cache" || true
+    if [[ -n $cached && -e $cached ]]; then
+      printf '%s\n' "$cached"
+      return 0
+    fi
   fi
 
-  device="$(sudo asdcontrol --detect "${devices[@]}" | grep -E '^/dev/(usb/)?hiddev' | cut -d: -f1 | head -n1)"
+  device="$(detect_apple_display_device)" || return 1
+  [[ -n $device ]] || return 1
+
+  printf '%s\n' "$device" >"$device_cache"
+  printf '%s\n' "$device"
+}
+
+current_brightness() {
+  local device="$1"
+
+  sudo asdcontrol "$device" 2>/dev/null | awk -F= '
+    /BRIGHTNESS=/ {
+      print int($2 * 100 / 60000)
+      found = 1
+    }
+
+    END { exit !found }
+  '
+}
+
+retry_with_fresh_device() {
+  rm -f "$device_cache"
+  device="$(find_apple_display_device || true)"
   if [[ -z $device ]]; then
-    echo "No Apple Display HID device found"
+    echo "No Apple Display HID device found" >&2
     exit 1
   fi
+}
 
-  sudo asdcontrol "$device" -- "$step" >/dev/null
-  value="$(sudo asdcontrol "$device" | awk -F= '/BRIGHTNESS=/{print $2+0}')"
-  omarchy-swayosd-brightness "$(( value * 100 / 60000 ))"
+device="$(find_apple_display_device || true)"
+if [[ -z $device ]]; then
+  echo "No Apple Display HID device found" >&2
+  exit 1
 fi
+
+if (( $# == 0 )); then
+  if current_brightness "$device"; then
+    exit
+  else
+    retry_with_fresh_device
+    current_brightness "$device"
+    exit
+  fi
+fi
+
+step="$1"
+if [[ $step =~ ^([0-9]+)%-$ ]]; then
+  step="-${BASH_REMATCH[1]}%"
+fi
+
+if ! sudo asdcontrol "$device" -- "$step" >/dev/null; then
+  retry_with_fresh_device
+  sudo asdcontrol "$device" -- "$step" >/dev/null
+fi
+
+(( no_osd )) || omarchy-osd -i brightness -p "$(current_brightness "$device")"
diff --git a/bin/omarchy-brightness-keyboard b/bin/omarchy-brightness-keyboard
index 7e5febe6..318c6b1b 100755
--- a/bin/omarchy-brightness-keyboard
+++ b/bin/omarchy-brightness-keyboard
@@ -1,7 +1,20 @@
 #!/bin/bash
 
 # omarchy:summary=Adjust keyboard backlight brightness using available steps.
-# omarchy:args=<up|down|cycle|off|restore>
+# omarchy:args=[--no-osd] <up|down|cycle|off|restore>
+
+no_osd=0
+args=()
+
+for arg in "$@"; do
+  if [[ $arg == "--no-osd" ]]; then
+    no_osd=1
+  else
+    args+=("$arg")
+  fi
+done
+
+set -- "${args[@]}"
 
 direction="${1:-up}"
 
@@ -49,7 +62,4 @@ fi
 
 # Set the new brightness.
 brightnessctl -d "$device" set "$new_brightness" >/dev/null
-
-# Use SwayOSD to display the new brightness setting.
-percent=$((new_brightness * 100 / max_brightness))
-omarchy-swayosd-kbd-brightness "$percent"
+(( no_osd )) || omarchy-osd -i keyboard -p "$(( new_brightness * 100 / max_brightness ))"
diff --git a/bin/omarchy-capture-screenrecording b/bin/omarchy-capture-screenrecording
index 75a5c207..6ed81d9c 100755
--- a/bin/omarchy-capture-screenrecording
+++ b/bin/omarchy-capture-screenrecording
@@ -2,7 +2,7 @@
 
 # omarchy:summary=Start or stop screen recording
 # omarchy:group=capture
-# omarchy:args=[--with-desktop-audio] [--with-microphone-audio] [--with-webcam] [--webcam-device=<device>] [--resolution=<size>] [--stop-recording]
+# omarchy:args=[--fullscreen] [--with-desktop-audio] [--with-microphone-audio] [--with-webcam] [--webcam-device=<device>] [--resolution=<size>] [--stop-recording]
 # omarchy:examples=omarchy screenrecord | omarchy capture screenrecord --with-desktop-audio
 # omarchy:aliases=omarchy screenrecord
 #
@@ -31,6 +31,7 @@ MICROPHONE_AUDIO="false"
 WEBCAM="false"
 WEBCAM_DEVICE=""
 RESOLUTION=""
+FULLSCREEN="false"
 STOP_RECORDING="false"
 RECORDING_FILE="/tmp/omarchy-screenrecord-filename"
 LOG_FILE=$([[ ${OMARCHY_SCREENRECORD_DEBUG:-false} == "true" ]] && echo "/tmp/omarchy-screenrecord.log" || echo "/dev/null")
@@ -42,6 +43,7 @@ for arg in "$@"; do
   --with-webcam) WEBCAM="true" ;;
   --webcam-device=*) WEBCAM_DEVICE="${arg#*=}" ;;
   --resolution=*) RESOLUTION="${arg#*=}" ;;
+  --fullscreen) FULLSCREEN="true" ;;
   --stop-recording) STOP_RECORDING="true" ;;
   esac
 done
@@ -167,7 +169,10 @@ start_screenrecording() {
   # the portal backend supports and the kms backend doesn't). Default flow uses
   # slurp + the kms backend, which avoids the EGL DMA-BUF modifier import
   # failures the portal path can hit on some configurations.
-  if [[ ${OMARCHY_SCREENRECORD_USE_PORTAL:-false} == "true" ]]; then
+  if [[ $FULLSCREEN == "true" ]]; then
+    target="monitor:$(omarchy-hyprland-monitor-focused)"
+    capture_args=(-w "${target#monitor:}" -s "${RESOLUTION:-$(default_resolution)}")
+  elif [[ ${OMARCHY_SCREENRECORD_USE_PORTAL:-false} == "true" ]]; then
     target="portal"
     capture_args=(-w portal -s "${RESOLUTION:-$(default_resolution)}")
   else
@@ -240,8 +245,9 @@ stop_screenrecording() {
     ffmpeg -y -i "$filename" -ss 00:00:00.1 -vframes 1 -q:v 2 "$preview" -loglevel quiet 2>/dev/null
 
     (
-      ACTION=$(notify-send "Screen recording saved" "Open with Super + Alt + , (or click this)" -t 10000 -i "${preview:-$filename}" -A "default=open")
-      [[ $ACTION == "default" ]] && mpv "$filename"
+      if [[ -n $(omarchy-notification-send "Screen recording saved" "Open with Super + Alt + , (or click this)" -t 10000 --image "${preview:-$filename}" -a) ]]; then
+        mpv "$filename"
+      fi
       rm -f "$preview"
     ) &
   fi
@@ -250,7 +256,7 @@ stop_screenrecording() {
 }
 
 toggle_screenrecording_indicator() {
-  pkill -RTMIN+8 waybar
+  omarchy-shell -q Indicators refresh
 }
 
 screenrecording_active() {
diff --git a/bin/omarchy-capture-screenrecording-with-webcam b/bin/omarchy-capture-screenrecording-with-webcam
new file mode 100755
index 00000000..fb35cb8e
--- /dev/null
+++ b/bin/omarchy-capture-screenrecording-with-webcam
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# omarchy:summary=Pick a webcam and start a screen recording with it
+# omarchy:examples=omarchy capture screenrecording-with-webcam
+
+set -o pipefail
+
+webcam_list() {
+  v4l2-ctl --list-devices 2>/dev/null | while IFS= read -r line; do
+    if [[ $line != $'\t'* && -n $line ]]; then
+      local name="$line"
+      local device
+      IFS= read -r device || break
+      device=$(tr -d '\t' <<<"$device" | head -1)
+      [[ -n $device ]] && echo "$device  $name"
+    fi
+  done
+}
+
+mapfile -t devices < <(webcam_list)
+if (( ${#devices[@]} == 0 )); then
+  omarchy-notification-send "No webcam devices found" -u critical -t 3000
+  exit 1
+fi
+
+if (( ${#devices[@]} == 1 )); then
+  device="${devices[0]%%[[:space:]]*}"
+else
+  selection=$(omarchy-menu-select "Select Webcam" "${devices[@]}" -- --width 520 --maxheight 520) || exit 1
+  device="${selection%%[[:space:]]*}"
+fi
+
+exec omarchy-capture-screenrecording \
+  --with-desktop-audio --with-microphone-audio \
+  --with-webcam --webcam-device="$device"
diff --git a/bin/omarchy-capture-screenshot b/bin/omarchy-capture-screenshot
index 572330f7..ca18d125 100755
--- a/bin/omarchy-capture-screenshot
+++ b/bin/omarchy-capture-screenshot
@@ -11,7 +11,7 @@ OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-${XDG_PICTURES_DIR:-$HOME/Pictures}}"
 
 if [[ ! -d $OUTPUT_DIR ]]; then
   mkdir -p "$OUTPUT_DIR"
-  notify-send "Created screenshot directory: $OUTPUT_DIR" -u normal -t 2000
+  omarchy-notification-send "Created screenshot directory: $OUTPUT_DIR" -t 2000
 fi
 
 pkill slurp && exit 0
@@ -36,7 +36,7 @@ open_editor() {
       --output-filename "$filepath" \
       --actions-on-enter save-to-clipboard \
       --save-after-copy \
-      --copy-command 'wl-copy'
+      --copy-command 'wl-copy --type image/png'
   else
     $SCREENSHOT_EDITOR "$filepath"
   fi
@@ -130,15 +130,16 @@ case "$PROCESSING" in
   slurp)
     grim -g "$SELECTION" "$FILEPATH" || exit 1
     echo "$FILEPATH"
-    wl-copy <"$FILEPATH"
+    wl-copy --type image/png <"$FILEPATH"
 
     (
-      ACTION=$(notify-send "Screenshot saved to clipboard and file" "Edit with Super + Alt + , (or click this)" -t 10000 -i "$FILEPATH" -A "default=edit")
-      [[ $ACTION == "default" ]] && open_editor "$FILEPATH"
+      if [[ -n $(omarchy-notification-send "Screenshot saved to clipboard and file" "Edit with Super + Alt + , (or click this)" -t 10000 --image "$FILEPATH" -a) ]]; then
+        open_editor "$FILEPATH"
+      fi
     ) >/dev/null 2>&1 &
     ;;
   copy)
-    grim -g "$SELECTION" - | wl-copy
+    grim -g "$SELECTION" - | wl-copy --type image/png
     ;;
   save)
     grim -g "$SELECTION" "$FILEPATH" || exit 1
diff --git a/bin/omarchy-capture-text-extraction b/bin/omarchy-capture-text-extraction
index 4b49b16b..b9b31302 100755
--- a/bin/omarchy-capture-text-extraction
+++ b/bin/omarchy-capture-text-extraction
@@ -23,4 +23,4 @@ TEXT=$(grim -g "$SELECTION" - | tesseract stdin stdout --oem 1 --psm 6 -l "${OMA
 [[ -z $TEXT ]] && exit 1
 
 printf "%s" "$TEXT" | wl-copy
-notify-send "󰴑    Copied text from selection to clipboard"
+omarchy-notification-send -g 󰴑 "Copied text from selection to clipboard"
diff --git a/bin/omarchy-channel-set b/bin/omarchy-channel-set
index b6c15d71..55d1e1bb 100755
--- a/bin/omarchy-channel-set
+++ b/bin/omarchy-channel-set
@@ -1,22 +1,21 @@
 #!/bin/bash
 
-# omarchy:summary=Set the Omarchy channel, which dictates what git branch and package repository is used.
+# omarchy:summary=Set the Omarchy package channel.
 # omarchy:args=<stable|rc|edge|dev>
 # omarchy:requires-sudo=true
 
+set -e
+
 if (($# == 0)); then
   echo "Usage: omarchy-channel-set [stable|rc|edge|dev]"
   exit 1
-else
-  channel="$1"
 fi
 
+channel="$1"
 case "$channel" in
-"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
-"rc") omarchy-branch-set "rc" && omarchy-refresh-pacman "rc" ;;
-"edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
-"dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
-*) echo "Unknown channel: $channel"; exit 1; ;;
+  stable|rc|edge) omarchy-refresh-pacman "$channel" ;;
+  dev) omarchy-refresh-pacman edge ;;
+  *) echo "Unknown channel: $channel"; exit 1 ;;
 esac
 
 omarchy-update -y
diff --git a/bin/omarchy-chromium-ytdlp-host b/bin/omarchy-chromium-ytdlp-host
new file mode 100755
index 00000000..5fc5842d
--- /dev/null
+++ b/bin/omarchy-chromium-ytdlp-host
@@ -0,0 +1,136 @@
+#!/bin/bash
+
+# omarchy:summary=Native messaging host: download the URL sent by the yt-dlp Chromium extension
+# omarchy:hidden=true
+
+set -euo pipefail
+
+SCRIPT_PATH="${BASH_SOURCE[0]}"
+
+# The browser launches us without Omarchy's environment, so locate the repo from
+# our own path when OMARCHY_PATH isn't already set. Export it — omarchy-shell (used
+# by omarchy-osd) needs it to find the running shell, and silently no-ops without it.
+export OMARCHY_PATH="${OMARCHY_PATH:-$(cd -- "$(dirname -- "$SCRIPT_PATH")/.." && pwd)}"
+
+# Make sure the Omarchy bin and yt-dlp are reachable when launched by the browser.
+export PATH="$OMARCHY_PATH/bin:/usr/local/bin:/usr/bin:$PATH"
+
+DOWNLOAD_DIR="${OMARCHY_YTDLP_DIR:-$HOME/Videos}"
+
+parse_url() {
+  jq -r '.url // empty' 2>/dev/null <<<"$1" || true
+}
+
+valid_url() {
+  [[ $1 =~ ^https?:// ]]
+}
+
+# Drive the Quickshell OSD — a single overlay that updates in place (like the
+# volume/brightness bar), so download progress never stacks like notifications.
+osd_progress() {
+  omarchy-osd -i 󰇚 -p "$1" -d 8000 >/dev/null 2>&1 || true
+}
+
+osd_close() {
+  omarchy-shell -q osd close >/dev/null 2>&1 || true
+}
+
+download_url() {
+  local url="$1"
+
+  mkdir -p "$DOWNLOAD_DIR"
+
+  # Don't show anything until yt-dlp confirms there's actually a video to grab.
+  if ! yt-dlp --no-playlist --simulate --quiet --no-warnings "$url" >/dev/null 2>&1; then
+    omarchy-notification-send -u critical -g 󰅖 "No video found for download" "$url"
+    exit 0
+  fi
+
+  osd_progress 0
+
+  # Stream the download: OMARCHY_PROG carries the percent (drives the OSD),
+  # OMARCHY_FILE (printed only after a successful move) carries title + path.
+  local line rest pct intpct last="" er nowms lastms=0 title="" filepath=""
+  while IFS= read -r line; do
+    case $line in
+    OMARCHY_PROG*)
+      pct=${line#OMARCHY_PROG$'\t'}
+      intpct=${pct%%.*}
+      intpct=${intpct//[^0-9]/}
+      [[ -n $intpct && $intpct != "$last" ]] || continue # skip no-op repeats
+      # Throttle to ~4 redraws/sec so fast downloads don't spawn a flurry of processes.
+      er=$EPOCHREALTIME
+      nowms=$((${er%[.,]*} * 1000 + 10#${er##*[.,]} / 1000))
+      ((nowms - lastms >= 250)) || continue
+      last=$intpct
+      lastms=$nowms
+      osd_progress "$intpct"
+      ;;
+    OMARCHY_FILE*)
+      rest=${line#OMARCHY_FILE$'\t'}
+      title=${rest%%$'\t'*}
+      filepath=${rest#*$'\t'}
+      ;;
+    esac
+  done < <(PYTHONUNBUFFERED=1 yt-dlp --no-playlist --restrict-filenames --no-simulate \
+    --quiet --no-warnings --progress --newline \
+    --progress-template $'download:OMARCHY_PROG\t%(progress._percent_str)s' \
+    --paths "$DOWNLOAD_DIR" -o '%(title)s [%(id)s].%(ext)s' \
+    --print $'after_move:OMARCHY_FILE\t%(title)s\t%(filepath)s' \
+    "$url" 2>&1)
+
+  osd_close
+
+  # after_move only prints on a successful download+move, so a captured path == success.
+  if [[ -n $filepath ]]; then
+    ((${#title} > 50)) && title="${title:0:50}…" # keep the toast compact
+
+    # Square, center-cropped thumbnail so the notification preview isn't stretched.
+    local preview
+    preview="$(mktemp --suffix=.jpg)"
+    ffmpeg -y -i "$filepath" -ss 00:00:00.1 -vframes 1 \
+      -vf "crop='min(iw,ih)':'min(iw,ih)',scale=256:256" -q:v 2 \
+      "$preview" -loglevel quiet 2>/dev/null || true
+
+    # Clicking the toast opens the video in mpv (-a blocks until clicked or timed out).
+    (
+      if [[ -n $(omarchy-notification-send -g 󰄬 "Download complete" "$title" -t 10000 --image "${preview:-$filepath}" -a) ]]; then
+        mpv "$filepath"
+      fi
+      rm -f "$preview"
+    ) &
+  else
+    omarchy-notification-send -u critical -g 󰅖 "Download failed" "$url"
+  fi
+
+  exit 0
+}
+
+main() {
+  local length payload url
+
+  # Detached worker: this is what actually runs yt-dlp and fires notifications.
+  if [[ "${1:-}" == "--download" ]]; then
+    download_url "$2"
+  fi
+
+  # Native messaging frame: 4-byte little-endian length prefix, then UTF-8 JSON.
+  length=$(head -c4 | od -An -v -tu4 --endian=little | tr -d ' ')
+  [[ -n ${length:-} ]] && ((length > 0)) || exit 0
+
+  payload=$(head -c "$length")
+
+  # Ack with an empty message so the extension's sendNativeMessage callback resolves cleanly.
+  printf '\x02\x00\x00\x00{}'
+
+  url=$(parse_url "$payload")
+  [[ -n $url ]] || exit 0
+  valid_url "$url" || exit 0
+
+  # Detach the download so this host exits promptly and frees the browser's port.
+  setsid -f "$SCRIPT_PATH" --download "$url" </dev/null >/dev/null 2>&1
+}
+
+if [[ ${BASH_SOURCE[0]} == "$0" ]]; then
+  main "$@"
+fi
diff --git a/bin/omarchy-clipboard-open b/bin/omarchy-clipboard-open
new file mode 100755
index 00000000..04ea3d77
--- /dev/null
+++ b/bin/omarchy-clipboard-open
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# omarchy:summary=Open a clipboard history entry
+# omarchy:group=clipboard
+# omarchy:args=--history-index <index>
+
+history_index=""
+history_path="$HOME/.local/state/omarchy/clipboard-history.json"
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --history-index)
+      history_index="${2:-}"
+      shift 2
+      ;;
+    *)
+      echo "Usage: omarchy-clipboard-open --history-index <index>" >&2
+      exit 1
+      ;;
+  esac
+done
+
+[[ $history_index =~ ^[0-9]+$ ]] || exit 1
+[[ -r $history_path ]] || exit 1
+
+entry_type=$(jq -er --argjson index "$history_index" '.[$index].type' "$history_path") || exit 1
+
+open_image() {
+  local path="$1"
+
+  [[ -r $path ]] || exit 1
+  exec satty --filename "$path" --output-filename "$path"
+}
+
+open_text() {
+  local text="$1"
+  local url=""
+  local open_dir=""
+  local open_file=""
+
+  url=$(grep -Eom1 'https?://[^[:space:]"'\''<>]+' <<<"$text" || true)
+  if [[ -z $url && $text =~ ^[[:space:]]*([[:alnum:]][[:alnum:].-]+\.[[:alpha:]]{2,})(/[^[:space:]]*)?[[:space:]]*$ ]]; then
+    url="https://${BASH_REMATCH[1]}${BASH_REMATCH[2]}"
+  fi
+
+  if [[ -n $url ]]; then
+    exec omarchy-launch-browser "$url"
+  fi
+
+  open_dir="${XDG_STATE_HOME:-$HOME/.local/state}/omarchy/clipboard-open"
+  mkdir -p "$open_dir"
+  open_file=$(mktemp --tmpdir="$open_dir" clipboard.XXXXXX.txt) || exit 1
+  printf '%s' "$text" >"$open_file"
+  exec omarchy-launch-editor "$open_file"
+}
+
+case "$entry_type" in
+  image)
+    path=$(jq -er --argjson index "$history_index" '.[$index].path' "$history_path") || exit 1
+    open_image "$path"
+    ;;
+  text)
+    text=$(jq -er --argjson index "$history_index" '.[$index].text' "$history_path") || exit 1
+    open_text "$text"
+    ;;
+  *)
+    exit 1
+    ;;
+esac
diff --git a/bin/omarchy-clipboard-paste-file b/bin/omarchy-clipboard-paste-file
new file mode 100755
index 00000000..a656931b
--- /dev/null
+++ b/bin/omarchy-clipboard-paste-file
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# omarchy:summary=Copy a file to the clipboard and paste it
+# omarchy:group=clipboard
+# omarchy:args=[--copy-only] <mime-type> <path>
+# omarchy:examples=omarchy clipboard paste file image/png /tmp/screenshot.png
+
+copy_only=false
+
+if [[ ${1:-} == "--copy-only" ]]; then
+  copy_only=true
+  shift
+fi
+
+mime=${1:-}
+path=${2:-}
+
+if [[ -z $mime || -z $path ]]; then
+  echo "Usage: omarchy-clipboard-paste-file [--copy-only] <mime-type> <path>" >&2
+  exit 1
+fi
+
+[[ -r $path ]] || exit 1
+
+wl-copy --type "$mime" < "$path"
+
+if [[ $copy_only == "true" ]]; then
+  exit
+fi
+
+sleep 0.15
+wtype -M shift -k Insert -m shift 2>/dev/null || true
diff --git a/bin/omarchy-clipboard-paste-text b/bin/omarchy-clipboard-paste-text
new file mode 100755
index 00000000..a1cf064e
--- /dev/null
+++ b/bin/omarchy-clipboard-paste-text
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# omarchy:summary=Copy text to the clipboard and type or paste it
+# omarchy:group=clipboard
+# omarchy:args=[--shift-insert] [--copy-only] [--history-index <index>|<text>]
+# omarchy:examples=omarchy clipboard paste text "hello" | omarchy clipboard paste text --shift-insert "hello"
+
+use_shift_insert=false
+copy_only=false
+history_index=""
+text=""
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --shift-insert)
+      use_shift_insert=true
+      shift
+      ;;
+    --copy-only)
+      copy_only=true
+      shift
+      ;;
+    --history-index)
+      history_index="${2:-}"
+      shift 2
+      ;;
+    *)
+      break
+      ;;
+  esac
+done
+
+copy_history_entry() {
+  local history_path="$HOME/.local/state/omarchy/clipboard-history.json"
+
+  [[ $history_index =~ ^[0-9]+$ ]] || exit
+  jq -e --argjson index "$history_index" '.[$index].type == "text" and (.[$index].text | type == "string")' "$history_path" >/dev/null || exit
+  jq -j --argjson index "$history_index" '.[$index].text' "$history_path" | wl-copy
+}
+
+if [[ -n $history_index ]]; then
+  copy_history_entry
+  if [[ $copy_only != "true" ]]; then
+    use_shift_insert=true
+  fi
+else
+  text=${1:-}
+  [[ -n $text ]] || exit
+  printf '%s' "$text" | wl-copy
+fi
+
+if [[ $copy_only == "true" ]]; then
+  exit
+fi
+
+sleep 0.15
+
+if [[ $use_shift_insert == "true" ]]; then
+  wtype -M shift -k Insert -m shift 2>/dev/null || true
+else
+  wtype "$text" 2>/dev/null || true
+fi
diff --git a/bin/omarchy-config-shell-bar b/bin/omarchy-config-shell-bar
new file mode 100755
index 00000000..56b2c394
--- /dev/null
+++ b/bin/omarchy-config-shell-bar
@@ -0,0 +1,615 @@
+#!/bin/bash
+
+# omarchy:summary=Mutate the user shell.json bar layout and active bar option
+# omarchy:args=show | options [--json] | use <plugin> | reset | list [--json] [--all] | add [plugin] [left|center|right] | remove [plugin] | drop [plugin] | position <top|bottom|left|right> | transparent <true|false>
+# omarchy:examples=omarchy config shell bar show | omarchy config shell bar options | omarchy config shell bar use local.neon-bar | omarchy config shell bar reset | omarchy config shell bar list | omarchy config shell bar add omarchy.tailscale | omarchy config shell bar position top | omarchy config shell bar transparent true
+
+set -euo pipefail
+
+CONFIG_FILE="$HOME/.config/omarchy/shell.json"
+OMARCHY_ROOT="${OMARCHY_PATH:-}"
+DEFAULTS_FILE="$OMARCHY_ROOT/config/omarchy/shell.json"
+
+usage() {
+  echo "Usage: omarchy-config-shell-bar show | options [--json] | use <plugin> | reset | list [--json] [--all] | add [plugin] [left|center|right] | remove [plugin] | drop [plugin] | position <top|bottom|left|right> | transparent <true|false>" >&2
+}
+
+fail() {
+  echo "omarchy-config-shell-bar: $*" >&2
+  exit 1
+}
+
+refresh_shell_config() {
+  if ! omarchy-shell shell reloadConfig >/dev/null 2>&1; then
+    omarchy-shell -q shell rescanPlugins >/dev/null 2>&1 || true
+  fi
+}
+
+source_file() {
+  local source="$CONFIG_FILE"
+
+  if [[ ! -s $source ]]; then
+    [[ -n $OMARCHY_ROOT ]] || fail "OMARCHY_PATH is not set"
+    source="$DEFAULTS_FILE"
+  fi
+
+  [[ -s $source ]] || fail "could not find shell config or defaults"
+  printf '%s\n' "$source"
+}
+
+bar_widget_manifest_paths() {
+  {
+    if [[ -n $OMARCHY_ROOT && -d $OMARCHY_ROOT/shell/plugins ]]; then
+      find "$OMARCHY_ROOT/shell/plugins" -mindepth 2 -maxdepth 4 -type f \( -name manifest.json -o -name '*.manifest.json' \) 2>/dev/null
+    fi
+
+    if [[ -d $HOME/.config/omarchy/plugins ]]; then
+      find -L "$HOME/.config/omarchy/plugins" -mindepth 2 -maxdepth 2 -type f -name manifest.json 2>/dev/null
+    fi
+  } | sort -u
+}
+
+bar_option_manifest_paths() {
+  {
+    if [[ -n $OMARCHY_ROOT && -d $OMARCHY_ROOT/shell/plugins ]]; then
+      find "$OMARCHY_ROOT/shell/plugins" -mindepth 2 -maxdepth 4 -type f \( -name manifest.json -o -name '*.manifest.json' \) 2>/dev/null
+    fi
+
+    if [[ -d $HOME/.config/omarchy/plugins ]]; then
+      find -L "$HOME/.config/omarchy/plugins" -mindepth 2 -maxdepth 2 -type f -name manifest.json 2>/dev/null
+    fi
+  } | sort -u
+}
+
+current_bar_option_id() {
+  jq -r '(.bar.id // "omarchy.bar") | tostring' "$(source_file)"
+}
+
+available_bar_options_json() {
+  local current_id
+  local manifest_paths=()
+
+  current_id=$(current_bar_option_id)
+  mapfile -t manifest_paths < <(bar_option_manifest_paths)
+
+  if (( ${#manifest_paths[@]} == 0 )); then
+    printf '[]\n'
+    return
+  fi
+
+  jq -s --arg currentId "$current_id" '
+    map(
+      select(((.kinds // []) | index("bar")) and ((.entryPoints.bar // "") != "")) |
+      {
+        id: (.id // ""),
+        name: (.name // .id // ""),
+        description: (.description // ""),
+        firstParty: ((.id // "") | startswith("omarchy.")),
+        active: ((.id // "") == $currentId)
+      } |
+      select(.id != "")
+    ) |
+    unique_by(.id) |
+    sort_by((if .id == "omarchy.bar" then 0 else 1 end), .name, .id)
+  ' "${manifest_paths[@]}"
+}
+
+print_bar_options() {
+  local json="false"
+
+  while (( $# > 0 )); do
+    case "$1" in
+      --json)
+        json="true"
+        ;;
+      -h|--help)
+        usage
+        exit 0
+        ;;
+      *)
+        fail "unknown options option: $1"
+        ;;
+    esac
+    shift
+  done
+
+  if [[ $json == "true" ]]; then
+    available_bar_options_json
+    return
+  fi
+
+  available_bar_options_json | jq -r '
+    .[] |
+    [
+      .id,
+      (if .active then "active" else "available" end),
+      (if .firstParty then "built-in" else "plugin" end),
+      .name,
+      .description
+    ] | @tsv
+  ' | awk -F '\t' '
+    BEGIN { printf "%-32s %-10s %-8s %-22s %s\n", "ID", "STATUS", "SOURCE", "NAME", "DESCRIPTION" }
+    { printf "%-32s %-10s %-8s %-22s %s\n", $1, $2, $3, $4, $5 }
+  '
+}
+
+bar_option_exists() {
+  local id="$1"
+  available_bar_options_json | jq -e --arg id "$id" 'any(.[]; .id == $id)' >/dev/null
+}
+
+current_bar_ids_json() {
+  jq -c '
+    def array_or_empty: if type == "array" then . else [] end;
+    def entry_id: if type == "object" then (.id // "" | tostring) else tostring end;
+
+    ["left", "center", "right"] as $sections |
+    [ $sections[] as $section |
+      ((.bar.layout[$section] // []) | array_or_empty)[] |
+      entry_id |
+      select(length > 0)
+    ]
+  ' "$(source_file)"
+}
+
+current_bar_entries_json() {
+  jq -c '
+    def array_or_empty: if type == "array" then . else [] end;
+    def entry_id($entry): if ($entry | type) == "object" then ($entry.id // "" | tostring) else ($entry | tostring) end;
+
+    ["left", "center", "right"] as $sections |
+    [ $sections[] as $section |
+      ((.bar.layout[$section] // []) | array_or_empty | to_entries[]) |
+      { section: $section, index: .key, id: entry_id(.value) } |
+      select(.id | length > 0)
+    ]
+  ' "$(source_file)"
+}
+
+available_widgets_json() {
+  local include_all="$1"
+  local current_ids
+  local manifest_paths=()
+
+  current_ids=$(current_bar_ids_json)
+  mapfile -t manifest_paths < <(bar_widget_manifest_paths)
+
+  if (( ${#manifest_paths[@]} == 0 )); then
+    printf '[]\n'
+    return
+  fi
+
+  jq -s --argjson currentIds "$current_ids" --argjson includeAll "$include_all" '
+    map(
+      select(((.kinds // []) | index("bar-widget")) and ((.entryPoints.barWidget // "") != "")) |
+      {
+        id: (.id // ""),
+        name: (.barWidget.displayName // .name // .id // ""),
+        description: (.barWidget.description // .description // ""),
+        category: (.barWidget.category // "Plugin"),
+        allowMultiple: (.barWidget.allowMultiple == true)
+      } |
+      select(.id != "")
+    ) |
+    unique_by(.id) |
+    map(. as $widget |
+      $widget + {
+        inBar: (($currentIds | index($widget.id)) != null),
+        addable: ($widget.allowMultiple or (($currentIds | index($widget.id)) == null))
+      }
+    ) |
+    map(select($includeAll or .addable)) |
+    sort_by(.category, .name, .id)
+  ' "${manifest_paths[@]}"
+}
+
+print_available_widgets() {
+  local include_all="false"
+  local json="false"
+
+  while (( $# > 0 )); do
+    case "$1" in
+      --all)
+        include_all="true"
+        ;;
+      --json)
+        json="true"
+        ;;
+      -h|--help)
+        usage
+        exit 0
+        ;;
+      *)
+        fail "unknown list option: $1"
+        ;;
+    esac
+    shift
+  done
+
+  if [[ $json == "true" ]]; then
+    available_widgets_json "$include_all"
+    return
+  fi
+
+  available_widgets_json "$include_all" | jq -r '
+    .[] |
+    [
+      .id,
+      (if .inBar and .allowMultiple then "addable*" elif .inBar then "in-bar" else "addable" end),
+      .category,
+      .name,
+      .description
+    ] | @tsv
+  ' | awk -F '\t' '
+    BEGIN { printf "%-28s %-10s %-14s %-22s %s\n", "ID", "STATUS", "CATEGORY", "NAME", "DESCRIPTION" }
+    { printf "%-28s %-10s %-14s %-22s %s\n", $1, $2, $3, $4, $5 }
+  '
+}
+
+choose_widget() {
+  local widgets
+  local options=()
+  local selected=""
+
+  widgets=$(available_widgets_json false)
+
+  if ! jq -e 'length > 0' <<<"$widgets" >/dev/null; then
+    fail "no addable bar widgets found"
+  fi
+
+  mapfile -t options < <(jq -r '
+    .[] |
+    [.id, .name, .category, .description] | @tsv
+  ' <<<"$widgets" | awk -F '\t' '{ printf "%-28s  %-22s  [%s] %s\n", $1, $2, $3, $4 }')
+
+  if [[ -t 0 || -t 2 ]]; then
+    if omarchy-cmd-present gum; then
+      selected=$(printf '%s\n' "${options[@]}" | gum filter --header "Add bar widget" --placeholder "Search addable widgets..." --limit 1 --height 14) || return 1
+    elif omarchy-cmd-present fzf; then
+      selected=$(printf '%s\n' "${options[@]}" | fzf --prompt "Add bar widget > " --height 40% --layout reverse --border) || return 1
+    else
+      print_available_widgets >&2
+      fail "gum or fzf is required for interactive widget selection"
+    fi
+  else
+    print_available_widgets >&2
+    fail "widget id is required; use list to see addable widgets"
+  fi
+
+  selected="${selected%%[[:space:]]*}"
+  [[ -n $selected ]] || return 1
+  printf '%s\n' "$selected"
+}
+
+choose_removal() {
+  local entries
+  local widgets
+  local options=()
+  local selected=""
+  local location=""
+  local section=""
+  local index=""
+
+  entries=$(current_bar_entries_json)
+  widgets=$(available_widgets_json true)
+
+  if ! jq -e 'length > 0' <<<"$entries" >/dev/null; then
+    fail "no bar widgets are currently configured"
+  fi
+
+  mapfile -t options < <(jq -r --argjson widgets "$widgets" '
+    def widget_meta($id): first($widgets[]? | select(.id == $id)) // {};
+
+    .[] as $entry |
+    (widget_meta($entry.id)) as $meta |
+    [
+      "\($entry.section)[\($entry.index)]",
+      $entry.id,
+      ($meta.name // $entry.id),
+      ($meta.category // "")
+    ] | @tsv
+  ' <<<"$entries" | awk -F '\t' '{ printf "%-10s  %-28s  %-22s  %s\n", $1, $2, $3, $4 }')
+
+  if [[ -t 0 || -t 2 ]]; then
+    if omarchy-cmd-present gum; then
+      selected=$(printf '%s\n' "${options[@]}" | gum filter --header "Remove bar widget" --placeholder "Search current widgets..." --limit 1 --height 14) || return 1
+    elif omarchy-cmd-present fzf; then
+      selected=$(printf '%s\n' "${options[@]}" | fzf --prompt "Remove bar widget > " --height 40% --layout reverse --border) || return 1
+    else
+      jq -r '.[] | "\(.section)[\(.index)]\t\(.id)"' <<<"$entries" >&2
+      fail "gum or fzf is required for interactive widget selection"
+    fi
+  else
+    jq -r '.[] | "\(.section)[\(.index)]\t\(.id)"' <<<"$entries" >&2
+    fail "widget id is required; use show to see current widgets"
+  fi
+
+  location="${selected%%[[:space:]]*}"
+  section="${location%%[*}"
+  index="${location#*[}"
+  index="${index%]}"
+
+  [[ $section =~ ^(left|center|right)$ ]] || return 1
+  [[ $index =~ ^[0-9]+$ ]] || return 1
+  printf '%s\t%s\n' "$section" "$index"
+}
+
+command="${1:-}"
+
+case "$command" in
+  show|current)
+    if (( $# != 1 )); then
+      usage
+      exit 1
+    fi
+
+    jq '.bar // {}' "$(source_file)"
+    ;;
+  selected|active)
+    if (( $# != 1 )); then
+      usage
+      exit 1
+    fi
+
+    current_bar_option_id
+    ;;
+  options|option)
+    shift
+    print_bar_options "$@"
+    ;;
+  use)
+    if (( $# != 2 )); then
+      usage
+      exit 1
+    fi
+
+    plugin="${2:-}"
+    [[ -n $plugin ]] || fail "bar option id is required"
+    if [[ $plugin == "default" || $plugin == "built-in" ]]; then
+      plugin="omarchy.bar"
+    fi
+    bar_option_exists "$plugin" || fail "$plugin is not a known bar option; run 'omarchy config shell bar options'"
+
+    mkdir -p "$(dirname "$CONFIG_FILE")"
+
+    source="$(source_file)"
+    tmp=$(mktemp)
+    trap 'rm -f "$tmp"' EXIT
+
+    if [[ $plugin == "omarchy.bar" ]]; then
+      jq '
+        def object_or_empty: if type == "object" then . else {} end;
+
+        object_or_empty
+        | .version = 1
+        | .bar = (.bar | object_or_empty)
+        | del(.bar.id)
+      ' "$source" >"$tmp"
+    else
+      jq --arg plugin "$plugin" '
+        def object_or_empty: if type == "object" then . else {} end;
+
+        object_or_empty
+        | .version = 1
+        | .bar = (.bar | object_or_empty)
+        | .bar.id = $plugin
+      ' "$source" >"$tmp"
+    fi
+
+    mv "$tmp" "$CONFIG_FILE"
+    trap - EXIT
+    omarchy-shell -q shell rescanPlugins >/dev/null 2>&1 || true
+    refresh_shell_config
+    ;;
+  reset)
+    if (( $# != 1 )); then
+      usage
+      exit 1
+    fi
+
+    mkdir -p "$(dirname "$CONFIG_FILE")"
+
+    source="$(source_file)"
+    tmp=$(mktemp)
+    trap 'rm -f "$tmp"' EXIT
+
+    jq '
+      def object_or_empty: if type == "object" then . else {} end;
+
+      object_or_empty
+      | .version = 1
+      | .bar = (.bar | object_or_empty)
+      | del(.bar.id)
+    ' "$source" >"$tmp"
+
+    mv "$tmp" "$CONFIG_FILE"
+    trap - EXIT
+    refresh_shell_config
+    ;;
+  list|available|widgets)
+    shift
+    print_available_widgets "$@"
+    ;;
+  add)
+    if (( $# > 3 )); then
+      usage
+      exit 1
+    fi
+
+    if (( $# == 1 )); then
+      plugin=$(choose_widget) || exit 1
+    else
+      plugin="${2:-}"
+    fi
+    section="${3:-right}"
+
+    [[ -n $plugin ]] || fail "plugin is required"
+    [[ $section =~ ^(left|center|right)$ ]] || fail "section must be left, center, or right"
+
+    mkdir -p "$(dirname "$CONFIG_FILE")"
+
+    source="$(source_file)"
+    tmp=$(mktemp)
+    trap 'rm -f "$tmp"' EXIT
+
+    jq --arg section "$section" --arg plugin "$plugin" '
+      def object_or_empty: if type == "object" then . else {} end;
+      def array_or_empty: if type == "array" then . else [] end;
+      def entry_id: if type == "object" then (.id // "" | tostring) else tostring end;
+      def append_anchor($section):
+        {
+          left: "omarchy.workspaces",
+          center: "omarchy.weather",
+          right: "omarchy.tray"
+        }[$section];
+      def insert_after_anchor($entries; $entry; $anchor):
+        ($entries | map(entry_id) | index($anchor)) as $index
+        | if $index == null then
+            $entries + [$entry]
+          else
+            $entries[0:$index + 1] + [$entry] + $entries[$index + 1:]
+          end;
+
+      object_or_empty
+      | .version = 1
+      | .bar = (.bar | object_or_empty)
+      | .bar.layout = (.bar.layout | object_or_empty)
+      | .bar.layout.left = (.bar.layout.left | array_or_empty | map(select(entry_id != $plugin)))
+      | .bar.layout.center = (.bar.layout.center | array_or_empty | map(select(entry_id != $plugin)))
+      | .bar.layout.right = (.bar.layout.right | array_or_empty | map(select(entry_id != $plugin)))
+      | .plugins = (.plugins | array_or_empty)
+      | .bar.layout[$section] = insert_after_anchor(.bar.layout[$section]; { id: $plugin }; append_anchor($section))
+    ' "$source" >"$tmp"
+
+    mv "$tmp" "$CONFIG_FILE"
+    trap - EXIT
+    refresh_shell_config
+    ;;
+  position)
+    if (( $# != 2 )); then
+      usage
+      exit 1
+    fi
+
+    position="${2:-}"
+
+    [[ $position =~ ^(top|bottom|left|right)$ ]] || fail "position must be top, bottom, left, or right"
+
+    mkdir -p "$(dirname "$CONFIG_FILE")"
+
+    source="$(source_file)"
+    tmp=$(mktemp)
+    trap 'rm -f "$tmp"' EXIT
+
+    jq --arg position "$position" '
+      def object_or_empty: if type == "object" then . else {} end;
+
+      object_or_empty
+      | .version = 1
+      | .bar = (.bar | object_or_empty)
+      | .bar.position = $position
+    ' "$source" >"$tmp"
+
+    mv "$tmp" "$CONFIG_FILE"
+    trap - EXIT
+    refresh_shell_config
+    ;;
+  transparent)
+    if (( $# != 2 )); then
+      usage
+      exit 1
+    fi
+
+    transparent="${2:-}"
+
+    [[ $transparent =~ ^(true|false)$ ]] || fail "transparent must be true or false"
+
+    mkdir -p "$(dirname "$CONFIG_FILE")"
+
+    source="$(source_file)"
+    tmp=$(mktemp)
+    trap 'rm -f "$tmp"' EXIT
+
+    jq --argjson transparent "$transparent" '
+      def object_or_empty: if type == "object" then . else {} end;
+
+      object_or_empty
+      | .version = 1
+      | .bar = (.bar | object_or_empty)
+      | .bar.transparent = $transparent
+    ' "$source" >"$tmp"
+
+    mv "$tmp" "$CONFIG_FILE"
+    trap - EXIT
+    refresh_shell_config
+    ;;
+  drop|remove|rm)
+    if (( $# > 2 )); then
+      usage
+      exit 1
+    fi
+
+    plugin=""
+    target_section=""
+    target_index=""
+
+    if (( $# == 1 )); then
+      removal=$(choose_removal) || exit 1
+      target_section="${removal%%$'\t'*}"
+      target_index="${removal#*$'\t'}"
+    else
+      plugin="${2:-}"
+      [[ -n $plugin ]] || fail "plugin is required"
+    fi
+
+    mkdir -p "$(dirname "$CONFIG_FILE")"
+
+    source="$(source_file)"
+    tmp=$(mktemp)
+    trap 'rm -f "$tmp"' EXIT
+
+    if [[ -n $target_section ]]; then
+      jq --arg section "$target_section" --argjson index "$target_index" '
+        def object_or_empty: if type == "object" then . else {} end;
+        def array_or_empty: if type == "array" then . else [] end;
+
+        object_or_empty
+        | .version = 1
+        | .bar = (.bar | object_or_empty)
+        | .bar.layout = (.bar.layout | object_or_empty)
+        | .bar.layout.left = (.bar.layout.left | array_or_empty)
+        | .bar.layout.center = (.bar.layout.center | array_or_empty)
+        | .bar.layout.right = (.bar.layout.right | array_or_empty)
+        | if (.bar.layout[$section] | length) <= $index then
+            error("no widget at " + $section + "[" + ($index | tostring) + "]")
+          else
+            .bar.layout[$section] = (.bar.layout[$section][0:$index] + .bar.layout[$section][($index + 1):])
+          end
+        | .plugins = (.plugins | array_or_empty)
+      ' "$source" >"$tmp"
+    else
+      jq --arg plugin "$plugin" '
+        def object_or_empty: if type == "object" then . else {} end;
+        def array_or_empty: if type == "array" then . else [] end;
+        def entry_id: if type == "object" then (.id // "" | tostring) else tostring end;
+
+        object_or_empty
+        | .version = 1
+        | .bar = (.bar | object_or_empty)
+        | .bar.layout = (.bar.layout | object_or_empty)
+        | .bar.layout.left = (.bar.layout.left | array_or_empty | map(select(entry_id != $plugin)))
+        | .bar.layout.center = (.bar.layout.center | array_or_empty | map(select(entry_id != $plugin)))
+        | .bar.layout.right = (.bar.layout.right | array_or_empty | map(select(entry_id != $plugin)))
+        | .plugins = (.plugins | array_or_empty)
+      ' "$source" >"$tmp"
+    fi
+
+    mv "$tmp" "$CONFIG_FILE"
+    trap - EXIT
+    refresh_shell_config
+    ;;
+  *)
+    usage
+    exit 1
+    ;;
+esac
diff --git a/bin/omarchy-debug b/bin/omarchy-debug
index c163e171..237a07d7 100755
--- a/bin/omarchy-debug
+++ b/bin/omarchy-debug
@@ -37,7 +37,7 @@ fi
 cat > "$LOG_FILE" <<EOF
 Date: $(date)
 Hostname: $(hostname)
-Omarchy Branch: $(git -C "$OMARCHY_PATH" branch --show-current 2>/dev/null || echo "unknown")
+Omarchy Package: $(pacman -Q omarchy 2>/dev/null || echo "unknown")
 
 =========================================
 SYSTEM INFORMATION
@@ -75,7 +75,7 @@ ACTION=$(gum choose "${OPTIONS[@]}")
 case "$ACTION" in
   "Upload log")
     echo "Uploading debug log to logs.omarchy.org..."
-    URL=$(curl -sf -F "file=@$LOG_FILE" https://logs.omarchy.org/)
+    URL=$(curl -sf -F "file=@$LOG_FILE" -Fexpires=24 https://logs.omarchy.org/)
     if (( $? == 0 )) && [[ -n $URL ]]; then
       echo "✓ Log uploaded successfully!"
       echo "Share this URL:"
diff --git a/bin/omarchy-debug-idle b/bin/omarchy-debug-idle
new file mode 100755
index 00000000..308df73f
--- /dev/null
+++ b/bin/omarchy-debug-idle
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# omarchy:summary=Show idle, screensaver, and lock diagnostics
+# omarchy:group=debug
+# omarchy:args=[log-lines]
+# omarchy:examples=omarchy debug idle | omarchy-debug-idle 400
+
+lines=${1:-200}
+if [[ ! $lines =~ ^[0-9]+$ ]]; then
+  lines=200
+fi
+
+section() {
+  printf '\n== %s ==\n' "$1"
+}
+
+section "Time"
+date -Is
+
+section "Idle IPC status"
+omarchy-shell idle status 2>&1 | jq . 2>/dev/null || omarchy-shell idle status 2>&1 || true
+
+section "Quickshell instances"
+quickshell list -p "$OMARCHY_PATH/shell" --any-display 2>&1 || true
+
+section "Recent idle logs"
+quickshell --no-color log -p "$OMARCHY_PATH/shell" --any-display --tail "$lines" --log-times -r 'quickshell.wayland.idle_notify=true' 2>&1 \
+  | grep -Ei 'omarchy idle|idle_notify|screensaver|lock|error|warn|failed' || true
+
+section "Relevant processes"
+ps -eo pid=,args= \
+  | grep -E 'quickshell -n -p|omarchy-system-sleep-monitor|systemd-inhibit.*Lock screen before suspend|org\.omarchy\.screensaver|omarchy-screensaver|(^|/| )tte( |$)' \
+  | grep -v grep || true
+
+section "Sleep lock service"
+systemctl --user status omarchy-sleep-lock.service --no-pager 2>/dev/null || true
+
+section "Hyprland screensaver clients"
+hyprctl clients -j 2>/dev/null \
+  | jq -r '.[] | select(.class == "org.omarchy.screensaver" or .initialClass == "org.omarchy.screensaver") | [.pid,.class,.initialClass,.title,.focusHistoryID] | @tsv' || true
+
+section "Idle inhibitors"
+hyprctl clients -j 2>/dev/null \
+  | jq -r '.[] | select(.inhibitingIdle == true or ((.tags // []) | index("noidle"))) | [.pid,.class,.title,((.tags // []) | join(",")),.inhibitingIdle] | @tsv' || true
+
+section "Screensaver detector"
+if hyprctl clients -j 2>/dev/null | jq -e '.[] | select(.class == "org.omarchy.screensaver" or .initialClass == "org.omarchy.screensaver")' >/dev/null; then
+  echo "running-window"
+elif pgrep -f '[o]rg.omarchy.screensaver' >/dev/null; then
+  echo "running-process"
+elif omarchy-toggle-enabled screensaver-off; then
+  echo "disabled"
+else
+  echo "stopped"
+fi
+
+section "Lock detector"
+omarchy-shell lock status 2>&1 | jq . 2>/dev/null || omarchy-shell lock status 2>&1 || true
diff --git a/bin/omarchy-default-ai b/bin/omarchy-default-ai
new file mode 100755
index 00000000..e1d40280
--- /dev/null
+++ b/bin/omarchy-default-ai
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# omarchy:summary=Set the default AI harness used by omarchy-launch-ai
+# omarchy:args=[pi|claude|codex|opencode]
+# omarchy:examples=omarchy default ai | omarchy default ai pi | omarchy default ai claude
+
+ai_file="$HOME/.local/state/omarchy/defaults/ai"
+
+if (( $# == 0 )); then
+  if [[ -f $ai_file ]]; then
+    read -r harness <"$ai_file"
+  fi
+
+  [[ -n ${harness:-} ]] && echo "$harness" || echo "pi"
+  exit 0
+fi
+
+case "$1" in
+pi) harness="pi"; name="Pi"; glyph=󰚩 ;;
+claude) harness="claude"; name="Claude Code"; glyph=󰚩 ;;
+codex) harness="codex"; name="Codex"; glyph=󰚩 ;;
+opencode) harness="opencode"; name="OpenCode"; glyph=󰚩 ;;
+*)
+  echo "Usage: omarchy-default-ai <pi|claude|codex|opencode>" >&2
+  exit 1
+  ;;
+esac
+
+mkdir -p "$(dirname "$ai_file")"
+printf '%s\n' "$harness" >"$ai_file"
+
+omarchy-notification-send -g "$glyph" "$name is now the default AI harness"
diff --git a/bin/omarchy-default-browser b/bin/omarchy-default-browser
index 0b38d760..10f96736 100755
--- a/bin/omarchy-default-browser
+++ b/bin/omarchy-default-browser
@@ -19,13 +19,13 @@ if (($# == 0)); then
 fi
 
 case "$1" in
-chromium) desktop_id="chromium.desktop"; name="Chromium"; glyph="" ;;
-chrome) desktop_id="google-chrome.desktop"; name="Chrome"; glyph="󰊯" ;;
-brave) desktop_id="brave-browser.desktop"; name="Brave"; glyph="󰖟" ;;
-brave-origin) desktop_id="brave-origin-beta.desktop"; name="Brave Origin"; glyph="󰖟" ;;
-edge) desktop_id="microsoft-edge.desktop"; name="Edge"; glyph="󰇩" ;;
-firefox) desktop_id="firefox.desktop"; name="Firefox"; glyph="󰈹" ;;
-zen) desktop_id="zen.desktop"; name="Zen"; glyph="󰰷" ;;
+chromium) desktop_id="chromium.desktop"; name="Chromium"; glyph= ;;
+chrome) desktop_id="google-chrome.desktop"; name="Chrome"; glyph=󰊯 ;;
+brave) desktop_id="brave-browser.desktop"; name="Brave"; glyph=󰖟 ;;
+brave-origin) desktop_id="brave-origin-beta.desktop"; name="Brave Origin"; glyph=󰖟 ;;
+edge) desktop_id="microsoft-edge.desktop"; name="Edge"; glyph=󰇩 ;;
+firefox) desktop_id="firefox.desktop"; name="Firefox"; glyph=󰈹 ;;
+zen) desktop_id="zen.desktop"; name="Zen"; glyph=󰖟 ;;
 *)
   echo "Usage: omarchy-default-browser <chromium|chrome|brave|brave-origin|edge|firefox|zen>"
   exit 1
@@ -37,4 +37,4 @@ xdg-mime default "$desktop_id" x-scheme-handler/http
 xdg-mime default "$desktop_id" x-scheme-handler/https
 xdg-mime default "$desktop_id" text/html
 
-notify-send -u low "$glyph    $name is now the default browser"
+omarchy-notification-send -g $glyph "$name is now the default browser"
diff --git a/bin/omarchy-default-editor b/bin/omarchy-default-editor
index 31846450..bf14dc44 100755
--- a/bin/omarchy-default-editor
+++ b/bin/omarchy-default-editor
@@ -1,30 +1,36 @@
 #!/bin/bash
 
-# omarchy:summary=Set the default editor for $EDITOR
+# omarchy:summary=Set the default editor used by omarchy-launch-editor
 # omarchy:args=[code|cursor|zed|sublime_text|helix|vim|emacs|nvim]
 # omarchy:examples=omarchy default editor | omarchy default editor code | omarchy default editor helix
 
+editor_file="$HOME/.local/state/omarchy/defaults/editor"
+
 if (($# == 0)); then
-  sed -n 's/^export EDITOR=//p' ~/.config/uwsm/default | head -n 1
+  if [[ -f $editor_file ]]; then
+    read -r editor <"$editor_file"
+  fi
+
+  [[ -n $editor ]] && echo "$editor" || echo "nvim"
   exit 0
 fi
 
 case "$1" in
-code) editor="code"; name="VSCode"; glyph="" ;;
-cursor) editor="cursor"; name="Cursor"; glyph="" ;;
-zed | zeditor) editor="zeditor"; name="Zed"; glyph="" ;;
-sublime_text) editor="sublime_text"; name="Sublime Text"; glyph="" ;;
-helix) editor="helix"; name="Helix"; glyph="" ;;
-vim) editor="vim"; name="Vim"; glyph="" ;;
-emacs) editor="emacs"; name="Emacs"; glyph="" ;;
-nvim) editor="nvim"; name="Neovim"; glyph="" ;;
+code) editor="code"; name="VSCode"; glyph= ;;
+cursor) editor="cursor"; name="Cursor"; glyph= ;;
+zed | zeditor) editor="zeditor"; name="Zed"; glyph= ;;
+sublime_text) editor="sublime_text"; name="Sublime Text"; glyph= ;;
+helix) editor="helix"; name="Helix"; glyph= ;;
+vim) editor="vim"; name="Vim"; glyph= ;;
+emacs) editor="emacs"; name="Emacs"; glyph= ;;
+nvim) editor="nvim"; name="Neovim"; glyph= ;;
 *)
   echo "Usage: omarchy-default-editor <code|cursor|zed|sublime_text|helix|vim|emacs|nvim>"
   exit 1
   ;;
 esac
 
-sed -i "s/^export EDITOR=.*/export EDITOR=$editor/" ~/.config/uwsm/default
+mkdir -p "$(dirname "$editor_file")"
+printf '%s\n' "$editor" >"$editor_file"
 
-export EDITOR="$editor"
-notify-send -u low "$glyph    $name is now the default editor" "      Effective after logging out"
+omarchy-notification-send -g $glyph "$name is now the default editor"
diff --git a/bin/omarchy-default-terminal b/bin/omarchy-default-terminal
index b44b0511..ca0ee1d3 100755
--- a/bin/omarchy-default-terminal
+++ b/bin/omarchy-default-terminal
@@ -5,7 +5,8 @@
 # omarchy:examples=omarchy default terminal ghostty | omarchy default terminal kitty
 
 if (($# == 0)); then
-  desktop_id=$(grep -vE '^($|#)' ~/.config/xdg-terminals.list 2>/dev/null | head -n 1)
+  desktop_id=$(xdg-terminal-exec --print-id 2>/dev/null || true)
+  desktop_id=${desktop_id%%:*}
   case "$desktop_id" in
   Alacritty.desktop) echo "alacritty" ;;
   foot.desktop) echo "foot" ;;
@@ -17,10 +18,10 @@ if (($# == 0)); then
 fi
 
 case "$1" in
-alacritty) desktop_id="Alacritty.desktop"; name="Alacritty"; glyph="" ;;
-foot) desktop_id="foot.desktop"; name="Foot"; glyph="" ;;
-ghostty) desktop_id="com.mitchellh.ghostty.desktop"; name="Ghostty"; glyph="" ;;
-kitty) desktop_id="kitty.desktop"; name="Kitty"; glyph="" ;;
+alacritty) desktop_id="Alacritty.desktop"; name="Alacritty"; glyph= ;;
+foot) desktop_id="foot.desktop"; name="Foot"; glyph= ;;
+ghostty) desktop_id="com.mitchellh.ghostty.desktop"; name="Ghostty"; glyph= ;;
+kitty) desktop_id="kitty.desktop"; name="Kitty"; glyph= ;;
 *)
   echo "Usage: omarchy-default-terminal <alacritty|foot|ghostty|kitty>"
   exit 1
@@ -33,4 +34,4 @@ cat >~/.config/xdg-terminals.list <<EOF
 $desktop_id
 EOF
 
-notify-send -u low "$glyph    $name is now the default terminal"
+omarchy-notification-send -g $glyph "$name is now the default terminal"
diff --git a/bin/omarchy-dev-add-migration b/bin/omarchy-dev-add-migration
index bff94502..079e7f08 100755
--- a/bin/omarchy-dev-add-migration
+++ b/bin/omarchy-dev-add-migration
@@ -1,13 +1,33 @@
 #!/bin/bash
 
-# omarchy:summary=Creates a new Omarchy migration named after the unix timestamp of the last commit.
+# omarchy:summary=Create a new Omarchy migration in the current source tree.
+# omarchy:args=<system|user> [--no-edit]
 
-cd ~/.local/share/omarchy
-migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
-touch $migration_file
+set -euo pipefail
 
-if [[ $1 != "--no-edit" ]]; then
-  nvim $migration_file
+scope="${1:-}"
+case "$scope" in
+  system|user)
+    shift
+    ;;
+  -h|--help|"")
+    echo "Usage: omarchy-dev-add-migration <system|user> [--no-edit]"
+    exit 0
+    ;;
+  *)
+    echo "Unknown migration scope: $scope" >&2
+    echo "Usage: omarchy-dev-add-migration <system|user> [--no-edit]" >&2
+    exit 1
+    ;;
+esac
+
+cd "${OMARCHY_PATH:-$(pwd)}"
+mkdir -p "migrations/$scope"
+migration_file="migrations/$scope/$(git log -1 --format=%cd --date=unix).sh"
+touch "$migration_file"
+
+if [[ ${1:-} != "--no-edit" ]]; then
+  nvim "$migration_file"
 fi
 
-echo $migration_file
+printf '%s\n' "$PWD/$migration_file"
diff --git a/bin/omarchy-dev-benchmark-theme-switcher b/bin/omarchy-dev-benchmark-theme-switcher
new file mode 100755
index 00000000..9bbc0424
--- /dev/null
+++ b/bin/omarchy-dev-benchmark-theme-switcher
@@ -0,0 +1,160 @@
+#!/bin/bash
+
+# omarchy:summary=Measure theme switcher cache and selector prep times
+# omarchy:args=[--repeat=<count>] [--keep-cache]
+# omarchy:examples=omarchy dev benchmark theme switcher | omarchy dev benchmark theme-switcher --repeat=10
+# omarchy:aliases=omarchy dev benchmark theme-switcher
+
+set -euo pipefail
+
+OMARCHY_BIN_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
+REPEAT=5
+KEEP_CACHE=false
+
+show_help() {
+  cat <<'EOF'
+Usage:
+  omarchy dev benchmark theme switcher [--repeat=<count>] [--keep-cache]
+
+Measure the non-interactive parts of the theme switcher:
+- theme preview index build (omarchy-theme-switcher before UI handoff)
+- lazy selector row prep used by the interactive theme switcher
+- full thumbnail cache warmup cost (omarchy-menu-images --cache-only)
+
+Options:
+  --repeat=<count>  Number of warm runs to measure for each case (default: 5)
+  --keep-cache      Keep the temporary benchmark cache and print its path
+EOF
+}
+
+now_us() {
+  local now="${EPOCHREALTIME/./}"
+  printf '%s' "$now"
+}
+
+format_ms() {
+  local us="$1"
+  printf '%d.%03d' "$(( us / 1000 ))" "$(( us % 1000 ))"
+}
+
+measure_once() {
+  local start_us end_us
+  start_us=$(now_us)
+  "$@" >/dev/null
+  end_us=$(now_us)
+  printf '%s' "$(( end_us - start_us ))"
+}
+
+run_case() {
+  local label="$1"
+  shift
+  local total_us=0
+  local min_us=0
+  local max_us=0
+  local elapsed_us=0
+
+  for (( i = 1; i <= REPEAT; i++ )); do
+    elapsed_us=$(measure_once "$@")
+    total_us=$(( total_us + elapsed_us ))
+
+    if (( i == 1 || elapsed_us < min_us )); then
+      min_us=$elapsed_us
+    fi
+
+    if (( elapsed_us > max_us )); then
+      max_us=$elapsed_us
+    fi
+  done
+
+  printf '%-34s avg %8s ms  min %8s ms  max %8s ms\n' \
+    "$label" \
+    "$(format_ms "$(( total_us / REPEAT ))")" \
+    "$(format_ms "$min_us")" \
+    "$(format_ms "$max_us")"
+}
+
+while (( $# > 0 )); do
+  case "$1" in
+  --repeat=*)
+    REPEAT="${1#*=}"
+    ;;
+  --keep-cache)
+    KEEP_CACHE=true
+    ;;
+  --help | -h)
+    show_help
+    exit 0
+    ;;
+  *)
+    echo "Unknown option: $1" >&2
+    show_help >&2
+    exit 2
+    ;;
+  esac
+  shift
+done
+
+if [[ ! $REPEAT =~ ^[0-9]+$ ]] || (( REPEAT < 1 )); then
+  echo "--repeat must be a positive integer" >&2
+  exit 2
+fi
+
+benchmark_cache=$(mktemp -d)
+thumbnail_cache=$(mktemp -d)
+stub_bin=$(mktemp -d)
+
+cleanup() {
+  rm -rf "$stub_bin"
+
+  if [[ $KEEP_CACHE == "true" ]]; then
+    printf 'Benchmark cache: %s\n' "$benchmark_cache"
+    printf 'Thumbnail cache: %s\n' "$thumbnail_cache"
+  else
+    rm -rf "$benchmark_cache" "$thumbnail_cache"
+  fi
+}
+trap cleanup EXIT
+
+cat >"$stub_bin/omarchy-menu-images" <<'EOF'
+#!/bin/bash
+exit 0
+EOF
+chmod +x "$stub_bin/omarchy-menu-images"
+
+benchmark_env=(
+  env
+  "XDG_CACHE_HOME=$benchmark_cache"
+  "PATH=$stub_bin:$OMARCHY_BIN_DIR:$PATH"
+)
+
+thumbnail_env=(
+  env
+  "XDG_CACHE_HOME=$thumbnail_cache"
+  "PATH=$stub_bin:$OMARCHY_BIN_DIR:$PATH"
+)
+
+preview_dir="$benchmark_cache/omarchy/theme-selector/previews"
+thumbnail_preview_dir="$thumbnail_cache/omarchy/theme-selector/previews"
+
+build_theme_index() {
+  "${benchmark_env[@]}" "$OMARCHY_BIN_DIR/omarchy-theme-switcher"
+}
+
+prepare_selector_lazy() {
+  "${benchmark_env[@]}" "$OMARCHY_BIN_DIR/omarchy-menu-images" --prepare-only --lazy-thumbnails --show-labels --filterable "$preview_dir"
+}
+
+prepare_image_cache() {
+  "${thumbnail_env[@]}" "$OMARCHY_BIN_DIR/omarchy-menu-images" --cache-only "$thumbnail_preview_dir"
+}
+
+printf 'Theme switcher benchmark (%d warm runs each)\n\n' "$REPEAT"
+printf '%-34s %s ms\n' "theme index cold" "$(format_ms "$(measure_once build_theme_index)")"
+run_case "theme index warm" build_theme_index
+printf '%-34s %s ms\n' "selector prep cold (lazy)" "$(format_ms "$(measure_once prepare_selector_lazy)")"
+run_case "selector prep warm (lazy)" prepare_selector_lazy
+"${thumbnail_env[@]}" "$OMARCHY_BIN_DIR/omarchy-theme-switcher" >/dev/null
+printf '%-34s %s ms\n' "thumbnail cache cold" "$(format_ms "$(measure_once prepare_image_cache)")"
+run_case "thumbnail cache warm" prepare_image_cache
+
+printf '\nTheme previews: %d\n' "$(find -L "$preview_dir" -maxdepth 1 -type f 2>/dev/null | wc -l)"
diff --git a/bin/omarchy-dev-bin-metadata b/bin/omarchy-dev-bin-metadata
index 99e87e86..a9e97214 100755
--- a/bin/omarchy-dev-bin-metadata
+++ b/bin/omarchy-dev-bin-metadata
@@ -61,7 +61,7 @@ Do not define:
   false flags or empty args
 
 Examples:
-  # omarchy:summary=Restart Walker and related user services
+  # omarchy:summary=Restart the shell
 
   # omarchy:summary=Take a screenshot
   # omarchy:group=capture
diff --git a/bin/omarchy-dev-install-ydoo b/bin/omarchy-dev-install-ydoo
new file mode 100755
index 00000000..91c4c502
--- /dev/null
+++ b/bin/omarchy-dev-install-ydoo
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# omarchy:summary=Install and enable ydotool mouse automation for Omarchy development
+# omarchy:requires-sudo=true
+
+set -euo pipefail
+
+RULE_FILE="/etc/udev/rules.d/80-uinput.rules"
+
+if ! getent group input >/dev/null; then
+  echo "omarchy-dev-install-ydoo: input group does not exist" >&2
+  exit 1
+fi
+
+if ! id -nG "$USER" | tr ' ' '\n' | grep -qx input; then
+  echo "Adding $USER to the input group. You may need to log out and back in before this applies."
+  pkexec usermod -aG input "$USER"
+fi
+
+if omarchy-cmd-missing ydotool || omarchy-pkg-missing ydotool; then
+  omarchy-pkg-add ydotool
+fi
+
+pkexec /bin/bash -c '
+set -euo pipefail
+
+cat >"'"$RULE_FILE"'" <<'"'"'EOF'"'"'
+KERNEL=="uinput", GROUP="input", MODE="0660", OPTIONS+="static_node=uinput"
+EOF
+
+modprobe uinput
+udevadm control --reload-rules
+udevadm trigger /dev/uinput 2>/dev/null || true
+
+if [[ -e /dev/uinput ]]; then
+  chgrp input /dev/uinput
+  chmod 0660 /dev/uinput
+fi
+'
+
+systemctl --user reset-failed ydotool.service >/dev/null 2>&1 || true
+systemctl --user start ydotool.service
+
+if ! systemctl --user is-active --quiet ydotool.service; then
+  echo "omarchy-dev-install-ydoo: ydotool.service did not start" >&2
+  systemctl --user status ydotool.service --no-pager >&2 || true
+  exit 1
+fi
+
+echo "ydotool is ready."
diff --git a/bin/omarchy-dev-link b/bin/omarchy-dev-link
new file mode 100755
index 00000000..3345e29d
--- /dev/null
+++ b/bin/omarchy-dev-link
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# omarchy:summary=Point Omarchy at a local checkout for live editing
+# omarchy:group=dev
+# omarchy:args=<path-to-checkout>
+# omarchy:examples=omarchy dev link ~/Work/omarchy/omarchy-installer
+
+set -euo pipefail
+
+# Sudo wipes HYPRLAND_INSTANCE_SIGNATURE, so the live-session refresh below
+# can't reach hyprctl. Run as user; we sudo internally for the conf write.
+if [[ $EUID -eq 0 ]]; then
+  echo "Error: run omarchy-dev-link as your user, not under sudo." >&2
+  exit 1
+fi
+
+if [[ $# -ne 1 || $1 == "-h" || $1 == "--help" ]]; then
+  cat <<USAGE
+Usage: omarchy dev link <path-to-checkout>
+
+Writes /etc/omarchy.conf so OMARCHY_PATH resolves to <path-to-checkout>
+in all new shells, the Hyprland session, and Quickshell. Restarts
+omarchy-shell and reloads hyprctl so changes take effect immediately.
+
+Affects only \$OMARCHY_PATH-resolved trees: bin/, default/, shell/,
+themes/, applications/, config/. Files installed at fixed system paths
+(/etc/, /usr/lib/systemd/, udev rule bodies, /etc/skel after user
+creation, /usr/share/plymouth) are NOT covered — for those, use
+omarchy-dev-pkg-test to build and install the package from the checkout.
+USAGE
+  exit 0
+fi
+
+target=$(realpath -e "$1" 2>/dev/null) || {
+  echo "Error: path does not exist: $1" >&2
+  exit 1
+}
+
+for required in bin default shell; do
+  if [[ ! -d "$target/$required" ]]; then
+    echo "Warning: $target/$required not found — does this look like an Omarchy source checkout?" >&2
+  fi
+done
+
+# Strip any previous dev-link's bin/ from PATH before adding the new one,
+# so repeated link calls don't accumulate stale entries.
+prior_target=""
+if [[ -f /etc/omarchy.conf ]]; then
+  prior_target=$(sed -n 's/^[[:space:]]*export[[:space:]]\+OMARCHY_PATH="\?\([^"]*\)"\?/\1/p' /etc/omarchy.conf | tail -1)
+fi
+
+echo "Pointing Omarchy at $target"
+printf 'export OMARCHY_PATH="%s"\n' "$target" | sudo tee /etc/omarchy.conf >/dev/null
+
+export OMARCHY_PATH="$target"
+if [[ -n $prior_target && $prior_target != "$target" ]]; then
+  PATH=$(printf '%s' "$PATH" | tr ':' '\n' | grep -vFx "$prior_target/bin" | paste -sd:)
+fi
+export PATH="$target/bin:$PATH"
+
+if command -v hyprctl >/dev/null 2>&1 && hyprctl version &>/dev/null; then
+  hyprctl setenv OMARCHY_PATH "$target" >/dev/null
+  hyprctl setenv PATH "$PATH" >/dev/null
+  echo "  Updated Hyprland session env."
+
+  systemctl --user import-environment OMARCHY_PATH PATH 2>/dev/null || true
+  echo "  Updated systemd --user env."
+
+  if pgrep -x quickshell >/dev/null 2>&1; then
+    omarchy-restart-shell
+    echo "  Restarted omarchy-shell."
+  fi
+
+  hyprctl reload >/dev/null
+  echo "  Reloaded Hyprland config."
+fi
+
+echo
+echo "Done. Open a new shell (or restart existing ones) to pick up the new"
+echo "OMARCHY_PATH. Run 'omarchy dev unlink' to restore the package install."
diff --git a/bin/omarchy-dev-pkg-test b/bin/omarchy-dev-pkg-test
new file mode 100755
index 00000000..514d56ed
--- /dev/null
+++ b/bin/omarchy-dev-pkg-test
@@ -0,0 +1,137 @@
+#!/bin/bash
+
+# omarchy:summary=Build and install an Omarchy package from a local checkout
+# omarchy:group=dev
+# omarchy:args=[package-name] [path-to-checkout]
+# omarchy:examples=omarchy dev pkg-test | omarchy dev pkg-test omarchy-dev ~/Work/omarchy/omarchy-installer
+
+set -euo pipefail
+
+if [[ ${1:-} == "-h" || ${1:-} == "--help" ]]; then
+  cat <<USAGE
+Usage: omarchy dev pkg-test [package-name] [path-to-checkout]
+
+Builds and installs an Omarchy package from a local Omarchy source
+checkout. Use when changes need to land at fixed system paths (/etc/,
+/usr/lib/systemd/, udev rule bodies, plymouth) that omarchy-dev-link
+can't shadow.
+
+Defaults:
+  packages          omarchy-settings-dev omarchy-dev
+  path-to-checkout  ~/Work/omarchy/omarchy-installer
+
+Examples:
+  omarchy dev pkg-test
+  omarchy dev pkg-test omarchy-settings-dev
+  omarchy dev pkg-test omarchy-dev ~/Work/omarchy/omarchy-installer
+
+The pkgver of the built package is tagged 'dev.<short-sha>[.dirty]' so
+'pacman -Q' makes it obvious where the installed version came from.
+
+PKGBUILDs are read from \${OMARCHY_PKGBUILDS_DIR:-~/Work/omarchy/omarchy-pkgs/pkgbuilds}/<package-name>/.
+USAGE
+  exit 0
+fi
+
+remove_pkgver_function() {
+  local pkgbuild="$1"
+  local tmp="$pkgbuild.tmp"
+
+  awk '
+    /^pkgver\(\)[[:space:]]*\{/ {
+      in_pkgver = 1
+      depth = 0
+    }
+    in_pkgver {
+      line = $0
+      opens = gsub(/\{/, "{", line)
+      line = $0
+      closes = gsub(/\}/, "}", line)
+      depth += opens - closes
+      if (depth <= 0) {
+        in_pkgver = 0
+      }
+      next
+    }
+    { print }
+  ' "$pkgbuild" >"$tmp"
+  mv "$tmp" "$pkgbuild"
+}
+
+dev_package_name() {
+  local pkg="$1"
+
+  case "$pkg" in
+    omarchy | omarchy-settings)
+      printf '%s-dev\n' "$pkg"
+      ;;
+    *)
+      printf '%s\n' "$pkg"
+      ;;
+  esac
+}
+
+if (( $# == 0 )); then
+  PKGS=(omarchy-settings-dev omarchy-dev)
+  CHECKOUT="$HOME/Work/omarchy/omarchy-installer"
+  MAKEPKG_ARGS=()
+else
+  PKGS=("$(dev_package_name "$1")")
+  CHECKOUT="${2:-$HOME/Work/omarchy/omarchy-installer}"
+  MAKEPKG_ARGS=("${@:3}")
+fi
+PKGBUILDS_ROOT="${OMARCHY_PKGBUILDS_DIR:-$HOME/Work/omarchy/omarchy-pkgs/pkgbuilds}"
+
+if [[ ! -d "$CHECKOUT" ]]; then
+  echo "Error: checkout not found at $CHECKOUT" >&2
+  exit 1
+fi
+for PKG in "${PKGS[@]}"; do
+  PKGBUILD_DIR="$PKGBUILDS_ROOT/$PKG"
+  if [[ ! -f "$PKGBUILD_DIR/PKGBUILD" ]]; then
+    echo "Error: PKGBUILD not found at $PKGBUILD_DIR/PKGBUILD" >&2
+    echo "       Pass a different package name as arg 1, or set OMARCHY_PKGBUILDS_DIR." >&2
+    exit 1
+  fi
+done
+
+build_dir=$(mktemp -d -t omarchy-dev-pkg-test.XXXXXX)
+trap 'rm -rf "$build_dir"' EXIT
+
+# pkgver=dev.<sha>[.dirty] so pacman -Q makes the source obvious.
+short_sha=$(git -C "$CHECKOUT" rev-parse --short HEAD 2>/dev/null || echo "local")
+dirty=""
+if [[ -d "$CHECKOUT/.git" ]] && [[ -n "$(git -C "$CHECKOUT" status --porcelain)" ]]; then
+  dirty=".dirty"
+fi
+new_pkgver="dev.${short_sha}${dirty}"
+
+for PKG in "${PKGS[@]}"; do
+  PKGBUILD_DIR="$PKGBUILDS_ROOT/$PKG"
+  package_build_dir="$build_dir/$PKG"
+  mkdir -p "$package_build_dir"
+  cp -a "$PKGBUILD_DIR/." "$package_build_dir/"
+
+  remove_pkgver_function "$package_build_dir/PKGBUILD"
+  sed -i "s/^pkgver=.*/pkgver=${new_pkgver}/" "$package_build_dir/PKGBUILD"
+
+  echo "Building $PKG ${new_pkgver} from $CHECKOUT"
+  echo "  build dir: $package_build_dir"
+  echo "  PKGBUILD : $PKGBUILD_DIR/PKGBUILD"
+  echo
+
+  (
+    cd "$package_build_dir"
+    OMARCHY_SRC="$CHECKOUT" makepkg -s --skipchecksums --noconfirm "${MAKEPKG_ARGS[@]}"
+  )
+
+  # Install separately so we can pass --overwrite='*' (makepkg -i can't).
+  # Dev builds frequently conflict with files left behind by previous
+  # script-installed Omarchy versions; the build is the authoritative state.
+  built_pkg=$(ls -t "$package_build_dir"/*.pkg.tar.* 2>/dev/null | grep -v '\.sig$' | head -1)
+  if [[ -z $built_pkg ]]; then
+    echo "Error: no built package found in $package_build_dir" >&2
+    exit 1
+  fi
+  sudo pacman -U --noconfirm --overwrite='*' "$built_pkg"
+done
diff --git a/bin/omarchy-dev-status b/bin/omarchy-dev-status
new file mode 100755
index 00000000..8cf621a9
--- /dev/null
+++ b/bin/omarchy-dev-status
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# omarchy:summary=Show the current Omarchy dev-link state
+# omarchy:group=dev
+
+default_target="/usr/share/omarchy"
+configured="$default_target"
+conf_present=0
+linked=0
+
+if [[ -f /etc/omarchy.conf ]]; then
+  conf_present=1
+  configured=$(
+    OMARCHY_PATH=
+    # shellcheck disable=SC1091
+    . /etc/omarchy.conf
+    printf '%s' "${OMARCHY_PATH:-<empty>}"
+  )
+  if [[ $configured != "$default_target" ]]; then
+    linked=1
+  fi
+fi
+
+if (( linked )); then
+  echo "dev-link: ACTIVE"
+  echo "  /etc/omarchy.conf -> OMARCHY_PATH=$configured"
+else
+  echo "dev-link: inactive"
+  if (( conf_present )); then
+    echo "  /etc/omarchy.conf -> OMARCHY_PATH=$configured (default guard)"
+  fi
+fi
+
+echo "  current shell:       OMARCHY_PATH=${OMARCHY_PATH:-<unset>}"
+
+if (( linked )) && [[ ${OMARCHY_PATH:-} != "$configured" ]]; then
+  echo
+  echo "Note: this shell predates dev-link. Open a new shell to pick up the change,"
+  echo "or 'export OMARCHY_PATH=$configured' to update just this shell."
+elif (( ! linked )) && [[ ${OMARCHY_PATH:-$default_target} != "$default_target" ]]; then
+  echo
+  echo "Note: no dev-link is configured, but this shell still has a stale OMARCHY_PATH."
+  echo "Open a new shell or run 'export OMARCHY_PATH=$default_target'."
+fi
+
+if command -v hyprctl >/dev/null 2>&1 && hyprctl version &>/dev/null; then
+  hypr_path=$(hyprctl getoption -j env 2>/dev/null | sed -n 's/.*OMARCHY_PATH=\([^"]*\).*/\1/p' | head -1)
+  if [[ -n "$hypr_path" ]]; then
+    echo "  hyprland session:   OMARCHY_PATH=$hypr_path"
+  fi
+fi
diff --git a/bin/omarchy-dev-ui-preview b/bin/omarchy-dev-ui-preview
new file mode 100755
index 00000000..17ed2579
--- /dev/null
+++ b/bin/omarchy-dev-ui-preview
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# omarchy:summary=Open the omarchy-shell dev gallery (qs.Ui kit preview)
+# omarchy:args=[section]
+# omarchy:examples=omarchy dev ui-preview | omarchy dev ui-preview button | omarchy dev ui-preview button-group | omarchy dev ui-preview slider
+#
+# Pass a section name to jump straight to that component instead of
+# scrolling from the top. Section names match the cursor section ids in
+# shell/plugins/dev-gallery/GalleryPanel.qml — `button`, `button-group`,
+# `cursor-surface`, `slider`, `toggle`, `dropdown`, etc. Unknown names
+# are ignored and the gallery opens at its normal default position.
+
+if (( $# > 0 )) && [[ -n $1 ]]; then
+  section="$1"
+  payload=$(printf '{"section":"%s"}' "${section//\"/}")
+else
+  payload='{}'
+fi
+
+omarchy-shell shell summon omarchy.dev-gallery "$payload"
diff --git a/bin/omarchy-dev-unlink b/bin/omarchy-dev-unlink
new file mode 100755
index 00000000..15f5783a
--- /dev/null
+++ b/bin/omarchy-dev-unlink
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# omarchy:summary=Restore Omarchy to the package install (undo omarchy-dev-link)
+# omarchy:group=dev
+
+set -euo pipefail
+
+if [[ $EUID -eq 0 ]]; then
+  echo "Error: run omarchy-dev-unlink as your user, not under sudo." >&2
+  exit 1
+fi
+
+if [[ ${1:-} == "-h" || ${1:-} == "--help" ]]; then
+  cat <<USAGE
+Usage: omarchy dev unlink
+
+Writes /etc/omarchy.conf defensively so OMARCHY_PATH resolves to
+/usr/share/omarchy (the package install), even from stale session env.
+Updates Hyprland/systemd session env and restarts omarchy-shell so live
+state matches.
+USAGE
+  exit 0
+fi
+
+default_target="/usr/share/omarchy"
+linked=0
+prior_target=""
+
+if [[ -f /etc/omarchy.conf ]]; then
+  # Capture the path dev-link wrote BEFORE we reset the conf, so we know
+  # which bin/ to strip from PATH.
+  prior_target=$(sed -n 's/^[[:space:]]*export[[:space:]]\+OMARCHY_PATH="\?\([^"]*\)"\?/\1/p' /etc/omarchy.conf | tail -1)
+  if [[ $prior_target != "$default_target" ]]; then
+    linked=1
+    echo "Unlinking Omarchy from ${prior_target:-<empty>}"
+  else
+    echo "/etc/omarchy.conf already points at $default_target."
+  fi
+elif [[ ${OMARCHY_PATH:-$default_target} != "$default_target" ]]; then
+  prior_target="$OMARCHY_PATH"
+  echo "Not currently linked: /etc/omarchy.conf is absent."
+  echo "This shell still has OMARCHY_PATH=$OMARCHY_PATH; writing the default guard."
+else
+  echo "Not currently linked. Writing the default OMARCHY_PATH guard."
+fi
+
+printf 'export OMARCHY_PATH="%s"\n' "$default_target" | sudo tee /etc/omarchy.conf >/dev/null
+echo "Set /etc/omarchy.conf -> OMARCHY_PATH=$default_target"
+
+export OMARCHY_PATH="$default_target"
+if [[ -n $prior_target && $prior_target != "$default_target" ]]; then
+  PATH=$(printf '%s' "$PATH" | tr ':' '\n' | awk -v drop="$prior_target/bin" '$0 != drop' | paste -sd:)
+  export PATH
+fi
+
+if command -v systemctl >/dev/null 2>&1; then
+  if systemctl --user import-environment OMARCHY_PATH PATH 2>/dev/null; then
+    echo "  Updated systemd --user env."
+  fi
+fi
+
+if command -v hyprctl >/dev/null 2>&1 && hyprctl version &>/dev/null; then
+  hyprctl setenv OMARCHY_PATH "$default_target" >/dev/null
+  hyprctl setenv PATH "$PATH" >/dev/null
+  echo "  Updated Hyprland session env."
+
+  if pgrep -x quickshell >/dev/null 2>&1; then
+    omarchy-restart-shell
+    echo "  Restarted omarchy-shell."
+  fi
+
+  hyprctl reload >/dev/null
+  echo "  Reloaded Hyprland config."
+fi
+
+echo
+if (( linked )) || [[ -n $prior_target ]]; then
+  echo "Done. Existing shells still have the old OMARCHY_PATH until restarted."
+  echo "For this shell, run: export OMARCHY_PATH=$default_target"
+else
+  echo "Done."
+fi
diff --git a/bin/omarchy-dns b/bin/omarchy-dns
new file mode 100755
index 00000000..928743bf
--- /dev/null
+++ b/bin/omarchy-dns
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+# omarchy:summary=Show or configure the system DNS provider
+# omarchy:args=[Cloudflare|Google|DHCP|Custom]
+# omarchy:examples=omarchy dns | omarchy dns Cloudflare | omarchy dns Custom
+
+set -euo pipefail
+
+current_dns_provider() {
+  local dns=""
+  local compact=""
+
+  dns=$(awk -F= '
+    /^[[:space:]]*#/ { next }
+    /^[[:space:]]*DNS[[:space:]]*=/ {
+      value=$0
+      sub(/^[^=]*=/, "", value)
+      print value
+      exit
+    }
+  ' /etc/systemd/resolved.conf 2>/dev/null || true)
+
+  compact=$(printf '%s' "$dns" | tr -d '[:space:]')
+
+  if [[ -z $compact ]]; then
+    echo "DHCP"
+  elif [[ $dns == *"cloudflare-dns.com"* || $dns == *"1.1.1.1"* || $dns == *"2606:4700:4700::1111"* ]]; then
+    echo "Cloudflare"
+  elif [[ $dns == *"dns.google"* || $dns == *"8.8.8.8"* || $dns == *"2001:4860:4860::8888"* ]]; then
+    echo "Google"
+  else
+    echo "Custom"
+  fi
+}
+
+require_root() {
+  if (( EUID != 0 )); then
+    exec pkexec omarchy-dns "$@"
+  fi
+}
+
+lock_dns_to_resolved() {
+  local file=""
+
+  for file in /etc/systemd/network/*.network; do
+    [[ -f $file ]] || continue
+    if ! grep -q "^\[DHCPv4\]" "$file"; then continue; fi
+
+    if ! sed -n '/^\[DHCPv4\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
+      sed -i '/^\[DHCPv4\]/a UseDNS=no' "$file"
+    fi
+
+    if grep -q "^\[IPv6AcceptRA\]" "$file" && ! sed -n '/^\[IPv6AcceptRA\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
+      sed -i '/^\[IPv6AcceptRA\]/a UseDNS=no' "$file"
+    fi
+  done
+}
+
+unlock_dns_to_dhcp() {
+  local file=""
+
+  for file in /etc/systemd/network/*.network; do
+    [[ -f $file ]] || continue
+    sed -i '/^\[DHCPv4\]/{n;/^UseDNS=no$/d}' "$file"
+    sed -i '/^\[IPv6AcceptRA\]/{n;/^UseDNS=no$/d}' "$file"
+  done
+}
+
+if (( $# == 0 )); then
+  current_dns_provider
+  exit 0
+fi
+
+provider="$1"
+
+case "$provider" in
+Cloudflare)
+  require_root "$provider"
+  tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
+[Resolve]
+DNS=1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com 2606:4700:4700::1111#cloudflare-dns.com 2606:4700:4700::1001#cloudflare-dns.com
+FallbackDNS=9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
+DNSOverTLS=opportunistic
+EOF
+  lock_dns_to_resolved
+  ;;
+
+Google)
+  require_root "$provider"
+  tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
+[Resolve]
+DNS=8.8.8.8#dns.google 8.8.4.4#dns.google 2001:4860:4860::8888#dns.google 2001:4860:4860::8844#dns.google
+FallbackDNS=9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
+DNSOverTLS=opportunistic
+EOF
+  lock_dns_to_resolved
+  ;;
+
+DHCP)
+  require_root "$provider"
+  tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
+[Resolve]
+DNSOverTLS=no
+EOF
+  unlock_dns_to_dhcp
+  ;;
+
+Custom)
+  require_root "$provider"
+  echo "Enter your DNS servers (space-separated, e.g. '192.168.1.1 1.1.1.1'):"
+  if ! read -r dns_servers; then
+    dns_servers=""
+  fi
+
+  if [[ -z $dns_servers ]]; then
+    echo "Error: No DNS servers provided." >&2
+    exit 1
+  fi
+
+  tee /etc/systemd/resolved.conf >/dev/null <<EOF
+[Resolve]
+DNS=$dns_servers
+FallbackDNS=9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
+EOF
+  lock_dns_to_resolved
+  ;;
+*)
+  echo "Usage: omarchy-dns [Cloudflare|Google|DHCP|Custom]" >&2
+  exit 1
+  ;;
+esac
+
+systemctl restart systemd-networkd systemd-resolved
diff --git a/bin/omarchy-finalize-user b/bin/omarchy-finalize-user
new file mode 100755
index 00000000..1775c3f2
--- /dev/null
+++ b/bin/omarchy-finalize-user
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+# omarchy:summary=Finalize Omarchy user setup (runtime tweaks /etc/skel can't do)
+# omarchy:group=finalize
+# omarchy:examples=omarchy finalize user | omarchy finalize user --force
+
+set -euo pipefail
+
+usage() {
+  cat <<USAGE
+Usage: omarchy finalize user [--force] [--first-install]
+
+Runs the per-user setup steps that /etc/skel can't seed:
+dev-aware skill symlinks, xdg-user-dirs + gtk bookmarks (need \$HOME),
+vconsole→hypr keyboard sync, default browser/mailto, and install/user/all.sh.
+
+For shipped configs see /etc/skel (new users) and omarchy-reinstall-configs
+(existing users explicitly resyncing).
+
+--first-install is used by the ISO in the target chroot. It marks shipped
+user migrations complete for the freshly-created user.
+
+Idempotency marker: ~/.local/state/omarchy/finalize-user.done
+USAGE
+}
+
+if (( EUID == 0 )); then
+  echo "Error: run omarchy-finalize-user as the user being configured, not as root." >&2
+  exit 1
+fi
+
+force=0
+first_install=0
+while (($#)); do
+  case "$1" in
+    --force)
+      force=1
+      shift
+      ;;
+    --first-install)
+      first_install=1
+      force=1
+      shift
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unknown option: $1" >&2
+      usage >&2
+      exit 1
+      ;;
+  esac
+done
+
+state_dir="$HOME/.local/state/omarchy"
+marker="$state_dir/finalize-user.done"
+mkdir -p "$state_dir"
+
+if [[ -f $marker && $force -eq 0 ]]; then
+  echo "User finalization already complete (rerun with --force to refresh)."
+  exit 0
+fi
+
+export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
+export OMARCHY_INSTALL="${OMARCHY_INSTALL:-$OMARCHY_PATH/install}"
+export OMARCHY_SETUP_CONTEXT="${OMARCHY_SETUP_CONTEXT:-runtime}"
+export PATH="$OMARCHY_PATH/bin:$PATH"
+
+if (( first_install )); then
+  export OMARCHY_SETUP_CONTEXT=iso-chroot
+fi
+
+if [[ -n ${OMARCHY_INSTALL_LOG_FILE:-} && -f $OMARCHY_INSTALL/helpers/logging.sh ]]; then
+  source "$OMARCHY_INSTALL/helpers/logging.sh"
+else
+  run_logged() {
+    local script="$1"
+    bash -eE -c 'source "$1"' bash "$script"
+  }
+fi
+
+# Dev-aware skill symlinks. Cannot live in /etc/skel because OMARCHY_PATH may
+# point at a dev checkout (omarchy dev link) where the target differs.
+mkdir -p ~/.agents/skills ~/.claude/skills ~/.codex/skills ~/.pi/agent/skills
+ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.agents/skills/omarchy
+ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.claude/skills/omarchy
+ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.codex/skills/omarchy
+ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.pi/agent/skills/omarchy
+
+mkdir -p ~/Downloads ~/Pictures ~/Videos ~/.config/gtk-3.0
+xdg-user-dirs-update --set TEMPLATES "$HOME"
+xdg-user-dirs-update --set PUBLICSHARE "$HOME"
+xdg-user-dirs-update --set DESKTOP "$HOME"
+rmdir ~/Templates ~/Public ~/Desktop 2>/dev/null || true
+touch ~/.config/gtk-3.0/bookmarks
+for dir in Downloads Projects Pictures Videos; do
+  bookmark="file://$HOME/$dir $dir"
+  grep -qxF "$bookmark" ~/.config/gtk-3.0/bookmarks || echo "$bookmark" >>~/.config/gtk-3.0/bookmarks
+done
+
+conf=/etc/vconsole.conf
+hyprlua="$HOME/.config/hypr/input.lua"
+if [[ -f $conf && -f $hyprlua ]]; then
+  sed -i '/^[[:space:]]*kb_layout[[:space:]]*=/d' "$hyprlua"
+  sed -i '/^[[:space:]]*kb_variant[[:space:]]*=/d' "$hyprlua"
+
+  if grep -q '^XKBLAYOUT=' "$conf"; then
+    layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
+    sed -i "/^[[:space:]]*kb_options *=/i\    kb_layout = \"$layout\"," "$hyprlua"
+  fi
+  if grep -q '^XKBVARIANT=' "$conf"; then
+    variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
+    sed -i "/^[[:space:]]*kb_options *=/i\    kb_variant = \"$variant\"," "$hyprlua"
+  fi
+fi
+
+source "$OMARCHY_INSTALL/user/all.sh"
+
+omarchy-refresh-applications
+xdg-settings set default-web-browser chromium.desktop
+xdg-mime default HEY.desktop x-scheme-handler/mailto
+
+if (( first_install )); then
+  mkdir -p "$state_dir/migrations/user"
+  for migration in "$OMARCHY_PATH"/migrations/user/*.sh; do
+    [[ -f $migration ]] && touch "$state_dir/migrations/user/$(basename "$migration")"
+  done
+fi
+
+touch "$marker"
+echo "User finalization complete."
diff --git a/bin/omarchy-first-run b/bin/omarchy-first-run
index 023d1a65..6f719d53 100755
--- a/bin/omarchy-first-run
+++ b/bin/omarchy-first-run
@@ -1,27 +1,135 @@
 #!/bin/bash
 
-# omarchy:summary=Finish the installation of Omarchy with items that can only be done after logging in.
-# omarchy:requires-sudo=true
+# omarchy:summary=Finish first-login setup for Omarchy.
+# omarchy:args=[--force]
 
 set -e
 
-FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode
+usage() {
+  cat <<USAGE
+Usage: omarchy-first-run [--force]
 
-if [[ -f $FIRST_RUN_MODE ]]; then
-  rm -f "$FIRST_RUN_MODE"
+Run first-login user setup and notification hooks. By default this only runs
+once per user. Use --force to rerun the full sequence and refresh user setup.
+USAGE
+}
 
-  bash "$OMARCHY_PATH/install/first-run/battery-monitor.sh"
-  bash "$OMARCHY_PATH/install/first-run/recover-internal-monitor.sh"
-  bash "$OMARCHY_PATH/install/first-run/cleanup-reboot-sudoers.sh"
-  bash "$OMARCHY_PATH/install/first-run/firewall.sh"
-  bash "$OMARCHY_PATH/install/first-run/dns-resolver.sh"
-  bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
-  bash "$OMARCHY_PATH/install/first-run/swayosd.sh"
-  bash "$OMARCHY_PATH/install/first-run/gtk-primary-paste.sh"
-  bash "$OMARCHY_PATH/install/first-run/elephant.sh"
-  omarchy-hook-install post-update "$OMARCHY_PATH/install/first-run/install-voxtype.hook"
-  sudo rm -f /etc/sudoers.d/first-run
+force=0
+finalize_user_args=()
+while (($#)); do
+  case "$1" in
+    --force)
+      force=1
+      finalize_user_args+=(--force)
+      shift
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unknown option: $1" >&2
+      usage >&2
+      exit 1
+      ;;
+  esac
+done
 
-  bash "$OMARCHY_PATH/install/first-run/welcome.sh"
-  bash "$OMARCHY_PATH/install/first-run/wifi.sh"
+omarchy-finalize-user "${finalize_user_args[@]}" || true
+
+state_dir=~/.local/state/omarchy
+mkdir -p "$state_dir"
+
+FIRST_RUN_LOG="$state_dir/first-run.log"
+first_run_failed=0
+
+log_first_run() {
+  printf '[%s] %s\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$*" >>"$FIRST_RUN_LOG"
+}
+
+notification_server_ready() {
+  if command -v gdbus >/dev/null 2>&1; then
+    gdbus call --session \
+      --dest org.freedesktop.Notifications \
+      --object-path /org/freedesktop/Notifications \
+      --method org.freedesktop.Notifications.GetServerInformation >/dev/null 2>&1
+  elif command -v busctl >/dev/null 2>&1; then
+    busctl --user call \
+      org.freedesktop.Notifications \
+      /org/freedesktop/Notifications \
+      org.freedesktop.Notifications \
+      GetServerInformation >/dev/null 2>&1
+  else
+    return 0
+  fi
+}
+
+wait_for_notifications() {
+  command -v omarchy-shell >/dev/null || return 0
+
+  for _ in {1..100}; do
+    if omarchy-shell notifications ping >/dev/null 2>&1 && notification_server_ready; then
+      return 0
+    fi
+    sleep 0.1
+  done
+
+  log_first_run "Timed out waiting for notification service; continuing"
+  return 0
+}
+
+run_first_run_step() {
+  local name="$1"
+  shift
+
+  log_first_run "Starting: $name"
+  if "$@"; then
+    log_first_run "Completed: $name"
+  else
+    local status=$?
+    first_run_failed=1
+    log_first_run "Failed: $name (exit code: $status)"
+  fi
+}
+
+wait_for_notifications
+
+MIGRATION_NOTIFY_WATCH_MARKER="$state_dir/user-migration-notify-watch-enabled"
+if [[ ! -f $MIGRATION_NOTIFY_WATCH_MARKER || $force -eq 1 ]]; then
+  if systemctl --user enable --now omarchy-update-user-notify.path >/dev/null 2>&1; then
+    touch "$MIGRATION_NOTIFY_WATCH_MARKER"
+  fi
+fi
+
+run_first_run_step "notify about pending user migrations" omarchy-migrate-notify
+
+USER_MARKER="$state_dir/first-run-user.done"
+if [[ ! -f $USER_MARKER || $force -eq 1 ]]; then
+  run_first_run_step "install Voxtype post-update hook" \
+    omarchy-hook-install post-update "$OMARCHY_PATH/install/user/first-run/install-voxtype.hook"
+
+  run_first_run_step "enable user systemd units" \
+    bash "$OMARCHY_PATH/install/user/first-run/enable-user-units.sh"
+  run_first_run_step "set GNOME theme" \
+    bash "$OMARCHY_PATH/install/user/first-run/gnome-theme.sh"
+  run_first_run_step "set GTK primary paste" \
+    bash "$OMARCHY_PATH/install/user/first-run/gtk-primary-paste.sh"
+
+  wait_for_notifications
+  run_first_run_step "show welcome notification" \
+    bash "$OMARCHY_PATH/install/user/first-run/welcome.sh"
+  # The first-run notification scripts register action callbacks in background
+  # notify-send processes. Give the notification server a tick to ingest the
+  # welcome toast before queueing the Wi-Fi/update toasts.
+  sleep 0.3
+  run_first_run_step "show Wi-Fi/update notifications" \
+    bash "$OMARCHY_PATH/install/user/first-run/wifi.sh"
+
+  if (( first_run_failed == 0 )); then
+    touch "$USER_MARKER"
+  else
+    log_first_run "One or more first-run steps failed; first-run will retry next login"
+  fi
+else
+  echo "First-run already complete (rerun with --force to refresh)."
 fi
diff --git a/bin/omarchy-font-current b/bin/omarchy-font-current
index ead8c3a3..839bd4db 100755
--- a/bin/omarchy-font-current
+++ b/bin/omarchy-font-current
@@ -3,4 +3,7 @@
 # omarchy:summary=Show current monospace font
 # omarchy:examples=omarchy font current
 
-grep -oP 'font-family:\s*["'\'']?\K[^;"'\'']+' ~/.config/waybar/style.css | head -n1
+# fontconfig is the source of truth. fc-match returns a comma-separated
+# alias list (e.g. "JetBrainsMono Nerd Font,JetBrainsMono NF") so take
+# the first entry.
+fc-match monospace -f '%{family}\n' | head -n1 | cut -d, -f1
diff --git a/bin/omarchy-font-set b/bin/omarchy-font-set
index 44bb9833..59c22ca5 100755
--- a/bin/omarchy-font-set
+++ b/bin/omarchy-font-set
@@ -4,52 +4,87 @@
 # omarchy:args=<font-name>
 # omarchy:examples=omarchy font list | omarchy font set "CaskaydiaMono Nerd Font"
 
-font_name="$1"
+usage() {
+  echo "Usage: omarchy-font-set <font-name>"
+}
 
-if [[ -n $font_name ]]; then
-  if fc-list | grep -iq "$font_name"; then
-    if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
-      sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
-    fi
+font_name="${1:-}"
+omarchy_root="${OMARCHY_PATH:-/usr/share/omarchy}"
 
-    if [[ -f ~/.config/kitty/kitty.conf ]]; then
-      sed -i "s/^font_family .*/font_family $font_name/g" ~/.config/kitty/kitty.conf
-      pkill -USR1 kitty
-    fi
+case "$font_name" in
+  -h|--help)
+    usage
+    exit 0
+    ;;
+  "")
+    usage >&2
+    exit 1
+    ;;
+esac
 
-    if [[ -f ~/.config/ghostty/config ]]; then
-      sed -i "s/font-family = \".*\"/font-family = \"$font_name\"/g" ~/.config/ghostty/config
-      pkill -SIGUSR2 ghostty
-    fi
+if ! fc-list | grep -Fqi -- "$font_name"; then
+  echo "Font '$font_name' not found."
+  exit 1
+fi
 
-    if [[ -f ~/.config/foot/foot.ini ]]; then
-      sed -i "s/^font=.*/font=$font_name:size=9/g" ~/.config/foot/foot.ini
-    fi
+if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
+  sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
+fi
 
-    sed -i "s/font_family = .*/font_family = $font_name/g" ~/.config/hypr/hyprlock.conf
-    sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
-    sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
-    xmlstarlet ed -L \
-      -u '//match[@target="pattern"][test/string="monospace"]/edit[@name="family"]/string' \
-      -v "$font_name" \
-      ~/.config/fontconfig/fonts.conf
+if [[ -f ~/.config/kitty/kitty.conf ]]; then
+  sed -i "s/^font_family .*/font_family $font_name/g" ~/.config/kitty/kitty.conf
+  pkill -USR1 kitty
+fi
 
-    omarchy-restart-waybar
-    omarchy-restart-swayosd
+if [[ -f ~/.config/ghostty/config ]]; then
+  sed -i "s/font-family = \".*\"/font-family = \"$font_name\"/g" ~/.config/ghostty/config
+  pkill -SIGUSR2 ghostty
+fi
 
-    if pgrep -x ghostty; then
-      notify-send -u low "    You must restart Ghostty to see font change"
-    fi
+if [[ -f ~/.config/foot/foot.ini ]]; then
+  sed -i "s/^font=.*/font=$font_name:size=9/g" ~/.config/foot/foot.ini
+fi
 
-    if pgrep -x foot; then
-      notify-send -u low "    You must restart Foot to see font change"
-    fi
-
-    omarchy-hook font-set "$font_name"
-  else
-    echo "Font '$font_name' not found."
+# fontconfig is the canonical source of truth — the omarchy shell, Qt apps,
+# and anything resolving "monospace" all read from here. The shipped default
+# is package-owned; create a user override only when the user changes fonts.
+fontconfig_file="$HOME/.config/fontconfig/fonts.conf"
+if [[ ! -f $fontconfig_file ]]; then
+  fontconfig_default="$omarchy_root/default/fontconfig/conf.avail/50-omarchy.conf"
+  if [[ ! -f $fontconfig_default ]]; then
+    echo "Default fontconfig file not found: $fontconfig_default" >&2
     exit 1
   fi
-else
-  echo "Usage: omarchy-font-set <font-name>"
+  mkdir -p "$(dirname "$fontconfig_file")"
+  cp "$fontconfig_default" "$fontconfig_file"
 fi
+
+# We own the markup in 50-omarchy.conf, so the monospace block is predictable:
+# the <string>FAMILY</string> immediately after <string>monospace</string> is
+# the family we're replacing.
+tmp=$(mktemp)
+if ! awk -v new_font="$font_name" '
+  in_mono && /<string>[^<]*<\/string>/ {
+    sub(/<string>[^<]*<\/string>/, "<string>" new_font "</string>")
+    in_mono = 0
+  }
+  /<string>monospace<\/string>/ { in_mono = 1 }
+  { print }
+' "$fontconfig_file" >"$tmp"; then
+  rm -f "$tmp"
+  echo "Failed to update $fontconfig_file" >&2
+  exit 1
+fi
+mv "$tmp" "$fontconfig_file"
+
+omarchy-restart-shell
+
+if pgrep -x ghostty; then
+  omarchy-notification-send -g  "You must restart Ghostty to see font change"
+fi
+
+if pgrep -x foot; then
+  omarchy-notification-send -g  "You must restart Foot to see font change"
+fi
+
+omarchy-hook font-set "$font_name"
diff --git a/bin/omarchy-games-retro-cores b/bin/omarchy-games-retro-cores
new file mode 100755
index 00000000..a81e9bb0
--- /dev/null
+++ b/bin/omarchy-games-retro-cores
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# omarchy:summary=List installed RetroArch core names
+
+set -e
+
+core_dir="/usr/lib/libretro"
+preferred_cores=(
+  "Amstrad CPC|cap32"
+  "Arcade FBNeo|fbneo"
+  "Arcade MAME|mame"
+  "Commodore Amiga|puae"
+  "Commodore C128|vice_x128"
+  "Commodore C64|vice_x64"
+  "Commodore VIC-20|vice_xvic"
+  "Nintendo DS|desmume"
+  "Nintendo Game Boy / Color|gambatte"
+  "Nintendo Game Boy Advance|mgba"
+  "Nintendo GameCube / Wii|dolphin"
+  "Nintendo NES / Famicom|mesen"
+  "Nintendo 64|parallel_n64"
+  "Nintendo SNES / SFC|snes9x"
+  "NEC PC Engine / TurboGrafx-16|mednafen_pce_fast"
+  "NEC PC Engine CD / TurboGrafx-CD|mednafen_pce"
+  "NEC PC Engine SuperGrafx|mednafen_supergrafx"
+  "Sega Dreamcast|flycast"
+  "Sega Mega Drive / Master System / Game Gear|genesis_plus_gx"
+  "Sega Saturn|kronos"
+  "Sony PlayStation|mednafen_psx_hw"
+  "Sony PlayStation Portable|ppsspp"
+)
+
+[[ -d $core_dir ]] || exit 0
+
+for preferred_core in "${preferred_cores[@]}"; do
+  label="${preferred_core%%|*}"
+  core="${preferred_core#*|}"
+  [[ -f $core_dir/${core}_libretro.so ]] && printf '%s (%s)\n' "$label" "$core"
+done
diff --git a/bin/omarchy-games-retro-install b/bin/omarchy-games-retro-install
new file mode 100755
index 00000000..9b30bb74
--- /dev/null
+++ b/bin/omarchy-games-retro-install
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# omarchy:summary=Create a desktop launcher for a RetroArch game
+# omarchy:args=[core path-to-game]
+# omarchy:examples=omarchy games retro install snes9x ~/Games/roms/snes/game.sfc | omarchy-games-retro-install /usr/lib/libretro/mgba_libretro.so ~/Games/roms/gba/game.gba
+
+set -e
+
+if (( $# == 0 )); then
+  mapfile -t cores < <(omarchy-games-retro-cores)
+
+  if (( ${#cores[@]} == 0 )); then
+    omarchy-notification-send -g 󰯉 "No RetroArch cores found" "/usr/lib/libretro"
+    exit 1
+  fi
+
+  core=$(omarchy-menu-select "RetroArch core" "${cores[@]}") || exit 0
+  [[ -n $core ]] || exit 0
+  core="${core##*(}"
+  core="${core%)}"
+
+  game_path=$(omarchy-menu-file "Retro game" "$HOME/Games/roms" "7z bin ccd chd cue dmg elf fds gb gba gbc iso lha m3u md n64 nds nes pbp sfc smc swc zip z64") || exit 0
+  [[ -n $game_path ]] || exit 0
+elif (( $# == 2 )); then
+  core="$1"
+  game_path="$2"
+else
+  echo "Usage: omarchy-games-retro-install [core path-to-game]"
+  echo "Example: omarchy-games-retro-install snes9x ~/Games/roms/snes/game.sfc"
+  exit 1
+fi
+
+if [[ ! -f $game_path ]]; then
+  echo "Game not found: $game_path"
+  exit 1
+fi
+
+if [[ $core == */* ]]; then
+  core_path="$core"
+else
+  core_path="/usr/lib/libretro/${core}_libretro.so"
+fi
+
+if [[ ! -f $core_path ]]; then
+  echo "Core not found: $core_path"
+  exit 1
+fi
+
+game_name=$(printf '%s' "${game_path##*/}" | sed 's/\.[^.]*$//; s/[[:space:]]*([^)]*)//g; s/[[:space:]]\+/ /g; s/^ //; s/ $//' | perl -Mopen=locale -pe 's/(^|[[:space:]])([^[:space:]])/$1\U$2/g')
+desktop_name="$game_name"
+desktop_id=$(printf '%s' "$desktop_name" | tr '[:upper:]' '[:lower:]' | tr -cs '[:alnum:]' '-' | sed 's/^-//; s/-$//')
+desktop_dir="$HOME/.local/share/applications"
+desktop_file="$desktop_dir/$desktop_id.desktop"
+mkdir -p "$desktop_dir"
+
+cat >"$desktop_file" <<EOF
+[Desktop Entry]
+Version=1.0
+Name=$desktop_name
+Comment=Play $game_name with RetroArch
+Exec=retroarch -L "$core_path" "$game_path"
+Terminal=false
+Type=Application
+Icon=retro-gaming
+StartupNotify=true
+Categories=Game;Emulator;
+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"
diff --git a/bin/omarchy-hibernation-remove b/bin/omarchy-hibernation-remove
index 49bad5bd..f06396b5 100755
--- a/bin/omarchy-hibernation-remove
+++ b/bin/omarchy-hibernation-remove
@@ -44,11 +44,6 @@ if grep -Fq "$SWAP_FILE" /etc/fstab; then
   sudo sed -i '/^# Btrfs swapfile for system hibernation$/d' /etc/fstab
 fi
 
-# Remove suspend-then-hibernate configuration
-echo "Removing suspend-then-hibernate configuration"
-sudo rm -f /etc/systemd/logind.conf.d/lid.conf
-sudo rm -f /etc/systemd/sleep.conf.d/hibernate.conf
-
 # Remove mkinitcpio resume hook
 echo "Removing resume hook"
 sudo rm "$MKINITCPIO_CONF"
diff --git a/bin/omarchy-hibernation-setup b/bin/omarchy-hibernation-setup
index d8e32c94..775c4e2c 100755
--- a/bin/omarchy-hibernation-setup
+++ b/bin/omarchy-hibernation-setup
@@ -38,8 +38,9 @@ if [[ -f $MKINITCPIO_CONF ]] && grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF";
     if [[ -n $RESUME_OFFSET ]]; then
       echo "Fixing empty resume_offset ($RESUME_OFFSET)"
       sudo sed -i "s/resume_offset=\"$/resume_offset=$RESUME_OFFSET\"/" "$RESUME_DROP_IN"
-      sudo sed -i "s/resume_offset=\"$/resume_offset=$RESUME_OFFSET\"/" /etc/default/limine
-      $NO_REBUILD || sudo limine-mkinitcpio
+      if ! $NO_REBUILD; then
+        sudo limine-mkinitcpio
+      fi
     fi
   fi
   echo "Hibernation is already set up"
@@ -100,7 +101,6 @@ if [[ ! -f $RESUME_DROP_IN ]]; then
   if [[ -n $RESUME_OFFSET ]]; then
     sudo mkdir -p /etc/limine-entry-tool.d
     echo "KERNEL_CMDLINE[default]+=\" resume=$RESUME_DEVICE resume_offset=$RESUME_OFFSET\"" | sudo tee "$RESUME_DROP_IN" >/dev/null
-    sudo tee -a /etc/default/limine < "$RESUME_DROP_IN" >/dev/null
   else
     echo "Warning: Could not determine resume offset for $SWAP_FILE" >&2
   fi
@@ -113,7 +113,6 @@ if grep -q "\[s2idle\]" /sys/power/mem_sleep 2>/dev/null; then
     echo "Enabling ACPI RTC alarm for s2idle suspend"
     sudo mkdir -p /etc/limine-entry-tool.d
     echo 'KERNEL_CMDLINE[default]+=" rtc_cmos.use_acpi_alarm=1"' | sudo tee "$LIMINE_DROP_IN" >/dev/null
-    sudo tee -a /etc/default/limine < "$LIMINE_DROP_IN" >/dev/null
   fi
 fi
 
diff --git a/bin/omarchy-hw-display b/bin/omarchy-hw-display
new file mode 100755
index 00000000..dcab14ac
--- /dev/null
+++ b/bin/omarchy-hw-display
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# omarchy:summary=Print the most likely display backlight device.
+# omarchy:examples=omarchy-hw-display
+
+# Start with the first possible output, then refine to the most likely given an order heuristic.
+device="$(ls -1 /sys/class/backlight 2>/dev/null | head -n1)"
+for candidate in amdgpu_bl* intel_backlight acpi_video*; do
+  if [[ -e /sys/class/backlight/$candidate ]]; then
+    device="$candidate"
+    break
+  fi
+done
+
+if [[ -n $device ]]; then
+  printf '%s\n' "$device"
+else
+  exit 1
+fi
diff --git a/bin/omarchy-hw-external-monitors b/bin/omarchy-hw-external-monitors
index 08ab52ff..3a5a837f 100755
--- a/bin/omarchy-hw-external-monitors
+++ b/bin/omarchy-hw-external-monitors
@@ -3,7 +3,7 @@
 # omarchy:summary=Returns true when an external monitor is physically connected.
 
 for status in /sys/class/drm/card*-*/status; do
-  [[ "$status" == *-eDP-*/status ]] && continue
-  [[ "$(<"$status")" == "connected" ]] && exit 0
+  [[ $status == *-eDP-*/status ]] && continue
+  [[ $(< $status) == "connected" ]] && exit 0
 done
 exit 1
diff --git a/bin/omarchy-hw-nvidia b/bin/omarchy-hw-nvidia
new file mode 100644
index 00000000..b50ca6e4
--- /dev/null
+++ b/bin/omarchy-hw-nvidia
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Detect whether the computer has an NVIDIA GPU.
+
+lspci | grep -qi 'nvidia' &>/dev/null
diff --git a/bin/omarchy-hw-recover-internal-monitor b/bin/omarchy-hw-recover-internal-monitor
index 2ff125e7..182f54f3 100755
--- a/bin/omarchy-hw-recover-internal-monitor
+++ b/bin/omarchy-hw-recover-internal-monitor
@@ -2,7 +2,7 @@
 
 # omarchy:summary=Clear the internal-monitor-disable toggle if no external display is connected.
 
-TOGGLE="$HOME/.local/state/omarchy/toggles/hypr/internal-monitor-disable.conf"
+TOGGLE="$HOME/.local/state/omarchy/toggles/hypr/internal-monitor-disable.lua"
 
 if [[ -f $TOGGLE ]] && ! omarchy-hw-external-monitors; then
   rm -f "$TOGGLE"
diff --git a/bin/omarchy-hyprland-focus-app b/bin/omarchy-hyprland-focus-app
new file mode 100755
index 00000000..d22d360c
--- /dev/null
+++ b/bin/omarchy-hyprland-focus-app
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# omarchy:summary=Focus a Hyprland window by application class
+# omarchy:args=<app-name>
+# omarchy:examples=omarchy hyprland focus app Slack
+
+usage() {
+  echo "Usage: omarchy-hyprland-focus-app <app-name>" >&2
+  exit 1
+}
+
+app=${1:-}
+[[ -n $app ]] || usage
+
+address=$(
+  hyprctl clients -j 2>/dev/null |
+    jq -r --arg name "${app,,}" \
+      '[.[] | select((.class // "") | ascii_downcase | startswith($name))] | first.address // empty'
+)
+
+[[ -n $address ]] || exit 1
+
+hyprctl dispatch focuswindow "address:$address" >/dev/null
diff --git a/bin/omarchy-hyprland-monitor-internal b/bin/omarchy-hyprland-monitor-internal
index 29f101d4..6b72c2bd 100755
--- a/bin/omarchy-hyprland-monitor-internal
+++ b/bin/omarchy-hyprland-monitor-internal
@@ -4,40 +4,50 @@
 # omarchy:args=<on|off|toggle|recover>
 
 TOGGLE="internal-monitor-disable"
-TOGGLE_FLAG="$HOME/.local/state/omarchy/toggles/hypr/$TOGGLE.conf"
+TOGGLE_FLAG="$HOME/.local/state/omarchy/toggles/hypr/$TOGGLE.lua"
 MIRROR_TOGGLE="internal-monitor-mirror"
 
 # Get internal monitor name dynamically
 INTERNAL=$(hyprctl monitors -j | jq -r '.[] | select(.name | contains("eDP")).name' | head -n 1)
 
-enable() {
-  if omarchy-hyprland-toggle-enabled "$TOGGLE"; then
-    omarchy-hyprland-toggle --disabled-notification "󰍹    Laptop display enabled" "$TOGGLE"
+on() {
+  if omarchy-hyprland-toggle-enabled $TOGGLE; then
+    omarchy-hyprland-toggle $TOGGLE off
+    omarchy-notification-send -g 󰍹 "Laptop display enabled"
   fi
 }
 
-disable() {
+off() {
   if ! omarchy-hw-external-monitors; then
-    notify-send -u low "󰍹    Can't disable the only active display"
+    omarchy-notification-send -g 󰍹 "Can't disable the only active display"
     exit 1
   fi
-  if omarchy-hyprland-toggle-disabled "$TOGGLE" && omarchy-hyprland-toggle-disabled "$MIRROR_TOGGLE"; then
-    echo "monitor=$INTERNAL,disable" >"$TOGGLE_FLAG"
-    notify-send -u low "󰍹    Laptop display disabled"
+
+  if omarchy-hyprland-toggle-disabled $TOGGLE && omarchy-hyprland-toggle-disabled $MIRROR_TOGGLE; then
+    printf 'hl.monitor({ output = "%s", disabled = true })\n' "$INTERNAL" >"$TOGGLE_FLAG"
+    omarchy-notification-send -g 󰍹 "Laptop display disabled"
     hyprctl reload
   fi
 }
 
 recover() {
-  if ! omarchy-hw-external-monitors && omarchy-hyprland-toggle-enabled "$TOGGLE"; then
-    omarchy-hyprland-toggle "$TOGGLE"
+  if ! omarchy-hw-external-monitors && omarchy-hyprland-toggle-enabled $TOGGLE; then
+    omarchy-hyprland-toggle $TOGGLE off
+  fi
+}
+
+toggle() {
+  if omarchy-hyprland-toggle-enabled $TOGGLE; then
+    on
+  else
+    off
   fi
 }
 
 case "$1" in
-  on) enable ;;
-  off) disable ;;
-  toggle) if omarchy-hyprland-toggle-enabled "$TOGGLE"; then enable; else disable; fi ;;
+  on) on ;;
+  off) off ;;
+  toggle) toggle ;;
   recover) recover ;;
   *)
     echo "Usage: $(basename "$0") {on|off|toggle|recover}" >&2
diff --git a/bin/omarchy-hyprland-monitor-internal-mirror b/bin/omarchy-hyprland-monitor-internal-mirror
index 07a0ccad..451d4305 100755
--- a/bin/omarchy-hyprland-monitor-internal-mirror
+++ b/bin/omarchy-hyprland-monitor-internal-mirror
@@ -4,7 +4,7 @@
 # omarchy:args=<on|off|toggle|recover>
 
 TOGGLE="internal-monitor-mirror"
-TOGGLE_FLAG="$HOME/.local/state/omarchy/toggles/hypr/$TOGGLE.conf"
+TOGGLE_FLAG="$HOME/.local/state/omarchy/toggles/hypr/$TOGGLE.lua"
 DISABLE_TOGGLE="internal-monitor-disable"
 
 # Get names dynamically
@@ -12,44 +12,51 @@ INTERNAL=$(hyprctl monitors -j | jq -r '.[] | select(.name | contains("eDP")).na
 # Get the first available external monitor
 EXTERNAL=$(hyprctl monitors -j | jq -r '.[] | select(.name | contains("eDP") | not).name' | head -n 1)
 
-enable() {
-  if [[ -z "$EXTERNAL" ]]; then
-    notify-send -u low "󰍹    No external monitors found for mirror"
+on() {
+  if [[ -z $EXTERNAL ]]; then
+    omarchy-notification-send -g 󰍹 "No external monitors found for mirror"
     exit 1
   fi
 
-  if [[ -z "$INTERNAL" ]]; then
-    notify-send -u low "󰍹    No laptop monitor found to mirror"
+  if [[ -z $INTERNAL ]]; then
+    omarchy-notification-send -g 󰍹 "No laptop monitor found to mirror"
     exit 1
   fi
 
-  if omarchy-hyprland-toggle-enabled "$DISABLE_TOGGLE"; then
-    omarchy-hyprland-toggle "$DISABLE_TOGGLE"
-  fi
+  omarchy-hyprland-toggle $DISABLE_TOGGLE off
 
-  if omarchy-hyprland-toggle-disabled "$TOGGLE"; then
-    echo "monitor=$EXTERNAL, preferred, auto, 1, mirror, $INTERNAL" > "$TOGGLE_FLAG"
-    notify-send -u low "󰍹    Mirroring enabled ($EXTERNAL)"
+  if omarchy-hyprland-toggle-disabled $TOGGLE; then
+    printf 'hl.monitor({ output = "%s", mode = "preferred", position = "auto", scale = 1, mirror = "%s" })\n' "$EXTERNAL" "$INTERNAL" >"$TOGGLE_FLAG"
+    omarchy-notification-send -g 󰍹 "Mirroring enabled ($EXTERNAL)"
     hyprctl reload
   fi
 }
 
-disable() {
-  if omarchy-hyprland-toggle-enabled "$TOGGLE"; then
-    omarchy-hyprland-toggle --disabled-notification "󰍹    Extended mode restored" "$TOGGLE"
+off() {
+  if omarchy-hyprland-toggle-enabled $TOGGLE; then
+    omarchy-hyprland-toggle $TOGGLE off
+    omarchy-notification-send -g 󰍹 "Extended mode restored"
+  fi
+}
+
+toggle() {
+  if omarchy-hyprland-toggle-enabled $TOGGLE; then
+    off
+  else
+    on
   fi
 }
 
 recover() {
-  if ! omarchy-hw-external-monitors && omarchy-hyprland-toggle-enabled "$TOGGLE"; then
-    omarchy-hyprland-toggle "$TOGGLE"
+  if ! omarchy-hw-external-monitors && omarchy-hyprland-toggle-enabled $TOGGLE; then
+    omarchy-hyprland-toggle $TOGGLE off
   fi
 }
 
 case "$1" in
-  on) enable ;;
-  off) disable ;;
-  toggle) if omarchy-hyprland-toggle-enabled "$TOGGLE"; then disable; else enable; fi ;;
+  on) on ;;
+  off) off ;;
+  toggle) toggle ;;
   recover) recover ;;
   *)
     echo "Usage: $(basename "$0") {on|off|toggle|recover}" >&2
diff --git a/bin/omarchy-hyprland-monitor-scaling b/bin/omarchy-hyprland-monitor-scaling
new file mode 100755
index 00000000..004a2743
--- /dev/null
+++ b/bin/omarchy-hyprland-monitor-scaling
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# omarchy:summary=Show, set, or adjust focused Hyprland monitor scaling
+# omarchy:args=[up|down|1|1.25|1.6|2|3|4]
+# omarchy:examples=omarchy hyprland monitor scaling | omarchy hyprland monitor scaling 1.6 | omarchy hyprland monitor scaling up | omarchy hyprland monitor scaling down
+
+SCALES=(1 1.25 1.6 2 3 4)
+
+usage() {
+  echo "Usage: omarchy-hyprland-monitor-scaling [up|down|1|1.25|1.6|2|3|4]"
+}
+
+focused_monitor_scale() {
+  hyprctl monitors -j | jq -er '.[] | select(.focused == true) | .scale'
+}
+
+set_scale() {
+  local new_scale="$1"
+  local monitor_info="$(hyprctl monitors -j | jq -e -c '.[] | select(.focused == true)')"
+  local active_monitor="$(echo "$monitor_info" | jq -r '.name')"
+  local width="$(echo "$monitor_info" | jq -r '.width')"
+  local height="$(echo "$monitor_info" | jq -r '.height')"
+  local refresh_rate="$(echo "$monitor_info" | jq -r '.refreshRate')"
+  local monitor_lua="$HOME/.config/hypr/monitors.lua"
+
+  hyprctl eval "hl.monitor({ output = \"$active_monitor\", mode = \"${width}x${height}@${refresh_rate}\", position = \"auto\", scale = $new_scale })" >/dev/null
+
+  # Persist to monitors.lua if the user still has Omarchy's generic catch-all
+  # defaults, so the scale survives reboots.
+  if [[ -f $monitor_lua ]] && grep -q '^local omarchy_monitor_scale = ' "$monitor_lua"; then
+    sed -i -E \
+      -e "s|^local omarchy_monitor_scale = .*|local omarchy_monitor_scale = ${new_scale}|" \
+      -e "s|^local omarchy_gdk_scale = .*|local omarchy_gdk_scale = ${new_scale}|" \
+      "$monitor_lua"
+  elif [[ -f $monitor_lua ]] && grep -Eq '^hl\.monitor\(\{ output = "", mode = "preferred", position = "auto", scale = ("auto"|[0-9.]+) \}\)' "$monitor_lua"; then
+    sed -i -E \
+      -e "s|^(hl\.monitor\(\{ output = \"\", mode = \"preferred\", position = \"auto\", scale = )([^ ]+)( \}\))|\\1${new_scale}\\3|" \
+      -e 's|^hl\.env\("GDK_SCALE", ".*"\)|hl.env("GDK_SCALE", "'"$new_scale"'")|' \
+      "$monitor_lua"
+  fi
+}
+
+scale_from_current() {
+  local direction="${1:-}"
+
+  # Find the preset closest to the current scale (Hyprland may snap fractional
+  # scales to nearby values, so we can't match exactly).
+  awk -v direction="$direction" -v list="${SCALES[*]}" '
+    NR == 1 { scale = $0; found = 1 }
+    END {
+      if (!found) exit 1
+
+      n = split(list, scales, " ")
+      best = 1; best_diff = 1e9
+      for (i = 1; i <= n; i++) {
+        diff = scale - scales[i]; if (diff < 0) diff = -diff
+        if (diff < best_diff) { best_diff = diff; best = i }
+      }
+
+      if (direction == "next" && best < n) best++
+      else if (direction == "previous" && best > 1) best--
+
+      print scales[best]
+    }'
+}
+
+case "${1:-}" in
+"")
+  focused_monitor_scale | scale_from_current
+  ;;
+-h | --help)
+  usage
+  ;;
+up)
+  set_scale "$(focused_monitor_scale | scale_from_current next)"
+  ;;
+down)
+  set_scale "$(focused_monitor_scale | scale_from_current previous)"
+  ;;
+1 | 1.25 | 1.6 | 2 | 3 | 4)
+  set_scale "$1"
+  ;;
+*)
+  usage >&2
+  exit 1
+  ;;
+esac
diff --git a/bin/omarchy-hyprland-monitor-scaling-cycle b/bin/omarchy-hyprland-monitor-scaling-cycle
deleted file mode 100755
index 8628c17c..00000000
--- a/bin/omarchy-hyprland-monitor-scaling-cycle
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Cycle focused Hyprland monitor scaling through 1x, 1.25x, 1.6x, 2x, 3x, and 4x
-
-MONITOR_INFO=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true)')
-ACTIVE_MONITOR=$(echo "$MONITOR_INFO" | jq -r '.name')
-CURRENT_SCALE=$(echo "$MONITOR_INFO" | jq -r '.scale')
-WIDTH=$(echo "$MONITOR_INFO" | jq -r '.width')
-HEIGHT=$(echo "$MONITOR_INFO" | jq -r '.height')
-REFRESH_RATE=$(echo "$MONITOR_INFO" | jq -r '.refreshRate')
-
-# Cycle through scales: 1 → 1.25 → 1.6 → 2 → 3 → 4 → 1 (or reverse with --reverse)
-SCALES=(1 1.25 1.6 2 3 4)
-
-# Find the index of the scale closest to the current one (Hyprland may
-# snap fractional scales to nearby values, so we can't match exactly)
-CURRENT_IDX=$(awk -v s="$CURRENT_SCALE" -v list="${SCALES[*]}" 'BEGIN {
-  n = split(list, arr, " ")
-  best = 0; best_diff = 1e9
-  for (i = 1; i <= n; i++) {
-    d = s - arr[i]; if (d < 0) d = -d
-    if (d < best_diff) { best_diff = d; best = i - 1 }
-  }
-  print best
-}')
-
-if [[ "$1" == "--reverse" ]]; then
-  NEW_IDX=$(( (CURRENT_IDX - 1 + ${#SCALES[@]}) % ${#SCALES[@]} ))
-else
-  NEW_IDX=$(( (CURRENT_IDX + 1) % ${#SCALES[@]} ))
-fi
-
-NEW_SCALE=${SCALES[$NEW_IDX]}
-
-hyprctl keyword monitor "$ACTIVE_MONITOR,${WIDTH}x${HEIGHT}@${REFRESH_RATE},auto,$NEW_SCALE"
-
-# Persist to monitors.conf if the user has a single generic catch-all line
-# (ignoring disabled monitors), so the scale survives reboots.
-MONITOR_CONF="$HOME/.config/hypr/monitors.conf"
-if [[ -f $MONITOR_CONF ]]; then
-  mapfile -t ACTIVE_LINES < <(grep -E '^[[:space:]]*monitor=' "$MONITOR_CONF" | grep -vE 'disable[[:space:]]*$')
-  if [[ ${#ACTIVE_LINES[@]} -eq 1 ]] && [[ "${ACTIVE_LINES[0]}" =~ ^monitor=,preferred,auto, ]]; then
-    sed -i -E "s|^(monitor=,preferred,auto,).*|\\1${NEW_SCALE}|" "$MONITOR_CONF"
-  fi
-fi
-
-notify-send -u low "󰍹    Display scaling set to ${NEW_SCALE}x"
diff --git a/bin/omarchy-hyprland-toggle b/bin/omarchy-hyprland-toggle
index 363ac855..158e28ac 100755
--- a/bin/omarchy-hyprland-toggle
+++ b/bin/omarchy-hyprland-toggle
@@ -1,32 +1,54 @@
 #!/bin/bash
 
 # omarchy:summary=Toggle permanent Hyprland flags by copying them into a directory that's sourced entirely.
-# omarchy:args=[--enabled-notification <text>] [--disabled-notification <text>] <flag-name>
+# omarchy:args=<flag-name> [on|off|toggle]
 
-ENABLED_NOTIFICATION=""
-DISABLED_NOTIFICATION=""
+usage() {
+  echo "Usage: omarchy-hyprland-toggle <flag-name> [on|off|toggle]" >&2
+}
 
-while [[ $# -gt 1 ]]; do
-  case $1 in
-    --enabled-notification) ENABLED_NOTIFICATION="$2"; shift 2 ;;
-    --disabled-notification) DISABLED_NOTIFICATION="$2"; shift 2 ;;
-    *) break ;;
-  esac
-done
-
-FLAG_NAME="$1"
-FLAG="$HOME/.local/state/omarchy/toggles/hypr/$FLAG_NAME.conf"
-FLAG_SOURCE="$OMARCHY_PATH/default/hypr/toggles/$FLAG_NAME.conf"
-
-if [[ -f $FLAG ]]; then
-  rm $FLAG
-  [[ -n $DISABLED_NOTIFICATION ]] && notify-send -u low "$DISABLED_NOTIFICATION"
-elif [[ -f $FLAG_SOURCE ]]; then
-  cp $FLAG_SOURCE $FLAG
-  [[ -n $ENABLED_NOTIFICATION ]] && notify-send -u low "$ENABLED_NOTIFICATION"
-else
-  echo "Flag not found: $FLAG_NAME"
+if (($# < 1)); then
+  usage
   exit 1
 fi
 
-hyprctl reload
+FLAG_NAME="$1"
+ACTION="${2:-toggle}"
+FLAG_FILE="$HOME/.local/state/omarchy/toggles/hypr/$FLAG_NAME.lua"
+FLAG_SOURCE="$OMARCHY_PATH/default/hypr/toggles/$FLAG_NAME.lua"
+
+on() {
+  if [[ -f $FLAG_SOURCE ]]; then
+    mkdir -p "$(dirname "$FLAG_FILE")"
+    cp "$FLAG_SOURCE" "$FLAG_FILE"
+  else
+    echo "Flag not found: $FLAG_NAME" >&2
+    exit 1
+  fi
+}
+
+off() {
+  rm -f "$FLAG_FILE"
+}
+
+toggle() {
+  if [[ -f $FLAG_FILE ]]; then
+    off
+    echo "off"
+  else
+    on
+    echo "on"
+  fi
+}
+
+case $ACTION in
+  on) on ;;
+  off) off ;;
+  toggle) toggle ;;
+  *)
+    usage
+    exit 1
+    ;;
+esac
+
+hyprctl reload >/dev/null
diff --git a/bin/omarchy-hyprland-toggle-disabled b/bin/omarchy-hyprland-toggle-disabled
index 51707491..5414e2b5 100755
--- a/bin/omarchy-hyprland-toggle-disabled
+++ b/bin/omarchy-hyprland-toggle-disabled
@@ -3,4 +3,4 @@
 # omarchy:summary=Check if a Hyprland toggle is currently disabled (missing).
 # omarchy:args=<flag-name>
 
-[[ ! -f "$HOME/.local/state/omarchy/toggles/hypr/$1.conf" ]]
+[[ ! -f "$HOME/.local/state/omarchy/toggles/hypr/$1.lua" ]]
diff --git a/bin/omarchy-hyprland-toggle-enabled b/bin/omarchy-hyprland-toggle-enabled
index cdc4e718..73bb7ba1 100755
--- a/bin/omarchy-hyprland-toggle-enabled
+++ b/bin/omarchy-hyprland-toggle-enabled
@@ -3,4 +3,4 @@
 # omarchy:summary=Check if a Hyprland toggle is currently enabled.
 # omarchy:args=<flag-name>
 
-[[ -f "$HOME/.local/state/omarchy/toggles/hypr/$1.conf" ]]
+[[ -f "$HOME/.local/state/omarchy/toggles/hypr/$1.lua" ]]
diff --git a/bin/omarchy-hyprland-window-close-all b/bin/omarchy-hyprland-window-close-all
index dbf0d758..c88a640c 100755
--- a/bin/omarchy-hyprland-window-close-all
+++ b/bin/omarchy-hyprland-window-close-all
@@ -4,7 +4,9 @@
 
 hyprctl clients -j | \
   jq -r ".[].address" | \
-  xargs -I{} hyprctl dispatch closewindow address:{}
+  while read -r addr; do
+    hyprctl dispatch "hl.dsp.window.close(\"address:$addr\")" >/dev/null 2>&1 || hyprctl dispatch closewindow "address:$addr"
+  done
 
 # Move to first workspace
-hyprctl dispatch workspace 1
+hyprctl dispatch 'hl.dsp.focus({ workspace = "1" })' >/dev/null 2>&1 || hyprctl dispatch workspace 1
diff --git a/bin/omarchy-hyprland-window-pop b/bin/omarchy-hyprland-window-pop
index 05451076..c115e091 100755
--- a/bin/omarchy-hyprland-window-pop
+++ b/bin/omarchy-hyprland-window-pop
@@ -11,24 +11,30 @@ y=${4:-}
 active=$(hyprctl activewindow -j)
 pinned=$(echo "$active" | jq ".pinned")
 addr=$(echo "$active" | jq -r ".address")
+window="address:$addr"
+
+hypr_dispatch() {
+  local lua="$1"
+  shift
+
+  hyprctl dispatch "$lua" >/dev/null 2>&1 || hyprctl dispatch "$@" >/dev/null
+}
 
 if [[ $pinned == "true" ]]; then
-  hyprctl -q --batch \
-    "dispatch pin address:$addr;" \
-    "dispatch togglefloating address:$addr;" \
-    "dispatch tagwindow -pop address:$addr;"
+  hypr_dispatch "hl.dsp.window.pin({ window = \"$window\" })" pin "$window"
+  hypr_dispatch "hl.dsp.window.float({ window = \"$window\", action = \"toggle\" })" togglefloating "$window"
+  hypr_dispatch "hl.dsp.window.tag({ window = \"$window\", tag = \"-pop\" })" tagwindow -pop "$window"
 elif [[ -n $addr ]]; then
-  hyprctl dispatch togglefloating address:$addr
-  hyprctl dispatch resizeactive exact $width $height address:$addr
+  hypr_dispatch "hl.dsp.window.float({ window = \"$window\", action = \"toggle\" })" togglefloating "$window"
+  hypr_dispatch "hl.dsp.window.resize({ window = \"$window\", x = $width, y = $height })" resizeactive exact "$width" "$height" "$window"
 
   if [[ -n $x && -n $y ]]; then
-    hyprctl dispatch moveactive $x $y address:$addr
+    hypr_dispatch "hl.dsp.window.move({ window = \"$window\", x = $x, y = $y })" moveactive "$x" "$y" "$window"
   else
-    hyprctl dispatch centerwindow address:$addr
+    hypr_dispatch "hl.dsp.window.center({ window = \"$window\" })" centerwindow "$window"
   fi
 
-  hyprctl -q --batch \
-    "dispatch pin address:$addr;" \
-    "dispatch alterzorder top address:$addr;" \
-    "dispatch tagwindow +pop address:$addr;"
+  hypr_dispatch "hl.dsp.window.pin({ window = \"$window\" })" pin "$window"
+  hypr_dispatch "hl.dsp.window.alter_zorder({ window = \"$window\", mode = \"top\" })" alterzorder top "$window"
+  hypr_dispatch "hl.dsp.window.tag({ window = \"$window\", tag = \"+pop\" })" tagwindow +pop "$window"
 fi
diff --git a/bin/omarchy-hyprland-window-single-square-aspect-toggle b/bin/omarchy-hyprland-window-single-square-aspect-toggle
index d600c408..dd51f28d 100755
--- a/bin/omarchy-hyprland-window-single-square-aspect-toggle
+++ b/bin/omarchy-hyprland-window-single-square-aspect-toggle
@@ -2,7 +2,7 @@
 
 # omarchy:summary=Toggle single-window square aspect ratio.
 
-omarchy-hyprland-toggle \
-  --enabled-notification "      Enable single-window square aspect ratio" \
-  --disabled-notification "      Disable single-window square aspect ratio" \
-  single-window-aspect-ratio
+case $(omarchy-hyprland-toggle single-window-aspect-ratio) in
+  on) omarchy-notification-send -g  "Enable single-window square aspect ratio" ;;
+  off) omarchy-notification-send -g  "Disable single-window square aspect ratio" ;;
+esac
diff --git a/bin/omarchy-hyprland-window-tiled-fullscreen-toggle b/bin/omarchy-hyprland-window-tiled-fullscreen-toggle
new file mode 100755
index 00000000..daa06ee2
--- /dev/null
+++ b/bin/omarchy-hyprland-window-tiled-fullscreen-toggle
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# omarchy:summary=Toggle tiled fullscreen for the focused Hyprland window
+
+set -euo pipefail
+
+active=$(hyprctl activewindow -j)
+fullscreen_client=$(jq -r '.fullscreenClient // 0' <<<"$active")
+
+if [[ $fullscreen_client == "2" ]]; then
+  hyprctl dispatch 'hl.dsp.window.fullscreen_state({ internal = 0, client = 0 })' >/dev/null 2>&1 || \
+    hyprctl dispatch fullscreenstate 0 0 >/dev/null
+else
+  hyprctl dispatch 'hl.dsp.window.fullscreen_state({ internal = 0, client = 2 })' >/dev/null 2>&1 || \
+    hyprctl dispatch fullscreenstate 0 2 >/dev/null
+fi
diff --git a/bin/omarchy-hyprland-window-transparency-toggle b/bin/omarchy-hyprland-window-transparency-toggle
index 81afc272..1235969d 100755
--- a/bin/omarchy-hyprland-window-transparency-toggle
+++ b/bin/omarchy-hyprland-window-transparency-toggle
@@ -2,4 +2,6 @@
 
 # omarchy:summary=Toggles transparency for the currently focused window.
 
-hyprctl dispatch setprop "address:$(hyprctl activewindow -j | jq -r '.address')" opaque toggle
+addr=$(hyprctl activewindow -j | jq -r '.address')
+hyprctl dispatch "hl.dsp.window.set_prop({ window = \"address:$addr\", prop = \"opaque\", value = \"toggle\" })" >/dev/null 2>&1 || \
+  hyprctl dispatch setprop "address:$addr" opaque toggle
diff --git a/bin/omarchy-hyprland-window-width b/bin/omarchy-hyprland-window-width
new file mode 100755
index 00000000..78bf5d89
--- /dev/null
+++ b/bin/omarchy-hyprland-window-width
@@ -0,0 +1,168 @@
+#!/bin/bash
+
+# omarchy:summary=Save or restore the focused Hyprland window width
+# omarchy:args=<save|restore>
+# omarchy:examples=omarchy hyprland window width save | omarchy-hyprland-window-width restore
+
+set -euo pipefail
+
+STATE_DIR="$HOME/.local/state/omarchy/windows"
+
+usage() {
+  echo "Usage: omarchy-hyprland-window-width save|restore" >&2
+  exit 1
+}
+
+active_window() {
+  hyprctl activewindow -j 2>/dev/null
+}
+
+window_key() {
+  jq -r '[.class, .initialClass, .title] | map(select(. != null and . != "")) | first // empty' <<<"$1"
+}
+
+workspace_key() {
+  jq -r '.workspace.id // .workspace.name // empty' <<<"$1"
+}
+
+state_file_for() {
+  local key="$1"
+  local workspace="$2"
+  local filename="workspace-${workspace}-${key}"
+
+  filename="${filename//\//_}"
+  filename="${filename//$'\n'/_}"
+
+  printf '%s/%s.width' "$STATE_DIR" "$filename"
+}
+
+notify_missing_width() {
+  local key="$1"
+  local workspace="$2"
+
+  omarchy-notification-send -g  "No saved width found for $key on workspace $workspace" "Use Super + Alt + Home to save one for this workspace."
+}
+
+notify_saved_width() {
+  local key="$1"
+  local workspace="$2"
+
+  omarchy-notification-send -g  "Saved width for $key on workspace $workspace" "Restore using Super + Home on this workspace."
+}
+
+hypr_dispatch() {
+  local lua="$1"
+  shift
+
+  hyprctl dispatch "$lua" >/dev/null 2>&1 || hyprctl dispatch "$@" >/dev/null
+}
+
+window_width() {
+  local address="$1"
+
+  hyprctl clients -j | jq -er --arg address "$address" '.[] | select(.address == $address) | .size[0]'
+}
+
+resize_width_by() {
+  local window="$1"
+  local delta="$2"
+
+  hypr_dispatch "hl.dsp.window.resize({ window = \"$window\", x = $delta, y = 0, relative = true })" resizeactive "$delta" 0 "$window"
+}
+
+save_width() {
+  local active="$1"
+  local key="$2"
+  local workspace="$3"
+  local state_file="$4"
+  local tmp=""
+  local width=""
+
+  width=$(jq -er '.size[0]' <<<"$active")
+
+  mkdir -p "$STATE_DIR"
+  tmp=$(mktemp "$STATE_DIR/.width.XXXXXX")
+  printf '%s\n' "$width" >"$tmp"
+  mv "$tmp" "$state_file"
+
+  notify_saved_width "$key" "$workspace"
+  echo "Saved width for $key on workspace $workspace"
+}
+
+restore_width() {
+  local active="$1"
+  local key="$2"
+  local workspace="$3"
+  local state_file="$4"
+  local address=""
+  local current_width=""
+  local delta=""
+  local direction=""
+  local next_width=""
+  local probe=""
+  local probe_delta=""
+  local width=""
+  local window=""
+
+  if [[ ! -f $state_file ]]; then
+    notify_missing_width "$key" "$workspace"
+    exit 1
+  fi
+
+  width=$(<"$state_file")
+  [[ $width =~ ^[0-9]+$ ]] || exit 1
+
+  address=$(jq -r '.address // empty' <<<"$active")
+  [[ -n $address ]] || exit 1
+
+  window="address:$address"
+
+  current_width=$(window_width "$address")
+  ((current_width == width)) && return
+
+  for probe in 10 -10; do
+    resize_width_by "$window" "$probe"
+    next_width=$(window_width "$address")
+
+    if ((next_width != current_width)); then
+      if (((next_width - current_width) * probe > 0)); then
+        direction=1
+      else
+        direction=-1
+      fi
+
+      current_width=$next_width
+      break
+    fi
+  done
+
+  [[ -n $direction ]] || exit 1
+
+  for _ in {1..6}; do
+    delta=$((width - current_width))
+    ((delta == 0)) && break
+
+    probe_delta=$((delta * direction))
+    resize_width_by "$window" "$probe_delta"
+    next_width=$(window_width "$address")
+
+    ((next_width == current_width)) && break
+    current_width=$next_width
+  done
+}
+
+action=${1:-}
+[[ $action == "save" || $action == "restore" ]] || usage
+
+active=$(active_window)
+key=$(window_key "$active")
+[[ -n $key ]] || exit 1
+workspace=$(workspace_key "$active")
+[[ -n $workspace ]] || exit 1
+
+state_file=$(state_file_for "$key" "$workspace")
+
+case "$action" in
+save) save_width "$active" "$key" "$workspace" "$state_file" ;;
+restore) restore_width "$active" "$key" "$workspace" "$state_file" ;;
+esac
diff --git a/bin/omarchy-hyprland-workspace-layout-toggle b/bin/omarchy-hyprland-workspace-layout-toggle
index 4636e38e..28f76337 100755
--- a/bin/omarchy-hyprland-workspace-layout-toggle
+++ b/bin/omarchy-hyprland-workspace-layout-toggle
@@ -10,5 +10,6 @@ case "$CURRENT_LAYOUT" in
   *) NEW_LAYOUT=dwindle ;;
 esac
 
-hyprctl keyword workspace $ACTIVE_WORKSPACE, layout:$NEW_LAYOUT
-notify-send -u low "󱂬    Workspace layout set to $NEW_LAYOUT"
+hyprctl eval "hl.workspace_rule({ workspace = \"$ACTIVE_WORKSPACE\", layout = \"$NEW_LAYOUT\" })" >/dev/null 2>&1 || \
+  hyprctl keyword workspace $ACTIVE_WORKSPACE, layout:$NEW_LAYOUT
+omarchy-notification-send -g 󱂬 "Workspace layout set to $NEW_LAYOUT"
diff --git a/bin/omarchy-install-and-launch b/bin/omarchy-install-and-launch
new file mode 100755
index 00000000..6a161102
--- /dev/null
+++ b/bin/omarchy-install-and-launch
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# omarchy:summary=Install a packaged app and gtk-launch it once it finishes
+# omarchy:args=<display-name> <packages> <desktop-id>
+# omarchy:examples=omarchy install and launch Cursor cursor-bin cursor
+
+name="${1-}"
+packages="${2-}"
+desktop_id="${3-}"
+
+if [[ -z $name || -z $packages || -z $desktop_id ]]; then
+  echo "Usage: omarchy-install-and-launch <display-name> <packages> <desktop-id>" >&2
+  exit 1
+fi
+
+exec omarchy-launch-floating-terminal-with-presentation \
+  "echo 'Installing ${name}...'; omarchy-pkg-add ${packages} && setsid gtk-launch ${desktop_id}"
diff --git a/bin/omarchy-install-app b/bin/omarchy-install-app
new file mode 100755
index 00000000..bae90897
--- /dev/null
+++ b/bin/omarchy-install-app
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# omarchy:summary=Install a packaged app, surfacing the install in a floating terminal
+# omarchy:args=<display-name> <packages>
+# omarchy:examples=omarchy install app 'LM Studio' lmstudio-bin
+
+name="${1-}"
+packages="${2-}"
+
+if [[ -z $name || -z $packages ]]; then
+  echo "Usage: omarchy-install-app <display-name> <packages>" >&2
+  exit 1
+fi
+
+exec omarchy-launch-floating-terminal-with-presentation "echo 'Installing ${name}...'; omarchy-pkg-add ${packages}"
diff --git a/bin/omarchy-install-browser b/bin/omarchy-install-browser
index ed067d8d..18a97c6e 100755
--- a/bin/omarchy-install-browser
+++ b/bin/omarchy-install-browser
@@ -16,7 +16,8 @@ announce_browser_installed() {
 
 copy_chromium_flags() {
   mkdir -p ~/.config
-  cp -f "${OMARCHY_PATH:-$HOME/.local/share/omarchy}/config/chromium-flags.conf" "$1"
+  cp -f "$OMARCHY_PATH/config/chromium-flags.conf" "$1"
+  omarchy-install-chromium-ytdlp
 }
 
 setup_firefox_preferences() {
@@ -66,7 +67,8 @@ brave-origin)
   setup_policy_directory /etc/brave/policies/managed
   mkdir -p ~/.config
   # FIXME: Use normal chromium flags when Brave Origin wrapper has been fixed
-  echo "--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url" > ~/.config/brave-origin-beta-flags.conf
+  echo "--load-extension=/usr/share/omarchy/default/chromium/extensions/copy-url,/usr/share/omarchy/default/chromium/extensions/yt-dlp" > ~/.config/brave-origin-beta-flags.conf
+  omarchy-install-chromium-ytdlp
   omarchy-theme-set-browser
   announce_browser_installed "Brave Origin"
   ;;
diff --git a/bin/omarchy-install-chromium-ytdlp b/bin/omarchy-install-chromium-ytdlp
new file mode 100755
index 00000000..c700578c
--- /dev/null
+++ b/bin/omarchy-install-chromium-ytdlp
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# omarchy:summary=Install the native messaging host for the yt-dlp Chromium extension
+
+set -euo pipefail
+
+HOST_NAME="com.omarchy.ytdlp"
+HOST_PATH="$OMARCHY_PATH/bin/omarchy-chromium-ytdlp-host"
+TEMPLATE="$OMARCHY_PATH/default/chromium/native-messaging-hosts/$HOST_NAME.json"
+
+# Chromium-based browser profile roots that use the NativeMessagingHosts layout.
+browser_dirs=(
+  "$HOME/.config/chromium"
+  "$HOME/.config/google-chrome"
+  "$HOME/.config/google-chrome-beta"
+  "$HOME/.config/google-chrome-unstable"
+  "$HOME/.config/BraveSoftware/Brave-Browser"
+  "$HOME/.config/BraveSoftware/Brave-Browser-Beta"
+  "$HOME/.config/BraveSoftware/Brave-Browser-Nightly"
+  "$HOME/.config/microsoft-edge"
+  "$HOME/.config/microsoft-edge-dev"
+)
+
+manifest=$(sed "s|__HOST_PATH__|$HOST_PATH|g" "$TEMPLATE")
+
+for dir in "${browser_dirs[@]}"; do
+  mkdir -p "$dir/NativeMessagingHosts"
+  printf '%s\n' "$manifest" >"$dir/NativeMessagingHosts/$HOST_NAME.json"
+done
diff --git a/bin/omarchy-install-helix b/bin/omarchy-install-editor-helix
similarity index 100%
rename from bin/omarchy-install-helix
rename to bin/omarchy-install-editor-helix
diff --git a/bin/omarchy-install-vscode b/bin/omarchy-install-editor-vscode
similarity index 100%
rename from bin/omarchy-install-vscode
rename to bin/omarchy-install-editor-vscode
diff --git a/bin/omarchy-install-zed b/bin/omarchy-install-editor-zed
similarity index 100%
rename from bin/omarchy-install-zed
rename to bin/omarchy-install-editor-zed
diff --git a/bin/omarchy-install-font b/bin/omarchy-install-font
new file mode 100755
index 00000000..6f68892e
--- /dev/null
+++ b/bin/omarchy-install-font
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# omarchy:summary=Install a Nerd Font package and switch the system to it
+# omarchy:args=<display-name> <package> <family>
+# omarchy:examples=omarchy install font 'Cascadia Mono' ttf-cascadia-mono-nerd 'CaskaydiaMono Nerd Font'
+
+name="${1-}"
+package="${2-}"
+family="${3-}"
+
+if [[ -z $name || -z $package || -z $family ]]; then
+  echo "Usage: omarchy-install-font <display-name> <package> <family>" >&2
+  exit 1
+fi
+
+exec omarchy-launch-floating-terminal-with-presentation \
+  "echo 'Installing ${name}...'; omarchy-pkg-add ${package} && sleep 2 && omarchy-font-set '${family}'"
diff --git a/bin/omarchy-install-gaming-battlenet b/bin/omarchy-install-gaming-battlenet
new file mode 100755
index 00000000..5df49955
--- /dev/null
+++ b/bin/omarchy-install-gaming-battlenet
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# omarchy:summary=Install Battle.net standalone via umu-launcher + GE-Proton (no Steam, no Lutris, no Heroic).
+# omarchy:requires-sudo=true
+
+set -e
+
+PREFIX="$HOME/Games/battlenet"
+LAUNCHER="$PREFIX/drive_c/Program Files (x86)/Battle.net/Battle.net Launcher.exe"
+INSTALLER_URL="https://downloader.battle.net/download/getInstallerForGame?os=win&gameProgram=BATTLENET_APP&version=Live"
+
+echo "Installing Battle.net..."
+
+omarchy-pkg-add umu-launcher
+omarchy-install-gaming-gpu-lib32
+
+# Detect a half-finished prefix from a closed/crashed previous run and offer
+# to wipe it before trying again. Battle.net's installer isn't idempotent.
+if [[ -d $PREFIX && ! -f $LAUNCHER ]]; then
+  echo
+  echo "Found a partial Battle.net install at $PREFIX (no Launcher.exe)."
+  echo "Battle.net's installer can't resume from this state."
+  if gum confirm "Wipe the partial prefix and start fresh?"; then
+    pkill -f "$PREFIX" 2>/dev/null || true
+    sleep 1
+    rm -rf "$PREFIX"
+  else
+    echo "Aborting. Re-run when ready to wipe."
+    exit 1
+  fi
+fi
+
+mkdir -p "$PREFIX"
+
+export WINEPREFIX="$PREFIX"
+export PROTONPATH=GE-Proton
+export GAMEID=umu-battlenet
+export PROTON_VERB=run
+
+if [[ -f $LAUNCHER ]]; then
+  echo "Battle.net is already installed at $PREFIX."
+  launched_installer=0
+else
+  cache_dir="$HOME/.cache/omarchy"
+  mkdir -p "$cache_dir"
+  installer="$cache_dir/Battle.net-Setup.exe"
+
+  echo
+  echo "Downloading Battle.net installer..."
+  curl --fail --location --retry 3 "$INSTALLER_URL" --output "$installer"
+
+  cat <<'EOF'
+
+Launching the Battle.net setup wizard. Click through it normally — the
+default install path is fine. When it finishes, Battle.net will be in your
+app launcher.
+
+EOF
+
+  log="/tmp/omarchy-battlenet-installer.log"
+  setsid -f sh -c "umu-run '$installer' >'$log' 2>&1" </dev/null >/dev/null 2>&1
+  echo "Installer log: $log"
+  launched_installer=1
+fi
+
+mkdir -p "$HOME/.local/share/applications"
+install -m 644 "$OMARCHY_PATH/applications/battlenet.desktop" \
+  "$HOME/.local/share/applications/battlenet.desktop"
+update-desktop-database "$HOME/.local/share/applications" 2>/dev/null || true
+
+if (( launched_installer )); then
+  cat <<EOF
+
+The Battle.net installer is running in the background. After it finishes,
+find Battle.net in your app launcher, or run:
+
+  omarchy-launch-battlenet
+
+EOF
+else
+  cat <<EOF
+
+Battle.net is installed. Find it in your app launcher, or run:
+
+  omarchy-launch-battlenet
+
+EOF
+fi
diff --git a/bin/omarchy-install-gaming-geforce-now b/bin/omarchy-install-gaming-geforce-now
index 195c01ef..f740c344 100755
--- a/bin/omarchy-install-gaming-geforce-now
+++ b/bin/omarchy-install-gaming-geforce-now
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 # omarchy:summary=Install and launch Geforce Now.
+# omarchy:group=install
+# omarchy:name=gaming geforce-now
 
 set -e
 
diff --git a/bin/omarchy-install-gaming-gpu-lib32 b/bin/omarchy-install-gaming-gpu-lib32
index 419c44e0..2e4e3533 100755
--- a/bin/omarchy-install-gaming-gpu-lib32
+++ b/bin/omarchy-install-gaming-gpu-lib32
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 # omarchy:summary=Install lib32 graphics drivers (Vulkan + NVIDIA) for any detected GPUs.
+# omarchy:group=install
+# omarchy:name=gaming gpu-lib32
 # omarchy:requires-sudo=true
 
 set -e
@@ -25,4 +27,4 @@ elif omarchy-hw-nvidia-without-gsp; then
   PACKAGES+=(lib32-nvidia-580xx-utils)
 fi
 
-[[ ${#PACKAGES[@]} -gt 0 ]] && omarchy-pkg-add "${PACKAGES[@]}"
+(( ${#PACKAGES[@]} > 0 )) && omarchy-pkg-add "${PACKAGES[@]}"
diff --git a/bin/omarchy-install-gaming-moonlight b/bin/omarchy-install-gaming-moonlight
deleted file mode 100755
index 1fe77e68..00000000
--- a/bin/omarchy-install-gaming-moonlight
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install Moonlight (NVIDIA GameStream / Sunshine client) for streaming games to this PC.
-# omarchy:requires-sudo=true
-
-set -e
-
-echo "Installing Moonlight..."
-omarchy-pkg-add moonlight-qt
-
-setsid gtk-launch com.moonlight_stream.Moonlight.desktop >/dev/null 2>&1 &
diff --git a/bin/omarchy-install-gaming-xbox-cloud b/bin/omarchy-install-gaming-xbox-cloud
index 8622949d..2367328f 100755
--- a/bin/omarchy-install-gaming-xbox-cloud
+++ b/bin/omarchy-install-gaming-xbox-cloud
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 # omarchy:summary=Install Xbox Cloud Gaming as a web app and launch it.
+# omarchy:group=install
+# omarchy:name=gaming xbox-cloud
 
 set -e
 
diff --git a/bin/omarchy-install-gaming-xbox-controllers b/bin/omarchy-install-gaming-xbox-controllers
index 539d0297..f4134f76 100755
--- a/bin/omarchy-install-gaming-xbox-controllers
+++ b/bin/omarchy-install-gaming-xbox-controllers
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 # omarchy:summary=Install support for using Xbox controllers with Steam/RetroArch/etc.
+# omarchy:group=install
+# omarchy:name=gaming xbox-controllers
 # omarchy:requires-sudo=true
 
 set -e
diff --git a/bin/omarchy-install-service-1password b/bin/omarchy-install-service-1password
new file mode 100755
index 00000000..f59cab92
--- /dev/null
+++ b/bin/omarchy-install-service-1password
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# omarchy:summary=Install 1Password and its Chromium extension.
+# omarchy:requires-sudo=true
+
+set -e
+
+EXTENSION_ID="aeblfdkhhhdcdjpifhhbdiojplfjncoa"
+EXTENSION_DIR="/usr/share/chromium/extensions"
+EXTENSION_FILE="$EXTENSION_DIR/$EXTENSION_ID.json"
+WEBSTORE_UPDATE_URL="https://clients2.google.com/service/update2/crx"
+
+install_chromium_extension() {
+  if omarchy-cmd-missing chromium; then
+    echo "Chromium is not installed; skipping 1Password Chromium extension."
+    return
+  fi
+
+  sudo mkdir -p "$EXTENSION_DIR"
+  printf '{ "external_update_url": "%s" }\n' "$WEBSTORE_UPDATE_URL" | sudo tee "$EXTENSION_FILE" >/dev/null
+  sudo chmod 644 "$EXTENSION_FILE"
+}
+
+echo "Installing 1Password..."
+omarchy-pkg-add 1password 1password-cli
+
+echo "Installing 1Password extension for Chromium..."
+install_chromium_extension
+
+echo "Opening 1Password..."
+uwsm-app -- 1password >/dev/null 2>&1 &
+
+echo ""
+echo "1Password has been installed. Restart Chromium to load the browser extension."
diff --git a/bin/omarchy-install-dropbox b/bin/omarchy-install-service-dropbox
similarity index 82%
rename from bin/omarchy-install-dropbox
rename to bin/omarchy-install-service-dropbox
index 4add3460..9de23983 100755
--- a/bin/omarchy-install-dropbox
+++ b/bin/omarchy-install-service-dropbox
@@ -5,6 +5,9 @@
 echo "Installing all dependencies..."
 omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 
+echo "Adding Dropbox to the bar..."
+omarchy-config-shell-bar add omarchy.dropbox
+
 echo "Starting Dropbox..."
 uwsm-app -- dropbox-cli start &>/dev/null &
 echo "See Dropbox icon behind  hover tray in top right and right-click for setup."
diff --git a/bin/omarchy-install-nordvpn b/bin/omarchy-install-service-nordvpn
similarity index 100%
rename from bin/omarchy-install-nordvpn
rename to bin/omarchy-install-service-nordvpn
diff --git a/bin/omarchy-install-once b/bin/omarchy-install-service-once
similarity index 100%
rename from bin/omarchy-install-once
rename to bin/omarchy-install-service-once
diff --git a/bin/omarchy-install-service-signal b/bin/omarchy-install-service-signal
new file mode 100755
index 00000000..f7679686
--- /dev/null
+++ b/bin/omarchy-install-service-signal
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# omarchy:summary=Install Signal and launch it.
+# omarchy:requires-sudo=true
+
+set -e
+
+echo "Installing Signal..."
+omarchy-pkg-add signal-desktop
+
+echo "Opening Signal..."
+setsid uwsm-app -- /usr/bin/signal-desktop >/dev/null 2>&1 &
+
+echo ""
+echo "Signal has been installed."
diff --git a/bin/omarchy-install-service-spotify b/bin/omarchy-install-service-spotify
new file mode 100755
index 00000000..beae9939
--- /dev/null
+++ b/bin/omarchy-install-service-spotify
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# omarchy:summary=Install Spotify.
+# omarchy:requires-sudo=true
+
+set -e
+
+echo "Installing Spotify..."
+omarchy-pkg-add spotify
+
+echo "Opening Spotify..."
+setsid uwsm-app -- /usr/bin/spotify >/dev/null 2>&1 &
+
+echo ""
+echo "Spotify has been installed."
diff --git a/bin/omarchy-install-service-sunshine b/bin/omarchy-install-service-sunshine
new file mode 100755
index 00000000..c215584b
--- /dev/null
+++ b/bin/omarchy-install-service-sunshine
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# omarchy:summary=Install Sunshine and open Moonlight streaming ports for LAN and Tailscale.
+# omarchy:requires-sudo=true
+
+set -e
+
+TCP_PORTS=(47984 47989 48010)
+UDP_PORTS=(5353 47998 47999 48000 48002 48010)
+PRIVATE_CIDRS=(10.0.0.0/8 172.16.0.0/12 192.168.0.0/16)
+UFW_COMMENT="omarchy-sunshine"
+SUNSHINE_ADMIN_APP="Sunshine Admin"
+SUNSHINE_ADMIN_URL="https://localhost:47990"
+SUNSHINE_ADMIN_EXEC="omarchy-launch-webapp $SUNSHINE_ADMIN_URL --ignore-certificate-errors"
+SUNSHINE_ICON_SOURCE="/usr/share/sunshine/web/images/logo-sunshine-45.png"
+HYPR_AUTOSTART_FILE="$HOME/.config/hypr/autostart.lua"
+HYPR_AUTOSTART_ENTRY='o.launch_on_start("sunshine")'
+
+open_ufw_port_for_private_lans() {
+  local proto="$1"
+  local port="$2"
+  local cidr
+
+  for cidr in "${PRIVATE_CIDRS[@]}"; do
+    sudo ufw allow in proto "$proto" from "$cidr" to any port "$port" comment "$UFW_COMMENT" >/dev/null
+  done
+}
+
+open_ufw_port_for_tailscale() {
+  local proto="$1"
+  local port="$2"
+
+  if ip link show tailscale0 >/dev/null 2>&1; then
+    sudo ufw allow in on tailscale0 to any port "$port" proto "$proto" comment "$UFW_COMMENT" >/dev/null
+  fi
+}
+
+open_ufw_ports() {
+  local port
+
+  if omarchy-cmd-missing ufw; then
+    echo "UFW is not installed; skipping Sunshine firewall rules."
+    return
+  fi
+
+  for port in "${TCP_PORTS[@]}"; do
+    open_ufw_port_for_private_lans tcp "$port"
+    open_ufw_port_for_tailscale tcp "$port"
+  done
+
+  for port in "${UDP_PORTS[@]}"; do
+    open_ufw_port_for_private_lans udp "$port"
+    open_ufw_port_for_tailscale udp "$port"
+  done
+
+  sudo ufw reload
+}
+
+install_admin_webapp() {
+  omarchy-webapp-install "$SUNSHINE_ADMIN_APP" "$SUNSHINE_ADMIN_URL" "$SUNSHINE_ICON_SOURCE" "$SUNSHINE_ADMIN_EXEC"
+}
+
+enable_hyprland_autostart() {
+  mkdir -p "$(dirname "$HYPR_AUTOSTART_FILE")"
+  touch "$HYPR_AUTOSTART_FILE"
+
+  if ! grep -Fxq "$HYPR_AUTOSTART_ENTRY" "$HYPR_AUTOSTART_FILE"; then
+    printf '\n%s\n' "$HYPR_AUTOSTART_ENTRY" >>"$HYPR_AUTOSTART_FILE"
+  fi
+}
+
+echo "Installing Sunshine..."
+omarchy-pkg-add sunshine
+systemctl --user enable --now sunshine
+
+echo "Opening Sunshine firewall ports..."
+open_ufw_ports
+
+echo "Installing Sunshine admin web app..."
+install_admin_webapp
+$SUNSHINE_ADMIN_EXEC >/dev/null 2>&1 &
+
+echo "Enabling Sunshine autostart..."
+enable_hyprland_autostart
+
+echo ""
+echo "Sunshine has been installed and its Moonlight streaming ports are open for private LANs and Tailscale."
diff --git a/bin/omarchy-install-tailscale b/bin/omarchy-install-service-tailscale
similarity index 72%
rename from bin/omarchy-install-tailscale
rename to bin/omarchy-install-service-tailscale
index 1c37ba41..c93295c0 100755
--- a/bin/omarchy-install-tailscale
+++ b/bin/omarchy-install-service-tailscale
@@ -10,4 +10,10 @@ echo -e "\nStarting Tailscale..."
 sudo systemctl enable --now tailscaled.service
 sudo tailscale up --accept-routes
 
+echo -e "\nAllowing $USER to manage Tailscale..."
+sudo tailscale set --operator="$USER"
+
+echo -e "\nAdding Tailscale to the bar..."
+omarchy-config-shell-bar add omarchy.tailscale
+
 omarchy-webapp-install "Tailscale" "https://login.tailscale.com/admin/machines" https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tailscale-light.png
diff --git a/bin/omarchy-install-terminal b/bin/omarchy-install-terminal
index 2fb040dd..a32a7a33 100755
--- a/bin/omarchy-install-terminal
+++ b/bin/omarchy-install-terminal
@@ -30,10 +30,10 @@ if omarchy-pkg-add $package; then
   # Copy custom desktop entries with X-TerminalArg* keys
   if [[ $package == "alacritty" ]]; then
     mkdir -p ~/.local/share/applications
-    cp "$OMARCHY_PATH/applications/$desktop_id" ~/.local/share/applications/
+    cp "$OMARCHY_PATH/default/alacritty/$desktop_id" ~/.local/share/applications/
   elif [[ $package == "foot" ]]; then
     mkdir -p ~/.local/share/applications
-    cp "$OMARCHY_PATH/default/foot/$desktop_id" ~/.local/share/applications/
+    cp "$OMARCHY_PATH/applications/$desktop_id" ~/.local/share/applications/
   fi
 
   # Copy default config for optional terminals when missing
diff --git a/bin/omarchy-launch-ai b/bin/omarchy-launch-ai
new file mode 100755
index 00000000..368c2ece
--- /dev/null
+++ b/bin/omarchy-launch-ai
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# omarchy:summary=Launch the default AI coding harness in a project path
+# omarchy:args=[--path <path>] [--prompt <prompt>] [--harness <pi|claude|codex|opencode>] [path]
+# omarchy:examples=omarchy launch ai --path ~/.config/omarchy/plugins/local.clock | omarchy launch ai --harness claude --path . --prompt "Review this plugin"
+
+set -euo pipefail
+
+path="."
+prompt=""
+harness=""
+
+usage() {
+  cat <<'USAGE'
+Usage: omarchy-launch-ai [--path <path>] [--prompt <prompt>] [--harness <pi|claude|codex|opencode>] [path]
+
+Launches an interactive AI coding harness in the given path. If no harness is
+provided, uses the value from `omarchy default ai`.
+USAGE
+}
+
+fail() {
+  echo "omarchy-launch-ai: $*" >&2
+  exit 1
+}
+
+while (( $# > 0 )); do
+  case "$1" in
+  --path)
+    path="${2:-}"
+    [[ -n $path ]] || fail "--path requires a value"
+    shift 2
+    ;;
+  --prompt)
+    prompt="${2:-}"
+    shift 2
+    ;;
+  --harness)
+    harness="${2:-}"
+    [[ -n $harness ]] || fail "--harness requires a value"
+    shift 2
+    ;;
+  -h | --help)
+    usage
+    exit 0
+    ;;
+  --)
+    shift
+    break
+    ;;
+  --*)
+    fail "unknown option: $1"
+    ;;
+  *)
+    path="$1"
+    shift
+    ;;
+  esac
+done
+
+[[ -d $path ]] || fail "path is not a directory: $path"
+path=$(cd "$path" && pwd)
+
+if [[ -z $harness ]]; then
+  harness=$(omarchy-default-ai)
+fi
+
+case "$harness" in
+pi | claude | codex | opencode)
+  ;;
+*)
+  fail "unknown AI harness: $harness"
+  ;;
+esac
+
+launch_in_place() {
+  cd "$path"
+  case "$harness" in
+  pi)
+    omarchy-cmd-present pi || fail "pi is not installed"
+    if [[ -n $prompt ]]; then exec pi "$prompt"; else exec pi; fi
+    ;;
+  claude)
+    omarchy-cmd-present claude || fail "claude is not installed"
+    if [[ -n $prompt ]]; then exec claude "$prompt"; else exec claude; fi
+    ;;
+  codex)
+    omarchy-cmd-present codex || fail "codex is not installed"
+    if [[ -n $prompt ]]; then exec codex "$prompt"; else exec codex; fi
+    ;;
+  opencode)
+    omarchy-cmd-present opencode || fail "opencode is not installed"
+    if [[ -n $prompt ]]; then exec opencode --prompt "$prompt" .; else exec opencode .; fi
+    ;;
+  esac
+}
+
+if [[ -t 0 && -t 1 ]]; then
+  launch_in_place
+fi
+
+quoted_path=$(printf '%q' "$path")
+quoted_prompt=$(printf '%q' "$prompt")
+quoted_harness=$(printf '%q' "$harness")
+exec omarchy-launch-tui bash -lc "cd $quoted_path && exec omarchy-launch-ai --harness $quoted_harness --prompt $quoted_prompt --path ."
diff --git a/bin/omarchy-launch-audio b/bin/omarchy-launch-audio
deleted file mode 100755
index c3d2592c..00000000
--- a/bin/omarchy-launch-audio
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Launch the Omarchy audio controls TUI (provided by wiremix).
-
-omarchy-launch-or-focus-tui wiremix
diff --git a/bin/omarchy-launch-bar-settings b/bin/omarchy-launch-bar-settings
new file mode 100755
index 00000000..23a557c9
--- /dev/null
+++ b/bin/omarchy-launch-bar-settings
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Open the Omarchy bar config panel
+
+exec omarchy-shell shell openBarConfig
diff --git a/bin/omarchy-launch-battlenet b/bin/omarchy-launch-battlenet
new file mode 100755
index 00000000..abaa85e5
--- /dev/null
+++ b/bin/omarchy-launch-battlenet
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# omarchy:summary=Launch the installed Battle.net client via umu-launcher + GE-Proton.
+# omarchy:args=[--with-mangohud]
+# omarchy:examples=omarchy launch battlenet | omarchy launch battlenet --with-mangohud
+
+set -e
+
+PREFIX="$HOME/Games/battlenet"
+LAUNCHER="$PREFIX/drive_c/Program Files (x86)/Battle.net/Battle.net Launcher.exe"
+
+with_mangohud=0
+for arg in "$@"; do
+  case "$arg" in
+    --with-mangohud) with_mangohud=1 ;;
+    -h|--help)
+      cat <<'EOF'
+Usage: omarchy-launch-battlenet [--with-mangohud]
+
+Options:
+  --with-mangohud   Enable the MangoHud FPS overlay for games launched from
+                    Battle.net. Toggle perf logging in-game with Shift_L+F2;
+                    CSV logs land in ~/mangohud/.
+EOF
+      exit 0
+      ;;
+    *)
+      echo "Unknown argument: $arg" >&2
+      echo "Try: omarchy-launch-battlenet --help" >&2
+      exit 1
+      ;;
+  esac
+done
+
+if [[ ! -f $LAUNCHER ]]; then
+  echo "Battle.net is not installed. Run omarchy-install-gaming-battlenet first." >&2
+  exit 1
+fi
+
+env_args=(
+  WINEPREFIX="$PREFIX"
+  PROTONPATH=GE-Proton
+  GAMEID=umu-battlenet
+  PROTON_VERB=run
+)
+(( with_mangohud )) && env_args+=(MANGOHUD=1)
+
+env "${env_args[@]}" umu-run "$LAUNCHER"
diff --git a/bin/omarchy-launch-bluetooth b/bin/omarchy-launch-bluetooth
deleted file mode 100755
index 8c450261..00000000
--- a/bin/omarchy-launch-bluetooth
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Launch the Omarchy bluetooth controls TUI (provided by bluetui).
-
-rfkill unblock bluetooth
-exec omarchy-launch-or-focus-tui bluetui
diff --git a/bin/omarchy-launch-browser b/bin/omarchy-launch-browser
index fefc935e..f1076e79 100755
--- a/bin/omarchy-launch-browser
+++ b/bin/omarchy-launch-browser
@@ -6,7 +6,7 @@
 default_browser=$(xdg-settings get default-web-browser)
 browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)
 
-if $browser_exec --help | grep -q MOZ_LOG; then
+if $browser_exec --help 2>/dev/null | grep -q MOZ_LOG; then
   private_flag="--private-window"
 elif [[ $browser_exec =~ edge ]]; then
   private_flag="--inprivate"
@@ -14,4 +14,6 @@ else
   private_flag="--incognito"
 fi
 
-exec setsid uwsm-app -- "$browser_exec" "${@/--private/$private_flag}"
+systemd-run --user --quiet --collect --unit="omarchy-browser-$(date +%s%N)" \
+  --property=StandardOutput=null --property=StandardError=null \
+  uwsm-app -- "$browser_exec" "${@/--private/$private_flag}"
diff --git a/bin/omarchy-launch-config-editor b/bin/omarchy-launch-config-editor
new file mode 100755
index 00000000..ffe100e9
--- /dev/null
+++ b/bin/omarchy-launch-config-editor
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# omarchy:summary=Open a config file in the user's editor and surface a toast
+# omarchy:args=<path>
+# omarchy:examples=omarchy launch config-editor ~/.config/hypr/hyprland.lua
+
+path="${1-}"
+
+if [[ -z $path ]]; then
+  echo "Usage: omarchy-launch-config-editor <path>" >&2
+  exit 1
+fi
+
+omarchy-notification-send -u low "Editing config file" "$path"
+exec omarchy-launch-editor "$path"
diff --git a/bin/omarchy-launch-editor b/bin/omarchy-launch-editor
index 9c3ec369..8a69dabd 100755
--- a/bin/omarchy-launch-editor
+++ b/bin/omarchy-launch-editor
@@ -1,15 +1,34 @@
 #!/bin/bash
 
-# omarchy:summary=Launch the default editor as determined by $EDITOR (set via ~/.config/uwsm/default) (or nvim if missing).
-# omarchy:args=<path>
+# omarchy:summary=Launch the default editor selected via Omarchy defaults.
+# omarchy:args=[--inline] <path>
 
-omarchy-cmd-present "$EDITOR" || EDITOR=nvim
+default_editor="$HOME/.local/state/omarchy/defaults/editor"
 
-case "$EDITOR" in
+if [[ ${1:-} == "--inline" ]]; then
+  inline=true
+  shift
+else
+  inline=false
+fi
+
+if [[ -f $default_editor ]]; then
+  read -r editor <"$default_editor"
+else
+  editor="nvim"
+fi
+
+omarchy-cmd-present "$editor" || editor="nvim"
+
+case "${editor##*/}" in
 nvim | vim | nano | micro | hx | helix | fresh)
-  exec omarchy-launch-tui "$EDITOR" "$@"
+  if [[ $inline == "true" ]]; then
+    exec "$editor" "$@"
+  else
+    exec omarchy-launch-tui "$editor" "$@"
+  fi
   ;;
 *)
-  exec setsid uwsm-app -- "$EDITOR" "$@"
+  exec setsid uwsm-app -- "$editor" "$@"
   ;;
 esac
diff --git a/bin/omarchy-launch-nautilus b/bin/omarchy-launch-nautilus
new file mode 100755
index 00000000..0b10b7b2
--- /dev/null
+++ b/bin/omarchy-launch-nautilus
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Launch Files
+
+exec setsid uwsm-app -- nautilus --new-window
diff --git a/bin/omarchy-launch-nautilus-cwd b/bin/omarchy-launch-nautilus-cwd
new file mode 100755
index 00000000..ae9a0d88
--- /dev/null
+++ b/bin/omarchy-launch-nautilus-cwd
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Launch Files in the active terminal's current directory
+
+exec setsid uwsm-app -- nautilus --new-window "$(omarchy-cmd-terminal-cwd)"
diff --git a/bin/omarchy-launch-or-focus b/bin/omarchy-launch-or-focus
index 44164bb5..11f65c5f 100755
--- a/bin/omarchy-launch-or-focus
+++ b/bin/omarchy-launch-or-focus
@@ -13,7 +13,7 @@ LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
 WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
 
 if [[ -n $WINDOW_ADDRESS ]]; then
-  hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
+  hyprctl dispatch "hl.dsp.focus({ window = \"address:$WINDOW_ADDRESS\" })" >/dev/null 2>&1 || hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
 else
   eval exec setsid $LAUNCH_COMMAND
 fi
diff --git a/bin/omarchy-launch-screensaver b/bin/omarchy-launch-screensaver
index 0cd64a70..846d7801 100755
--- a/bin/omarchy-launch-screensaver
+++ b/bin/omarchy-launch-screensaver
@@ -6,54 +6,47 @@ if ! command -v tte &>/dev/null; then
   exit 1
 fi
 
-# Exit early if screensave is already running
-pgrep -f org.omarchy.screensaver && exit 0
+# Exit early if screensaver is already running
+pgrep -f '[o]rg.omarchy.screensaver' && exit 0
 
 # Allow screensaver to be turned off but also force started
 if omarchy-toggle-enabled screensaver-off && [[ $1 != "force" ]]; then
   exit 1
 fi
 
-# Silently quit Walker on overlay
-walker -q
-
 focused=$(omarchy-hyprland-monitor-focused)
 terminal=$(xdg-terminal-exec --print-id)
 
+hypr_focus_monitor() {
+  hyprctl dispatch "hl.dsp.focus({ monitor = \"$1\" })" >/dev/null 2>&1 || hyprctl dispatch focusmonitor "$1" >/dev/null
+}
+
+hypr_exec() {
+  local command="$1"
+
+  hyprctl dispatch "hl.dsp.exec_cmd([[$command]])" >/dev/null 2>&1 || hyprctl dispatch exec -- bash -lc "$command" >/dev/null
+}
+
 for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
-  hyprctl dispatch focusmonitor $m
+  hypr_focus_monitor "$m"
 
   case $terminal in
   *Alacritty*)
-    hyprctl dispatch exec -- \
-      alacritty --class=org.omarchy.screensaver \
-      --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
-      -e omarchy-screensaver
+    hypr_exec "alacritty --class=org.omarchy.screensaver --config-file $OMARCHY_PATH/default/alacritty/screensaver.toml -e omarchy-screensaver"
     ;;
   *ghostty*)
-    hyprctl dispatch exec -- \
-      ghostty --class=org.omarchy.screensaver \
-      --config-file=~/.local/share/omarchy/default/ghostty/screensaver \
-      --font-size=18 \
-      -e omarchy-screensaver
+    hypr_exec "ghostty --class=org.omarchy.screensaver --config-file=$OMARCHY_PATH/default/ghostty/screensaver --font-size=18 -e omarchy-screensaver"
     ;;
   *foot*)
-    hyprctl dispatch exec -- \
-      foot --app-id=org.omarchy.screensaver \
-      --config="$OMARCHY_PATH/default/foot/screensaver.ini" \
-      -e omarchy-screensaver
+    hypr_exec "foot --app-id=org.omarchy.screensaver --config=\"$OMARCHY_PATH/default/foot/screensaver.ini\" -e omarchy-screensaver"
     ;;
   *kitty*)
-    hyprctl dispatch exec -- \
-      kitty --class=org.omarchy.screensaver \
-      --override font_size=18 \
-      --override window_padding_width=0 \
-      -e omarchy-screensaver
+    hypr_exec "kitty --class=org.omarchy.screensaver --override font_size=18 --override window_padding_width=0 -e omarchy-screensaver"
     ;;
   *)
-    notify-send -u low "✋  Screensaver only runs in Alacritty, Foot, Ghostty, or Kitty"
+    omarchy-notification-send -g ✋ "Screensaver only runs in Alacritty, Foot, Ghostty, or Kitty"
     ;;
   esac
 done
 
-hyprctl dispatch focusmonitor $focused
+hypr_focus_monitor "$focused"
diff --git a/bin/omarchy-launch-signal b/bin/omarchy-launch-signal
new file mode 100755
index 00000000..31d94cce
--- /dev/null
+++ b/bin/omarchy-launch-signal
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# omarchy:summary=Launch Signal or start its installer when missing.
+
+set -e
+
+WINDOW_ADDRESS=$(hyprctl clients -j | jq -r '.[]|select((.class|test("\\bsignal\\b";"i")) or (.title|test("\\bsignal\\b";"i")))|.address' | head -n1)
+
+if [[ -n $WINDOW_ADDRESS ]]; then
+  hyprctl dispatch "hl.dsp.focus({ window = \"address:$WINDOW_ADDRESS\" })" >/dev/null 2>&1 || hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
+elif [[ -x /usr/bin/signal-desktop ]]; then
+  exec setsid uwsm-app -- /usr/bin/signal-desktop
+else
+  exec omarchy-launch-floating-terminal-with-presentation omarchy-install-service-signal
+fi
diff --git a/bin/omarchy-launch-spotify b/bin/omarchy-launch-spotify
new file mode 100755
index 00000000..d94202a3
--- /dev/null
+++ b/bin/omarchy-launch-spotify
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# omarchy:summary=Launch Spotify or start its installer when missing.
+
+set -e
+
+WINDOW_ADDRESS=$(hyprctl clients -j | jq -r '.[]|select((.class|test("\\bspotify\\b";"i")) or (.title|test("\\bspotify\\b";"i")))|.address' | head -n1)
+
+if [[ -n $WINDOW_ADDRESS ]]; then
+  hyprctl dispatch "hl.dsp.focus({ window = \"address:$WINDOW_ADDRESS\" })" >/dev/null 2>&1 || hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
+elif [[ -x /usr/bin/spotify ]]; then
+  exec setsid uwsm-app -- /usr/bin/spotify
+else
+  exec omarchy-launch-floating-terminal-with-presentation omarchy-install-service-spotify
+fi
diff --git a/bin/omarchy-launch-terminal b/bin/omarchy-launch-terminal
new file mode 100755
index 00000000..a07a1dde
--- /dev/null
+++ b/bin/omarchy-launch-terminal
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# omarchy:summary=Launch a terminal in the active terminal's current directory
+# omarchy:args=[command...]
+
+exec setsid uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)" "$@"
diff --git a/bin/omarchy-launch-terminal-tmux b/bin/omarchy-launch-terminal-tmux
new file mode 100755
index 00000000..2b70179c
--- /dev/null
+++ b/bin/omarchy-launch-terminal-tmux
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Launch or attach to the Work tmux session in a terminal
+
+exec omarchy-launch-terminal bash -c "tmux attach || tmux new -s Work"
diff --git a/bin/omarchy-launch-walker b/bin/omarchy-launch-walker
deleted file mode 100755
index d6af04e1..00000000
--- a/bin/omarchy-launch-walker
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Launch Walker and ensure its Elephant data provider is running
-
-if ! pgrep -x elephant > /dev/null; then
-  setsid uwsm-app -- elephant &
-fi
-
-# Ensure walker service is running
-if ! pgrep -f "walker --gapplication-service" > /dev/null; then
-  setsid uwsm-app -- env GSK_RENDERER=cairo walker --gapplication-service &
-fi
-
-exec walker --width 644 --maxheight 300 --minheight 300 "$@"
diff --git a/bin/omarchy-launch-wifi b/bin/omarchy-launch-wifi
deleted file mode 100755
index e22b7083..00000000
--- a/bin/omarchy-launch-wifi
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Launch the Omarchy wifi controls (provided by the Impala TUI).
-
-rfkill unblock wifi
-omarchy-launch-or-focus-tui impala
diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index 9f098c92..59e4af8e 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -1,891 +1,52 @@
 #!/bin/bash
 
-# omarchy:summary=Launch the Omarchy Menu or takes a parameter to jump straight to a submenu.
+# omarchy:summary=Control the Omarchy menu (toggle / summon / close / refresh)
+# omarchy:args=[toggle|summon|close|refresh|ping] [route]
+# omarchy:examples=omarchy menu | omarchy menu toggle system | omarchy menu summon style.theme | omarchy menu refresh
 
-# Set to true when going directly to a submenu, so we can exit directly
-BACK_TO_EXIT=false
+# Thin wrapper around the standard plugin IPC surface. The menu is the
+# first-party `omarchy.menu` plugin; routes are passed as JSON payload.
 
-back_to() {
-  local parent_menu="$1"
+set -euo pipefail
 
-  if [[ $BACK_TO_EXIT == "true" ]]; then
-    exit 0
-  elif [[ -n $parent_menu ]]; then
-    "$parent_menu"
-  else
-    show_main_menu
-  fi
+verb="${1-toggle}"
+route="${2-root}"
+
+menu_payload() {
+  perl -MEncode=decode -MJSON::PP=encode_json -e 'print encode_json({ menu => decode("UTF-8", $ARGV[0]) })' "$1"
 }
 
-toggle_existing_menu() {
-  if pgrep -f "walker.*--dmenu" >/dev/null; then
-    walker --close >/dev/null 2>&1
-    exit 0
-  fi
-}
-
-menu() {
-  local prompt="$1"
-  local options="$2"
-  local extra="$3"
-  local preselect="$4"
-
-  read -r -a args <<<"$extra"
-
-  if [[ -n $preselect ]]; then
-    local index
-    index=$(echo -e "$options" | grep -nxF "$preselect" | cut -d: -f1)
-    if [[ -n $index ]]; then
-      args+=("-c" "$index")
-    fi
-  fi
-
-  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 630 -p "$prompt…" "${args[@]}" 2>/dev/null
-}
-
-terminal() {
-  xdg-terminal-exec --app-id=org.omarchy.terminal "$@"
-}
-
-present_terminal() {
-  omarchy-launch-floating-terminal-with-presentation $1
-}
-
-open_in_editor() {
-  notify-send -u low "Editing config file" "$1"
-  omarchy-launch-editor "$1"
-}
-
-install() {
-  present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2"
-}
-
-install_and_launch() {
-  present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2 && setsid gtk-launch $3"
-}
-
-install_font() {
-  present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2 && sleep 2 && omarchy-font-set '$3'"
-}
-
-install_terminal() {
-  present_terminal "omarchy-install-terminal $1"
-}
-
-aur_install() {
-  present_terminal "echo 'Installing $1 from AUR...'; omarchy-pkg-aur-add $2"
-}
-
-aur_install_and_launch() {
-  present_terminal "echo 'Installing $1 from AUR...'; omarchy-pkg-aur-add $2 && setsid gtk-launch $3"
-}
-
-show_learn_menu() {
-  case $(menu "Learn" "  Keybindings\n  Omarchy\n  Hyprland\n󰣇  Arch\n  Neovim\n󱆃  Bash") in
-  *Keybindings*) omarchy-menu-keybindings ;;
-  *Omarchy*) omarchy-launch-webapp "https://learn.omacom.io/2/the-omarchy-manual" ;;
-  *Hyprland*) omarchy-launch-webapp "https://wiki.hypr.land/" ;;
-  *Arch*) omarchy-launch-webapp "https://wiki.archlinux.org/title/Main_page" ;;
-  *Bash*) omarchy-launch-webapp "https://devhints.io/bash" ;;
-  *Neovim*) omarchy-launch-webapp "https://www.lazyvim.org/keymaps" ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_trigger_menu() {
-  case $(menu "Trigger" "󰔛  Reminder\n  Capture\n󰧸  Transcode\n  Share\n󰔎  Toggle\n  Hardware") in
-  *Reminder*) show_reminder_menu ;;
-  *Capture*) show_capture_menu ;;
-  *Transcode*) omarchy-transcode || back_to show_trigger_menu ;;
-  *Share*) show_share_menu ;;
-  *Toggle*) show_toggle_menu ;;
-  *Hardware*) show_hardware_menu ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_reminder_menu() {
-  case $(menu "Reminder" "󰔛  Set one\n󰔛  Show all\n󰔛  Clear all") in
-  *Set*) show_custom_reminder_input ;;
-  *"Show all"*) omarchy-reminder show ;;
-  *"Clear all"*) omarchy-reminder clear ;;
-  *) back_to show_trigger_menu ;;
-  esac
-}
-
-show_custom_reminder_input() {
-  local minutes
-  minutes=$(omarchy-menu-input "Remind in minutes")
-
-  if [[ $minutes =~ ^[0-9]+$ ]] && ((minutes > 0)); then
-    show_reminder_message_input "$minutes"
-  elif [[ -n $minutes ]]; then
-    omarchy-notification-send "󰔛" "Invalid reminder" "Enter the number of minutes" -u critical
-    show_custom_reminder_input
-  else
-    back_to show_reminder_menu
-  fi
-}
-
-show_reminder_message_input() {
-  local minutes="$1"
-  local message
-  message=$(omarchy-menu-input "Reminder message")
-
-  if [[ -n $message ]]; then
-    omarchy-reminder "$minutes" "$message"
-  else
-    omarchy-reminder "$minutes"
-  fi
-}
-
-show_capture_menu() {
-  case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰴑  Text Extraction\n󰃉  Color") in
-  *Screenshot*) omarchy-capture-screenshot ;;
-  *Screenrecord*) show_screenrecord_menu ;;
-  *Text*) omarchy-capture-text-extraction ;;
-  *Color*) pkill hyprpicker || hyprpicker -a ;;
-  *) back_to show_trigger_menu ;;
-  esac
-}
-
-get_webcam_list() {
-  v4l2-ctl --list-devices 2>/dev/null | while IFS= read -r line; do
-    if [[ $line != $'\t'* && -n $line ]]; then
-      local name="$line"
-      IFS= read -r device || break
-      device=$(echo "$device" | tr -d '\t' | head -1)
-      [[ -n $device ]] && echo "$device  $name"
-    fi
-  done
-}
-
-show_webcam_select_menu() {
-  local devices=$(get_webcam_list)
-  local count=$(echo "$devices" | grep -c . 2>/dev/null || echo 0)
-
-  if [[ -z $devices ]] || ((count == 0)); then
-    notify-send "No webcam devices found" -u critical -t 3000
-    return 1
-  fi
-
-  if ((count == 1)); then
-    echo "$devices" | awk '{print $1}'
-  else
-    menu "Select Webcam" "$devices" | awk '{print $1}'
-  fi
-}
-
-show_screenrecord_menu() {
-  omarchy-capture-screenrecording --stop-recording && exit 0
-
-  case $(menu "Screenrecord" "  With no audio\n  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
-  *"With no audio") omarchy-capture-screenrecording ;;
-  *"With desktop audio") omarchy-capture-screenrecording --with-desktop-audio ;;
-  *"With desktop + microphone audio") omarchy-capture-screenrecording --with-desktop-audio --with-microphone-audio ;;
-  *"With desktop + microphone audio + webcam")
-    local device=$(show_webcam_select_menu) || {
-      back_to show_capture_menu
-      return
-    }
-    omarchy-capture-screenrecording --with-desktop-audio --with-microphone-audio --with-webcam --webcam-device="$device"
+case "$verb" in
+  toggle)
+    exec omarchy-shell shell toggle omarchy.menu "$(menu_payload "$route")"
     ;;
-  *) back_to show_capture_menu ;;
-  esac
-}
-
-show_share_menu() {
-  case $(menu "Share" "  Clipboard\n  File \n  Folder") in
-  *Clipboard*) omarchy-menu-share clipboard ;;
-  *File*) terminal bash -c "omarchy-menu-share file" ;;
-  *Folder*) terminal bash -c "omarchy-menu-share folder" ;;
-  *) back_to show_trigger_menu ;;
-  esac
-}
-
-show_toggle_menu() {
-  local options="󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰂛  Notifications\n󰍜  Top Bar\n󱂬  Workspace Layout\n  Window Gaps\n  1-Window Ratio\n󰍹  Monitor Scaling\n  Direct Boot\n󰟵  Passwordless Sudo"
-
-  case $(menu "Toggle" "$options") in
-  *Screensaver*) omarchy-toggle-screensaver ;;
-  *Nightlight*) omarchy-toggle-nightlight ;;
-  *Idle*) omarchy-toggle-idle ;;
-  *Notifications*) omarchy-toggle-notification-silencing ;;
-  *Bar*) omarchy-toggle-waybar ;;
-  *Layout*) omarchy-hyprland-workspace-layout-toggle ;;
-  *Ratio*) omarchy-hyprland-window-single-square-aspect-toggle ;;
-  *Gaps*) omarchy-hyprland-window-gaps-toggle ;;
-  *Scaling*) omarchy-hyprland-monitor-scaling-cycle ;;
-  *"Direct Boot"*) present_terminal omarchy-config-direct-boot ;;
-  *"Passwordless Sudo"*) present_terminal omarchy-sudo-passwordless ;;
-  *) back_to show_trigger_menu ;;
-  esac
-}
-
-show_hardware_menu() {
-  local options="󰛧  Laptop Display\n 󰍹  Mirror Display"
-
-  if omarchy-hw-hybrid-gpu; then
-    options="$options\n  Hybrid GPU"
-  fi
-
-  if omarchy-hw-touchpad; then
-    options="$options\n󰟸  Touchpad"
-  fi
-
-  if omarchy-hw-dell-xps-haptic-touchpad && omarchy-cmd-present dell-xps-touchpad-haptics; then
-    options="$options\n󰌌  Touchpad Haptics"
-  fi
-
-  if omarchy-hw-touchscreen; then
-    options="$options\n󰆽  Touchscreen"
-  fi
-
-  case $(menu "Toggle" "$options") in
-  *Laptop*) omarchy-hyprland-monitor-internal toggle ;;
-  *Mirror*) omarchy-hyprland-monitor-internal-mirror toggle ;;
-  *Haptics*) show_hardware_touchpad_haptics_menu ;;
-  *Touchpad*) omarchy-toggle-touchpad ;;
-  *Touchscreen*) omarchy-toggle-touchscreen ;;
-  *"Hybrid GPU"*) present_terminal omarchy-toggle-hybrid-gpu ;;
-  *) back_to show_trigger_menu ;;
-  esac
-}
-
-show_hardware_touchpad_haptics_menu() {
-  local current=$(dell-xps-touchpad-haptics get)
-  local selected=$(menu "Touchpad Haptics" "low\nmid\nhigh" "" "$current")
-
-  if [[ -n $selected ]]; then
-    dell-xps-touchpad-haptics set "$selected"
-  else
-    back_to show_hardware_menu
-  fi
-}
-
-show_style_menu() {
-  case $(menu "Style" "󰸌  Theme\n󰟵  Unlock\n  Font\n  Background\n  Hyprland\n󱄄  Screensaver\n  About") in
-  *Theme*) show_theme_menu ;;
-  *Unlock*) omarchy-launch-walker -m menus:omarchyunlocks --width 800 --minheight 400 ;;
-  *Font*) show_font_menu ;;
-  *Background*) show_background_menu ;;
-  *Hyprland*) open_in_editor ~/.config/hypr/looknfeel.conf ;;
-  *Screensaver*) show_screensaver_menu ;;
-  *About*) show_about_menu ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_about_menu() {
-  case $(menu "About" "  Edit Text\n  Set From Image\n  Restore Default") in
-  *Text*) omarchy-branding-about text ;;
-  *Image*) omarchy-branding-about image ;;
-  *Default*) omarchy-branding-about reset ;;
-  *) show_style_menu ;;
-  esac
-}
-
-show_screensaver_menu() {
-  case $(menu "Screensaver" "  Edit Text\n  Set From Image\n  Restore Default") in
-  *Text*) omarchy-branding-screensaver text ;;
-  *Image*) omarchy-branding-screensaver image ;;
-  *Default*) omarchy-branding-screensaver reset ;;
-  *) show_style_menu ;;
-  esac
-}
-
-show_theme_menu() {
-  omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
-}
-
-show_background_menu() {
-  omarchy-launch-walker -m menus:omarchyBackgroundSelector --width 800 --minheight 400
-}
-
-show_font_menu() {
-  theme=$(menu "Font" "$(omarchy-font-list)" "--width 350" "$(omarchy-font-current)")
-  if [[ $theme == "CNCLD" || -z $theme ]]; then
-    back_to show_style_menu
-  else
-    omarchy-font-set "$theme"
-  fi
-}
-
-show_setup_menu() {
-  local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n  System Sleep\n󰍹  Monitors"
-  [[ -f ~/.config/hypr/bindings.conf ]] && options="$options\n  Keybindings"
-  [[ -f ~/.config/hypr/input.conf ]] && options="$options\n  Input"
-  options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
-
-  case $(menu "Setup" "$options") in
-  *Audio*) omarchy-launch-audio ;;
-  *Wifi*) omarchy-launch-wifi ;;
-  *Bluetooth*) omarchy-launch-bluetooth ;;
-  *Power*) show_setup_power_menu ;;
-  *System*) show_setup_system_menu ;;
-  *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
-  *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
-  *Input*) open_in_editor ~/.config/hypr/input.conf ;;
-  *Defaults*) show_setup_default_menu ;;
-  *DNS*) present_terminal omarchy-setup-dns ;;
-  *Security*) show_setup_security_menu ;;
-  *Config*) show_setup_config_menu ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_setup_power_menu() {
-  profile=$(menu "Power Profile" "$(omarchy-powerprofiles-list)" "" "$(powerprofilesctl get)")
-
-  if [[ $profile == "CNCLD" || -z $profile ]]; then
-    back_to show_setup_menu
-  else
-    powerprofilesctl set "$profile"
-  fi
-}
-
-show_setup_security_menu() {
-  case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
-  *Fingerprint*) present_terminal omarchy-setup-security-fingerprint ;;
-  *Fido2*) present_terminal omarchy-setup-security-fido2 ;;
-  *) show_setup_menu ;;
-  esac
-}
-
-show_setup_default_menu() {
-  case $(menu "Default" "  Browser\n  Terminal\n  Editor") in
-  *Browser*) show_setup_default_browser_menu ;;
-  *Terminal*) show_setup_default_terminal_menu ;;
-  *Editor*) show_setup_default_editor_menu ;;
-  *) show_setup_menu ;;
-  esac
-}
-
-browser_desktop_exists() {
-  [[ -f ~/.local/share/applications/$1 || -f ~/.nix-profile/share/applications/$1 || -f /usr/share/applications/$1 ]]
-}
-
-show_setup_default_browser_menu() {
-  local options=""
-  browser_desktop_exists chromium.desktop && options="$options  Chromium"
-  browser_desktop_exists google-chrome.desktop && options="${options:+$options\n}󰊯  Chrome"
-  browser_desktop_exists brave-browser.desktop && options="${options:+$options\n}󰖟  Brave"
-  browser_desktop_exists brave-origin-beta.desktop && options="${options:+$options\n}󰖟  Brave Origin"
-  browser_desktop_exists microsoft-edge.desktop && options="${options:+$options\n}󰇩  Edge"
-  browser_desktop_exists firefox.desktop && options="${options:+$options\n}󰈹  Firefox"
-  browser_desktop_exists zen.desktop && options="${options:+$options\n}󰖟  Zen"
-
-  local current=""
-  case "$(omarchy-default-browser)" in
-  chromium) current="  Chromium" ;;
-  chrome) current="󰊯  Chrome" ;;
-  brave) current="󰖟  Brave" ;;
-  brave-origin) current="󰖟  Brave Origin" ;;
-  edge) current="󰇩  Edge" ;;
-  firefox) current="󰈹  Firefox" ;;
-  zen) current="󰖟  Zen" ;;
-  esac
-
-  case $(menu "Default Browser" "$options" "" "$current") in
-  *Chromium*) omarchy-default-browser chromium ;;
-  *Chrome*) omarchy-default-browser chrome ;;
-  *"Brave Origin"*) omarchy-default-browser brave-origin ;;
-  *Brave*) omarchy-default-browser brave ;;
-  *Edge*) omarchy-default-browser edge ;;
-  *Firefox*) omarchy-default-browser firefox ;;
-  *Zen*) omarchy-default-browser zen ;;
-  *) show_setup_default_menu ;;
-  esac
-}
-
-show_setup_default_terminal_menu() {
-  local options=""
-  omarchy-cmd-present alacritty && options="$options  Alacritty"
-  omarchy-cmd-present foot && options="${options:+$options\n}  Foot"
-  omarchy-cmd-present ghostty && options="${options:+$options\n}  Ghostty"
-  omarchy-cmd-present kitty && options="${options:+$options\n}  Kitty"
-
-  local current=""
-  case "$(omarchy-default-terminal)" in
-  alacritty) current="  Alacritty" ;;
-  foot) current="  Foot" ;;
-  ghostty) current="  Ghostty" ;;
-  kitty) current="  Kitty" ;;
-  esac
-
-  case $(menu "Default Terminal" "$options" "" "$current") in
-  *Alacritty*) omarchy-default-terminal alacritty ;;
-  *Foot*) omarchy-default-terminal foot ;;
-  *Ghostty*) omarchy-default-terminal ghostty ;;
-  *Kitty*) omarchy-default-terminal kitty ;;
-  *) show_setup_default_menu ;;
-  esac
-}
-
-show_setup_default_editor_menu() {
-  local options=""
-  omarchy-cmd-present nvim && options="$options  Neovim"
-  omarchy-cmd-present code && options="${options:+$options\n}  VSCode"
-  omarchy-cmd-present cursor && options="${options:+$options\n}  Cursor"
-  omarchy-cmd-present zeditor && options="${options:+$options\n}  Zed"
-  omarchy-cmd-present sublime_text && options="${options:+$options\n}  Sublime Text"
-  omarchy-cmd-present helix && options="${options:+$options\n}  Helix"
-  omarchy-cmd-present vim && options="${options:+$options\n}  Vim"
-  omarchy-cmd-present emacs && options="${options:+$options\n}  Emacs"
-
-  local current=""
-  case "$(omarchy-default-editor)" in
-  nvim) current="  Neovim" ;;
-  code) current="  VSCode" ;;
-  cursor) current="  Cursor" ;;
-  zed | zeditor) current="  Zed" ;;
-  sublime_text) current="  Sublime Text" ;;
-  helix) current="  Helix" ;;
-  vim) current="  Vim" ;;
-  emacs) current="  Emacs" ;;
-  esac
-
-  case $(menu "Default Editor" "$options" "" "$current") in
-  *Neovim*) omarchy-default-editor nvim ;;
-  *VSCode*) omarchy-default-editor code ;;
-  *Cursor*) omarchy-default-editor cursor ;;
-  *Zed*) omarchy-default-editor zed ;;
-  *Sublime*) omarchy-default-editor sublime_text ;;
-  *Helix*) omarchy-default-editor helix ;;
-  *Vim*) omarchy-default-editor vim ;;
-  *Emacs*) omarchy-default-editor emacs ;;
-  *) show_setup_default_menu ;;
-  esac
-}
-
-show_setup_config_menu() {
-  case $(menu "Setup" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar\n󰞅  XCompose") in
-  *Hyprland*) open_in_editor ~/.config/hypr/hyprland.conf ;;
-  *Hypridle*) open_in_editor ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
-  *Hyprlock*) open_in_editor ~/.config/hypr/hyprlock.conf ;;
-  *Hyprsunset*) open_in_editor ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
-  *Swayosd*) open_in_editor ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
-  *Walker*) open_in_editor ~/.config/walker/config.toml && omarchy-restart-walker ;;
-  *Waybar*) open_in_editor ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
-  *XCompose*) open_in_editor ~/.XCompose && omarchy-restart-xcompose ;;
-  *) show_setup_menu ;;
-  esac
-}
-
-show_setup_system_menu() {
-  local options=""
-
-  if omarchy-toggle-enabled suspend-off; then
-    options="$options󰒲  Enable Suspend"
-  else
-    options="$options󰒲  Disable Suspend"
-  fi
-
-  if omarchy-hibernation-available; then
-    options="$options\n󰤁  Disable Hibernate"
-  else
-    options="$options\n󰤁  Enable Hibernate"
-  fi
-
-  case $(menu "System" "$options") in
-  *Suspend*) omarchy-toggle-suspend ;;
-  *"Enable Hibernate"*) present_terminal omarchy-hibernation-setup ;;
-  *"Disable Hibernate"*) present_terminal omarchy-hibernation-remove ;;
-  *) show_setup_menu ;;
-  esac
-}
-
-show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n  Terminal\n  Browser\n󱚤  AI\n  Gaming\n󰍲  Windows") in
-  *Package*) terminal omarchy-pkg-install ;;
-  *AUR*) terminal omarchy-pkg-aur-install ;;
-  *Web*) present_terminal omarchy-webapp-install ;;
-  *TUI*) present_terminal omarchy-tui-install ;;
-  *Service*) show_install_service_menu ;;
-  *Style*) show_install_style_menu ;;
-  *Development*) show_install_development_menu ;;
-  *Editor*) show_install_editor_menu ;;
-  *Terminal*) show_install_terminal_menu ;;
-  *Browser*) show_install_browser_menu ;;
-  *Gaming*) show_install_gaming_menu ;;
-  *AI*) show_install_ai_menu ;;
-  *Windows*) present_terminal "omarchy-windows-vm install" ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_install_browser_menu() {
-  case $(menu "Install" "  Chrome\n  Edge\n  Brave\n  Brave Origin\n  Firefox\n󰖟  Zen") in
-  *Chrome*) present_terminal "omarchy-install-browser chrome" ;;
-  *Edge*) present_terminal "omarchy-install-browser edge" ;;
-  *"Brave Origin"*) present_terminal "omarchy-install-browser brave-origin" ;;
-  *Brave*) present_terminal "omarchy-install-browser brave" ;;
-  *Firefox*) present_terminal "omarchy-install-browser firefox" ;;
-  *Zen*) present_terminal "omarchy-install-browser zen" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale\n󱇱  NordVPN [AUR]\n󰏖  ONCE\n󰟵  Bitwarden\n  Chromium Account") in
-  *Dropbox*) present_terminal omarchy-install-dropbox ;;
-  *Tailscale*) present_terminal omarchy-install-tailscale ;;
-  *NordVPN*) present_terminal omarchy-install-nordvpn ;;
-  *ONCE*) present_terminal omarchy-install-once ;;
-  *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
-  *Chromium*) present_terminal omarchy-install-chromium-google-account ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Vim\n  Emacs") in
-  *VSCode*) present_terminal omarchy-install-vscode ;;
-  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
-  *Zed*) present_terminal omarchy-install-zed ;;
-  *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
-  *Helix*) present_terminal omarchy-install-helix ;;
-  *Vim*) install "Vim" "vim" ;;
-  *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_terminal_menu() {
-  case $(menu "Install" "  Alacritty\n  Foot\n  Ghostty\n  Kitty") in
-  *Alacritty*) install_terminal "alacritty" ;;
-  *Foot*) install_terminal "foot" ;;
-  *Ghostty*) install_terminal "ghostty" ;;
-  *Kitty*) install_terminal "kitty" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_ai_menu() {
-  ollama_pkg=$(
-    (omarchy-cmd-present nvidia-smi && echo ollama-cuda) ||
-      (omarchy-cmd-present rocminfo && echo ollama-rocm) ||
-      echo ollama
-  )
-
-  case $(menu "Install" "  Dictation\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
-  *Dictation*) present_terminal omarchy-voxtype-install ;;
-  *Studio*) install "LM Studio" "lmstudio-bin" ;;
-  *Ollama*) install "Ollama" $ollama_pkg ;;
-  *Crush*) install "Crush" "crush-bin" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch\n󰍳  Minecraft\n󰢹  NVIDIA GeForce NOW\n  Xbox Cloud Gaming\n󰂯  Xbox Controller\n󰍹  Moonlight (GameStream)\n  Lutris (Battle.net)\n󱓟  Heroic (Epic Games)") in
-  *Steam*) present_terminal omarchy-install-gaming-steam ;;
-  *RetroArch*) present_terminal omarchy-install-gaming-retroarch ;;
-  *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
-  *GeForce*) present_terminal omarchy-install-gaming-geforce-now ;;
-  *"Xbox Cloud"*) present_terminal omarchy-install-gaming-xbox-cloud ;;
-  *Xbox*) present_terminal omarchy-install-gaming-xbox-controllers ;;
-  *Lutris*) present_terminal omarchy-install-gaming-lutris ;;
-  *Heroic*) present_terminal omarchy-install-gaming-heroic ;;
-  *Moonlight*) present_terminal omarchy-install-gaming-moonlight ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_style_menu() {
-  case $(menu "Install" "󰸌  Theme\n  Background\n  Font") in
-  *Theme*) present_terminal omarchy-theme-install ;;
-  *Background*) omarchy-theme-bg-install ;;
-  *Font*) show_install_font_menu ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_font_menu() {
-  case $(menu "Install" "  Cascadia Mono\n  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bitstream Vera Mono\n  Iosevka" "--width 350") in
-  *Cascadia*) install_font "Cascadia Mono" "ttf-cascadia-mono-nerd" "CaskaydiaMono Nerd Font" ;;
-  *Meslo*) install_font "Meslo LG Mono" "ttf-meslo-nerd" "MesloLGL Nerd Font" ;;
-  *Fira*) install_font "Fira Code" "ttf-firacode-nerd" "FiraCode Nerd Font" ;;
-  *Victor*) install_font "Victor Code" "ttf-victor-mono-nerd" "VictorMono Nerd Font" ;;
-  *Bitstream*) install_font "Bitstream Vera Code" "ttf-bitstream-vera-mono-nerd" "BitstromWera Nerd Font" ;;
-  *Iosevka*) install_font "Iosevka" "ttf-iosevka-nerd" "Iosevka Nerd Font Mono" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_development_menu() {
-  case $(menu "Install" "󰫏  Ruby on Rails\n  Docker DB\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure\n  Scala") in
-  *Rails*) present_terminal "omarchy-install-dev-env ruby" ;;
-  *Docker*) present_terminal omarchy-install-docker-dbs ;;
-  *JavaScript*) show_install_javascript_menu ;;
-  *Go*) present_terminal "omarchy-install-dev-env go" ;;
-  *PHP*) show_install_php_menu ;;
-  *Python*) present_terminal "omarchy-install-dev-env python" ;;
-  *Elixir*) show_install_elixir_menu ;;
-  *Zig*) present_terminal "omarchy-install-dev-env zig" ;;
-  *Rust*) present_terminal "omarchy-install-dev-env rust" ;;
-  *Java*) present_terminal "omarchy-install-dev-env java" ;;
-  *NET*) present_terminal "omarchy-install-dev-env dotnet" ;;
-  *OCaml*) present_terminal "omarchy-install-dev-env ocaml" ;;
-  *Clojure*) present_terminal "omarchy-install-dev-env clojure" ;;
-  *Scala*) present_terminal "omarchy-install-dev-env scala" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_javascript_menu() {
-  case $(menu "Install" "  Node.js\n  Bun\n  Deno") in
-  *Node*) present_terminal "omarchy-install-dev-env node" ;;
-  *Bun*) present_terminal "omarchy-install-dev-env bun" ;;
-  *Deno*) present_terminal "omarchy-install-dev-env deno" ;;
-  *) show_install_development_menu ;;
-  esac
-}
-
-show_install_php_menu() {
-  case $(menu "Install" "  PHP\n  Laravel\n  Symfony") in
-  *PHP*) present_terminal "omarchy-install-dev-env php" ;;
-  *Laravel*) present_terminal "omarchy-install-dev-env laravel" ;;
-  *Symfony*) present_terminal "omarchy-install-dev-env symfony" ;;
-  *) show_install_development_menu ;;
-  esac
-}
-
-show_install_elixir_menu() {
-  case $(menu "Install" "  Elixir\n  Phoenix") in
-  *Elixir*) present_terminal "omarchy-install-dev-env elixir" ;;
-  *Phoenix*) present_terminal "omarchy-install-dev-env phoenix" ;;
-  *) show_install_development_menu ;;
-  esac
-}
-
-show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\n󰸌  Theme\n  Browser\n  Dictation\n  Gaming\n󰍲  Windows\n󰏓  Preinstalls\n  Security") in
-  *Package*) terminal omarchy-pkg-remove ;;
-  *Web*) present_terminal omarchy-webapp-remove ;;
-  *TUI*) present_terminal omarchy-tui-remove ;;
-  *Development*) show_remove_development_menu ;;
-  *Theme*) present_terminal omarchy-theme-remove ;;
-  *Browser*) show_remove_browser_menu ;;
-  *Dictation*) present_terminal omarchy-voxtype-remove ;;
-  *Gaming*) show_remove_gaming_menu ;;
-  *Windows*) present_terminal "omarchy-windows-vm remove" ;;
-  *Preinstalls*) present_terminal omarchy-remove-preinstalls ;;
-  *Security*) show_remove_security_menu ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_remove_security_menu() {
-  case $(menu "Remove" "󰈷  Fingerprint\n  Fido2") in
-  *Fingerprint*) present_terminal omarchy-remove-security-fingerprint ;;
-  *Fido2*) present_terminal omarchy-remove-security-fido2 ;;
-  *) show_remove_menu ;;
-  esac
-}
-
-show_remove_browser_menu() {
-  case $(menu "Remove" "  Chrome\n  Edge\n  Brave\n  Brave Origin\n  Firefox\n  Zen") in
-  *Chrome*) present_terminal "omarchy-remove-browser chrome" ;;
-  *Edge*) present_terminal "omarchy-remove-browser edge" ;;
-  *"Brave Origin"*) present_terminal "omarchy-remove-browser brave-origin" ;;
-  *Brave*) present_terminal "omarchy-remove-browser brave" ;;
-  *Firefox*) present_terminal "omarchy-remove-browser firefox" ;;
-  *Zen*) present_terminal "omarchy-remove-browser zen" ;;
-  *) show_remove_menu ;;
-  esac
-}
-
-show_remove_gaming_menu() {
-  case $(menu "Remove" "  Steam\n  RetroArch\n󰍳  Minecraft\n󰢹  NVIDIA GeForce NOW\n  Xbox Cloud Gaming\n󰖺  Xbox Controller (󰂯)\n󰍹  Moonlight (GameStream)\n  Lutris (Battle.net)\n󱓟  Heroic (Epic Games)") in
-  *Steam*) present_terminal omarchy-remove-gaming-steam ;;
-  *RetroArch*) present_terminal omarchy-remove-gaming-retroarch ;;
-  *Minecraft*) present_terminal omarchy-remove-gaming-minecraft ;;
-  *GeForce*) present_terminal omarchy-remove-gaming-geforce-now ;;
-  *"Xbox Cloud"*) present_terminal omarchy-remove-gaming-xbox-cloud ;;
-  *Xbox*) present_terminal omarchy-remove-gaming-xbox-controllers ;;
-  *Moonlight*) present_terminal omarchy-remove-gaming-moonlight ;;
-  *Lutris*) present_terminal omarchy-remove-gaming-lutris ;;
-  *Heroic*) present_terminal omarchy-remove-gaming-heroic ;;
-  *) show_remove_menu ;;
-  esac
-}
-
-show_remove_development_menu() {
-  case $(menu "Remove" "󰫏  Ruby on Rails\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure\n  Scala") in
-  *Rails*) present_terminal "omarchy-remove-dev-env ruby" ;;
-  *JavaScript*) show_remove_javascript_menu ;;
-  *Go*) present_terminal "omarchy-remove-dev-env go" ;;
-  *PHP*) show_remove_php_menu ;;
-  *Python*) present_terminal "omarchy-remove-dev-env python" ;;
-  *Elixir*) show_remove_elixir_menu ;;
-  *Zig*) present_terminal "omarchy-remove-dev-env zig" ;;
-  *Rust*) present_terminal "omarchy-remove-dev-env rust" ;;
-  *Java*) present_terminal "omarchy-remove-dev-env java" ;;
-  *NET*) present_terminal "omarchy-remove-dev-env dotnet" ;;
-  *OCaml*) present_terminal "omarchy-remove-dev-env ocaml" ;;
-  *Clojure*) present_terminal "omarchy-remove-dev-env clojure" ;;
-  *Scala*) present_terminal "omarchy-remove-dev-env scala" ;;
-  *) show_remove_menu ;;
-  esac
-}
-
-show_remove_javascript_menu() {
-  case $(menu "Remove" "  Node.js\n  Bun\n  Deno") in
-  *Node*) present_terminal "omarchy-remove-dev-env node" ;;
-  *Bun*) present_terminal "omarchy-remove-dev-env bun" ;;
-  *Deno*) present_terminal "omarchy-remove-dev-env deno" ;;
-  *) show_remove_development_menu ;;
-  esac
-}
-
-show_remove_php_menu() {
-  case $(menu "Remove" "  PHP\n  Laravel\n  Symfony") in
-  *PHP*) present_terminal "omarchy-remove-dev-env php" ;;
-  *Laravel*) present_terminal "omarchy-remove-dev-env laravel" ;;
-  *Symfony*) present_terminal "omarchy-remove-dev-env symfony" ;;
-  *) show_remove_development_menu ;;
-  esac
-}
-
-show_remove_elixir_menu() {
-  case $(menu "Remove" "  Elixir\n  Phoenix") in
-  *Elixir*) present_terminal "omarchy-remove-dev-env elixir" ;;
-  *Phoenix*) present_terminal "omarchy-remove-dev-env phoenix" ;;
-  *) show_remove_development_menu ;;
-  esac
-}
-
-show_update_menu() {
-  case $(menu "Update" "  Omarchy\n󰔫  Channel\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
-  *Omarchy*) present_terminal omarchy-update ;;
-  *Channel*) show_update_channel_menu ;;
-  *Config*) show_update_config_menu ;;
-  *Themes*) present_terminal omarchy-theme-update ;;
-  *Process*) show_update_process_menu ;;
-  *Hardware*) show_update_hardware_menu ;;
-  *Firmware*) present_terminal omarchy-update-firmware ;;
-  *Timezone*) present_terminal omarchy-tz-select ;;
-  *Time*) present_terminal omarchy-update-time ;;
-  *Password*) show_update_password_menu ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_update_channel_menu() {
-  case $(menu "Update channel" "🟢 Stable\n🟡 RC\n🟠 Edge\n🔴 Dev") in
-  *Stable*) present_terminal "omarchy-channel-set stable" ;;
-  *RC*) present_terminal "omarchy-channel-set rc" ;;
-  *Edge*) present_terminal "omarchy-channel-set edge" ;;
-  *Dev*) present_terminal "omarchy-channel-set dev" ;;
-  *) show_update_menu ;;
-  esac
-}
-show_update_process_menu() {
-  case $(menu "Restart" "  Hypridle\n  Hyprsunset\n󰎟  Mako\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
-  *Hypridle*) omarchy-restart-hypridle ;;
-  *Hyprsunset*) omarchy-restart-hyprsunset ;;
-  *Mako*) omarchy-restart-mako ;;
-  *Swayosd*) omarchy-restart-swayosd ;;
-  *Walker*) omarchy-restart-walker ;;
-  *Waybar*) omarchy-restart-waybar ;;
-  *) show_update_menu ;;
-  esac
-}
-
-show_update_config_menu() {
-  case $(menu "Use default config" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n󱣴  Plymouth\n  Swayosd\n  Tmux\n󰌧  Walker\n󰍜  Waybar") in
-  *Hyprland*) present_terminal omarchy-refresh-hyprland ;;
-  *Hypridle*) present_terminal omarchy-refresh-hypridle ;;
-  *Hyprlock*) present_terminal omarchy-refresh-hyprlock ;;
-  *Hyprsunset*) present_terminal omarchy-refresh-hyprsunset ;;
-  *Plymouth*) present_terminal omarchy-refresh-plymouth ;;
-  *Swayosd*) present_terminal omarchy-refresh-swayosd ;;
-  *Tmux*) present_terminal omarchy-refresh-tmux ;;
-  *Walker*) present_terminal omarchy-refresh-walker ;;
-  *Waybar*) present_terminal omarchy-refresh-waybar ;;
-  *) show_update_menu ;;
-  esac
-}
-
-show_update_hardware_menu() {
-  case $(menu "Restart" "  Audio\n󱚾  Wi-Fi\n󰂯  Bluetooth\n󰟸  Trackpad") in
-  *Audio*) present_terminal omarchy-restart-pipewire ;;
-  *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
-  *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
-  *Trackpad*) present_terminal omarchy-restart-trackpad ;;
-  *) show_update_menu ;;
-  esac
-}
-
-show_update_password_menu() {
-  case $(menu "Update Password" "  Drive Encryption\n  User") in
-  *Drive*) present_terminal omarchy-drive-password ;;
-  *User*) present_terminal passwd ;;
-  *) show_update_menu ;;
-  esac
-}
-
-show_about() {
-  omarchy-launch-about
-}
-
-show_system_menu() {
-  local options="󱄄  Screensaver\n  Lock"
-  ! omarchy-toggle-enabled suspend-off && options="$options\n󰒲  Suspend"
-  omarchy-hibernation-available && options="$options\n󰤁  Hibernate"
-  options="$options\n󰍃  Logout\n󰜉  Restart\n󰐥  Shutdown"
-
-  case $(menu "System" "$options") in
-  *Screensaver*) omarchy-launch-screensaver force ;;
-  *Lock*) omarchy-system-lock ;;
-  *Suspend*) systemctl suspend ;;
-  *Hibernate*) systemctl hibernate ;;
-  *Logout*) omarchy-system-logout ;;
-  *Restart*) omarchy-system-reboot ;;
-  *Shutdown*) omarchy-system-shutdown ;;
-  *) back_to show_main_menu ;;
-  esac
-}
-
-show_main_menu() {
-  go_to_menu "$(menu "Go" "󰀻  Apps\n󰧑  Learn\n󱓞  Trigger\n  Style\n  Setup\n󰉉  Install\n󰭌  Remove\n  Update\n  About\n  System")"
-}
-
-go_to_menu() {
-  case "${1,,}" in
-  *apps*) walker -p "Launch…" ;;
-  *learn*) show_learn_menu ;;
-  *trigger*) show_trigger_menu ;;
-  *toggle*) show_toggle_menu ;;
-  *hardware*) show_hardware_menu ;;
-  *share*) show_share_menu ;;
-  *reminder-set*) show_custom_reminder_input ;;
-  *reminder*) show_reminder_menu ;;
-  *background*) show_background_menu ;;
-  *capture*) show_capture_menu ;;
-  *style*) show_style_menu ;;
-  *theme*) show_theme_menu ;;
-  *screenrecord*) show_screenrecord_menu ;;
-  *setup*) show_setup_menu ;;
-  *power*) show_setup_power_menu ;;
-  *install*) show_install_menu ;;
-  *remove*) show_remove_menu ;;
-  *update*) show_update_menu ;;
-  *about*) show_about ;;
-  *system*) show_system_menu ;;
-  esac
-}
-
-# Allow user extensions and overrides
-USER_EXTENSIONS="$HOME/.config/omarchy/extensions/menu.sh"
-[[ -f $USER_EXTENSIONS ]] && source "$USER_EXTENSIONS"
-
-toggle_existing_menu
-
-if [[ -n $1 ]]; then
-  BACK_TO_EXIT=true
-  go_to_menu "$1"
-else
-  show_main_menu
-fi
+  summon)
+    exec omarchy-shell shell summon omarchy.menu "$(menu_payload "$route")"
+    ;;
+  close)
+    exec omarchy-shell shell hide omarchy.menu
+    ;;
+  refresh | ping)
+    exec omarchy-shell shell call omarchy.menu "$verb" "{}"
+    ;;
+  -h | --help | help)
+    cat <<USAGE
+Usage: omarchy menu [verb] [route]
+
+Verbs:
+  toggle [route]   Open the menu at <route>, or close it if already open. Default verb.
+  summon [route]   Always open the menu (no close-if-visible toggle).
+  close            Close the menu if it is visible.
+  refresh          Re-parse the menu JSONC files.
+  ping             Health check.
+
+Route is an item id (e.g. setup.power) or alias (e.g. power). Defaults to
+"root", which opens the top-level menu.
+USAGE
+    exit 0
+    ;;
+  *)
+    echo "omarchy-menu: unknown verb '$verb'. Try 'omarchy menu --help'." >&2
+    exit 2
+    ;;
+esac
diff --git a/bin/omarchy-menu-clipboard b/bin/omarchy-menu-clipboard
new file mode 100755
index 00000000..83a6b557
--- /dev/null
+++ b/bin/omarchy-menu-clipboard
@@ -0,0 +1,6 @@
+#!/bin/bash
+# omarchy:summary=Launch the clipboard manager
+# omarchy:group=menu
+# omarchy:examples=omarchy menu clipboard
+
+omarchy-shell shell toggle omarchy.clipboard
diff --git a/bin/omarchy-menu-emoji b/bin/omarchy-menu-emoji
new file mode 100755
index 00000000..edc1427b
--- /dev/null
+++ b/bin/omarchy-menu-emoji
@@ -0,0 +1,6 @@
+#!/bin/bash
+# omarchy:summary=Launch emojis
+# omarchy:group=menu
+# omarchy:examples=omarchy menu emoji
+
+omarchy-shell shell toggle omarchy.emojis
diff --git a/bin/omarchy-menu-emoji-insert b/bin/omarchy-menu-emoji-insert
new file mode 100755
index 00000000..583702e0
--- /dev/null
+++ b/bin/omarchy-menu-emoji-insert
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# omarchy:summary=Insert an emoji into the focused application
+# omarchy:group=menu
+# omarchy:args=<emoji>
+# omarchy:hidden=true
+
+emoji="${1:-}"
+copy_pid=""
+
+[[ -n $emoji ]] || exit
+
+printf '%s' "$emoji" | wl-copy --type text/plain --sensitive --foreground &
+copy_pid=$!
+
+sleep 0.15
+wtype -M shift -k Insert -m shift 2>/dev/null || true
+sleep 0.2
+
+kill "$copy_pid" 2>/dev/null || true
diff --git a/bin/omarchy-menu-file b/bin/omarchy-menu-file
index 8cdf4bb0..c2662060 100755
--- a/bin/omarchy-menu-file
+++ b/bin/omarchy-menu-file
@@ -1,15 +1,15 @@
 #!/bin/bash
 
-# omarchy:summary=Pick a file with Walker
+# omarchy:summary=Pick a file from a menu
 # omarchy:group=menu
 # omarchy:name=file
-# omarchy:args=label paths formats [walker args...]
+# omarchy:args=label paths formats [menu args...]
 # omarchy:examples=omarchy menu file "Select image" "$HOME/Pictures" "jpg png webp"|omarchy-menu-file "Select media" "$HOME/Pictures:$HOME/Videos" "jpg png mp4 mov" --width 800
 
 set -euo pipefail
 
 if (( $# < 3 )); then
-  echo "Usage: omarchy-menu-file <label> <paths> <formats> [walker args...]" >&2
+  echo "Usage: omarchy-menu-file <label> <paths> <formats> [menu args...]" >&2
   exit 1
 fi
 
@@ -22,7 +22,7 @@ IFS=: read -r -a paths <<<"$paths_arg"
 read -r -a formats <<<"$formats_arg"
 
 if (( ${#paths[@]} == 0 || ${#formats[@]} == 0 )); then
-  echo "Usage: omarchy-menu-file <label> <paths> <formats> [walker args...]" >&2
+  echo "Usage: omarchy-menu-file <label> <paths> <formats> [menu args...]" >&2
   exit 1
 fi
 
@@ -45,4 +45,4 @@ done
 find_args+=(")" -printf '%T@\t%p\n')
 
 find "${find_args[@]}" 2>/dev/null | sort -rn | cut -f2- |
-  omarchy-launch-walker --dmenu --width 800 --minheight 1 --maxheight 500 -p "$label…" "$@" 2>/dev/null
+  omarchy-menu-select "$label" -- --width 800 --maxheight 500 "$@"
diff --git a/bin/omarchy-menu-images b/bin/omarchy-menu-images
new file mode 100755
index 00000000..5c6ede58
--- /dev/null
+++ b/bin/omarchy-menu-images
@@ -0,0 +1,260 @@
+#!/bin/bash
+
+# omarchy:summary=Open a generic image selector menu
+# omarchy:args=[--selected <image>] [--print-name] [--show-labels] [--filterable] [--lazy-thumbnails] [--preload] [--cache-only] <image-dir>...
+
+selected_image=""
+print_name=false
+show_labels=false
+filterable=false
+lazy_thumbnails=false
+prepare_only=false
+preload=false
+cache_only=false
+image_dirs=()
+
+usage() {
+  echo "Usage: omarchy-menu-images [--selected <image>] [--print-name] [--show-labels] [--filterable] [--lazy-thumbnails] [--preload] [--cache-only] <image-dir>..."
+}
+
+while (( $# > 0 )); do
+  case "$1" in
+    --selected)
+      if (( $# < 2 )); then
+        usage >&2
+        exit 1
+      fi
+
+      selected_image="$2"
+      shift 2
+      ;;
+    --print-name)
+      print_name=true
+      shift
+      ;;
+    --show-labels)
+      show_labels=true
+      shift
+      ;;
+    --filterable)
+      filterable=true
+      shift
+      ;;
+    --lazy-thumbnails)
+      lazy_thumbnails=true
+      shift
+      ;;
+    --prepare-only)
+      prepare_only=true
+      shift
+      ;;
+    --preload)
+      preload=true
+      shift
+      ;;
+    --cache-only)
+      cache_only=true
+      shift
+      ;;
+    --help|-h)
+      usage
+      exit 0
+      ;;
+    *)
+      image_dirs+=("$1")
+      shift
+      ;;
+  esac
+done
+
+if (( ${#image_dirs[@]} == 0 )); then
+  usage >&2
+  exit 1
+fi
+
+selection_file=$(mktemp)
+done_file=$(mktemp)
+rm -f "$done_file"
+trap 'rm -f "$selection_file" "$done_file"' EXIT
+
+image_dirs_env=""
+for dir in "${image_dirs[@]}"; do
+  if [[ -z $image_dirs_env ]]; then
+    image_dirs_env="$dir"
+  else
+    image_dirs_env+=$'\n'"$dir"
+  fi
+done
+
+current_image=$(readlink -f "$selected_image" 2>/dev/null)
+selected_list_image=""
+
+if [[ -n $current_image ]]; then
+  for dir in "${image_dirs[@]}"; do
+    if [[ -d $dir && -f $selected_image && ${selected_image%/*} == "$dir" ]]; then
+      selected_list_image="$selected_image"
+      break
+    elif [[ -d $dir ]]; then
+      selected_list_image=$(find -L "$dir" -maxdepth 1 -type f -samefile "$current_image" -print -quit 2>/dev/null)
+      [[ -n $selected_list_image ]] && break
+    fi
+  done
+fi
+
+cache_dir=${XDG_CACHE_HOME:-$HOME/.cache}/omarchy/image-selector
+index_file="$cache_dir/index.tsv"
+rows=""
+mkdir -p "$cache_dir"
+
+cache_key=$(printf '%s' "$image_dirs_env" | md5sum | cut -d ' ' -f 1)
+rows_cache_file="$cache_dir/$cache_key.rows"
+rows_signature_file="$cache_dir/$cache_key.signature"
+rows_fast_signature_file="$cache_dir/$cache_key.fast-signature"
+rows_signature="v2"$'\n'
+rows_fast_signature="v1"$'\n'
+rows_cacheable=true
+rows_cache_hit=false
+image_files=()
+
+for dir in "${image_dirs[@]}"; do
+  [[ -d $dir ]] && rows_fast_signature+="$dir:$(stat -Lc '%Y' "$dir")"$'\n'
+done
+
+if [[ -f $rows_cache_file && -f $rows_fast_signature_file ]] && cmp -s "$rows_fast_signature_file" <(printf '%s' "$rows_fast_signature"); then
+  rows=$(<"$rows_cache_file")
+  rows_cache_hit=true
+else
+  for dir in "${image_dirs[@]}"; do
+    if [[ -d $dir ]]; then
+      rows_signature+="$dir:$(stat -Lc '%Y' "$dir")"$'\n'
+
+      while IFS= read -r -d '' image; do
+        image_files+=("$image")
+        image_signature=$(stat -Lc '%s:%Y' "$image") || continue
+        rows_signature+="$image:$image_signature"$'\n'
+      done < <(find -L "$dir" -maxdepth 1 -type f \( -iname '*.jpg' -o -iname '*.jpeg' -o -iname '*.png' -o -iname '*.gif' -o -iname '*.bmp' -o -iname '*.webp' \) -print0 2>/dev/null | sort -z)
+    fi
+  done
+fi
+
+generate_thumbnail() {
+  local image="$1"
+  local thumbnail="$2"
+  local lock="$thumbnail.lock"
+  local tmp="$thumbnail.$$.jpg"
+
+  if mkdir "$lock" 2>/dev/null; then
+    if magick "${image}[0]" -auto-orient -resize '1536x864^' -gravity center -extent '1536x864' -strip -quality 82 "$tmp"; then
+      mv -f "$tmp" "$thumbnail"
+    else
+      rm -f "$tmp" "$thumbnail"
+    fi
+
+    rmdir "$lock" 2>/dev/null || true
+  else
+    for ((i = 0; i < 3000; i++)); do
+      [[ -f $thumbnail ]] && return
+      [[ -d $lock ]] || break
+      sleep 0.01
+    done
+  fi
+}
+
+thumbnail_for() {
+  local image="$1"
+  local signature hash thumbnail
+
+  signature=$(stat -Lc '%s:%Y' "$image") || return
+  hash=$(awk -F '\t' -v path="$image" -v sig="$signature" '$1 == path && $2 == sig { print $3; exit }' "$index_file" 2>/dev/null)
+
+  if [[ -z $hash ]]; then
+    hash=$(printf '%s\t%s' "$image" "$signature" | md5sum | cut -d ' ' -f 1)
+    printf '%s\t%s\t%s\n' "$image" "$signature" "$hash" >>"$index_file"
+  fi
+
+  thumbnail="$cache_dir/$hash.jpg"
+
+  if [[ ! -f $thumbnail ]]; then
+    if [[ $lazy_thumbnails == true && $cache_only != true ]]; then
+      rows_cacheable=false
+
+      if [[ $prepare_only != true ]]; then
+        generate_thumbnail "$image" "$thumbnail" >/dev/null 2>&1 &
+      fi
+
+      printf '%s' "$image"
+      return
+    fi
+
+    generate_thumbnail "$image" "$thumbnail"
+  fi
+
+  [[ -f $thumbnail ]] && printf '%s' "$thumbnail"
+}
+
+if [[ $rows_cache_hit != true && -f $rows_cache_file && -f $rows_signature_file ]] && cmp -s "$rows_signature_file" <(printf '%s' "$rows_signature"); then
+  rows=$(<"$rows_cache_file")
+  printf '%s' "$rows_fast_signature" >"$rows_fast_signature_file"
+elif [[ $rows_cache_hit != true ]]; then
+  for image in "${image_files[@]}"; do
+    thumbnail=$(thumbnail_for "$image")
+    [[ -n $thumbnail ]] || continue
+    if [[ $lazy_thumbnails == true && $cache_only != true && $thumbnail == $image ]]; then
+      rows_cacheable=false
+    fi
+
+    if [[ -z $rows ]]; then
+      rows="$image"$'\t'"$thumbnail"
+    else
+      rows+=$'\n'"$image"$'\t'"$thumbnail"
+    fi
+  done
+
+  if [[ $rows_cacheable == true ]]; then
+    printf '%s' "$rows" >"$rows_cache_file"
+    printf '%s' "$rows_signature" >"$rows_signature_file"
+    printf '%s' "$rows_fast_signature" >"$rows_fast_signature_file"
+  else
+    rm -f "$rows_cache_file" "$rows_signature_file" "$rows_fast_signature_file"
+  fi
+fi
+
+if [[ $cache_only == true || $prepare_only == true ]]; then
+  exit 0
+fi
+
+# Image rows can contain newlines and tabs, which don't survive positional
+# shell IPC arguments. Base64-encode for transit; the ImagePicker plugin
+# Qt.atob()s on the other side.
+rows_b64=$(printf '%s' "$rows" | base64 -w 0)
+
+if [[ $preload == true ]]; then
+  omarchy-shell image-selector preload "$rows_b64" "$selected_list_image" "$show_labels" "$filterable" >/dev/null || true
+  exit 0
+fi
+
+if ! omarchy-shell image-selector open \
+     "" \
+     "$rows_b64" \
+     "$selected_list_image" \
+     "$selection_file" \
+     "$done_file" \
+     "$show_labels" \
+     "$filterable" >/dev/null; then
+  echo "Image selector failed to accept request" >&2
+  exit 1
+fi
+
+while [[ ! -e $done_file ]]; do
+  sleep 0.01
+done
+
+if [[ -s $selection_file ]]; then
+  if [[ $print_name == true ]]; then
+    selection=$(<"$selection_file")
+    selection=${selection##*/}
+    printf '%s\n' "${selection%.*}"
+  else
+    cat "$selection_file"
+  fi
+fi
diff --git a/bin/omarchy-menu-input b/bin/omarchy-menu-input
index 1d71cc58..b61f88e3 100755
--- a/bin/omarchy-menu-input
+++ b/bin/omarchy-menu-input
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-# omarchy:summary=Prompt for text input with Walker
+# omarchy:summary=Prompt for text input from a menu
 # omarchy:group=menu
 # omarchy:name=input
-# omarchy:args=prompt [walker args...]
+# omarchy:args=prompt [menu args...]
 # omarchy:examples=omarchy menu input Reminder|omarchy-menu-input "Reminder in minutes" --width 400
 
 set -euo pipefail
@@ -13,4 +13,46 @@ if (( $# > 0 )); then
   shift
 fi
 
-omarchy-launch-walker --dmenu --inputonly --width 295 --minheight 1 --maxheight 1 -p "$prompt…" "$@" 2>/dev/null
+menu_width=""
+
+while (( $# > 0 )); do
+  case "$1" in
+    --width)
+      shift
+      if (( $# == 0 )); then
+        echo "omarchy-menu-input: --width requires a value" >&2
+        exit 1
+      fi
+      menu_width="$1"
+      ;;
+  esac
+  shift
+done
+
+selection_file=$(mktemp)
+done_file=$(mktemp)
+rm -f "$done_file"
+trap 'rm -f "$selection_file" "$done_file"' EXIT
+
+payload=$(perl -MEncode=decode -MJSON::PP=encode_json -e '
+  my $payload = {
+    mode => "input",
+    prompt => decode("UTF-8", $ARGV[0]),
+    selectionFile => decode("UTF-8", $ARGV[1]),
+    doneFile => decode("UTF-8", $ARGV[2])
+  };
+  $payload->{width} = int($ARGV[3]) if length($ARGV[3] // "");
+  print encode_json($payload)
+' "$prompt" "$selection_file" "$done_file" "$menu_width")
+
+omarchy-shell shell summon omarchy.menu "$payload" >/dev/null
+
+while [[ ! -e $done_file ]]; do
+  sleep 0.05
+done
+
+if [[ -s $selection_file ]]; then
+  cat "$selection_file"
+else
+  exit 1
+fi
diff --git a/bin/omarchy-menu-keybindings b/bin/omarchy-menu-keybindings
index d28474dc..f2d82d1b 100755
--- a/bin/omarchy-menu-keybindings
+++ b/bin/omarchy-menu-keybindings
@@ -1,8 +1,35 @@
 #!/bin/bash
 
-# omarchy:summary=Display Hyprland keybindings defined in your configuration using walker for an interactive search menu.
+# omarchy:summary=Display Hyprland keybindings defined in your configuration using an interactive search menu.
 
 declare -A KEYCODE_SYM_MAP
+# Hyprland reports XKB keycodes for code: bindings. Keep a small fallback for
+# common keys so the menu remains readable if xkbcli cannot resolve a symbol.
+declare -A FALLBACK_KEYCODE_SYM_MAP=(
+  [10]="1"
+  [11]="2"
+  [12]="3"
+  [13]="4"
+  [14]="5"
+  [15]="6"
+  [16]="7"
+  [17]="8"
+  [18]="9"
+  [19]="0"
+  [20]="MINUS"
+  [21]="EQUAL"
+  [59]="COMMA"
+  [60]="PERIOD"
+  [61]="SLASH"
+)
+
+# Hyprland's Lua config provider currently reports Lua binds as dispatcher
+# __lua and code:... binds from hl.bind() as key="" and keycode=0 in
+# `hyprctl -j binds`. Keep a lightweight source-derived cache so the menu can
+# still show and dispatch those bindings.
+declare -A LUA_BIND_KEY_MAP
+declare -A LUA_BIND_DISPATCHER_MAP
+declare -A LUA_BIND_ARG_MAP
 
 build_keymap_cache() {
   local keymap
@@ -37,7 +64,18 @@ build_keymap_cache() {
 }
 
 lookup_keycode_cached() {
-  printf '%s\n' "${KEYCODE_SYM_MAP[$1]}"
+  local symbol
+  symbol="${KEYCODE_SYM_MAP[$1]}"
+
+  if [[ -z $symbol ]]; then
+    symbol="${FALLBACK_KEYCODE_SYM_MAP[$1]}"
+  fi
+
+  if [[ -z $symbol ]]; then
+    symbol="code:$1"
+  fi
+
+  printf '%s\n' "${symbol^^}"
 }
 
 parse_keycodes() {
@@ -80,44 +118,268 @@ parse_keycodes() {
   fi
 }
 
-# Fetch dynamic keybindings from Hyprland
+# Supplement `hyprctl -j binds` for Lua-only binds that Hyprland currently
+# reports as dispatcher __lua and without their original key for code: binds.
+build_lua_bind_cache() {
+  local modmask description key dispatcher arg cache_key
+
+  omarchy-cmd-present lua || return 0
+
+  while IFS=$'\t' read -r modmask description key dispatcher arg; do
+    [[ -z $modmask || -z $description || -z $key ]] && continue
+
+    LUA_BIND_KEY_MAP["$modmask,$description"]="$key"
+    cache_key="$modmask,$description,$key"
+    LUA_BIND_DISPATCHER_MAP["$cache_key"]="$dispatcher"
+    LUA_BIND_ARG_MAP["$cache_key"]="$arg"
+  done < <(
+    lua <<'LUA'
+local modifiers = { SHIFT = 1, CTRL = 4, CONTROL = 4, ALT = 8, SUPER = 64 }
+
+local function split_keys(keys)
+  local modmask = 0
+  local key = ""
+
+  for part in string.gmatch(tostring(keys or ""), "[^+]+") do
+    local value = part:gsub("^%s+", ""):gsub("%s+$", "")
+    local modifier = modifiers[string.upper(value)]
+
+    if modifier then
+      modmask = modmask + modifier
+    else
+      key = value
+    end
+  end
+
+  return modmask, key
+end
+
+local function lua_literal(value)
+  local value_type = type(value)
+
+  if value_type == "string" then
+    return string.format("%q", value)
+  elseif value_type == "number" or value_type == "boolean" then
+    return tostring(value)
+  elseif value_type == "table" then
+    local parts = {}
+    local keys = {}
+    local array_length = #value
+
+    for index = 1, array_length do
+      parts[#parts + 1] = lua_literal(value[index])
+    end
+
+    for key in pairs(value) do
+      if not (type(key) == "number" and key >= 1 and key <= array_length and math.floor(key) == key) then
+        keys[#keys + 1] = key
+      end
+    end
+
+    table.sort(keys, function(left, right)
+      return tostring(left) < tostring(right)
+    end)
+
+    for _, key in ipairs(keys) do
+      local key_prefix
+      if type(key) == "string" and key:match("^[%a_][%w_]*$") then
+        key_prefix = key .. " = "
+      else
+        key_prefix = "[" .. lua_literal(key) .. "] = "
+      end
+
+      parts[#parts + 1] = key_prefix .. lua_literal(value[key])
+    end
+
+    return "{ " .. table.concat(parts, ", ") .. " }"
+  elseif value_type == "nil" then
+    return "nil"
+  else
+    return "nil"
+  end
+end
+
+local function call_expression(path, ...)
+  local args = {}
+
+  for index = 1, select("#", ...) do
+    args[index] = lua_literal(select(index, ...))
+  end
+
+  return path .. "(" .. table.concat(args, ", ") .. ")"
+end
+
+local function dispatcher(kind, arg, expr)
+  return {
+    __omarchy_dispatcher = true,
+    kind = kind or "",
+    arg = arg or "",
+    expr = expr or "",
+  }
+end
+
+local function dsp_proxy(path)
+  return setmetatable({ path = path }, {
+    __index = function(self, key)
+      return dsp_proxy(self.path .. "." .. tostring(key))
+    end,
+    __call = function(self, ...)
+      local first_arg = ...
+      local expr = call_expression(self.path, ...)
+
+      if self.path == "hl.dsp.exec_cmd" and type(first_arg) == "string" then
+        return dispatcher("exec", first_arg, expr)
+      end
+
+      return dispatcher("lua", expr, expr)
+    end,
+  })
+end
+
+local noop
+noop = setmetatable({}, {
+  __index = function()
+    return noop
+  end,
+  __call = function()
+    return noop
+  end,
+})
+
+local function noop_fn()
+  return noop
+end
+
+hl = setmetatable({
+  dsp = dsp_proxy("hl.dsp"),
+  bind = function(keys, bind_dispatcher, opts)
+    opts = opts or {}
+
+    if opts.description and opts.description ~= "" then
+      local modmask, key = split_keys(keys)
+      local kind = ""
+      local arg = ""
+
+      if type(bind_dispatcher) == "table" and bind_dispatcher.__omarchy_dispatcher then
+        kind = bind_dispatcher.kind or ""
+        arg = bind_dispatcher.arg or bind_dispatcher.expr or ""
+      elseif type(bind_dispatcher) == "string" and bind_dispatcher ~= "" then
+        kind = "exec"
+        arg = bind_dispatcher
+      end
+
+      print(table.concat({ tostring(modmask), opts.description, key, kind, arg }, "\t"))
+    end
+
+    return noop
+  end,
+  unbind = noop_fn,
+  config = noop_fn,
+  env = noop_fn,
+  monitor = noop_fn,
+  window_rule = noop_fn,
+  workspace_rule = noop_fn,
+  layer_rule = noop_fn,
+  gesture = noop_fn,
+  animation = noop_fn,
+  curve = noop_fn,
+  exec_cmd = noop_fn,
+  dispatch = noop_fn,
+  on = noop_fn,
+  timer = noop_fn,
+  get_config = function()
+    return nil
+  end,
+}, {
+  __index = function()
+    return noop
+  end,
+})
+
+local config = os.getenv("HOME") .. "/.config/hypr/hyprland.lua"
+local file = io.open(config, "r")
+
+if file then
+  file:close()
+  local ok, err = pcall(dofile, config)
+  if not ok and os.getenv("DEBUG") == "1" then
+    io.stderr:write("[DEBUG] lua bind scan failed: " .. tostring(err) .. "\n")
+  end
+end
+LUA
+  )
+}
+
+modmask_to_text() {
+  case "$1" in
+    0)  printf '' ;;
+    1)  printf 'SHIFT' ;;
+    4)  printf 'CTRL' ;;
+    5)  printf 'SHIFT CTRL' ;;
+    8)  printf 'ALT' ;;
+    9)  printf 'SHIFT ALT' ;;
+    12) printf 'CTRL ALT' ;;
+    13) printf 'SHIFT CTRL ALT' ;;
+    64) printf 'SUPER' ;;
+    65) printf 'SUPER SHIFT' ;;
+    68) printf 'SUPER CTRL' ;;
+    69) printf 'SUPER SHIFT CTRL' ;;
+    72) printf 'SUPER ALT' ;;
+    73) printf 'SUPER SHIFT ALT' ;;
+    76) printf 'SUPER CTRL ALT' ;;
+    77) printf 'SUPER SHIFT CTRL ALT' ;;
+    *)  printf '%s' "$1" ;;
+  esac
+}
+
+# Fetch dynamic keybindings from Hyprland.
 #
 # Also do some pre-processing:
+# - Fill missing Lua code:... keys and __lua dispatch metadata from the Lua source cache
 # - Remove standard Omarchy bin path prefix
-# - Remove uwsm prefix
 # - Map numeric modifier key mask to a textual rendition
 # - Output comma-separated values that the parser can understand
 dynamic_bindings() {
+  local modmask key keycode description dispatcher arg modifiers cache_key
+
   hyprctl -j binds |
-    jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' |
-    sed -r \
-      -e 's/null//' \
-      -e 's,~/.local/share/omarchy/bin/,,' \
-      -e 's,uwsm app -- ,,' \
-      -e 's,uwsm-app -- ,,' \
-      -e 's/@0//' \
-      -e 's/,@/,code:/' \
-      -e 's/^0,/,/' \
-      -e 's/^1,/SHIFT,/' \
-      -e 's/^4,/CTRL,/' \
-      -e 's/^5,/SHIFT CTRL,/' \
-      -e 's/^8,/ALT,/' \
-      -e 's/^9,/SHIFT ALT,/' \
-      -e 's/^12,/CTRL ALT,/' \
-      -e 's/^13,/SHIFT CTRL ALT,/' \
-      -e 's/^64,/SUPER,/' \
-      -e 's/^65,/SUPER SHIFT,/' \
-      -e 's/^68,/SUPER CTRL,/' \
-      -e 's/^69,/SUPER SHIFT CTRL,/' \
-      -e 's/^72,/SUPER ALT,/' \
-      -e 's/^73,/SUPER SHIFT ALT,/' \
-      -e 's/^76,/SUPER CTRL ALT,/' \
-      -e 's/^77,/SUPER SHIFT CTRL ALT,/'
+    jq -r '.[] | [.modmask, (.key // ""), (.keycode // 0), (.description // ""), (.dispatcher // ""), (.arg // "") | tostring] | join("\u001f")' |
+    while IFS=$'\x1f' read -r modmask key keycode description dispatcher arg; do
+      if [[ -z $key && $keycode != "0" ]]; then
+        key="code:$keycode"
+      fi
+
+      if [[ -z $key && -n $description ]]; then
+        key="${LUA_BIND_KEY_MAP["$modmask,$description"]}"
+      fi
+
+      if [[ $dispatcher == "__lua" && -n $description && -n $key ]]; then
+        cache_key="$modmask,$description,$key"
+        dispatcher="${LUA_BIND_DISPATCHER_MAP["$cache_key"]}"
+        arg="${LUA_BIND_ARG_MAP["$cache_key"]}"
+      fi
+
+      [[ -z $description && $dispatcher == "__lua" ]] && continue
+
+      case "$key" in
+        comma) key="COMMA" ;;
+        period) key="PERIOD" ;;
+        minus) key="MINUS" ;;
+        equal) key="EQUAL" ;;
+        slash) key="SLASH" ;;
+      esac
+
+      modifiers=$(modmask_to_text "$modmask")
+      arg="${arg//~\/.local\/share\/omarchy\/bin\//}"
+
+      printf '%s,%s,%s,%s,%s\n' "$modifiers" "$key" "$description" "$dispatcher" "$arg"
+    done
 }
 
 # Hardcoded bindings, like the copy-url extension and such
 static_bindings() {
-    echo "SHIFT ALT,L,Copy URL from Web App,extension,copy-url"
+  echo "SHIFT ALT,L,Copy URL from Web App,sendshortcut,SHIFT ALT,L,"
+  echo "SHIFT ALT,D,Download Video from Web App,sendshortcut,SHIFT ALT,D,"
 }
 
 # Parse and format keybindings
@@ -126,8 +388,8 @@ static_bindings() {
 # - Set the field separator to a comma ','.
 # - Joins the key combination (e.g., "SUPER + Q").
 # - Joins the command that the key executes.
-# - Prints everything in a nicely aligned format.
-parse_bindings() {
+# - Prints display text and dispatch metadata as tab-separated fields.
+parse_binding_records() {
   awk -F, '
 {
     # Combine the modifier and key (first two fields)
@@ -139,6 +401,13 @@ parse_bindings() {
 
     # Use description, if set
     action = $3;
+    dispatcher = $4;
+
+    # Reconstruct the dispatcher arg from the remaining fields
+    arg = "";
+    for (i = 5; i <= NF; i++) {
+        arg = arg $i (i < NF ? "," : "");
+    }
 
     if (action == "") {
         # Reconstruct the command from the remaining fields
@@ -149,6 +418,7 @@ parse_bindings() {
         # Clean up trailing commas, remove leading "exec, ", and trim
         sub(/,$/, "", action);
         gsub(/(^|,)[[:space:]]*exec[[:space:]]*,?/, "", action);
+        gsub(/(^|[[:space:]])uwsm(-app| app)[[:space:]]+--[[:space:]]+/, "", action);
         gsub(/^[ \t]+|[ \t]+$/, "", action);
         gsub(/[ \t]+/, " ", key_combo);  # Collapse multiple spaces to one
 
@@ -161,15 +431,15 @@ parse_bindings() {
     }
 
     if (action != "") {
-        printf "%-35s → %s\n", key_combo, action;
+        printf "%-35s → %s\t%s\t%s\n", key_combo, action, dispatcher, arg;
     }
 }'
 }
 
 prioritize_entries() {
-  awk '
+  awk -F '\t' '
   {
-    line = $0
+    line = $1
     prio = 50
     if (match(line, /Terminal/)) prio = 0
     if (match(line, /Tmux/)) prio = 1
@@ -192,7 +462,7 @@ prioritize_entries() {
     if (match(line, /Audio controls/))  prio = 18
     if (match(line, /Bluetooth controls/))  prio = 19
     if (match(line, /Wifi controls/))  prio = 20
-    if (match(line, /Emoji picker/))  prio = 21
+    if (match(line, /Emojis/))  prio = 21
     if (match(line, /Color picker/))  prio = 22
     if (match(line, /Screenshot/))  prio = 23
     if (match(line, /Screenrecording/))  prio = 24
@@ -220,15 +490,16 @@ prioritize_entries() {
     if (match(line, /Apple Display/))  prio = 98
     if (match(line, /XF86/))  prio = 99
 
-    # print "priority<TAB>line"
-    printf "%d\t%s\n", prio, line
+    # print "priority<TAB>record"
+    printf "%d\t%s\n", prio, $0
   }' |
   sort -k1,1n -k2,2 |
   cut -f2-
 }
 
-output_keybindings() {
+output_binding_records() {
   build_keymap_cache
+  build_lua_bind_cache
 
   {
     dynamic_bindings
@@ -236,16 +507,107 @@ output_keybindings() {
   } |
     sort -u |
     parse_keycodes |
-    parse_bindings |
+    parse_binding_records |
     prioritize_entries
 }
 
+output_keybindings() {
+  output_binding_records | cut -f1
+}
+
+trim() {
+  local value="$1"
+
+  value="${value#"${value%%[![:space:]]*}"}"
+  value="${value%"${value##*[![:space:]]}"}"
+
+  printf '%s\n' "$value"
+}
+
+lua_string() {
+  jq -Rnr --arg value "$1" '$value | @json'
+}
+
+dispatch_lua_expression() {
+  local expression="$1"
+  local output status
+
+  output=$(hyprctl dispatch "$expression" 2>&1)
+  status=$?
+
+  if (( status == 0 )) && [[ -z $output || $output == "ok" ]]; then
+    [[ -n $output ]] && printf '%s\n' "$output"
+    return 0
+  fi
+
+  return 1
+}
+
+dispatch_exec_binding() {
+  local command="$1"
+
+  dispatch_lua_expression "hl.dsp.exec_cmd($(lua_string "$command"))" || hyprctl dispatch exec "$command"
+}
+
+dispatch_sendshortcut_binding() {
+  local arg="$1"
+  local mods key window rest
+
+  IFS=, read -r mods key window rest <<<"$arg"
+  mods=$(trim "$mods")
+  key=$(trim "$key")
+  window=$(trim "$window")
+
+  [[ -z $window ]] && window="activewindow"
+
+  if [[ -n $key ]] && dispatch_lua_expression "hl.dsp.send_key_state({ mods = $(lua_string "$mods"), key = $(lua_string "$key"), state = \"down\", window = $(lua_string "$window") })"; then
+    sleep 0.05
+    dispatch_lua_expression "hl.dsp.send_key_state({ mods = $(lua_string "$mods"), key = $(lua_string "$key"), state = \"up\", window = $(lua_string "$window") })"
+    return
+  fi
+
+  hyprctl dispatch sendshortcut "$arg"
+}
+
+dispatch_binding() {
+  local dispatcher="$1"
+  local arg="$2"
+
+  case "$dispatcher" in
+    exec)
+      [[ -n $arg ]] && dispatch_exec_binding "$arg"
+      ;;
+    sendshortcut)
+      [[ -n $arg ]] && dispatch_sendshortcut_binding "$arg"
+      ;;
+    lua)
+      [[ -n $arg ]] && hyprctl dispatch "$arg"
+      ;;
+    "") return 1 ;;
+    *)
+      if [[ -n $arg ]]; then
+        hyprctl dispatch "$dispatcher" "$arg"
+      else
+        hyprctl dispatch "$dispatcher"
+      fi
+      ;;
+  esac
+}
+
 if [[ $1 == "--print" || $1 == "-p" ]]; then
   output_keybindings
 else
+  records=$(output_binding_records)
   monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
   menu_height=$((monitor_height * 40 / 100))
+  selection=$(cut -f1 <<<"$records" |
+    omarchy-menu-select 'Keybindings' -- --width 800 --height "$menu_height")
 
-  output_keybindings |
-    walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
+  if [[ -n $selection ]]; then
+    record=$(awk -F '\t' -v selection="$selection" '$1 == selection { print; exit }' <<<"$records")
+    dispatcher=$(cut -f2 <<<"$record")
+    arg=$(cut -f3- <<<"$record")
+
+    dispatch_binding "$dispatcher" "$arg"
+  fi
 fi
diff --git a/bin/omarchy-menu-select b/bin/omarchy-menu-select
index 2f646c49..7914aa1f 100755
--- a/bin/omarchy-menu-select
+++ b/bin/omarchy-menu-select
@@ -1,15 +1,15 @@
 #!/bin/bash
 
-# omarchy:summary=Pick one option with Walker
+# omarchy:summary=Pick one option from a menu
 # omarchy:group=menu
 # omarchy:name=select
-# omarchy:args=prompt option... [-- walker args...]
+# omarchy:args=prompt [option...] [-- menu args...]
 # omarchy:examples=omarchy menu select Format jpg png|omarchy-menu-select Resolution 4k 1080p 720p -- --width 400
 
 set -euo pipefail
 
-if (( $# < 2 )); then
-  echo "Usage: omarchy-menu-select <prompt> <option>... [-- walker args...]" >&2
+if (( $# < 1 )); then
+  echo "Usage: omarchy-menu-select <prompt> [option...] [-- menu args...]" >&2
   exit 1
 fi
 
@@ -17,12 +17,34 @@ prompt="$1"
 shift
 
 options=()
-walker_args=()
+menu_width=""
+menu_maxheight=""
 
 while (( $# > 0 )); do
   if [[ $1 == "--" ]]; then
     shift
-    walker_args=("$@")
+    while (( $# > 0 )); do
+      case "$1" in
+        --width)
+          shift
+          if (( $# == 0 )); then
+            echo "omarchy-menu-select: --width requires a value" >&2
+            exit 1
+          fi
+          menu_width="$1"
+          ;;
+        --height|--maxheight)
+          arg="$1"
+          shift
+          if (( $# == 0 )); then
+            echo "omarchy-menu-select: $arg requires a value" >&2
+            exit 1
+          fi
+          menu_maxheight="$1"
+          ;;
+      esac
+      shift
+    done
     break
   fi
 
@@ -30,9 +52,42 @@ while (( $# > 0 )); do
   shift
 done
 
+if (( ${#options[@]} == 0 )) && [[ ! -t 0 ]]; then
+  mapfile -t options
+fi
+
 if (( ${#options[@]} == 0 )); then
-  echo "Usage: omarchy-menu-select <prompt> <option>... [-- walker args...]" >&2
+  echo "Usage: omarchy-menu-select <prompt> [option...] [-- menu args...]" >&2
   exit 1
 fi
 
-printf '%s\n' "${options[@]}" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 300 -p "$prompt…" "${walker_args[@]}" 2>/dev/null
+selection_file=$(mktemp)
+done_file=$(mktemp)
+rm -f "$done_file"
+trap 'rm -f "$selection_file" "$done_file"' EXIT
+
+options_json=$(perl -MEncode=decode -MJSON::PP=encode_json -e 'print encode_json([map { decode("UTF-8", $_) } @ARGV])' "${options[@]}")
+payload=$(perl -MEncode=decode -MJSON::PP=encode_json,decode_json -e '
+  my $payload = {
+    mode => "select",
+    prompt => decode("UTF-8", $ARGV[0]),
+    options => decode_json($ARGV[1]),
+    selectionFile => decode("UTF-8", $ARGV[2]),
+    doneFile => decode("UTF-8", $ARGV[3])
+  };
+  $payload->{width} = int($ARGV[4]) if length($ARGV[4] // "");
+  $payload->{maxHeight} = int($ARGV[5]) if length($ARGV[5] // "");
+  print encode_json($payload)
+' "$prompt" "$options_json" "$selection_file" "$done_file" "$menu_width" "$menu_maxheight")
+
+omarchy-shell shell summon omarchy.menu "$payload" >/dev/null
+
+while [[ ! -e $done_file ]]; do
+  sleep 0.05
+done
+
+if [[ -s $selection_file ]]; then
+  cat "$selection_file"
+else
+  exit 1
+fi
diff --git a/bin/omarchy-menu-timezone b/bin/omarchy-menu-timezone
new file mode 100755
index 00000000..52d55635
--- /dev/null
+++ b/bin/omarchy-menu-timezone
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# omarchy:summary=Select and set the system timezone
+# omarchy:group=menu
+# omarchy:name=timezone
+
+timezone=$(timedatectl list-timezones | omarchy-menu-select "Set timezone" -- --width 520 --maxheight 520) || exit 1
+sudo timedatectl set-timezone "$timezone"
+omarchy-shell -q Clock refresh
+omarchy-notification-send "Timezone is now set to $timezone"
diff --git a/bin/omarchy-menu-tmux-keybindings b/bin/omarchy-menu-tmux-keybindings
new file mode 100755
index 00000000..a06d7c5d
--- /dev/null
+++ b/bin/omarchy-menu-tmux-keybindings
@@ -0,0 +1,243 @@
+#!/bin/bash
+
+# omarchy:summary=Display Tmux keybindings defined in your configuration using an interactive search menu.
+# omarchy:args=[--print|-p] [--config <path>]
+
+print_only=false
+config_file="${TMUX_CONF:-$HOME/.config/tmux/tmux.conf}"
+
+while (($#)); do
+  case "$1" in
+    --print|-p)
+      print_only=true
+      ;;
+    --config)
+      shift
+      config_file="$1"
+      ;;
+    *)
+      config_file="$1"
+      ;;
+  esac
+
+  shift
+done
+
+if [[ ! -f $config_file ]]; then
+  default_config="$OMARCHY_PATH/config/tmux/tmux.conf"
+
+  if [[ -f $default_config ]]; then
+    config_file="$default_config"
+  else
+    echo "Tmux config not found: $config_file" >&2
+    exit 1
+  fi
+fi
+
+output_keybindings() {
+  awk '
+function trim(value) {
+  gsub(/^[ \t]+|[ \t]+$/, "", value)
+  return value
+}
+
+function key_part_text(part, is_modifier, part_count) {
+  gsub(/^\\/, "", part)
+
+  if (is_modifier && part == "C") return "CTRL"
+  if (is_modifier && part == "M") return "ALT"
+  if (is_modifier && part == "S") return "SHIFT"
+  if (part == "Space") return "SPACE"
+  if (part == "BSpace") return "BACKSPACE"
+  if (part == "BTab") return "SHIFT + TAB"
+  if (part == "PPage") return "PAGE UP"
+  if (part == "NPage") return "PAGE DOWN"
+  if (part == "DC") return "DELETE"
+  if (part == "IC") return "INSERT"
+  if (part_count == 1 && part ~ /^[a-z]$/) return part
+
+  return toupper(part)
+}
+
+function key_text(key, parts, count, i, part, text) {
+  gsub(/\\/, "", key)
+  count = split(key, parts, "-")
+  text = ""
+
+  for (i = 1; i <= count; i++) {
+    part = key_part_text(parts[i], i < count, count)
+    text = text (text == "" ? "" : " + ") part
+  }
+
+  return text
+}
+
+function table_text(table) {
+  if (table == "copy-mode-vi") return "COPY MODE"
+  if (table == "copy-mode") return "COPY MODE"
+  if (table == "prefix") return "PREFIX"
+
+  gsub(/-/, " ", table)
+  return toupper(table)
+}
+
+function pretty_command(command) {
+  gsub(/\\;/, ";", command)
+  gsub(/[{}]/, "", command)
+  gsub(/^[ \t]+|[ \t]+$/, "", command)
+  gsub(/[ \t]+/, " ", command)
+  return command
+}
+
+function command_action(command, normalized, target) {
+  normalized = pretty_command(command)
+
+  if (normalized ~ /omarchy-menu-tmux-keybindings/) return "Show Tmux keybindings"
+  if (normalized ~ /^send(-keys)? -X begin-selection/) return "Begin selection"
+  if (normalized ~ /^send(-keys)? -X copy-selection-and-cancel/) return "Copy selection"
+  if (normalized ~ /^send-prefix/) return "Send prefix"
+  if (normalized ~ /^source-file/) return "Reload config"
+  if (normalized ~ /^split-window -v/) return "Split pane vertically"
+  if (normalized ~ /^split-window -h/) return "Split pane horizontally"
+  if (normalized ~ /^kill-pane/) return "Kill pane"
+  if (normalized ~ /^select-pane -L/) return "Focus pane left"
+  if (normalized ~ /^select-pane -R/) return "Focus pane right"
+  if (normalized ~ /^select-pane -U/) return "Focus pane up"
+  if (normalized ~ /^select-pane -D/) return "Focus pane down"
+  if (normalized ~ /^resize-pane -L/) return "Resize pane left"
+  if (normalized ~ /^resize-pane -R/) return "Resize pane right"
+  if (normalized ~ /^resize-pane -U/) return "Resize pane up"
+  if (normalized ~ /^resize-pane -D/) return "Resize pane down"
+  if (normalized ~ /^swap-pane -t "?left-of"?/) return "Move pane left"
+  if (normalized ~ /^swap-pane -t "?right-of"?/) return "Move pane right"
+  if (normalized ~ /^swap-pane -t "?up-of"?/) return "Move pane up"
+  if (normalized ~ /^swap-pane -t "?down-of"?/) return "Move pane down"
+  if (normalized ~ /^swap-pane -U/) return "Move pane left"
+  if (normalized ~ /^swap-pane -D/) return "Move pane right"
+  if (normalized ~ /rename-window/) return "Rename window"
+  if (normalized ~ /^new-window/) return "New window"
+  if (normalized ~ /^kill-window/) return "Kill window"
+
+  if (match(normalized, /^select-window -t ([^ ;]+)/, target)) {
+    gsub(/^:=?/, "", target[1])
+
+    if (target[1] == "-1") return "Previous window"
+    if (target[1] == "+1") return "Next window"
+
+    return "Switch to window " target[1]
+  }
+
+  if (normalized ~ /^swap-window -t -1/) return "Move window left"
+  if (normalized ~ /^swap-window -t \+1/) return "Move window right"
+  if (normalized ~ /rename-session/) return "Rename session"
+  if (normalized ~ /^new-session/) return "New session"
+  if (normalized ~ /^kill-session/) return "Kill session"
+  if (normalized ~ /^switch-client -p/) return "Previous session"
+  if (normalized ~ /^switch-client -n/) return "Next session"
+
+  return normalized
+}
+
+function add_record(combo, action) {
+  records[++record_count] = sprintf("%-32s → %s", combo, action)
+}
+
+function parse_bind(line, words, count, i, table, global, key, command, combo, action) {
+  count = split(line, words, /[ \t]+/)
+  i = 2
+  table = "prefix"
+  global = 0
+
+  while (i <= count && words[i] ~ /^-/) {
+    if (words[i] == "-n") {
+      global = 1
+      i++
+    } else if (words[i] == "-T") {
+      table = words[i + 1]
+      i += 2
+    } else if (words[i] == "-r") {
+      i++
+    } else {
+      i++
+    }
+  }
+
+  key = words[i]
+  i++
+
+  command = ""
+  for (; i <= count; i++) {
+    command = command (command == "" ? "" : " ") words[i]
+  }
+
+  if (key == "" || command == "") return
+
+  if (global) {
+    combo = key_text(key)
+  } else if (table == "prefix") {
+    combo = "PREFIX + " key_text(key)
+  } else {
+    combo = table_text(table) " + " key_text(key)
+  }
+
+  action = command_action(command)
+  add_record(combo, action)
+}
+
+BEGIN {
+  prefix = "C-b"
+  prefix2 = ""
+}
+
+{
+  line = trim($0)
+
+  if (line == "") next
+  if (line ~ /^#/) next
+
+  if (line ~ /^(set|set-option|setw|set-window-option)[ \t]/) {
+    word_count = split(line, words, /[ \t]+/)
+
+    for (i = 2; i <= word_count; i++) {
+      if (words[i] == "prefix") prefix = words[i + 1]
+      if (words[i] == "prefix2") prefix2 = words[i + 1]
+    }
+
+    next
+  }
+
+  if (line ~ /^(bind|bind-key)[ \t]/) parse_bind(line)
+}
+
+END {
+  prefix_description = key_text(prefix)
+
+  if (prefix2 != "" && prefix2 != "None") {
+    prefix_description = prefix_description " / " key_text(prefix2)
+  }
+
+  printf "%-32s → %s\n", "PREFIX", prefix_description
+
+  add_record("PREFIX + {", "Move pane left")
+  add_record("PREFIX + }", "Move pane right")
+
+  for (i = 1; i <= record_count; i++) print records[i]
+}
+' "$config_file"
+}
+
+if [[ $print_only == "true" ]]; then
+  output_keybindings
+  exit 0
+fi
+
+records=$(output_keybindings)
+
+monitor_height=$(hyprctl monitors -j 2>/dev/null | jq -r '.[] | select(.focused == true) | .height' 2>/dev/null)
+
+if [[ ! $monitor_height =~ ^[0-9]+$ ]] || ((monitor_height <= 0)); then
+  monitor_height=900
+fi
+
+menu_height=$((monitor_height * 40 / 100))
+printf '%s\n' "$records" | omarchy-menu-select 'Tmux keybindings' -- --width 800 --height "$menu_height" >/dev/null || true
diff --git a/bin/omarchy-migrate b/bin/omarchy-migrate
index 4ba325be..e087624f 100755
--- a/bin/omarchy-migrate
+++ b/bin/omarchy-migrate
@@ -1,28 +1,97 @@
 #!/bin/bash
 
-# omarchy:summary=Run all pending migrations to bring the system in line with the installed version.
+# omarchy:summary=Run pending Omarchy system and user migrations.
+# omarchy:args=[--pending [all|system|user]]
 
-STATE_DIR="$HOME/.local/state/omarchy/migrations"
-mkdir -p "$STATE_DIR"
+set -euo pipefail
 
-# Skipped migrations are tracked separately
-mkdir -p "$STATE_DIR/skipped"
+mode="run"
+pending_scope="all"
 
-# Run any pending migrations
-for file in $OMARCHY_PATH/migrations/*.sh; do
-  filename=$(basename "$file")
+usage() {
+  echo "Usage: omarchy-migrate [--pending [all|system|user]]"
+}
 
-  if [[ ! -f $STATE_DIR/$filename && ! -f $STATE_DIR/skipped/$filename ]]; then
-    echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"
-
-    if bash $file; then
-      touch "$STATE_DIR/$filename"
-    else
-      if gum confirm "Migration ${filename%.sh} failed. Skip and continue?"; then
-        touch "$STATE_DIR/skipped/$filename"
-      else
-        exit 1
+while (($#)); do
+  case "$1" in
+    --pending|--check)
+      mode="pending"
+      shift
+      if [[ ${1:-} == "all" || ${1:-} == "system" || ${1:-} == "user" ]]; then
+        pending_scope="$1"
+        shift
       fi
-    fi
-  fi
+      ;;
+    --pending=all|--pending=system|--pending=user)
+      mode="pending"
+      pending_scope="${1#--pending=}"
+      shift
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unknown option: $1" >&2
+      exit 1
+      ;;
+  esac
 done
+
+pending_output=""
+
+append_pending() {
+  local scope="$1"
+  local command="$2"
+  local output=""
+  local migration=""
+
+  if output=$("$command" --pending 2>/dev/null); then
+    while IFS= read -r migration; do
+      [[ -n $migration ]] || continue
+      pending_output+="$scope/$migration"$'\n'
+    done <<<"$output"
+  fi
+}
+
+if [[ $mode == "pending" ]]; then
+  case "$pending_scope" in
+    all)
+      append_pending system omarchy-migrate-system
+      append_pending user omarchy-migrate-user
+      ;;
+    system)
+      append_pending system omarchy-migrate-system
+      ;;
+    user)
+      append_pending user omarchy-migrate-user
+      ;;
+  esac
+
+  if [[ -n $pending_output ]]; then
+    printf '%s' "$pending_output"
+    exit 0
+  else
+    exit 1
+  fi
+fi
+
+wait_for_pacman_transaction() {
+  local lock_file=/var/lib/pacman/db.lck
+
+  [[ -e $lock_file ]] || return 0
+  echo "Waiting for pacman transaction to finish before running Omarchy migrations..."
+
+  for _ in {1..900}; do
+    [[ -e $lock_file ]] || return 0
+    sleep 1
+  done
+
+  echo "Pacman transaction is still running; Omarchy migrations will retry on next login."
+  exit 0
+}
+
+wait_for_pacman_transaction
+
+omarchy-migrate-system
+omarchy-migrate-user
diff --git a/bin/omarchy-migrate-notify b/bin/omarchy-migrate-notify
new file mode 100755
index 00000000..ab2a365f
--- /dev/null
+++ b/bin/omarchy-migrate-notify
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# omarchy:summary=Notify the user when Omarchy has pending user migrations
+
+set -euo pipefail
+
+pending_migrations=$(omarchy-migrate --pending user 2>/dev/null) || exit 0
+pending_count=$(printf '%s\n' "$pending_migrations" | sed '/^[[:space:]]*$/d' | wc -l)
+
+if (( pending_count == 1 )); then
+  message="1 new Omarchy user migration is available. Click to run it in a terminal."
+else
+  message="$pending_count new Omarchy user migrations are available. Click to run them in a terminal."
+fi
+
+notify_command=$(printf 'if [[ -n $(omarchy-notification-send -u critical -g  "Run Omarchy Migrations" %q -a) ]]; then omarchy-launch-floating-terminal-with-presentation omarchy-migrate; fi' "$message")
+
+if command -v systemd-run >/dev/null 2>&1; then
+  unit="omarchy-migrations-notification-$(date +%Y%m%d%H%M%S)"
+  systemd-run --user --scope --unit="$unit" bash -lc "$notify_command" >/dev/null 2>&1 && exit 0
+fi
+
+print_pending_migrations() {
+  echo "Omarchy has pending user migrations. Run omarchy-migrate in a terminal to apply them:"
+  while IFS= read -r migration; do
+    [[ -n $migration ]] || continue
+    printf '  %s\n' "$migration"
+  done <<<"$pending_migrations"
+}
+
+if [[ -t 1 ]]; then
+  print_pending_migrations
+else
+  print_pending_migrations >&2
+fi
diff --git a/bin/omarchy-migrate-system b/bin/omarchy-migrate-system
new file mode 100755
index 00000000..8cf109af
--- /dev/null
+++ b/bin/omarchy-migrate-system
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# omarchy:summary=Run pending Omarchy system migrations as root.
+# omarchy:args=[--pending]
+# omarchy:requires-sudo=true
+
+set -euo pipefail
+
+mode="run"
+while (($#)); do
+  case "$1" in
+    --pending|--check)
+      mode="pending"
+      shift
+      ;;
+    -h|--help)
+      echo "Usage: omarchy-migrate-system [--pending]"
+      exit 0
+      ;;
+    *)
+      echo "Unknown option: $1" >&2
+      exit 1
+      ;;
+  esac
+done
+
+OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
+STATE_DIR="${OMARCHY_SYSTEM_MIGRATION_STATE:-/var/lib/omarchy/migrations/system}"
+MIGRATIONS_DIR="$OMARCHY_PATH/migrations/system"
+
+pending_migrations() {
+  [[ -d $MIGRATIONS_DIR ]] || return 0
+
+  for file in "$MIGRATIONS_DIR"/*.sh; do
+    [[ -f $file ]] || continue
+    filename=$(basename "$file")
+
+    if [[ ! -f $STATE_DIR/$filename ]]; then
+      printf '%s\n' "$filename"
+    fi
+  done
+}
+
+if [[ $mode == "pending" ]]; then
+  pending_output=$(pending_migrations)
+  if [[ -n $pending_output ]]; then
+    printf '%s\n' "$pending_output"
+    exit 0
+  else
+    exit 1
+  fi
+fi
+
+if (( EUID != 0 )) && [[ -z ${OMARCHY_SYSTEM_MIGRATION_STATE:-} ]]; then
+  if ! "$0" --pending >/dev/null; then
+    exit 0
+  fi
+
+  exec sudo --preserve-env=OMARCHY_PATH "$0" "$@"
+fi
+
+mkdir -p "$STATE_DIR"
+[[ -d $MIGRATIONS_DIR ]] || exit 0
+
+for file in "$MIGRATIONS_DIR"/*.sh; do
+  [[ -f $file ]] || continue
+  filename=$(basename "$file")
+
+  if [[ ! -f $STATE_DIR/$filename ]]; then
+    echo -e "\e[32m\nRunning system migration (${filename%.sh})\e[0m"
+    OMARCHY_PATH="$OMARCHY_PATH" bash -euo pipefail "$file"
+    touch "$STATE_DIR/$filename"
+  fi
+done
diff --git a/bin/omarchy-migrate-user b/bin/omarchy-migrate-user
new file mode 100755
index 00000000..cd9a2149
--- /dev/null
+++ b/bin/omarchy-migrate-user
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# omarchy:summary=Run pending Omarchy migrations for the current user.
+# omarchy:args=[--pending]
+
+set -euo pipefail
+
+mode="run"
+while (($#)); do
+  case "$1" in
+    --pending|--check)
+      mode="pending"
+      shift
+      ;;
+    -h|--help)
+      echo "Usage: omarchy-migrate-user [--pending]"
+      exit 0
+      ;;
+    *)
+      echo "Unknown option: $1" >&2
+      exit 1
+      ;;
+  esac
+done
+
+OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
+STATE_DIR="${OMARCHY_USER_MIGRATION_STATE:-$HOME/.local/state/omarchy/migrations/user}"
+MIGRATIONS_DIR="$OMARCHY_PATH/migrations/user"
+
+pending_migrations() {
+  [[ -d $MIGRATIONS_DIR ]] || return 0
+
+  for file in "$MIGRATIONS_DIR"/*.sh; do
+    [[ -f $file ]] || continue
+    filename=$(basename "$file")
+
+    if [[ ! -f $STATE_DIR/$filename ]]; then
+      printf '%s\n' "$filename"
+    fi
+  done
+}
+
+if [[ $mode == "pending" ]]; then
+  pending_output=$(pending_migrations)
+  if [[ -n $pending_output ]]; then
+    printf '%s\n' "$pending_output"
+    exit 0
+  else
+    exit 1
+  fi
+fi
+
+mkdir -p "$STATE_DIR"
+[[ -d $MIGRATIONS_DIR ]] || exit 0
+
+for file in "$MIGRATIONS_DIR"/*.sh; do
+  [[ -f $file ]] || continue
+  filename=$(basename "$file")
+
+  if [[ ! -f $STATE_DIR/$filename ]]; then
+    echo -e "\e[32m\nRunning user migration (${filename%.sh})\e[0m"
+    OMARCHY_PATH="$OMARCHY_PATH" bash -euo pipefail "$file"
+    touch "$STATE_DIR/$filename"
+  fi
+done
diff --git a/bin/omarchy-mise-install b/bin/omarchy-mise-install
new file mode 100755
index 00000000..bf98dd9f
--- /dev/null
+++ b/bin/omarchy-mise-install
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# omarchy:summary=Install a small mise-backed wrapper for a given tool.
+# omarchy:args=<package> [command-name [bin-name]]
+
+if [[ -z $1 ]]; then
+  echo "Usage: omarchy-mise-install <package> [command-name [bin-name]]"
+  exit 1
+fi
+
+package=$1
+command=${2:-$1}
+bin=${3:-$command}
+
+mkdir -p "$HOME/.local/bin"
+
+cat >"$HOME/.local/bin/$command" <<EOF
+#!/bin/bash
+mise use -g "$package"
+exec "$bin" "\$@"
+EOF
+
+chmod +x "$HOME/.local/bin/$command"
diff --git a/bin/omarchy-monitor-state b/bin/omarchy-monitor-state
new file mode 100755
index 00000000..26663aa2
--- /dev/null
+++ b/bin/omarchy-monitor-state
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# omarchy:summary=Print monitor panel state for the shell
+# omarchy:group=monitor
+
+{ omarchy-brightness-display 2>/dev/null; echo; } | head -n 1
+
+monitors_json=$(hyprctl monitors all -j)
+
+printf '%s\n' "$monitors_json" | jq -r '
+  def internal: test("^(eDP|LVDS|DSI)-");
+  ([.[] | select(.name | internal)][0].name // ""),
+  ([.[] | select((.name | internal) | not)][0].name // ""),
+  ([.[] | select((.name | internal) and .disabled != true)][0].name // ""),
+  ([.[] | select((.name | internal) and .mirrorOf != "none")][0].mirrorOf // "")
+'
+
+omarchy-hyprland-monitor-focused 2>/dev/null || echo
+omarchy-hyprland-monitor-scaling 2>/dev/null || echo
+
+printf '%s\n' "$monitors_json" | jq -c '[.[] | {name, enabled:(.disabled != true), focused:(.focused == true)}]'
diff --git a/bin/omarchy-network-status b/bin/omarchy-network-status
new file mode 100755
index 00000000..2f8a9875
--- /dev/null
+++ b/bin/omarchy-network-status
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# omarchy:summary=Print active network status for the shell
+# omarchy:group=network
+# omarchy:args=[--verbose]
+
+verbose=false
+
+case "${1:-}" in
+  "")
+    ;;
+  --verbose)
+    verbose=true
+    ;;
+  *)
+    echo "Usage: omarchy-network-status [--verbose]" >&2
+    exit 2
+    ;;
+esac
+
+print_status() {
+  local device nm state ssid signal freq
+
+  device=$(ip route get 1.1.1.1 2>/dev/null | awk '{ for (i = 1; i <= NF; i++) if ($i == "dev") { print $(i + 1); exit } }')
+
+  if [[ -z $device ]]; then
+    printf 'disconnected\t\t\t\n'
+    return
+  fi
+
+  if [[ ! -d /sys/class/net/$device/wireless ]]; then
+    printf 'ethernet\t%s\t\t\n' "$device"
+    return
+  fi
+
+  if omarchy-cmd-present nmcli; then
+    nm=$(nmcli -t -f GENERAL.STATE,GENERAL.CONNECTION dev show "$device" 2>/dev/null)
+    state=$(awk -F: '$1 == "GENERAL.STATE" { print $2; exit }' <<<"$nm")
+    ssid=$(awk -F: '$1 == "GENERAL.CONNECTION" { print $2; exit }' <<<"$nm")
+    signal=$(nmcli -t -f IN-USE,SIGNAL dev wifi list ifname "$device" 2>/dev/null | awk -F: '$1 == "*" { print $2; exit }')
+    freq=$(iw dev "$device" link 2>/dev/null | awk '/freq:/ { print $2; exit }')
+
+    if [[ $state != 100* ]]; then
+      printf 'disconnected\t\t\t\n'
+      return
+    fi
+
+    printf 'wifi\t%s\t%s\t%s\n' "${ssid:-$device}" "$signal" "$freq"
+    return
+  fi
+
+  printf 'wifi\t%s\t\t\n' "$device"
+}
+
+print_verbose() {
+  local route_json iface gw src prefix link
+
+  route_json=$(ip -j route get 1.1.1.1 2>/dev/null)
+  [[ -z $route_json ]] && return
+
+  iface=$(jq -r '.[0].dev // ""' <<<"$route_json" 2>/dev/null)
+  gw=$(jq -r '.[0].gateway // ""' <<<"$route_json" 2>/dev/null)
+  src=$(jq -r '.[0].prefsrc // ""' <<<"$route_json" 2>/dev/null)
+
+  [[ -z $iface ]] && return
+
+  prefix=$(ip -j addr show "$iface" 2>/dev/null | jq -r '.[0].addr_info[]? | select(.family == "inet") | .prefixlen // ""' 2>/dev/null | head -n 1)
+
+  printf 'iface\t%s\n' "$iface"
+  printf 'ip\t%s\n' "$src"
+  printf 'prefix\t%s\n' "$prefix"
+  printf 'gateway\t%s\n' "$gw"
+
+  if [[ -r /sys/class/net/$iface/statistics/rx_bytes ]]; then
+    printf 'rx_bytes\t%s\n' "$(cat /sys/class/net/$iface/statistics/rx_bytes)"
+  fi
+  if [[ -r /sys/class/net/$iface/statistics/tx_bytes ]]; then
+    printf 'tx_bytes\t%s\n' "$(cat /sys/class/net/$iface/statistics/tx_bytes)"
+  fi
+
+  if [[ -d /sys/class/net/$iface/wireless ]]; then
+    printf 'type\twifi\n'
+
+    if omarchy-cmd-present iw; then
+      link=$(iw dev "$iface" link 2>/dev/null)
+
+      if [[ -n $link ]]; then
+        printf 'ssid\t%s\n' "$(awk '/SSID:/ { sub(/.*SSID: /, ""); print; exit }' <<<"$link")"
+        printf 'signal_dbm\t%s\n' "$(awk '/signal:/ { print $2; exit }' <<<"$link")"
+        printf 'freq\t%s\n' "$(awk '/freq:/ { print $2; exit }' <<<"$link")"
+        printf 'bitrate\t%s %s\n' "$(awk '/tx bitrate:/ { print $3; exit }' <<<"$link")" "$(awk '/tx bitrate:/ { print $4; exit }' <<<"$link")"
+      fi
+    fi
+  else
+    printf 'type\tethernet\n'
+    [[ -r /sys/class/net/$iface/speed ]] && printf 'speed\t%s\n' "$(cat /sys/class/net/$iface/speed)"
+    [[ -r /sys/class/net/$iface/duplex ]] && printf 'duplex\t%s\n' "$(cat /sys/class/net/$iface/duplex)"
+  fi
+}
+
+if [[ $verbose == "true" ]]; then
+  print_verbose
+else
+  print_status
+fi
diff --git a/bin/omarchy-notification-battery b/bin/omarchy-notification-battery
new file mode 100755
index 00000000..3b0dcad7
--- /dev/null
+++ b/bin/omarchy-notification-battery
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Show the current battery status notification
+
+omarchy-notification-send -g 󰁹 -u low "$(omarchy-battery-status)"
diff --git a/bin/omarchy-notification-dismiss b/bin/omarchy-notification-dismiss
index ab515e72..91e8b0d0 100755
--- a/bin/omarchy-notification-dismiss
+++ b/bin/omarchy-notification-dismiss
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# omarchy:summary=Dismiss a mako notification on the basis of its summary. Used by the first-run notifications to dismiss them after clicking for action.
+# omarchy:summary=Dismiss a notification by summary substring. Used by the first-run notifications to dismiss them after clicking for action.
 # omarchy:args=<summary>
 
 if (($# == 0)); then
@@ -8,9 +8,4 @@ if (($# == 0)); then
   exit 1
 fi
 
-# Find the first notification whose 'summary' matches the regex in $1
-notification_id=$(makoctl list | grep -F "$1" | head -n1 | sed -E 's/^Notification ([0-9]+):.*/\1/')
-
-if [[ -n $notification_id ]]; then
-  makoctl dismiss -n $notification_id
-fi
+omarchy-shell -q notifications dismiss "$1"
diff --git a/bin/omarchy-notification-send b/bin/omarchy-notification-send
index 0a1c4e7c..05961410 100755
--- a/bin/omarchy-notification-send
+++ b/bin/omarchy-notification-send
@@ -1,32 +1,116 @@
 #!/bin/bash
 
-# omarchy:summary=Send a desktop notification with Omarchy glyph and body spacing
-# omarchy:args=<glyph> <headline> [description] [notify-send options]
-# omarchy:examples=omarchy notification send "󰔛" "Reminder" "5 minutes are up" -u critical
+# omarchy:summary=Send an Omarchy desktop notification
+# omarchy:args=[-a] [--app-name <app-name>] [-g <glyph>] [-u <low|normal|critical>] [--image <path-or-uri>] <headline> [description] [notify-send options]
+# omarchy:examples=omarchy notification send "Reminder" "5 minutes are up" -g 󰢌
 
 set -euo pipefail
 
-if (($# < 2)); then
-  echo "Usage: omarchy-notification-send <glyph> <headline> [description] [notify-send options]"
+headline=""
+description=""
+glyph=
+urgency="low"
+app_name="omarchy-action"
+image=
+click_action=0
+args=()
+parsed_option_args=0
+
+parse_omarchy_option() {
+  case $1 in
+  -g | --glyph)
+    if (($# < 2)); then
+      echo "Missing value for $1" >&2
+      exit 1
+    fi
+    glyph=$2
+    parsed_option_args=2
+    return 0
+    ;;
+  -u | --urgency)
+    if (($# < 2)); then
+      echo "Missing value for $1" >&2
+      exit 1
+    fi
+    urgency="$2"
+    parsed_option_args=2
+    return 0
+    ;;
+  --app-name)
+    if (($# < 2)); then
+      echo "Missing value for $1" >&2
+      exit 1
+    fi
+    app_name=$2
+    parsed_option_args=2
+    return 0
+    ;;
+  --image)
+    if (($# < 2)); then
+      echo "Missing value for $1" >&2
+      exit 1
+    fi
+    image=$2
+    parsed_option_args=2
+    return 0
+    ;;
+  -a | --action)
+    click_action=1
+    parsed_option_args=1
+    return 0
+    ;;
+  esac
+
+  return 1
+}
+
+while (($# > 0)); do
+  if parse_omarchy_option "$@"; then
+    shift "$parsed_option_args"
+  else
+    break
+  fi
+done
+
+if (($# < 1)); then
+  echo "Usage: omarchy-notification-send [-a] [--app-name <app-name>] [-g <glyph>] [-u <low|normal|critical>] [--image <path-or-uri>] <headline> [description] [notify-send options]"
   exit 1
 fi
 
-glyph=$1
-headline=$2
-description=${3:-}
-shift 2
+headline=$1
+shift
 
 if (($# > 0)) && [[ $1 != -* ]]; then
+  description=$1
   shift
-else
-  description=""
 fi
 
-summary="$glyph    $headline"
+while (($# > 0)); do
+  if parse_omarchy_option "$@"; then
+    shift "$parsed_option_args"
+  else
+    args+=("$1")
+    shift
+  fi
+done
+
+# Tag as a user-action toast so it pops through DND.
+args+=("-a" "$app_name" "-u" "$urgency")
+
+if [[ -n $glyph ]]; then
+  args+=("--hint=string:omarchy-glyph:$glyph")
+fi
+
+if [[ -n $image ]]; then
+  args+=("--hint=string:image-path:$image")
+fi
+
+if ((click_action)); then
+  args+=("-A" "default=default")
+fi
 
 if [[ -n $description ]]; then
-  description=$(sed 's/^/      /' <<<"$description")
-  notify-send "$@" "$summary" "$description"
+  notify-send "${args[@]}" "$headline" "$description"
 else
-  notify-send "$@" "$summary"
+  notify-send "${args[@]}" "$headline"
 fi
diff --git a/bin/omarchy-notification-time b/bin/omarchy-notification-time
new file mode 100755
index 00000000..6963f373
--- /dev/null
+++ b/bin/omarchy-notification-time
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Show the current time and date notification
+
+omarchy-notification-send -g  -u low "$(date +"%A %H:%M  ·  %d %B %Y  ·  Week %V")"
diff --git a/bin/omarchy-notification-weather b/bin/omarchy-notification-weather
new file mode 100755
index 00000000..e4eaa349
--- /dev/null
+++ b/bin/omarchy-notification-weather
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Toggle the current weather panel
+
+omarchy-shell omarchy.weather toggle
diff --git a/bin/omarchy-npx-install b/bin/omarchy-npx-install
deleted file mode 100755
index 6c0101d6..00000000
--- a/bin/omarchy-npx-install
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install an npx wrapper for a given npm package.
-# omarchy:args=<package> [command-name]
-
-if [[ -z $1 ]]; then
-  echo "Usage: omarchy-npx-install <package> [command-name]"
-  exit 1
-fi
-
-package=$1
-command=${2:-$1}
-
-mkdir -p "$HOME/.local/bin"
-
-cat > "$HOME/.local/bin/$command" <<EOF
-#!/bin/bash
-package="$package"
-command="$command"
-
-if ! node_root="\$(mise where node@latest 2>/dev/null)"; then
-  mise use -g node@latest >/dev/null
-  node_root="\$(mise where node@latest)"
-fi
-
-node_bin="\$node_root/bin/node"
-npx_bin="\$node_root/bin/npx"
-
-ensure_bin_runtime() {
-  local bin_path=\$1
-  local shebang
-
-  IFS= read -r shebang < "\$bin_path"
-
-  if [[ \$shebang == "#!"*"/bun"* || \$shebang == "#!"*"/env bun"* ]]; then
-    if omarchy-cmd-missing bun; then
-      echo "Installing bun runtime for \$package..."
-      omarchy-pkg-add bun
-      hash -r
-    fi
-  fi
-}
-
-exec_package_bin() {
-  local package_bin_path=\$1
-  shift
-
-  if [[ -n \$package_bin_path ]]; then
-    ensure_bin_runtime "\$package_bin_path"
-    PATH="\$node_root/bin:\$PATH" exec "\$package_bin_path" "\$@"
-  fi
-}
-
-# Resolve the package bin inside npx, then run it with node@latest available for node shebangs.
-# Some wrappers are aliases, e.g. playwright-cli wraps the playwright bin.
-"\$node_bin" "\$npx_bin" --yes --prefer-online --package "\$package" -- true
-
-package_bin_path=\$("\$node_bin" "\$npx_bin" --yes --package "\$package" -- which "\$package" 2>/dev/null)
-exec_package_bin "\$package_bin_path" "\$@"
-
-# Scoped packages like @openai/codex expose an unscoped bin like codex.
-package_bin_path=\$("\$node_bin" "\$npx_bin" --yes --package "\$package" -- which "\$command" 2>/dev/null)
-exec_package_bin "\$package_bin_path" "\$@"
-
-echo "Could not resolve npm bin for \$package / \$command" >&2
-exit 127
-EOF
-
-chmod +x "$HOME/.local/bin/$command"
diff --git a/bin/omarchy-osd b/bin/omarchy-osd
new file mode 100755
index 00000000..99442989
--- /dev/null
+++ b/bin/omarchy-osd
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# omarchy:summary=Show the Omarchy Quickshell on-screen display
+# omarchy:args=[-i|--icon <icon>] [-m|--message <text>] [-p|--progress <0-100>] [-d|--duration <ms>]
+# omarchy:examples=omarchy osd -i brightness -p 50 | omarchy osd -m "Hello"
+
+set -euo pipefail
+
+icon=""
+message=""
+progress=""
+progress_text=""
+max="100"
+duration=""
+
+while (($#)); do
+  case $1 in
+    -i|--icon) icon="${2:-}"; shift 2 ;;
+    -m|--message) message="${2:-}"; shift 2 ;;
+    -p|--progress) progress="${2:-}"; shift 2 ;;
+    -d|--duration) duration="${2:-}"; shift 2 ;;
+    -h|--help) omarchy osd --help; exit 0 ;;
+    *) echo "Unknown OSD option: $1" >&2; exit 1 ;;
+  esac
+done
+
+if [[ -n $progress ]]; then
+  progress_text="${progress}%"
+fi
+
+payload=$(jq -cn \
+  --arg icon "$icon" \
+  --arg message "$message" \
+  --arg value "$progress" \
+  --arg progressText "$progress_text" \
+  --arg max "$max" \
+  --arg duration "$duration" \
+  '{icon:$icon,message:$message,value:$value,progressText:$progressText,max:$max,duration:$duration}')
+
+omarchy-shell -q osd show "$payload"
diff --git a/bin/omarchy-pkg-add b/bin/omarchy-pkg-add
index 4db19e05..977d7efd 100755
--- a/bin/omarchy-pkg-add
+++ b/bin/omarchy-pkg-add
@@ -6,7 +6,11 @@
 # omarchy:requires-sudo=true
 
 if omarchy-pkg-missing "$@"; then
-  sudo pacman -S --noconfirm --needed "$@" || exit 1
+  if (( EUID == 0 )); then
+    pacman -S --noconfirm --needed "$@" || exit 1
+  else
+    sudo pacman -S --noconfirm --needed "$@" || exit 1
+  fi
 fi
 
 for pkg in "$@"; do
diff --git a/bin/omarchy-pkg-drop b/bin/omarchy-pkg-drop
index 0cbbfca6..24e9ed54 100755
--- a/bin/omarchy-pkg-drop
+++ b/bin/omarchy-pkg-drop
@@ -5,9 +5,14 @@
 # omarchy:requires-sudo=true
 
 installed=()
+declare -A seen=()
 for pkg in "$@"; do
-  if pacman -Q "$pkg" &>/dev/null; then
-    installed+=("$pkg")
+  if package_info=$(pacman -Q "$pkg" 2>/dev/null); then
+    package_name=${package_info%% *}
+    if [[ -z ${seen[$package_name]} ]]; then
+      installed+=("$package_name")
+      seen[$package_name]=1
+    fi
   fi
 done
 
diff --git a/bin/omarchy-plugin b/bin/omarchy-plugin
new file mode 100755
index 00000000..99c2b46a
--- /dev/null
+++ b/bin/omarchy-plugin
@@ -0,0 +1,1294 @@
+#!/bin/bash
+
+# omarchy:summary=Manage Omarchy shell plugins and bar widgets
+# omarchy:group=plugin
+# omarchy:args=<list|rescan|enable|disable|clone|edit|bar> [...]
+# omarchy:examples=omarchy plugin list | omarchy plugin clone omarchy.clock local.clock --with ai | omarchy plugin edit local.clock --with editor | omarchy plugin enable acme.weather --section right | omarchy plugin bar settings
+
+set -euo pipefail
+
+CONFIG_FILE="$HOME/.config/omarchy/shell.json"
+
+usage() {
+  cat <<USAGE
+Usage: omarchy-plugin <command> [args...]
+
+Plugin commands:
+  list [--json]                         List discovered shell plugins
+  rescan                                Rescan ~/.config/omarchy/plugins
+  enable <id> [placement]               Enable a plugin
+  disable <id>                          Disable a plugin
+  clone [source] [new-id] [options]      Clone a built-in or user plugin
+  edit [id] [--with <ai|editor>] [--prompt <prompt>]
+                                        Open a user plugin for editing
+
+Add from sources (see 'omarchy plugin <command> --help'):
+  source <add|list|remove|refresh>      Manage trusted plugin source repos
+  available                             List plugins offered by your sources
+  add [id] [--from <src>] [--enable] [--review] [--yes]
+                                        Add a plugin from a trusted source
+  update [id] [--all] [--review] [--yes]
+                                        Update added plugins (shows a diff)
+  remove [id] [--yes]                   Remove an installed plugin
+  validate <plugin-folder>              Check a plugin's manifest (for authors)
+
+  Source/add commands run their own binaries; the rest are handled here.
+  Plugins are unsandboxed code — review what you add and enable.
+
+Clone options:
+  --name <name>                         Display name for the clone
+  --with <ai|editor>                    Open the clone with AI or editor
+  --prompt <prompt>                     Initial prompt when opening with AI
+  --replace                             Replace the first source bar instance
+  --add [placement]                     Add cloned bar widget to the bar
+  --use                                 Use cloned bar options as the active bar
+
+Bar widget commands:
+  bar settings                          Open the inline bar config panel
+  bar options [--json]                  List available bar options
+  bar use <id>                          Use a bar option as the active bar
+  bar reset                             Return to the built-in Omarchy bar
+  bar list [--json]                     List current bar layout
+  bar add <id> [placement] [--duplicate]
+  bar move <id> [placement] [--from-section SECTION] [--from-index N]
+  bar remove <id> [--section SECTION] [--all]
+  bar remove --section SECTION --index N
+  bar set <id> <key> <value> [--json] [--section SECTION] [--index N]
+
+Placement options:
+  --section <left|center|right>         Target bar section
+  --index <n>                           Insert at index in the target section
+  --before <id>                         Insert before the first matching widget
+  --after <id>                          Insert after the first matching widget
+
+Examples:
+  omarchy plugin list
+  omarchy plugin rescan
+  omarchy plugin clone
+  omarchy plugin clone omarchy.clock local.clock --name "My Clock" --replace --with ai --prompt "Customize this clock"
+  omarchy plugin edit local.clock --with editor
+  omarchy plugin edit local.clock --with ai --prompt "Customize this clock"
+  omarchy plugin enable acme.weather --section right
+  omarchy plugin bar options
+  omarchy plugin bar use local.neon-bar
+  omarchy plugin bar reset
+  omarchy plugin bar add acme.weather --section right --before omarchy.tray
+  omarchy plugin bar move omarchy.clock --section center --index 0
+  omarchy plugin bar remove acme.weather
+  omarchy plugin bar set omarchy.clock format HH:mm
+  omarchy plugin bar set omarchy.indicators items '["Dnd","NightLight"]' --json
+USAGE
+}
+
+fail() {
+  echo "omarchy-plugin: $*" >&2
+  exit 1
+}
+
+require_omarchy_path() {
+  [[ -n ${OMARCHY_PATH:-} ]] || fail "OMARCHY_PATH is not set"
+}
+
+require_command() {
+  local command_name="$1"
+  command -v "$command_name" >/dev/null 2>&1 || fail "$command_name is required"
+}
+
+plugin_discovered() {
+  local id="$1" plugins
+  plugins=$(omarchy-shell shell listPlugins 2>/dev/null) || return 1
+  jq -e --arg id "$id" 'any(.[]; .id == $id)' <<<"$plugins" >/dev/null 2>&1
+}
+
+wait_for_plugin_discovery() {
+  local id="$1" attempt
+  for (( attempt = 0; attempt < 40; attempt++ )); do
+    plugin_discovered "$id" && return 0
+    sleep 0.05
+  done
+  return 1
+}
+
+section_valid() {
+  [[ $1 =~ ^(left|center|right)$ ]]
+}
+
+validate_section() {
+  local section="$1"
+  section_valid "$section" || fail "section must be left, center, or right"
+}
+
+validate_index() {
+  local value="$1"
+  [[ $value =~ ^[0-9]+$ ]] || fail "index must be a non-negative integer"
+}
+
+canonical_widget_id() {
+  printf '%s' "$1"
+}
+
+validate_plugin_id() {
+  local id="$1"
+  [[ $id =~ ^[A-Za-z0-9][A-Za-z0-9._-]*$ ]] || fail "plugin id must contain only letters, numbers, dots, underscores, and dashes"
+  [[ $id == *.* ]] || fail "plugin id must be namespaced, e.g. local.clock"
+  [[ $id != omarchy.* ]] || fail "plugin ids beginning with omarchy. are reserved for built-ins"
+  [[ $(canonical_widget_id "$id") == "$id" ]] || fail "$id is a reserved built-in widget id"
+}
+
+print_plugins() {
+  local json="false"
+
+  while (( $# > 0 )); do
+    case "$1" in
+    --json)
+      json="true"
+      ;;
+    -h | --help)
+      usage
+      exit 0
+      ;;
+    *)
+      fail "unknown list option: $1"
+      ;;
+    esac
+    shift
+  done
+
+  local plugins
+  plugins=$(omarchy-shell shell listPlugins) || fail "could not list plugins; is omarchy-shell running?"
+
+  if [[ $json == "true" ]]; then
+    printf '%s\n' "$plugins"
+    return
+  fi
+
+  require_command jq
+  jq -r '
+    sort_by(.id)[] |
+    [ .id,
+      (if .enabled then "enabled" else "disabled" end),
+      (if .firstParty then "first-party" else "third-party" end),
+      ((.kinds // []) | join(",")),
+      (.name // "")
+    ] | @tsv
+  ' <<<"$plugins" | awk -F '\t' '
+    BEGIN { printf "%-32s %-9s %-11s %-18s %s\n", "ID", "STATE", "SOURCE", "KINDS", "NAME" }
+    { printf "%-32s %-9s %-11s %-18s %s\n", $1, $2, $3, $4, $5 }
+  '
+}
+
+rescan_plugins() {
+  (( $# == 0 )) || fail "rescan does not take arguments"
+  omarchy-shell shell rescanPlugins || fail "could not rescan plugins; is omarchy-shell running?"
+  echo "Plugins rescanned"
+}
+
+plugin_enabled() {
+  local enabled="$1"
+  local id="${2:-}"
+  [[ -n $id ]] || fail "plugin id is required"
+  shift 2
+
+  if [[ $enabled != "true" && $# -gt 0 ]]; then
+    fail "disable does not take placement options"
+  fi
+
+  id=$(canonical_widget_id "$id")
+
+  omarchy-shell shell rescanPlugins >/dev/null 2>&1 || true
+  if [[ $enabled == "true" ]]; then
+    require_command jq
+    wait_for_plugin_discovery "$id" || fail "plugin '$id' was not discovered; is omarchy-shell running?"
+  fi
+
+  local result
+  result=$(omarchy-shell shell setPluginEnabled "$id" "$enabled") || fail "could not update plugin; is omarchy-shell running?"
+  [[ $result == "ok" ]] || fail "plugin '$id' is not known; run: omarchy plugin rescan"
+
+  if [[ $enabled == "true" && $# -gt 0 ]]; then
+    mutate_bar move --id "$id" "$@"
+    echo "Enabled and moved $id"
+  else
+    if [[ $enabled == "true" ]]; then
+      echo "Enabled $id"
+    else
+      echo "Disabled $id"
+    fi
+  fi
+}
+
+config_source() {
+  require_omarchy_path
+  local defaults_file="$OMARCHY_PATH/config/omarchy/shell.json"
+
+  if [[ -s $CONFIG_FILE ]] && jq -e 'type == "object" and .version == 1' "$CONFIG_FILE" >/dev/null 2>&1; then
+    printf '%s' "$CONFIG_FILE"
+  elif [[ -s $defaults_file ]] && jq -e 'type == "object" and .version == 1' "$defaults_file" >/dev/null 2>&1; then
+    printf '%s' "$defaults_file"
+  else
+    fail "could not find a valid shell config or defaults file"
+  fi
+}
+
+bar_list() {
+  local json="false"
+
+  while (( $# > 0 )); do
+    case "$1" in
+    --json)
+      json="true"
+      ;;
+    -h | --help)
+      usage
+      exit 0
+      ;;
+    *)
+      fail "unknown bar list option: $1"
+      ;;
+    esac
+    shift
+  done
+
+  require_command jq
+  local source
+  source=$(config_source)
+
+  if [[ $json == "true" ]]; then
+    jq '.bar.layout // { left: [], center: [], right: [] }' "$source"
+    return
+  fi
+
+  jq -r '
+    (.bar.layout // { left: [], center: [], right: [] }) as $layout |
+    ["left", "center", "right"][] as $section |
+    ($layout[$section] // []) as $entries |
+    if ($entries | length) == 0 then
+      "\($section)\t-\t-"
+    else
+      $entries | to_entries[] | "\($section)\t\(.key)\t\(.value.id // "<missing>")"
+    end
+  ' "$source" | awk '
+    BEGIN { printf "%-8s %-5s %s\n", "SECTION", "INDEX", "WIDGET" }
+    { printf "%-8s %-5s %s\n", $1, $2, $3 }
+  '
+}
+
+mutate_bar() {
+  require_command jq
+  require_command python3
+  require_omarchy_path
+
+  local operation="$1"
+  shift
+  local id=""
+  local section=""
+  local index=""
+  local before=""
+  local after=""
+  local from_section=""
+  local from_index=""
+  local duplicate="false"
+  local all="false"
+  local key=""
+  local value=""
+  local value_is_json="false"
+  local new_id=""
+
+  while (( $# > 0 )); do
+    case "$1" in
+    --id)
+      id="${2-}"
+      shift 2
+      ;;
+    --section)
+      section="${2:-}"
+      validate_section "$section"
+      shift 2
+      ;;
+    --index)
+      index="${2:-}"
+      validate_index "$index"
+      shift 2
+      ;;
+    --before)
+      before="${2:-}"
+      [[ -n $before ]] || fail "--before requires a widget id"
+      shift 2
+      ;;
+    --after)
+      after="${2:-}"
+      [[ -n $after ]] || fail "--after requires a widget id"
+      shift 2
+      ;;
+    --from-section)
+      from_section="${2:-}"
+      validate_section "$from_section"
+      shift 2
+      ;;
+    --from-index)
+      from_index="${2:-}"
+      validate_index "$from_index"
+      shift 2
+      ;;
+    --duplicate)
+      duplicate="true"
+      shift
+      ;;
+    --all)
+      all="true"
+      shift
+      ;;
+    --key)
+      key="${2:-}"
+      [[ -n $key ]] || fail "--key requires a value"
+      shift 2
+      ;;
+    --new-id)
+      new_id="${2:-}"
+      [[ -n $new_id ]] || fail "--new-id requires a value"
+      shift 2
+      ;;
+    --value)
+      value="${2:-}"
+      shift 2
+      ;;
+    --json)
+      value_is_json="true"
+      shift
+      ;;
+    *)
+      fail "unknown option: $1"
+      ;;
+    esac
+  done
+
+  if [[ -n $before && -n $after ]]; then
+    fail "use only one of --before or --after"
+  fi
+
+  local source tmp
+  source=$(config_source)
+  mkdir -p "$(dirname "$CONFIG_FILE")"
+  tmp=$(mktemp)
+
+  OPERATION="$operation" \
+  WIDGET_ID="$id" \
+  TARGET_SECTION="$section" \
+  TARGET_INDEX="$index" \
+  TARGET_BEFORE="$before" \
+  TARGET_AFTER="$after" \
+  FROM_SECTION="$from_section" \
+  FROM_INDEX="$from_index" \
+  ALLOW_DUPLICATE="$duplicate" \
+  REMOVE_ALL="$all" \
+  SET_KEY="$key" \
+  SET_VALUE="$value" \
+  SET_VALUE_IS_JSON="$value_is_json" \
+  NEW_WIDGET_ID="$new_id" \
+  python3 - "$source" >"$tmp" <<'PY'
+import json
+import os
+import sys
+from copy import deepcopy
+
+source = sys.argv[1]
+operation = os.environ["OPERATION"]
+def canonical(value):
+    return str(value or "")
+
+
+widget_id = canonical(os.environ.get("WIDGET_ID", ""))
+target_section = os.environ.get("TARGET_SECTION", "")
+target_index = os.environ.get("TARGET_INDEX", "")
+target_before = canonical(os.environ.get("TARGET_BEFORE", ""))
+target_after = canonical(os.environ.get("TARGET_AFTER", ""))
+from_section = os.environ.get("FROM_SECTION", "")
+from_index = os.environ.get("FROM_INDEX", "")
+allow_duplicate = os.environ.get("ALLOW_DUPLICATE") == "true"
+remove_all = os.environ.get("REMOVE_ALL") == "true"
+set_key = os.environ.get("SET_KEY", "")
+set_value = os.environ.get("SET_VALUE", "")
+set_value_is_json = os.environ.get("SET_VALUE_IS_JSON") == "true"
+new_widget_id = os.environ.get("NEW_WIDGET_ID", "")
+sections = ["left", "center", "right"]
+
+
+def die(message):
+    print(f"omarchy-plugin: {message}", file=sys.stderr)
+    sys.exit(1)
+
+
+def load_config(path):
+    with open(path, encoding="utf-8") as handle:
+        data = json.load(handle)
+    if not isinstance(data, dict):
+        die("shell config must be a JSON object")
+    data = deepcopy(data)
+    data["version"] = 1
+    data.setdefault("bar", {})
+    if not isinstance(data["bar"], dict):
+        data["bar"] = {}
+    data["bar"].setdefault("layout", {})
+    if not isinstance(data["bar"]["layout"], dict):
+        data["bar"]["layout"] = {}
+    for section in sections:
+        entries = data["bar"]["layout"].get(section)
+        if not isinstance(entries, list):
+            data["bar"]["layout"][section] = []
+    data.setdefault("plugins", [])
+    if not isinstance(data["plugins"], list):
+        data["plugins"] = []
+    return data
+
+
+config = load_config(source)
+layout = config["bar"]["layout"]
+
+
+def find_entries(id_value=None, only_section=""):
+    found = []
+    for section in sections:
+        if only_section and section != only_section:
+            continue
+        for index, entry in enumerate(layout[section]):
+            if id_value is None or (isinstance(entry, dict) and canonical(entry.get("id")) == id_value):
+                found.append((section, index, entry))
+    return found
+
+
+def entry_at(section, index):
+    if section not in sections:
+        die("section must be left, center, or right")
+    if index < 0 or index >= len(layout[section]):
+        die(f"no widget at {section}[{index}]")
+    return layout[section][index]
+
+
+def parse_index(value):
+    if value == "":
+        return None
+    try:
+        parsed = int(value)
+    except ValueError:
+        die("index must be a non-negative integer")
+    if parsed < 0:
+        die("index must be a non-negative integer")
+    return parsed
+
+
+def resolve_target(default_section="right"):
+    if target_before or target_after:
+        target_id = target_before or target_after
+        matches = find_entries(target_id, target_section)
+        if not matches:
+            scope = f" in {target_section}" if target_section else ""
+            die(f"could not find target widget {target_id}{scope}")
+        section, index, _entry = matches[0]
+        if target_after:
+            index += 1
+        return section, index
+
+    section = target_section or default_section
+    if section not in sections:
+        die("section must be left, center, or right")
+    index = parse_index(target_index)
+    if index is None:
+        index = len(layout[section])
+    if index > len(layout[section]):
+        index = len(layout[section])
+    return section, index
+
+
+def source_location():
+    if from_index != "":
+        if not from_section:
+            die("--from-index requires --from-section")
+        index = parse_index(from_index)
+        entry = entry_at(from_section, index)
+        if widget_id and (not isinstance(entry, dict) or canonical(entry.get("id")) != widget_id):
+            die(f"widget at {from_section}[{index}] is not {widget_id}")
+        return from_section, index, entry
+
+    if not widget_id:
+        die("widget id is required")
+    matches = find_entries(widget_id, from_section)
+    if not matches:
+        scope = f" in {from_section}" if from_section else ""
+        die(f"could not find widget {widget_id}{scope}")
+    return matches[0]
+
+
+if operation == "add":
+    if not widget_id:
+        die("widget id is required")
+    if not allow_duplicate and find_entries(widget_id):
+        die(f"{widget_id} is already in the bar; use 'bar move' or pass --duplicate")
+    section, index = resolve_target("right")
+    layout[section].insert(index, {"id": widget_id})
+
+elif operation == "move":
+    old_section, old_index, entry = source_location()
+    entry = deepcopy(entry)
+    if isinstance(entry, dict):
+        entry["id"] = widget_id
+    del layout[old_section][old_index]
+    default_section = target_section or old_section
+    section, index = resolve_target(default_section)
+    layout[section].insert(index, entry)
+
+elif operation == "remove":
+    if from_index != "":
+        old_section, old_index, _entry = source_location()
+        del layout[old_section][old_index]
+    elif target_index != "":
+        if not target_section:
+            die("--index requires --section for bar remove")
+        index = parse_index(target_index)
+        entry = entry_at(target_section, index)
+        if widget_id and (not isinstance(entry, dict) or canonical(entry.get("id")) != widget_id):
+            die(f"widget at {target_section}[{index}] is not {widget_id}")
+        del layout[target_section][index]
+    else:
+        if not widget_id:
+            die("widget id is required")
+        matches = find_entries(widget_id, target_section)
+        if not matches:
+            scope = f" in {target_section}" if target_section else ""
+            die(f"could not find widget {widget_id}{scope}")
+        if remove_all:
+            for section, index, _entry in reversed(matches):
+                del layout[section][index]
+        else:
+            section, index, _entry = matches[0]
+            del layout[section][index]
+
+elif operation == "replace":
+    if not widget_id:
+        die("source widget id is required")
+    if not new_widget_id:
+        die("replacement widget id is required")
+    section, index, entry = source_location()
+    if not isinstance(entry, dict):
+        die("widget entry must be an object")
+    entry["id"] = new_widget_id
+    layout[section][index] = entry
+
+elif operation == "set":
+    if not widget_id:
+        die("widget id is required")
+    if not set_key:
+        die("setting key is required")
+    if from_index != "":
+        section, index, entry = source_location()
+    elif target_index != "":
+        if not target_section:
+            die("--index requires --section for bar set")
+        index = parse_index(target_index)
+        entry = entry_at(target_section, index)
+        if not isinstance(entry, dict) or canonical(entry.get("id")) != widget_id:
+            die(f"widget at {target_section}[{index}] is not {widget_id}")
+        section = target_section
+    else:
+        matches = find_entries(widget_id, target_section)
+        if not matches:
+            scope = f" in {target_section}" if target_section else ""
+            die(f"could not find widget {widget_id}{scope}")
+        section, index, entry = matches[0]
+    if not isinstance(entry, dict):
+        die("widget entry must be an object")
+    if set_value_is_json:
+        try:
+            parsed_value = json.loads(set_value)
+        except json.JSONDecodeError as error:
+            die(f"invalid JSON value: {error}")
+    else:
+        parsed_value = set_value
+    layout[section][index][set_key] = parsed_value
+
+else:
+    die(f"unknown operation: {operation}")
+
+json.dump(config, sys.stdout, indent=2)
+sys.stdout.write("\n")
+PY
+
+  mv "$tmp" "$CONFIG_FILE"
+  omarchy-shell -q shell rescanPlugins >/dev/null 2>&1 || true
+}
+
+# Canonical ids of every known bar widget, read from manifests on disk
+# (first-party + user). This is the same set `omarchy plugin list` reports, but
+# read straight from disk so it works with the shell down and never races an
+# in-flight rescan.
+bar_widget_ids() {
+  require_command jq
+  first_party_manifest_paths | while IFS= read -r manifest; do
+    jq -r 'select((.kinds // []) | index("bar-widget")) | .id' "$manifest" 2>/dev/null
+  done
+  local user_dir="$HOME/.config/omarchy/plugins"
+  if [[ -d $user_dir ]]; then
+    find "$user_dir" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) 2>/dev/null | while IFS= read -r dir; do
+      [[ -f $dir/manifest.json ]] || continue
+      jq -r 'select((.kinds // []) | index("bar-widget")) | .id' "$dir/manifest.json" 2>/dev/null
+    done
+  fi
+}
+
+bar_add() {
+  local id="${1:-}"
+  [[ -n $id ]] || fail "bar add requires a widget id"
+  shift
+  id=$(canonical_widget_id "$id")
+  # Only let real bar widgets into the layout — a typo'd or non-widget id just
+  # renders as a dead entry (this is how a stray "--help" once got in).
+  if ! bar_widget_ids | grep -qxF -- "$id"; then
+    fail "$id is not a known bar widget; run 'omarchy plugin list' to see valid ids"
+  fi
+  mutate_bar add --id "$id" "$@"
+  echo "Added $id to the bar"
+}
+
+bar_move() {
+  local id="${1:-}"
+  [[ -n $id ]] || fail "bar move requires a widget id"
+  shift
+  mutate_bar move --id "$id" "$@"
+  echo "Moved $id"
+}
+
+bar_remove() {
+  local id=""
+  if (( $# > 0 )) && [[ $1 != --* ]]; then
+    id="$1"
+    shift
+  fi
+  mutate_bar remove --id "$id" "$@"
+  if [[ -n $id ]]; then
+    echo "Removed $id from the bar"
+  else
+    echo "Removed bar widget"
+  fi
+}
+
+bar_set() {
+  local id="${1:-}"
+  local key="${2:-}"
+  local value="${3:-}"
+  [[ -n $id ]] || fail "bar set requires a widget id"
+  [[ -n $key ]] || fail "bar set requires a setting key"
+  (( $# >= 3 )) || fail "bar set requires a value"
+  shift 3
+  mutate_bar set --id "$id" --key "$key" --value "$value" "$@"
+  echo "Set $key on $(canonical_widget_id "$id")"
+}
+
+slug_id() {
+  tr '[:upper:]' '[:lower:]' <<<"$1" | sed -E 's/^omarchy\.//; s/[^a-z0-9]+/-/g; s/^-+//; s/-+$//'
+}
+
+first_party_manifest_paths() {
+  require_omarchy_path
+  find "$OMARCHY_PATH/shell/plugins" -mindepth 2 -maxdepth 3 -type f \( -name manifest.json -o -name '*.manifest.json' \) 2>/dev/null | sort
+}
+
+manifest_source_dir() {
+  local manifest="$1"
+  if [[ ${manifest##*/} == "manifest.json" ]]; then
+    dirname -- "$manifest"
+  else
+    dirname -- "$manifest"
+  fi
+}
+
+builtin_widget_info() {
+  require_command jq
+  local wanted
+  wanted=$(canonical_widget_id "$1")
+
+  local manifest id entry source_dir source_path name category multiple
+  while IFS= read -r manifest; do
+    if ! jq -e --arg id "$wanted" '
+      (.id == $id or ((.barWidget.aliases // []) | index($id))) and
+      ((.kinds // []) | index("bar-widget"))
+    ' "$manifest" >/dev/null 2>&1; then
+      continue
+    fi
+
+    id=$(jq -r '.id' "$manifest")
+    entry=$(jq -r '.entryPoints.barWidget // empty' "$manifest")
+    [[ -n $entry ]] || return 1
+    source_dir=$(manifest_source_dir "$manifest")
+    source_path="$source_dir/$entry"
+    name=$(jq -r '.barWidget.displayName // .name // .id' "$manifest")
+    category=$(jq -r '.barWidget.category // "Plugin"' "$manifest")
+    multiple=$(jq -r 'if .barWidget.allowMultiple == true then "true" else "false" end' "$manifest")
+    printf '%s\t%s\t%s\t%s\t%s\n' "$id" "$source_path" "$name" "$category" "$multiple"
+    return 0
+  done < <(first_party_manifest_paths)
+
+  return 1
+}
+
+clone_source_options() {
+  local id name
+  first_party_manifest_paths | while IFS= read -r manifest; do
+    id=$(jq -r '.id // empty' "$manifest" 2>/dev/null || true)
+    name=$(jq -r '.barWidget.displayName // .name // .id // empty' "$manifest" 2>/dev/null || true)
+    [[ -n $id ]] || continue
+    if jq -e '(.kinds // []) | index("bar-widget")' "$manifest" >/dev/null 2>&1; then
+      printf '%s\tBuilt-in widget\t%s\n' "$id" "${name:-$id}"
+    else
+      printf '%s\tBuilt-in plugin\t%s\n' "$id" "${name:-$id}"
+    fi
+  done
+
+  if [[ -d $HOME/.config/omarchy/plugins ]]; then
+    find "$HOME/.config/omarchy/plugins" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) 2>/dev/null | sort | while IFS= read -r dir; do
+      [[ -f $dir/manifest.json ]] || continue
+      id=$(jq -r '.id // empty' "$dir/manifest.json" 2>/dev/null || true)
+      name=$(jq -r '.name // .id // empty' "$dir/manifest.json" 2>/dev/null || true)
+      [[ -n $id ]] && printf '%s\tUser plugin\t%s\n' "$id" "${name:-$id}"
+    done
+  fi
+}
+
+choose_value() {
+  local prompt="$1"
+  shift
+  if command -v gum >/dev/null 2>&1; then
+    gum choose --header "$prompt" "$@"
+  else
+    printf '%s\n' "$@" | fzf --prompt "$prompt > "
+  fi
+}
+
+input_value() {
+  local prompt="$1"
+  local value="${2:-}"
+  if command -v gum >/dev/null 2>&1; then
+    gum input --prompt "$prompt " --value "$value"
+  else
+    read -r -p "$prompt " value
+    printf '%s' "$value"
+  fi
+}
+
+choose_clone_source() {
+  local selected
+  if command -v gum >/dev/null 2>&1; then
+    selected=$(clone_source_options | awk -F '\t' '{ printf "%-32s  %-15s  %s\n", $3, $2, $1 }' | gum filter --header "Clone plugin" --placeholder "Search built-in and user plugins..." --limit 1) || return 1
+    awk '{ print $NF }' <<<"$selected"
+  elif command -v fzf >/dev/null 2>&1; then
+    selected=$(clone_source_options | fzf --delimiter=$'\t' --with-nth=1,2,3 --prompt "Clone plugin > ") || return 1
+    cut -f1 <<<"$selected"
+  else
+    fail "gum or fzf is required for interactive clone selection"
+  fi
+}
+
+edit_source_options() {
+  if [[ -d $HOME/.config/omarchy/plugins ]]; then
+    find "$HOME/.config/omarchy/plugins" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) 2>/dev/null | sort | while IFS= read -r dir; do
+      [[ -f $dir/manifest.json ]] || continue
+      id=$(jq -r '.id // empty' "$dir/manifest.json" 2>/dev/null || true)
+      name=$(jq -r '.name // .id // empty' "$dir/manifest.json" 2>/dev/null || true)
+      [[ -n $id ]] && printf '%s\t%s\t%s\n' "$id" "${name:-$id}" "$dir"
+    done
+  fi
+}
+
+choose_edit_source() {
+  local selected
+  if command -v gum >/dev/null 2>&1; then
+    selected=$(edit_source_options | awk -F '\t' '{ printf "%-32s  %s\n", $2, $1 }' | gum filter --header "Edit plugin" --placeholder "Search user plugins..." --limit 1) || return 1
+    awk '{ print $NF }' <<<"$selected"
+  elif command -v fzf >/dev/null 2>&1; then
+    selected=$(edit_source_options | fzf --delimiter=$'\t' --with-nth=2,1 --prompt "Edit plugin > ") || return 1
+    cut -f1 <<<"$selected"
+  else
+    fail "gum or fzf is required for interactive plugin selection"
+  fi
+}
+
+validate_user_plugin_dir() {
+  local dir="$1"
+  local requested_id="${2:-}"
+  local root="$HOME/.config/omarchy/plugins"
+  local dir_abs root_abs manifest_id
+
+  require_command jq
+  require_command python3
+  [[ -d $dir ]] || fail "plugin directory not found: $dir"
+
+  dir_abs=$(python3 -c 'from pathlib import Path; import sys; print(Path(sys.argv[1]).expanduser().resolve(strict=False))' "$dir")
+  root_abs=$(python3 -c 'from pathlib import Path; import sys; print(Path(sys.argv[1]).expanduser().resolve(strict=False))' "$root")
+  [[ $dir_abs == $root_abs/* ]] || fail "plugin edit only opens user plugins under $root"
+  [[ -f $dir_abs/manifest.json ]] || fail "plugin directory missing manifest.json: $dir_abs"
+
+  manifest_id=$(jq -r '.id // empty' "$dir_abs/manifest.json" 2>/dev/null || true)
+  [[ -n $manifest_id ]] || fail "plugin manifest missing id: $dir_abs/manifest.json"
+  [[ $manifest_id != omarchy.* && $(canonical_widget_id "$manifest_id") == $manifest_id ]] || fail "$manifest_id is built in; clone it first with: omarchy plugin clone $manifest_id local.$(slug_id "$manifest_id")"
+  if [[ -n $requested_id && $manifest_id != $requested_id ]]; then
+    fail "plugin id mismatch: requested $requested_id but manifest declares $manifest_id"
+  fi
+
+  printf '%s' "$dir_abs"
+}
+
+plugin_dir_for_id() {
+  local id="$1"
+
+  if [[ $id == */* ]]; then
+    validate_user_plugin_dir "$id"
+    return
+  fi
+
+  id=$(canonical_widget_id "$id")
+  if builtin_widget_info "$id" >/dev/null 2>&1 || [[ $id == omarchy.* ]]; then
+    fail "$id is built in; clone it first with: omarchy plugin clone $id local.$(slug_id "$id")"
+  fi
+
+  validate_user_plugin_dir "$HOME/.config/omarchy/plugins/$id" "$id"
+}
+
+open_plugin_dir() {
+  local tool="$1"
+  local dir="$2"
+  local prompt="${3:-}"
+
+  case "$tool" in
+  "" | none)
+    printf 'Plugin directory: %s\n' "$dir"
+    return
+    ;;
+  ai)
+    omarchy-launch-ai --path "$dir" --prompt "$prompt"
+    ;;
+  editor)
+    omarchy-launch-editor "$dir"
+    ;;
+  *)
+    fail "unknown edit target: $tool (use ai, editor, or none)"
+    ;;
+  esac
+}
+
+edit_command() {
+  local id=""
+  if (( $# > 0 )) && [[ $1 != --* ]]; then
+    id="$1"
+    shift
+  fi
+
+  local open_tool=""
+  local prompt=""
+  while (( $# > 0 )); do
+    case "$1" in
+    --with)
+      open_tool="${2:-}"
+      [[ -n $open_tool ]] || fail "--with requires a value"
+      shift 2
+      ;;
+    --open)
+      open_tool="${2:-}"
+      [[ -n $open_tool ]] || fail "--open requires a value"
+      shift 2
+      ;;
+    --prompt)
+      prompt="${2:-}"
+      shift 2
+      ;;
+    -h | --help)
+      usage
+      return
+      ;;
+    *)
+      fail "unknown edit option: $1"
+      ;;
+    esac
+  done
+
+  if [[ -z $id ]]; then
+    if [[ -t 0 && -t 1 ]]; then
+      id=$(choose_edit_source) || fail "edit cancelled"
+    else
+      fail "plugin id is required"
+    fi
+  fi
+
+  local dir
+  dir=$(plugin_dir_for_id "$id")
+
+  if [[ -z $open_tool ]]; then
+    if [[ -t 0 && -t 1 ]]; then
+      open_tool=$(choose_value "Edit with" ai editor)
+    else
+      open_tool="editor"
+    fi
+  fi
+
+  open_plugin_dir "$open_tool" "$dir" "$prompt"
+}
+
+rewrite_cloned_qml() {
+  local file="$1"
+  local id="$2"
+  local source_path="$3"
+  python3 - "$file" "$id" "$source_path" <<'PY'
+import pathlib
+import re
+import sys
+path, plugin_id, source_path = sys.argv[1], sys.argv[2], pathlib.Path(sys.argv[3])
+text = open(path, encoding="utf-8").read()
+text = re.sub(r'moduleName:\s*"[^"]+"', f'moduleName: "{plugin_id}"', text, count=1)
+
+
+def resolve_relative(match):
+    rel = match.group(1)
+    if rel.startswith(("../", "./")) or (not rel.startswith("/") and "://" not in rel):
+        resolved = (source_path.parent / rel).resolve()
+        return '"' + resolved.as_uri() + '"'
+    return match.group(0)
+
+text = re.sub(r'Qt\.resolvedUrl\("([^"]+)"\)', resolve_relative, text)
+
+# Indicators dynamically loads sibling indicator components via string
+# concatenation, so the simple Qt.resolvedUrl("literal") rewrite above cannot
+# see it. Point the clone back at Omarchy's bundled indicator directory.
+if source_path.name == "Indicators.qml":
+    indicators_url = (source_path.parent.parent / "indicators").resolve().as_uri() + "/"
+    text = text.replace(
+        'Qt.resolvedUrl("../indicators/" + indicatorSlot.indicatorId + ".qml")',
+        f'"{indicators_url}" + indicatorSlot.indicatorId + ".qml"',
+    )
+
+# Panel-backed clones should not register the same global IPC target as the
+# built-in widget. Direct panel clones can disable Panel.manageIpc themselves;
+# wrapper widgets such as Weather disable it on the loaded panel instance.
+if "ipcTarget:" in text and "manageIpc:" not in text:
+    text = text.replace("  id: root\n", "  id: root\n  manageIpc: false\n", 1)
+if "function injectPanel()" in text and '"manageIpc" in target' not in text:
+    text = text.replace(
+        "    if (!target) return\n",
+        "    if (!target) return\n    if (\"manageIpc\" in target) target.manageIpc = false\n",
+        1,
+    )
+
+open(path, "w", encoding="utf-8").write(text)
+PY
+}
+
+write_clone_manifest() {
+  local file="$1"
+  local id="$2"
+  local name="$3"
+  local description="$4"
+  local category="$5"
+  local multiple="$6"
+  local source_id="$7"
+  local source_path="$8"
+  python3 - "$file" "$id" "$name" "$description" "$category" "$multiple" "$source_id" "$source_path" <<'PY'
+import json
+import sys
+file, plugin_id, name, description, category, multiple, source_id, source_path = sys.argv[1:]
+data = {
+  "schemaVersion": 1,
+  "id": plugin_id,
+  "name": name,
+  "version": "1.0.0",
+  "author": "Local",
+  "description": description,
+  "kinds": ["bar-widget"],
+  "entryPoints": {"barWidget": "Widget.qml"},
+  "barWidget": {
+    "displayName": name,
+    "description": description,
+    "category": category,
+    "allowMultiple": multiple == "true"
+  },
+  "omarchy": {
+    "clonedFrom": source_id,
+    "clonedFromPath": source_path
+  }
+}
+open(file, "w", encoding="utf-8").write(json.dumps(data, indent=2) + "\n")
+PY
+}
+
+update_cloned_manifest() {
+  local file="$1"
+  local id="$2"
+  local name="$3"
+  local source_id="$4"
+  local source_path="$5"
+  python3 - "$file" "$id" "$name" "$source_id" "$source_path" <<'PY'
+import json
+import sys
+file, plugin_id, name, source_id, source_path = sys.argv[1:]
+with open(file, encoding="utf-8") as handle:
+    data = json.load(handle)
+data["id"] = plugin_id
+data["name"] = name
+if "barWidget" in data and isinstance(data["barWidget"], dict):
+    data["barWidget"]["displayName"] = name
+meta = data.get("omarchy") if isinstance(data.get("omarchy"), dict) else {}
+meta.update({"clonedFrom": source_id, "clonedFromPath": source_path})
+data["omarchy"] = meta
+open(file, "w", encoding="utf-8").write(json.dumps(data, indent=2) + "\n")
+PY
+}
+
+clone_command() {
+  require_command jq
+  require_command python3
+  require_omarchy_path
+
+  local source_id=""
+  local new_id=""
+  if (( $# > 0 )) && [[ $1 != --* ]]; then
+    source_id="$1"
+    shift
+  fi
+  if (( $# > 0 )) && [[ $1 != --* ]]; then
+    new_id="$1"
+    shift
+  fi
+
+  local display_name=""
+  local open_tool=""
+  local prompt=""
+  local replace="false"
+  local add="false"
+  local use_bar="false"
+  local placement=()
+
+  while (( $# > 0 )); do
+    case "$1" in
+    --name)
+      display_name="${2:-}"
+      [[ -n $display_name ]] || fail "--name requires a value"
+      shift 2
+      ;;
+    --with)
+      open_tool="${2:-}"
+      [[ -n $open_tool ]] || fail "--with requires a value"
+      shift 2
+      ;;
+    --open)
+      open_tool="${2:-}"
+      [[ -n $open_tool ]] || fail "--open requires a value"
+      shift 2
+      ;;
+    --prompt)
+      prompt="${2:-}"
+      shift 2
+      ;;
+    --replace)
+      replace="true"
+      shift
+      ;;
+    --add)
+      add="true"
+      shift
+      ;;
+    --use)
+      use_bar="true"
+      shift
+      ;;
+    --section | --index | --before | --after)
+      placement+=("$1" "${2:-}")
+      shift 2
+      ;;
+    -h | --help)
+      usage
+      return
+      ;;
+    *)
+      fail "unknown clone option: $1"
+      ;;
+    esac
+  done
+
+  if [[ -z $source_id ]]; then
+    if [[ -t 0 && -t 1 ]]; then
+      source_id=$(choose_clone_source) || fail "clone cancelled"
+    else
+      fail "clone source is required"
+    fi
+  fi
+  source_id=$(canonical_widget_id "$source_id")
+
+  local default_slug
+  default_slug=$(slug_id "$source_id")
+  if [[ -z $new_id ]]; then
+    if [[ -t 0 && -t 1 ]]; then
+      new_id=$(input_value "New plugin id:" "local.$default_slug")
+    else
+      fail "new plugin id is required"
+    fi
+  fi
+  validate_plugin_id "$new_id"
+
+  local target_dir="$HOME/.config/omarchy/plugins/$new_id"
+  [[ ! -e $target_dir && ! -L $target_dir ]] || fail "$target_dir already exists"
+
+  local source_path=""
+  local source_name=""
+  local source_category="Plugin"
+  local source_multiple="false"
+  local source_type=""
+
+  if IFS=$'\t' read -r _ source_path source_name source_category source_multiple < <(builtin_widget_info "$source_id"); then
+    source_type="builtin-widget"
+  elif [[ -f $HOME/.config/omarchy/plugins/$source_id/manifest.json ]]; then
+    source_type="user-plugin"
+    source_path="$HOME/.config/omarchy/plugins/$source_id"
+    source_name=$(jq -r '.name // .id' "$source_path/manifest.json")
+  else
+    source_path=$(find "$OMARCHY_PATH/shell/plugins" -path '*/manifest.json' -print0 | xargs -0 jq -r --arg id "$source_id" 'select(.id == $id) | input_filename' 2>/dev/null | head -1 || true)
+    if [[ -n $source_path ]]; then
+      source_type="builtin-plugin"
+      source_path=$(dirname "$source_path")
+      source_name=$(jq -r '.name // .id' "$source_path/manifest.json")
+    fi
+  fi
+
+  [[ -n $source_type ]] || fail "unknown clone source: $source_id"
+  if [[ -z $display_name ]]; then
+    if [[ -t 0 && -t 1 ]]; then
+      display_name=$(input_value "Display name:" "${source_name:-$new_id}")
+    else
+      display_name="${source_name:-$new_id}"
+    fi
+  fi
+  [[ -n $display_name ]] || fail "display name is required"
+
+  mkdir -p "$target_dir"
+  if [[ $source_type == "builtin-widget" ]]; then
+    cp "$source_path" "$target_dir/Widget.qml"
+    rewrite_cloned_qml "$target_dir/Widget.qml" "$new_id" "$source_path"
+    write_clone_manifest "$target_dir/manifest.json" "$new_id" "$display_name" "Cloned from $source_id" "$source_category" "$source_multiple" "$source_id" "$source_path"
+  else
+    cp -aL "$source_path/." "$target_dir/"
+    update_cloned_manifest "$target_dir/manifest.json" "$new_id" "$display_name" "$source_id" "$source_path"
+  fi
+
+  {
+    printf '# %s\n\n' "$display_name"
+    printf 'Cloned from `%s`.\n\n' "$source_id"
+    printf 'Source: `%s`\n\n' "$source_path"
+    printf 'The original remains built into Omarchy. Remove this plugin directory or swap\n'
+    printf 'your bar entry back to `%s` whenever you want to return to the built-in.\n' "$source_id"
+  } >"$target_dir/UPSTREAM.md"
+
+  omarchy-shell -q shell rescanPlugins >/dev/null 2>&1 || true
+
+  if [[ $replace == "true" ]]; then
+    mutate_bar replace --id "$source_id" --new-id "$new_id"
+    echo "Cloned $source_id to $new_id and replaced the first bar instance"
+  elif [[ $add == "true" ]]; then
+    bar_add "$new_id" "${placement[@]}"
+    echo "Cloned $source_id to $new_id"
+  elif [[ $use_bar == "true" ]]; then
+    omarchy-config-shell-bar use "$new_id"
+    echo "Cloned $source_id to $new_id and selected it as the active bar option"
+  else
+    echo "Cloned $source_id to $new_id"
+  fi
+
+  if [[ -z $open_tool && -t 0 && -t 1 ]]; then
+    open_tool=$(choose_value "Edit with" ai editor)
+  fi
+  if [[ -n $open_tool ]]; then
+    edit_command "$new_id" --with "$open_tool" --prompt "$prompt"
+  fi
+}
+
+bar_command() {
+  local command="${1:-list}"
+  [[ $# -gt 0 ]] && shift || true
+
+  case "$command" in
+  edit | settings)
+    (( $# == 0 )) || fail "bar settings does not take arguments"
+    exec omarchy-launch-bar-settings
+    ;;
+  options | option)
+    exec omarchy-config-shell-bar options "$@"
+    ;;
+  use)
+    exec omarchy-config-shell-bar use "$@"
+    ;;
+  reset)
+    exec omarchy-config-shell-bar reset "$@"
+    ;;
+  list)
+    bar_list "$@"
+    ;;
+  add)
+    bar_add "$@"
+    ;;
+  move)
+    bar_move "$@"
+    ;;
+  remove | rm)
+    bar_remove "$@"
+    ;;
+  set)
+    bar_set "$@"
+    ;;
+  -h | --help | help)
+    usage
+    ;;
+  *)
+    fail "unknown bar command: $command"
+    ;;
+  esac
+}
+
+command="${1:-}"
+case "$command" in
+list | ls)
+  shift
+  print_plugins "$@"
+  ;;
+rescan)
+  shift
+  rescan_plugins "$@"
+  ;;
+enable)
+  shift
+  plugin_enabled true "$@"
+  ;;
+disable)
+  shift
+  plugin_enabled false "$@"
+  ;;
+clone)
+  shift
+  clone_command "$@"
+  ;;
+edit)
+  shift
+  edit_command "$@"
+  ;;
+bar | widget | widgets)
+  shift
+  bar_command "$@"
+  ;;
+source | available | add | update | remove | validate)
+  # These live in sibling binaries (omarchy-plugin-<command>). The `omarchy`
+  # dispatcher normally routes straight to them; delegate here too so invoking
+  # this base binary directly matches the commands its --help advertises.
+  shift
+  sibling="$(dirname -- "${BASH_SOURCE[0]}")/omarchy-plugin-$command"
+  [[ -x $sibling ]] || fail "missing helper: omarchy-plugin-$command"
+  exec "$sibling" "$@"
+  ;;
+-h | --help | help | "")
+  usage
+  ;;
+*)
+  fail "unknown command: $command"
+  ;;
+esac
diff --git a/bin/omarchy-plugin-add b/bin/omarchy-plugin-add
new file mode 100755
index 00000000..a3324080
--- /dev/null
+++ b/bin/omarchy-plugin-add
@@ -0,0 +1,314 @@
+#!/bin/bash
+
+# omarchy:summary=Add an Omarchy shell plugin from a trusted source
+# omarchy:group=plugin
+# omarchy:args=[plugin-id] [--from <source-id>] [--enable] [--no-enable] [--review] [--no-refresh] [--yes]
+# omarchy:examples=omarchy plugin add | omarchy plugin add orbit --enable | omarchy plugin add model-usage --from owner-plugins --yes
+
+# Copies a plugin folder out of a trusted source's local clone into
+# ~/.config/omarchy/plugins/<id>/. It never runs plugin code, never runs install
+# hooks, and never uses sudo — it only copies files, validates the manifest, and
+# toggles enabled state over shell IPC. Reviewing and trusting the code is the
+# user's call; --yes opts out of every prompt for scripts/agents.
+
+set -o pipefail
+
+PLUGINS_DIR="$HOME/.config/omarchy/plugins"
+OMARCHY_PATH="${OMARCHY_PATH:-$HOME/.local/share/omarchy}"
+
+fail() {
+  echo "omarchy-plugin-add: $*" >&2
+  exit 1
+}
+
+require_command() {
+  command -v "$1" >/dev/null 2>&1 || fail "$1 is required"
+}
+
+interactive() {
+  [[ -t 0 && -t 1 ]]
+}
+
+plugin_discovered() {
+  local id="$1" plugins
+  plugins=$(omarchy-shell shell listPlugins 2>/dev/null) || return 1
+  jq -e --arg id "$id" 'any(.[]; .id == $id)' <<<"$plugins" >/dev/null 2>&1
+}
+
+wait_for_plugin_discovery() {
+  local id="$1" attempt
+  for (( attempt = 0; attempt < 40; attempt++ )); do
+    plugin_discovered "$id" && return 0
+    sleep 0.05
+  done
+  return 1
+}
+
+PLUGIN_ID=""
+FROM_SOURCE=""
+ENABLE_AFTER="" # "", "true", or "false"
+DO_REVIEW=0
+NO_REFRESH=0
+ASSUME_YES=0
+
+while (($# > 0)); do
+  case "$1" in
+  --from) FROM_SOURCE="${2:-}"; shift 2 ;;
+  --enable) ENABLE_AFTER=true; shift ;;
+  --no-enable) ENABLE_AFTER=false; shift ;;
+  --review) DO_REVIEW=1; shift ;;
+  --no-refresh) NO_REFRESH=1; shift ;;
+  --yes | -y) ASSUME_YES=1; shift ;;
+  -h | --help)
+    cat <<USAGE
+Usage: omarchy plugin add [plugin-id] [--from <source-id>] [--enable] [--no-enable] [--review] [--no-refresh] [--yes]
+
+Adds a plugin from a trusted source into ~/.config/omarchy/plugins/<id>/.
+Without a plugin-id, an interactive picker lists everything available.
+  --from       disambiguate when the same id exists in multiple sources
+  --enable     enable the plugin afterward (bar widgets land in the bar)
+  --no-enable  add but leave disabled
+  --review     open the plugin's files before adding (always in a TTY)
+  --no-refresh use the cached clones as-is, skip the network refresh
+  --yes        skip every confirmation (review, add, enable)
+USAGE
+    exit 0
+    ;;
+  -*) fail "unknown option: $1" ;;
+  *)
+    [[ -z $PLUGIN_ID ]] || fail "unexpected argument: $1"
+    PLUGIN_ID="$1"; shift ;;
+  esac
+done
+
+require_command jq
+
+confirm() {
+  local prompt="$1"
+  ((ASSUME_YES)) && return 0
+  if command -v gum >/dev/null 2>&1 && interactive; then
+    gum confirm "$prompt"; return
+  fi
+  if interactive; then
+    local reply; read -r -p "$prompt [y/N] " reply; [[ $reply == [yY]* ]]; return
+  fi
+  fail "refusing to add without confirmation; pass --yes"
+}
+
+if ((!NO_REFRESH)); then
+  omarchy-plugin-source refresh >/dev/null 2>&1 || true
+fi
+
+CATALOG=$(omarchy-plugin-scan)
+if [[ $(jq 'length' <<<"$CATALOG") -eq 0 ]]; then
+  fail "no plugins available; add a source with: omarchy plugin source add <git-url>"
+fi
+
+# ---------------------------------------------------------------- resolve id
+
+if [[ -z $PLUGIN_ID ]]; then
+  interactive || fail "a plugin-id is required (try: omarchy plugin available)"
+  choices=$(jq -r '.[] | "\(.manifest.id)\t\(.manifest.name // .manifest.id)\t\(.manifest.version // "?")\t\(.sourceId)"' <<<"$CATALOG")
+  rows=$(awk -F '\t' '{ printf "%-26s  %-26s  v%-8s  [%s]\n", $1, $2, $3, $4 }' <<<"$choices")
+  if command -v gum >/dev/null 2>&1; then
+    pick=$(gum choose --header="Add which plugin?" <<<"$rows") || fail "cancelled"
+  elif command -v fzf >/dev/null 2>&1; then
+    pick=$(fzf --prompt "Add which plugin > " <<<"$rows") || fail "cancelled"
+  else
+    fail "a plugin-id is required (gum or fzf needed for an interactive picker)"
+  fi
+  [[ -n $pick ]] || fail "nothing selected"
+  PLUGIN_ID=$(awk '{print $1}' <<<"$pick")
+fi
+
+if [[ -n $FROM_SOURCE ]]; then
+  matches=$(jq --arg id "$PLUGIN_ID" --arg src "$FROM_SOURCE" '[.[] | select(.manifest.id == $id and .sourceId == $src)]' <<<"$CATALOG")
+else
+  matches=$(jq --arg id "$PLUGIN_ID" '[.[] | select(.manifest.id == $id)]' <<<"$CATALOG")
+fi
+
+match_count=$(jq 'length' <<<"$matches")
+if ((match_count == 0)); then
+  if [[ -n $FROM_SOURCE ]]; then
+    fail "no plugin '$PLUGIN_ID' in source '$FROM_SOURCE'"
+  fi
+  fail "no plugin '$PLUGIN_ID' in any configured source (try: omarchy plugin available)"
+fi
+if ((match_count > 1)); then
+  echo "omarchy-plugin-add: '$PLUGIN_ID' is available from multiple sources:" >&2
+  jq -r '.[] | "  - " + .sourceId' <<<"$matches" >&2
+  fail "pick one with: --from <source-id>"
+fi
+
+entry=$(jq -c '.[0]' <<<"$matches")
+src_id=$(jq -r '.sourceId' <<<"$entry")
+src_url=$(jq -r '.sourceUrl' <<<"$entry")
+src_path=$(jq -r '.path' <<<"$entry")
+m_id=$(jq -r '.manifest.id' <<<"$entry")
+m_name=$(jq -r '.manifest.name // .manifest.id' <<<"$entry")
+m_version=$(jq -r '.manifest.version // "?"' <<<"$entry")
+m_author=$(jq -r '.manifest.author // ""' <<<"$entry")
+m_license=$(jq -r '.manifest.license // ""' <<<"$entry")
+m_desc=$(jq -r '.manifest.description // ""' <<<"$entry")
+m_kinds=$(jq -r '(.manifest.kinds // []) | join(", ")' <<<"$entry")
+
+# ---------------------------------------------------------------- validate
+
+omarchy-plugin-validate "$src_path" || fail "refusing to add: validation failed"
+
+target="$PLUGINS_DIR/$m_id"
+replacing=0
+target_is_link=0
+if [[ -L $target ]]; then
+  target_is_link=1
+  replacing=1
+elif [[ -d $target ]]; then
+  replacing=1
+fi
+
+# Soft warning: a third-party id that matches a built-in's alias installs as a
+# separate widget rather than replacing the built-in.
+alias_owner=""
+while IFS= read -r fp_manifest; do
+  [[ -f $fp_manifest ]] || continue
+  if jq -e --arg id "$m_id" '((.barWidget.aliases // []) | index($id)) != null' "$fp_manifest" >/dev/null 2>&1; then
+    alias_owner=$(jq -r '.id' "$fp_manifest")
+    break
+  fi
+done < <(find "$OMARCHY_PATH/shell/plugins" -type f \( -name manifest.json -o -name '*.manifest.json' \) 2>/dev/null)
+
+# Always surface an alias collision, even under --yes, since it changes what the
+# added plugin actually shadows.
+if [[ -n $alias_owner ]]; then
+  echo "Note: '$m_id' is also an alias of the built-in $alias_owner; it is added as a separate plugin and does not replace the built-in." >&2
+fi
+
+# ---------------------------------------------------------------- summary
+
+print_summary() {
+  cat <<INFO
+
+  Plugin:    $m_name ($m_id)
+  Version:   $m_version${m_author:+
+  Author:    $m_author}${m_license:+
+  License:   $m_license}
+  Kinds:     $m_kinds
+  Source:    $src_id ($src_url)${m_desc:+
+  About:     $m_desc}
+INFO
+  if ((target_is_link)); then
+    echo "  Target:    $target (REPLACING a symlink -> $(readlink "$target"))"
+  elif ((replacing)); then
+    echo "  Target:    $target (REPLACING existing install)"
+  else
+    echo "  Target:    $target"
+  fi
+  echo
+  echo "  Plugins run as unsandboxed code inside omarchy-shell. Review before enabling."
+  echo
+}
+
+review_files() {
+  echo "Files in $m_id:"
+  find "$src_path" -type f -printf '%P\n' 2>/dev/null | sort | sed 's/^/  /'
+  echo
+  # Only spawn an editor in a real terminal; a headless run just prints the path
+  # so it never launches a detached window.
+  if interactive && command -v omarchy-launch-editor >/dev/null 2>&1; then
+    omarchy-launch-editor "$src_path"
+  else
+    echo "Source folder: $src_path"
+  fi
+}
+
+if ((!ASSUME_YES)); then
+  print_summary
+
+  if ((DO_REVIEW)); then
+    review_files
+    confirm "Add $m_id $m_version now?" || fail "aborted"
+  elif interactive && command -v gum >/dev/null 2>&1; then
+    action=$(gum choose --header="Add $m_id $m_version?" "Add" "Review files first" "Cancel") || fail "aborted"
+    case "$action" in
+    "Review files first")
+      review_files
+      confirm "Add $m_id $m_version now?" || fail "aborted"
+      ;;
+    Add) ;;
+    *) fail "aborted" ;;
+    esac
+  else
+    confirm "Add $m_id $m_version?" || fail "aborted"
+  fi
+fi
+
+# ---------------------------------------------------------------- install files
+
+mkdir -p "$PLUGINS_DIR"
+
+stage="$PLUGINS_DIR/.${m_id}.tmp.$$"
+rm -rf "$stage"
+if ! cp -a "$src_path/." "$stage/"; then
+  rm -rf "$stage"
+  fail "failed to stage plugin into $stage"
+fi
+
+backup=""
+if ((replacing)); then
+  if ((target_is_link)); then
+    # Don't drag a (possibly large) dev-symlink target into a backup; just drop
+    # the link. The real files it points at are untouched.
+    rm -f "$target"
+  else
+    base="$PLUGINS_DIR/.${m_id}.bak.$(date -u +%Y%m%d%H%M%S)"
+    backup="$base"
+    n=1
+    while [[ -e $backup ]]; do backup="${base}-${n}"; n=$((n + 1)); done
+    if ! mv "$target" "$backup"; then
+      rm -rf "$stage"
+      fail "failed to back up existing $target"
+    fi
+  fi
+fi
+
+if ! mv "$stage" "$target"; then
+  rm -rf "$stage"
+  [[ -n $backup && -d $backup ]] && mv "$backup" "$target"
+  fail "failed to move staged plugin into place"
+fi
+
+echo "Added $m_id $m_version into $target"
+[[ -n $backup ]] && echo "Previous version backed up to: $backup"
+
+omarchy-shell shell rescanPlugins >/dev/null 2>&1 || true
+
+# ---------------------------------------------------------------- enable
+
+if [[ -z $ENABLE_AFTER ]]; then
+  if ((ASSUME_YES)) || ! interactive; then
+    ENABLE_AFTER=false
+  elif confirm "Enable '$m_id' now?"; then
+    ENABLE_AFTER=true
+  else
+    ENABLE_AFTER=false
+  fi
+fi
+
+if [[ $ENABLE_AFTER == true ]]; then
+  if ! wait_for_plugin_discovery "$m_id"; then
+    echo "Could not enable $m_id because omarchy-shell did not discover it yet. Enable later with: omarchy plugin enable $m_id" >&2
+  elif result=$(omarchy-shell shell setPluginEnabled "$m_id" true) && [[ $result == "ok" ]]; then
+    echo "Enabled $m_id."
+    if [[ $m_kinds == *bar-widget* ]]; then
+      echo "It was added to the bar; arrange it with: omarchy plugin bar move $m_id --section <left|center|right>"
+    fi
+  else
+    echo "Could not enable $m_id over IPC (is omarchy-shell running?). Enable later with: omarchy plugin enable $m_id" >&2
+  fi
+else
+  echo "Enable it later with: omarchy plugin enable $m_id"
+fi
+
+# Reaching here means the files are in place; never let a falsy trailing test
+# leak a non-zero status to callers like `omarchy plugin update`.
+exit 0
diff --git a/bin/omarchy-plugin-available b/bin/omarchy-plugin-available
new file mode 100755
index 00000000..01c517b6
--- /dev/null
+++ b/bin/omarchy-plugin-available
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# omarchy:summary=List plugins available across trusted sources and their install status
+# omarchy:group=plugin
+# omarchy:args=[--json] [--no-refresh]
+# omarchy:examples=omarchy plugin available | omarchy plugin available --json
+
+set -o pipefail
+
+PLUGINS_DIR="$HOME/.config/omarchy/plugins"
+
+fail() {
+  echo "omarchy-plugin-available: $*" >&2
+  exit 1
+}
+
+command -v jq >/dev/null 2>&1 || fail "jq is required"
+
+JSON=0
+NO_REFRESH=0
+while (($# > 0)); do
+  case "$1" in
+  --json) JSON=1; shift ;;
+  --no-refresh) NO_REFRESH=1; shift ;;
+  -h | --help)
+    cat <<USAGE
+Usage: omarchy plugin available [--json] [--no-refresh]
+
+Lists every plugin found across your trusted sources, with whether it is
+installed and whether an update is available. Add one with:
+  omarchy plugin add <plugin-id>
+USAGE
+    exit 0
+    ;;
+  *) fail "unknown option: $1" ;;
+  esac
+done
+
+if ((!NO_REFRESH)); then
+  omarchy-plugin-source refresh >/dev/null 2>&1 || true
+fi
+
+CATALOG=$(omarchy-plugin-scan)
+
+# Annotate each catalogue entry with a stable status token (available |
+# installed | update-available | local-newer, matching omarchy-plugin-update's
+# vocabulary) plus the installed version, by comparing the installed manifest
+# version (if any) against the upstream version. Entries are read as compact
+# JSON objects so an empty version field never shifts the parse.
+rows='[]'
+while IFS= read -r row; do
+  [[ -n $row ]] || continue
+  id=$(jq -r '.id' <<<"$row")
+  name=$(jq -r '.name' <<<"$row")
+  version=$(jq -r '.version' <<<"$row")
+  source=$(jq -r '.source' <<<"$row")
+
+  installed=""
+  [[ -f "$PLUGINS_DIR/$id/manifest.json" ]] && installed=$(jq -r '.version // ""' "$PLUGINS_DIR/$id/manifest.json" 2>/dev/null)
+  if [[ -z $installed ]]; then
+    status="available"
+  elif [[ $installed == "$version" ]]; then
+    status="installed"
+  elif [[ $(printf '%s\n%s\n' "$installed" "$version" | sort -V | tail -n1) == "$version" ]]; then
+    status="update-available"
+  else
+    status="local-newer"
+  fi
+
+  entry=$(jq -n --arg id "$id" --arg name "$name" --arg version "$version" \
+    --arg installed "$installed" --arg source "$source" --arg status "$status" \
+    '{id:$id, name:$name, version:$version, installedVersion:$installed, source:$source, status:$status}')
+  rows=$(jq --argjson e "$entry" '. + [$e]' <<<"$rows")
+done < <(jq -c '.[] | {id: .manifest.id, name: (.manifest.name // .manifest.id), version: (.manifest.version // ""), source: .sourceId}' <<<"$CATALOG")
+
+if ((JSON)); then
+  echo "$rows"
+  exit 0
+fi
+
+if [[ $(jq 'length' <<<"$rows") -eq 0 ]]; then
+  echo "No plugins available. Add a source with: omarchy plugin source add <git-url>"
+  exit 0
+fi
+
+# Render the human status from the token + versions (ASCII arrow, matching update).
+jq -r '.[] | [.id, .name, .version, .source, .status, .installedVersion] | @tsv' <<<"$rows" |
+  awk -F '\t' '
+    function human(st, inst, ver) {
+      if (st == "update-available") return "update (" inst " -> " ver ")"
+      if (st == "local-newer") return "local-newer (" inst ")"
+      return st
+    }
+    BEGIN { printf "%-26s %-26s %-10s %-30s %s\n", "ID", "NAME", "VERSION", "SOURCE", "STATUS" }
+    { printf "%-26s %-26s %-10s %-30s %s\n", $1, $2, ("v" ($3=="" ? "?" : $3)), $4, human($5, $6, $3) }'
+
+echo
+echo "Add with: omarchy plugin add <id>"
diff --git a/bin/omarchy-plugin-remove b/bin/omarchy-plugin-remove
new file mode 100755
index 00000000..0fe78584
--- /dev/null
+++ b/bin/omarchy-plugin-remove
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# omarchy:summary=Remove an installed Omarchy shell plugin
+# omarchy:group=plugin
+# omarchy:args=[plugin-id] [--yes]
+# omarchy:examples=omarchy plugin remove | omarchy plugin remove orbit --yes
+
+# Disables a plugin and removes it from ~/.config/omarchy/plugins/. A real
+# install is moved to a timestamped backup so it can be restored; a dev symlink
+# is just unlinked (the files it points at are left alone).
+
+set -o pipefail
+
+PLUGINS_DIR="$HOME/.config/omarchy/plugins"
+
+fail() {
+  echo "omarchy-plugin-remove: $*" >&2
+  exit 1
+}
+
+interactive() {
+  [[ -t 0 && -t 1 ]]
+}
+
+PLUGIN_ID=""
+ASSUME_YES=0
+while (($# > 0)); do
+  case "$1" in
+  --yes | -y) ASSUME_YES=1; shift ;;
+  -h | --help)
+    cat <<USAGE
+Usage: omarchy plugin remove [plugin-id] [--yes]
+
+Disables the plugin and removes it from ~/.config/omarchy/plugins/.
+A real install is backed up to .<id>.bak.<timestamp>/; a symlink is unlinked.
+USAGE
+    exit 0
+    ;;
+  -*) fail "unknown option: $1" ;;
+  *)
+    [[ -z $PLUGIN_ID ]] || fail "unexpected argument: $1"
+    PLUGIN_ID="$1"; shift ;;
+  esac
+done
+
+confirm() {
+  local prompt="$1"
+  ((ASSUME_YES)) && return 0
+  if command -v gum >/dev/null 2>&1 && interactive; then gum confirm "$prompt"; return; fi
+  if interactive; then local reply; read -r -p "$prompt [y/N] " reply; [[ $reply == [yY]* ]]; return; fi
+  fail "refusing to remove without confirmation; pass --yes"
+}
+
+[[ -d $PLUGINS_DIR ]] || fail "no plugins installed"
+
+if [[ -z $PLUGIN_ID ]]; then
+  mapfile -t ids < <(find "$PLUGINS_DIR" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) ! -name '.*' -printf '%f\n' 2>/dev/null | sort)
+  ((${#ids[@]})) || fail "no plugins installed"
+  interactive || fail "a plugin-id is required"
+  if command -v gum >/dev/null 2>&1; then
+    PLUGIN_ID=$(printf '%s\n' "${ids[@]}" | gum choose --header="Remove which plugin?") || fail "cancelled"
+  elif command -v fzf >/dev/null 2>&1; then
+    PLUGIN_ID=$(printf '%s\n' "${ids[@]}" | fzf --prompt "Remove which plugin > ") || fail "cancelled"
+  else
+    fail "a plugin-id is required (gum or fzf needed for an interactive picker)"
+  fi
+  [[ -n $PLUGIN_ID ]] || fail "nothing selected"
+fi
+
+# The id becomes a path under PLUGINS_DIR that we mv/rm, so reject anything that
+# could escape it (matches the id rules in omarchy-plugin-validate).
+[[ $PLUGIN_ID =~ ^[A-Za-z0-9][A-Za-z0-9._-]*$ && $PLUGIN_ID != *"/"* && $PLUGIN_ID != *".."* ]] \
+  || fail "invalid plugin id '$PLUGIN_ID'"
+
+target="$PLUGINS_DIR/$PLUGIN_ID"
+[[ -e $target || -L $target ]] || fail "plugin '$PLUGIN_ID' is not installed"
+
+was_enabled=""
+if shell_plugins=$(omarchy-shell shell listPlugins 2>/dev/null) && [[ -n $shell_plugins ]]; then
+  was_enabled=$(jq -r --arg id "$PLUGIN_ID" '.[] | select(.id == $id) | .enabled' <<<"$shell_plugins" 2>/dev/null)
+fi
+
+if [[ -L $target ]]; then
+  confirm "Unlink '$PLUGIN_ID' (symlink -> $(readlink "$target"))?" || fail "aborted"
+else
+  confirm "Remove '$PLUGIN_ID'? The folder will be backed up." || fail "aborted"
+fi
+
+[[ $was_enabled == "true" ]] && omarchy-shell shell setPluginEnabled "$PLUGIN_ID" false >/dev/null 2>&1 || true
+
+if [[ -L $target ]]; then
+  rm -f "$target" || fail "failed to unlink $target"
+  echo "Unlinked $PLUGIN_ID."
+else
+  base="$PLUGINS_DIR/.${PLUGIN_ID}.bak.$(date -u +%Y%m%d%H%M%S)"
+  backup="$base"; n=1
+  while [[ -e $backup ]]; do backup="${base}-${n}"; n=$((n + 1)); done
+  mv "$target" "$backup" || fail "failed to move $target to backup"
+  echo "Removed $PLUGIN_ID. Backup at: $backup"
+fi
+
+omarchy-shell shell rescanPlugins >/dev/null 2>&1 || true
+
+if [[ $was_enabled == "true" ]]; then
+  echo "Plugin was enabled and was unloaded from omarchy-shell."
+fi
diff --git a/bin/omarchy-plugin-scan b/bin/omarchy-plugin-scan
new file mode 100755
index 00000000..80394807
--- /dev/null
+++ b/bin/omarchy-plugin-scan
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# omarchy:summary=List every plugin available across configured sources (JSON)
+# omarchy:group=plugin
+# omarchy:hidden=true
+
+# Walks the locally cached clones of every trusted source and emits one JSON
+# entry per plugin folder it finds. This is the shared catalogue that
+# `available`, `install`, and `update` all read; it never touches the network
+# (run `omarchy plugin source refresh` first to pull fresh clones).
+
+set -o pipefail
+
+SOURCES_FILE="$HOME/.config/omarchy/plugins/sources.json"
+CACHE_ROOT="$HOME/.cache/omarchy/plugin-sources"
+
+command -v jq >/dev/null 2>&1 || { echo "omarchy-plugin-scan: jq is required" >&2; exit 1; }
+
+if [[ ! -f $SOURCES_FILE ]]; then
+  echo "[]"
+  exit 0
+fi
+
+results='[]'
+
+# Read each source as a compact JSON object (one per line) rather than a
+# delimiter-joined string — no separator to get wrong, and empty fields survive.
+while IFS= read -r src_json; do
+  [[ -n $src_json ]] || continue
+  src_id=$(jq -r '.id // ""' <<<"$src_json")
+  src_url=$(jq -r '.url // ""' <<<"$src_json")
+  src_ref=$(jq -r '.ref // ""' <<<"$src_json")
+  [[ -n $src_id ]] || continue
+
+  cache_dir="$CACHE_ROOT/$src_id"
+  [[ -d $cache_dir ]] || continue
+
+  for folder in "$cache_dir"/*/; do
+    [[ -d $folder ]] || continue
+    manifest="$folder/manifest.json"
+    [[ -f $manifest ]] || continue
+    jq -e . "$manifest" >/dev/null 2>&1 || continue
+
+    folder_name=$(basename "$folder")
+    abs_path=$(cd "$folder" && pwd)
+
+    entry=$(jq -n \
+      --arg sourceId "$src_id" \
+      --arg sourceUrl "$src_url" \
+      --arg ref "$src_ref" \
+      --arg folder "$folder_name" \
+      --arg path "$abs_path" \
+      --slurpfile manifest "$manifest" \
+      '{sourceId:$sourceId, sourceUrl:$sourceUrl, ref:$ref, folder:$folder, path:$path, manifest:$manifest[0]}') || continue
+
+    results=$(jq --argjson e "$entry" '. + [$e]' <<<"$results")
+  done
+done < <(jq -c '.sources[]?' "$SOURCES_FILE")
+
+echo "$results"
diff --git a/bin/omarchy-plugin-source b/bin/omarchy-plugin-source
new file mode 100755
index 00000000..3f41b318
--- /dev/null
+++ b/bin/omarchy-plugin-source
@@ -0,0 +1,372 @@
+#!/bin/bash
+
+# omarchy:summary=Manage trusted git repos that Omarchy plugins are installed from
+# omarchy:group=plugin
+# omarchy:args=<add|list|remove|refresh> [...]
+# omarchy:examples=omarchy plugin source add | omarchy plugin source list | omarchy plugin source add https://github.com/owner/omarchy-plugins.git --as owner-plugins | omarchy plugin source refresh
+
+set -o pipefail
+
+# Never let git block an unattended run on a credential or host-key prompt; fail
+# fast instead so callers' `|| true` / error paths can handle it.
+export GIT_TERMINAL_PROMPT=0
+export GIT_SSH_COMMAND="${GIT_SSH_COMMAND:-ssh -oBatchMode=yes}"
+
+SOURCES_FILE="$HOME/.config/omarchy/plugins/sources.json"
+CACHE_ROOT="$HOME/.cache/omarchy/plugin-sources"
+
+fail() {
+  echo "omarchy-plugin-source: $*" >&2
+  exit 1
+}
+
+# A source id becomes a cache directory name and a sources.json key, so it must
+# never contain path separators or traversal. Used for --as, derived ids, and
+# (defensively) any id read back before an rm -rf.
+valid_source_id() {
+  [[ $1 =~ ^[a-z0-9][a-z0-9._-]*$ && $1 != *..* ]]
+}
+
+require_command() {
+  command -v "$1" >/dev/null 2>&1 || fail "$1 is required"
+}
+
+interactive() {
+  [[ -t 0 && -t 1 ]]
+}
+
+# Yes/no prompt. Honours a caller-set ASSUME_YES, falls back to a plain read
+# when gum is missing, and refuses in a non-interactive context so an agent
+# must pass --yes deliberately rather than hang on a prompt.
+confirm() {
+  local prompt="$1"
+  [[ ${ASSUME_YES:-0} == 1 ]] && return 0
+  if command -v gum >/dev/null 2>&1 && interactive; then
+    gum confirm "$prompt"
+    return
+  fi
+  if interactive; then
+    local reply
+    read -r -p "$prompt [y/N] " reply
+    [[ $reply == [yY]* ]]
+    return
+  fi
+  fail "refusing to continue without confirmation; pass --yes"
+}
+
+ask_input() {
+  local prompt="$1"
+  local value=""
+  if command -v gum >/dev/null 2>&1; then
+    gum input --prompt "$prompt " || return 1
+  else
+    read -r -p "$prompt " value || return 1
+    printf '%s' "$value"
+  fi
+}
+
+ensure_sources_file() {
+  mkdir -p "$(dirname "$SOURCES_FILE")"
+  if [[ ! -f $SOURCES_FILE ]]; then
+    # Subshell the umask so it does not leak into the rest of this process.
+    (umask 077; echo '{"version":1,"sources":[]}' >"$SOURCES_FILE")
+  fi
+}
+
+# Persist a jq transform of the sources file, then keep it owner-only.
+write_sources() {
+  local filter="$1"
+  shift
+  local tmp
+  tmp=$(mktemp)
+  if ! jq "$@" "$filter" "$SOURCES_FILE" >"$tmp"; then
+    rm -f "$tmp"
+    fail "failed to update $SOURCES_FILE"
+  fi
+  mv "$tmp" "$SOURCES_FILE"
+  chmod 600 "$SOURCES_FILE" 2>/dev/null || true
+}
+
+# owner-repo, lowercased and sanitized, from any git URL form (scp-like or URL).
+derive_source_id() {
+  local url="$1"
+  url="${url%.git}"
+  url="${url%/}"
+  local path
+  if [[ $url =~ ^[^/]+@[^/]+:(.+)$ ]]; then
+    path="${BASH_REMATCH[1]}"
+  else
+    path="${url#*://}"
+    path="${path#*/}"
+  fi
+  local repo="${path##*/}"
+  local owner_part="${path%/*}"
+  local owner="${owner_part##*/}"
+  local id
+  if [[ -n $owner && $owner != "$path" ]]; then
+    id="${owner}-${repo}"
+  else
+    id="$repo"
+  fi
+  id="${id,,}"
+  id="${id//[^a-z0-9._-]/-}"
+  while [[ $id == -* ]]; do id="${id#-}"; done
+  while [[ $id == *- ]]; do id="${id%-}"; done
+  printf '%s' "$id"
+}
+
+source_exists() {
+  jq -e --arg id "$1" '.sources | map(.id) | index($id) != null' "$SOURCES_FILE" >/dev/null 2>&1
+}
+
+# ---------------------------------------------------------------- add
+
+source_add() {
+  require_command jq
+  require_command git
+
+  local url="" ref="" name=""
+  ASSUME_YES=0
+  while (($# > 0)); do
+    case "$1" in
+    --ref) ref="${2:-}"; shift 2 ;;
+    --as) name="${2:-}"; shift 2 ;;
+    --yes | -y) ASSUME_YES=1; shift ;;
+    -h | --help) usage; return 0 ;;
+    --) shift; break ;;
+    -*) fail "unknown option: $1" ;;
+    *)
+      [[ -z $url ]] || fail "unexpected argument: $1"
+      url="$1"; shift ;;
+    esac
+  done
+
+  if [[ -z $url ]]; then
+    interactive || fail "a git URL is required (e.g. omarchy plugin source add https://github.com/owner/repo.git)"
+    url=$(ask_input "Git URL of the plugin source repo:") || fail "cancelled"
+    [[ -n $url ]] || fail "a git URL is required"
+  fi
+
+  [[ -n $name ]] || name=$(derive_source_id "$url")
+  [[ -n $name ]] || fail "could not derive a source id from '$url'; re-run with --as <name>"
+  valid_source_id "$name" || fail "invalid source id '$name' (lowercase letters, digits, '.', '_', '-'; no '/' or '..')"
+
+  ensure_sources_file
+  if source_exists "$name"; then
+    local existing
+    existing=$(jq -r --arg id "$name" '.sources[] | select(.id == $id) | .url' "$SOURCES_FILE")
+    fail "source '$name' already exists (url: $existing); remove it first with: omarchy plugin source remove $name"
+  fi
+
+  cat >&2 <<WARN
+
+⚠️  You are about to trust a new plugin source.
+
+      Name: $name
+      URL:  $url
+      Ref:  ${ref:-<default branch>}
+
+  Plugins from this repo run as arbitrary code inside your long-lived
+  omarchy-shell process. They are not sandboxed. Only add sources you
+  trust, and review a plugin's code before you install and enable it.
+
+WARN
+  confirm "Trust this source?" || fail "aborted"
+
+  local cache_dir="$CACHE_ROOT/$name"
+  rm -rf "$cache_dir"
+  mkdir -p "$CACHE_ROOT"
+
+  local clone_args=(--depth 1)
+  [[ -n $ref ]] && clone_args+=(--branch "$ref")
+
+  echo "Cloning $url ..."
+  if ! git clone "${clone_args[@]}" -- "$url" "$cache_dir"; then
+    rm -rf "$cache_dir"
+    fail "failed to clone $url"
+  fi
+
+  [[ -n $ref ]] || ref=$(git -C "$cache_dir" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
+
+  local ts
+  ts=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+  write_sources '.sources += [{id:$id, url:$url, ref:$ref, trustedAt:$ts}]' \
+    --arg id "$name" --arg url "$url" --arg ref "$ref" --arg ts "$ts"
+
+  echo "Added source '$name'${ref:+ (ref: $ref)}."
+  echo "Browse its plugins with: omarchy plugin available"
+}
+
+# ---------------------------------------------------------------- list
+
+source_list() {
+  require_command jq
+  local json=0
+  while (($# > 0)); do
+    case "$1" in
+    --json) json=1; shift ;;
+    -h | --help) usage; return 0 ;;
+    *) fail "unknown list option: $1" ;;
+    esac
+  done
+
+  if [[ ! -f $SOURCES_FILE ]]; then
+    if ((json)); then echo '{"version":1,"sources":[]}'; else echo "No plugin sources configured. Add one with: omarchy plugin source add <git-url>"; fi
+    return 0
+  fi
+
+  if ((json)); then
+    cat "$SOURCES_FILE"
+    return 0
+  fi
+
+  if [[ $(jq '.sources | length' "$SOURCES_FILE") -eq 0 ]]; then
+    echo "No plugin sources configured. Add one with: omarchy plugin source add <git-url>"
+    return 0
+  fi
+
+  jq -r '.sources[] | [.id, .url, (.ref // "")] | @tsv' "$SOURCES_FILE" |
+    while IFS=$'\t' read -r id url ref; do
+      local cache="missing"
+      [[ -d "$CACHE_ROOT/$id/.git" ]] && cache="cached"
+      printf '%s\t%s\t%s\t%s\n' "$id" "$url" "${ref:-?}" "$cache"
+    done |
+    awk -F '\t' '
+      BEGIN { printf "%-34s %-46s %-14s %s\n", "ID", "URL", "REF", "CACHE" }
+      { printf "%-34s %-46s %-14s %s\n", $1, $2, $3, $4 }'
+}
+
+# ---------------------------------------------------------------- remove
+
+source_remove() {
+  require_command jq
+  local id=""
+  ASSUME_YES=0
+  while (($# > 0)); do
+    case "$1" in
+    --yes | -y) ASSUME_YES=1; shift ;;
+    -h | --help) usage; return 0 ;;
+    -*) fail "unknown option: $1" ;;
+    *)
+      [[ -z $id ]] || fail "unexpected argument: $1"
+      id="$1"; shift ;;
+    esac
+  done
+
+  [[ -f $SOURCES_FILE ]] || fail "no plugin sources configured"
+
+  if [[ -z $id ]]; then
+    interactive || fail "a source id is required"
+    if command -v gum >/dev/null 2>&1; then
+      id=$(jq -r '.sources[].id' "$SOURCES_FILE" | gum choose --header="Remove which plugin source?") || fail "cancelled"
+    elif command -v fzf >/dev/null 2>&1; then
+      id=$(jq -r '.sources[].id' "$SOURCES_FILE" | fzf --prompt "Remove which plugin source > ") || fail "cancelled"
+    else
+      fail "a source id is required (install gum or fzf for an interactive picker)"
+    fi
+    [[ -n $id ]] || fail "nothing selected"
+  fi
+
+  source_exists "$id" || fail "no such source: $id"
+  confirm "Remove source '$id'? (installed plugins are left in place)" || fail "aborted"
+
+  write_sources '.sources |= map(select(.id != $id))' --arg id "$id"
+  # Defense in depth: never rm -rf a cache path built from an id that could
+  # contain traversal, even though valid_source_id gates ids on the way in.
+  if valid_source_id "$id"; then
+    rm -rf "${CACHE_ROOT:?}/$id"
+  fi
+  echo "Removed source '$id'."
+}
+
+# ---------------------------------------------------------------- refresh
+
+refresh_one() {
+  local id="$1"
+  valid_source_id "$id" || { echo "omarchy-plugin-source: invalid source id: $id" >&2; return 1; }
+  local url ref cache_dir
+  url=$(jq -r --arg id "$id" '.sources[] | select(.id == $id) | .url' "$SOURCES_FILE")
+  ref=$(jq -r --arg id "$id" '.sources[] | select(.id == $id) | .ref // ""' "$SOURCES_FILE")
+  cache_dir="$CACHE_ROOT/$id"
+
+  [[ -n $url ]] || { echo "omarchy-plugin-source: no such source: $id" >&2; return 1; }
+
+  if [[ ! -d "$cache_dir/.git" ]]; then
+    echo "Cache missing for '$id'; re-cloning ..."
+    rm -rf "$cache_dir"
+    mkdir -p "$CACHE_ROOT"
+    local clone_args=(--depth 1)
+    [[ -n $ref ]] && clone_args+=(--branch "$ref")
+    git clone "${clone_args[@]}" -- "$url" "$cache_dir" || return 1
+    return 0
+  fi
+
+  echo "Refreshing '$id' (${ref:-HEAD}) ..."
+  if ! git -C "$cache_dir" fetch --depth 1 origin "${ref:-HEAD}" >/dev/null 2>&1; then
+    echo "omarchy-plugin-source: fetch failed for '$id'" >&2
+    return 1
+  fi
+  git -C "$cache_dir" reset --hard FETCH_HEAD >/dev/null 2>&1 || return 1
+}
+
+source_refresh() {
+  require_command jq
+  require_command git
+  local id=""
+  while (($# > 0)); do
+    case "$1" in
+    -h | --help) usage; return 0 ;;
+    -*) fail "unknown option: $1" ;;
+    *)
+      [[ -z $id ]] || fail "unexpected argument: $1"
+      id="$1"; shift ;;
+    esac
+  done
+
+  [[ -f $SOURCES_FILE ]] || fail "no plugin sources configured"
+
+  if [[ -n $id ]]; then
+    refresh_one "$id"
+    return $?
+  fi
+
+  local rc=0
+  mapfile -t ids < <(jq -r '.sources[].id' "$SOURCES_FILE")
+  if ((${#ids[@]} == 0)); then
+    echo "No plugin sources configured."
+    return 0
+  fi
+  for sid in "${ids[@]}"; do
+    refresh_one "$sid" || rc=1
+  done
+  return $rc
+}
+
+usage() {
+  cat <<USAGE
+Usage: omarchy plugin source <command> [args...]
+
+  add [<git-url>] [--ref <ref>] [--as <name>] [--yes]
+        Trust a git repo as a plugin source and clone it locally.
+  list [--json]
+        List trusted plugin sources and whether each is cached.
+  remove [<source-id>] [--yes]
+        Forget a source and drop its cache (installed plugins stay).
+  refresh [<source-id>]
+        Pull the latest clone for one source, or all sources.
+
+Sources are stored in ~/.config/omarchy/plugins/sources.json and cloned
+into ~/.cache/omarchy/plugin-sources/<source-id>/.
+USAGE
+}
+
+command="${1:-list}"
+[[ $# -gt 0 ]] && shift || true
+case "$command" in
+add) source_add "$@" ;;
+list | ls) source_list "$@" ;;
+remove | rm) source_remove "$@" ;;
+refresh | update) source_refresh "$@" ;;
+-h | --help | help) usage ;;
+*) fail "unknown command: $command (use add, list, remove, or refresh)" ;;
+esac
diff --git a/bin/omarchy-plugin-update b/bin/omarchy-plugin-update
new file mode 100755
index 00000000..ee326231
--- /dev/null
+++ b/bin/omarchy-plugin-update
@@ -0,0 +1,214 @@
+#!/bin/bash
+
+# omarchy:summary=Update installed Omarchy plugins from their sources
+# omarchy:group=plugin
+# omarchy:args=[plugin-id] [--all] [--force] [--review] [--no-refresh] [--yes]
+# omarchy:examples=omarchy plugin update | omarchy plugin update orbit --review | omarchy plugin update --all --yes
+
+# Re-pulls a plugin's folder from its source when the upstream manifest version
+# is newer. Updates are just re-installs, so the same "review the code" rule
+# applies — by default this prints a diff of exactly what changed before
+# touching anything. --yes skips the diff and confirmation for scripts/agents.
+
+set -o pipefail
+
+PLUGINS_DIR="$HOME/.config/omarchy/plugins"
+
+fail() {
+  echo "omarchy-plugin-update: $*" >&2
+  exit 1
+}
+
+require_command() {
+  command -v "$1" >/dev/null 2>&1 || fail "$1 is required"
+}
+
+interactive() {
+  [[ -t 0 && -t 1 ]]
+}
+
+PLUGIN_ID=""
+ALL=0
+FORCE=0
+DO_REVIEW=0
+NO_REFRESH=0
+ASSUME_YES=0
+
+while (($# > 0)); do
+  case "$1" in
+  --all | -a) ALL=1; shift ;;
+  --force | -f) FORCE=1; shift ;;
+  --review) DO_REVIEW=1; shift ;;
+  --no-refresh) NO_REFRESH=1; shift ;;
+  --yes | -y) ASSUME_YES=1; shift ;;
+  -h | --help)
+    cat <<USAGE
+Usage: omarchy plugin update [plugin-id] [--all] [--force] [--review] [--no-refresh] [--yes]
+
+Updates installed plugins when their source has a newer version.
+  (no args)    pick from the plugins that have an update available
+  <plugin-id>  update one plugin
+  --all        update every plugin with an available update
+  --force      re-pull even when versions match (or local looks newer)
+  --review     always show the file diff before updating (default in a TTY)
+  --no-refresh use cached clones, skip the network refresh
+  --yes        skip the diff and confirmation
+USAGE
+    exit 0
+    ;;
+  -*) fail "unknown option: $1" ;;
+  *)
+    [[ -z $PLUGIN_ID ]] || fail "unexpected argument: $1"
+    PLUGIN_ID="$1"; shift ;;
+  esac
+done
+
+require_command jq
+((ALL)) && [[ -n $PLUGIN_ID ]] && fail "pass either a plugin-id or --all, not both"
+
+confirm() {
+  local prompt="$1"
+  ((ASSUME_YES)) && return 0
+  if command -v gum >/dev/null 2>&1 && interactive; then gum confirm "$prompt"; return; fi
+  if interactive; then local reply; read -r -p "$prompt [y/N] " reply; [[ $reply == [yY]* ]]; return; fi
+  fail "refusing to update without confirmation; pass --yes"
+}
+
+if ((!NO_REFRESH)); then
+  omarchy-plugin-source refresh >/dev/null 2>&1 || true
+fi
+
+CATALOG=$(omarchy-plugin-scan 2>/dev/null || echo "[]")
+
+# Map of currently enabled third-party plugins, so we can preserve state.
+declare -A enabled_map
+if shell_plugins=$(omarchy-shell shell listPlugins 2>/dev/null) && [[ -n $shell_plugins ]]; then
+  while IFS=$'\t' read -r pid pen; do
+    [[ -n $pid ]] && enabled_map["$pid"]="$pen"
+  done < <(jq -r '.[] | select(.firstParty == false) | [.id, (.enabled|tostring)] | @tsv' <<<"$shell_plugins" 2>/dev/null)
+fi
+
+# Echoes "<status>\t<source-id>\t<installed-version>\t<upstream-version>\t<cache-path>"
+plugin_status() {
+  local id="$1" installed_version="$2"
+  local up
+  up=$(jq -c --arg id "$id" 'map(select(.manifest.id == $id)) | .[0] // empty' <<<"$CATALOG")
+  if [[ -z $up ]]; then
+    printf 'unmanaged\t\t%s\t\t\n' "$installed_version"
+    return
+  fi
+  local upstream_version src_id cache_path status
+  upstream_version=$(jq -r '.manifest.version // ""' <<<"$up")
+  src_id=$(jq -r '.sourceId' <<<"$up")
+  cache_path=$(jq -r '.path' <<<"$up")
+  if [[ -z $installed_version || -z $upstream_version ]]; then
+    status="unknown"
+  elif [[ $installed_version == "$upstream_version" ]]; then
+    status="up-to-date"
+  elif [[ $(printf '%s\n%s\n' "$installed_version" "$upstream_version" | sort -V | tail -n1) == "$upstream_version" ]]; then
+    status="update-available"
+  else
+    status="local-newer"
+  fi
+  printf '%s\t%s\t%s\t%s\t%s\n' "$status" "$src_id" "$installed_version" "$upstream_version" "$cache_path"
+}
+
+installed_version_of() {
+  local id="$1"
+  [[ -f "$PLUGINS_DIR/$id/manifest.json" ]] || return 1
+  jq -r '.version // ""' "$PLUGINS_DIR/$id/manifest.json" 2>/dev/null
+}
+
+# ---------------------------------------------------------------- pick targets
+
+[[ -d $PLUGINS_DIR ]] || fail "no plugins installed"
+
+declare -a targets=()
+if ((ALL)); then
+  for d in "$PLUGINS_DIR"/*/; do
+    [[ -d $d ]] || continue
+    id=$(basename "$d"); [[ $id == .* ]] && continue
+    iv=$(installed_version_of "$id") || continue
+    IFS=$'\t' read -r status _ _ _ _ < <(plugin_status "$id" "$iv")
+    [[ $status == "update-available" ]] && targets+=("$id")
+  done
+  ((${#targets[@]})) || { echo "No updates available."; exit 0; }
+elif [[ -n $PLUGIN_ID ]]; then
+  installed_version_of "$PLUGIN_ID" >/dev/null || fail "plugin '$PLUGIN_ID' is not installed"
+  targets=("$PLUGIN_ID")
+else
+  interactive || fail "a plugin-id is required (or pass --all)"
+  outdated=""
+  for d in "$PLUGINS_DIR"/*/; do
+    [[ -d $d ]] || continue
+    id=$(basename "$d"); [[ $id == .* ]] && continue
+    iv=$(installed_version_of "$id") || continue
+    IFS=$'\t' read -r status _ instv upv _ < <(plugin_status "$id" "$iv")
+    [[ $status == "update-available" ]] && outdated+="$id"$'\t'"$instv -> $upv"$'\n'
+  done
+  [[ -n $outdated ]] || { echo "No updates available."; exit 0; }
+  rows=$(awk -F '\t' 'NF{printf "%-28s  %s\n", $1, $2}' <<<"$outdated")
+  if command -v gum >/dev/null 2>&1; then
+    pick=$(gum choose --no-limit --header="Update which plugins? (space toggles, enter confirms)" <<<"$rows") || fail "cancelled"
+  elif command -v fzf >/dev/null 2>&1; then
+    pick=$(fzf --multi --prompt "Update which plugins (tab to mark) > " <<<"$rows") || fail "cancelled"
+  else
+    fail "a plugin-id is required (install gum or fzf for an interactive picker, or pass --all)"
+  fi
+  [[ -n $pick ]] || { echo "Nothing selected."; exit 0; }
+  mapfile -t targets < <(awk '{print $1}' <<<"$pick")
+fi
+
+# ---------------------------------------------------------------- apply
+
+show_diff() {
+  local installed="$1" cache="$2"
+  echo "Changes for $3 ($4 -> $5):"
+  if command -v delta >/dev/null 2>&1; then
+    diff -ruN "$installed" "$cache" | delta --paging=never
+  else
+    diff -ruN "$installed" "$cache"
+  fi
+  echo
+}
+
+any_enabled=0
+rc=0
+for id in "${targets[@]}"; do
+  iv=$(installed_version_of "$id") || { echo "Skipping $id: not installed." >&2; rc=1; continue; }
+  IFS=$'\t' read -r status src_id instv upv cache_path < <(plugin_status "$id" "$iv")
+
+  case "$status" in
+  unmanaged) echo "Skipping $id: not found in any configured source." >&2; rc=1; continue ;;
+  unknown) echo "Skipping $id: missing version metadata to compare." >&2; rc=1; continue ;;
+  up-to-date)
+    ((FORCE)) || { echo "Skipping $id: already up to date ($instv). Use --force to re-pull."; continue; } ;;
+  local-newer)
+    ((FORCE)) || { echo "Skipping $id: installed $instv is newer than upstream $upv. Use --force to overwrite." >&2; rc=1; continue; } ;;
+  esac
+
+  if ((!ASSUME_YES)); then
+    if ((DO_REVIEW)) || interactive; then
+      show_diff "$PLUGINS_DIR/$id" "$cache_path" "$id" "$instv" "$upv"
+    fi
+    confirm "Update $id ($instv -> $upv)?" || { echo "Skipped $id."; continue; }
+  fi
+
+  echo "Updating $id ..."
+  install_args=("$id" --from "$src_id" --no-refresh --yes)
+  case "${enabled_map[$id]:-}" in
+  true) install_args+=(--enable); any_enabled=1 ;;
+  false) install_args+=(--no-enable) ;;
+  esac
+  if ! omarchy-plugin-add "${install_args[@]}"; then
+    echo "Failed to update $id" >&2
+    rc=1
+  fi
+done
+
+if ((any_enabled)); then
+  echo
+  echo "Updated enabled plugins were hot-reloaded by omarchy-shell."
+fi
+
+exit $rc
diff --git a/bin/omarchy-plugin-validate b/bin/omarchy-plugin-validate
new file mode 100755
index 00000000..a7d99b07
--- /dev/null
+++ b/bin/omarchy-plugin-validate
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# omarchy:summary=Validate a plugin folder against the Omarchy plugin manifest schema
+# omarchy:group=plugin
+# omarchy:args=<plugin-folder>
+# omarchy:examples=omarchy plugin validate ./my-plugin
+
+# Mirrors the checks in shell/services/PluginRegistry.qml so the CLI refuses to
+# install anything the running shell would silently reject (or worse, load
+# unsafely). The shell never trusts manifests blindly; neither do we.
+
+set -o pipefail
+
+fail() {
+  echo "omarchy-plugin-validate: $*" >&2
+  exit 1
+}
+
+if [[ ${1:-} == -h || ${1:-} == --help ]]; then
+  cat <<USAGE
+Usage: omarchy plugin validate <plugin-folder>
+
+Checks a plugin folder's manifest.json against the schema the shell enforces:
+schemaVersion, required fields, safe relative entry points that exist, no
+symlinks, and an id that is not reserved. Exits 0 if valid — handy for plugin
+authors before publishing.
+USAGE
+  exit 0
+fi
+
+command -v jq >/dev/null 2>&1 || fail "jq is required"
+
+PLUGIN_DIR="${1:-}"
+[[ -n $PLUGIN_DIR && -d $PLUGIN_DIR ]] || fail "plugin folder not found: ${PLUGIN_DIR:-<none>}"
+
+MANIFEST="$PLUGIN_DIR/manifest.json"
+[[ -f $MANIFEST ]] || fail "missing manifest.json in $PLUGIN_DIR"
+jq -e . "$MANIFEST" >/dev/null 2>&1 || fail "manifest.json is not valid JSON: $MANIFEST"
+
+# schemaVersion must be exactly the JSON number 1 (the only version the registry
+# understands). jq's == is type-aware, so the string "1" is correctly rejected
+# just as the QML `schemaVersion !== 1` check rejects it.
+jq -e '.schemaVersion == 1' "$MANIFEST" >/dev/null 2>&1 \
+  || fail "unsupported or missing schemaVersion (expected 1) in $MANIFEST"
+
+for field in id name version kinds entryPoints; do
+  jq -e --arg f "$field" 'has($f)' "$MANIFEST" >/dev/null 2>&1 \
+    || fail "manifest missing required field '$field'"
+done
+
+ID=$(jq -r '.id // ""' "$MANIFEST")
+[[ -n $ID ]] || fail "manifest 'id' is empty"
+[[ $ID =~ ^[A-Za-z0-9][A-Za-z0-9._-]*$ ]] || fail "invalid plugin id '$ID'"
+[[ $ID != *"/"* && $ID != *".."* ]] || fail "invalid plugin id '$ID'"
+[[ $ID != omarchy.* ]] || fail "plugin id '$ID' uses the reserved omarchy.* namespace"
+
+# kinds must be a non-empty array.
+jq -e '(.kinds | type) == "array" and (.kinds | length) > 0' "$MANIFEST" >/dev/null 2>&1 \
+  || fail "'kinds' must be a non-empty array"
+
+# entryPoints must be an object and every value a safe relative path that exists.
+jq -e '(.entryPoints | type) == "object"' "$MANIFEST" >/dev/null 2>&1 \
+  || fail "'entryPoints' must be an object"
+
+# Read each entry point as a JSON-encoded string (one per line), then decode it,
+# so a value that itself contains a newline stays one literal path instead of
+# being split into fragments that each pass the checks.
+while IFS= read -r ep_json; do
+  [[ -n $ep_json ]] || continue
+  ep=$(jq -r '.' <<<"$ep_json")
+  [[ -n $ep ]] || fail "entry point path is empty"
+  [[ $ep != *$'\n'* ]] || fail "entry point may not contain a newline"
+  [[ $ep != /* ]] || fail "entry point must be a relative path: '$ep'"
+  [[ $ep != *".."* ]] || fail "entry point may not contain '..': '$ep'"
+  [[ -f "$PLUGIN_DIR/$ep" ]] || fail "entry point file not found: '$ep'"
+done < <(jq -c '.entryPoints | to_entries[] | .value' "$MANIFEST")
+
+# Refuse any symlink anywhere inside the plugin folder. Symlinks could point a
+# copied plugin back at arbitrary files on disk after it lands in the trusted
+# plugins directory.
+link=$(find "$PLUGIN_DIR" -type l -print -quit 2>/dev/null)
+[[ -z $link ]] || fail "symlinks are not allowed inside a plugin folder: $link"
+
+# The whole omarchy.* namespace plus every shipped first-party id is reserved.
+# A third-party plugin claiming one of those ids would be rejected by the shell
+# and could shadow built-in behaviour, so refuse it here too.
+FIRST_PARTY_DIR="${OMARCHY_PATH:-$HOME/.local/share/omarchy}/shell/plugins"
+if [[ -d $FIRST_PARTY_DIR ]]; then
+  while IFS= read -r fp_manifest; do
+    [[ -f $fp_manifest ]] || continue
+    fp_id=$(jq -r '.id // empty' "$fp_manifest" 2>/dev/null || true)
+    [[ $fp_id == "$ID" ]] && fail "plugin id '$ID' collides with a first-party Omarchy plugin"
+  done < <(find "$FIRST_PARTY_DIR" -type f \( -name manifest.json -o -name '*.manifest.json' \) 2>/dev/null)
+fi
+
+exit 0
diff --git a/bin/omarchy-plymouth-preview b/bin/omarchy-plymouth-preview
index b3724f5a..1e36d5d9 100755
--- a/bin/omarchy-plymouth-preview
+++ b/bin/omarchy-plymouth-preview
@@ -7,7 +7,7 @@
 # Render a Plymouth login-screen preview PNG by compositing the staged omarchy
 # theme assets (recolored with the given text color) onto the background.
 
-if [[ $# -ne 4 ]]; then
+if (( $# != 4 )); then
   echo "Usage: omarchy-plymouth-preview <background-hex> <text-hex> <path-to-logo.png> <output-path>" >&2
   exit 1
 fi
@@ -35,7 +35,7 @@ fi
 staging_dir=$(mktemp -d)
 trap 'rm -rf "$staging_dir"' EXIT
 
-find ~/.local/share/omarchy/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} +
+find $OMARCHY_PATH/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} +
 cp "$logo_path" "$staging_dir/logo.png"
 
 for asset in bullet.png entry.png lock.png; do
diff --git a/bin/omarchy-plymouth-reset b/bin/omarchy-plymouth-reset
index 584c8417..551df310 100755
--- a/bin/omarchy-plymouth-reset
+++ b/bin/omarchy-plymouth-reset
@@ -5,7 +5,7 @@
 
 theme_dir="/usr/share/plymouth/themes/omarchy"
 
-sudo find ~/.local/share/omarchy/default/plymouth -maxdepth 1 -type f -exec cp -t "$theme_dir/" {} +
+sudo find $OMARCHY_PATH/default/plymouth -maxdepth 1 -type f -exec cp -t "$theme_dir/" {} +
 sudo plymouth-set-default-theme omarchy
 
 if omarchy-cmd-present limine-mkinitcpio; then
diff --git a/bin/omarchy-plymouth-set b/bin/omarchy-plymouth-set
index c92ca53c..4917c151 100755
--- a/bin/omarchy-plymouth-set
+++ b/bin/omarchy-plymouth-set
@@ -10,7 +10,7 @@
 # rebuilds the initramfs. Also syncs the SDDM login screen (the post-logout
 # screen) with the same colors and logo so boot/login stay visually unified.
 
-if [[ $# -ne 3 ]]; then
+if (( $# != 3 )); then
   echo "Usage: omarchy-plymouth-set <background-hex> <text-hex> <path-to-logo.png>" >&2
   exit 1
 fi
@@ -42,7 +42,7 @@ theme_dir="/usr/share/plymouth/themes/omarchy"
 staging_dir=$(mktemp -d)
 trap 'rm -rf "$staging_dir"' EXIT
 
-find ~/.local/share/omarchy/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} +
+find $OMARCHY_PATH/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} +
 cp "$logo_path" "$staging_dir/logo.png"
 
 sed -i \
@@ -65,7 +65,7 @@ fi
 
 # Sync the SDDM login screen with the same colors and logo.
 sddm_dir="/usr/share/sddm/themes/omarchy"
-sddm_template="$HOME/.local/share/omarchy/default/sddm/omarchy/Main.qml"
+sddm_template="$OMARCHY_PATH/default/sddm/omarchy/Main.qml"
 
 sed \
   -e "s/#1a1b26/#$bg_hex/g" \
diff --git a/bin/omarchy-plymouth-set-by-theme b/bin/omarchy-plymouth-set-by-theme
index d46d5668..52ae33f7 100755
--- a/bin/omarchy-plymouth-set-by-theme
+++ b/bin/omarchy-plymouth-set-by-theme
@@ -7,7 +7,7 @@
 # Resolve a theme by name and apply its unlock.png + colors.toml as the
 # Plymouth boot screen via omarchy-plymouth-set.
 
-if [[ $# -ne 1 ]]; then
+if (( $# != 1 )); then
   echo "Usage: omarchy-plymouth-set-by-theme <theme-name>" >&2
   exit 1
 fi
diff --git a/bin/omarchy-powerprofiles-list b/bin/omarchy-powerprofiles-list
index 093f9c99..73a3d28f 100755
--- a/bin/omarchy-powerprofiles-list
+++ b/bin/omarchy-powerprofiles-list
@@ -1,7 +1,19 @@
 #!/bin/bash
 
 # omarchy:summary=Returns a list of all the available power profiles on the system.
+# omarchy:args=[--active-state]
 
-powerprofilesctl list |
-  awk '/^\s*[* ]\s*[a-zA-Z0-9\-]+:$/ { gsub(/^[*[:space:]]+|:$/,""); print }' |
-  tac
+if [[ ${1:-} != "" && ${1:-} != "--active-state" ]]; then
+  echo "Usage: omarchy-powerprofiles-list [--active-state]" >&2
+  exit 1
+fi
+
+if [[ ${1:-} == "--active-state" ]]; then
+  powerprofilesctl list 2>/dev/null |
+    awk '/^\s*[* ]\s*[a-zA-Z0-9-]+:$/ { active=($1=="*"); gsub(/^[*[:space:]]+|:$/,""); print $0 "\t" (active ? 1 : 0) }' |
+    tac
+else
+  powerprofilesctl list 2>/dev/null |
+    awk '/^\s*[* ]\s*[a-zA-Z0-9-]+:$/ { gsub(/^[*[:space:]]+|:$/,""); print }' |
+    tac
+fi
diff --git a/bin/omarchy-powerprofiles-set b/bin/omarchy-powerprofiles-set
index a7dd623d..bebd18d2 100755
--- a/bin/omarchy-powerprofiles-set
+++ b/bin/omarchy-powerprofiles-set
@@ -11,6 +11,11 @@ action="${1-}"
 # events, and also avoids false negatives from per-port USB-C devices
 # that are present-but-empty (online=0) while another port supplies power.
 if [[ -z $action || $action == "autodetect" ]]; then
+  # On plug/unplug, udev fires the rule before sysfs `online` is updated
+  # on some laptops (notably Lenovo Yoga Pro 7 with USB-C charging). A
+  # short settle delay lets the kernel update before we read state.
+  sleep 0.3
+
   action=battery
   for ps in /sys/class/power_supply/*; do
     [[ -r $ps/online && -r $ps/type ]] || continue
diff --git a/bin/omarchy-refresh-applications b/bin/omarchy-refresh-applications
index 9eb4e9de..875a7426 100755
--- a/bin/omarchy-refresh-applications
+++ b/bin/omarchy-refresh-applications
@@ -1,24 +1,17 @@
 #!/bin/bash
 
-# omarchy:summary=Ensure all default .desktop, web apps, TUIs, and npx wrappers are installed.
-
-mkdir -p ~/.local/share/icons/hicolor/48x48/apps/
-cp ~/.local/share/omarchy/applications/icons/*.png ~/.local/share/icons/hicolor/48x48/apps/
-gtk-update-icon-cache ~/.local/share/icons/hicolor &>/dev/null
+# omarchy:summary=Ensure default application launchers and mise wrappers are installed.
 
 # Copy .desktop declarations
 mkdir -p ~/.local/share/applications
-cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/
-cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/
+cp "$OMARCHY_PATH"/applications/*.desktop ~/.local/share/applications/
 
-if omarchy-cmd-present foot; then
-  cp ~/.local/share/omarchy/default/foot/foot.desktop ~/.local/share/applications/
+if omarchy-cmd-present alacritty; then
+  cp "$OMARCHY_PATH/default/alacritty/Alacritty.desktop" ~/.local/share/applications/
 fi
 
-# Refresh the webapps, TUIs, and npx wrappers
-bash $OMARCHY_PATH/install/packaging/icons.sh
-bash $OMARCHY_PATH/install/packaging/webapps.sh
-bash $OMARCHY_PATH/install/packaging/tuis.sh
-bash $OMARCHY_PATH/install/packaging/npx.sh
+if [[ -f "$OMARCHY_PATH/install/user/mise.sh" ]]; then
+  bash "$OMARCHY_PATH/install/user/mise.sh"
+fi
 
 update-desktop-database ~/.local/share/applications
diff --git a/bin/omarchy-refresh-chromium b/bin/omarchy-refresh-chromium
index f8d13f73..77165837 100755
--- a/bin/omarchy-refresh-chromium
+++ b/bin/omarchy-refresh-chromium
@@ -15,6 +15,9 @@ fi
 # Refresh the Chromium configuration
 omarchy-refresh-config chromium-flags.conf
 
+# Install/refresh the native messaging host used by the yt-dlp extension
+omarchy-install-chromium-ytdlp
+
 # Re-install Google accounts if previously configured
 if [[ $INSTALL_GOOGLE_ACCOUNTS == "true" ]]; then
   omarchy-install-chromium-google-account
diff --git a/bin/omarchy-refresh-config b/bin/omarchy-refresh-config
index 0e46925a..a4dbe6b3 100755
--- a/bin/omarchy-refresh-config
+++ b/bin/omarchy-refresh-config
@@ -1,37 +1,37 @@
 #!/bin/bash
 
-# omarchy:summary=Copies the named config from ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z.
+# omarchy:summary=Copy a shipped user config from /etc/skel/.config into ~/.config (backs up your version).
 # omarchy:args=<config-path>
 
-config_file=$1
+config_file=${1:-}
 
 if [[ -z $config_file ]]; then
   cat <<USAGE
   Usage: $0 [config_file]
 
-  Must provide a file path from the .config directory to be refreshed.
-  To copy ~/.local/share/omarchy/config/hypr/hyprlock.conf to ~/.config/hypr/hyprlock.conf
+  Must provide a file path relative to .config to be refreshed.
+  To copy /etc/skel/.config/hypr/hyprland.lua to ~/.config/hypr/hyprland.lua:
 
-    $0 hypr/hyprlock.conf
+    $0 hypr/hyprland.lua
 USAGE
   exit 1
 fi
 
-# Backup the destination file (with timestamp) to avoid clobbering (Ex: hyprlock.conf.bak.1753817951)
 user_config_file="${HOME}/.config/$config_file"
-default_config_file="${HOME}/.local/share/omarchy/config/$config_file"
+default_config_file="/etc/skel/.config/$config_file"
 backup_config_file="$user_config_file.bak.$(date +%s)"
 
+if [[ ! -e $default_config_file ]]; then
+  echo "Not a shipped user config: $config_file" >&2
+  exit 1
+fi
+
 mkdir -p "$(dirname "$user_config_file")"
 
 if [[ -f $user_config_file ]]; then
-  # Create preliminary backup
-  cp -f "$user_config_file" "$backup_config_file" 2>/dev/null
+  cp -f "$user_config_file" "$backup_config_file"
+  cp -f "$default_config_file" "$user_config_file"
 
-  # Replace config with new default
-  cp -f "$default_config_file" "$user_config_file" 2>/dev/null
-
-  # Compare and delete/inform accordingly
   if cmp -s "$user_config_file" "$backup_config_file"; then
     rm "$backup_config_file"
   else
@@ -39,6 +39,5 @@ if [[ -f $user_config_file ]]; then
     diff "$user_config_file" "$backup_config_file" || true
   fi
 else
-  # Config file did not exist already
-  cp -f "$default_config_file" "$user_config_file" 2>/dev/null
+  cp -f "$default_config_file" "$user_config_file"
 fi
diff --git a/bin/omarchy-refresh-fastfetch b/bin/omarchy-refresh-fastfetch
deleted file mode 100755
index c7988b71..00000000
--- a/bin/omarchy-refresh-fastfetch
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Overwrite the user config for fastfetch with the Omarchy default.
-
-omarchy-refresh-config fastfetch/config.jsonc
diff --git a/bin/omarchy-refresh-hypridle b/bin/omarchy-refresh-hypridle
deleted file mode 100755
index 210e78bf..00000000
--- a/bin/omarchy-refresh-hypridle
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Overwrite the user config for hypridle with the Omarchy default and restart the service.
-
-omarchy-refresh-config hypr/hypridle.conf
-omarchy-restart-hypridle
diff --git a/bin/omarchy-refresh-hyprland b/bin/omarchy-refresh-hyprland
index 58618014..d9f751d3 100755
--- a/bin/omarchy-refresh-hyprland
+++ b/bin/omarchy-refresh-hyprland
@@ -1,11 +1,31 @@
 #!/bin/bash
 
-# omarchy:summary=Overwrite all the user configs in ~/.config/hypr with the Omarchy defaults.
+# omarchy:summary=Overwrite all the user Hyprland Lua configs in ~/.config/hypr with the Omarchy defaults.
 
-omarchy-refresh-config hypr/autostart.conf
-omarchy-refresh-config hypr/bindings.conf
-omarchy-refresh-config hypr/input.conf
-omarchy-refresh-config hypr/looknfeel.conf
-omarchy-refresh-config hypr/hyprland.conf
-omarchy-refresh-config hypr/monitors.conf
-bash "$OMARCHY_PATH/install/config/detect-keyboard-layout.sh"
+omarchy-refresh-config hypr/.luarc.json
+omarchy-refresh-config hypr/autostart.lua
+omarchy-refresh-config hypr/bindings.lua
+omarchy-refresh-config hypr/input.lua
+omarchy-refresh-config hypr/looknfeel.lua
+omarchy-refresh-config hypr/hyprland.lua
+omarchy-refresh-config hypr/monitors.lua
+
+mkdir -p ~/.local/state/omarchy/toggles/hypr
+cp "$OMARCHY_PATH/default/hypr/toggles/flags.lua" ~/.local/state/omarchy/toggles/hypr/
+
+conf=/etc/vconsole.conf
+hyprlua="$HOME/.config/hypr/input.lua"
+if [[ -f $conf && -f $hyprlua ]]; then
+  sed -i '/^[[:space:]]*kb_layout[[:space:]]*=/d' "$hyprlua"
+  sed -i '/^[[:space:]]*kb_variant[[:space:]]*=/d' "$hyprlua"
+
+  if grep -q '^XKBLAYOUT=' "$conf"; then
+    layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
+    sed -i "/^[[:space:]]*kb_options *=/i\    kb_layout = \"$layout\"," "$hyprlua"
+  fi
+
+  if grep -q '^XKBVARIANT=' "$conf"; then
+    variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
+    sed -i "/^[[:space:]]*kb_options *=/i\    kb_variant = \"$variant\"," "$hyprlua"
+  fi
+fi
diff --git a/bin/omarchy-refresh-hyprlock b/bin/omarchy-refresh-hyprlock
deleted file mode 100755
index 1a09c88f..00000000
--- a/bin/omarchy-refresh-hyprlock
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Overwrite the user config for hyprlock with the Omarchy default.
-
-omarchy-refresh-config hypr/hyprlock.conf
diff --git a/bin/omarchy-refresh-limine b/bin/omarchy-refresh-limine
index b2b735cc..c8234278 100755
--- a/bin/omarchy-refresh-limine
+++ b/bin/omarchy-refresh-limine
@@ -11,7 +11,7 @@ echo "Resetting limine config"
 
 sudo mv /boot/limine.conf /boot/limine.conf.bak
 
-sudo cp ~/.local/share/omarchy/default/limine/limine.conf /boot/limine.conf
+sudo cp $OMARCHY_PATH/default/limine/limine.conf /boot/limine.conf
 
 sudo limine-update
 sudo limine-snapper-sync
diff --git a/bin/omarchy-refresh-pacman b/bin/omarchy-refresh-pacman
index fce99ee5..299d6c20 100755
--- a/bin/omarchy-refresh-pacman
+++ b/bin/omarchy-refresh-pacman
@@ -19,5 +19,8 @@ echo
 sudo cp -f "$OMARCHY_PATH/default/pacman/pacman-$channel.conf" /etc/pacman.conf
 sudo cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-$channel" /etc/pacman.d/mirrorlist
 
+# Allow user customization of /etc/pacman.conf before the upgrade runs
+omarchy-hook pre-refresh-pacman
+
 # Reset all package DBs and then update
-sudo pacman -Syyuu --noconfirm
+sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syyuu --noconfirm
diff --git a/bin/omarchy-refresh-plymouth b/bin/omarchy-refresh-plymouth
index 5a9671d7..07feaf78 100755
--- a/bin/omarchy-refresh-plymouth
+++ b/bin/omarchy-refresh-plymouth
@@ -3,7 +3,7 @@
 # omarchy:summary=Overwrite the user config for the Plymouth drive decryption and boot sequence with the Omarchy default and rebuild it.
 # omarchy:requires-sudo=true
 
-sudo cp -r ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
+sudo cp -r $OMARCHY_PATH/default/plymouth/* /usr/share/plymouth/themes/omarchy/
 sudo plymouth-set-default-theme omarchy
 
 if command -v limine-mkinitcpio &>/dev/null; then
diff --git a/bin/omarchy-refresh-shell b/bin/omarchy-refresh-shell
new file mode 100755
index 00000000..c76ed96a
--- /dev/null
+++ b/bin/omarchy-refresh-shell
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# omarchy:summary=Reset shell.json to Omarchy defaults
+# omarchy:examples=omarchy refresh shell
+
+omarchy-refresh-config omarchy/shell.json
+omarchy-restart-shell
diff --git a/bin/omarchy-refresh-swayosd b/bin/omarchy-refresh-swayosd
deleted file mode 100755
index 65820784..00000000
--- a/bin/omarchy-refresh-swayosd
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Overwrite the user configs for swayosd (controls on-screen feedback for changing volume/songs etc) with the Omarchy defaults and restart the service.
-
-omarchy-refresh-config swayosd/config.toml
-omarchy-refresh-config swayosd/style.css
-omarchy-restart-swayosd
diff --git a/bin/omarchy-refresh-walker b/bin/omarchy-refresh-walker
deleted file mode 100755
index 2354144f..00000000
--- a/bin/omarchy-refresh-walker
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Overwrite the user configs for the Walker application launcher (which also powers the Omarchy Menu) and restart the services.
-
-mkdir -p ~/.config/autostart/
-cp $OMARCHY_PATH/default/walker/walker.desktop ~/.config/autostart/
-
-# And restarts if it crashes or is killed
-mkdir -p ~/.config/systemd/user/app-walker@autostart.service.d/
-cp $OMARCHY_PATH/default/walker/restart.conf ~/.config/systemd/user/app-walker@autostart.service.d/restart.conf
-
-systemctl --user daemon-reload
-
-# Refresh configs
-omarchy-refresh-config walker/config.toml
-omarchy-refresh-config elephant/calc.toml
-omarchy-refresh-config elephant/desktopapplications.toml
-
-# Link all elephant menus
-mkdir -p ~/.config/elephant/menus
-for menu in $OMARCHY_PATH/default/elephant/*.lua; do
-  ln -snf "$menu" ~/.config/elephant/menus/"$(basename "$menu")"
-done
-
-# Restart service
-omarchy-restart-walker
diff --git a/bin/omarchy-refresh-waybar b/bin/omarchy-refresh-waybar
deleted file mode 100755
index 62aebde4..00000000
--- a/bin/omarchy-refresh-waybar
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Reset Waybar config to Omarchy defaults
-# omarchy:examples=omarchy refresh waybar
-
-omarchy-refresh-config waybar/config.jsonc
-omarchy-refresh-config waybar/style.css
-omarchy-restart-waybar
diff --git a/bin/omarchy-reinstall b/bin/omarchy-reinstall
index d214188a..e46a6420 100755
--- a/bin/omarchy-reinstall
+++ b/bin/omarchy-reinstall
@@ -5,12 +5,9 @@
 
 set -e
 
-# Attempt to reinstall all default Omarchy packages and reset all the default configs.
+echo -e "This will reinstall all default Omarchy packages and reset default configs.\nWarning: user config changes will be overwritten.\n"
 
-echo -e "This will reinstall all the default Omarchy packages and reset all default configs.\nWarning: All user changes to configs will be lost.\n"
-
-if gum confirm "Are you sure you want to reinstall and lose all config changes?"; then
-  omarchy-reinstall-git
+if gum confirm "Are you sure you want to reinstall and lose config changes?"; then
   omarchy-reinstall-pkgs
   omarchy-reinstall-configs
 
diff --git a/bin/omarchy-reinstall-configs b/bin/omarchy-reinstall-configs
index 8b073cf8..f89b6531 100755
--- a/bin/omarchy-reinstall-configs
+++ b/bin/omarchy-reinstall-configs
@@ -1,24 +1,28 @@
 #!/bin/bash
 
-# omarchy:summary=Reset all Omarchy user configs to the defaults
-# omarchy:requires-sudo=true
+# omarchy:summary=Reset Omarchy user configs and shipped defaults in $HOME (destructive)
 
-set -e
-
-# Overwrite all user configs with the Omarchy defaults.
+set -euo pipefail
 
 if (( EUID == 0 )); then
   echo "Error: This script should not be run as root"
   exit 1
 fi
 
-echo "Resetting all Omarchy configs"
-cp -R ~/.local/share/omarchy/config/* ~/.config/
-cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
-echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' | tee ~/.bash_profile >/dev/null
+echo "Resetting Omarchy user configs to shipped defaults..."
 
-$(bash $OMARCHY_PATH/install/config/theme.sh)
+# /etc/skel is the same tree useradd -m copies to seed a fresh user's $HOME.
+# Replaying it over an existing user resyncs every package-shipped user
+# default in one pass: .bashrc, .config/**, .local/share/applications,
+# nautilus-python extensions, branding, hypr toggles, and migration markers.
+# Trailing dot copies dotfiles; the shell wouldn't glob them with /etc/skel/*.
+cp -af /etc/skel/. ~/
 
 omarchy-refresh-limine
 omarchy-refresh-plymouth
-omarchy-nvim-setup
+
+if omarchy-cmd-present omarchy-nvim-refresh; then
+  omarchy-nvim-refresh
+elif omarchy-cmd-present omarchy-nvim-setup; then
+  omarchy-nvim-setup --force
+fi
diff --git a/bin/omarchy-reinstall-git b/bin/omarchy-reinstall-git
deleted file mode 100755
index 235ee146..00000000
--- a/bin/omarchy-reinstall-git
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Reinstall the Omarchy source directory from git
-
-set -e
-
-# Reinstall the Omarchy configuration directory from the git source.
-
-git clone --depth=1 --branch master "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
-mv $OMARCHY_PATH ~/.local/share/omarchy-old
-mv ~/.local/share/omarchy-new $OMARCHY_PATH
diff --git a/bin/omarchy-reinstall-pkgs b/bin/omarchy-reinstall-pkgs
index dc64a1f3..c1d51cbf 100755
--- a/bin/omarchy-reinstall-pkgs
+++ b/bin/omarchy-reinstall-pkgs
@@ -11,8 +11,8 @@ set -e
 omarchy-refresh-pacman
 
 # Downgrade any packages to the stable setup
-sudo pacman -Suu --noconfirm
+sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Suu --noconfirm
 
 # Ensure all packages are installed
 mapfile -t packages < <(grep -v '^#' "$OMARCHY_PATH/install/omarchy-base.packages" | grep -v '^$')
-sudo pacman -Syu --noconfirm --needed "${packages[@]}"
+sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syu --noconfirm --needed "${packages[@]}"
diff --git a/bin/omarchy-reminder b/bin/omarchy-reminder
index 1dc59097..d1287101 100755
--- a/bin/omarchy-reminder
+++ b/bin/omarchy-reminder
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # omarchy:summary=Set and show lightweight desktop notification reminders
-# omarchy:args=<minutes> [message] | show | clear
-# omarchy:examples=omarchy reminder 5 | omarchy reminder 30 "Check the oven" | omarchy reminder show | omarchy reminder clear
+# omarchy:args=[-i|--interactive] | <minutes> [message] | show [-j|--json] | clear
+# omarchy:examples=omarchy reminder -i | omarchy reminder 5 | omarchy reminder 30 "Check the oven" | omarchy reminder show | omarchy reminder show --json | omarchy reminder clear
 
 set -euo pipefail
 
@@ -20,63 +20,103 @@ format_remaining() {
   fi
 }
 
-parse_systemd_timespan() {
-  local timespan="$1"
-  local total=0
-  local value unit whole
+active_reminder_timers() {
+  local now=${1:-$(date +%s)}
+  local timer next
 
-  while read -r value unit; do
-    whole=${value%.*}
+  while IFS=$'\t' read -r timer next; do
+    [[ -z $timer || -z $next ]] && continue
 
-    case $unit in
-    d) total=$((total + whole * 86400)) ;;
-    h) total=$((total + whole * 3600)) ;;
-    min) total=$((total + whole * 60)) ;;
-    s) total=$((total + whole)) ;;
-    ms | us) ;;
-    esac
-  done < <(grep -oE '[0-9]+([.][0-9]+)?(d|h|min|s|ms|us)' <<<"$timespan" | sed -E 's/^([0-9.]+)([a-z]+)$/\1 \2/')
+    next=$((next / 1000000))
+    ((next <= now)) && continue
 
-  echo "$total"
+    printf "%s\t%s\n" "$timer" "$next"
+  done < <(systemctl --user list-timers --all --output=json "omarchy-reminder-*.timer" 2>/dev/null | jq -r '.[] | [.unit, .next] | @tsv')
+}
+
+refresh_indicator() {
+  omarchy-shell -q omarchy.indicators refresh >/dev/null 2>&1 || true
+}
+
+open_interactive() {
+  omarchy-shell shell summon omarchy.reminders "{}"
 }
 
 show_reminders() {
-  local timers timer next next_seconds uptime remaining body=""
+  local timer next remaining reminder reminder_minutes body=""
   local reminder_dir="${XDG_RUNTIME_DIR:-/tmp}/omarchy-reminders"
   local reminder_message=""
+  local now=$(date +%s)
 
-  timers=$(systemctl --user list-timers --all --no-legend --no-pager "omarchy-reminder-*.timer" 2>/dev/null | awk '{ print $(NF - 1) }')
-  uptime=${SECONDS_SINCE_BOOT:-$(awk '{ print int($1) }' /proc/uptime)}
-
-  for timer in $timers; do
-    next=$(systemctl --user show -P NextElapseUSecMonotonic "$timer" 2>/dev/null || true)
-    [[ -z $next ]] && continue
-
-    next_seconds=$(parse_systemd_timespan "$next")
-    ((next_seconds <= uptime)) && continue
-
-    remaining=$((next_seconds - uptime))
+  while IFS=$'\t' read -r timer next; do
+    remaining=$((next - now))
     reminder=${timer%.timer}
     reminder=${reminder#omarchy-reminder-}
-    set_at=${reminder##*-}
     reminder_minutes=${reminder%%m-*}
     reminder_message=""
     [[ -f $reminder_dir/${timer%.timer}.message ]] && reminder_message=$(<"$reminder_dir/${timer%.timer}.message")
 
     if [[ -n $reminder_message ]]; then
-      body+="$reminder_message in $(format_remaining $remaining) ($(date -d "@$((set_at + reminder_minutes * 60))" +%-H:%M))"$'\n'
+      body+="$reminder_message in $(format_remaining $remaining) ($(date -d "@$next" +%-H:%M))"$'\n'
     else
-      body+="${reminder_minutes}-min reminder in $(format_remaining $remaining) ($(date -d "@$((set_at + reminder_minutes * 60))" +%-H:%M))"$'\n'
+      body+="${reminder_minutes}-min reminder in $(format_remaining $remaining) ($(date -d "@$next" +%-H:%M))"$'\n'
     fi
-  done
+  done < <(active_reminder_timers "$now")
 
   if [[ -z $body ]]; then
-    omarchy-notification-send "󰔛" "Upcoming reminders" "No outstanding reminders" -u low
+    omarchy-notification-send -g 󰢌 "Upcoming reminders" "No outstanding reminders"
   else
-    omarchy-notification-send "󰔛" "Upcoming reminders" "${body%$'\n'}" -u low
+    omarchy-notification-send -g 󰢌 "Upcoming reminders" "${body%$'\n'}"
   fi
 }
 
+show_json() {
+  local timer next remaining reminder reminder_minutes unit reminder_message label item_json reminders_json="[]"
+  local reminder_dir="${XDG_RUNTIME_DIR:-/tmp}/omarchy-reminders"
+  local now=$(date +%s)
+  local count=0
+  local tooltip="Set Reminder"
+
+  while IFS=$'\t' read -r timer next; do
+    count=$((count + 1))
+
+    unit=${timer%.timer}
+    reminder=${unit#omarchy-reminder-}
+    reminder_minutes=${reminder%%m-*}
+    [[ ! $reminder_minutes =~ ^[0-9]+$ ]] && reminder_minutes=0
+    remaining=$((next - now))
+    reminder_message=""
+    [[ -f $reminder_dir/$unit.message ]] && reminder_message=$(<"$reminder_dir/$unit.message")
+
+    if [[ -n $reminder_message ]]; then
+      label=$reminder_message
+    else
+      label="${reminder_minutes}-min reminder"
+    fi
+
+    item_json=$(jq -cn \
+      --arg unit "$unit" \
+      --arg timer "$timer" \
+      --arg label "$label" \
+      --arg message "$reminder_message" \
+      --arg remaining "$(format_remaining "$remaining")" \
+      --arg atTime "$(date -d "@$next" +%-H:%M)" \
+      --argjson minutes "$reminder_minutes" \
+      --argjson at "$next" \
+      --argjson remainingSeconds "$remaining" \
+      '{unit:$unit,timer:$timer,minutes:$minutes,message:$message,label:$label,remaining:$remaining,remainingSeconds:$remainingSeconds,at:$at,atTime:$atTime}')
+    reminders_json=$(jq -cn --argjson reminders "$reminders_json" --argjson item "$item_json" '$reminders + [$item]')
+  done < <(active_reminder_timers "$now")
+
+  if ((count == 1)); then
+    tooltip="1 reminder"
+  elif ((count > 1)); then
+    tooltip="$count reminders"
+  fi
+
+  jq -cn --argjson count "$count" --arg tooltip "$tooltip" --argjson reminders "$reminders_json" '{count:$count,active:($count > 0),tooltip:$tooltip,reminders:$reminders}'
+}
+
 clear_reminders() {
   local units
   local reminder_dir="${XDG_RUNTIME_DIR:-/tmp}/omarchy-reminders"
@@ -88,12 +128,35 @@ clear_reminders() {
   fi
 
   rm -f "$reminder_dir"/omarchy-reminder-*.message 2>/dev/null || true
-  omarchy-notification-send "󰔛" "All reminders have been cleared" -u low
+  refresh_indicator
+  omarchy-notification-send -g 󰢌 "All reminders have been cleared"
+}
+
+usage() {
+  echo "Usage: omarchy-reminder [-i|--interactive]"
+  echo "       omarchy-reminder <minutes> [message]"
+  echo "       omarchy-reminder show [-j|--json]"
+  echo "       omarchy-reminder clear"
 }
 
 case ${1:-} in
+-i | --interactive)
+  open_interactive
+  exit 0
+  ;;
 show | list)
-  show_reminders
+  case ${2:-} in
+  -j | --json)
+    show_json
+    ;;
+  "")
+    show_reminders
+    ;;
+  *)
+    usage
+    exit 1
+    ;;
+  esac
   exit 0
   ;;
 clear)
@@ -108,9 +171,7 @@ message="$*"
 custom_message="$message"
 
 if [[ -z $minutes ]] || [[ ! $minutes =~ ^[0-9]+$ ]] || ((minutes == 0)); then
-  echo "Usage: omarchy-reminder <minutes> [message]"
-  echo "       omarchy-reminder show"
-  echo "       omarchy-reminder clear"
+  usage
   exit 1
 fi
 
@@ -134,6 +195,7 @@ if [[ -n $custom_message ]]; then
 fi
 
 systemd-run --user --quiet --collect --on-active="${minutes}m" --unit="$unit" \
-  bash -c 'omarchy-notification-send "󰔛" "Reminder" "$1" -u critical; rm -f "$2"' bash "$message" "$message_file"
+  bash -c 'omarchy-notification-send -g 󰢌 "Reminder" "$1"; rm -f "$2"; omarchy-shell -q omarchy.indicators refresh >/dev/null 2>&1 || true' bash "$message" "$message_file"
 
-omarchy-notification-send "󰔛" "$confirmation_title" "$confirmation" -u low
+refresh_indicator
+omarchy-notification-send -g 󰢌 "$confirmation_title" "$confirmation"
diff --git a/bin/omarchy-remove-browser b/bin/omarchy-remove-browser
index 6ae076df..b459d6ae 100755
--- a/bin/omarchy-remove-browser
+++ b/bin/omarchy-remove-browser
@@ -9,7 +9,7 @@ set_fallback_default_browser() {
   local current_browser
   current_browser=$(xdg-settings get default-web-browser)
 
-  if [[ $current_browser != "$1" ]]; then
+  if [[ $current_browser != $1 ]]; then
     return
   fi
 
diff --git a/bin/omarchy-remove-gaming-battlenet b/bin/omarchy-remove-gaming-battlenet
new file mode 100755
index 00000000..9a7f6b91
--- /dev/null
+++ b/bin/omarchy-remove-gaming-battlenet
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# omarchy:summary=Remove Battle.net, its Proton prefix, installed games, and desktop entry.
+
+set -e
+
+PREFIX="$HOME/Games/battlenet"
+
+# Stop any running Battle.net / wine processes tied to this prefix.
+pkill -f "$PREFIX" 2>/dev/null || true
+sleep 1
+
+rm -rf "$PREFIX"
+rm -f "$HOME/.local/share/applications/battlenet.desktop"
+rm -f "$HOME/.cache/omarchy/Battle.net-Setup.exe"
+update-desktop-database "$HOME/.local/share/applications" 2>/dev/null || true
+
+echo
+echo "Battle.net and its Proton prefix at $PREFIX have been removed."
+
+if omarchy-pkg-present umu-launcher; then
+  echo
+  read -rp "Also remove umu-launcher? It's only used by this command. [y/N] " reply
+  if [[ $reply =~ ^[Yy]$ ]]; then
+    omarchy-pkg-drop umu-launcher
+  fi
+fi
+
+PROTON_DIR="$HOME/.local/share/Steam/compatibilitytools.d"
+if compgen -G "$PROTON_DIR/GE-Proton*" >/dev/null; then
+  echo
+  read -rp "Also remove GE-Proton runtimes downloaded by umu? [y/N] " reply
+  if [[ $reply =~ ^[Yy]$ ]]; then
+    rm -rf "$PROTON_DIR"/GE-Proton*
+    rm -rf "$HOME/.local/share/umu"
+  fi
+fi
diff --git a/bin/omarchy-remove-gaming-geforce-now b/bin/omarchy-remove-gaming-geforce-now
index 9947ee10..c7d37444 100755
--- a/bin/omarchy-remove-gaming-geforce-now
+++ b/bin/omarchy-remove-gaming-geforce-now
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 # omarchy:summary=Remove the GeForce NOW Flatpak app and its data.
+# omarchy:group=remove
+# omarchy:name=gaming geforce-now
 
 set -e
 
diff --git a/bin/omarchy-remove-gaming-moonlight b/bin/omarchy-remove-gaming-moonlight
deleted file mode 100755
index 9cb951de..00000000
--- a/bin/omarchy-remove-gaming-moonlight
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove Moonlight and its configs and caches.
-# omarchy:requires-sudo=true
-
-set -e
-
-omarchy-pkg-drop moonlight-qt
-
-rm -rf \
-  "$HOME/.config/Moonlight Game Streaming Project" \
-  "$HOME/.cache/Moonlight Game Streaming Project"
-
-echo ""
-echo "Moonlight and its data have been removed."
diff --git a/bin/omarchy-remove-gaming-xbox-controllers b/bin/omarchy-remove-gaming-xbox-controllers
index d20af7e6..d841b128 100755
--- a/bin/omarchy-remove-gaming-xbox-controllers
+++ b/bin/omarchy-remove-gaming-xbox-controllers
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 # omarchy:summary=Remove the xpadneo Xbox controller driver and undo its module/blacklist config.
+# omarchy:group=remove
+# omarchy:name=gaming xbox-controllers
 # omarchy:requires-sudo=true
 
 set -e
diff --git a/bin/omarchy-remove-launcher-entry b/bin/omarchy-remove-launcher-entry
new file mode 100755
index 00000000..2e18f3a3
--- /dev/null
+++ b/bin/omarchy-remove-launcher-entry
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# omarchy:summary=Remove or uninstall the selected launcher entry
+# omarchy:args=<desktop-id> <name>
+# omarchy:hidden=true
+# omarchy:requires-sudo=true
+
+set -e
+
+desktop_id="${1-}"
+entry_name="${2-}"
+
+if [[ -z $desktop_id ]]; then
+  echo "Usage: omarchy-remove-launcher-entry <desktop-id> <name>" >&2
+  exit 1
+fi
+
+desktop_file_name="$desktop_id"
+if [[ $desktop_file_name != *.desktop ]]; then
+  desktop_file_name="$desktop_file_name.desktop"
+fi
+
+desktop_dirs=()
+if [[ -n ${XDG_DATA_HOME-} ]]; then
+  desktop_dirs+=("$XDG_DATA_HOME/applications")
+else
+  desktop_dirs+=("$HOME/.local/share/applications")
+fi
+
+if [[ -n ${XDG_DATA_DIRS-} ]]; then
+  IFS=: read -ra data_dirs <<<"$XDG_DATA_DIRS"
+  for data_dir in "${data_dirs[@]}"; do
+    desktop_dirs+=("$data_dir/applications")
+  done
+else
+  desktop_dirs+=("/usr/local/share/applications" "/usr/share/applications")
+fi
+
+desktop_file=""
+for dir in "${desktop_dirs[@]}"; do
+  candidate="$dir/$desktop_file_name"
+  if [[ -f $candidate ]]; then
+    desktop_file="$candidate"
+    break
+  fi
+done
+
+if [[ -z $desktop_file ]]; then
+  echo "Could not find launcher entry: $desktop_file_name" >&2
+  exit 1
+fi
+
+desktop_name="${desktop_file##*/}"
+desktop_name="${desktop_name%.desktop}"
+exec_line="$(sed -n 's/^Exec=//p' "$desktop_file" | head -1)"
+
+if [[ $exec_line =~ omarchy-launch-webapp|omarchy-webapp-handler ]]; then
+  omarchy-webapp-remove "$desktop_name"
+  exit 0
+fi
+
+if [[ $exec_line =~ (^|[[:space:]])(\$TERMINAL|xdg-terminal-exec)[[:space:]].*-e([[:space:]]|$) ]]; then
+  omarchy-tui-remove "$desktop_name"
+  exit 0
+fi
+
+if package_name="$(pacman -Qqo "$desktop_file" 2>/dev/null | head -1)" && [[ -n $package_name ]]; then
+  display_name="${entry_name:-$desktop_name}"
+  quoted_package="$(printf '%q' "$package_name")"
+  quoted_display="$(printf '%q' "$display_name")"
+  exec omarchy-launch-floating-terminal-with-presentation "echo Uninstalling $quoted_display...; sudo pacman -Rns $quoted_package"
+fi
+
+if command -v flatpak >/dev/null 2>&1 && flatpak info "${desktop_file_name%.desktop}" >/dev/null 2>&1; then
+  flatpak_id="${desktop_file_name%.desktop}"
+  quoted_flatpak="$(printf '%q' "$flatpak_id")"
+  exec omarchy-launch-floating-terminal-with-presentation "flatpak uninstall $quoted_flatpak"
+fi
+
+echo "Don't know how to uninstall $desktop_file_name" >&2
+exit 1
diff --git a/bin/omarchy-remove-preinstalls b/bin/omarchy-remove-preinstalls
index fc5eae72..b74458b9 100755
--- a/bin/omarchy-remove-preinstalls
+++ b/bin/omarchy-remove-preinstalls
@@ -8,13 +8,14 @@ if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI w
   omarchy-webapp-remove-all
   omarchy-tui-remove-all
 
-  cp ~/.config/hypr/bindings.conf ~/.config/hypr/bindings.conf.bak
-  cp "$OMARCHY_PATH/default/hypr/plain-bindings.conf" ~/.config/hypr/bindings.conf
+  [[ -f ~/.config/hypr/bindings.lua ]] && cp ~/.config/hypr/bindings.lua ~/.config/hypr/bindings.lua.bak
+  cp "$OMARCHY_PATH/default/hypr/plain-bindings.lua" ~/.config/hypr/bindings.lua
   hyprctl reload
 
-  # Remove npx stubs
-  rm -f ~/.local/bin/codex ~/.local/bin/gemini ~/.local/bin/copilot \
-       ~/.local/bin/opencode ~/.local/bin/playwright-cli ~/.local/bin/pi
+  # Remove mise stubs
+  rm -f ~/.local/bin/codex ~/.local/bin/claude ~/.local/bin/gemini ~/.local/bin/copilot \
+       ~/.local/bin/gh ~/.local/bin/opencode ~/.local/bin/playwright ~/.local/bin/playwright-cli ~/.local/bin/pi \
+       ~/.local/bin/ghui ~/.local/bin/hunk
 
   omarchy-pkg-drop \
     aether \
@@ -22,7 +23,7 @@ if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI w
     typora \
     spotify \
     libreoffice-fresh \
-    1password-beta \
+    1password \
     1password-cli \
     xournalpp \
     signal-desktop \
@@ -32,5 +33,6 @@ if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI w
     kdenlive \
     lazydocker \
     opencode \
-    claude-code
+    claude-code \
+    github-cli
 fi
diff --git a/bin/omarchy-remove-security-fingerprint b/bin/omarchy-remove-security-fingerprint
index 1bbc7982..cdb54387 100755
--- a/bin/omarchy-remove-security-fingerprint
+++ b/bin/omarchy-remove-security-fingerprint
@@ -20,16 +20,18 @@ remove_pam_config() {
   fi
 }
 
-remove_hyprlock_fingerprint_icon() {
-  echo "Removing fingerprint icon from hyprlock placeholder text..."
-  sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
-  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = false/' ~/.config/hypr/hyprlock.conf
+remove_lock_fingerprint_pam() {
+  if [[ -f /etc/pam.d/omarchy-lock-fingerprint ]]; then
+    echo "Removing lock screen fingerprint authentication..."
+    sudo rm -f /etc/pam.d/omarchy-lock-fingerprint
+  fi
 }
 
+
 echo -e "\e[32mRemoving fingerprint scanner from authentication.\n\e[0m"
 
 remove_pam_config
-remove_hyprlock_fingerprint_icon
+remove_lock_fingerprint_pam
 
 echo "Removing fingerprint packages..."
 omarchy-pkg-drop fprintd libfprint-git
diff --git a/bin/omarchy-remove-service-1password b/bin/omarchy-remove-service-1password
new file mode 100755
index 00000000..9aaed45a
--- /dev/null
+++ b/bin/omarchy-remove-service-1password
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# omarchy:summary=Remove 1Password and its Chromium extension.
+# omarchy:requires-sudo=true
+
+EXTENSION_ID="aeblfdkhhhdcdjpifhhbdiojplfjncoa"
+EXTENSION_FILE="/usr/share/chromium/extensions/$EXTENSION_ID.json"
+
+sudo rm -f "$EXTENSION_FILE"
+omarchy-pkg-drop 1password 1password-cli
+
+echo ""
+echo "1Password has been removed."
diff --git a/bin/omarchy-remove-service-dropbox b/bin/omarchy-remove-service-dropbox
new file mode 100644
index 00000000..c94c2a71
--- /dev/null
+++ b/bin/omarchy-remove-service-dropbox
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# omarchy:summary=Remove Dropbox and its bar plugin.
+# omarchy:requires-sudo=true
+
+dropbox-cli stop 2>/dev/null || true
+omarchy-config-shell-bar drop omarchy.dropbox
+omarchy-pkg-drop dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
+
+echo ""
+echo "Dropbox has been removed."
diff --git a/bin/omarchy-remove-service-sunshine b/bin/omarchy-remove-service-sunshine
new file mode 100755
index 00000000..e9976222
--- /dev/null
+++ b/bin/omarchy-remove-service-sunshine
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# omarchy:summary=Remove Sunshine and close Omarchy-managed Moonlight streaming ports.
+# omarchy:requires-sudo=true
+
+set -e
+
+TCP_PORTS=(47984 47989 48010)
+UDP_PORTS=(5353 47998 47999 48000 48002 48010)
+PRIVATE_CIDRS=(10.0.0.0/8 172.16.0.0/12 192.168.0.0/16)
+SUNSHINE_ADMIN_APP="Sunshine Admin"
+HYPR_AUTOSTART_FILE="$HOME/.config/hypr/autostart.lua"
+HYPR_AUTOSTART_ENTRY='o.launch_on_start("sunshine")'
+
+delete_ufw_rule() {
+  sudo ufw --force delete "$@" >/dev/null 2>&1 || true
+}
+
+close_ufw_port_for_private_lans() {
+  local proto="$1"
+  local port="$2"
+  local cidr
+
+  for cidr in "${PRIVATE_CIDRS[@]}"; do
+    delete_ufw_rule allow in proto "$proto" from "$cidr" to any port "$port"
+  done
+}
+
+close_ufw_port_for_tailscale() {
+  local proto="$1"
+  local port="$2"
+
+  delete_ufw_rule allow in on tailscale0 to any port "$port" proto "$proto"
+}
+
+close_ufw_ports() {
+  local port
+
+  if omarchy-cmd-missing ufw; then
+    return
+  fi
+
+  for port in "${TCP_PORTS[@]}"; do
+    close_ufw_port_for_private_lans tcp "$port"
+    close_ufw_port_for_tailscale tcp "$port"
+  done
+
+  for port in "${UDP_PORTS[@]}"; do
+    close_ufw_port_for_private_lans udp "$port"
+    close_ufw_port_for_tailscale udp "$port"
+  done
+
+  sudo ufw reload
+}
+
+disable_hyprland_autostart() {
+  if [[ -f $HYPR_AUTOSTART_FILE ]]; then
+    sed -i "\|^$HYPR_AUTOSTART_ENTRY$|d" "$HYPR_AUTOSTART_FILE"
+  fi
+}
+
+systemctl --user disable --now sunshine 2>/dev/null || true
+omarchy-pkg-drop sunshine
+omarchy-webapp-remove "$SUNSHINE_ADMIN_APP" 2>/dev/null || true
+disable_hyprland_autostart
+close_ufw_ports
+
+echo ""
+echo "Sunshine has been removed and its Omarchy-managed Moonlight streaming ports have been closed."
diff --git a/bin/omarchy-remove-service-tailscale b/bin/omarchy-remove-service-tailscale
new file mode 100644
index 00000000..1fa4e321
--- /dev/null
+++ b/bin/omarchy-remove-service-tailscale
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# omarchy:summary=Remove Tailscale and its bar plugin.
+# omarchy:requires-sudo=true
+
+tailscale down 2>/dev/null || true
+sudo systemctl disable --now tailscaled.service 2>/dev/null || true
+omarchy-config-shell-bar drop omarchy.tailscale
+omarchy-webapp-remove "Tailscale" 2>/dev/null || true
+omarchy-pkg-drop tailscale
+
+echo ""
+echo "Tailscale has been removed."
diff --git a/bin/omarchy-restart-audio b/bin/omarchy-restart-audio
new file mode 100755
index 00000000..c0ef0286
--- /dev/null
+++ b/bin/omarchy-restart-audio
@@ -0,0 +1,225 @@
+#!/bin/bash
+
+# omarchy:summary=Restart audio services and recover stuck USB audio devices.
+# omarchy:examples=omarchy restart audio | omarchy-restart-audio
+
+services=(wireplumber.service pipewire.service pipewire-pulse.service)
+
+restart_audio_services() {
+  echo -e "Restarting audio services...\n"
+
+  if timeout 25s systemctl --user restart "${services[@]}"; then
+    return 0
+  fi
+
+  echo -e "\nAudio services did not restart cleanly. Forcing stuck services down...\n"
+  systemctl --user cancel >/dev/null 2>&1 || true
+  systemctl --user kill --kill-whom=all --signal=KILL "${services[@]}" >/dev/null 2>&1 || true
+  systemctl --user reset-failed "${services[@]}" >/dev/null 2>&1 || true
+
+  timeout 25s systemctl --user start pipewire.service pipewire-pulse.service wireplumber.service
+}
+
+wpctl_healthy() {
+  timeout 5s wpctl status >/dev/null 2>&1
+}
+
+usb_device_for_card() {
+  local card="$1"
+  local path
+
+  path=$(readlink -f "/sys/class/sound/card$card" 2>/dev/null) || return 1
+
+  while [[ $path != "/" ]]; do
+    if [[ -f $path/idVendor && -f $path/idProduct && -f $path/busnum && -f $path/devnum ]]; then
+      basename "$path"
+      return 0
+    fi
+
+    path=$(dirname "$path")
+  done
+
+  return 1
+}
+
+append_unique() {
+  local value="$1"
+  shift
+  local existing
+
+  [[ -z $value ]] && return
+
+  for existing in "$@"; do
+    [[ $existing == "$value" ]] && return
+  done
+
+  printf '%s\n' "$value"
+}
+
+audio_process_blocked_on_usb() {
+  local pid
+  local name
+  local wchan
+
+  for pid in /proc/[0-9]*; do
+    [[ -r $pid/comm && -r $pid/wchan ]] || continue
+
+    name=$(cat "$pid/comm" 2>/dev/null || true)
+    [[ $name == "wireplumber" || $name == "pipewire" ]] || continue
+
+    wchan=$(cat "$pid/wchan" 2>/dev/null || true)
+    [[ $wchan == usb_* || $wchan == *usb* ]] && return 0
+  done
+
+  return 1
+}
+
+usb_audio_devices() {
+  local card
+  local device
+  local devices=()
+  local unique
+
+  for card in /sys/class/sound/card*; do
+    [[ -e $card && $card =~ /card([0-9]+)$ ]] || continue
+
+    device=$(usb_device_for_card "${BASH_REMATCH[1]}" || true)
+    unique=$(append_unique "$device" "${devices[@]}")
+    [[ -n $unique ]] && devices+=("$unique")
+  done
+
+  printf '%s\n' "${devices[@]}"
+}
+
+clear_usb_audio_defaults() {
+  local state_dir="${XDG_STATE_HOME:-$HOME/.local/state}/wireplumber"
+
+  [[ -d $state_dir ]] || return 0
+
+  if [[ -f $state_dir/default-nodes ]]; then
+    cp "$state_dir/default-nodes" "$state_dir/default-nodes.bak.$(date +%s)" 2>/dev/null || true
+    sed -i \
+      -e '/^default\.configured\.audio\.sink=alsa_output\.usb-/d' \
+      -e '/^default\.configured\.audio\.sink\.[0-9]\+=alsa_output\.usb-/d' \
+      "$state_dir/default-nodes" 2>/dev/null || true
+  fi
+
+  if [[ -f $state_dir/default-routes ]]; then
+    cp "$state_dir/default-routes" "$state_dir/default-routes.bak.$(date +%s)" 2>/dev/null || true
+    sed -i '/^alsa_card\.usb-/d' "$state_dir/default-routes" 2>/dev/null || true
+  fi
+}
+
+stuck_usb_audio_devices() {
+  local status
+  local state
+  local owner_pid
+  local owner_name
+  local card
+  local device
+  local devices=()
+  local unique
+
+  for status in /proc/asound/card*/pcm*p/sub*/status; do
+    [[ -e $status ]] || continue
+
+    state=$(awk '/^state:/ { print $2; exit }' "$status")
+    [[ $state == "SETUP" ]] || continue
+
+    owner_pid=$(awk '/^owner_pid[[:space:]]*:/ { print $3; exit }' "$status")
+    [[ -n $owner_pid && -r /proc/$owner_pid/comm ]] || continue
+
+    owner_name=$(cat "/proc/$owner_pid/comm" 2>/dev/null || true)
+    [[ $owner_name == "wireplumber" || $owner_name == "pipewire" ]] || continue
+    [[ $status =~ /card([0-9]+)/ ]] || continue
+
+    card="${BASH_REMATCH[1]}"
+    device=$(usb_device_for_card "$card" || true)
+    unique=$(append_unique "$device" "${devices[@]}")
+    [[ -n $unique ]] && devices+=("$unique")
+  done
+
+  printf '%s\n' "${devices[@]}"
+}
+
+reset_usb_audio_device() {
+  local device="$1"
+  local sysfs="/sys/bus/usb/devices/$device"
+  local busnum
+  local devnum
+  local bus_device
+  local product
+
+  [[ -d $sysfs ]] || return 1
+
+  if ! omarchy-cmd-present usbreset; then
+    echo "usbreset is not installed; replug or power-cycle $device to recover it."
+    return 1
+  fi
+
+  busnum=$(cat "$sysfs/busnum" 2>/dev/null) || return 1
+  devnum=$(cat "$sysfs/devnum" 2>/dev/null) || return 1
+  product=$(cat "$sysfs/product" 2>/dev/null || echo "$device")
+  bus_device=$(printf '%03d/%03d' "$busnum" "$devnum")
+
+  echo -e "\nResetting stuck USB audio device: $product ($bus_device)..."
+
+  if timeout 25s sudo usbreset "$bus_device"; then
+    return 0
+  fi
+
+  echo "Could not reset $product automatically. Replug or power-cycle it, then run omarchy-restart-audio again."
+  return 1
+}
+
+recover_stuck_usb_audio() {
+  local devices=()
+  local device
+  local detected=()
+  local reset_count=0
+
+  while IFS= read -r device; do
+    [[ -n $device ]] && detected+=("$device")
+  done < <(stuck_usb_audio_devices)
+
+  if (( ${#detected[@]} == 0 )) && audio_process_blocked_on_usb; then
+    echo "Audio service is blocked in USB I/O; resetting USB audio devices..."
+    clear_usb_audio_defaults
+    while IFS= read -r device; do
+      [[ -n $device ]] && detected+=("$device")
+    done < <(usb_audio_devices)
+  fi
+
+  for device in "${detected[@]}"; do
+    [[ -n $(append_unique "$device" "${devices[@]}") ]] && devices+=("$device")
+  done
+
+  (( ${#devices[@]} > 0 )) || return 1
+
+  for device in "${devices[@]}"; do
+    reset_usb_audio_device "$device" && reset_count=$((reset_count + 1))
+  done
+
+  (( reset_count > 0 ))
+}
+
+restart_audio_services || true
+
+if ! wpctl_healthy; then
+  echo -e "\nPipeWire is still not responding. Checking for stuck USB audio devices..."
+
+  if recover_stuck_usb_audio; then
+    echo -e "\nRestarting audio services after USB audio reset...\n"
+    restart_audio_services || true
+  else
+    echo "No stuck USB audio device was detected automatically."
+  fi
+fi
+
+sleep 2
+
+echo -e "\nAudio status:\n"
+if ! timeout 5s wpctl status; then
+  echo "Audio services are still not responding. Try replugging or power-cycling the selected USB audio device."
+  exit 1
+fi
diff --git a/bin/omarchy-restart-hypridle b/bin/omarchy-restart-hypridle
deleted file mode 100755
index 0ea7776c..00000000
--- a/bin/omarchy-restart-hypridle
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Restart the hypridle service (used for idle detection and auto-lock).
-
-omarchy-restart-app hypridle
diff --git a/bin/omarchy-restart-mako b/bin/omarchy-restart-mako
deleted file mode 100755
index 3cb6a6a2..00000000
--- a/bin/omarchy-restart-mako
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Reload mako configuration (used by the Omarchy theme switching).
-
-makoctl reload
diff --git a/bin/omarchy-restart-pipewire b/bin/omarchy-restart-pipewire
deleted file mode 100755
index f69be512..00000000
--- a/bin/omarchy-restart-pipewire
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Restart the PipeWire audio service to fix audio issues or apply new configuration.
-
-echo -e "Restarting PipeWire audio services...\n"
-systemctl --user restart wireplumber.service pipewire.service
-
-if systemctl --user --quiet is-active pipewire-pulse.service; then
-  systemctl --user restart pipewire-pulse.service
-fi
diff --git a/bin/omarchy-restart-shell b/bin/omarchy-restart-shell
new file mode 100755
index 00000000..908c65c5
--- /dev/null
+++ b/bin/omarchy-restart-shell
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# omarchy:summary=Restart the Omarchy shell
+# omarchy:examples=omarchy restart shell
+
+omarchy_root="${OMARCHY_PATH:-/usr/share/omarchy}"
+if [[ ! -f $omarchy_root/shell/shell.qml && -f /usr/share/omarchy/shell/shell.qml ]]; then
+  omarchy_root=/usr/share/omarchy
+fi
+
+CONFIG_DIR="$omarchy_root/shell"
+[[ -f $CONFIG_DIR/shell.qml ]] || { echo "Omarchy shell config not found: $CONFIG_DIR" >&2; exit 1; }
+
+export OMARCHY_PATH="$omarchy_root"
+export PATH="$omarchy_root/bin:/usr/local/bin:/usr/bin:/bin:$PATH"
+
+omarchy_shell_bin=/usr/bin/omarchy-shell
+[[ -x $omarchy_shell_bin ]] || omarchy_shell_bin=omarchy-shell
+
+if [[ $("$omarchy_shell_bin" lock isLocked 2>/dev/null || true) == "true" ]]; then
+  echo "Refusing to restart Omarchy shell while the session is locked." >&2
+  exit 1
+fi
+
+pkill -x quickshell 2>/dev/null || true
+sleep 0.2
+setsid quickshell -n -p "$CONFIG_DIR" >/dev/null 2>&1 &
diff --git a/bin/omarchy-restart-swayosd b/bin/omarchy-restart-swayosd
deleted file mode 100755
index 06b3204f..00000000
--- a/bin/omarchy-restart-swayosd
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Restart the SwayOSD server
-
-systemctl --user daemon-reload
-systemctl --user stop swayosd-server.service || true
-pkill -x swayosd-server || true
-systemctl --user reset-failed swayosd-server.service || true
-systemctl --user enable --now swayosd-server.service
diff --git a/bin/omarchy-restart-walker b/bin/omarchy-restart-walker
deleted file mode 100755
index b4326998..00000000
--- a/bin/omarchy-restart-walker
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Restart Walker and related user services
-
-restart_services() {
-  if systemctl --user is-enabled elephant.service &>/dev/null; then
-    systemctl --user restart elephant.service
-  fi
-
-  if systemctl --user is-enabled app-walker@autostart.service &>/dev/null; then
-    systemctl --user restart app-walker@autostart.service
-  else
-    echo -e "\e[31mUnable to restart Walker -- RESTART MANUALLY\e[0m"
-  fi
-}
-
-if (( EUID == 0 )); then
-  SCRIPT_OWNER=$(stat -c '%U' "$0")
-  USER_UID=$(id -u "$SCRIPT_OWNER")
-  systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
-    bash -c "$(declare -f restart_services); restart_services"
-else
-  restart_services
-fi
diff --git a/bin/omarchy-restart-waybar b/bin/omarchy-restart-waybar
deleted file mode 100755
index 3a2f4203..00000000
--- a/bin/omarchy-restart-waybar
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Restart Waybar
-# omarchy:examples=omarchy restart waybar
-
-pkill -9 -x waybar
-setsid uwsm-app -- waybar >/dev/null 2>&1 &
diff --git a/bin/omarchy-restart-wifi b/bin/omarchy-restart-wifi
index 1a177c33..64f85a72 100755
--- a/bin/omarchy-restart-wifi
+++ b/bin/omarchy-restart-wifi
@@ -3,5 +3,9 @@
 # omarchy:summary=Unblock and restart the Wi-Fi service.
 
 echo -e "Unblocking wifi...\n"
+
 rfkill unblock wifi
+nmcli networking on
+nmcli radio wifi on
+nmcli device wifi rescan 2>/dev/null || true
 rfkill list wifi
diff --git a/bin/omarchy-screensaver b/bin/omarchy-screensaver
index 536ae0e3..040d772a 100755
--- a/bin/omarchy-screensaver
+++ b/bin/omarchy-screensaver
@@ -7,9 +7,9 @@ screensaver_in_focus() {
 }
 
 exit_screensaver() {
-  hyprctl keyword cursor:invisible false &>/dev/null || true
+  hyprctl eval 'hl.config({ cursor = { invisible = false } })' &>/dev/null || hyprctl keyword cursor:invisible false &>/dev/null || true
   pkill -x tte 2>/dev/null
-  pkill -f org.omarchy.screensaver 2>/dev/null
+  pkill -f '[o]rg.omarchy.screensaver' 2>/dev/null
   exit 0
 }
 
@@ -18,7 +18,7 @@ trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
 
 printf '\033]11;rgb:00/00/00\007'  # Set background color to black
 
-hyprctl keyword cursor:invisible true &>/dev/null
+hyprctl eval 'hl.config({ cursor = { invisible = true } })' &>/dev/null || hyprctl keyword cursor:invisible true &>/dev/null
 
 tty=$(tty 2>/dev/null)
 
diff --git a/bin/omarchy-setup-dns b/bin/omarchy-setup-dns
deleted file mode 100755
index b62e0610..00000000
--- a/bin/omarchy-setup-dns
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Configure the system DNS provider
-# omarchy:args=[Cloudflare|Google|DHCP|Custom]
-# omarchy:requires-sudo=true
-
-lock_dns_to_resolved() {
-  for file in /etc/systemd/network/*.network; do
-    [[ -f $file ]] || continue
-    if ! grep -q "^\[DHCPv4\]" "$file"; then continue; fi
-
-    if ! sed -n '/^\[DHCPv4\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
-      sudo sed -i '/^\[DHCPv4\]/a UseDNS=no' "$file"
-    fi
-
-    if grep -q "^\[IPv6AcceptRA\]" "$file" && ! sed -n '/^\[IPv6AcceptRA\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
-      sudo sed -i '/^\[IPv6AcceptRA\]/a UseDNS=no' "$file"
-    fi
-  done
-}
-
-unlock_dns_to_dhcp() {
-  for file in /etc/systemd/network/*.network; do
-    [[ -f $file ]] || continue
-    sudo sed -i '/^\[DHCPv4\]/{n;/^UseDNS=no$/d}' "$file"
-    sudo sed -i '/^\[IPv6AcceptRA\]/{n;/^UseDNS=no$/d}' "$file"
-  done
-}
-
-if [[ -z $1 ]]; then
-  dns=$(gum choose --height 6 --header "Select DNS provider" Cloudflare Google DHCP Custom)
-else
-  dns=$1
-fi
-
-case "$dns" in
-Cloudflare)
-  sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
-[Resolve]
-DNS=1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com 2606:4700:4700::1111#cloudflare-dns.com 2606:4700:4700::1001#cloudflare-dns.com
-FallbackDNS=9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
-DNSOverTLS=opportunistic
-EOF
-  lock_dns_to_resolved
-  ;;
-
-Google)
-  sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
-[Resolve]
-DNS=8.8.8.8#dns.google 8.8.4.4#dns.google 2001:4860:4860::8888#dns.google 2001:4860:4860::8844#dns.google
-FallbackDNS=9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
-DNSOverTLS=opportunistic
-EOF
-  lock_dns_to_resolved
-  ;;
-
-DHCP)
-  sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
-[Resolve]
-DNSOverTLS=no
-EOF
-  unlock_dns_to_dhcp
-  ;;
-
-Custom)
-  echo "Enter your DNS servers (space-separated, e.g. '192.168.1.1 1.1.1.1'):"
-  read -r dns_servers
-
-  if [[ -z $dns_servers ]]; then
-    echo "Error: No DNS servers provided."
-    exit 1
-  fi
-
-  sudo tee /etc/systemd/resolved.conf >/dev/null <<EOF
-[Resolve]
-DNS=$dns_servers
-FallbackDNS=9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
-EOF
-  lock_dns_to_resolved
-  ;;
-esac
-
-sudo systemctl restart systemd-networkd systemd-resolved
diff --git a/bin/omarchy-setup-hardware b/bin/omarchy-setup-hardware
new file mode 100755
index 00000000..d1255754
--- /dev/null
+++ b/bin/omarchy-setup-hardware
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# omarchy:summary=Apply Omarchy hardware-specific packages and system configuration
+# omarchy:group=setup
+# omarchy:requires-sudo=true
+# omarchy:examples=omarchy setup hardware --install-user dhh
+
+set -euo pipefail
+
+usage() {
+  cat <<USAGE
+Usage: omarchy setup hardware --install-user USER
+
+Runs idempotent hardware detection/setup for the installed machine. This is
+called by omarchy-setup-system during ISO finalization and can be rerun later
+for diagnostics or after hardware/package updates.
+USAGE
+}
+
+install_user="${OMARCHY_INSTALL_USER:-}"
+while (($#)); do
+  case "$1" in
+    --install-user)
+      install_user="${2:-}"
+      shift 2
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unknown option: $1" >&2
+      usage >&2
+      exit 1
+      ;;
+  esac
+done
+
+if (( EUID != 0 )); then
+  echo "Error: omarchy-setup-hardware must run as root" >&2
+  exit 1
+fi
+
+if [[ -z $install_user || $install_user == "root" ]]; then
+  echo "Error: --install-user must name the target non-root user" >&2
+  exit 1
+fi
+
+if ! getent passwd "$install_user" >/dev/null; then
+  echo "Error: user '$install_user' does not exist" >&2
+  exit 1
+fi
+
+export OMARCHY_INSTALL_USER="$install_user"
+export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
+export OMARCHY_INSTALL="${OMARCHY_INSTALL:-$OMARCHY_PATH/install}"
+export OMARCHY_INSTALL_LOG_FILE="${OMARCHY_INSTALL_LOG_FILE:-/var/log/omarchy-install.log}"
+export PATH="$OMARCHY_PATH/bin:$PATH"
+
+source "$OMARCHY_INSTALL/helpers/logging.sh"
+source "$OMARCHY_INSTALL/hardware/all.sh"
diff --git a/bin/omarchy-setup-lock b/bin/omarchy-setup-lock
new file mode 100755
index 00000000..36701aae
--- /dev/null
+++ b/bin/omarchy-setup-lock
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# omarchy:summary=Configure Quickshell lock screen authentication
+# omarchy:group=setup
+# omarchy:name=lock
+# omarchy:requires-sudo=true
+
+set -e
+
+target_user=${OMARCHY_INSTALL_USER:-${SUDO_USER:-}}
+if [[ -z $target_user && -n ${PKEXEC_UID:-} ]]; then
+  target_user=$(getent passwd "$PKEXEC_UID" | cut -d: -f1)
+fi
+target_user=${target_user:-$USER}
+target_home=$(getent passwd "$target_user" | cut -d: -f6)
+target_group=$(id -gn "$target_user" 2>/dev/null || echo "$target_user")
+
+as_root() {
+  if (( EUID == 0 )); then
+    "$@"
+  else
+    sudo "$@"
+  fi
+}
+
+tee_root() {
+  local path="$1"
+
+  if (( EUID == 0 )); then
+    tee "$path"
+  else
+    sudo tee "$path"
+  fi
+}
+
+echo "Configuring lock screen password authentication..."
+
+tee_root /etc/pam.d/omarchy-lock-password >/dev/null <<'EOF'
+#%PAM-1.0
+auth       required                    pam_faillock.so preauth silent deny=10 unlock_time=120
+-auth      [success=2 default=ignore]  pam_systemd_home.so
+auth       [success=1 default=bad]     pam_unix.so try_first_pass nullok
+auth       [default=die]               pam_faillock.so authfail deny=10 unlock_time=120
+auth       optional                    pam_permit.so
+auth       required                    pam_env.so
+auth       required                    pam_faillock.so authsucc
+account    include                     system-local-login
+EOF
+
+if omarchy-cmd-present fprintd-list && fprintd-list "$target_user" 2>/dev/null | grep -qi finger; then
+  echo "Configuring lock screen fingerprint authentication..."
+  tee_root /etc/pam.d/omarchy-lock-fingerprint >/dev/null <<'EOF'
+#%PAM-1.0
+auth       required                    pam_fprintd.so
+account    include                     system-local-login
+EOF
+else
+  as_root rm -f /etc/pam.d/omarchy-lock-fingerprint
+fi
+
+
+# omarchy-shell can't reach a running shell during chroot install. The echo
+# is just confirmation, so swallow the failure rather than letting it become
+# the script's exit code.
+if omarchy-shell lock status >/dev/null 2>&1; then
+  echo "Lock screen authentication configured."
+fi
diff --git a/bin/omarchy-setup-security-fingerprint b/bin/omarchy-setup-security-fingerprint
index 08588be0..b4977c59 100755
--- a/bin/omarchy-setup-security-fingerprint
+++ b/bin/omarchy-setup-security-fingerprint
@@ -42,12 +42,16 @@ EOF
   fi
 }
 
-add_hyprlock_fingerprint_icon() {
-  echo "Adding fingerprint icon to hyprlock placeholder text..."
-  sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password 󰈷 <\/span>/' ~/.config/hypr/hyprlock.conf
-  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = true/' ~/.config/hypr/hyprlock.conf
+setup_lock_fingerprint_pam() {
+  echo "Configuring lock screen for fingerprint authentication..."
+  sudo tee /etc/pam.d/omarchy-lock-fingerprint >/dev/null <<'EOF'
+#%PAM-1.0
+auth       required                    pam_fprintd.so
+account    include                     system-local-login
+EOF
 }
 
+
 echo -e "\e[32mSetting up fingerprint scanner for authentication.\n\e[0m"
 
 # Install required packages
@@ -71,9 +75,6 @@ fi
 # Configure PAM
 setup_pam_config
 
-# Add fingerprint icon to hyprlock placeholder text
-add_hyprlock_fingerprint_icon
-
 # Enroll first fingerprint
 echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\e[0m"
 echo -e "Keep moving the finger around on sensor until the process completes.\n"
@@ -84,8 +85,9 @@ if sudo fprintd-enroll "$USER"; then
   # Verify
   echo -e "\nNow let's verify that it's working correctly.\n"
   if fprintd-verify; then
+    setup_lock_fingerprint_pam
     echo -e "\e[32m\nPerfect! Fingerprint authentication is now configured.\e[0m"
-    echo "You can use your fingerprint for sudo, polkit, and lock screen (Super + Escape)."
+    echo "You can use your fingerprint for sudo, polkit, and lock screen (Super + Ctrl + L)."
   else
     echo -e "\e[31m\nVerification failed. You may want to try enrolling again.\e[0m"
   fi
diff --git a/bin/omarchy-setup-system b/bin/omarchy-setup-system
new file mode 100755
index 00000000..0d4e7df7
--- /dev/null
+++ b/bin/omarchy-setup-system
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# omarchy:summary=Apply Omarchy system setup in the installed target
+# omarchy:group=setup
+# omarchy:requires-sudo=true
+# omarchy:examples=omarchy setup system --install-user dhh --first-install
+
+set -euo pipefail
+
+usage() {
+  cat <<USAGE
+Usage: omarchy setup system --install-user USER [--first-install|--upgrade]
+
+Runs root-owned Omarchy system setup. The ISO calls this in the target chroot
+after packages are installed and the target user exists. It also calls
+omarchy-setup-hardware, so hardware setup cannot be accidentally skipped.
+USAGE
+}
+
+install_user="${OMARCHY_INSTALL_USER:-}"
+first_install=0
+upgrade=0
+
+while (($#)); do
+  case "$1" in
+    --install-user)
+      install_user="${2:-}"
+      shift 2
+      ;;
+    --first-install)
+      first_install=1
+      shift
+      ;;
+    --upgrade)
+      upgrade=1
+      shift
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unknown option: $1" >&2
+      usage >&2
+      exit 1
+      ;;
+  esac
+done
+
+if (( EUID != 0 )); then
+  echo "Error: omarchy-setup-system must run as root" >&2
+  exit 1
+fi
+
+if [[ -z $install_user || $install_user == "root" ]]; then
+  echo "Error: --install-user must name the target non-root user" >&2
+  exit 1
+fi
+
+if ! getent passwd "$install_user" >/dev/null; then
+  echo "Error: user '$install_user' does not exist" >&2
+  exit 1
+fi
+
+export OMARCHY_INSTALL_USER="$install_user"
+export OMARCHY_FIRST_INSTALL="$first_install"
+export OMARCHY_UPGRADE="$upgrade"
+export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
+export OMARCHY_INSTALL="${OMARCHY_INSTALL:-$OMARCHY_PATH/install}"
+export OMARCHY_INSTALL_LOG_FILE="${OMARCHY_INSTALL_LOG_FILE:-/var/log/omarchy-install.log}"
+export PATH="$OMARCHY_PATH/bin:$PATH"
+
+source "$OMARCHY_INSTALL/helpers/logging.sh"
+start_install_log
+
+run_logged "$OMARCHY_INSTALL/config/theme-system.sh"
+run_logged "$OMARCHY_INSTALL/config/increase-lockout-limit.sh"
+run_logged "$OMARCHY_INSTALL/config/lockscreen-pam.sh"
+run_logged "$OMARCHY_INSTALL/config/fix-powerprofilesctl-shebang.sh"
+run_logged "$OMARCHY_INSTALL/config/docker.sh"
+run_logged "$OMARCHY_INSTALL/config/enable-services.sh"
+run_logged "$OMARCHY_INSTALL/config/firewall.sh"
+
+omarchy-setup-hardware --install-user "$install_user"
+
+run_logged "$OMARCHY_INSTALL/login/sddm.sh"
+
+run_logged "$OMARCHY_INSTALL/post-install/pacman.sh"
+run_logged "$OMARCHY_INSTALL/post-install/udev.sh"
+run_logged "$OMARCHY_INSTALL/post-install/localdb.sh"
+
+stop_install_log
diff --git a/bin/omarchy-shell b/bin/omarchy-shell
new file mode 100755
index 00000000..79edb244
--- /dev/null
+++ b/bin/omarchy-shell
@@ -0,0 +1,164 @@
+#!/bin/bash
+
+# omarchy:summary=Send an IPC call to the running Omarchy shell
+# omarchy:args=[-q] <target> <method> [args...]
+# omarchy:examples=omarchy shell shell ping | omarchy-shell shell toggle omarchy.menu '{"menu":"root"}'
+
+QUIET=0
+if [[ ${1:-} == "-q" ]]; then
+  QUIET=1
+  shift
+fi
+
+if (( $# == 0 )) || [[ $1 == "-h" || $1 == "--help" ]]; then
+  cat <<USAGE
+Usage: omarchy-shell [-q] <target> <method> [args...]
+
+Forwards an IPC call to the running Omarchy shell. The shell is expected
+to already be running; this command does not start it.
+
+Options:
+  -q  Quiet best-effort mode. Suppress output and return success even when
+      the shell, target, method, or arguments are unavailable.
+
+Examples:
+  omarchy-shell shell ping
+  omarchy-shell shell openBarConfig
+  omarchy-shell -q Indicators refresh
+  omarchy-shell shell listPlugins
+  omarchy-shell shell toggle omarchy.menu '{"menu":"root"}'
+USAGE
+  exit 0
+fi
+
+if (( $# < 2 )); then
+  (( QUIET )) && exit 0
+  echo "Usage: omarchy-shell <target> <method> [args...]" >&2
+  exit 1
+fi
+
+if [[ -z ${OMARCHY_PATH:-} ]]; then
+  (( QUIET )) && exit 0
+  echo "OMARCHY_PATH is not set" >&2
+  exit 1
+fi
+
+SHELL_QML="$OMARCHY_PATH/shell/shell.qml"
+
+if [[ $1 == "shell" && ( $2 == "summon" || $2 == "toggle" ) ]] && (( $# == 3 )); then
+  set -- "$1" "$2" "$3" "{}"
+fi
+
+export OMARCHY_SHELL_QUIET="$QUIET"
+
+perl -MCwd=abs_path -MEncode=encode,decode -MSocket -MIO::Handle \
+  -e '
+    binmode STDOUT, ":encoding(UTF-8)";
+    binmode STDERR, ":encoding(UTF-8)";
+    $SIG{PIPE} = "IGNORE";
+
+    sub read_qstring {
+      my ($data, $offset) = @_;
+      return (undef, $offset) if $offset + 4 > length($data);
+      my $length = unpack("N", substr($data, $offset, 4));
+      $offset += 4;
+      return (undef, $offset) if $length == 0xffffffff || $offset + $length > length($data);
+      return (decode("UTF-16BE", substr($data, $offset, $length)), $offset + $length);
+    }
+
+    sub qstring {
+      my $encoded = encode("UTF-16BE", $_[0] // "");
+      return pack("N", length($encoded)) . $encoded;
+    }
+
+    sub write_all {
+      my ($client, $payload) = @_;
+      my $written = 0;
+      while ($written < length($payload)) {
+        my $n = syswrite($client, $payload, length($payload) - $written, $written);
+        return 0 unless defined $n;
+        $written += $n;
+      }
+      return 1;
+    }
+
+    sub print_success {
+      my ($response) = @_;
+      my ($message) = read_qstring($response, 2);
+      return 0 unless defined $message && length($message);
+      print $message;
+      print "\n" unless substr($message, -1) eq "\n";
+      return 0;
+    }
+
+    my $shell_qml_arg = shift @ARGV;
+    my $shell_qml = abs_path($shell_qml_arg);
+    my $target = decode("UTF-8", shift @ARGV);
+    my $function = decode("UTF-8", shift @ARGV);
+    my @args = map { decode("UTF-8", $_) } @ARGV;
+    my $runtime_dir = $ENV{"XDG_RUNTIME_DIR"} || "/run/user/$<";
+    my $quiet = ($ENV{"OMARCHY_SHELL_QUIET"} || "") eq "1";
+    my $payload = chr(3) . qstring($target) . qstring($function) . pack("N", scalar @args) . join("", map { qstring($_) } @args);
+    my @candidates;
+
+    if (!defined $shell_qml) {
+      exit 0 if $quiet;
+      print STDERR "omarchy-shell config not found: $shell_qml_arg\n";
+      exit 1;
+    }
+
+    for my $lock_path (glob("$runtime_dir/quickshell/by-id/*/instance.lock")) {
+      my $data;
+      next unless open(my $lock, "<:raw", $lock_path);
+      { local $/; $data = <$lock>; }
+      close($lock);
+      my (undef, $offset) = read_qstring($data, 0);
+      my ($path) = read_qstring($data, $offset);
+      next unless $path;
+      my $abs_path = abs_path($path);
+      next unless defined $abs_path && $abs_path eq $shell_qml;
+      (my $socket_path = $lock_path) =~ s{/instance\.lock$}{/ipc.sock};
+      push @candidates, [(stat($lock_path))[9] || 0, $socket_path];
+    }
+
+    for my $candidate (sort { $b->[0] <=> $a->[0] } @candidates) {
+      socket(my $client, AF_UNIX, SOCK_STREAM, 0) || next;
+      if (connect($client, sockaddr_un($candidate->[1]))) {
+        unless (write_all($client, $payload)) {
+          close($client);
+          next;
+        }
+
+        my $response = "";
+        while (1) {
+          my $buffer = "";
+          my $n = sysread($client, $buffer, 65536);
+          last unless defined $n && $n > 0;
+          $response .= $buffer;
+        }
+        close($client);
+
+        next unless length($response);
+        my $code = ord(substr($response, 0, 1));
+        if ($code == 5) {
+          exit 0 if $quiet;
+          print_success($response);
+          exit 0;
+        } elsif ($code == 2) {
+          print STDERR "Target not found.\n" unless $quiet;
+        } elsif ($code == 3) {
+          print STDERR "Function not found.\n" unless $quiet;
+        } elsif ($code == 4) {
+          print STDERR "Invalid arguments.\n" unless $quiet;
+        } else {
+          print STDERR "Unexpected IPC response: $code\n" unless $quiet;
+        }
+        exit($quiet ? 0 : 1);
+      }
+      close($client);
+    }
+
+    exit 0 if $quiet;
+    print STDERR "omarchy-shell is not running\n";
+    exit 1;
+  ' "$SHELL_QML" "$@"
diff --git a/bin/omarchy-shell-bar-text-color b/bin/omarchy-shell-bar-text-color
new file mode 100755
index 00000000..29a8767c
--- /dev/null
+++ b/bin/omarchy-shell-bar-text-color
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# omarchy:summary=Choose a legible transparent bar text color
+# omarchy:hidden=true
+
+set -e
+
+position=${1:-top}
+bar_size=${2:-}
+text_color=${3:-}
+background_color=${4:-}
+background_path=""
+screen_size=""
+
+shift 4 2>/dev/null || true
+while (($# > 0)); do
+  case "$1" in
+  --background)
+    background_path=${2:-}
+    shift 2
+    ;;
+  --screen)
+    screen_size=${2:-}
+    shift 2
+    ;;
+  *)
+    shift
+    ;;
+  esac
+done
+
+valid_hex() {
+  [[ $1 =~ ^#[0-9A-Fa-f]{6}$ ]]
+}
+
+fallback() {
+  printf '%s\n' "$text_color"
+  exit 0
+}
+
+contrast() {
+  local color="$1"
+  local sample="$2"
+
+  awk -v fg="$color" -v bg="$sample" '
+    function channel(hex, start) {
+      return strtonum("0x" substr(hex, start, 2)) / 255
+    }
+    function linear(c) {
+      return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ^ 2.4
+    }
+    function luminance(hex, r, g, b) {
+      r = linear(channel(hex, 2))
+      g = linear(channel(hex, 4))
+      b = linear(channel(hex, 6))
+      return 0.2126 * r + 0.7152 * g + 0.0722 * b
+    }
+    BEGIN {
+      l1 = luminance(fg)
+      l2 = luminance(bg)
+      if (l1 < l2) {
+        t = l1
+        l1 = l2
+        l2 = t
+      }
+      printf "%.6f\n", (l1 + 0.05) / (l2 + 0.05)
+    }
+  '
+}
+
+valid_hex "$text_color" || fallback
+valid_hex "$background_color" || fallback
+[[ $position =~ ^(top|bottom|left|right)$ ]] || fallback
+[[ $bar_size =~ ^[0-9]+$ ]] || fallback
+omarchy-cmd-present magick || fallback
+
+if [[ -z $background_path ]]; then
+  background_path=$(readlink -f "$HOME/.config/omarchy/current/background" 2>/dev/null || true)
+fi
+[[ -f $background_path ]] || fallback
+
+if [[ -z $screen_size ]]; then
+  if omarchy-cmd-present hyprctl && omarchy-cmd-present jq; then
+    screen_size=$(hyprctl monitors -j 2>/dev/null | jq -r '.[0] | "\(.width)x\(.height)"' 2>/dev/null || true)
+  fi
+fi
+[[ $screen_size =~ ^([0-9]+)x([0-9]+)$ ]] || fallback
+
+screen_width=${BASH_REMATCH[1]}
+screen_height=${BASH_REMATCH[2]}
+((screen_width > 0 && screen_height > 0 && bar_size > 0)) || fallback
+
+case "$position" in
+top)
+  crop="${screen_width}x${bar_size}+0+0"
+  ;;
+bottom)
+  crop_y=$((screen_height - bar_size))
+  ((crop_y >= 0)) || fallback
+  crop="${screen_width}x${bar_size}+0+${crop_y}"
+  ;;
+left)
+  crop="${bar_size}x${screen_height}+0+0"
+  ;;
+right)
+  crop_x=$((screen_width - bar_size))
+  ((crop_x >= 0)) || fallback
+  crop="${bar_size}x${screen_height}+${crop_x}+0"
+  ;;
+esac
+
+pixel=$(magick "$background_path" -auto-orient \
+  -resize "${screen_width}x${screen_height}^" \
+  -gravity center -extent "${screen_width}x${screen_height}" \
+  -gravity NorthWest -crop "$crop" +repage \
+  -resize '1x1!' -format '%[fx:int(255*r)],%[fx:int(255*g)],%[fx:int(255*b)]' info:- 2>/dev/null || true)
+[[ $pixel =~ ^([0-9]+),([0-9]+),([0-9]+)$ ]] || fallback
+
+sample=$(printf '#%02x%02x%02x' "${BASH_REMATCH[1]}" "${BASH_REMATCH[2]}" "${BASH_REMATCH[3]}")
+text_contrast=$(contrast "$text_color" "$sample")
+background_contrast=$(contrast "$background_color" "$sample")
+
+awk -v text="$text_contrast" -v background="$background_contrast" 'BEGIN { exit !(background > text) }' \
+  && printf '%s\n' "$background_color" \
+  || printf '%s\n' "$text_color"
diff --git a/bin/omarchy-show-logo b/bin/omarchy-show-logo
index 595bb487..1d6cfdf2 100755
--- a/bin/omarchy-show-logo
+++ b/bin/omarchy-show-logo
@@ -4,6 +4,6 @@
 
 clear
 echo -e "\033[32m"
-cat <~/.local/share/omarchy/logo.txt
+cat <$OMARCHY_PATH/logo.txt
 echo -e "\033[0m"
 echo
diff --git a/bin/omarchy-snapshot b/bin/omarchy-snapshot
index ce1bc9ca..27c1b7de 100755
--- a/bin/omarchy-snapshot
+++ b/bin/omarchy-snapshot
@@ -7,7 +7,6 @@
 set -e
 
 COMMAND="$1"
-OMARCHY_PATH=${OMARCHY_PATH:-$HOME/.local/share/omarchy}
 
 if [[ -z $COMMAND ]]; then
   echo "Usage: omarchy-snapshot <create|restore>" >&2
diff --git a/bin/omarchy-style-bar-position b/bin/omarchy-style-bar-position
new file mode 100755
index 00000000..e1e28a1b
--- /dev/null
+++ b/bin/omarchy-style-bar-position
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# omarchy:summary=Set bar position
+# omarchy:args=<top|bottom|left|right>
+# omarchy:examples=omarchy-style-bar-position top | omarchy style bar position bottom
+
+set -e
+
+CONFIG_FILE="$HOME/.config/omarchy/shell.json"
+DEFAULTS_FILE="$OMARCHY_PATH/config/omarchy/shell.json"
+position=$1
+
+if [[ ! $position =~ ^(top|bottom|left|right)$ ]]; then
+  echo "Usage: omarchy-style-bar-position top|bottom|left|right" >&2
+  exit 1
+fi
+
+mkdir -p "$(dirname "$CONFIG_FILE")"
+tmp=$(mktemp)
+
+# Seed from the default shell.json when the user has no shell.json yet (or it's
+# malformed). Writing just `{ bar: { position } }` would leave the bar with
+# no layout, since the shell treats any valid user config as authoritative
+# and does not deep-merge defaults.
+if [[ -s $CONFIG_FILE ]] && jq -e 'type == "object"' "$CONFIG_FILE" >/dev/null 2>&1; then
+  source="$CONFIG_FILE"
+else
+  source="$DEFAULTS_FILE"
+fi
+
+jq --arg position "$position" '
+  .version = 1 |
+  .bar = ((.bar // {}) | if type == "object" then . else {} end) |
+  .bar.position = $position
+' "$source" >"$tmp"
+
+mv "$tmp" "$CONFIG_FILE"
diff --git a/bin/omarchy-swayosd-brightness b/bin/omarchy-swayosd-brightness
deleted file mode 100755
index 8a1e852d..00000000
--- a/bin/omarchy-swayosd-brightness
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Display brightness level using SwayOSD on the current monitor.
-# omarchy:args=<0-100>
-# omarchy:examples=omarchy swayosd brightness 0 | omarchy swayosd brightness 50 | omarchy swayosd brightness 100
-
-percent="$1"
-
-progress="$(awk -v p="$percent" 'BEGIN{printf "%.2f", p/100}')"
-[[ $progress == "0.00" ]] && progress="0.01"
-
-omarchy-swayosd-client \
-  --custom-icon display-brightness-symbolic \
-  --custom-progress "$progress" \
-  --custom-progress-text "${percent}%"
diff --git a/bin/omarchy-swayosd-client b/bin/omarchy-swayosd-client
deleted file mode 100755
index e8343aaa..00000000
--- a/bin/omarchy-swayosd-client
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Wrapper for swayosd-client that targets the currently focused monitor.
-# omarchy:args=<swayosd-client-args...>
-
-exec swayosd-client --monitor "$(omarchy-hyprland-monitor-focused)" "$@"
diff --git a/bin/omarchy-swayosd-kbd-brightness b/bin/omarchy-swayosd-kbd-brightness
deleted file mode 100755
index 52e7959a..00000000
--- a/bin/omarchy-swayosd-kbd-brightness
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Display keyboard brightness level using SwayOSD on the current monitor.
-# omarchy:args=<0-100>
-# omarchy:examples=omarchy swayosd kbd brightness 0 | omarchy swayosd kbd brightness 50 | omarchy swayosd kbd brightness 100
-
-percent="$1"
-
-progress="$(awk -v p="$percent" 'BEGIN{printf "%.2f", p/100}')"
-[[ $progress == "0.00" ]] && progress="0.01"
-
-omarchy-swayosd-client \
-  --custom-icon keyboard-brightness-symbolic \
-  --custom-progress "$progress" \
-  --custom-progress-text "${percent}%"
diff --git a/bin/omarchy-system-lock b/bin/omarchy-system-lock
index a1ea82b4..bcad2452 100755
--- a/bin/omarchy-system-lock
+++ b/bin/omarchy-system-lock
@@ -5,29 +5,19 @@
 # omarchy:name=lock
 # omarchy:examples=omarchy system lock
 
-if ! pidof hyprlock >/dev/null; then
-  (
-    hyprlock
-    omarchy-system-wake
-  ) &
-fi
+omarchy-shell lock lock >/dev/null
 
 # Set keyboard layout to default (first layout)
 hyprctl switchxkblayout all 0 > /dev/null 2>&1
 
-# Ensure 1password is locked
-if pgrep -x "1password" >/dev/null; then
-  1password --lock &
+# Ensure 1password is locked. Use timeout because `1password --lock` can
+# otherwise leave a full Electron helper tree running after each lock.
+if pgrep -x "1password" >/dev/null && command -v 1password >/dev/null 2>&1; then
+  (
+    flock -n 9 || exit 0
+    timeout --kill-after=1s 3s 1password --lock >/dev/null 2>&1 || true
+  ) 9>"${XDG_RUNTIME_DIR:-/tmp}/omarchy-1password-lock.lock" &
 fi
 
 # Avoid running screensaver when locked
-pkill -f org.omarchy.screensaver
-
-if [[ ${OMARCHY_LOCK_ONLY:-false} != "true" ]]; then
-  (
-    sleep 3
-    pidof hyprlock >/dev/null || exit 0
-    omarchy-brightness-keyboard off
-    omarchy-brightness-display off
-  ) &
-fi
+pkill -f '[o]rg.omarchy.screensaver' 2>/dev/null || true
diff --git a/bin/omarchy-system-sleep-lock b/bin/omarchy-system-sleep-lock
new file mode 100755
index 00000000..be3ba621
--- /dev/null
+++ b/bin/omarchy-system-sleep-lock
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# omarchy:summary=Lock before suspend and wait for the session lock to become secure
+# omarchy:group=system
+# omarchy:hidden=true
+
+wait_attempts=${1:-100}
+
+if [[ ! $wait_attempts =~ ^[0-9]+$ ]] || (( wait_attempts < 1 )); then
+  wait_attempts=100
+fi
+
+omarchy-shell lock lock >/dev/null 2>&1 || exit 1
+
+for (( attempt = 0; attempt < wait_attempts; attempt++ )); do
+  status=$(omarchy-shell lock status 2>/dev/null || true)
+
+  if jq -e '.secure == true' <<<"$status" >/dev/null 2>&1; then
+    exit 0
+  fi
+
+  sleep 0.05
+done
+
+exit 1
diff --git a/bin/omarchy-system-sleep-monitor b/bin/omarchy-system-sleep-monitor
new file mode 100755
index 00000000..bd343b01
--- /dev/null
+++ b/bin/omarchy-system-sleep-monitor
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# omarchy:summary=Monitor sleep preparation and lock before suspend
+# omarchy:group=system
+# omarchy:hidden=true
+
+monitor_command='exec dbus-monitor --system "type='\''signal'\'',sender='\''org.freedesktop.login1'\'',interface='\''org.freedesktop.login1.Manager'\'',member='\''PrepareForSleep'\''"'
+
+consume_sleep_events() {
+  local line sleep_lock
+  sleep_lock=$(command -v omarchy-system-sleep-lock || true)
+  sleep_lock=${sleep_lock:-/usr/bin/omarchy-system-sleep-lock}
+
+  while IFS= read -r line; do
+    if [[ $line == *"boolean true"* ]]; then
+      "$sleep_lock"
+      exit 0
+    fi
+  done
+}
+
+if [[ ${1:-} == "--consume" ]]; then
+  consume_sleep_events
+  exit 0
+fi
+
+sleep_monitor=$(command -v omarchy-system-sleep-monitor || true)
+sleep_monitor=${sleep_monitor:-/usr/bin/omarchy-system-sleep-monitor}
+
+exec systemd-inhibit \
+  --what=sleep \
+  --mode=delay \
+  --who=Omarchy \
+  --why="Lock screen before suspend" \
+  bash -lc "$monitor_command | \"$sleep_monitor\" --consume"
diff --git a/bin/omarchy-system-stats b/bin/omarchy-system-stats
new file mode 100755
index 00000000..12ee3015
--- /dev/null
+++ b/bin/omarchy-system-stats
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# omarchy:summary=Print CPU and memory stats for the shell
+# omarchy:group=system
+# omarchy:args=[--bar-widget]
+
+bar_widget_stats() {
+  awk '
+    NR == 1 {
+      idle = $5
+      total = 0
+      for (i = 2; i <= NF; i++) total += $i
+      printf "cpu\t%s\t%s\n", idle, total
+    }
+  ' /proc/stat
+
+  awk '
+    /^MemTotal:/ { total = $2 }
+    /^MemAvailable:/ { avail = $2 }
+    END {
+      if (total > 0) printf "memory\t%.2f\n", ((total - avail) / total) * 100
+    }
+  ' /proc/meminfo
+
+  awk '{ print "load\t" $1 }' /proc/loadavg
+}
+
+case "${1:-}" in
+  "")
+    ;;
+  --bar-widget)
+    bar_widget_stats
+    exit
+    ;;
+  *)
+    echo "Usage: omarchy-system-stats [--bar-widget]" >&2
+    exit 1
+    ;;
+esac
+
+cpu=$(top -bn1 | awk '/^%?Cpu/ {
+  gsub(/,/, "")
+  for (i = 1; i <= NF; i++) {
+    if ($(i + 1) == "id") {
+      printf "%.0f%%", 100 - $i
+      exit
+    }
+  }
+}')
+
+awk -v cpu="$cpu" '
+  /^MemTotal:/ { total = $2 }
+  /^MemAvailable:/ { avail = $2 }
+  END {
+    used = total - avail
+    printf "cpu\t%s\n", cpu
+    printf "memory\t%.1fGB / %.0fGB\n", used / 1024 / 1024, total / 1024 / 1024
+  }
+' /proc/meminfo
diff --git a/bin/omarchy-theme-bg-cache b/bin/omarchy-theme-bg-cache
new file mode 100755
index 00000000..4564e5bd
--- /dev/null
+++ b/bin/omarchy-theme-bg-cache
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# omarchy:summary=Cache background switcher thumbnails for the current theme
+
+theme_name=$(cat "$HOME/.config/omarchy/current/theme.name" 2>/dev/null)
+
+omarchy-menu-images \
+  --cache-only \
+  "$HOME/.config/omarchy/current/theme/backgrounds" \
+  "$HOME/.config/omarchy/backgrounds/$theme_name"
diff --git a/bin/omarchy-theme-bg-current b/bin/omarchy-theme-bg-current
new file mode 100755
index 00000000..5597d782
--- /dev/null
+++ b/bin/omarchy-theme-bg-current
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# omarchy:summary=Show current background
+# omarchy:examples=omarchy theme bg current
+
+BACKGROUND_PATH=$(readlink -f "$HOME/.config/omarchy/current/background" 2>/dev/null)
+
+if [[ -n $BACKGROUND_PATH ]]; then
+  basename -- "$BACKGROUND_PATH" | perl -pe 's/\.[^.]+$//; s/^\d+-//; s/-/ /g; s/\b(\w)/\U$1/g'
+else
+  echo "Unknown"
+fi
diff --git a/bin/omarchy-theme-bg-next b/bin/omarchy-theme-bg-next
index e2d0bd4a..13852207 100755
--- a/bin/omarchy-theme-bg-next
+++ b/bin/omarchy-theme-bg-next
@@ -8,13 +8,15 @@ THEME_BACKGROUNDS_PATH="$HOME/.config/omarchy/current/theme/backgrounds/"
 USER_BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-mapfile -d '' -t BACKGROUNDS < <(find -L "$USER_BACKGROUNDS_PATH" "$THEME_BACKGROUNDS_PATH" -maxdepth 1 -type f -print0 2>/dev/null | sort -z)
+mapfile -d '' -t BACKGROUNDS < <(
+  find -L "$USER_BACKGROUNDS_PATH" "$THEME_BACKGROUNDS_PATH" -maxdepth 1 -type f \
+    \( -iname '*.jpg' -o -iname '*.jpeg' -o -iname '*.png' -o -iname '*.gif' -o -iname '*.bmp' -o -iname '*.webp' \) \
+    -print0 2>/dev/null | sort -z
+)
 TOTAL=${#BACKGROUNDS[@]}
 
 if (( TOTAL == 0 )); then
-  notify-send "No background was found for theme" -t 2000
-  pkill -x swaybg
-  setsid uwsm-app -- swaybg --color '#000000' >/dev/null 2>&1 &
+  omarchy-notification-send "No background was found for theme" -t 2000
 else
   # Get current background from symlink
   if [[ -L $CURRENT_BACKGROUND_LINK ]]; then
@@ -42,10 +44,5 @@ else
     NEW_BACKGROUND="${BACKGROUNDS[$NEXT_INDEX]}"
   fi
 
-  # Set new background symlink
-  ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
-
-  # Relaunch swaybg
-  pkill -x swaybg
-  setsid uwsm-app -- swaybg -i "$CURRENT_BACKGROUND_LINK" -m fill >/dev/null 2>&1 &
+  omarchy-theme-bg-set "$NEW_BACKGROUND"
 fi
diff --git a/bin/omarchy-theme-bg-set b/bin/omarchy-theme-bg-set
index 9c695d0e..94da61f9 100755
--- a/bin/omarchy-theme-bg-set
+++ b/bin/omarchy-theme-bg-set
@@ -2,7 +2,7 @@
 
 # omarchy:summary=Set the current background image
 # omarchy:args=<path-to-image>
-# omarchy:examples=omarchy theme bg set ~/Pictures/wallpaper.png
+# omarchy:examples=omarchy theme bg set ~/Pictures/background.png
 
 if [[ -z $1 ]]; then
   echo "Usage: omarchy-theme-bg-set <path-to-image>" >&2
@@ -12,7 +12,7 @@ fi
 BACKGROUND="$(realpath "$1")"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-if [[ ! -f "$BACKGROUND" ]]; then
+if [[ ! -f $BACKGROUND ]]; then
   echo "File does not exist: $BACKGROUND" >&2
   exit 1
 fi
@@ -20,6 +20,6 @@ fi
 # Create symlink to the new background
 ln -nsf "$BACKGROUND" "$CURRENT_BACKGROUND_LINK"
 
-# Kill existing swaybg and start new one
-pkill -x swaybg
-setsid uwsm-app -- swaybg -i "$CURRENT_BACKGROUND_LINK" -m fill >/dev/null 2>&1 &
+# Update the live shell background immediately when it is running. The
+# background plugin also polls this symlink, but IPC avoids the visible delay.
+omarchy-shell -q background set "$BACKGROUND"
diff --git a/bin/omarchy-theme-bg-switcher b/bin/omarchy-theme-bg-switcher
new file mode 100755
index 00000000..93a47a12
--- /dev/null
+++ b/bin/omarchy-theme-bg-switcher
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# omarchy:summary=Open the Omarchy background switcher
+# omarchy:group=theme
+# omarchy:name=bg-switcher
+# omarchy:aliases=omarchy background
+
+theme_name=$(cat "$HOME/.config/omarchy/current/theme.name" 2>/dev/null)
+current_background=$(readlink -f "$HOME/.config/omarchy/current/background" 2>/dev/null)
+
+omarchy-menu-images \
+  --selected "$current_background" \
+  "$HOME/.config/omarchy/current/theme/backgrounds" \
+  "$HOME/.config/omarchy/backgrounds/$theme_name"
diff --git a/bin/omarchy-theme-osc b/bin/omarchy-theme-osc
new file mode 100755
index 00000000..b7e9f6f7
--- /dev/null
+++ b/bin/omarchy-theme-osc
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# omarchy:summary=Print OSC sequences for an Omarchy color theme
+# omarchy:hidden=true
+
+theme="${1:-$HOME/.config/omarchy/current/theme/colors.toml}"
+
+[[ -f $theme ]] || exit 0
+
+awk -F= '
+  function clean(value) {
+    gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
+    if (value ~ /^"/) {
+      sub(/^"/, "", value)
+      sub(/".*$/, "", value)
+    }
+    return value
+  }
+
+  function alias_color(target, source) {
+    if (colors[target] == "" && colors[source] != "") colors[target] = colors[source]
+  }
+
+  function emit_color(color_index, key) {
+    if (colors[key] != "") printf "\033]4;%d;%s\007", color_index, colors[key]
+  }
+
+  {
+    key = $1
+    gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
+    value = clean($2)
+    colors[key] = value
+  }
+
+  END {
+    alias_color("color0", "bg")
+    alias_color("color0", "background")
+    alias_color("color1", "red")
+    alias_color("color2", "green")
+    alias_color("color3", "yellow")
+    alias_color("color4", "blue")
+    alias_color("color5", "magenta")
+    alias_color("color5", "purple")
+    alias_color("color6", "cyan")
+    alias_color("color7", "fg")
+    alias_color("color7", "foreground")
+    alias_color("color8", "muted")
+    alias_color("color8", "dark_fg")
+    alias_color("color8", "foreground")
+    alias_color("color9", "bright_red")
+    alias_color("color9", "red")
+    alias_color("color10", "bright_green")
+    alias_color("color10", "green")
+    alias_color("color11", "bright_yellow")
+    alias_color("color11", "yellow")
+    alias_color("color12", "bright_blue")
+    alias_color("color12", "blue")
+    alias_color("color13", "bright_magenta")
+    alias_color("color13", "bright_purple")
+    alias_color("color13", "magenta")
+    alias_color("color13", "purple")
+    alias_color("color14", "bright_cyan")
+    alias_color("color14", "cyan")
+    alias_color("color15", "bright_fg")
+    alias_color("color15", "foreground")
+
+    if (colors["foreground"] != "") printf "\033]10;%s\007", colors["foreground"]
+    if (colors["background"] != "") printf "\033]11;%s\007", colors["background"]
+    if (colors["cursor"] != "") printf "\033]12;%s\007", colors["cursor"]
+    if (colors["selection_background"] != "") printf "\033]17;%s\007", colors["selection_background"]
+    if (colors["selection_foreground"] != "") printf "\033]19;%s\007", colors["selection_foreground"]
+
+    for (i = 0; i <= 15; i++) emit_color(i, "color" i)
+  }
+' "$theme"
diff --git a/bin/omarchy-theme-remove b/bin/omarchy-theme-remove
index dac33cd4..fdbeac03 100755
--- a/bin/omarchy-theme-remove
+++ b/bin/omarchy-theme-remove
@@ -8,7 +8,8 @@ if [[ -z $1 ]]; then
   mapfile -t extra_themes < <(find ~/.config/omarchy/themes -mindepth 1 -maxdepth 1 -type d ! -xtype l -printf '%f\n')
 
   if (( ${#extra_themes[@]} > 0 )); then
-    THEME_NAME=$(printf '%s\n' "${extra_themes[@]}" | sort | gum choose --header="Remove extra theme")
+    mapfile -t extra_themes < <(printf '%s\n' "${extra_themes[@]}" | sort)
+    THEME_NAME=$(omarchy-menu-select "Remove extra theme" "${extra_themes[@]}" -- --width 520 --maxheight 520)
   else
     echo "No extra themes installed."
     exit 1
@@ -34,3 +35,5 @@ fi
 
 # Now remove the theme directory for THEME_NAME
 rm -rf "$THEME_PATH"
+omarchy-notification-send "Theme removed" "$THEME_NAME" || true
+echo "Removed $THEME_NAME"
diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set
index fe57c2af..d78fbefc 100755
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@@ -11,16 +11,134 @@ fi
 
 CURRENT_THEME_PATH="$HOME/.config/omarchy/current/theme"
 NEXT_THEME_PATH="$HOME/.config/omarchy/current/next-theme"
+CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
+BACKGROUND_TRANSITION_CACHE="$HOME/.cache/omarchy/background-transitions"
+THEME_SET_LOCK="${XDG_RUNTIME_DIR:-/tmp}/omarchy-theme-set.lock"
 USER_THEMES_PATH="$HOME/.config/omarchy/themes"
 OMARCHY_THEMES_PATH="$OMARCHY_PATH/themes"
 
+run_parallel() {
+  local pid
+  local pids=()
+
+  for command in "$@"; do
+    bash -lc "$command" &
+    pids+=("$!")
+  done
+
+  for pid in "${pids[@]}"; do
+    wait "$pid"
+  done
+}
+
+shell_ipc() {
+  timeout 2 omarchy-shell "$@" >/dev/null 2>&1
+}
+
+snapshot_background_path() {
+  local background="$1"
+  local name="$2"
+  local snapshot extension
+
+  [[ -f $background ]] || return
+
+  mkdir -p "$BACKGROUND_TRANSITION_CACHE"
+  extension=${background##*.}
+  snapshot="$BACKGROUND_TRANSITION_CACHE/$name-$$.$extension"
+  ln "$background" "$snapshot" 2>/dev/null || cp "$background" "$snapshot"
+  echo "$snapshot"
+}
+
+snapshot_current_background() {
+  local current_background
+
+  current_background=$(readlink -f "$CURRENT_BACKGROUND_LINK" 2>/dev/null || true)
+  snapshot_background_path "$current_background" "previous"
+}
+
+choose_theme_background() {
+  local backgrounds=()
+  local current_background index next_index i
+
+  CHOSEN_THEME_BACKGROUND=""
+  mapfile -d '' -t backgrounds < <(
+    find -L "$HOME/.config/omarchy/backgrounds/$THEME_NAME/" "$CURRENT_THEME_PATH/backgrounds/" -maxdepth 1 -type f \
+      \( -iname '*.jpg' -o -iname '*.jpeg' -o -iname '*.png' -o -iname '*.gif' -o -iname '*.bmp' -o -iname '*.webp' \) \
+      -print0 2>/dev/null | sort -z
+  )
+
+  (( ${#backgrounds[@]} > 0 )) || return 1
+
+  current_background=$(readlink "$CURRENT_BACKGROUND_LINK" 2>/dev/null || true)
+  index=-1
+  for i in "${!backgrounds[@]}"; do
+    if [[ ${backgrounds[$i]} == $current_background ]]; then
+      index=$i
+      break
+    fi
+  done
+
+  if (( index == -1 )); then
+    CHOSEN_THEME_BACKGROUND="${backgrounds[0]}"
+  else
+    next_index=$(((index + 1) % ${#backgrounds[@]}))
+    CHOSEN_THEME_BACKGROUND="${backgrounds[$next_index]}"
+  fi
+}
+
+set_theme_background_link() {
+  choose_theme_background || return 1
+  ln -nsf "$CHOSEN_THEME_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
+}
+
+set_theme_background() {
+  local new_background new_background_snapshot
+
+  if ! choose_theme_background; then
+    omarchy-notification-send "No background was found for theme" -t 2000
+    shell_ipc shell applyTheme "$colors_payload" "$shell_payload" || true
+    return
+  fi
+
+  new_background="$CHOSEN_THEME_BACKGROUND"
+  new_background_snapshot=$(snapshot_background_path "$new_background" "next")
+
+  if [[ -f $OLD_BACKGROUND_SNAPSHOT && -f $new_background_snapshot ]]; then
+    shell_ipc background themeTransition "$OLD_BACKGROUND_SNAPSHOT" "$new_background_snapshot" "$new_background" "$colors_payload" "$shell_payload" || \
+      shell_ipc shell applyTheme "$colors_payload" "$shell_payload" || true
+    (sleep 3; rm -f "$OLD_BACKGROUND_SNAPSHOT" "$new_background_snapshot") &
+  elif [[ -f $new_background_snapshot ]]; then
+    shell_ipc background themeTransition "" "$new_background_snapshot" "$new_background" "$colors_payload" "$shell_payload" || \
+      shell_ipc shell applyTheme "$colors_payload" "$shell_payload" || true
+    (sleep 3; rm -f "$new_background_snapshot") &
+  else
+    shell_ipc background themeTransition "$OLD_BACKGROUND_SNAPSHOT" "$new_background" "$new_background" "$colors_payload" "$shell_payload" || \
+      shell_ipc shell applyTheme "$colors_payload" "$shell_payload" || true
+    if [[ -f $OLD_BACKGROUND_SNAPSHOT ]]; then
+      (sleep 3; rm -f "$OLD_BACKGROUND_SNAPSHOT") &
+    fi
+  fi
+
+  ln -nsf "$new_background" "$CURRENT_BACKGROUND_LINK"
+}
+
 THEME_NAME=$(echo "$1" | sed -E 's/<[^>]+>//g' | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
+THEME_HEADLESS=0
+if [[ ${OMARCHY_THEME_HEADLESS:-} == "1" || ${OMARCHY_THEME_OFFLINE:-} == "1" ]]; then
+  THEME_HEADLESS=1
+fi
 
 if [[ ! -d $OMARCHY_THEMES_PATH/$THEME_NAME ]] && [[ ! -d $USER_THEMES_PATH/$THEME_NAME ]]; then
   echo "Theme '$THEME_NAME' does not exist"
   exit 1
 fi
 
+# Serialize theme changes. Theme switching rebuilds a shared next-theme staging
+# directory and updates current theme/background symlinks; concurrent calls can
+# otherwise race and make one selection appear to be ignored.
+exec 9>"$THEME_SET_LOCK"
+flock 9
+
 # Setup clean next theme directory (for atomic theme config swapping)
 rm -rf "$NEXT_THEME_PATH"
 mkdir -p "$NEXT_THEME_PATH"
@@ -37,6 +155,11 @@ fi
 # Generate dynamic configs
 omarchy-theme-set-templates
 
+OLD_BACKGROUND_SNAPSHOT=""
+if [[ $THEME_HEADLESS != "1" && $OMARCHY_THEME_SKIP_BACKGROUND != "1" ]]; then
+  OLD_BACKGROUND_SNAPSHOT=$(snapshot_current_background)
+fi
+
 # Swap next theme in as current
 rm -rf "$CURRENT_THEME_PATH"
 mv "$NEXT_THEME_PATH" "$CURRENT_THEME_PATH"
@@ -44,30 +167,51 @@ mv "$NEXT_THEME_PATH" "$CURRENT_THEME_PATH"
 # Store theme name for reference
 echo "$THEME_NAME" >"$HOME/.config/omarchy/current/theme.name"
 
-# Change background with theme
-if [[ $OMARCHY_THEME_SKIP_BACKGROUND != "1" ]]; then
-  omarchy-theme-bg-next
+# Make the running shell pick up the new palette immediately while the rest of
+# the theme hooks run.
+colors_payload=$([[ -f $CURRENT_THEME_PATH/colors.toml ]] && base64 -w 0 "$CURRENT_THEME_PATH/colors.toml")
+shell_payload=$([[ -f $CURRENT_THEME_PATH/shell.toml ]] && base64 -w 0 "$CURRENT_THEME_PATH/shell.toml")
+if [[ $THEME_HEADLESS == "1" ]]; then
+  # No shell/session bus exists during ISO chroot finalization, but the first
+  # real login still needs a current background symlink for omarchy-shell to
+  # render.
+  [[ $OMARCHY_THEME_SKIP_BACKGROUND == "1" ]] || set_theme_background_link || true
+elif [[ $OMARCHY_THEME_SKIP_BACKGROUND == "1" ]]; then
+  shell_ipc shell applyTheme "$colors_payload" "$shell_payload" || true
+else
+  set_theme_background
 fi
 
-# Restart components to apply new theme
-if pgrep -x waybar >/dev/null; then
-  omarchy-restart-waybar
+# The shared staging/current symlinks are updated and the shell has accepted
+# the transition. Let another theme selection queue only behind that critical
+# section, not behind slower app-retint hooks and selector cache warmups.
+flock -u 9
+
+post_theme_commands=(
+  omarchy-restart-terminal
+  omarchy-restart-hyprctl
+  omarchy-restart-btop
+  omarchy-restart-opencode
+  omarchy-restart-helix
+  omarchy-theme-set-foot
+  omarchy-theme-set-tmux
+  omarchy-theme-set-gnome
+  omarchy-theme-set-pi
+  omarchy-theme-set-browser
+  omarchy-theme-set-vscode
+  omarchy-theme-set-obsidian
+  omarchy-theme-set-keyboard
+)
+
+if [[ $THEME_HEADLESS != "1" ]]; then
+  run_parallel "${post_theme_commands[@]}"
+
+  # Call hook on theme set
+  omarchy-hook theme-set "$THEME_NAME" >/dev/null
+
+  # Warm selector caches after the theme is applied. The shell hot-reloads theme
+  # colors/backgrounds, so keep the running instance alive and preload the picker
+  # rows/selection to avoid first-open carousel settling after a theme change.
+  omarchy-theme-switcher --preload >/dev/null 2>&1
+  omarchy-theme-bg-cache >/dev/null 2>&1 &
 fi
-omarchy-restart-swayosd
-omarchy-restart-terminal
-omarchy-restart-hyprctl
-omarchy-restart-btop
-omarchy-restart-opencode
-omarchy-restart-mako
-omarchy-restart-helix
-
-# Change app-specific themes
-omarchy-theme-set-foot
-omarchy-theme-set-gnome
-omarchy-theme-set-browser
-omarchy-theme-set-vscode
-omarchy-theme-set-obsidian
-omarchy-theme-set-keyboard
-
-# Call hook on theme set
-omarchy-hook theme-set "$THEME_NAME" >/dev/null
diff --git a/bin/omarchy-theme-set-foot b/bin/omarchy-theme-set-foot
index f7268d22..74ad3741 100755
--- a/bin/omarchy-theme-set-foot
+++ b/bin/omarchy-theme-set-foot
@@ -3,22 +3,14 @@
 # omarchy:summary=Apply current Omarchy theme colors to running Foot terminals
 # omarchy:hidden=true
 
-foot_theme=~/.config/omarchy/current/theme/foot.ini
+colors_toml=~/.config/omarchy/current/theme/colors.toml
 
-if [[ ! -f $foot_theme ]] || ! pgrep -x foot >/dev/null; then
+if [[ ! -f $colors_toml ]] || ! pgrep -x foot >/dev/null; then
   exit 0
 fi
 
-foot_osc=$(awk -F= '
-  function color(value) { return "#" value }
-  /^foreground=/ { printf "\033]10;%s\007", color($2) }
-  /^background=/ { printf "\033]11;%s\007", color($2) }
-  /^cursor=/ { split($2, parts, " "); printf "\033]12;%s\007", color(parts[2]) }
-  /^selection-background=/ { printf "\033]17;%s\007", color($2) }
-  /^selection-foreground=/ { printf "\033]19;%s\007", color($2) }
-  /^regular[0-7]=/ { split($1, parts, "regular"); printf "\033]4;%d;%s\007", parts[2], color($2) }
-  /^bright[0-7]=/ { split($1, parts, "bright"); printf "\033]4;%d;%s\007", parts[2] + 8, color($2) }
-' "$foot_theme")
+foot_osc=$(omarchy-theme-osc "$colors_toml")
+[[ -n $foot_osc ]] || exit 0
 
 for foot_pid in $(pgrep -x foot); do
   for child_pid in $(pgrep -P "$foot_pid"); do
diff --git a/bin/omarchy-theme-set-gnome b/bin/omarchy-theme-set-gnome
index 379f76ec..61a9d8d3 100755
--- a/bin/omarchy-theme-set-gnome
+++ b/bin/omarchy-theme-set-gnome
@@ -3,7 +3,45 @@
 # omarchy:summary=Apply the current theme to GNOME color mode and icon settings
 # omarchy:hidden=true
 
-if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+# gsettings needs a user DBus session. During ISO installs this command can be
+# reached from arch-chroot while applying the initial Omarchy theme; defer until
+# the user has a real session instead of emitting dconf warnings.
+if [[ -z ${DBUS_SESSION_BUS_ADDRESS:-} ]]; then
+  exit 0
+fi
+
+THEME_DIR=~/.config/omarchy/current/theme
+COLORS_FILE="$THEME_DIR/colors.toml"
+
+# In-tree light themes now declare `mode = "light"` in colors.toml instead of
+# shipping a separate light.mode marker. Keep light.mode as a user-theme fallback.
+theme_mode() {
+  [[ -f $COLORS_FILE ]] || return
+
+  awk -F= '
+    {
+      field = $1
+      gsub(/^[[:space:]]+|[[:space:]]+$/, "", field)
+      if (field == "mode") {
+        value = $2
+        gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
+        if (value ~ /^"/) {
+          sub(/^"/, "", value)
+          sub(/".*$/, "", value)
+        }
+        print value
+        exit
+      }
+    }
+  ' "$COLORS_FILE"
+}
+
+mode=$(theme_mode)
+if [[ -z $mode && -f $THEME_DIR/light.mode ]]; then
+  mode="light"
+fi
+
+if [[ $mode == "light" ]]; then
   gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
   gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
 else
diff --git a/bin/omarchy-theme-set-pi b/bin/omarchy-theme-set-pi
new file mode 100755
index 00000000..f75e75fd
--- /dev/null
+++ b/bin/omarchy-theme-set-pi
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# omarchy:summary=Sync the generated Omarchy Pi theme
+# omarchy:args=[--activate]
+# omarchy:hidden=true
+
+set -euo pipefail
+
+CURRENT_THEME_PATH="$HOME/.config/omarchy/current/theme"
+PI_SOURCE_PATH="$CURRENT_THEME_PATH/pi.json"
+PI_AGENT_DIR="$HOME/.pi/agent"
+PI_THEME_DIR="$PI_AGENT_DIR/themes"
+PI_THEME_PATH="$PI_THEME_DIR/omarchy-system.json"
+PI_SETTINGS_PATH="$PI_AGENT_DIR/settings.json"
+PI_ACTIVATE=0
+
+usage() {
+  echo "Usage: omarchy-theme-set-pi [--activate]"
+}
+
+for arg in "$@"; do
+  case "$arg" in
+    --activate)
+      PI_ACTIVATE=1
+      ;;
+    -h | --help)
+      usage
+      exit 0
+      ;;
+    *)
+      usage >&2
+      exit 1
+      ;;
+  esac
+done
+
+if [[ ! -f $PI_SOURCE_PATH ]]; then
+  if (( PI_ACTIVATE == 1 )); then
+    echo "Pi theme source missing: $PI_SOURCE_PATH" >&2
+    echo "Run omarchy-theme-refresh after selecting an Omarchy theme." >&2
+    exit 1
+  fi
+
+  exit 0
+fi
+
+if (( PI_ACTIVATE == 0 )) && [[ ! -d $PI_AGENT_DIR ]]; then
+  exit 0
+fi
+
+write_setting_theme() {
+  local tmp
+
+  mkdir -p "$PI_AGENT_DIR"
+
+  if [[ -f $PI_SETTINGS_PATH ]]; then
+    tmp=$(mktemp "$PI_SETTINGS_PATH.XXXXXX")
+    jq '.theme = "omarchy-system"' "$PI_SETTINGS_PATH" >"$tmp"
+    mv "$tmp" "$PI_SETTINGS_PATH"
+  else
+    cat >"$PI_SETTINGS_PATH" <<EOF
+{
+  "theme": "omarchy-system"
+}
+EOF
+  fi
+}
+
+mkdir -p "$PI_THEME_DIR"
+tmp=$(mktemp "$PI_THEME_PATH.XXXXXX")
+cp "$PI_SOURCE_PATH" "$tmp"
+mv "$tmp" "$PI_THEME_PATH"
+
+if (( PI_ACTIVATE == 1 )); then
+  write_setting_theme
+fi
diff --git a/bin/omarchy-theme-set-templates b/bin/omarchy-theme-set-templates
index 92236d19..620b84b7 100755
--- a/bin/omarchy-theme-set-templates
+++ b/bin/omarchy-theme-set-templates
@@ -8,34 +8,490 @@ USER_TEMPLATES_DIR="$HOME/.config/omarchy/themed"
 NEXT_THEME_DIR="$HOME/.config/omarchy/current/next-theme"
 COLORS_FILE="$NEXT_THEME_DIR/colors.toml"
 
+declare -A THEME_COLORS
+
 # Convert hex color to decimal RGB (e.g., "#1e1e2e" -> "30,30,46")
 hex_to_rgb() {
   local hex="${1#\#}"
   printf "%d,%d,%d" "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
 }
 
+# Mix two hex colors. Amount may be a fraction (0.30) or percentage (30%).
+mix_color() {
+  local start="${1#\#}"
+  local end="${2#\#}"
+  local amount="$3"
+
+  awk -v start="$start" -v end="$end" -v amount="$amount" '
+    function hex_value(char) {
+      return index("0123456789abcdef", tolower(char)) - 1
+    }
+
+    function hex_pair_to_int(hex, idx) {
+      return hex_value(substr(hex, idx, 1)) * 16 + hex_value(substr(hex, idx + 1, 1))
+    }
+
+    BEGIN {
+      if (amount ~ /%$/) {
+        sub(/%$/, "", amount)
+        amount = amount / 100
+      } else {
+        amount += 0
+        if (amount > 1) amount = amount / 100
+      }
+
+      if (amount < 0) amount = 0
+      if (amount > 1) amount = 1
+
+      start_r = hex_pair_to_int(start, 1)
+      start_g = hex_pair_to_int(start, 3)
+      start_b = hex_pair_to_int(start, 5)
+      end_r = hex_pair_to_int(end, 1)
+      end_g = hex_pair_to_int(end, 3)
+      end_b = hex_pair_to_int(end, 5)
+
+      red = int(start_r * (1 - amount) + end_r * amount + 0.5)
+      green = int(start_g * (1 - amount) + end_g * amount + 0.5)
+      blue = int(start_b * (1 - amount) + end_b * amount + 0.5)
+
+      printf "#%02x%02x%02x\n", red, green, blue
+    }
+  '
+}
+
+trim() {
+  local value="$1"
+
+  value="${value#"${value%%[![:space:]]*}"}"
+  value="${value%"${value##*[![:space:]]}"}"
+  printf "%s" "$value"
+}
+
+resolve_theme_ref() {
+  local ref="$1"
+  local fallback="${2:-}"
+
+  if [[ -n ${THEME_COLORS[$ref]+_} ]]; then
+    printf "%s" "${THEME_COLORS[$ref]}"
+  elif [[ -n $fallback && -n ${THEME_COLORS[$fallback]+_} ]]; then
+    printf "%s" "${THEME_COLORS[$fallback]}"
+  elif [[ -n $fallback ]]; then
+    printf "%s" "$fallback"
+  else
+    printf "%s" "$ref"
+  fi
+}
+
+resolve_gradient_color() {
+  local color
+
+  color=$(trim "$1")
+  if [[ -n ${THEME_COLORS[$color]+_} ]]; then
+    color="${THEME_COLORS[$color]}"
+  fi
+
+  printf "%s" "$color"
+}
+
+parse_gradient() {
+  local spec="$1"
+  local part color
+  local -a parts
+
+  GRADIENT_COLORS=()
+  GRADIENT_ANGLE=""
+
+  read -ra parts <<<"$spec"
+  for part in "${parts[@]}"; do
+    [[ -n $part ]] || continue
+
+    if [[ $part =~ ^-?[0-9]+([.][0-9]+)?deg$ ]]; then
+      GRADIENT_ANGLE="${part%deg}"
+    else
+      color=$(resolve_gradient_color "$part")
+      GRADIENT_COLORS+=("$color")
+    fi
+  done
+}
+
+color_to_shell_hex() {
+  local color r g b
+
+  color=$(resolve_gradient_color "$1")
+
+  if [[ $color =~ ^#[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$ ]]; then
+    printf "#%s" "${color:1:6}"
+  elif [[ $color =~ ^[Rr][Gg][Bb][Aa]?\(([0-9A-Fa-f]{6})([0-9A-Fa-f]{2})?\)$ ]]; then
+    printf "#%s" "${BASH_REMATCH[1]}"
+  elif [[ $color =~ ^[Rr][Gg][Bb][Aa]?\(([0-9]+),([0-9]+),([0-9]+)(,[0-9.]+)?\)$ ]]; then
+    r=${BASH_REMATCH[1]}
+    g=${BASH_REMATCH[2]}
+    b=${BASH_REMATCH[3]}
+    (( r > 255 )) && r=255
+    (( g > 255 )) && g=255
+    (( b > 255 )) && b=255
+    printf "#%02x%02x%02x" "$r" "$g" "$b"
+  elif [[ $color =~ ^0x[0-9A-Fa-f]{8}$ ]]; then
+    printf "#%s" "${color:4:6}"
+  else
+    printf "%s" "$color"
+  fi
+}
+
+hypr_gradient_value() {
+  local spec color index
+
+  spec=$(resolve_theme_ref "$1" "${2:-}")
+  parse_gradient "$spec"
+
+  if (( ${#GRADIENT_COLORS[@]} == 0 )); then
+    printf '"%s"' "$spec"
+  elif (( ${#GRADIENT_COLORS[@]} == 1 )); then
+    printf '"%s"' "${GRADIENT_COLORS[0]}"
+  else
+    printf '{ colors = {'
+    for index in "${!GRADIENT_COLORS[@]}"; do
+      (( index > 0 )) && printf ','
+      printf ' "%s"' "${GRADIENT_COLORS[$index]}"
+    done
+    printf ' }'
+    [[ -n $GRADIENT_ANGLE ]] && printf ', angle = %s' "$GRADIENT_ANGLE"
+    printf ' }'
+  fi
+}
+
+gradient_start_value() {
+  local spec
+
+  spec=$(resolve_theme_ref "$1" "${2:-}")
+  parse_gradient "$spec"
+
+  if (( ${#GRADIENT_COLORS[@]} == 0 )); then
+    color_to_shell_hex "$spec"
+  else
+    color_to_shell_hex "${GRADIENT_COLORS[0]}"
+  fi
+}
+
+shell_gradient_value() {
+  local spec index
+
+  spec=$(resolve_theme_ref "$1" "${2:-}")
+  parse_gradient "$spec"
+
+  if (( ${#GRADIENT_COLORS[@]} == 0 )); then
+    printf "%s" "$spec"
+    return
+  fi
+
+  for index in "${!GRADIENT_COLORS[@]}"; do
+    (( index > 0 )) && printf " "
+    printf "%s" "${GRADIENT_COLORS[$index]}"
+  done
+
+  [[ -n $GRADIENT_ANGLE ]] && printf " %sdeg" "$GRADIENT_ANGLE"
+}
+
+add_template_value() {
+  local key="$1"
+  local value="$2"
+  local rgb
+
+  printf 's|{{ %s }}|%s|g\n' "$key" "$value" >>"$sed_script"
+  printf 's|{{ %s_strip }}|%s|g\n' "$key" "${value#\#}" >>"$sed_script"
+
+  if [[ $value =~ ^#[0-9A-Fa-f]{6}$ ]]; then
+    rgb=$(hex_to_rgb "$value")
+    printf 's|{{ %s_rgb }}|%s|g\n' "$key" "$rgb" >>"$sed_script"
+  fi
+}
+
+add_mix_value() {
+  local token="$1"
+  local content fn start_key end_key amount start end value
+
+  content="${token#\{\{}"
+  content="${content%\}\}}"
+  read -r fn start_key end_key amount <<<"$content"
+
+  start="${THEME_COLORS[$start_key]:-}"
+  end="${THEME_COLORS[$end_key]:-}"
+
+  [[ $start =~ ^#[0-9A-Fa-f]{6}$ && $end =~ ^#[0-9A-Fa-f]{6}$ ]] || return
+
+  value=$(mix_color "$start" "$end" "$amount")
+
+  case "$fn" in
+    mix)
+      ;;
+    mix_strip)
+      value="${value#\#}"
+      ;;
+    mix_rgb)
+      value=$(hex_to_rgb "$value")
+      ;;
+    *)
+      return
+      ;;
+  esac
+
+  printf 's|%s|%s|g\n' "$token" "$value" >>"$sed_script"
+}
+
+add_mix_values() {
+  local tpl token
+  local -A seen=()
+
+  for tpl in "${template_files[@]}"; do
+    while IFS= read -r token; do
+      [[ -n ${seen[$token]:-} ]] && continue
+      seen[$token]=1
+      add_mix_value "$token"
+    done < <(grep -hEo '\{\{[[:space:]]*mix(_strip|_rgb)?[[:space:]]+[A-Za-z0-9_]+[[:space:]]+[A-Za-z0-9_]+[[:space:]]+[0-9]+([.][0-9]+)?%?[[:space:]]*\}\}' "$tpl" 2>/dev/null || true)
+  done
+}
+
+add_gradient_function_value() {
+  local token="$1"
+  local content fn key fallback value
+
+  content="${token#\{\{}"
+  content="${content%\}\}}"
+  read -r fn key fallback <<<"$content"
+
+  case "$fn" in
+    hypr_gradient)
+      value=$(hypr_gradient_value "$key" "$fallback")
+      ;;
+    gradient_start)
+      value=$(gradient_start_value "$key" "$fallback")
+      ;;
+    shell_gradient)
+      value=$(shell_gradient_value "$key" "$fallback")
+      ;;
+    *)
+      return
+      ;;
+  esac
+
+  printf 's|%s|%s|g\n' "$token" "$value" >>"$sed_script"
+}
+
+add_gradient_function_values() {
+  local tpl token
+  local -A seen=()
+
+  for tpl in "${template_files[@]}"; do
+    while IFS= read -r token; do
+      [[ -n ${seen[$token]:-} ]] && continue
+      seen[$token]=1
+      add_gradient_function_value "$token"
+    done < <(grep -hEo '\{\{[[:space:]]*(hypr_gradient|gradient_start|shell_gradient)[[:space:]]+[^}]+[[:space:]]*\}\}' "$tpl" 2>/dev/null || true)
+  done
+}
+
+strip_shell_section_header() {
+  local section="$1"
+  local file="$2"
+
+  awk -v section="$section" '
+    BEGIN { skipping_header = 0 }
+    /^[[:space:]]*\[[^]]+\][[:space:]]*($|#)/ {
+      if ($0 ~ "^[[:space:]]*\\[" section "\\][[:space:]]*($|#)") {
+        skipping_header = 1
+        next
+      }
+    }
+    { print }
+  ' "$file"
+}
+
+apply_shell_section_override() {
+  local override="$1"
+  local section tmp body
+
+  [[ -f $NEXT_THEME_DIR/shell.toml ]] || return
+  [[ -f $override ]] || return
+
+  section=$(basename "$override")
+  section="${section#shell.}"
+  section="${section%.toml}"
+  [[ $section =~ ^[A-Za-z0-9_-]+$ ]] || return
+
+  tmp=$(mktemp)
+  body=$(mktemp)
+
+  strip_shell_section_header "$section" "$override" >"$body"
+
+  awk -v section="$section" -v body="$body" '
+    function emit_override() {
+      if (emitted) return
+      print "[" section "]"
+      while ((getline line < body) > 0) print line
+      close(body)
+      emitted = 1
+    }
+
+    /^[[:space:]]*\[[^]]+\][[:space:]]*($|#)/ {
+      if (in_section) {
+        emit_override()
+        in_section = 0
+      }
+      if ($0 ~ "^[[:space:]]*\\[" section "\\][[:space:]]*($|#)") {
+        in_section = 1
+        next
+      }
+    }
+
+    !in_section { print }
+
+    END {
+      if (in_section || !emitted) {
+        if (NR > 0) print ""
+        emit_override()
+      }
+    }
+  ' "$NEXT_THEME_DIR/shell.toml" >"$tmp"
+
+  mv "$tmp" "$NEXT_THEME_DIR/shell.toml"
+  rm "$body"
+}
+
+apply_shell_section_overrides() {
+  local override
+
+  shopt -s nullglob
+  for override in "$NEXT_THEME_DIR"/shell.*.toml; do
+    [[ $(basename "$override") != "shell.toml" ]] || continue
+    apply_shell_section_override "$override"
+  done
+}
+
+alias_theme_color() {
+  local key="$1"
+  local fallback="$2"
+
+  [[ ${THEME_COLORS[$key]} ]] || THEME_COLORS[$key]="${THEME_COLORS[$fallback]}"
+}
+
+resolve_theme_mode() {
+  local bg_hex lum
+
+  [[ ${THEME_COLORS[mode]} ]] || THEME_COLORS[mode]="${THEME_COLORS[theme_type]}"
+  [[ ${THEME_COLORS[mode]} ]] && return
+
+  if [[ -f $NEXT_THEME_DIR/light.mode ]]; then
+    THEME_COLORS[mode]="light"
+  elif [[ ${THEME_COLORS[background]} =~ ^#[0-9A-Fa-f]{6}$ ]]; then
+    bg_hex="${THEME_COLORS[background]#\#}"
+    lum=$(( $(printf "%d" "0x${bg_hex:0:2}") + $(printf "%d" "0x${bg_hex:2:2}") + $(printf "%d" "0x${bg_hex:4:2}") ))
+    (( lum > 382 )) && THEME_COLORS[mode]="light" || THEME_COLORS[mode]="dark"
+  else
+    THEME_COLORS[mode]="dark"
+  fi
+}
+
 # Only generate dynamic templates for themes with a colors.toml definition
 if [[ -f $COLORS_FILE ]]; then
   sed_script=$(mktemp)
 
+  shopt -s nullglob
+  template_files=("$USER_TEMPLATES_DIR"/*.tpl "$TEMPLATES_DIR"/*.tpl)
+
   while IFS='=' read -r key value; do
     key="${key//[\"\' ]/}"                # strip quotes and spaces from key
     [[ $key && $key != \#* ]] || continue # skip empty lines and comments
     value="${value#*[\"\']}"
     value="${value%%[\"\']*}" # extract value between quotes (ignores inline comments)
 
-    printf 's|{{ %s }}|%s|g\n' "$key" "$value"            # {{ key }} -> value
-    printf 's|{{ %s_strip }}|%s|g\n' "$key" "${value#\#}" # {{ key_strip }} -> value without leading #
-    if [[ $value =~ ^# ]]; then
-      rgb=$(hex_to_rgb "$value")
-      echo "s|{{ ${key}_rgb }}|${rgb}|g"
-    fi
-  done <"$COLORS_FILE" >"$sed_script"
+    THEME_COLORS[$key]="$value"
+  done <"$COLORS_FILE"
 
-  shopt -s nullglob
+  # Legacy compatibility: map ANSI color0..color15 and raw bg/fg to semantic names
+  declare -A legacy_alias=(
+    [bg]=background
+    [fg]=foreground
+    [red]=color1
+    [green]=color2
+    [yellow]=color3
+    [blue]=color4
+    [magenta]=color5
+    [cyan]=color6
+    [bright_red]=color9
+    [bright_green]=color10
+    [bright_yellow]=color11
+    [bright_blue]=color12
+    [bright_magenta]=color13
+    [bright_cyan]=color14
+  )
+  for key in "${!legacy_alias[@]}"; do
+    alias_theme_color "$key" "${legacy_alias[$key]}"
+  done
+  alias_theme_color magenta purple
+  alias_theme_color bright_magenta bright_purple
+
+  [[ ${THEME_COLORS[light_fg]} ]]   || THEME_COLORS[light_fg]="${THEME_COLORS[color7]:-${THEME_COLORS[foreground]}}"
+  [[ ${THEME_COLORS[bright_fg]} ]]  || THEME_COLORS[bright_fg]="${THEME_COLORS[color15]:-${THEME_COLORS[foreground]}}"
+  [[ ${THEME_COLORS[lighter_bg]} ]] || THEME_COLORS[lighter_bg]="${THEME_COLORS[color0]:-${THEME_COLORS[background]}}"
+  [[ ${THEME_COLORS[dark_fg]} ]]    || THEME_COLORS[dark_fg]="${THEME_COLORS[color8]:-${THEME_COLORS[foreground]}}"
+  [[ ${THEME_COLORS[muted]} ]]      || THEME_COLORS[muted]="${THEME_COLORS[color8]:-${THEME_COLORS[dark_fg]}}"
+  [[ ${THEME_COLORS[selection]} ]]  || THEME_COLORS[selection]="${THEME_COLORS[selection_background]:-${THEME_COLORS[color8]:-${THEME_COLORS[color0]}}}"
+  [[ ${THEME_COLORS[orange]} ]]     || THEME_COLORS[orange]="${THEME_COLORS[yellow]}"
+  [[ ${THEME_COLORS[brown]} ]]      || THEME_COLORS[brown]=$(mix_color "${THEME_COLORS[orange]}" "#000000" 50%)
+
+  # Auto-derive shades from base accents when not defined and not aliased from colorN
+  [[ ${THEME_COLORS[dark_bg]} ]]       || THEME_COLORS[dark_bg]=$(mix_color "${THEME_COLORS[background]}" "#000000" 25%)
+  [[ ${THEME_COLORS[darker_bg]} ]]     || THEME_COLORS[darker_bg]=$(mix_color "${THEME_COLORS[background]}" "#000000" 50%)
+  [[ ${THEME_COLORS[bright_red]} ]]    || THEME_COLORS[bright_red]=$(mix_color "${THEME_COLORS[red]}" "#ffffff" 20%)
+  [[ ${THEME_COLORS[bright_yellow]} ]] || THEME_COLORS[bright_yellow]=$(mix_color "${THEME_COLORS[yellow]}" "#ffffff" 20%)
+  [[ ${THEME_COLORS[bright_green]} ]]  || THEME_COLORS[bright_green]=$(mix_color "${THEME_COLORS[green]}" "#ffffff" 20%)
+  [[ ${THEME_COLORS[bright_cyan]} ]]   || THEME_COLORS[bright_cyan]=$(mix_color "${THEME_COLORS[cyan]}" "#ffffff" 20%)
+  [[ ${THEME_COLORS[bright_blue]} ]]   || THEME_COLORS[bright_blue]=$(mix_color "${THEME_COLORS[blue]}" "#ffffff" 20%)
+  [[ ${THEME_COLORS[bright_magenta]} ]] || THEME_COLORS[bright_magenta]=$(mix_color "${THEME_COLORS[magenta]}" "#ffffff" 20%)
+  alias_theme_color purple magenta
+  alias_theme_color bright_purple bright_magenta
+
+  # Keep semantic themes compatible with user templates that still reference
+  # the legacy ANSI placeholders directly.
+  declare -A ansi_alias=(
+    [color0]=bg
+    [color1]=red
+    [color2]=green
+    [color3]=yellow
+    [color4]=blue
+    [color5]=magenta
+    [color6]=cyan
+    [color7]=fg
+    [color8]=muted
+    [color9]=bright_red
+    [color10]=bright_green
+    [color11]=bright_yellow
+    [color12]=bright_blue
+    [color13]=bright_magenta
+    [color14]=bright_cyan
+    [color15]=bright_fg
+  )
+  for key in "${!ansi_alias[@]}"; do
+    alias_theme_color "$key" "${ansi_alias[$key]}"
+  done
+
+  # Resolve theme mode (dark|light) with this precedence:
+  #   1. `mode` key in colors.toml
+  #   2. legacy `light.mode` file shipped beside the theme
+  #   3. background luminance auto-detect
+  # `theme_type` is kept as an alias so existing templates ({{ theme_type }}) keep working.
+  resolve_theme_mode
+  THEME_COLORS[theme_type]="${THEME_COLORS[mode]}"
+
+  for key in "${!THEME_COLORS[@]}"; do
+    add_template_value "$key" "${THEME_COLORS[$key]}"
+  done
+
+  add_mix_values
+  add_gradient_function_values
 
   # Process user templates first, then built-in templates (user overrides built-in)
-  for tpl in "$USER_TEMPLATES_DIR"/*.tpl "$TEMPLATES_DIR"/*.tpl; do
+  for tpl in "${template_files[@]}"; do
     filename=$(basename "$tpl" .tpl)
     output_path="$NEXT_THEME_DIR/$filename"
 
@@ -47,3 +503,5 @@ if [[ -f $COLORS_FILE ]]; then
 
   rm "$sed_script"
 fi
+
+apply_shell_section_overrides
diff --git a/bin/omarchy-theme-set-tmux b/bin/omarchy-theme-set-tmux
new file mode 100755
index 00000000..efb696d1
--- /dev/null
+++ b/bin/omarchy-theme-set-tmux
@@ -0,0 +1,129 @@
+#!/bin/bash
+
+# omarchy:summary=Sync current Omarchy theme environment into tmux
+# omarchy:hidden=true
+
+CURRENT_THEME_PATH="$HOME/.config/omarchy/current/theme"
+GUM_ENV="$CURRENT_THEME_PATH/gum_env.lua"
+COLORS_TOML="$CURRENT_THEME_PATH/colors.toml"
+
+if ! tmux list-sessions >/dev/null 2>&1; then
+  exit 0
+fi
+
+set_tmux_environment() {
+  local key="$1"
+  local value="$2"
+  local session
+
+  tmux set-environment -g "$key" "$value" 2>/dev/null || return 0
+
+  while IFS= read -r session; do
+    [[ -n $session ]] || continue
+    tmux set-environment -t "$session" "$key" "$value" 2>/dev/null || true
+  done < <(tmux list-sessions -F "#{session_id}" 2>/dev/null)
+}
+
+sync_theme_environment() {
+  local key value
+
+  [[ -f $GUM_ENV ]] || return
+
+  while IFS=$'\t' read -r key value; do
+    [[ -n $key && -n $value ]] || continue
+    set_tmux_environment "$key" "$value"
+  done < <(awk -F'"' '/hl\.env\("[A-Z0-9_]+", "[^"]+"\)/ { print $2 "\t" $4 }' "$GUM_ENV")
+}
+
+sync_colorfgbg() {
+  local colorfgbg="15;0"
+  local mode
+
+  mode=$(theme_color mode)
+
+  if [[ $mode == "light" ]] || [[ -z $mode && -f $CURRENT_THEME_PATH/light.mode ]]; then
+    colorfgbg="0;15"
+  fi
+
+  set_tmux_environment COLORFGBG "$colorfgbg"
+}
+
+theme_osc_sequences() {
+  omarchy-theme-osc "$COLORS_TOML"
+}
+
+theme_color() {
+  local key="$1"
+
+  awk -F= -v key="$key" '
+    {
+      field = $1
+      gsub(/^[[:space:]]+|[[:space:]]+$/, "", field)
+      if (field == key) {
+        value = $2
+        gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
+        if (value ~ /^"/) {
+          sub(/^"/, "", value)
+          sub(/".*$/, "", value)
+        }
+        print value
+        exit
+      }
+    }
+  ' "$COLORS_TOML"
+}
+
+sync_tmux_window_style() {
+  local background foreground
+
+  [[ -f $COLORS_TOML ]] || return
+
+  foreground=$(theme_color foreground)
+  background=$(theme_color background)
+
+  [[ -n $foreground && -n $background ]] || return
+
+  tmux set-option -g window-style "fg=$foreground,bg=$background" 2>/dev/null || true
+  tmux set-option -g window-active-style "fg=$foreground,bg=$background" 2>/dev/null || true
+}
+
+sync_tmux_pane_colors() {
+  local pane_tty theme_osc
+
+  [[ -f $COLORS_TOML ]] || return
+
+  theme_osc=$(theme_osc_sequences)
+  [[ -n $theme_osc ]] || return
+
+  while IFS= read -r pane_tty; do
+    [[ $pane_tty == /dev/pts/* ]] || continue
+    printf '%b' "$theme_osc" >"$pane_tty" 2>/dev/null || true
+  done < <(tmux list-panes -a -F "#{pane_tty}" 2>/dev/null | sort -u)
+}
+
+signal_tmux_panes() {
+  local pane_tty tpgid
+
+  while IFS= read -r pane_tty; do
+    [[ $pane_tty == /dev/pts/* ]] || continue
+    tpgid=$(ps -o tpgid= -t "${pane_tty#/dev/}" 2>/dev/null | awk 'NF && $1 > 0 { print $1; exit }')
+    [[ -n $tpgid ]] || continue
+    kill -WINCH "-$tpgid" 2>/dev/null || true
+  done < <(tmux list-panes -a -F "#{pane_tty}" 2>/dev/null | sort -u)
+}
+
+refresh_tmux_clients() {
+  local client
+
+  while IFS= read -r client; do
+    [[ -n $client ]] || continue
+    tmux refresh-client -t "$client" 2>/dev/null || true
+  done < <(tmux list-clients -F "#{client_name}" 2>/dev/null)
+}
+
+sync_theme_environment
+sync_colorfgbg
+sync_tmux_window_style
+sync_tmux_pane_colors
+signal_tmux_panes
+refresh_tmux_clients
diff --git a/bin/omarchy-theme-set-vscode b/bin/omarchy-theme-set-vscode
index d0e0331c..97144172 100755
--- a/bin/omarchy-theme-set-vscode
+++ b/bin/omarchy-theme-set-vscode
@@ -3,22 +3,121 @@
 # omarchy:summary=Sync Omarchy theme to VS Code, VSCodium, and Cursor
 # omarchy:hidden=true
 
-VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json"
+VS_CODE_THEME_DESCRIPTOR="$HOME/.config/omarchy/current/theme/vscode.json"
+GENERATED_THEME="$HOME/.config/omarchy/current/theme/vscode-theme.json"
+GENERATED_EXTENSION_NAME="omarchy-theme"
+GENERATED_EXTENSION_ID="local.$GENERATED_EXTENSION_NAME"
+GENERATED_EXTENSION_VERSION="1.0.0"
+
+register_generated_extension() {
+  local ext_dir="$1"
+  local ext_base extensions_file obsolete_file relative tmp
+
+  ext_base=$(dirname "$ext_dir")
+  extensions_file="$ext_base/extensions.json"
+  obsolete_file="$ext_base/.obsolete"
+  relative=$(basename "$ext_dir")
+
+  if [[ -f $obsolete_file ]]; then
+    tmp=$(mktemp)
+    if jq --arg key "$GENERATED_EXTENSION_ID-$GENERATED_EXTENSION_VERSION" 'del(.[$key])' "$obsolete_file" >"$tmp"; then
+      mv "$tmp" "$obsolete_file"
+      [[ $(jq 'length' "$obsolete_file") == "0" ]] && rm -f "$obsolete_file"
+    else
+      rm -f "$tmp"
+    fi
+  fi
+
+  [[ -f $extensions_file ]] || printf '[]\n' >"$extensions_file"
+
+  tmp=$(mktemp)
+  if jq \
+    --arg id "$GENERATED_EXTENSION_ID" \
+    --arg version "$GENERATED_EXTENSION_VERSION" \
+    --arg fs_path "$ext_dir" \
+    --arg external "file://$ext_dir" \
+    --arg relative "$relative" \
+    'map(select(.identifier.id != $id)) + [{
+      identifier: { id: $id },
+      version: $version,
+      location: {
+        "$mid": 1,
+        fsPath: $fs_path,
+        external: $external,
+        path: $fs_path,
+        scheme: "file"
+      },
+      relativeLocation: $relative
+    }]' \
+    "$extensions_file" >"$tmp"; then
+    mv "$tmp" "$extensions_file"
+  else
+    rm -f "$tmp"
+  fi
+}
+
+# Install generated theme as a local extension for a given editor
+install_generated_extension() {
+  local ext_dir="$1"
+  local theme_type ui_theme
+
+  theme_type=$(jq -r '.type // "dark"' "$GENERATED_THEME")
+  if [[ $theme_type == "light" ]]; then
+    ui_theme="vs"
+  else
+    ui_theme="vs-dark"
+  fi
+
+  mkdir -p "$ext_dir/themes"
+  ln -sfn "$GENERATED_THEME" "$ext_dir/themes/omarchy-color-theme.json"
+
+  cat > "$ext_dir/package.json" <<EOF
+{
+    "name": "$GENERATED_EXTENSION_NAME",
+    "displayName": "Omarchy",
+    "description": "Omarchy color theme",
+    "publisher": "local",
+    "version": "$GENERATED_EXTENSION_VERSION",
+    "engines": { "vscode": "^1.70.0" },
+    "categories": ["Themes"],
+    "contributes": {
+        "themes": [{
+            "label": "Omarchy",
+            "uiTheme": "$ui_theme",
+            "path": "./themes/omarchy-color-theme.json"
+        }]
+    }
+}
+EOF
+
+  register_generated_extension "$ext_dir"
+}
 
 set_theme() {
   local editor_cmd="$1"
   local settings_path="$2"
+  local ext_base="$3"
 
   omarchy-cmd-present "$editor_cmd" || return 0
 
-  if [[ -f $VS_CODE_THEME ]]; then
-    theme_name=$(jq -r '.name' "$VS_CODE_THEME")
-    extension=$(jq -r '.extension' "$VS_CODE_THEME")
+  local theme_name=""
+
+  if [[ -f "$VS_CODE_THEME_DESCRIPTOR" ]]; then
+    # Theme specifies a preferred 3rd-party extension/theme pair.
+    theme_name=$(jq -r '.name' "$VS_CODE_THEME_DESCRIPTOR")
+    local extension
+    extension=$(jq -r '.extension' "$VS_CODE_THEME_DESCRIPTOR")
 
     if [[ -n $extension ]] && ! "$editor_cmd" --list-extensions 2>/dev/null | grep -Fxq "$extension"; then
       "$editor_cmd" --install-extension "$extension" >/dev/null 2>&1
     fi
+  elif [[ -f "$GENERATED_THEME" ]]; then
+    # VS Code only discovers local color themes through an extension package.
+    install_generated_extension "$ext_base/$GENERATED_EXTENSION_NAME"
+    theme_name="Omarchy"
+  fi
 
+  if [[ -n "$theme_name" ]]; then
     mkdir -p "$(dirname "$settings_path")"
     [[ -f $settings_path ]] || printf '{\n}\n' >"$settings_path"
 
@@ -34,7 +133,7 @@ set_theme() {
   fi
 }
 
-! omarchy-toggle-enabled skip-vscode-theme-changes && set_theme "code" "$HOME/.config/Code/User/settings.json"
-! omarchy-toggle-enabled skip-vscode-insiders-theme-changes && set_theme "code-insiders" "$HOME/.config/Code - Insiders/User/settings.json"
-! omarchy-toggle-enabled skip-codium-theme-changes && set_theme "codium" "$HOME/.config/VSCodium/User/settings.json"
-! omarchy-toggle-enabled skip-cursor-theme-changes && set_theme "cursor" "$HOME/.config/Cursor/User/settings.json"
+! omarchy-toggle-enabled skip-vscode-theme-changes && set_theme "code" "$HOME/.config/Code/User/settings.json" "$HOME/.vscode/extensions"
+! omarchy-toggle-enabled skip-vscode-insiders-theme-changes && set_theme "code-insiders" "$HOME/.config/Code - Insiders/User/settings.json" "$HOME/.vscode-insiders/extensions"
+! omarchy-toggle-enabled skip-codium-theme-changes && set_theme "codium" "$HOME/.config/VSCodium/User/settings.json" "$HOME/.vscode-oss/extensions"
+! omarchy-toggle-enabled skip-cursor-theme-changes && set_theme "cursor" "$HOME/.config/Cursor/User/settings.json" "$HOME/.cursor/extensions"
diff --git a/bin/omarchy-theme-switcher b/bin/omarchy-theme-switcher
new file mode 100755
index 00000000..6e20acbe
--- /dev/null
+++ b/bin/omarchy-theme-switcher
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# omarchy:summary=Open the Omarchy theme switcher
+
+preload=false
+
+if [[ $1 == "--preload" ]]; then
+  preload=true
+  shift
+fi
+
+USER_THEMES_PATH="$HOME/.config/omarchy/themes"
+OMARCHY_THEMES_PATH="$OMARCHY_PATH/themes"
+CACHE_PATH="${XDG_CACHE_HOME:-$HOME/.cache}/omarchy/theme-selector"
+preview_dir="$CACHE_PATH/previews"
+signature_file="$CACHE_PATH/signature"
+fast_signature_file="$CACHE_PATH/fast-signature"
+
+mkdir -p "$preview_dir"
+
+find_preview() {
+  local theme_path="$1"
+  local preview preview_name
+
+  for preview_name in preview.png preview.jpg preview.jpeg preview.webp preview.gif preview.bmp; do
+    preview=$(find -L "$theme_path" -maxdepth 1 -type f -iname "$preview_name" -print -quit 2>/dev/null)
+
+    if [[ -n $preview ]]; then
+      printf '%s\n' "$preview"
+      return
+    fi
+  done
+
+  if [[ -d $theme_path/backgrounds ]]; then
+    find -L "$theme_path/backgrounds" -maxdepth 1 -type f \( -iname '*.jpg' -o -iname '*.jpeg' -o -iname '*.png' -o -iname '*.gif' -o -iname '*.bmp' -o -iname '*.webp' \) -print 2>/dev/null | sort | head -n 1
+  fi
+}
+
+add_theme_preview() {
+  local theme_name="$1"
+  local preview="$2"
+  local extension="${preview##*.}"
+  extension="${extension,,}"
+
+  [[ -n $preview ]] || return
+  [[ -e $preview_dir/$theme_name.$extension ]] && return
+
+  ln -s "$preview" "$preview_dir/$theme_name.$extension"
+}
+
+fast_signature="v1"$'\n'
+for theme_dir in "$USER_THEMES_PATH" "$OMARCHY_THEMES_PATH"; do
+  if [[ -d $theme_dir ]]; then
+    fast_signature+="$theme_dir:$(stat -Lc '%Y' "$theme_dir")"$'\n'
+
+    while IFS= read -r -d '' theme_path; do
+      fast_signature+="$theme_path:$(stat -Lc '%Y' "$theme_path")"$'\n'
+    done < <(find -L "$theme_dir" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) -print0 2>/dev/null | sort -z)
+  fi
+done
+
+if [[ ! -f $fast_signature_file ]] || ! cmp -s "$fast_signature_file" <(printf '%s' "$fast_signature"); then
+  theme_signature=""
+  for theme_dir in "$USER_THEMES_PATH" "$OMARCHY_THEMES_PATH"; do
+    if [[ -d $theme_dir ]]; then
+      theme_signature+="$theme_dir:$(stat -Lc '%Y' "$theme_dir")"$'\n'
+
+      while IFS= read -r -d '' theme_path; do
+        preview=$(find_preview "$theme_path")
+        theme_signature+="$theme_path:$(stat -Lc '%Y' "$theme_path")"$'\n'
+
+        if [[ -n $preview ]]; then
+          theme_signature+="$preview:$(stat -Lc '%s:%Y' "$preview")"$'\n'
+        fi
+      done < <(find -L "$theme_dir" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) -print0 2>/dev/null | sort -z)
+    fi
+  done
+fi
+
+if [[ ! -f $fast_signature_file ]] || ! cmp -s "$fast_signature_file" <(printf '%s' "$fast_signature"); then
+  rm -rf "$preview_dir"
+  mkdir -p "$preview_dir"
+
+  while IFS= read -r theme_path; do
+    theme_name=${theme_path##*/}
+    preview=$(find_preview "$theme_path")
+
+    if [[ -z $preview ]]; then
+      preview=$(find_preview "$OMARCHY_THEMES_PATH/$theme_name")
+    fi
+
+    add_theme_preview "$theme_name" "$preview"
+  done < <(find -L "$USER_THEMES_PATH" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) -print 2>/dev/null | sort)
+
+  while IFS= read -r theme_path; do
+    theme_name=${theme_path##*/}
+    preview=$(find_preview "$theme_path")
+    add_theme_preview "$theme_name" "$preview"
+  done < <(find -L "$OMARCHY_THEMES_PATH" -mindepth 1 -maxdepth 1 -type d -print 2>/dev/null | sort)
+
+  printf '%s' "$theme_signature" >"$signature_file"
+  printf '%s' "$fast_signature" >"$fast_signature_file"
+fi
+
+current_theme=$(cat "$HOME/.config/omarchy/current/theme.name" 2>/dev/null)
+selected_preview=""
+for extension in png jpg jpeg webp gif bmp; do
+  if [[ -e $preview_dir/$current_theme.$extension ]]; then
+    selected_preview="$preview_dir/$current_theme.$extension"
+    break
+  fi
+done
+menu_args=(
+  --print-name
+  --show-labels
+  --filterable
+  --lazy-thumbnails
+  --selected "$selected_preview"
+)
+
+if [[ $preload == true ]]; then
+  menu_args+=(--preload)
+fi
+
+exec omarchy-menu-images "${menu_args[@]}" "$preview_dir"
diff --git a/bin/omarchy-toggle b/bin/omarchy-toggle
index f5eb1a3b..a36f0e63 100755
--- a/bin/omarchy-toggle
+++ b/bin/omarchy-toggle
@@ -1,27 +1,42 @@
 #!/bin/bash
 
 # omarchy:summary=Toggle Omarchy features between enabled and disabled
-# omarchy:args=[--enabled-notification <text>] [--disabled-notification <text>] <flag-name>
+# omarchy:args=<flag-name> [toggle|on|off]
 
-ENABLED_NOTIFICATION=""
-DISABLED_NOTIFICATION=""
-
-while [[ $# -gt 1 ]]; do
-  case $1 in
-    --enabled-notification) ENABLED_NOTIFICATION="$2"; shift 2 ;;
-    --disabled-notification) DISABLED_NOTIFICATION="$2"; shift 2 ;;
-    *) break ;;
-  esac
-done
+if (($# < 1)); then
+  echo "Usage: omarchy-toggle <flag-name> [toggle|on|off]" >&2
+  exit 1
+fi
 
 FLAG_NAME="$1"
+ACTION="${2:-toggle}"
 FLAG="$HOME/.local/state/omarchy/toggles/$FLAG_NAME"
 
-if [[ -f $FLAG ]]; then
-  rm $FLAG
-  [[ -n $DISABLED_NOTIFICATION ]] && notify-send -u low "$DISABLED_NOTIFICATION"
-else
-  mkdir -p "$(dirname $FLAG)"
-  touch $FLAG
-  [[ -n $ENABLED_NOTIFICATION ]] && notify-send -u low "$ENABLED_NOTIFICATION"
-fi
+enable() {
+  mkdir -p "$(dirname "$FLAG")"
+  touch "$FLAG"
+}
+
+disable() {
+  rm -f "$FLAG"
+}
+
+case "$ACTION" in
+  toggle|"")
+    if [[ -f $FLAG ]]; then
+      disable
+    else
+      enable
+    fi
+    ;;
+  on)
+    enable
+    ;;
+  off)
+    disable
+    ;;
+  *)
+    echo "Usage: omarchy-toggle <flag-name> [toggle|on|off]" >&2
+    exit 1
+    ;;
+esac
diff --git a/bin/omarchy-toggle-bar b/bin/omarchy-toggle-bar
new file mode 100755
index 00000000..f76fe049
--- /dev/null
+++ b/bin/omarchy-toggle-bar
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# omarchy:summary=Toggle bar visibility without killing the Omarchy shell
+# omarchy:args=[toggle|on|off]
+# omarchy:examples=omarchy toggle bar | omarchy toggle bar off | omarchy toggle bar on
+
+omarchy-toggle bar-off "${1:-toggle}"
diff --git a/bin/omarchy-toggle-idle b/bin/omarchy-toggle-idle
index 622f1ab4..26e948ed 100755
--- a/bin/omarchy-toggle-idle
+++ b/bin/omarchy-toggle-idle
@@ -1,13 +1,71 @@
 #!/bin/bash
 
-# omarchy:summary=Toggle hypridle idle locking
+# omarchy:summary=Toggle idle behavior so the system either idles normally or stays awake
+# omarchy:group=toggle
+# omarchy:args=[toggle|stay-awake|allow-idle|status]
+# omarchy:examples=omarchy toggle idle | omarchy toggle idle stay-awake | omarchy-toggle-idle --status
 
-if pgrep -x hypridle >/dev/null; then
-  pkill -x hypridle
-  notify-send -u low "󱫖    Stop locking computer when idle"
-else
-  uwsm-app -- hypridle >/dev/null 2>&1 &
-  notify-send -u low "󱫖    Now locking computer when idle"
-fi
+STATE_DIR="$HOME/.local/state/omarchy/indicators"
+STATE_FILE="$STATE_DIR/stay-awake"
 
-pkill -RTMIN+9 waybar
+stay_awake_enabled() {
+  [[ -f $STATE_FILE ]]
+}
+
+print_status() {
+  if stay_awake_enabled; then
+    printf '{"enabled":true,"class":"enabled","tooltip":"Allow Idle Lock & Screensaver"}\n'
+  else
+    printf '{"enabled":false,"class":"disabled","tooltip":"Stay Awake"}\n'
+  fi
+}
+
+print_idle_state() {
+  if stay_awake_enabled; then
+    printf 'disabled\n'
+  else
+    printf 'enabled\n'
+  fi
+}
+
+apply_state() {
+  case "$1" in
+    stay-awake)
+      mkdir -p "$STATE_DIR"
+      touch "$STATE_FILE"
+      omarchy-shell -q idle disable
+      ;;
+    allow-idle)
+      rm -f "$STATE_FILE"
+      omarchy-shell -q idle enable
+      ;;
+  esac
+
+  omarchy-shell -q omarchy.indicators refresh
+}
+
+case "${1:-toggle}" in
+  toggle)
+    if stay_awake_enabled; then
+      apply_state allow-idle
+    else
+      apply_state stay-awake
+    fi
+    print_idle_state
+    ;;
+  stay-awake|awake|on)
+    apply_state stay-awake
+    print_idle_state
+    ;;
+  allow-idle|idle|off)
+    apply_state allow-idle
+    print_idle_state
+    ;;
+  status|--status)
+    print_status
+    ;;
+  *)
+    echo "Usage: omarchy-toggle-idle [toggle|stay-awake|allow-idle|status]" >&2
+    exit 1
+    ;;
+esac
diff --git a/bin/omarchy-toggle-nightlight b/bin/omarchy-toggle-nightlight
index c308b757..3db4e41f 100755
--- a/bin/omarchy-toggle-nightlight
+++ b/bin/omarchy-toggle-nightlight
@@ -1,32 +1,52 @@
 #!/bin/bash
 
 # omarchy:summary=Toggle nightlight screen temperature
+# omarchy:args=[--status]
 # omarchy:examples=omarchy toggle nightlight
 
 ON_TEMP=4000
-OFF_TEMP=6000
+OFF_TEMP=6500
+IDENTITY_TEMP=6000
+
+current_temp() {
+  local output
+
+  output=$(hyprctl hyprsunset temperature 2>/dev/null) || return
+  grep -oE '[0-9]+' <<<"$output" | head -n1
+}
+
+status_json() {
+  local temp enabled
+
+  temp=$(current_temp)
+  if [[ -n $temp ]] && (( temp < IDENTITY_TEMP )); then
+    enabled=true
+  else
+    enabled=false
+  fi
+
+  jq -cn --argjson enabled "$enabled" --arg temp "$temp" \
+    '{enabled:$enabled, temperature:(($temp | tonumber?) // null)}'
+}
+
+if [[ ${1:-} == "--status" ]]; then
+  status_json
+  exit 0
+fi
 
 # Ensure hyprsunset is running
-if ! pgrep -x hyprsunset; then
+if ! pgrep -x hyprsunset >/dev/null; then
   setsid uwsm-app -- hyprsunset &
   sleep 1 # Give it time to register
 fi
 
 # Query the current temperature
-CURRENT_TEMP=$(hyprctl hyprsunset temperature 2>/dev/null | grep -oE '[0-9]+')
+CURRENT_TEMP=$(current_temp)
 
-restart_nightlighted_waybar() {
-  if grep -q "custom/nightlight" ~/.config/waybar/config.jsonc; then
-    omarchy-restart-waybar # restart waybar in case user has waybar module for hyprsunset
-  fi
-}
-
-if [[ $CURRENT_TEMP == $OFF_TEMP ]]; then
+if [[ -z $CURRENT_TEMP || $CURRENT_TEMP == $OFF_TEMP ]]; then
   hyprctl hyprsunset temperature $ON_TEMP
-  notify-send -u low "  Nightlight screen temperature"
-  restart_nightlighted_waybar
 else
   hyprctl hyprsunset temperature $OFF_TEMP
-  notify-send -u low "   Daylight screen temperature"
-  restart_nightlighted_waybar
 fi
+
+omarchy-shell -q omarchy.indicators refresh
diff --git a/bin/omarchy-toggle-notification-silencing b/bin/omarchy-toggle-notification-silencing
index 5e327ec2..ee336e3d 100755
--- a/bin/omarchy-toggle-notification-silencing
+++ b/bin/omarchy-toggle-notification-silencing
@@ -2,12 +2,5 @@
 
 # omarchy:summary=Toggle notification do-not-disturb mode
 
-makoctl mode -t do-not-disturb
-
-if makoctl mode | grep -q 'do-not-disturb'; then
-  notify-send -u low "󰂛    Silenced notifications"
-else
-  notify-send -u low "󰂚    Enabled notifications"
-fi
-
-pkill -RTMIN+10 waybar
+state=$(omarchy-shell notifications toggleDnd 2>/dev/null || echo "")
+omarchy-shell -q Indicators refresh
diff --git a/bin/omarchy-toggle-screensaver b/bin/omarchy-toggle-screensaver
index 681c35ef..a0f74ea7 100755
--- a/bin/omarchy-toggle-screensaver
+++ b/bin/omarchy-toggle-screensaver
@@ -2,7 +2,10 @@
 
 # omarchy:summary=Toggle screensaver availability
 
-omarchy-toggle \
-  --enabled-notification "󱄄   Screensaver disabled" \
-  --disabled-notification "󱄄   Screensaver enabled" \
-  screensaver-off
+if omarchy-toggle-enabled screensaver-off; then
+  omarchy-toggle screensaver-off
+  omarchy-notification-send -g 󱄄 "Screensaver enabled"
+else
+  omarchy-toggle screensaver-off
+  omarchy-notification-send -g 󱄄 "Screensaver disabled"
+fi
diff --git a/bin/omarchy-toggle-suspend b/bin/omarchy-toggle-suspend
index c9ecac0a..22cda36f 100755
--- a/bin/omarchy-toggle-suspend
+++ b/bin/omarchy-toggle-suspend
@@ -2,7 +2,10 @@
 
 # omarchy:summary=Toggle suspend availability in the system menu
 
-omarchy-toggle \
-  --enabled-notification "󰒲   Suspend removed from system menu" \
-  --disabled-notification "󰒲   Suspend now available in system menu" \
-  suspend-off
+if omarchy-toggle-enabled suspend-off; then
+  omarchy-toggle suspend-off
+  omarchy-notification-send -g 󰒲 "Suspend now available in system menu"
+else
+  omarchy-toggle suspend-off
+  omarchy-notification-send -g 󰒲 "Suspend removed from system menu"
+fi
diff --git a/bin/omarchy-toggle-touchpad b/bin/omarchy-toggle-touchpad
index 06764dab..3ab72616 100755
--- a/bin/omarchy-toggle-touchpad
+++ b/bin/omarchy-toggle-touchpad
@@ -3,7 +3,7 @@
 # omarchy:summary=Enable, disable, or toggle the touchpad
 # omarchy:args=[on|off|toggle]
 
-STATE_CONF="$HOME/.local/state/omarchy/toggles/hypr/touchpad-disabled.conf"
+STATE_FILE="$HOME/.local/state/omarchy/toggles/hypr/touchpad-disabled.lua"
 
 device="$(omarchy-hw-touchpad)"
 
@@ -13,20 +13,20 @@ if [[ -z $device ]]; then
 fi
 
 enable() {
-  hyprctl keyword "device[$device]:enabled" true >/dev/null
-  rm -f "$STATE_CONF"
-  omarchy-swayosd-client --custom-icon input-touchpad-symbolic --custom-message "Touchpad enabled"
+  hyprctl eval "hl.device({ name = \"$device\", enabled = true })" >/dev/null
+  rm -f "$STATE_FILE"
+  omarchy-osd -i touchpad -m "Touchpad enabled"
 }
 
 disable() {
-  hyprctl keyword "device[$device]:enabled" false >/dev/null
-  mkdir -p "$(dirname "$STATE_CONF")"
-  printf 'device {\n    name = %s\n    enabled = false\n}\n' "$device" > "$STATE_CONF"
-  omarchy-swayosd-client --custom-icon touchpad-disabled-symbolic --custom-message "Touchpad disabled"
+  hyprctl eval "hl.device({ name = \"$device\", enabled = false })" >/dev/null
+  mkdir -p "$(dirname "$STATE_FILE")"
+  printf 'hl.device({ name = "%s", enabled = false })\n' "$device" >"$STATE_FILE"
+  omarchy-osd -i touchpad -m "Touchpad disabled"
 }
 
 case "${1:-toggle}" in
   on) enable ;;
   off) disable ;;
-  toggle) if [[ -f $STATE_CONF ]]; then enable; else disable; fi ;;
+  toggle) if [[ -f $STATE_FILE ]]; then enable; else disable; fi ;;
 esac
diff --git a/bin/omarchy-toggle-touchscreen b/bin/omarchy-toggle-touchscreen
index a0b5ccb0..45b1284f 100755
--- a/bin/omarchy-toggle-touchscreen
+++ b/bin/omarchy-toggle-touchscreen
@@ -3,7 +3,7 @@
 # omarchy:summary=Enable, disable, or toggle the touch functionality of the screen
 # omarchy:args=[on|off|toggle]
 
-STATE_CONF="$HOME/.local/state/omarchy/toggles/hypr/touchscreen-disabled.conf"
+STATE_FILE="$HOME/.local/state/omarchy/toggles/hypr/touchscreen-disabled.lua"
 
 device="$(omarchy-hw-touchscreen)"
 
@@ -13,20 +13,20 @@ if [[ -z $device ]]; then
 fi
 
 enable() {
-  hyprctl keyword "device[$device]:enabled" true >/dev/null
-  rm -f "$STATE_CONF"
-  omarchy-swayosd-client --custom-icon device-support-touch-symbolic --custom-message "Touchscreen enabled"
+  hyprctl eval "hl.device({ name = \"$device\", enabled = true })" >/dev/null
+  rm -f "$STATE_FILE"
+  omarchy-osd -i touch -m "Touchscreen enabled"
 }
 
 disable() {
-  hyprctl keyword "device[$device]:enabled" false >/dev/null
-  mkdir -p "$(dirname "$STATE_CONF")"
-  printf 'device {\n    name = %s\n    enabled = false\n}\n' "$device" > "$STATE_CONF"
-  omarchy-swayosd-client --custom-icon touch-disabled-symbolic --custom-message "Touchscreen disabled"
+  hyprctl eval "hl.device({ name = \"$device\", enabled = false })" >/dev/null
+  mkdir -p "$(dirname "$STATE_FILE")"
+  printf 'hl.device({ name = "%s", enabled = false })\n' "$device" >"$STATE_FILE"
+  omarchy-osd -i touch -m "Touchscreen disabled"
 }
 
 case "${1:-toggle}" in
   on) enable ;;
   off) disable ;;
-  toggle) if [[ -f $STATE_CONF ]]; then enable; else disable; fi ;;
+  toggle) if [[ -f $STATE_FILE ]]; then enable; else disable; fi ;;
 esac
diff --git a/bin/omarchy-toggle-waybar b/bin/omarchy-toggle-waybar
deleted file mode 100755
index b441f011..00000000
--- a/bin/omarchy-toggle-waybar
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Toggle Waybar visibility
-# omarchy:examples=omarchy toggle waybar
-
-omarchy-toggle waybar-off
-
-if pgrep -x waybar >/dev/null; then
-  pkill -x waybar
-else
-  uwsm-app -- waybar >/dev/null 2>&1 &
-fi
diff --git a/bin/omarchy-transcode b/bin/omarchy-transcode
index 1602e493..3a6acfd1 100755
--- a/bin/omarchy-transcode
+++ b/bin/omarchy-transcode
@@ -4,7 +4,7 @@
 # omarchy:name=
 # omarchy:summary=Transcode pictures and videos for sharing
 # omarchy:args=[--path path] [input] [format] [resolution]
-# omarchy:examples=omarchy transcode|omarchy transcode --path ~/Downloads|omarchy transcode ~/Videos/demo.mov mp4 1080p|omarchy transcode ~/Pictures/wallpaper.heic jpg medium
+# omarchy:examples=omarchy transcode|omarchy transcode --path ~/Downloads|omarchy transcode ~/Videos/demo.mov mp4 1080p|omarchy transcode ~/Pictures/background.heic jpg medium
 
 set -euo pipefail
 
@@ -13,7 +13,7 @@ usage() {
 Usage:
   omarchy transcode [--path path] [input] [format] [resolution]
 
-With no input, pick a picture or video with Walker from ~/Pictures and ~/Videos,
+With no input, pick a picture or video from ~/Pictures and ~/Videos,
 or only from --path when provided. Then pick the output format and resolution.
 
 Options:
@@ -136,7 +136,7 @@ main() {
     case "$1" in
     --path)
       shift
-      [[ $# -gt 0 ]] || { echo "Missing value for --path" >&2; return 2; }
+      (( $# > 0 )) || { echo "Missing value for --path" >&2; return 2; }
       search_path="$1"
       ;;
     --help | -h)
@@ -193,14 +193,14 @@ main() {
   output=$(output_path "$input" "$format" "$resolution")
 
   if [[ $type == "video" ]]; then
-    omarchy-notification-send "" "Transcoding video…" "$(basename -- "$input") to $format ($resolution)"
+    omarchy-notification-send -g  "Transcoding video…" "$(basename -- "$input") to $format ($resolution)"
     transcode_video "$input" "$format" "$resolution" "$output"
     copy_to_clipboard "$output"
-    omarchy-notification-send "" "Transcoded to $resolution $format" "Saved and copied to clipboard."
+    omarchy-notification-send -g  "Transcoded to $resolution $format" "Saved and copied to clipboard."
   else
     transcode_picture "$input" "$format" "$resolution" "$output"
     copy_to_clipboard "$output"
-    omarchy-notification-send "" "Transcoded to $resolution $format" "Saved and copied to clipboard."
+    omarchy-notification-send -g  "Transcoded to $resolution $format" "Saved and copied to clipboard."
   fi
 }
 
diff --git a/bin/omarchy-tui-install b/bin/omarchy-tui-install
index d529b54f..2ddb0778 100755
--- a/bin/omarchy-tui-install
+++ b/bin/omarchy-tui-install
@@ -1,40 +1,76 @@
 #!/bin/bash
 
 # omarchy:summary=Create a desktop launcher for a terminal UI app
-# omarchy:args=[name command window-style icon-url]
+# omarchy:args=[name command window-style icon-url-or-name]
 
 set -e
 
+ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
+
+safe_icon_name() {
+  printf '%s\n' "$1" \
+    | tr '[:upper:]' '[:lower:]' \
+    | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//'
+}
+
+icon_name_from_ref() {
+  local ref="$1"
+  local name
+  name=$(basename "$ref")
+
+  if [[ $name == *.* ]]; then
+    safe_icon_name "${name%.*}"
+  else
+    printf '%s\n' "$name"
+  fi
+}
+
+install_user_icon() {
+  local source="$1"
+  local name="$2"
+  local ext="${source##*.}"
+
+  [[ $ext == "$source" ]] && ext="png"
+  mkdir -p "$ICON_DIR"
+  cp "$source" "$ICON_DIR/$name.$ext"
+  gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
+  printf '%s\n' "$name"
+}
+
 if (( $# != 4 )); then
   echo -e "\e[32mLet's create a TUI shortcut you can start with the app launcher.\n\e[0m"
   APP_NAME=$(gum input --prompt "Name> " --placeholder "My TUI")
   APP_EXEC=$(gum input --prompt "Launch Command> " --placeholder "lazydocker or bash -c 'dust; read -n 1 -s'")
   WINDOW_STYLE=$(gum choose --header "Window style" float tile)
-  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG or SVG!)")
+  ICON_REF=$(gum input --prompt "Icon URL/name> " --placeholder "See https://dashboardicons.com or enter an installed icon name")
 else
   APP_NAME="$1"
   APP_EXEC="$2"
   WINDOW_STYLE="$3"
-  ICON_URL="$4"
+  ICON_REF="$4"
 fi
 
-if [[ -z $APP_NAME || -z $APP_EXEC || -z $ICON_URL ]]; then
-  echo "You must set app name, app command, and icon URL!"
+if [[ -z $APP_NAME || -z $APP_EXEC || -z $ICON_REF ]]; then
+  echo "You must set app name, app command, and icon URL/name!"
   exit 1
 fi
 
-ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
+mkdir -p "$(dirname "$DESKTOP_FILE")"
 
-if [[ ! $ICON_URL =~ ^https?:// ]] && [[ -f $ICON_URL ]]; then
-  ICON_PATH="$ICON_URL"
-else
-  ICON_PATH="$ICON_DIR/$APP_NAME.png"
+if [[ $ICON_REF =~ ^https?:// ]]; then
+  ICON_VALUE=$(safe_icon_name "$APP_NAME")
   mkdir -p "$ICON_DIR"
-  if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
+  if ! curl -sL -o "$ICON_DIR/$ICON_VALUE.png" "$ICON_REF"; then
     echo "Error: Failed to download icon."
     exit 1
   fi
+  gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
+elif [[ -f $ICON_REF ]]; then
+  ICON_VALUE=$(install_user_icon "$ICON_REF" "$(safe_icon_name "$APP_NAME")")
+else
+  # Bundled Omarchy icons are package-owned under /usr/share/icons/hicolor.
+  ICON_VALUE=$(icon_name_from_ref "$ICON_REF")
 fi
 
 if [[ $WINDOW_STYLE == "float" ]]; then
@@ -51,7 +87,7 @@ Comment=$APP_NAME
 Exec=xdg-terminal-exec --app-id=$APP_CLASS -e $APP_EXEC
 Terminal=false
 Type=Application
-Icon=$ICON_PATH
+Icon=$ICON_VALUE
 StartupNotify=true
 EOF
 
diff --git a/bin/omarchy-tui-remove b/bin/omarchy-tui-remove
index 369528e2..c2c39d07 100755
--- a/bin/omarchy-tui-remove
+++ b/bin/omarchy-tui-remove
@@ -1,11 +1,12 @@
 #!/bin/bash
 
-# omarchy:summary=Remove terminal UI desktop launchers
-# omarchy:args=[name...]
+# omarchy:summary=Remove a terminal UI desktop launcher
+# omarchy:args=[name]
 
 set -e
 
-ICON_DIR="$HOME/.local/share/applications/icons"
+ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
+OLD_ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"
 
 if (( $# == 0 )); then
@@ -17,30 +18,22 @@ if (( $# == 0 )); then
   done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)
 
   if ((${#TUIS[@]})); then
-    IFS=$'\n' SORTED_TUIS=($(sort <<<"${TUIS[*]}"))
-    unset IFS
-    APP_NAMES_STRING=$(gum choose --no-limit --header "Select TUI to remove..." --selected-prefix="✗ " "${SORTED_TUIS[@]}")
-    # Convert newline-separated string to array
-    APP_NAMES=()
-    while IFS= read -r line; do
-      [[ -n $line ]] && APP_NAMES+=("$line")
-    done <<< "$APP_NAMES_STRING"
+    mapfile -t SORTED_TUIS < <(printf '%s\n' "${TUIS[@]}" | sort)
+    APP_NAME=$(omarchy-menu-select "Select TUI to remove" "${SORTED_TUIS[@]}" -- --width 520 --maxheight 520)
   else
     echo "No TUIs to remove."
     exit 1
   fi
 else
-  # Use array to preserve spaces in app names
-  APP_NAMES=("$@")
+  APP_NAME="$*"
 fi
 
-if (( ${#APP_NAMES[@]} == 0 )); then
-  echo "You must provide TUI names."
+if [[ -z $APP_NAME ]]; then
+  echo "You must select a TUI to remove."
   exit 1
 fi
 
-for APP_NAME in "${APP_NAMES[@]}"; do
-  rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
-  rm -f "$ICON_DIR/$APP_NAME.png"
-  echo "Removed $APP_NAME"
-done
+icon_name=$(printf '%s\n' "$APP_NAME" | tr '[:upper:]' '[:lower:]' | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//')
+rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
+rm -f "$ICON_DIR/$icon_name.png" "$ICON_DIR/$APP_NAME.png" "$OLD_ICON_DIR/$APP_NAME.png"
+omarchy-notification-send -g  "TUI removed" "$APP_NAME"
diff --git a/bin/omarchy-tui-remove-all b/bin/omarchy-tui-remove-all
index 7f1c11f0..f947a198 100755
--- a/bin/omarchy-tui-remove-all
+++ b/bin/omarchy-tui-remove-all
@@ -5,7 +5,8 @@
 set -e
 
 APP_DIR="${1:-$HOME/.local/share/applications}"
-ICON_DIR="$HOME/.local/share/applications/icons"
+ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
+OLD_ICON_DIR="$HOME/.local/share/applications/icons"
 
 echo "Scanning for TUIs in $APP_DIR..."
 
@@ -23,9 +24,10 @@ fi
 
 for file in "${tui_desktop_files[@]}"; do
   app_name=$(basename "$file" .desktop)
+  icon_name=$(printf '%s\n' "$app_name" | tr '[:upper:]' '[:lower:]' | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//')
   echo "Removing TUI: $app_name"
   rm -f "$file"
-  rm -f "$ICON_DIR/$app_name.png"
+  rm -f "$ICON_DIR/$icon_name.png" "$ICON_DIR/$app_name.png" "$OLD_ICON_DIR/$app_name.png"
 done
 
 if command -v update-desktop-database &>/dev/null; then
diff --git a/bin/omarchy-tz-select b/bin/omarchy-tz-select
deleted file mode 100755
index 6ddb26c2..00000000
--- a/bin/omarchy-tz-select
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Select and set the system timezone
-# omarchy:requires-sudo=true
-
-timezone=$(timedatectl list-timezones | gum filter --height 20 --header "Set timezone") || exit 1
-sudo timedatectl set-timezone "$timezone"
-echo "Timezone is now set to $timezone"
-omarchy-restart-waybar
diff --git a/bin/omarchy-update b/bin/omarchy-update
index f1ca5bc0..f5727e5e 100755
--- a/bin/omarchy-update
+++ b/bin/omarchy-update
@@ -7,17 +7,100 @@
 
 set -e
 
-# Run the update inside a PTY so pacman/yay keep showing download progress
-# while still logging the full session for later analysis.
-if [[ -z $OMARCHY_UPDATE_LOGGED ]]; then
+if [[ -z ${OMARCHY_UPDATE_LOGGED:-} ]]; then
   script_command=$(printf '%q ' "$0" "$@")
   exec env OMARCHY_UPDATE_LOGGED=1 script -qefc "$script_command" "/tmp/omarchy-update.log"
 fi
 
+acquire_update_lock() {
+  local lock_dir="${XDG_RUNTIME_DIR:-/tmp}"
+  local lock_path="$lock_dir/omarchy-update.lock"
+  local lock_fd_path=""
+
+  mkdir -p "$lock_dir" 2>/dev/null || true
+
+  if [[ -n ${OMARCHY_UPDATE_LOCK_FD:-} && -e /proc/$$/fd/$OMARCHY_UPDATE_LOCK_FD ]]; then
+    lock_fd_path=$(readlink -f "/proc/$$/fd/$OMARCHY_UPDATE_LOCK_FD" 2>/dev/null || true)
+    if [[ $lock_fd_path == "$(readlink -m "$lock_path")" ]] && flock -n "$OMARCHY_UPDATE_LOCK_FD"; then
+      return 0
+    fi
+  fi
+
+  exec {OMARCHY_UPDATE_LOCK_FD}>"$lock_path"
+  if ! flock -n "$OMARCHY_UPDATE_LOCK_FD"; then
+    echo "An Omarchy update is already running."
+    exit 1
+  fi
+  export OMARCHY_UPDATE_LOCK_FD
+}
+
+update_disabled_idle=0
+sleep_inhibit_pid=""
+
+disable_sleep_for_update() {
+  command -v systemd-inhibit >/dev/null 2>&1 || return 0
+
+  systemd-inhibit \
+    --what=sleep:idle \
+    --who=omarchy-update \
+    --why="Omarchy update in progress" \
+    --mode=block \
+    sleep infinity >/dev/null 2>&1 &
+  sleep_inhibit_pid=$!
+}
+
+disable_idle_for_update() {
+  local stay_awake_state="$HOME/.local/state/omarchy/indicators/stay-awake"
+
+  if [[ ! -f $stay_awake_state ]]; then
+    omarchy-toggle-idle stay-awake >/dev/null 2>&1 || true
+    update_disabled_idle=1
+  fi
+}
+
+restore_update_inhibitors() {
+  if (( update_disabled_idle )); then
+    omarchy-toggle-idle allow-idle >/dev/null 2>&1 || true
+  fi
+
+  if [[ -n $sleep_inhibit_pid ]]; then
+    kill "$sleep_inhibit_pid" >/dev/null 2>&1 || true
+    wait "$sleep_inhibit_pid" >/dev/null 2>&1 || true
+  fi
+}
+
+run_update_pipeline() {
+  disable_sleep_for_update
+  disable_idle_for_update
+
+  omarchy-update-keyring
+  omarchy-update-system-pkgs
+  omarchy-migrate
+  omarchy-hook post-update
+  omarchy-update-aur-pkgs
+  omarchy-update-mise
+  omarchy-update-orphan-pkgs
+
+  omarchy-update-analyze-logs
+
+  # Re-check after updates so the status bar reflects any remaining updates.
+  # This clears the state when everything is current, so a separate reset command
+  # is not needed.
+  if omarchy-update-available >/dev/null; then
+    omarchy-shell -q omarchy.system-update refresh
+  else
+    omarchy-shell -q omarchy.system-update clear
+  fi
+
+  omarchy-update-restart
+}
+
+acquire_update_lock
+
+trap restore_update_inhibitors EXIT
 trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m"' ERR
 
-if [[ $1 == "-y" ]] || omarchy-update-confirm; then
+if [[ ${1:-} == "-y" ]] || omarchy-update-confirm; then
   omarchy-snapshot create || (($? == 127))
-  omarchy-update-git
-  omarchy-update-perform
+  run_update_pipeline
 fi
diff --git a/bin/omarchy-update-available b/bin/omarchy-update-available
index 92c57adc..6755d349 100755
--- a/bin/omarchy-update-available
+++ b/bin/omarchy-update-available
@@ -1,24 +1,119 @@
 #!/bin/bash
 
-# omarchy:summary=Get remote tag
+# omarchy:summary=Check whether system or AUR packages have available updates.
 
-latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
-if [[ -z $latest_tag ]]; then
-  echo "Error: Could not retrieve latest tag."
-  exit 1
-fi
+set -euo pipefail
 
-# Get local tag
-current_tag=$(git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1))
-if [[ -z $current_tag ]]; then
-  echo "Error: Could not retrieve current tag."
-  exit 1
-fi
+CHECK_TIMEOUT="${OMARCHY_UPDATE_CHECK_TIMEOUT:-60}"
+STATE_DIR="${XDG_STATE_HOME:-$HOME/.local/state}/omarchy/updates"
+TMP_PARENT="${TMPDIR:-/tmp}"
 
-if [[ $current_tag != $latest_tag ]]; then
-  echo "Omarchy update available ($latest_tag)"
-  exit 0
+mkdir -p "$STATE_DIR"
+
+tmp_dir=$(mktemp -d "$TMP_PARENT/omarchy-update-available.XXXXXX")
+trap 'rm -rf "$tmp_dir"' EXIT
+
+packages_raw="$tmp_dir/packages.raw"
+packages_tmp="$tmp_dir/packages"
+aur_raw="$tmp_dir/aur.raw"
+aur_tmp="$tmp_dir/aur"
+errors_tmp="$tmp_dir/errors"
+
+packages_file="$STATE_DIR/packages"
+aur_file="$STATE_DIR/aur"
+available_file="$STATE_DIR/available"
+checked_at_file="$STATE_DIR/checked-at"
+error_file="$STATE_DIR/error"
+
+: >"$packages_raw"
+: >"$packages_tmp"
+: >"$aur_raw"
+: >"$aur_tmp"
+: >"$errors_tmp"
+
+strip_update_output() {
+  local source="$1"
+  local destination="$2"
+
+  sed -E 's/\x1B\[[0-9;]*m//g' "$source" | sed '/^[[:space:]]*$/d' >"$destination"
+}
+
+check_system_packages() {
+  local status=0
+
+  if command -v checkupdates >/dev/null 2>&1 && command -v fakeroot >/dev/null 2>&1; then
+    CHECKUPDATES_DB="$tmp_dir/checkupdates-db" timeout "$CHECK_TIMEOUT" checkupdates --nocolor >"$packages_raw" 2>"$tmp_dir/checkupdates.err" || status=$?
+
+    case "$status" in
+      0|2)
+        ;;
+      124)
+        echo "System package update check timed out" >>"$errors_tmp"
+        ;;
+      *)
+        echo "System package update check failed" >>"$errors_tmp"
+        sed '/^[[:space:]]*$/d' "$tmp_dir/checkupdates.err" >>"$errors_tmp" || true
+        ;;
+    esac
+  elif command -v pacman >/dev/null 2>&1; then
+    # Fallback for systems that have not picked up pacman-contrib/fakeroot yet.
+    # This only reports updates already known to the local sync database.
+    pacman -Qu --color never >"$packages_raw" 2>/dev/null || true
+  else
+    echo "pacman is not available" >>"$errors_tmp"
+  fi
+
+  strip_update_output "$packages_raw" "$packages_tmp"
+}
+
+check_aur_packages() {
+  local status=0
+
+  command -v pacman >/dev/null 2>&1 || return 0
+  command -v yay >/dev/null 2>&1 || return 0
+  pacman -Qem >/dev/null 2>&1 || return 0
+
+  timeout "$CHECK_TIMEOUT" yay --color never -Qua >"$aur_raw" 2>"$tmp_dir/yay.err" || status=$?
+
+  case "$status" in
+    0|1)
+      ;;
+    124)
+      echo "AUR package update check timed out" >>"$errors_tmp"
+      ;;
+    *)
+      echo "AUR package update check failed" >>"$errors_tmp"
+      sed '/^[[:space:]]*$/d' "$tmp_dir/yay.err" >>"$errors_tmp" || true
+      ;;
+  esac
+
+  strip_update_output "$aur_raw" "$aur_tmp"
+  grep -vw '\[ignored\]$' "$aur_tmp" >"$aur_tmp.filtered" || true
+  mv "$aur_tmp.filtered" "$aur_tmp"
+}
+
+check_system_packages
+check_aur_packages
+
+cp "$packages_tmp" "$packages_file"
+cp "$aur_tmp" "$aur_file"
+cat "$packages_tmp" "$aur_tmp" >"$available_file"
+date --iso-8601=seconds >"$checked_at_file"
+
+if [[ -s $errors_tmp ]]; then
+  cp "$errors_tmp" "$error_file"
 else
-  echo "Omarchy is up to date ($current_tag)"
-  exit 1
+  rm -f "$error_file"
 fi
+
+if [[ -s $available_file ]]; then
+  cat "$available_file"
+  exit 0
+fi
+
+if [[ -s $error_file ]]; then
+  cat "$error_file" >&2
+fi
+
+echo "System is up to date"
+exit 1
diff --git a/bin/omarchy-update-available-reset b/bin/omarchy-update-available-reset
deleted file mode 100755
index d1e2ca4c..00000000
--- a/bin/omarchy-update-available-reset
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Ensure Waybar icon offering the available update is removed
-
-pkill -RTMIN+7 waybar
-exit 0
diff --git a/bin/omarchy-update-branch b/bin/omarchy-update-branch
deleted file mode 100755
index fa294b63..00000000
--- a/bin/omarchy-update-branch
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Switch Omarchy branches and update from the selected branch
-# omarchy:args=<branch>
-
-set -e
-
-if (($# == 0)); then
-  echo "Usage: omarchy-update-branch [master|dev]"
-  exit 1
-fi
-
-branch="$1"
-
-# Snapshot before switching branch
-omarchy-snapshot create || (( $? == 127 ))
-
-if ! git -C "$OMARCHY_PATH" diff --quiet || ! git -C "$OMARCHY_PATH" diff --cached --quiet; then
-  stashed=true
-  git -C "$OMARCHY_PATH" stash push -u -m "Autostash before switching to $branch"
-else
-  stashed=false
-fi
-
-# Switch branches
-git -C "$OMARCHY_PATH" switch "$branch"
-
-# Reapply stash if we made one
-if [[ $stashed == "true" ]]; then
-  if ! git -C "$OMARCHY_PATH" stash pop; then
-    echo "⚠️ Conflicts when applying stash — stash kept"
-  fi
-fi
-
-# Update the system from the new branch
-omarchy-update-perform
diff --git a/bin/omarchy-update-confirm b/bin/omarchy-update-confirm
index 4ec37e85..472927f1 100755
--- a/bin/omarchy-update-confirm
+++ b/bin/omarchy-update-confirm
@@ -8,7 +8,7 @@ gum style --border normal --padding "1 2" \
   "• You cannot stop the update once you start!" \
   "• Make sure you're connected to power or have a full battery" \
   "" \
-  "What's new: https://github.com/basecamp/omarchy/releases"
+  "What's new: https://github.com/basecamp/omarchy/releases/latest"
 
 echo
 
diff --git a/bin/omarchy-update-git b/bin/omarchy-update-git
deleted file mode 100755
index 5c64b624..00000000
--- a/bin/omarchy-update-git
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Pull the latest Omarchy git changes
-
-set -e
-
-echo -e "\e[32mUpdate Omarchy\e[0m"
-
-omarchy-update-time
-
-# Suppress Hyprland config errors while git updates default config files mid-pull
-hyprctl keyword debug:suppress_errors true &>/dev/null || true
-
-git -C $OMARCHY_PATH pull --autostash
-git -C $OMARCHY_PATH --no-pager diff --check || git -C $OMARCHY_PATH reset --merge
-
-hyprctl reload &>/dev/null || true
diff --git a/bin/omarchy-update-mise b/bin/omarchy-update-mise
new file mode 100755
index 00000000..8252e68b
--- /dev/null
+++ b/bin/omarchy-update-mise
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# omarchy:summary=Update mise-managed tools
+
+if omarchy-cmd-present mise; then
+  echo -e "\e[32m\nUpdate mise tools\e[0m"
+  mise up
+  echo
+fi
diff --git a/bin/omarchy-update-orphan-pkgs b/bin/omarchy-update-orphan-pkgs
index b1486867..7869671a 100755
--- a/bin/omarchy-update-orphan-pkgs
+++ b/bin/omarchy-update-orphan-pkgs
@@ -1,13 +1,29 @@
 #!/bin/bash
 
-# omarchy:summary=Remove orphaned system packages after updates
+# omarchy:summary=Review and optionally remove orphaned system packages after updates
 # omarchy:requires-sudo=true
 
-orphans=$(pacman -Qtdq || true)
-if [[ -n $orphans ]]; then
-  echo -e "\e[32m\nRemove orphan system packages\e[0m"
-  for pkg in $orphans; do
-    sudo pacman -Rs --noconfirm "$pkg" || true
-  done
+set -e
+
+mapfile -t orphans < <(pacman -Qtdq 2>/dev/null || true)
+(( ${#orphans[@]} )) || exit 0
+
+echo -e "\e[32m\nOrphan system packages\e[0m"
+printf '  %s\n' "${orphans[@]}"
+echo
+
+if [[ ! -t 0 || ! -t 1 ]]; then
+  echo "${#orphans[@]} orphaned package(s) found. Re-run omarchy-update-orphan-pkgs in a terminal to review/remove them."
   echo
+  exit 0
 fi
+
+if ! gum confirm --default=false "Remove ${#orphans[@]} orphaned package(s)?"; then
+  echo "Keeping orphaned packages."
+  echo
+  exit 0
+fi
+
+echo -e "\e[32m\nRemoving orphan system packages\e[0m"
+sudo pacman -Rns "${orphans[@]}"
+echo
diff --git a/bin/omarchy-update-pacman-guard b/bin/omarchy-update-pacman-guard
new file mode 100755
index 00000000..616702a8
--- /dev/null
+++ b/bin/omarchy-update-pacman-guard
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# omarchy:summary=Prevent direct pacman system upgrades from bypassing omarchy update.
+# omarchy:hidden=true
+
+set -euo pipefail
+
+if [[ ${OMARCHY_UPDATE_PACMAN:-} == "1" || ${OMARCHY_ALLOW_DIRECT_PACMAN:-} == "1" ]]; then
+  exit 0
+fi
+
+pacman_args=()
+if [[ -n ${OMARCHY_PACMAN_CMDLINE:-} ]]; then
+  read -r -a pacman_args <<<"$OMARCHY_PACMAN_CMDLINE"
+elif [[ -r /proc/$PPID/cmdline ]]; then
+  mapfile -d '' -t pacman_args <"/proc/$PPID/cmdline" || true
+fi
+
+is_system_upgrade=0
+has_sync=0
+has_sysupgrade=0
+
+for arg in "${pacman_args[@]}"; do
+  case "$arg" in
+    --sync)
+      has_sync=1
+      ;;
+    --sysupgrade)
+      has_sysupgrade=1
+      ;;
+    --*)
+      ;;
+    -*)
+      [[ $arg == *S* ]] && has_sync=1
+      [[ $arg == *u* ]] && has_sysupgrade=1
+      ;;
+  esac
+done
+
+if (( has_sync && has_sysupgrade )); then
+  is_system_upgrade=1
+fi
+
+(( is_system_upgrade )) || exit 0
+
+cat >&2 <<'MESSAGE'
+
+Woah partner...
+
+This looks like a direct pacman system upgrade. Omarchy updates should normally
+run through:
+
+  omarchy update
+
+That path handles the update transcript, snapshot, keyrings, package upgrade,
+migrations, post-update hooks, shell update state, and restart checks together.
+
+If you really meant to bypass Omarchy for this transaction, rerun pacman with:
+
+  sudo env OMARCHY_ALLOW_DIRECT_PACMAN=1 pacman -Syu
+
+MESSAGE
+
+exit 1
diff --git a/bin/omarchy-update-perform b/bin/omarchy-update-perform
index 6e892610..3520a138 100755
--- a/bin/omarchy-update-perform
+++ b/bin/omarchy-update-perform
@@ -1,25 +1,7 @@
 #!/bin/bash
 
-# omarchy:summary=Run the full Omarchy update pipeline
+# omarchy:summary=Compatibility wrapper for omarchy-update -y.
+# omarchy:hidden=true
 # omarchy:requires-sudo=true
 
-set -e
-
-# Ensure screensaver/sleep doesn't set in during updates
-hyprctl dispatch tagwindow +noidle &>/dev/null || true
-
-# Perform all update steps
-omarchy-update-keyring
-omarchy-update-available-reset
-omarchy-update-system-pkgs
-omarchy-migrate
-omarchy-update-aur-pkgs
-omarchy-update-orphan-pkgs
-omarchy-hook post-update
-
-omarchy-update-analyze-logs
-
-omarchy-update-restart
-
-# Re-enable screensaver/sleep after updates
-hyprctl dispatch tagwindow -- -noidle &>/dev/null || true
+exec omarchy-update -y
diff --git a/bin/omarchy-update-restart b/bin/omarchy-update-restart
index 2712cd39..763d6b65 100755
--- a/bin/omarchy-update-restart
+++ b/bin/omarchy-update-restart
@@ -4,6 +4,10 @@
 
 echo
 
+confirm_reboot() {
+  gum confirm "$1" && { omarchy-system-reboot; exit 0; }
+}
+
 running_kernel=$(uname -r)
 kernel_updated=true
 
@@ -19,14 +23,14 @@ for kernel in /usr/lib/modules/*/vmlinuz; do
 done
 
 if [[ $kernel_updated == "true" ]]; then
-  gum confirm "Linux kernel has been updated. Reboot?" && omarchy-system-reboot
+  confirm_reboot "Linux kernel has been updated. Reboot?"
 elif [[ -f $HOME/.local/state/omarchy/reboot-required ]]; then
-  gum confirm "Updates require reboot. Ready?" && omarchy-system-reboot
+  confirm_reboot "Updates require reboot. Ready?"
 fi
 
 running_hyprland=$(readlink /proc/$(pgrep -x Hyprland)/exe 2>/dev/null)
 if [[ $running_hyprland == *"(deleted)"* ]]; then
-  gum confirm "Hyprland has been updated. Reboot?" && omarchy-system-reboot
+  confirm_reboot "Hyprland has been updated. Reboot?"
 fi
 
 for file in "$HOME"/.local/state/omarchy/restart-*-required; do
diff --git a/bin/omarchy-update-system-pkgs b/bin/omarchy-update-system-pkgs
index 6c6719f8..f5aad0ad 100755
--- a/bin/omarchy-update-system-pkgs
+++ b/bin/omarchy-update-system-pkgs
@@ -6,4 +6,25 @@
 set -e
 
 echo -e "\e[32m\nUpdate system packages\e[0m"
-sudo pacman -Syyu --noconfirm
+
+# Transition --overwrite: previous script-installed Omarchy wrote these paths
+# as unowned files; pacman would refuse the omarchy-settings upgrade on first
+# encounter. Drop each entry once the transition release is the baseline.
+sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syu --noconfirm \
+  --overwrite '/etc/docker/daemon.json' \
+  --overwrite '/etc/gnupg/dirmngr.conf' \
+  --overwrite '/etc/modprobe.d/omarchy-usb-autosuspend.conf' \
+  --overwrite '/etc/sudoers.d/omarchy-asdcontrol' \
+  --overwrite '/etc/sudoers.d/omarchy-passwd-tries' \
+  --overwrite '/etc/sudoers.d/omarchy-tzupdate' \
+  --overwrite '/etc/sysctl.d/90-omarchy-file-watchers.conf' \
+  --overwrite '/etc/sysctl.d/99-omarchy-sysctl.conf' \
+  --overwrite '/etc/systemd/logind.conf.d/10-ignore-power-button.conf' \
+  --overwrite '/etc/systemd/resolved.conf.d/10-disable-multicast.conf' \
+  --overwrite '/etc/systemd/resolved.conf.d/20-docker-dns.conf' \
+  --overwrite '/etc/systemd/system.conf.d/10-faster-shutdown.conf' \
+  --overwrite '/etc/systemd/system/user@.service.d/10-faster-shutdown.conf' \
+  --overwrite '/etc/systemd/system/docker.service.d/no-block-boot.conf' \
+  --overwrite '/etc/systemd/system/plocate-updatedb.service.d/ac-only.conf' \
+  --overwrite '/usr/lib/systemd/system-sleep/unmount-fuse' \
+  --overwrite '/usr/share/plymouth/themes/omarchy/*'
diff --git a/bin/omarchy-update-user-notify b/bin/omarchy-update-user-notify
new file mode 100755
index 00000000..95320ff0
--- /dev/null
+++ b/bin/omarchy-update-user-notify
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# omarchy:summary=Compatibility wrapper for omarchy-migrate-notify.
+# omarchy:hidden=true
+
+exec omarchy-migrate-notify "$@"
diff --git a/bin/omarchy-update-without-idle b/bin/omarchy-update-without-idle
deleted file mode 100755
index bea1400b..00000000
--- a/bin/omarchy-update-without-idle
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=No-op now that omarchy-update-perform is responsible for idle management.
-# omarchy:hidden=true
diff --git a/bin/omarchy-upgrade-to-4 b/bin/omarchy-upgrade-to-4
new file mode 100755
index 00000000..4a843d69
--- /dev/null
+++ b/bin/omarchy-upgrade-to-4
@@ -0,0 +1,2167 @@
+#!/bin/bash
+
+# omarchy:summary=Upgrade a legacy Omarchy install to the package-backed Omarchy 4 layout.
+# omarchy:args=[--yes] [--reboot] [--dev] [--channel stable|rc|edge] [--user USER]
+# omarchy:examples=omarchy upgrade to 4 | omarchy upgrade to 4 --dev
+# omarchy:requires-sudo=true
+
+set -euo pipefail
+
+usage() {
+  cat <<'USAGE'
+Usage: omarchy-upgrade-to-4 [--yes] [--reboot] [--dev] [--channel stable|rc|edge] [--user USER]
+
+Upgrade any pre-4 Omarchy install to the package-backed Omarchy 4 layout.
+This script is intentionally self-contained so it can be shipped as a command
+in Omarchy 3.8.x or run directly with curl | bash on older systems.
+
+Options:
+  -y, --yes                 Do not prompt before upgrading
+  --reboot                  Reboot automatically after a successful upgrade
+  --dev                     Use stop-gap packages from the [omarchy-dev] repo
+  --channel stable|rc|edge  Override detected Omarchy package channel
+  --user USER               User account to refresh after package install
+  -h, --help                Show this help
+USAGE
+}
+
+log() {
+  printf '\033[32m==>\033[0m %s\n' "$*"
+}
+
+warn() {
+  printf '\033[33mWarning:\033[0m %s\n' "$*" >&2
+}
+
+fail() {
+  printf '\033[31mError:\033[0m %s\n' "$*" >&2
+  exit 1
+}
+
+normalize_channel() {
+  case "${1:-}" in
+    stable|master|main) echo stable ;;
+    rc) echo rc ;;
+    edge|dev) echo edge ;;
+    *) return 1 ;;
+  esac
+}
+
+valid_channel() {
+  normalize_channel "$1" >/dev/null 2>&1
+}
+
+channel_override="${OMARCHY_UPGRADE_CHANNEL:-${OMARCHY_CHANNEL:-${OMARCHY_MIRROR:-}}}"
+target_user="${OMARCHY_INSTALL_USER:-}"
+yes=0
+auto_reboot=0
+use_dev_packages=${OMARCHY_UPGRADE_DEV:-0}
+
+while (($#)); do
+  case "$1" in
+    -y|--yes)
+      yes=1
+      shift
+      ;;
+    --reboot)
+      auto_reboot=1
+      shift
+      ;;
+    --dev)
+      use_dev_packages=1
+      shift
+      ;;
+    --channel)
+      channel_override="${2:-}"
+      shift 2
+      ;;
+    --user)
+      target_user="${2:-}"
+      shift 2
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      fail "Unknown option: $1"
+      ;;
+  esac
+done
+
+case "$use_dev_packages" in
+  1|true|yes|on) use_dev_packages=1 ;;
+  0|false|no|off|"") use_dev_packages=0 ;;
+  *) fail "Invalid OMARCHY_UPGRADE_DEV value '$use_dev_packages'. Use 1/0, true/false, or pass --dev." ;;
+esac
+
+if ! command -v pacman >/dev/null 2>&1; then
+  fail "This upgrade is only supported on Arch/Omarchy systems with pacman."
+fi
+
+if ! command -v sudo >/dev/null 2>&1 && (( EUID != 0 )); then
+  fail "sudo is required when not running as root."
+fi
+
+if [[ -z $target_user ]]; then
+  if (( EUID == 0 )); then
+    target_user="${SUDO_USER:-}"
+  else
+    target_user="${USER:-$(id -un)}"
+  fi
+fi
+
+if [[ -z $target_user || $target_user == root ]]; then
+  fail "Could not determine the non-root Omarchy user. Re-run with --user USER."
+fi
+
+if ! getent passwd "$target_user" >/dev/null; then
+  fail "User '$target_user' does not exist."
+fi
+
+target_home=$(getent passwd "$target_user" | cut -d: -f6)
+[[ -n $target_home && -d $target_home ]] || fail "Home directory for '$target_user' was not found."
+target_uid=$(id -u "$target_user")
+target_runtime_dir="/run/user/$target_uid"
+package_path="/usr/share/omarchy/bin:/usr/local/bin:/usr/bin:/bin:$target_home/.local/bin"
+
+as_root() {
+  if (( EUID == 0 )); then
+    "$@"
+  else
+    sudo "$@"
+  fi
+}
+
+run_as_user() {
+  if (( EUID == 0 )); then
+    if command -v sudo >/dev/null 2>&1; then
+      sudo -u "$target_user" -H "$@"
+    else
+      runuser -u "$target_user" -- "$@"
+    fi
+  else
+    "$@"
+  fi
+}
+
+run_as_user_session() {
+  run_as_user env \
+    HOME="$target_home" \
+    USER="$target_user" \
+    LOGNAME="$target_user" \
+    XDG_RUNTIME_DIR="$target_runtime_dir" \
+    DBUS_SESSION_BUS_ADDRESS="unix:path=$target_runtime_dir/bus" \
+    XDG_CURRENT_DESKTOP=Hyprland \
+    XDG_SESSION_DESKTOP=Hyprland \
+    DESKTOP_SESSION=hyprland \
+    "$@"
+}
+
+package_installed_exact() {
+  local pkg="$1"
+  pacman -Qq "$pkg" 2>/dev/null | grep -Fxq "$pkg"
+}
+
+mark_packages_explicit() {
+  local pkg installed_pkg
+  local installed_packages=()
+
+  for pkg in "$@"; do
+    # pacman -Qq resolves installed providers too (for example nvim -> neovim),
+    # while package_installed_exact intentionally does not.
+    installed_pkg=$(pacman -Qq "$pkg" 2>/dev/null | head -n1 || true)
+    [[ -n $installed_pkg ]] && installed_packages+=("$installed_pkg")
+  done
+
+  ((${#installed_packages[@]})) || return 0
+  mapfile -t installed_packages < <(printf '%s\n' "${installed_packages[@]}" | sort -u)
+
+  if ! as_root pacman -D --asexplicit "${installed_packages[@]}" >/dev/null; then
+    warn "Could not mark installed default packages as explicit; retired-package cleanup may leave extra dependencies installed."
+  fi
+}
+
+target_hyprland_pid() {
+  pgrep -u "$target_uid" -x Hyprland 2>/dev/null | head -n1 || true
+}
+
+target_process_env() {
+  local name="$1" pid value
+  pid=$(target_hyprland_pid)
+  [[ -n $pid && -r /proc/$pid/environ ]] || return 1
+  value=$(tr '\0' '\n' <"/proc/$pid/environ" 2>/dev/null | awk -v name="$name" '
+    BEGIN { prefix = name "=" }
+    index($0, prefix) == 1 { print substr($0, length(prefix) + 1); exit }
+  ' || true)
+  [[ -n $value ]] || return 1
+  printf '%s\n' "$value"
+}
+
+valid_wayland_display() {
+  [[ -n ${1:-} && -S $target_runtime_dir/$1 ]]
+}
+
+discover_wayland_display() {
+  local candidate
+  candidate="${WAYLAND_DISPLAY:-}"
+  if valid_wayland_display "$candidate"; then
+    printf '%s\n' "$candidate"
+    return 0
+  fi
+
+  candidate=$(target_process_env WAYLAND_DISPLAY || true)
+  if valid_wayland_display "$candidate"; then
+    printf '%s\n' "$candidate"
+    return 0
+  fi
+
+  local candidates=()
+  mapfile -t candidates < <(find "$target_runtime_dir" -maxdepth 1 -type s -name 'wayland-*' -printf '%f\n' 2>/dev/null || true)
+  (( ${#candidates[@]} == 1 )) || return 1
+  printf '%s\n' "${candidates[0]}"
+}
+
+valid_hyprland_signature() {
+  [[ -n ${1:-} ]] || return 1
+  [[ -S $target_runtime_dir/hypr/$1/.socket.sock || -S $target_runtime_dir/hypr/$1/.socket2.sock ]]
+}
+
+discover_hyprland_signature() {
+  local candidate
+  candidate="${HYPRLAND_INSTANCE_SIGNATURE:-}"
+  if valid_hyprland_signature "$candidate"; then
+    printf '%s\n' "$candidate"
+    return 0
+  fi
+
+  candidate=$(target_process_env HYPRLAND_INSTANCE_SIGNATURE || true)
+  if valid_hyprland_signature "$candidate"; then
+    printf '%s\n' "$candidate"
+    return 0
+  fi
+
+  local candidates=()
+  mapfile -t candidates < <(find "$target_runtime_dir/hypr" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' 2>/dev/null || true)
+  (( ${#candidates[@]} == 1 )) || return 1
+  printf '%s\n' "${candidates[0]}"
+}
+
+detect_channel() {
+  local candidate="${channel_override:-}"
+
+  if [[ -n $candidate ]] && valid_channel "$candidate"; then
+    normalize_channel "$candidate"
+    return 0
+  fi
+
+  if command -v omarchy-version-channel >/dev/null 2>&1; then
+    candidate=$(omarchy-version-channel 2>/dev/null | awk '{ print $1 }' || true)
+    if [[ -n $candidate ]] && valid_channel "$candidate"; then
+      normalize_channel "$candidate"
+      return 0
+    fi
+  fi
+
+  if [[ -f /etc/pacman.conf ]]; then
+    if grep -q 'https://pkgs\.omarchy\.org/rc/' /etc/pacman.conf; then
+      echo rc
+      return 0
+    elif grep -q 'https://pkgs\.omarchy\.org/edge/' /etc/pacman.conf; then
+      echo edge
+      return 0
+    elif grep -q 'https://pkgs\.omarchy\.org/stable/' /etc/pacman.conf; then
+      echo stable
+      return 0
+    fi
+  fi
+
+  if [[ -f /etc/pacman.d/mirrorlist ]]; then
+    if grep -q 'https://rc-mirror\.omarchy\.org/' /etc/pacman.d/mirrorlist; then
+      echo rc
+      return 0
+    elif grep -q 'https://mirror\.omarchy\.org/' /etc/pacman.d/mirrorlist; then
+      echo edge
+      return 0
+    elif grep -q 'https://stable-mirror\.omarchy\.org/' /etc/pacman.d/mirrorlist; then
+      echo stable
+      return 0
+    fi
+  fi
+
+  if [[ -d $target_home/.local/share/omarchy/.git ]]; then
+    if (( EUID == 0 )); then
+      candidate=$(run_as_user git -C "$target_home/.local/share/omarchy" branch --show-current 2>/dev/null || true)
+    else
+      candidate=$(git -C "$target_home/.local/share/omarchy" branch --show-current 2>/dev/null || true)
+    fi
+    if [[ -n $candidate ]] && valid_channel "$candidate"; then
+      normalize_channel "$candidate"
+      return 0
+    fi
+  fi
+
+  echo stable
+}
+
+channel=$(detect_channel)
+if ! valid_channel "$channel"; then
+  fail "Invalid channel '$channel'. Use stable, rc, or edge."
+fi
+
+case "$channel" in
+  stable)
+    mirror_server='https://stable-mirror.omarchy.org/$repo/os/$arch'
+    package_server='https://pkgs.omarchy.org/stable/$arch'
+    ;;
+  rc)
+    mirror_server='https://rc-mirror.omarchy.org/$repo/os/$arch'
+    package_server='https://pkgs.omarchy.org/rc/$arch'
+    ;;
+  edge)
+    mirror_server='https://mirror.omarchy.org/$repo/os/$arch'
+    package_server='https://pkgs.omarchy.org/edge/$arch'
+    ;;
+esac
+
+if (( ! yes )); then
+  package_mode="production Omarchy packages"
+  (( use_dev_packages )) && package_mode="stop-gap packages from [omarchy-dev]"
+
+  cat <<EOF
+
+This will upgrade Omarchy for user '$target_user' to Omarchy 4 using the '$channel' channel and $package_mode.
+
+It will install the package-backed Omarchy 4 stack, overwrite files previously
+written by the legacy installer, remove retired default packages, and apply the
+Omarchy 4 system/user transition inline. A reboot is strongly recommended afterward.
+EOF
+
+  if [[ -r /dev/tty ]]; then
+    printf '\nContinue? [y/N] ' >/dev/tty
+    read -r answer </dev/tty
+    [[ $answer =~ ^[Yy]$ ]] || exit 0
+  else
+    fail "No TTY available for confirmation. Re-run with --yes to proceed non-interactively."
+  fi
+fi
+
+sudo_keepalive_pid=""
+hyprland_config_reload_suppressed=0
+
+cleanup_on_exit() {
+  local exit_status=$?
+
+  if (( hyprland_config_reload_suppressed )) && declare -F restore_hyprland_config_reload >/dev/null; then
+    restore_hyprland_config_reload >/dev/null 2>&1 || true
+  fi
+
+  if [[ -n ${sudo_keepalive_pid:-} ]]; then
+    kill "$sudo_keepalive_pid" 2>/dev/null || true
+  fi
+
+  exit "$exit_status"
+}
+trap cleanup_on_exit EXIT
+
+if (( EUID != 0 )); then
+  sudo -v
+  while true; do sudo -n true; sleep 60; done 2>/dev/null &
+  sudo_keepalive_pid=$!
+fi
+
+backup_suffix=$(date +%Y%m%d%H%M%S)
+
+configure_pacman_channel() {
+  log "Configuring Omarchy pacman repositories ($channel)"
+
+  as_root install -d -m 0755 /etc/pacman.d
+  if [[ -f /etc/pacman.d/mirrorlist ]]; then
+    as_root cp -f /etc/pacman.d/mirrorlist "/etc/pacman.d/mirrorlist.omarchy-upgrade-to-4.$backup_suffix.bak"
+  fi
+  printf 'Server = %s\n' "$mirror_server" | as_root tee /etc/pacman.d/mirrorlist >/dev/null
+
+  if [[ ! -f /etc/pacman.conf ]]; then
+    fail "/etc/pacman.conf does not exist."
+  fi
+
+  as_root cp -f /etc/pacman.conf "/etc/pacman.conf.omarchy-upgrade-to-4.$backup_suffix.bak"
+
+  # Drop any stale [omarchy-dev] block every time. Re-add it only for the
+  # stop-gap dev package mode so normal upgrades resolve the real tagged
+  # packages from [omarchy] once they exist.
+  local dev_server='https://share.heyoodle.com/omarchy/dev/$arch'
+  local tmp
+
+  tmp=$(mktemp)
+  awk -v server="$package_server" -v dev_server="$dev_server" -v use_dev="$use_dev_packages" '
+    BEGIN { in_omarchy = 0; in_dev = 0; wrote = 0; use_dev += 0 }
+    /^\[omarchy-dev\]$/ {
+      in_dev = 1
+      in_omarchy = 0
+      next
+    }
+    /^\[omarchy\]$/ {
+      if (!wrote) {
+        if (use_dev) {
+          print "[omarchy-dev]"
+          print "SigLevel = Never"
+          print "Server = " dev_server
+          print ""
+        }
+        print "[omarchy]"
+        print "SigLevel = Optional TrustAll"
+        print "Server = " server
+        wrote = 1
+      }
+      in_omarchy = 1
+      in_dev = 0
+      next
+    }
+    /^\[/ { in_omarchy = 0; in_dev = 0 }
+    !in_omarchy && !in_dev { print }
+    END {
+      if (!wrote) {
+        print ""
+        if (use_dev) {
+          print "[omarchy-dev]"
+          print "SigLevel = Never"
+          print "Server = " dev_server
+          print ""
+        }
+        print "[omarchy]"
+        print "SigLevel = Optional TrustAll"
+        print "Server = " server
+      }
+    }
+  ' /etc/pacman.conf >"$tmp"
+  as_root install -m 0644 "$tmp" /etc/pacman.conf
+  rm -f "$tmp"
+}
+
+install_keyrings() {
+  log "Refreshing package databases and keyrings"
+  as_root pacman -Sy --noconfirm archlinux-keyring omarchy-keyring || {
+    warn "Keyring package install failed; attempting to trust the Omarchy packaging key directly."
+    as_root pacman-key --recv-keys 40DFB630FF42BCFFB047046CF0134EE680CAC571 --keyserver keys.openpgp.org || true
+    as_root pacman-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571 || true
+    as_root pacman -Sy --noconfirm archlinux-keyring omarchy-keyring
+  }
+}
+
+remove_legacy_installer_package() {
+  if pacman -Q omarchy-installer >/dev/null 2>&1; then
+    log "Removing legacy omarchy-installer package"
+    # The pre-4 omarchy meta package may depend on omarchy-installer. Ignore
+    # that edge temporarily; the next transaction installs the Omarchy 4 meta.
+    as_root pacman -Rdd --noconfirm omarchy-installer
+  fi
+}
+
+remove_legacy_limine_configs() {
+  # Mirrors the old 1762446739 migration: old Limine installs sometimes left
+  # alternate limine.conf files in paths Limine searches before /boot/limine.conf.
+  # If any are still present, Limine may ignore the package-managed default config.
+  local canonical_limine_config=/boot/limine.conf
+  local legacy_limine_configs=(
+    /boot/EFI/arch-limine/limine.conf
+    /boot/EFI/limine/limine.conf
+    /boot/EFI/BOOT/limine.conf
+    /boot/limine/limine.conf
+  )
+  local legacy_limine_config
+  local found_legacy_limine_configs=()
+
+  for legacy_limine_config in "${legacy_limine_configs[@]}"; do
+    if as_root test -f "$legacy_limine_config"; then
+      found_legacy_limine_configs+=("$legacy_limine_config")
+    fi
+  done
+
+  ((${#found_legacy_limine_configs[@]})) || return 0
+
+  if ! as_root test -f "$canonical_limine_config"; then
+    fail "Legacy Limine configs exist (${found_legacy_limine_configs[*]}) but $canonical_limine_config does not. Do not reboot until the bootloader config is repaired."
+  fi
+
+  log "Removing legacy alternate Limine configs"
+  as_root rm -f "${found_legacy_limine_configs[@]}"
+}
+
+normalize_limine_config() {
+  local machine_id legacy_uki
+
+  as_root test -f /boot/limine.conf || return 0
+
+  log "Normalizing Limine config"
+  # Mirrors old 1777570652: normalize British/American spelling, the old color
+  # index, and help colors that pre-4 installs may never have migrated.
+  as_root sed -i -E 's/^interface_branding_colou?r: 2$/interface_branding_color: 9ece6a/' /boot/limine.conf
+  as_root sed -i 's/^interface_branding_colour: /interface_branding_color: /' /boot/limine.conf
+  as_root sed -i -E '/^interface_help_colou?r(_bright)?:/d' /boot/limine.conf
+  as_root sed -i '/^interface_branding_color:/a interface_help_color_bright: 9ece6a' /boot/limine.conf
+  as_root sed -i '/^interface_branding_color:/a interface_help_color: 9ece6a' /boot/limine.conf
+
+  # Pre-4 custom-UKI installs used <machine-id>_linux.efi. Omarchy 4 uses the
+  # stable omarchy_linux.efi path generated by limine-entry-tool.
+  machine_id=$(as_root cat /etc/machine-id 2>/dev/null || true)
+  legacy_uki="/boot/EFI/Linux/${machine_id}_linux.efi"
+  if [[ -n $machine_id ]] && as_root test -f /boot/EFI/Linux/omarchy_linux.efi && as_root test -f "$legacy_uki"; then
+    as_root rm -f "$legacy_uki"
+  fi
+}
+
+remove_conflicting_legacy_packages() {
+  # Remove legacy packages that are known to conflict with Omarchy 4 defaults
+  # before the main package transaction. Broader retired-package cleanup runs
+  # after NetworkManager and the rest of the new stack are installed.
+  local conflicting_packages=(
+    asdcontrol-git
+    lazydocker-bin
+    localsend-bin
+    omarchy-chromium
+    omarchy-lazyvim
+    openai-codex-bin
+    ttf-jetbrains-mono
+    ttf-jetbrains-mono-nerd
+    wayfreeze
+    wayfreeze-git
+  )
+
+  local pkg
+  for pkg in "${conflicting_packages[@]}"; do
+    if package_installed_exact "$pkg"; then
+      # Some pre-4 meta packages depend on these retired/default packages. We
+      # intentionally break those old dependency edges before installing the
+      # Omarchy 4 meta, otherwise pacman prompts to remove conflicts (for
+      # example ttf-jetbrains-mono-nerd -> ttf-jetbrains-mono-nerd-basic) and
+      # --noconfirm answers "no".
+      as_root pacman -Rdd --noconfirm "$pkg" || warn "Could not remove conflicting legacy package '$pkg'; continuing."
+    fi
+  done
+}
+
+migrate_1password_beta_package() {
+  if ! package_installed_exact 1password-beta && ! package_installed_exact 1password-beta-bin; then
+    return 0
+  fi
+
+  log "Replacing 1Password Beta with stable 1Password"
+  if ! as_root pacman -S --noconfirm --ask 4 1password; then
+    warn "Could not replace 1Password Beta with stable 1Password; leaving the existing 1Password package installed."
+  fi
+}
+
+install_omarchy_4_packages() {
+  # Until Omarchy 4 is tagged and published for real, --dev installs the
+  # stop-gap package names from [omarchy-dev]. They provide/conflict the real
+  # names so testers can later move to omarchy/omarchy-settings cleanly.
+  local omarchy_package=omarchy
+  local settings_package=omarchy-settings
+  if (( use_dev_packages )); then
+    omarchy_package=omarchy-dev
+    settings_package=omarchy-settings-dev
+  fi
+
+  # The bootloader stack (limine, snapper, etc.) is hard-depended by the
+  # Omarchy package, so it'll be pulled in automatically.
+  local core_packages=(
+    omarchy-keyring
+    "$settings_package"
+    omarchy-nvim
+    "$omarchy_package"
+    # checkupdates support for update tooling
+    fakeroot
+    pacman-contrib
+  )
+  local base_packages=()
+
+  log "Installing Omarchy 4 packages"
+  (( use_dev_packages )) && log "Using stop-gap packages from [omarchy-dev]"
+  # --noconfirm answers "no" to conflict-removal prompts. --ask 4 preselects
+  # removing the conflicting package, which is required for legacy packages like
+  # ttf-jetbrains-mono-nerd -> ttf-jetbrains-mono-nerd-basic.
+  as_root env OMARCHY_UPDATE_PACMAN=1 pacman -Syu --needed --noconfirm --ask 4 --overwrite='*' "${core_packages[@]}"
+  mark_packages_explicit "${core_packages[@]}"
+
+  if [[ -f /usr/share/omarchy/install/omarchy-base.packages ]]; then
+    log "Installing Omarchy 4 default package set"
+    mapfile -t base_packages < <(sed -e 's/[[:space:]]*#.*$//' -e '/^[[:space:]]*$/d' /usr/share/omarchy/install/omarchy-base.packages)
+    if (( ${#base_packages[@]} )); then
+      as_root pacman -S --needed --noconfirm --ask 4 --overwrite='*' "${base_packages[@]}"
+      mark_packages_explicit "${base_packages[@]}"
+    fi
+  else
+    warn "/usr/share/omarchy/install/omarchy-base.packages was not found; skipping default package set install."
+  fi
+
+  # Archinstall installs the audio application during fresh ISO installs, so
+  # legacy upgrades need to ensure the same PipeWire stack is present without
+  # depending on Archinstall or Omarchy setup helpers.
+  local audio_packages=(
+    pipewire
+    pipewire-alsa
+    pipewire-jack
+    pipewire-pulse
+    gst-plugin-pipewire
+    libpulse
+    wireplumber
+  )
+  as_root pacman -S --needed --noconfirm --ask 4 --overwrite='*' "${audio_packages[@]}"
+  mark_packages_explicit "${audio_packages[@]}"
+}
+
+remove_retired_default_packages() {
+  local retired_packages=(
+    asdcontrol-git
+    blueberry
+    bluetui
+    chaotic-keyring
+    chaotic-mirrorlist
+    claude-code
+    elephant
+    elephant-all
+    elephant-bluetooth
+    elephant-calc
+    elephant-clipboard
+    elephant-desktopapplications
+    elephant-files
+    elephant-menus
+    elephant-providerlist
+    elephant-runner
+    elephant-symbols
+    elephant-todo
+    elephant-unicode
+    elephant-websearch
+    fcitx5-configtool
+    gcc14
+    hypridle
+    hyprlock
+    impala
+    iwd
+    lazydocker-bin
+    lmstudio
+    lmstudio-bin
+    localsend-bin
+    makima-bin
+    mako
+    omarchy-chromium
+    omarchy-lazyvim
+    omarchy-walker
+    openai-codex
+    openai-codex-bin
+    opencode
+    pavucontrol
+    playerctl
+    polkit-gnome
+    qt5-remoteobjects
+    swaybg
+    swayosd
+    walker-bin
+    ttf-jetbrains-mono
+    ttf-jetbrains-mono-nerd
+    vlc
+    waybar
+    wayfreeze
+    wayfreeze-git
+    wf-recorder
+    wiremix
+    wl-screenrec
+    yay-bin-debug
+    zoom
+  )
+
+  log "Removing packages retired from the Omarchy 4 default install"
+  local pkg
+  local installed_retired=()
+  for pkg in "${retired_packages[@]}"; do
+    if package_installed_exact "$pkg"; then
+      installed_retired+=("$pkg")
+    fi
+  done
+
+  ((${#installed_retired[@]})) || return 0
+
+  # Remove as one transaction so dependency anchors like waybar/playerctl and
+  # omarchy-walker/elephant-* disappear together instead of failing one-by-one.
+  # Preflight first so dependency failures do not print scary pacman errors in
+  # the middle of an otherwise successful upgrade.
+  if pacman -Rs --print "${installed_retired[@]}" >/dev/null 2>&1; then
+    if as_root pacman -Rns --noconfirm --ask 4 "${installed_retired[@]}"; then
+      return 0
+    fi
+    warn "Batch retired-package removal failed; retrying dependency-aware groups."
+  else
+    warn "Some retired packages are still required by non-retired packages; retrying dependency-aware groups."
+  fi
+
+  local group group_pkg required_by_line
+  local group_packages=()
+  local installed_group=()
+  local fallback_groups=(
+    "omarchy-walker walker elephant-all elephant elephant-bluetooth elephant-calc elephant-clipboard elephant-desktopapplications elephant-files elephant-menus elephant-providerlist elephant-runner elephant-symbols elephant-todo elephant-unicode elephant-websearch"
+    "waybar playerctl"
+    "impala iwd"
+    "blueberry bluetui"
+    "wiremix pavucontrol"
+  )
+
+  for group in "${fallback_groups[@]}"; do
+    read -r -a group_packages <<<"$group"
+    installed_group=()
+    for group_pkg in "${group_packages[@]}"; do
+      if package_installed_exact "$group_pkg"; then
+        installed_group+=("$group_pkg")
+      fi
+    done
+    ((${#installed_group[@]})) || continue
+
+    if pacman -Rs --print "${installed_group[@]}" >/dev/null 2>&1; then
+      as_root pacman -Rns --noconfirm --ask 4 "${installed_group[@]}" || warn "Could not remove retired package group: ${installed_group[*]}"
+    else
+      warn "Leaving retired package group installed because other packages still depend on it: ${installed_group[*]}"
+    fi
+  done
+
+  for pkg in "${installed_retired[@]}"; do
+    package_installed_exact "$pkg" || continue
+
+    if pacman -Rs --print "$pkg" >/dev/null 2>&1; then
+      as_root pacman -Rns --noconfirm --ask 4 "$pkg" || warn "Could not remove retired package '$pkg'; leaving it installed."
+    else
+      required_by_line=$(LC_ALL=C pacman -Qi "$pkg" 2>/dev/null | awk -F: '/^Required By/ { gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2; exit }')
+      if [[ -n $required_by_line && $required_by_line != None ]]; then
+        warn "Leaving retired package '$pkg' installed because it is still required by: $required_by_line"
+      else
+        warn "Leaving retired package '$pkg' installed because pacman reports remaining dependency constraints."
+      fi
+    fi
+  done
+}
+
+cleanup_legacy_user_paths() {
+  log "Cleaning legacy user command shims"
+  run_as_user env TARGET_HOME="$target_home" BACKUP_SUFFIX="$backup_suffix" bash <<'USER_CLEANUP'
+set -euo pipefail
+local_bin="$TARGET_HOME/.local/bin"
+legacy_root="$TARGET_HOME/.local/share/omarchy"
+legacy_bin="$legacy_root/bin/"
+if [[ -d $local_bin ]]; then
+  shopt -s nullglob
+  for link in "$local_bin"/omarchy*; do
+    [[ -L $link ]] || continue
+    target=$(readlink "$link" || true)
+    case "$target" in
+      "$legacy_bin"*|../share/omarchy/bin/*|*.local/share/omarchy/bin/*)
+        rm -f "$link"
+        ;;
+    esac
+  done
+fi
+
+legacy_hypr_config_active() {
+  local hyprland_conf="$TARGET_HOME/.config/hypr/hyprland.conf"
+  [[ -f $hyprland_conf ]] || return 1
+  grep -q '\.local/share/omarchy/default/hypr' "$hyprland_conf"
+}
+
+populate_legacy_hypr_defaults() {
+  local shim_hypr_dir="$1" backup="$2" tmp_dir clone_dir archive_dir
+
+  rm -rf "$shim_hypr_dir"
+  mkdir -p "$shim_hypr_dir"
+  tmp_dir=$(mktemp -d)
+  clone_dir="$tmp_dir/omarchy"
+  archive_dir="$tmp_dir/archive"
+
+  if command -v git >/dev/null 2>&1; then
+    if git clone --depth 1 --branch master --single-branch --filter=blob:none --sparse https://github.com/basecamp/omarchy.git "$clone_dir" >/dev/null 2>&1 && \
+      git -C "$clone_dir" sparse-checkout set default/hypr >/dev/null 2>&1 && \
+      [[ -d $clone_dir/default/hypr ]]; then
+      cp -a "$clone_dir/default/hypr/." "$shim_hypr_dir/"
+    fi
+  fi
+
+  if ! find "$shim_hypr_dir" -type f -name '*.conf' -print -quit | grep -q .; then
+    if command -v curl >/dev/null 2>&1 && command -v tar >/dev/null 2>&1; then
+      mkdir -p "$archive_dir"
+      if curl -fsSL https://github.com/basecamp/omarchy/archive/refs/heads/master.tar.gz | tar -xz -C "$archive_dir"; then
+        if [[ -d $archive_dir/omarchy-master/default/hypr ]]; then
+          cp -a "$archive_dir/omarchy-master/default/hypr/." "$shim_hypr_dir/"
+        fi
+      fi
+    fi
+  fi
+
+  if ! find "$shim_hypr_dir" -type f -name '*.conf' -print -quit | grep -q .; then
+    if [[ -n $backup && -d $backup/default/hypr ]]; then
+      cp -a "$backup/default/hypr/." "$shim_hypr_dir/"
+    fi
+  fi
+
+  rm -rf "$tmp_dir"
+  find "$shim_hypr_dir" -type f -name '*.conf' -print -quit | grep -q .
+}
+
+create_live_omarchy_overlay() {
+  local backup="$1" compat_root shim_hypr_dir entry base cleanup_hook
+
+  compat_root="$TARGET_HOME/.local/state/omarchy/upgrade-to-4-live-omarchy"
+  shim_hypr_dir="$TARGET_HOME/.local/state/omarchy/upgrade-to-4-hypr-defaults"
+
+  populate_legacy_hypr_defaults "$shim_hypr_dir" "$backup" || return 1
+
+  rm -rf "$compat_root"
+  mkdir -p "$compat_root/default"
+
+  shopt -s dotglob nullglob
+  for entry in /usr/share/omarchy/* /usr/share/omarchy/.[!.]* /usr/share/omarchy/..?*; do
+    [[ -e $entry ]] || continue
+    base=$(basename "$entry")
+    [[ $base == default ]] && continue
+    ln -s "$entry" "$compat_root/$base"
+  done
+  for entry in /usr/share/omarchy/default/* /usr/share/omarchy/default/.[!.]* /usr/share/omarchy/default/..?*; do
+    [[ -e $entry ]] || continue
+    base=$(basename "$entry")
+    [[ $base == hypr ]] && continue
+    ln -s "$entry" "$compat_root/default/$base"
+  done
+  ln -s "$shim_hypr_dir" "$compat_root/default/hypr"
+
+  cleanup_hook="$TARGET_HOME/.config/omarchy/hooks/post-boot.d/cleanup-upgrade-to-4-live-shim"
+  mkdir -p "$(dirname "$cleanup_hook")"
+  cat >"$cleanup_hook" <<CLEANUP_HOOK
+#!/bin/bash
+set -euo pipefail
+legacy_root="\$HOME/.local/share/omarchy"
+compat_root="$compat_root"
+shim_hypr_dir="$shim_hypr_dir"
+if [[ -L \$legacy_root && \$(readlink "\$legacy_root") == "\$compat_root" ]]; then
+  ln -sfn /usr/share/omarchy "\$legacy_root"
+fi
+rm -rf "\$compat_root" "\$shim_hypr_dir"
+rm -f "\$0"
+CLEANUP_HOOK
+  chmod +x "$cleanup_hook"
+
+  printf '%s\n' "$compat_root"
+}
+
+# Existing terminals still have OMARCHY_PATH=$HOME/.local/share/omarchy and
+# often have $OMARCHY_PATH/bin early in PATH. Make that stale path resolve to
+# the package-backed tree for the rest of the live session, while backing up
+# the old git checkout for inspection/rollback. If the live Hyprland session is
+# still using legacy ~/.config/hypr/*.conf files, keep those user files in place
+# and provide a temporary default/hypr/*.conf shim so reloads do not explode.
+if [[ -e /usr/share/omarchy ]]; then
+  mkdir -p "$TARGET_HOME/.local/share"
+  backup=""
+  if [[ -L $legacy_root ]]; then
+    rm -f "$legacy_root"
+  elif [[ -e $legacy_root ]]; then
+    backup="$legacy_root.omarchy-upgrade-to-4.$BACKUP_SUFFIX.bak"
+    mv "$legacy_root" "$backup"
+  fi
+
+  if legacy_hypr_config_active; then
+    if compat_root=$(create_live_omarchy_overlay "$backup"); then
+      ln -sfn "$compat_root" "$legacy_root"
+    else
+      echo "Warning: Could not prepare legacy Hyprland conf shim; linking ~/.local/share/omarchy directly to /usr/share/omarchy." >&2
+      ln -sfn /usr/share/omarchy "$legacy_root"
+    fi
+  else
+    ln -sfn /usr/share/omarchy "$legacy_root"
+  fi
+fi
+USER_CLEANUP
+}
+
+cleanup_retired_user_unit_files() {
+  run_as_user bash <<'USER_UNITS'
+set -euo pipefail
+units=(
+  hyprpolkitagent.service
+  mako.service
+  omarchy-battery-monitor.service
+  omarchy-battery-monitor.timer
+  omarchy-shell.service
+  swayosd-server.service
+  elephant.service
+  app-walker@autostart.service
+)
+shopt -s nullglob
+for base in "$HOME/.config/systemd/user" "$HOME/.local/share/systemd/user"; do
+  [[ -d $base ]] || continue
+  for unit in "${units[@]}"; do
+    rm -f "$base/$unit"
+    for link in "$base"/*.wants/"$unit" "$base"/*.requires/"$unit"; do
+      rm -f "$link"
+    done
+  done
+done
+USER_UNITS
+}
+
+cleanup_retired_services() {
+  log "Disabling services retired by Omarchy 4"
+
+  # Do not stop iwd mid-upgrade; disabling is enough and avoids dropping a
+  # running Wi-Fi connection before the user can reboot into NetworkManager.
+  as_root systemctl disable iwd.service >/dev/null 2>&1 || true
+
+  cleanup_retired_user_unit_files
+  if [[ -S $target_runtime_dir/bus ]]; then
+    run_as_user_session systemctl --user disable \
+      hyprpolkitagent.service \
+      mako.service \
+      omarchy-battery-monitor.service \
+      omarchy-battery-monitor.timer \
+      omarchy-shell.service \
+      swayosd-server.service \
+      elephant.service \
+      app-walker@autostart.service \
+      >/dev/null 2>&1 || true
+    run_as_user_session systemctl --user daemon-reload >/dev/null 2>&1 || true
+  fi
+}
+
+stop_retired_session_processes() {
+  log "Stopping retired Omarchy 3 session processes"
+
+  if [[ -S $target_runtime_dir/bus ]]; then
+    run_as_user_session systemctl --user stop \
+      hyprpolkitagent.service \
+      mako.service \
+      omarchy-battery-monitor.service \
+      omarchy-battery-monitor.timer \
+      omarchy-shell.service \
+      swayosd-server.service \
+      elephant.service \
+      app-walker@autostart.service \
+      >/dev/null 2>&1 || true
+  fi
+
+  # Removed packages do not stop already-running processes. Stop the old UI
+  # only after the new Quickshell has been verified, so users are not left
+  # without a bar/launcher if current-session shell startup fails.
+  run_as_user pkill -x waybar >/dev/null 2>&1 || true
+  run_as_user pkill -x walker >/dev/null 2>&1 || true
+  run_as_user pkill -x elephant >/dev/null 2>&1 || true
+  run_as_user pkill -x mako >/dev/null 2>&1 || true
+  run_as_user pkill -x swayosd-server >/dev/null 2>&1 || true
+  run_as_user_session systemctl --user daemon-reload >/dev/null 2>&1 || true
+}
+
+start_omarchy_shell_session() {
+  # Omarchy 4 starts Quickshell from Hyprland autostart, not a user service.
+  # Reboot is still the real cutover, but start the new shell in the current
+  # Wayland session when possible so users do not sit without a bar after the
+  # retired waybar/walker/elephant processes are stopped.
+  local quickshell_bin omarchy_shell_bin shell_log
+  quickshell_bin=$(command -v quickshell || true)
+  [[ -n $quickshell_bin ]] || { warn "quickshell is not available; Omarchy shell will start after reboot."; return 1; }
+  omarchy_shell_bin=/usr/bin/omarchy-shell
+  [[ -x $omarchy_shell_bin ]] || omarchy_shell_bin=$(command -v omarchy-shell || true)
+  [[ -n $omarchy_shell_bin ]] || { warn "omarchy-shell is not available; Omarchy shell will start after reboot."; return 1; }
+  [[ -f /usr/share/omarchy/shell/shell.qml ]] || { warn "/usr/share/omarchy/shell is missing; Omarchy shell will start after reboot."; return 1; }
+  [[ -d $target_runtime_dir ]] || { warn "No running user session found; Omarchy shell will start after reboot."; return 1; }
+
+  shell_log="$target_home/.local/state/omarchy/omarchy-shell-upgrade.log"
+  run_as_user mkdir -p "$target_home/.local/state/omarchy" >/dev/null 2>&1 || true
+
+  local wayland_display hyprland_signature
+  wayland_display=$(discover_wayland_display || true)
+  [[ -n $wayland_display ]] || { warn "No Wayland display found; Omarchy shell will start after reboot."; return 1; }
+
+  hyprland_signature=$(discover_hyprland_signature || true)
+  [[ -n $hyprland_signature ]] || { warn "No Hyprland session found; Omarchy shell will start after reboot."; return 1; }
+
+  log "Starting Omarchy shell in the current session"
+  run_as_user env \
+    HOME="$target_home" \
+    USER="$target_user" \
+    LOGNAME="$target_user" \
+    XDG_RUNTIME_DIR="$target_runtime_dir" \
+    WAYLAND_DISPLAY="$wayland_display" \
+    HYPRLAND_INSTANCE_SIGNATURE="$hyprland_signature" \
+    DBUS_SESSION_BUS_ADDRESS="unix:path=$target_runtime_dir/bus" \
+    XDG_CURRENT_DESKTOP=Hyprland \
+    XDG_SESSION_DESKTOP=Hyprland \
+    XDG_SESSION_TYPE=wayland \
+    QT_QPA_PLATFORM=wayland \
+    GDK_BACKEND=wayland,x11,* \
+    DESKTOP_SESSION=hyprland \
+    OMARCHY_PATH=/usr/share/omarchy \
+    PATH="$package_path" \
+    bash -c '
+      omarchy_shell_bin=$1
+      quickshell_bin=$2
+      shell_log=$3
+      if [[ $("$omarchy_shell_bin" lock isLocked 2>/dev/null || true) == "true" ]]; then
+        exit 2
+      fi
+      pkill -x quickshell 2>/dev/null || true
+      sleep 0.2
+      : >"$shell_log"
+      setsid "$quickshell_bin" -n -p /usr/share/omarchy/shell >>"$shell_log" 2>&1 &
+    ' bash "$omarchy_shell_bin" "$quickshell_bin" "$shell_log" \
+    || { warn "Could not start Omarchy shell in the current session; it will start after reboot. See $shell_log"; return 1; }
+
+  local attempt
+  for attempt in {1..60}; do
+    if run_as_user env \
+      HOME="$target_home" \
+      USER="$target_user" \
+      LOGNAME="$target_user" \
+      XDG_RUNTIME_DIR="$target_runtime_dir" \
+      DBUS_SESSION_BUS_ADDRESS="unix:path=$target_runtime_dir/bus" \
+      OMARCHY_PATH=/usr/share/omarchy \
+      PATH="$package_path" \
+      "$omarchy_shell_bin" shell ping >/dev/null 2>&1; then
+      return 0
+    fi
+    sleep 0.25
+  done
+
+  warn "Omarchy shell did not respond in the current session; it will start after reboot. See $shell_log"
+  return 1
+}
+
+run_hyprctl_session() {
+  local wayland_display hyprland_signature hyprctl_bin
+  [[ -d $target_runtime_dir ]] || return 1
+
+  hyprctl_bin=/usr/bin/hyprctl
+  [[ -x $hyprctl_bin ]] || hyprctl_bin=$(command -v hyprctl || true)
+  [[ -n $hyprctl_bin ]] || return 1
+
+  wayland_display=$(discover_wayland_display || true)
+  [[ -n $wayland_display ]] || return 1
+
+  hyprland_signature=$(discover_hyprland_signature || true)
+  [[ -n $hyprland_signature ]] || return 1
+
+  run_as_user env \
+    HOME="$target_home" \
+    USER="$target_user" \
+    LOGNAME="$target_user" \
+    XDG_RUNTIME_DIR="$target_runtime_dir" \
+    WAYLAND_DISPLAY="$wayland_display" \
+    HYPRLAND_INSTANCE_SIGNATURE="$hyprland_signature" \
+    DBUS_SESSION_BUS_ADDRESS="unix:path=$target_runtime_dir/bus" \
+    XDG_CURRENT_DESKTOP=Hyprland \
+    XDG_SESSION_DESKTOP=Hyprland \
+    XDG_SESSION_TYPE=wayland \
+    DESKTOP_SESSION=hyprland \
+    OMARCHY_PATH=/usr/share/omarchy \
+    PATH="$package_path" \
+    "$hyprctl_bin" "$@"
+}
+
+suppress_hyprland_config_reload() {
+  log "Suppressing live Hyprland reloads during the config swap"
+
+  local changed=0
+  if run_hyprctl_session keyword misc:disable_autoreload true >/dev/null 2>&1; then
+    changed=1
+  fi
+  if run_hyprctl_session eval 'hl.config({ misc = { disable_autoreload = true }, debug = { suppress_errors = true } })' >/dev/null 2>&1; then
+    changed=1
+  fi
+  run_hyprctl_session keyword debug:suppress_errors true >/dev/null 2>&1 || true
+
+  if (( changed )); then
+    hyprland_config_reload_suppressed=1
+  else
+    warn "Could not disable Hyprland auto-reload; the live session may briefly report config errors."
+  fi
+}
+
+restore_hyprland_config_reload() {
+  (( hyprland_config_reload_suppressed )) || return 0
+
+  run_hyprctl_session keyword misc:disable_autoreload false >/dev/null 2>&1 || true
+  run_hyprctl_session eval 'hl.config({ misc = { disable_autoreload = false } })' >/dev/null 2>&1 || true
+  run_hyprctl_session keyword debug:suppress_errors false >/dev/null 2>&1 || true
+  run_hyprctl_session eval 'hl.config({ debug = { suppress_errors = false } })' >/dev/null 2>&1 || true
+  hyprland_config_reload_suppressed=0
+}
+
+ensure_sleep_lock_service() {
+  [[ -S $target_runtime_dir/bus ]] || return 0
+
+  log "Ensuring Omarchy sleep lock service is enabled"
+  run_as_user_session systemctl --user daemon-reload >/dev/null 2>&1 || true
+  run_as_user_session systemctl --user reset-failed omarchy-sleep-lock.service >/dev/null 2>&1 || true
+  if ! run_as_user_session systemctl --user enable --now omarchy-sleep-lock.service >/dev/null 2>&1; then
+    warn "Could not start omarchy-sleep-lock.service; it should start after reboot."
+  fi
+}
+
+
+enable_system_service() {
+  local unit="$1"
+  as_root systemctl enable "$unit" >/dev/null 2>&1 || warn "Could not enable $unit; it may not be installed on this system."
+}
+
+apply_firewall_defaults() {
+  if ! command -v ufw >/dev/null 2>&1; then
+    warn "ufw is not installed; skipping firewall defaults."
+    return 0
+  fi
+
+  log "Applying Omarchy firewall defaults"
+  as_root ufw default deny incoming >/dev/null || true
+  as_root ufw default allow outgoing >/dev/null || true
+  as_root ufw allow 53317/udp >/dev/null || true
+  as_root ufw allow 53317/tcp >/dev/null || true
+  as_root ufw allow in proto udp from 172.16.0.0/12 to 172.17.0.1 port 53 comment 'allow-docker-dns' >/dev/null || true
+  as_root ufw allow in proto udp from 192.168.0.0/16 to 172.17.0.1 port 53 comment 'allow-docker-dns' >/dev/null || true
+  as_root sed -i 's/^ENABLED=.*/ENABLED=yes/' /etc/ufw/ufw.conf 2>/dev/null || true
+  enable_system_service ufw.service
+}
+
+root_filesystem_encrypted() {
+  local root_source root_type
+
+  root_source=$(findmnt -n -o SOURCE / 2>/dev/null || true)
+  [[ $root_source == /dev/mapper/* ]] && return 0
+
+  if [[ -n $root_source ]]; then
+    root_type=$(lsblk -no TYPE "$root_source" 2>/dev/null | head -n1 || true)
+    [[ $root_type == crypt ]] && return 0
+  fi
+
+  as_root bash -c '[[ -s /etc/crypttab ]] && grep -qvE "^[[:space:]]*(#|$)" /etc/crypttab' >/dev/null 2>&1
+}
+
+should_enable_sddm_autologin() {
+  as_root test -f /etc/sddm.conf.d/autologin.conf && return 0
+  as_root systemctl is-enabled omarchy-seamless-login.service >/dev/null 2>&1 && return 0
+  root_filesystem_encrypted
+}
+
+apply_system_transition() {
+  log "Applying Omarchy 4 system transition"
+  [[ -d /usr/share/omarchy ]] || fail "/usr/share/omarchy was not installed."
+
+  as_root install -d -m 0755 /usr/share/icons/Yaru/scalable/actions
+  as_root ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-previous-symbolic.svg \
+    /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg
+  as_root ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-next-symbolic.svg \
+    /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg
+  as_root gtk-update-icon-cache /usr/share/icons/Yaru >/dev/null 2>&1 || true
+
+  as_root install -d -m 0777 /etc/chromium/policies/managed
+  as_root install -d -m 0755 /usr/lib/chromium
+  printf '%s\n' '{"browser":{"theme":{"color_scheme":0,"color_scheme2":0}}}' | \
+    as_root tee /usr/lib/chromium/initial_preferences >/dev/null
+
+  if getent group docker >/dev/null; then
+    as_root usermod -aG docker "$target_user"
+  fi
+
+  if [[ -f /usr/bin/powerprofilesctl ]]; then
+    as_root sed -i '/env python3/ c\#!/bin/python3' /usr/bin/powerprofilesctl || true
+  fi
+
+  as_root install -d -m 0755 /etc/systemd/resolved.conf.d /etc/docker
+  cat <<'EOF' | as_root tee /etc/systemd/resolved.conf.d/10-disable-multicast.conf >/dev/null
+[Resolve]
+LLMNR=no
+MulticastDNS=no
+EOF
+  cat <<'EOF' | as_root tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
+[Resolve]
+DNSStubListenerExtra=172.17.0.1
+EOF
+  cat <<'EOF' | as_root tee /etc/docker/daemon.json >/dev/null
+{
+    "log-driver": "json-file",
+    "log-opts": { "max-size": "10m", "max-file": "5" },
+    "dns": ["172.17.0.1"],
+    "bip": "172.17.0.1/16"
+}
+EOF
+  as_root ln -sfn ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
+
+  # Fresh Omarchy socket-activates Docker. Disable the old always-on service if
+  # an upgraded install had enabled it, but do not stop running containers mid-upgrade.
+  as_root systemctl disable docker.service >/dev/null 2>&1 || true
+
+  enable_system_service cups.service
+  enable_system_service cups-browsed.service
+  enable_system_service avahi-daemon.service
+  enable_system_service linux-modules-cleanup.service
+  enable_system_service docker.socket
+  enable_system_service systemd-resolved.service
+  enable_system_service NetworkManager.service
+  enable_system_service bluetooth.service
+  enable_system_service power-profiles-daemon.service
+  enable_system_service sddm.service
+
+  apply_firewall_defaults
+
+  log "Normalizing SDDM login configuration"
+  as_root install -d -m 0755 /etc/sddm.conf.d
+  printf '[Theme]\nCurrent=omarchy\n' | as_root tee /etc/sddm.conf.d/10-theme.conf >/dev/null
+  cat <<'EOF' | as_root tee /etc/sddm.conf.d/10-wayland.conf >/dev/null
+[General]
+DisplayServer=wayland
+
+[Wayland]
+CompositorCommand=start-hyprland -- --config /usr/share/sddm/hyprland.lua
+EOF
+  cat <<'EOF' | as_root tee /etc/sddm.conf.d/99-omarchy-login.conf >/dev/null
+[Theme]
+Current=omarchy
+
+[Users]
+RememberLastUser=true
+RememberLastSession=true
+EOF
+
+  local autologin_user
+  if should_enable_sddm_autologin; then
+    if as_root test -f /etc/sddm.conf.d/autologin.conf; then
+      autologin_user=$(as_root awk -F= '/^User=/ { print $2; exit }' /etc/sddm.conf.d/autologin.conf 2>/dev/null || true)
+    fi
+    [[ -n ${autologin_user:-} ]] || autologin_user="$target_user"
+    cat <<EOF | as_root tee /etc/sddm.conf.d/autologin.conf >/dev/null
+[Autologin]
+User=$autologin_user
+Session=omarchy.desktop
+EOF
+  else
+    as_root rm -f /etc/sddm.conf.d/autologin.conf
+  fi
+
+  as_root install -d -m 0755 -o sddm -g sddm /var/lib/sddm 2>/dev/null || as_root install -d -m 0755 /var/lib/sddm
+  cat <<EOF | as_root tee /var/lib/sddm/state.conf >/dev/null
+[Last]
+Session=omarchy.desktop
+User=$target_user
+EOF
+  as_root chown sddm:sddm /var/lib/sddm /var/lib/sddm/state.conf 2>/dev/null || true
+
+  as_root rm -f /etc/systemd/system/getty@tty1.service.d/autologin.conf
+  as_root rm -f /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf
+  as_root rm -f /etc/systemd/system/omarchy-seamless-login.service
+  as_root rm -f /usr/local/bin/seamless-login
+  as_root systemctl disable omarchy-seamless-login.service >/dev/null 2>&1 || true
+
+  as_root systemctl disable makima.service >/dev/null 2>&1 || true
+  as_root rm -rf /etc/systemd/system/makima.service.d
+  as_root rm -f /etc/udev/rules.d/99-uinput.rules
+  as_root systemctl disable dell-xps-haptic-touchpad.service >/dev/null 2>&1 || true
+  as_root rm -f /etc/systemd/system/dell-xps-haptic-touchpad.service
+  as_root rm -f /etc/systemd/system/multi-user.target.wants/dell-xps-haptic-touchpad.service
+  as_root rm -rf /etc/systemd/system/dell-xps-haptic-touchpad.service.d
+  as_root rm -f /etc/udev/rules.d/99-dell-xps-haptic-touchpad.rules
+  as_root rm -f /etc/omarchy-dell-haptic-touchpad.env
+  as_root rm -f /etc/pacman.d/hooks/walker-restart.hook
+  as_root systemctl daemon-reload >/dev/null 2>&1 || true
+
+  if [[ -f /etc/pam.d/sddm ]]; then
+    as_root sed -i '/-auth.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
+    as_root sed -i '/-password.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
+  fi
+
+  if [[ -f /etc/pam.d/system-auth ]]; then
+    as_root sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' /etc/pam.d/system-auth
+    as_root sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' /etc/pam.d/system-auth
+  fi
+  if [[ -f /etc/pam.d/sddm-autologin ]]; then
+    as_root sed -i '/pam_faillock\.so preauth/d' /etc/pam.d/sddm-autologin
+    as_root sed -i '/pam_faillock\.so authsucc/d' /etc/pam.d/sddm-autologin
+    as_root sed -i '/auth.*pam_permit\.so/a auth        required    pam_faillock.so authsucc' /etc/pam.d/sddm-autologin
+  fi
+}
+
+apply_user_transition() {
+  log "Applying Omarchy 4 user transition"
+  [[ -d /usr/share/omarchy ]] || fail "/usr/share/omarchy was not installed."
+
+  run_as_user env \
+    TARGET_HOME="$target_home" \
+    BACKUP_SUFFIX="$backup_suffix" \
+    OMARCHY_USER_NAME="${OMARCHY_USER_NAME:-}" \
+    OMARCHY_USER_EMAIL="${OMARCHY_USER_EMAIL:-}" \
+    bash <<'USER_SETUP'
+set -euo pipefail
+root=/usr/share/omarchy
+state_dir="$HOME/.local/state/omarchy"
+mkdir -p "$state_dir" "$HOME/.config"
+
+file_sha256() {
+  sha256sum "$1" | awk '{print $1}'
+}
+
+known_config_default_hashes() {
+  cat <<'DEFAULT_HASHES'
+# action<TAB>relative ~/.config path<TAB>sha256
+# refresh: hash-matched shipped defaults
+refresh	alacritty/alacritty.toml	d43ab27e10ba1fd0505d50fe374b9bd02fa2e1d888fe2252c5208542fe5ddc8f
+refresh	alacritty/alacritty.toml	4e627909552ceebc80f5839955a09a7f804c501fee9a1fe76e13d95ad6cf5030
+refresh	alacritty/alacritty.toml	73dc34be744039613ef522aab84c27468b61ff13d7bc0ed2d57a83904e13f613
+refresh	alacritty/alacritty.toml	e25fae44db040d97714cf4ca3d77e48f0ae32fed9e02e6b3db9ad4d705bdaed5
+refresh	alacritty/alacritty.toml	999562ef35642910bec05c2444c3acdcd6e29bc60ec541529d9c69a20cad5c88
+refresh	alacritty/alacritty.toml	8bf6dee79e634949617cd7acdd2756da52f7c3031b8eac98a7948f2fef0cf07e
+refresh	alacritty/alacritty.toml	e4d201b6b9afd2f591d64f98eb50eb19247b8b839c2eaacfe2623628203c486f
+refresh	autostart/org.fcitx.Fcitx5.desktop	a0260e7f35579a73f77e257e9e3795abd8b33119a17b931ca6016a07036e1670
+refresh	btop/btop.conf	e6b86ddda073e06bf64cfbbde9652f9335171d8ca8c622e617478a3c696a6a3d
+refresh	btop/btop.conf	7f4122f2ed5f4c95489950cce2c0b192e19ae6fa74b0666d25e0b10040b2cee8
+refresh	btop/btop.conf	4e17dd28c43948af48a408ed9b0901c008e57dfe3b8fcf09649ec10f28746137
+refresh	chromium/Default/Preferences	67aef8ae3a6e0ee1180057198f47f2ea412ea1f01051d77edce4c465fb83d887
+refresh	chromium-flags.conf	3a8fe5b85bc42b27f5a0f36f3b674dc8e22a7d670a6aabbdc4f2d4057b97a1d4
+refresh	chromium-flags.conf	3d52925a48ac3704f9427ecec70310d9c89be5442c41ece183122a9246837be4
+refresh	chromium-flags.conf	4bc8710615d2151464e9bd6d1123fbfbb8f56dea4cf0568320bc7b50d24ad205
+refresh	chromium-flags.conf	1df1a5282f9525bfbb97a697c8169c08c1adb2b5a4de5ae94d84df7b4a78f2fc
+refresh	chromium-flags.conf	0408c524892830f5cf43e94c389b897cbc093ede312f49a4627bfabf692653c2
+
+refresh	fcitx5/conf/clipboard.conf	2d53b40811ee7ceb71c7db0422a3ed733647f389379a57dbf2915d522dff4193
+refresh	fcitx5/conf/xcb.conf	f5cf059182c4361fa7b16d5149f20a09eb1e0915f4463ba60dae626b86df7d9c
+refresh	foot/foot.ini	52e30647172522459b2179af714c19b62a35fe11bc23c49839fda5dca3253e84
+refresh	foot/foot.ini	ac16453a4b4ebc997ff6732e7e4448dc759c25587fdb8aa1d1a7eee92b518987
+refresh	ghostty/config	ed589d69296f5aa083e4dba43fc3d40cfbe2f6d10b382f3d0dc2ff76d5ec8fe5
+refresh	ghostty/config	2832c9c27cdcd735e913d538c3c61005fd90e909541bdcb746bb454851ae79ca
+refresh	ghostty/config	8200bc34b7ced8170d512c619f0408ac7dd7d7b4e64021ac66393d8a8bf1d951
+refresh	ghostty/config	006fbe4048de02fc040eeefd0974081c6f7df5dae419f8d542fc1adf08b0d6fb
+refresh	ghostty/config	e55a409a490d4f80c19c9242a59db8e00e271e01feddb8fda6a5a7102d39af20
+refresh	ghostty/config	b65e4903813d442a25540eef5a24313121c640a57114ee3d76d1ec7408d86b27
+refresh	ghostty/config	4e6ccba3d0584832cedf22713842f8ce7eca383c2ea3bfe61286d2b8df73f3fe
+refresh	git/config	3e1bdf77aa65b7bb412cc25c02bac4734e98c10e4a63815b98737bf817b6f682
+refresh	hypr/hyprsunset.conf	3ac2e9fe716fb8c612f07ca608ba7eee491921c2386118aae54ff9c8121726f2
+refresh	hypr/hyprsunset.conf	e6fa7d909a90b64df7f75e8842bc2541e75463a47bbc7213ec79a56364f563f2
+refresh	hypr/hyprsunset.conf	afe595d9d31574bde0f3ab8f7d370d0710bc188d6e5643f73255ffa7a202b647
+refresh	hypr/hyprsunset.conf	3042e4a923030239f4edf7b1943f41f4ed57107550177130c96f3b215b226e22
+refresh	hypr/xdph.conf	637899cd3926c4b8c758d3cb812cc1e7ac7643aca83a8e5030208234d064c839
+refresh	hypr/xdph.conf	2fded88a27b89f33cbc2b64a1258117df74b591f39a84c78ec3504a7d3b09136
+refresh	hyprland-preview-share-picker/config.yaml	cb7f8768566ce41f8b09249b504ea8f6dbd6ed830637eef24c4e94e94486d113
+refresh	hyprland-preview-share-picker/config.yaml	cf88364e497e4af2adaff9a0b7ca12227d29f831bc7e18846dd8f03bf4c618a8
+refresh	imv/config	58fd37d4862eb484d50c2c0cc507836e685a776d8da8dd9f20bd894809c31cd6
+refresh	imv/config	569b52b9614a78be67ce9f0a828ff1a7a73e4741d4751577ec6b247ab78e29ea
+refresh	imv/config	832b19821b4c69f9381aea6902b1b80c5682c30091e6d4a59493c8edf827bf72
+refresh	kitty/kitty.conf	69d6cbd2f8adcaec09407b5fb71ec7956cd510f6d64c36600ab7f7e7d3812cc6
+refresh	kitty/kitty.conf	6c5fe293bb92b1ea5fd955afcec126597ae0a665395db1d38b9beb6461c587d1
+refresh	kitty/kitty.conf	68779240358653a03ede95c4c872d94e3ab3742cf64a982b17e94f42aa2b74d4
+refresh	kitty/kitty.conf	9599cfd1f1fbd7e14fe1ba48196137be3cf8bcfa95f6c24d15d8053d88f73f0a
+refresh	kitty/kitty.conf	ea3bc5e353f7312d774362310f7c511584efd6076c163b4cad1a9cc05c0f80ab
+refresh	kitty/kitty.conf	8984216fe0c0d006b969a7494dd4aad79ac78e9d15bd7a82ccbf5f10eac48fa6
+refresh	lazygit/config.yml	e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+refresh	obsidian/user-flags.conf	6c00f4daeff2b018bda247151a8edee44115273f554cfda00909bc5e56a3ae85
+refresh	omarchy/hooks/battery-low.d/play-warning-sound.sample	9623f5534cd52f76a51cfbb4e8a0699a550bf7f0f5f2ff54a1c78534d907fdf1
+refresh	omarchy/hooks/font-set.d/show-font-notification.sample	d28090fd796b02fa799dcf7160e46ce9fc8d7a17b476ef87639d0b83a347dc37
+refresh	omarchy/hooks/post-boot.d/weather.sample	fe37567a09046f1e4fcff9a9c74e4a036270cdf6da73dcc5cd3aa617f9a7c2ba
+refresh	omarchy/hooks/post-update.d/show-update-notification.sample	7995adc93a0ac6cd1afcd7ed9ac6d0ff058751ce4df4594aa78855603a613815
+refresh	omarchy/hooks/theme-set.d/show-theme-notification.sample	b9d6754d95057bdb2f37595fd2f40055872118cb2f442bdc7b0b900317bac332
+refresh	omarchy/themed/alacritty.toml.tpl.sample	ea5889bf79e273aa9cf1e7a1b2916dae7751fc0dced2cd53af36a2ebeecb4f1e
+refresh	omarchy/themed/alacritty.toml.tpl.sample	a05d015227a406470b571d9d8f372eb8042df94b32cf746e71fd2f513c9880ac
+refresh	opencode/opencode.json	3806450805c8661a729c46aea325826e9ee7d158d650c9d750f5d0a763ec2c03
+refresh	opencode/opencode.json	fb067af039252d48ef5b5c573a5e12c17357af4324b218aca5efa36f882846dd
+refresh	starship.toml	b17c9b5f096fc125e97050e359171c6011d6b3c7d7e9ac28f630e75b4d4bb9db
+refresh	tmux/tmux.conf	345abaa3f128529abbbe4da3a24c227170c9679fb0af1f3d87eb15959e183219
+refresh	tmux/tmux.conf	93088311b8b67eb10ede3040b55e81193ff43fe16c5b2a6e3799300e00f39e3d
+refresh	tmux/tmux.conf	02d7c3914b73b8fec139316b9e1e88a40764617c6f4f1b6a3c05ad9c4a68b944
+refresh	tmux/tmux.conf	6633a3c59441087fdead8c30601e50c39fc7e74a66a32514296657332ff6cde9
+refresh	tmux/tmux.conf	473abae53d3aa7da59be65cc6301a15f6cc878045ae3f4c5e180ee013a0a04a7
+refresh	tmux/tmux.conf	bf881713284aa2cc6722a199e42d57c005ae5922ef4eb6305593ead09b13ca7c
+refresh	Typora/themes/ia_typora.css	8bb2493c1dc24c8217c35ce9c0d29054b3733316923a0ddd2e63908b11ec073e
+refresh	Typora/themes/ia_typora_night.css	ff3d670351fdaf64aca339fbb94453c4962feae4705be9ed7ff31237e6da5791
+refresh	Typora/themes/ia_typora_night.css	d3708c850dcedf2ec210454c38bd1fa19b390e51bfce42ebac73d5f469aa1462
+refresh	xournalpp/settings.xml	47eafeeb3c246af1a5fb2cd1d87a748ce127d13410c351194c5d89bbaefb623d
+refresh	xournalpp/settings.xml	1c1a9efbf1b6dc7813bf3440fd5bf8409fc283e8d0192ca297dc36a10e12c846
+# retire: nothing is actually copied. The new package owns the file at the
+# system path below (shipped by omarchy-settings), so once the user's
+# hash-matched copy in ~/.config is removed, the system path takes effect
+# via the usual XDG/fontconfig/systemd lookup order. User overrides
+# (hash mismatch) are kept active as backups.
+# Legacy ~/.config path -> package-owned destination (where the file now lives):
+# environment.d/fcitx.conf -> /usr/lib/environment.d/10-omarchy-fcitx.conf
+# fastfetch/config.jsonc -> /etc/fastfetch/config.jsonc
+# fontconfig/fonts.conf -> /usr/share/fontconfig/conf.avail/50-omarchy.conf
+# mimeapps.list -> /usr/share/applications/mimeapps.list
+# omarchy.ttf -> /usr/share/fonts/omarchy/omarchy.ttf
+# systemd/user/bt-agent.service -> /usr/lib/systemd/user/bt-agent.service
+# systemd/user/omarchy-recover-internal-monitor.service -> /usr/lib/systemd/user/omarchy-recover-internal-monitor.service
+# systemd/user/omarchy-sleep-lock.service -> /usr/lib/systemd/user/omarchy-sleep-lock.service
+# uwsm/default -> /usr/share/omarchy/default/uwsm/default
+# uwsm/env -> /usr/share/uwsm/env.d/10-omarchy
+# xdg-terminals.list -> /usr/share/xdg-terminal-exec/hyprland-xdg-terminals.list
+retire	environment.d/fcitx.conf	faacbd703a8f797013968b235fec6289a9c921d3ec7b7f8b4e1cd24392f68b9c
+retire	environment.d/fcitx.conf	8b077b6ea2594dc1d4b57592a3bc62703df4959e86b93ea0fc488b6686309095
+retire	fastfetch/config.jsonc	6adebf87d93902fb4bc68824a8e7c71e482846af23fea199e489c5496f791590
+retire	fastfetch/config.jsonc	fe61d9f7cfac800adb7bd21f75f1bfcca266c609b6efa02a6e25303ac192e86e
+retire	fastfetch/config.jsonc	62fa26fa5fb8e11d31c5ec9f3a53b9b6b1124b29134b19329a092878ff624581
+retire	fastfetch/config.jsonc	abb336459df8dea8f84df1dd54a2f223adec558df3de39cce84ca83f88acc02f
+retire	fastfetch/config.jsonc	f1c9a999a4f31a215b10474eeac8894ce6da220d680c30d2aab7b3c1b7a539a6
+retire	fastfetch/config.jsonc	97aefdea2103d6c73e063bf0d11ad26da8fe60630305ac4eb2970cfc50cb0d91
+retire	fastfetch/config.jsonc	22565532d139ab8c2ddb21dcfe56460dc9f2f8a712b8d29f125c1c8b29beca37
+retire	fastfetch/config.jsonc	b65cb9ca36eed45929bfc35443762b14957d3847f6bed361a338224a87450e3a
+retire	fastfetch/config.jsonc	3d153225131d3031b99b2e1a07e84d22cd0e51fcae1e701b08f6b6a558bc7a9c
+retire	fastfetch/config.jsonc	404d0273c380cfdad4a037fa87202fc1d96be178c867e8a9d27b0a772f6e2fa1
+retire	fastfetch/config.jsonc	4a98ff77ed46109d08ef7301249ea6823d1abba6c39c0871680feebf96620bf2
+retire	fastfetch/config.jsonc	2cc59c562e51ed3a58a784a17414ad40699253d0a9522eb7ce01faf6d7cff7c2
+retire	fastfetch/config.jsonc	07027778c12914c7077022cc835de4ac6c38af90aed539a871b13c7c89603e87
+retire	fastfetch/config.jsonc	0bc8cb0a24ec07e786cccbad446fd80b72520e7effd9bff8cfa27b7361211f4b
+retire	fastfetch/config.jsonc	c827c3a24f64c418d309244a8a967def0c522d824addf65d8ee0741afbc970bd
+retire	fastfetch/config.jsonc	c909b43ba000887cd418d9eaf98c1c9c5ba938aa27f9246cf8fa5662946c4e87
+retire	fastfetch/config.jsonc	b2e5757851f0703edb8bcfc4b51a00bf5e303c1df26b8c63e6b7df6be4ead4ed
+retire	fastfetch/config.jsonc	1a0a085e7a80036f415148da21f772e99898de7e70768ec7b7613f8cc620700c
+retire	fontconfig/fonts.conf	7db33b0f8673f71f42604255cad222194294cd401315fecde6b83151eecebe91
+retire	fontconfig/fonts.conf	f35b5b4bd0d8d3926f5d9a49ca791fc66b00793786420508d4a4c41ae9ccbefc
+retire	fontconfig/fonts.conf	6dec98b539388b95ecfdb3c7ab951001c712820eb0581002832cb7bfdde1a654
+retire	fontconfig/fonts.conf	3545f6c5a8c1465df7a4e251b3c2047d4ba03654c86636794f64cb0d8ea8ef63
+retire	fontconfig/fonts.conf	0f085b449f1cbe8eda3b59a6235bf2a3ddb6e982ab5d22fa642248916e63bafc
+retire	mimeapps.list	3b574cef135b5deb7a8a0c7e17139037cf1fe155300e3809f60bed0e04120975
+retire	omarchy.ttf	e55e67119e82f56f92d90cbf54b7ccc1b2946b32c535a29370439d7ef5215966
+retire	systemd/user/bt-agent.service	0406b577a1225dc2a9f86638d3c346eb3635168576f04050be50ebcc0be6be12
+retire	systemd/user/omarchy-recover-internal-monitor.service	b9b92cedc44cf3cb6216948629be55b53d16746e31896dc6469fd49ba55e82f4
+retire	systemd/user/omarchy-recover-internal-monitor.service	e1483079b9f2aefcd43b4722c75a31643e5f3bb5a2eada5f52f1d7d201e8c289
+retire	systemd/user/omarchy-sleep-lock.service	6870b232a6c0474b59187882e6d25ae771bba735098bcbedef8a2b73b97e2b6a
+retire	uwsm/default	2e89b03a3710b70cf754ea0c8db4388bb35a7519870036abff5ea8a584eafbc0
+retire	uwsm/default	3622ba134d29b639a155424a5226215e213c8508144e98001ffe128a8967c9b5
+retire	uwsm/default	73712c5a677532bd4afcee5800ae9b76e3d02a2130659a96a8b7fbe2fd2c3d53
+retire	uwsm/default	56f968d461da1b8360bc21d5fb7d5375121b772dd06d9397ebcda55a9097c2a0
+retire	uwsm/default	f7558795e1f6b89357a780ad4e1c63ffdd56e423f31c9a888738afe894e16623
+retire	uwsm/env	60eae2629f2dbc70bb068de7bcb245032a429dd989f98b573eb315c0760b4ea5
+retire	uwsm/env	daf70280edd80bae94660f8509d294df2aaa242d3428320bf6542341efff5a6d
+retire	uwsm/env	61a4147404a2b6b920f6f414a8c9bcef69b8bcf2a1251e1ddd2fbc37fe45e04d
+retire	uwsm/env	32130b0033e1d3229d89e6f73394e272eb3adad07314f740f8df9629c1f89beb
+retire	uwsm/env	278df755a1679f2735742c61de9789614cdb2021fbbb4e802f056c0403d1a6b8
+retire	uwsm/env	7be477d4e734d30ebc2caf9dbad6133dcb4aef38d64eb0979beab46f1c0e2464
+retire	uwsm/env	0c2cd9c32bd8aea26c62bc18c4a287a29999d4b2ec2b3216b666fb204ab3c471
+retire	uwsm/env	957dc0a95f8e909a378ce82967d7a55eb474e2fe5b2672212272e88530c4d4aa
+retire	uwsm/env	425036ed11f004f59a5fca324305b13189a6aca4b4dd1582532f075d14413d93
+retire	uwsm/env	9eb186609afce36a525e58e0b0858eb586869c5d067a7e5545bb5be606ab8a44
+retire	xdg-terminals.list	7303fa8d1d74eda73cf5fb4c90183a8608c191bb80d7fb9d96ab60f9df06022e
+retire	xdg-terminals.list	d035da571a6bfc7d626d4a88846ea86a8adb6f6662f1f8b4abe2330e53ceb71b
+DEFAULT_HASHES
+}
+
+declare -A known_config_default_hashes_by_key=()
+while IFS=$'	' read -r action rel hash; do
+  [[ -n ${action:-} && $action != \#* ]] || continue
+  known_config_default_hashes_by_key["$action:$rel:$hash"]=1
+done < <(known_config_default_hashes)
+
+default_hash_paths() {
+  local action_filter="$1" action rel hash
+  known_config_default_hashes | while IFS=$'	' read -r action rel hash; do
+    [[ -n ${action:-} && $action != \#* ]] || continue
+    [[ $action == "$action_filter" ]] || continue
+    printf '%s\n' "$rel"
+  done | sort -u
+}
+
+is_known_default_hash() {
+  local action="$1" rel="$2" file="$3" hash
+  [[ -f $file ]] || return 1
+  hash=$(file_sha256 "$file")
+  [[ -n ${known_config_default_hashes_by_key["$action:$rel:$hash"]+set} ]]
+}
+
+backup_config_file() {
+  local file="$1"
+  [[ -e $file || -L $file ]] || return 0
+  cp -af "$file" "$file.omarchy-upgrade-to-4.$BACKUP_SUFFIX.bak"
+}
+
+mapfile -t retired_config_files < <(default_hash_paths retire)
+
+# These are new Omarchy 4 config entry points. Older installs cannot have an
+# Omarchy-shipped legacy copy to hash-match, so always install the v4 default.
+always_copy_config_files=(
+  hypr/.luarc.json
+  hypr/autostart.lua
+  hypr/bindings.lua
+  hypr/hyprland.lua
+  hypr/input.lua
+  hypr/looknfeel.lua
+  hypr/monitors.lua
+  omarchy/bar.json
+  omarchy/extensions/omarchy-menu.jsonc
+  omarchy/hooks/pre-refresh-pacman.d/add-custom-repo.sample
+  omarchy/shell.json
+)
+
+migrate_uwsm_env_customizations() {
+  local source="$1" dest="$HOME/.config/uwsm/env.d/99-omarchy-upgrade-env" tmp
+  [[ -f $source ]] || return 0
+  is_known_default_hash retire uwsm/env "$source" && return 0
+
+  tmp=$(mktemp)
+  awk '
+    function omitted(reason) { print ": # omarchy-upgrade omitted legacy Omarchy " reason; next }
+
+    /^[[:space:]]*export[[:space:]]+OMARCHY_PATH=\$HOME\/\.local\/share\/omarchy[[:space:]]*$/ { omitted("OMARCHY_PATH") }
+    /^[[:space:]]*export[[:space:]]+OMARCHY_PATH="\$\{OMARCHY_PATH:-\/usr\/share\/omarchy\}"[[:space:]]*$/ { omitted("OMARCHY_PATH") }
+    /^[[:space:]]*\[ -f \/etc\/omarchy\.conf \] && \. \/etc\/omarchy\.conf[[:space:]]*$/ { omitted("/etc/omarchy.conf source") }
+    /^[[:space:]]*export[[:space:]]+PATH=\$OMARCHY_PATH\/bin:\$PATH:\$HOME\/\.local\/bin[[:space:]]*$/ { omitted("PATH setup") }
+    /^[[:space:]]*export[[:space:]]+PATH="\$OMARCHY_PATH\/bin:\$PATH:\$HOME\/\.local\/bin"[[:space:]]*$/ { omitted("PATH setup") }
+    /^[[:space:]]*source[[:space:]]+~\/\.config\/uwsm\/default[[:space:]]*$/ { omitted("uwsm/default source") }
+    /^[[:space:]]*\[ -f "\$HOME\/\.config\/uwsm\/default" \] && \. "\$HOME\/\.config\/uwsm\/default"[[:space:]]*$/ { omitted("uwsm/default source") }
+    /^[[:space:]]*omarchy-cmd-present[[:space:]]+mise && eval "\$\(mise activate bash --shims\)"[[:space:]]*$/ { omitted("mise activation") }
+
+    { print }
+  ' "$source" >"$tmp"
+
+  if [[ -s $tmp ]]; then
+    if ! sh -n "$tmp" >/dev/null 2>&1; then
+      cp -f "$source" "$tmp"
+    fi
+
+    mkdir -p "$(dirname "$dest")"
+    {
+      echo '# Preserved custom ~/.config/uwsm/env content during Omarchy 4 upgrade.'
+      echo '# Exact legacy Omarchy-managed setup lines were replaced with no-op markers where safe.'
+      cat "$tmp"
+    } >"$dest"
+  fi
+
+  rm -f "$tmp"
+}
+
+is_retired_config_file() {
+  local rel="$1" retired
+  [[ $rel == systemd/user/* ]] && return 0
+
+  for retired in "${retired_config_files[@]}"; do
+    [[ $rel == "$retired" ]] && return 0
+  done
+
+  return 1
+}
+
+copy_config_default() {
+  local rel="$1" source="$root/config/$1" target="$HOME/.config/$1"
+  [[ -e $source || -L $source ]] || return 0
+
+  if [[ -e $target || -L $target ]]; then
+    if [[ -f $source && -f $target ]] && cmp -s "$source" "$target"; then
+      return 0
+    fi
+    backup_config_file "$target"
+    rm -f "$target"
+  fi
+
+  mkdir -p "$(dirname "$target")"
+  cp -P "$source" "$target"
+}
+
+copy_missing_config_defaults() {
+  local source_dir="$1" target_dir="$2" source_path rel target_path
+  [[ -d $source_dir ]] || return 0
+
+  while IFS= read -r -d '' source_path; do
+    rel="${source_path#$source_dir/}"
+    is_retired_config_file "$rel" && continue
+
+    target_path="$target_dir/$rel"
+    [[ -e $target_path || -L $target_path ]] && continue
+
+    mkdir -p "$(dirname "$target_path")"
+    cp -P "$source_path" "$target_path"
+  done < <(find "$source_dir" \( -type f -o -type l \) -print0)
+}
+
+refresh_known_config_defaults() {
+  local rel file default
+
+  while IFS= read -r rel; do
+    file="$HOME/.config/$rel"
+    default="$root/config/$rel"
+    [[ -f $file && -f $default ]] || continue
+    is_known_default_hash refresh "$rel" "$file" || continue
+    copy_config_default "$rel"
+  done < <(default_hash_paths refresh)
+}
+
+copy_always_config_defaults() {
+  local rel
+  for rel in "${always_copy_config_files[@]}"; do
+    copy_config_default "$rel"
+  done
+}
+
+repair_chromium_copy_url_extension_flags() {
+  local file
+  local -a flag_files=(
+    "$HOME/.config/chromium-flags.conf"
+    "$HOME/.config/chrome-flags.conf"
+    "$HOME/.config/google-chrome-flags.conf"
+    "$HOME/.config/google-chrome-stable-flags.conf"
+    "$HOME/.config/brave-flags.conf"
+    "$HOME/.config/brave-browser-flags.conf"
+    "$HOME/.config/brave-origin-beta-flags.conf"
+    "$HOME/.config/microsoft-edge-flags.conf"
+    "$HOME/.config/microsoft-edge-stable-flags.conf"
+    "$HOME/.config/opera-flags.conf"
+    "$HOME/.config/vivaldi-flags.conf"
+    "$HOME/.config/helium-flags.conf"
+  )
+
+  for file in "${flag_files[@]}"; do
+    [[ -f $file ]] || continue
+    grep -qF '.local/share/omarchy/default/chromium/extensions/copy-url' "$file" || continue
+
+    backup_config_file "$file"
+    python3 - "$file" <<'CHROMIUM_FLAGS_PATCH_PY'
+import sys
+from pathlib import Path
+
+path = Path(sys.argv[1])
+new_path = "/usr/share/omarchy/default/chromium/extensions/copy-url"
+legacy_paths = [
+    "~/.local/share/omarchy/default/chromium/extensions/copy-url",
+    "$HOME/.local/share/omarchy/default/chromium/extensions/copy-url",
+    str(Path.home() / ".local/share/omarchy/default/chromium/extensions/copy-url"),
+]
+text = path.read_text()
+for legacy_path in legacy_paths:
+    text = text.replace(legacy_path, new_path)
+path.write_text(text)
+CHROMIUM_FLAGS_PATCH_PY
+  done
+}
+
+repair_sleep_lock_unit_override() {
+  local unit="$HOME/.config/systemd/user/omarchy-sleep-lock.service"
+  local legacy_exec='ExecStart=%h/.local/share/omarchy/bin/omarchy-system-sleep-monitor'
+  local current_exec='ExecStart=/usr/bin/omarchy-system-sleep-monitor'
+  local tmp
+  [[ -f $unit ]] || return 0
+
+  if grep -qxF "$legacy_exec" "$unit"; then
+    backup_config_file "$unit"
+    tmp=$(mktemp)
+    LEGACY_EXEC="$legacy_exec" CURRENT_EXEC="$current_exec" awk '
+      $0 == ENVIRON["LEGACY_EXEC"] { print ENVIRON["CURRENT_EXEC"]; next }
+      { print }
+    ' "$unit" >"$tmp" && mv "$tmp" "$unit"
+    rm -f "$tmp"
+  fi
+}
+
+is_known_bashrc_default() {
+  local file="$1" hash
+  [[ -f $file ]] || return 1
+  hash=$(file_sha256 "$file")
+
+  case "$hash" in
+    06ef4dcaa0530d7410513b65b82eea45f147d386a7689dcf1f5636fdad7561ff|\
+    907d367c7589361788a2b0456003f6ef0a2e049548b77b9acf5b0f8cecc2ab0f|\
+    7f46fdc7e3016ab2309d49607a9dddc907b06066cebcf23a63e0110f5d962d73|\
+    322f495563435da1dc70e16968ee33f6a9d81ab361b79ebfd97814b83a89e011|\
+    56009cd83e46e0715911877f173bf1dab966f3e22b6995c530937f2feb18b667|\
+    1a8c98df85360a85acde31effa33c419ce9d27bc17e3a0d5900d4a6cb1743bcc)
+      return 0
+      ;;
+  esac
+
+  return 1
+}
+
+install_bash_startup() {
+  local bashrc="$HOME/.bashrc" bash_profile="$HOME/.bash_profile"
+  [[ -f $root/default/bashrc ]] || return 0
+
+  backup_config_file "$bashrc"
+
+  if [[ ! -e $bashrc && ! -L $bashrc ]] || is_known_bashrc_default "$bashrc"; then
+    cp "$root/default/bashrc" "$bashrc"
+  elif grep -qxF 'source ~/.local/share/omarchy/default/bash/rc' "$bashrc" || grep -qxF 'source "$OMARCHY_PATH/default/bash/rc"' "$bashrc"; then
+    python3 - "$bashrc" <<'BASHRC_PATCH_PY'
+import sys
+from pathlib import Path
+
+path = Path(sys.argv[1])
+text = path.read_text()
+new_block = '''# /etc/omarchy.conf is written by omarchy-dev-link. When absent, force the
+# package default instead of preserving a stale inherited dev-link value before
+# we decide which rc file to source.
+if [[ -f /etc/omarchy.conf ]]; then
+  source /etc/omarchy.conf
+  export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
+else
+  export OMARCHY_PATH=/usr/share/omarchy
+fi
+source "$OMARCHY_PATH/default/bash/rc"
+'''
+text = text.replace('source ~/.local/share/omarchy/default/bash/rc\n', new_block)
+text = text.replace(': "${OMARCHY_PATH:=/usr/share/omarchy}"\nsource "$OMARCHY_PATH/default/bash/rc"\n', new_block)
+path.write_text(text)
+BASHRC_PATCH_PY
+  fi
+
+  if [[ ! -e $bash_profile && ! -L $bash_profile ]]; then
+    echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' >"$bash_profile"
+  fi
+}
+
+# Some former ~/.config defaults are now package-owned elsewhere so future
+# updates can change defaults without rewriting user files. Back them up before
+# cleanup, then keep only real user customizations active.
+uwsm_env="$HOME/.config/uwsm/env"
+if [[ -f $uwsm_env ]]; then
+  cp -f "$uwsm_env" "$uwsm_env.omarchy-upgrade-to-4.$BACKUP_SUFFIX.bak"
+  migrate_uwsm_env_customizations "$uwsm_env"
+fi
+
+for rel in "${retired_config_files[@]}"; do
+  file="$HOME/.config/$rel"
+  backup_config_file "$file"
+done
+
+# Existing user config may be customized. Refresh only files whose hash matches
+# a default Omarchy has shipped before, fill in missing defaults for old installs,
+# and always write the v4-only entry points that older installs cannot have.
+refresh_known_config_defaults
+copy_missing_config_defaults "$root/config" "$HOME/.config"
+copy_always_config_defaults
+repair_chromium_copy_url_extension_flags
+
+# Carry over user-added backgrounds from the legacy git checkout backup, then
+# remove old symlinks that pointed ~/.config/omarchy/themes/* back into the
+# pre-4 checkout. Omarchy 4 reads stock themes from /usr/share/omarchy/themes.
+legacy_omarchy_backup="$HOME/.local/share/omarchy.omarchy-upgrade-to-4.$BACKUP_SUFFIX.bak"
+if [[ -d $legacy_omarchy_backup/themes && -d $legacy_omarchy_backup/.git ]]; then
+  (
+    cd "$legacy_omarchy_backup"
+    mapfile -t tracked_backgrounds < <(git ls-files --cached 'themes/*/backgrounds/*' 2>/dev/null)
+    for theme_dir in themes/*/; do
+      [[ -d $theme_dir/backgrounds ]] || continue
+      theme_name=$(basename "$theme_dir")
+      for bg_file in "$theme_dir"/backgrounds/*; do
+        [[ -f $bg_file ]] || continue
+        is_tracked=0
+        for tracked in "${tracked_backgrounds[@]}"; do
+          [[ $tracked == "$bg_file" ]] && { is_tracked=1; break; }
+        done
+        if (( ! is_tracked )); then
+          mkdir -p "$HOME/.config/omarchy/backgrounds/$theme_name"
+          mv "$bg_file" "$HOME/.config/omarchy/backgrounds/$theme_name/"
+        fi
+      done
+    done
+  )
+fi
+if [[ -d $HOME/.config/omarchy/themes ]]; then
+  find "$HOME/.config/omarchy/themes" -mindepth 1 -maxdepth 1 -type l -delete
+fi
+
+# Retire legacy UI configs replaced by omarchy-shell. Hyprland .conf files are
+# intentionally left in place for users to reference/port after the upgrade.
+for rel in waybar swayosd mako walker; do
+  file="$HOME/.config/$rel"
+  if [[ -e $file || -L $file ]]; then
+    backup="$file.omarchy-upgrade-to-4.$BACKUP_SUFFIX.bak"
+    rm -rf "$backup"
+    mv "$file" "$backup"
+  fi
+done
+
+for rel in "${retired_config_files[@]}"; do
+  file="$HOME/.config/$rel"
+  backup="$file.omarchy-upgrade-to-4.$BACKUP_SUFFIX.bak"
+
+  # UWSM env was hardcoded to the legacy checkout on older installs. Custom
+  # non-Omarchy lines were migrated to env.d above; never keep the active file.
+  if [[ $rel == uwsm/env ]]; then
+    rm -f "$file"
+    continue
+  fi
+
+  if [[ -f $backup ]] && ! is_known_default_hash retire "$rel" "$backup"; then
+    # Keep intentional user overrides active; package defaults remain lower
+    # priority under /usr/lib or /usr/share.
+    mkdir -p "$(dirname "$file")"
+    cp -af "$backup" "$file"
+  else
+    rm -f "$file"
+  fi
+done
+repair_sleep_lock_unit_override
+install_bash_startup
+
+unset rel file backup retired_config_files always_copy_config_files uwsm_env known_config_default_hashes_by_key
+unset -f file_sha256 known_config_default_hashes default_hash_paths is_known_default_hash backup_config_file migrate_uwsm_env_customizations is_retired_config_file copy_config_default copy_missing_config_defaults refresh_known_config_defaults copy_always_config_defaults repair_chromium_copy_url_extension_flags repair_sleep_lock_unit_override is_known_bashrc_default install_bash_startup
+
+mkdir -p "$HOME/.agents/skills" "$HOME/.claude/skills" "$HOME/.codex/skills" "$HOME/.pi/agent/skills"
+if [[ -d $root/default/omarchy-skill ]]; then
+  ln -sfn "$root/default/omarchy-skill" "$HOME/.agents/skills/omarchy"
+  ln -sfn "$root/default/omarchy-skill" "$HOME/.claude/skills/omarchy"
+  ln -sfn "$root/default/omarchy-skill" "$HOME/.codex/skills/omarchy"
+  ln -sfn "$root/default/omarchy-skill" "$HOME/.pi/agent/skills/omarchy"
+fi
+
+mkdir -p "$HOME/.local/state/omarchy/toggles/hypr"
+if [[ -f $root/default/hypr/toggles/flags.lua ]]; then
+  cp "$root/default/hypr/toggles/flags.lua" "$HOME/.local/state/omarchy/toggles/hypr/"
+fi
+# Legacy Hyprland .conf entry points source ~/.local/state/omarchy/toggles/hypr/*.conf.
+# Keep an empty match around for the live pre-reboot session; v4 Lua ignores it.
+if [[ -f $HOME/.config/hypr/hyprland.conf ]]; then
+  : >"$HOME/.local/state/omarchy/toggles/hypr/flags.conf"
+fi
+
+mkdir -p "$HOME/.local/share/nautilus-python/extensions"
+for extension in localsend.py transcode.py; do
+  if [[ -f $root/default/nautilus-python/extensions/$extension ]]; then
+    cp "$root/default/nautilus-python/extensions/$extension" "$HOME/.local/share/nautilus-python/extensions/"
+  fi
+done
+
+mkdir -p "$HOME/.config/omarchy/branding"
+[[ -f $root/icon.txt ]] && cp "$root/icon.txt" "$HOME/.config/omarchy/branding/about.txt"
+[[ -f $root/logo.txt ]] && cp "$root/logo.txt" "$HOME/.config/omarchy/branding/screensaver.txt"
+
+mkdir -p "$HOME/Downloads" "$HOME/Pictures" "$HOME/Videos" "$HOME/Projects" "$HOME/.config/gtk-3.0"
+if command -v xdg-user-dirs-update >/dev/null 2>&1; then
+  xdg-user-dirs-update --set TEMPLATES "$HOME" || true
+  xdg-user-dirs-update --set PUBLICSHARE "$HOME" || true
+  xdg-user-dirs-update --set DESKTOP "$HOME" || true
+fi
+rmdir "$HOME/Templates" "$HOME/Public" "$HOME/Desktop" 2>/dev/null || true
+touch "$HOME/.config/gtk-3.0/bookmarks"
+for dir in Downloads Projects Pictures Videos; do
+  bookmark="file://$HOME/$dir $dir"
+  grep -qxF "$bookmark" "$HOME/.config/gtk-3.0/bookmarks" || echo "$bookmark" >>"$HOME/.config/gtk-3.0/bookmarks"
+done
+
+conf=/etc/vconsole.conf
+hyprlua="$HOME/.config/hypr/input.lua"
+if [[ -f $conf && -f $hyprlua ]]; then
+  sed -i '/^[[:space:]]*kb_layout[[:space:]]*=/d' "$hyprlua"
+  sed -i '/^[[:space:]]*kb_variant[[:space:]]*=/d' "$hyprlua"
+  if grep -q '^XKBLAYOUT=' "$conf"; then
+    layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
+    sed -i "/^[[:space:]]*kb_options *=/i\    kb_layout = \"$layout\"," "$hyprlua"
+  fi
+  if grep -q '^XKBVARIANT=' "$conf"; then
+    variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
+    sed -i "/^[[:space:]]*kb_options *=/i\    kb_variant = \"$variant\"," "$hyprlua"
+  fi
+fi
+
+if [[ -n ${OMARCHY_USER_NAME//[[:space:]]/} ]]; then
+  git config --global user.name "$OMARCHY_USER_NAME" || true
+fi
+if [[ -n ${OMARCHY_USER_EMAIL//[[:space:]]/} ]]; then
+  git config --global user.email "$OMARCHY_USER_EMAIL" || true
+fi
+if [[ ! -f $HOME/.XCompose ]]; then
+  cat >"$HOME/.XCompose" <<EOF
+# Run omarchy-restart-xcompose to apply changes
+
+# Include fast emoji access
+include "/usr/share/omarchy/default/xcompose"
+
+# Identification
+<Multi_key> <space> <n> : "$OMARCHY_USER_NAME"
+<Multi_key> <space> <e> : "$OMARCHY_USER_EMAIL"
+EOF
+fi
+
+mkdir -p "$HOME/.config/omarchy/themes" "$HOME/.config/btop/themes"
+ln -snf "$HOME/.config/omarchy/current/theme/btop.theme" "$HOME/.config/btop/themes/current.theme"
+if [[ ! -e $HOME/.config/omarchy/current/background && -d $HOME/.config/omarchy/current/theme/backgrounds ]]; then
+  background=$(find "$HOME/.config/omarchy/current/theme/backgrounds" -maxdepth 1 -type f \( -iname '*.jpg' -o -iname '*.jpeg' -o -iname '*.png' -o -iname '*.webp' \) | sort | head -n1)
+  [[ -n ${background:-} ]] && ln -snf "$background" "$HOME/.config/omarchy/current/background"
+fi
+
+mkdir -p "$HOME/.config/wireplumber/wireplumber.conf.d"
+if [[ -f $root/default/wireplumber/wireplumber.conf.d/bluetooth-a2dp-autoconnect.conf ]]; then
+  cp "$root/default/wireplumber/wireplumber.conf.d/bluetooth-a2dp-autoconnect.conf" "$HOME/.config/wireplumber/wireplumber.conf.d/"
+fi
+
+enable_user_unit() {
+  local unit="$1" unit_path link_target target
+  local -a targets=()
+
+  if [[ -f $HOME/.config/systemd/user/$unit ]]; then
+    unit_path="$HOME/.config/systemd/user/$unit"
+    link_target="../$unit"
+  elif [[ -f /usr/lib/systemd/user/$unit ]]; then
+    unit_path="/usr/lib/systemd/user/$unit"
+    link_target="$unit_path"
+  elif [[ -f $root/default/systemd/user/$unit ]]; then
+    unit_path="$root/default/systemd/user/$unit"
+    link_target="$unit_path"
+  else
+    return 0
+  fi
+
+  mapfile -t targets < <(awk -F= '
+    /^\[Install\]/ { in_install=1; next }
+    /^\[/ { in_install=0 }
+    in_install && $1 == "WantedBy" {
+      n=split($2, values, /[[:space:]]+/)
+      for (i = 1; i <= n; i++) if (values[i] != "") print values[i]
+    }
+  ' "$unit_path")
+  ((${#targets[@]})) || targets=(default.target)
+  for target in "${targets[@]}"; do
+    mkdir -p "$HOME/.config/systemd/user/$target.wants"
+    ln -sfn "$link_target" "$HOME/.config/systemd/user/$target.wants/$unit"
+  done
+}
+enable_user_unit bt-agent.service
+enable_user_unit omarchy-sleep-lock.service
+enable_user_unit omarchy-recover-internal-monitor.service
+mkdir -p "$HOME/.config/systemd/user/default.target.wants"
+for unit in pipewire-pulse.service pipewire-pulse.socket; do
+  if [[ -e /usr/lib/systemd/user/$unit ]]; then
+    ln -sfn "/usr/lib/systemd/user/$unit" "$HOME/.config/systemd/user/default.target.wants/$unit"
+  fi
+done
+
+keyring_dir="$HOME/.local/share/keyrings"
+keyring_file="$keyring_dir/Default_keyring.keyring"
+default_file="$keyring_dir/default"
+mkdir -p "$keyring_dir"
+if [[ ! -f $keyring_file ]]; then
+  cat >"$keyring_file" <<EOF
+[keyring]
+display-name=Default keyring
+ctime=$(date +%s)
+mtime=0
+lock-on-idle=false
+lock-after=false
+EOF
+fi
+if [[ ! -f $default_file ]]; then
+  printf 'Default_keyring\n' >"$default_file"
+fi
+chmod 700 "$keyring_dir"
+chmod 600 "$keyring_file"
+chmod 644 "$default_file"
+
+mkdir -p "$HOME/.local/share/applications"
+rm -f "$HOME/.config/autostart/walker.desktop"
+rm -rf "$HOME/.config/elephant" "$HOME/.config/makima" "$HOME/.config/wiremix"
+rm -rf "$HOME/.config/systemd/user/app-walker@autostart.service.d"
+rm -f \
+  "$HOME/.config/systemd/user/omarchy-battery-monitor.service" \
+  "$HOME/.config/systemd/user/omarchy-battery-monitor.timer" \
+  "$HOME/.config/systemd/user/omarchy-shell.service" \
+  "$HOME/.config/systemd/user/swayosd-server.service" \
+  "$HOME/.config/systemd/user/elephant.service"
+rm -f \
+  "$HOME/.local/state/omarchy/toggles/mako.ini" \
+  "$HOME/.local/state/omarchy/toggles/waybar-off" \
+  "$HOME/.local/state/omarchy/toggles/hyprlock.conf" \
+  "$HOME/.local/state/omarchy/toggles/lock.conf" \
+  "$HOME/.local/state/omarchy/toggles/hypr/rounded-corners.lua"
+
+for desktop in \
+  About.desktop \
+  Activity.desktop \
+  Alacritty.desktop \
+  Cliamp.desktop \
+  blueberry.desktop \
+  nvim.desktop \
+  omarchy.desktop \
+  org.pulseaudio.pavucontrol.desktop \
+  vlc.desktop \
+  wiremix.desktop; do
+  rm -f "$HOME/.local/share/applications/$desktop"
+done
+
+legacy_icons_dir="$HOME/.local/share/applications/icons"
+legacy_icons_backup="$HOME/.local/share/applications/icons.omarchy-upgrade-to-4.$BACKUP_SUFFIX.bak"
+if [[ -d $legacy_icons_dir ]]; then
+  mkdir -p "$legacy_icons_backup"
+  for icon in \
+    Basecamp.png \
+    Battle.net.png \
+    ChatGPT.png \
+    Cliamp.png \
+    Discord.png \
+    "Disk Usage.png" \
+    Docker.png \
+    Figma.png \
+    Fizzy.png \
+    GitHub.png \
+    "Google Contacts.png" \
+    "Google Maps.png" \
+    "Google Messages.png" \
+    "Google Photos.png" \
+    HEY.png \
+    imv.png \
+    "Retro Gaming.png" \
+    WhatsApp.png \
+    windows.png \
+    X.png \
+    YouTube.png \
+    Zoom.png; do
+    if [[ -e $legacy_icons_dir/$icon ]]; then
+      mv -f "$legacy_icons_dir/$icon" "$legacy_icons_backup/"
+    fi
+  done
+  rmdir "$legacy_icons_dir" 2>/dev/null || true
+  rmdir "$legacy_icons_backup" 2>/dev/null || true
+fi
+
+if [[ -d $root/applications ]]; then
+  find "$root/applications" -maxdepth 1 -type f -name '*.desktop' -exec cp -f {} "$HOME/.local/share/applications/" \;
+fi
+if [[ -f $root/default/alacritty/Alacritty.desktop && ! -f $HOME/.local/share/applications/Alacritty.desktop ]]; then
+  cp "$root/default/alacritty/Alacritty.desktop" "$HOME/.local/share/applications/"
+fi
+if command -v update-desktop-database >/dev/null 2>&1; then
+  update-desktop-database "$HOME/.local/share/applications" >/dev/null 2>&1 || true
+fi
+if command -v xdg-settings >/dev/null 2>&1; then
+  xdg-settings set default-web-browser chromium.desktop || true
+fi
+if command -v xdg-mime >/dev/null 2>&1; then
+  xdg-mime default HEY.desktop x-scheme-handler/mailto || true
+fi
+
+touch "$state_dir/finalize-user.done"
+USER_SETUP
+}
+
+write_legacy_theme_hyprland_conf() {
+  run_as_user env HOME="$target_home" bash <<'THEME_COMPAT'
+set -euo pipefail
+hyprland_conf="$HOME/.config/hypr/hyprland.conf"
+[[ -f $hyprland_conf ]] || exit 0
+grep -q 'current/theme/hyprland.conf' "$hyprland_conf" || exit 0
+
+theme_dir="$HOME/.config/omarchy/current/theme"
+colors="$theme_dir/colors.toml"
+target="$theme_dir/hyprland.conf"
+mkdir -p "$theme_dir"
+accent="7aa2f7"
+if [[ -f $colors ]]; then
+  parsed=$(awk -F= '/^[[:space:]]*accent[[:space:]]*=/ { gsub(/[[:space:]"#]/, "", $2); print $2; exit }' "$colors")
+  [[ -n ${parsed:-} ]] && accent="$parsed"
+fi
+{
+  printf '$activeBorderColor = rgb(%s)\n\n' "$accent"
+  cat <<'EOF'
+general {
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
+}
+EOF
+} >"$target"
+THEME_COMPAT
+}
+
+refresh_current_theme_after_upgrade() {
+  local theme_name runtime_dir
+
+  theme_name=$(run_as_user env HOME="$target_home" bash -c '
+    set -euo pipefail
+    theme_name_path="$HOME/.config/omarchy/current/theme.name"
+    current_theme_path="$HOME/.config/omarchy/current/theme"
+
+    if [[ -f $theme_name_path ]]; then
+      read -r theme_name <"$theme_name_path" || true
+      printf "%s" "${theme_name:-}"
+    elif [[ -L $current_theme_path ]]; then
+      basename -- "$(readlink "$current_theme_path")"
+    else
+      printf ""
+    fi
+  ')
+  theme_name=${theme_name//$'\r'/}
+  theme_name=${theme_name//$'\n'/}
+  [[ -n $theme_name ]] || theme_name="Tokyo Night"
+
+  log "Refreshing current theme with Omarchy 4 templates ($theme_name)"
+
+  runtime_dir="$target_runtime_dir"
+  [[ -d $runtime_dir ]] || runtime_dir=/tmp
+
+  if ! run_as_user env \
+    HOME="$target_home" \
+    USER="$target_user" \
+    LOGNAME="$target_user" \
+    XDG_RUNTIME_DIR="$runtime_dir" \
+    DBUS_SESSION_BUS_ADDRESS="unix:path=$runtime_dir/bus" \
+    XDG_CURRENT_DESKTOP=Hyprland \
+    XDG_SESSION_DESKTOP=Hyprland \
+    XDG_SESSION_TYPE=wayland \
+    DESKTOP_SESSION=hyprland \
+    OMARCHY_PATH=/usr/share/omarchy \
+    OMARCHY_THEME_HEADLESS=1 \
+    PATH="$package_path" \
+    omarchy-theme-set "$theme_name"; then
+    warn "Could not refresh current theme '$theme_name'. Run 'omarchy theme set \"$theme_name\"' after reboot if theme-dependent app config looks stale."
+  fi
+
+  write_legacy_theme_hyprland_conf
+
+  # Headless theme refresh intentionally skips omarchy-theme-set's live post
+  # hooks because one of them runs `hyprctl reload`. Still poke terminal
+  # emulators so the active upgrade terminal picks up generated theme files.
+  run_as_user env \
+    HOME="$target_home" \
+    USER="$target_user" \
+    LOGNAME="$target_user" \
+    OMARCHY_PATH=/usr/share/omarchy \
+    PATH="$package_path" \
+    omarchy-restart-terminal >/dev/null 2>&1 || true
+}
+
+configure_pacman_channel
+install_keyrings
+remove_legacy_installer_package
+remove_legacy_limine_configs
+remove_conflicting_legacy_packages
+install_omarchy_4_packages
+normalize_limine_config
+migrate_1password_beta_package
+cleanup_legacy_user_paths
+apply_system_transition
+suppress_hyprland_config_reload
+apply_user_transition
+cleanup_retired_services
+ensure_sleep_lock_service
+remove_retired_default_packages
+refresh_current_theme_after_upgrade
+# Do not force-reload Hyprland in the live upgraded session. The legacy
+# default/hypr and theme hyprland.conf shims above exist specifically so the
+# pre-reboot session can keep running safely; the reboot performs the real
+# Omarchy 4 Lua-config cutover.
+restore_hyprland_config_reload
+if start_omarchy_shell_session; then
+  stop_retired_session_processes
+else
+  warn "Leaving retired Omarchy 3 session processes running until reboot."
+fi
+
+cat <<EOF
+
+Omarchy 4 upgrade complete.
+
+IMPORTANT: Review the output above before rebooting.
+DO NOT REBOOT IF THERE ARE ERRORS above; fix the errors or ask for help first.
+
+A reboot is required to finish switching to the package-backed Omarchy 4 session.
+EOF
+
+if (( auto_reboot )); then
+  log "Rebooting because --reboot was passed"
+  as_root systemctl reboot
+elif { exec {tty_fd}<>/dev/tty; } 2>/dev/null; then
+  printf '\nReboot now? [y/N] ' >&$tty_fd
+  read -r reboot_answer <&$tty_fd || reboot_answer=""
+  exec {tty_fd}>&-
+  if [[ $reboot_answer =~ ^[Yy]([Ee][Ss])?$ ]]; then
+    as_root systemctl reboot
+  else
+    echo "Not rebooting. Please reboot manually after confirming there were no errors."
+  fi
+else
+  echo "No TTY available for reboot prompt. Please reboot manually after confirming there were no errors."
+fi
diff --git a/bin/omarchy-upload-log b/bin/omarchy-upload-log
index c4aa8cf4..2bbafac7 100755
--- a/bin/omarchy-upload-log
+++ b/bin/omarchy-upload-log
@@ -39,6 +39,23 @@ else
   } >"$SYSTEM_INFO"
 fi
 
+same_or_prefix_log() {
+  local a="$1" b="$2" size_a size_b min_size
+  [[ -s $a && -s $b ]] || return 1
+  cmp -s "$a" "$b" && return 0
+
+  size_a=$(stat -c '%s' "$a" 2>/dev/null) || return 1
+  size_b=$(stat -c '%s' "$b" 2>/dev/null) || return 1
+  if (( size_a < size_b )); then
+    min_size=$size_a
+  else
+    min_size=$size_b
+  fi
+  (( min_size > 0 )) || return 1
+
+  cmp -n "$min_size" "$a" "$b" >/dev/null 2>&1
+}
+
 case "$LOG_TYPE" in
 install)
   # In the live ISO before reboot, the target system is mounted at /mnt so the
@@ -47,19 +64,27 @@ install)
   # exists, with /mnt taking precedence (only present in the ISO context, and
   # there it's the right one).
   ARCHINSTALL_LOG="/var/log/archinstall/install.log"
-  if [[ -s /mnt/var/log/omarchy-install.log ]]; then
-    OMARCHY_LOG="/mnt/var/log/omarchy-install.log"
-  else
-    OMARCHY_LOG="/var/log/omarchy-install.log"
-  fi
+  LIVE_OMARCHY_LOG="/var/log/omarchy-install.log"
+  TARGET_OMARCHY_LOG="/mnt/var/log/omarchy-install.log"
 
   cat "$SYSTEM_INFO" >"$TEMP_LOG"
-  [[ -s $ARCHINSTALL_LOG ]] && cat "$ARCHINSTALL_LOG" >>"$TEMP_LOG"
-  if [[ -s $OMARCHY_LOG ]]; then
-    printf '\n========================================\nOMARCHY INSTALL LOG (%s)\n========================================\n\n' "$OMARCHY_LOG" >>"$TEMP_LOG"
-    cat "$OMARCHY_LOG" >>"$TEMP_LOG"
-  else
-    echo "Warning: omarchy install log not found (looked at /mnt/var/log/ and /var/log/)" >&2
+  if [[ -s $ARCHINSTALL_LOG ]]; then
+    printf '\n========================================\nARCHINSTALL SUBSYSTEM LOG (%s)\n========================================\n\n' "$ARCHINSTALL_LOG" >>"$TEMP_LOG"
+    cat "$ARCHINSTALL_LOG" >>"$TEMP_LOG"
+  fi
+
+  if [[ -s $LIVE_OMARCHY_LOG ]]; then
+    printf '\n========================================\nOMARCHY INSTALL LOG (%s)\n========================================\n\n' "$LIVE_OMARCHY_LOG" >>"$TEMP_LOG"
+    cat "$LIVE_OMARCHY_LOG" >>"$TEMP_LOG"
+  fi
+
+  if [[ -s $TARGET_OMARCHY_LOG ]] && ! same_or_prefix_log "$LIVE_OMARCHY_LOG" "$TARGET_OMARCHY_LOG"; then
+    printf '\n========================================\nTARGET OMARCHY INSTALL LOG (%s)\n========================================\n\n' "$TARGET_OMARCHY_LOG" >>"$TEMP_LOG"
+    cat "$TARGET_OMARCHY_LOG" >>"$TEMP_LOG"
+  fi
+
+  if [[ ! -s $LIVE_OMARCHY_LOG && ! -s $TARGET_OMARCHY_LOG ]]; then
+    echo "Warning: omarchy install log not found (looked at /var/log and /mnt/var/log)" >&2
   fi
 
   if [[ ! -s $TEMP_LOG ]]; then
@@ -127,7 +152,7 @@ esac
 
 echo ""
 
-URL=$(curl -sf -F "file=@$TEMP_LOG" https://logs.omarchy.org/)
+URL=$(curl -sf -F "file=@$TEMP_LOG" -Fexpires=24 https://logs.omarchy.org/)
 
 if (( $? == 0 )) && [[ -n $URL ]]; then
   echo "✓ Log uploaded successfully!"
diff --git a/bin/omarchy-version b/bin/omarchy-version
index da8b4974..eaa203a6 100755
--- a/bin/omarchy-version
+++ b/bin/omarchy-version
@@ -2,4 +2,22 @@
 
 # omarchy:summary=Print the installed Omarchy version
 
-cat $OMARCHY_PATH/version
+omarchy_path=${OMARCHY_PATH:-/usr/share/omarchy}
+omarchy_path=${omarchy_path%/}
+
+if [[ $omarchy_path != "/usr/share/omarchy" ]]; then
+  hash=$(git -C "$omarchy_path" rev-parse --short HEAD 2>/dev/null || true)
+
+  if [[ -n $hash ]]; then
+    echo "dev ($hash)"
+  else
+    echo "dev"
+  fi
+
+  exit 0
+fi
+
+version=$(pacman -Q omarchy 2>/dev/null | awk '{ print $2 }')
+[[ -n $version ]] || exit 1
+
+echo "$version"
diff --git a/bin/omarchy-version-branch b/bin/omarchy-version-branch
index 898a71cd..efec57d0 100755
--- a/bin/omarchy-version-branch
+++ b/bin/omarchy-version-branch
@@ -1,5 +1,18 @@
 #!/bin/bash
 
-# omarchy:summary=Print the current Omarchy git branch
+# omarchy:summary=Print the active Omarchy dev-link git branch
+# omarchy:hidden=true
 
-echo $(git -C "$OMARCHY_PATH" rev-parse --abbrev-ref HEAD)
+omarchy_path=${OMARCHY_PATH:-/usr/share/omarchy}
+omarchy_path=${omarchy_path%/}
+
+[[ $omarchy_path != "/usr/share/omarchy" ]] || exit 1
+
+branch=$(git -C "$omarchy_path" branch --show-current 2>/dev/null || true)
+if [[ -z $branch ]]; then
+  hash=$(git -C "$omarchy_path" rev-parse --short HEAD 2>/dev/null || true)
+  [[ -n $hash ]] || exit 1
+  branch="detached@$hash"
+fi
+
+echo "$branch"
diff --git a/bin/omarchy-voxtype-config b/bin/omarchy-voxtype-config
index 57665be4..8b73ec51 100755
--- a/bin/omarchy-voxtype-config
+++ b/bin/omarchy-voxtype-config
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-# omarchy:summary=Open the Voxtype configuration file
+# omarchy:summary=Open Voxtype configuration
 
 set -e
 
-# Used by Voxtype waybar module to open config on right click
-
-exec omarchy-launch-editor ~/.config/voxtype/config.toml
+omarchy-launch-floating-terminal-with-presentation "voxtype configure"
+omarchy-restart-shell
diff --git a/bin/omarchy-voxtype-install b/bin/omarchy-voxtype-install
index 32a1153e..c3d7f5ae 100755
--- a/bin/omarchy-voxtype-install
+++ b/bin/omarchy-voxtype-install
@@ -20,6 +20,7 @@ if gum confirm "Install Voxtype + AI model (~150MB) to enable dictation?"; then
   fi
   voxtype setup systemd
 
-  omarchy-restart-waybar
-  notify-send "    Voxtype Dictation Ready" "Hold F9 to dictate (or toggle with Super + Ctrl + X)." -t 10000
+  omarchy-hyprland-toggle voxtype on
+  omarchy-restart-shell
+  omarchy-notification-send -g  "Voxtype Dictation Ready" "Hold F9 to dictate (or toggle with Super + Ctrl + X)." -t 10000
 fi
diff --git a/bin/omarchy-voxtype-model b/bin/omarchy-voxtype-model
index 00ccb426..f513cb0d 100755
--- a/bin/omarchy-voxtype-model
+++ b/bin/omarchy-voxtype-model
@@ -5,4 +5,4 @@
 set -e
 
 omarchy-launch-floating-terminal-with-presentation "voxtype setup model"
-omarchy-restart-waybar
+omarchy-restart-shell
diff --git a/bin/omarchy-voxtype-remove b/bin/omarchy-voxtype-remove
index 4253f73d..3cab07b3 100755
--- a/bin/omarchy-voxtype-remove
+++ b/bin/omarchy-voxtype-remove
@@ -11,14 +11,14 @@ if omarchy-cmd-present voxtype; then
   echo "Uninstall Voxtype to remove dictation."
 
   # Remove services
-  systemctl --user stop voxtype.service 2>/dev/null || true
-  rm -f ~/.config/systemd/user/voxtype*
+  systemctl --user disable --now voxtype.service 2>/dev/null || true
   systemctl --user daemon-reload
 
   # Remove packages and configs
-  omarchy-pkg-drop wtype voxtype-bin
+  omarchy-pkg-drop voxtype-bin
   rm -rf ~/.config/voxtype
   rm -rf ~/.local/share/voxtype
+  omarchy-hyprland-toggle voxtype off
 else
   echo "Voxtype was not installed."
 fi
diff --git a/bin/omarchy-voxtype-status b/bin/omarchy-voxtype-status
index 9576efaa..f3131483 100755
--- a/bin/omarchy-voxtype-status
+++ b/bin/omarchy-voxtype-status
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-# omarchy:summary=Clean up the voxtype --follow child when Waybar reloads
+# omarchy:summary=Stream voxtype --follow status as bar-friendly JSON
 
-trap 'kill 0' EXIT
-
-if omarchy-cmd-present voxtype; then
-  voxtype status --follow --extended --format json | while read -r line; do
-    echo "$line" | jq -c '. + {alt: .class}'
-  done
-else
-  echo '{"alt": "", "tooltip": ""}'
+if omarchy-cmd-missing voxtype; then
+  echo '{"alt": "", "class": "idle", "tooltip": ""}'
+  exit 0
 fi
+
+# Keep the status follower as the direct child of the bar. Quickshell
+# clean up their direct child when they restart; a shell pipeline/coproc would
+# leave `voxtype status --follow` orphaned under the user systemd instance.
+exec setpriv --pdeathsig TERM voxtype status --follow --extended --format json
diff --git a/bin/omarchy-weather-icon b/bin/omarchy-weather-icon
index 072af706..1171ed03 100755
--- a/bin/omarchy-weather-icon
+++ b/bin/omarchy-weather-icon
@@ -24,11 +24,11 @@ case $weather_code in
   116) [[ $night == "true" ]] && icon="" || icon="" ;;
   119|122) icon="" ;;
   143|248|260) icon="" ;;
-  176|263|266|293|296|353) [[ $night == "true" ]] && icon="" || icon="" ;;
+  176|263|353) [[ $night == "true" ]] && icon="" || icon="" ;;
   179|227|230|323|326|368) [[ $night == "true" ]] && icon="" || icon="" ;;
   182|185|281|284|311|314|317|320|350|362|365|374|377) icon="" ;;
   200|386|389|392|395) icon="" ;;
-  299|302|305|308|356|359) icon="" ;;
+  266|293|296|299|302|305|308|356|359) icon="" ;;
   329|332|335|338|371) icon="" ;;
   *) icon="" ;;
 esac
diff --git a/bin/omarchy-weather-status b/bin/omarchy-weather-status
index b2552b82..f0cf0741 100755
--- a/bin/omarchy-weather-status
+++ b/bin/omarchy-weather-status
@@ -14,4 +14,4 @@ place=${place%%,*}
 place=${place^}
 temperature=${temperature#+}
 
-echo "$(omarchy-weather-icon)    $place  ·  Temp $temperature  ·  Wind $wind"
+echo "$place  ·  Temp $temperature  ·  Wind $wind"
diff --git a/bin/omarchy-webapp-install b/bin/omarchy-webapp-install
index dbf00609..9d6abbf1 100755
--- a/bin/omarchy-webapp-install
+++ b/bin/omarchy-webapp-install
@@ -1,11 +1,41 @@
 #!/bin/bash
 
 # omarchy:summary=Create a desktop launcher for a web app
-# omarchy:args=[name url icon [custom-exec] [mime-types]]
+# omarchy:args=[name url icon-url-or-name [custom-exec] [mime-types]]
 
 set -e
 
-ICON_DIR="$HOME/.local/share/applications/icons"
+ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
+
+safe_icon_name() {
+  printf '%s\n' "$1" \
+    | tr '[:upper:]' '[:lower:]' \
+    | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//'
+}
+
+icon_name_from_ref() {
+  local ref="$1"
+  local name
+  name=$(basename "$ref")
+
+  if [[ $name == *.* ]]; then
+    safe_icon_name "${name%.*}"
+  else
+    printf '%s\n' "$name"
+  fi
+}
+
+install_user_icon() {
+  local source="$1"
+  local name="$2"
+  local ext="${source##*.}"
+
+  [[ $ext == "$source" ]] && ext="png"
+  mkdir -p "$ICON_DIR"
+  cp "$source" "$ICON_DIR/$name.$ext"
+  gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
+  printf '%s\n' "$name"
+}
 
 if (( $# < 3 )); then
   echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
@@ -18,10 +48,12 @@ if (( $# < 3 )); then
   # Try to fetch favicon automatically first.
   FAVICON_URL="https://www.google.com/s2/favicons?domain=${APP_URL}&sz=128"
   mkdir -p "$ICON_DIR"
-  if curl -fsSL -o "$ICON_DIR/$APP_NAME.png" "$FAVICON_URL" && [[ -s $ICON_DIR/$APP_NAME.png ]]; then
-    ICON_REF="$APP_NAME.png"
+  ICON_VALUE=$(safe_icon_name "$APP_NAME")
+  if curl -fsSL -o "$ICON_DIR/$ICON_VALUE.png" "$FAVICON_URL" && [[ -s $ICON_DIR/$ICON_VALUE.png ]]; then
+    gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
+    ICON_REF="$ICON_VALUE"
   else
-    ICON_REF=$(gum input --prompt "Icon URL> " --placeholder "Could not fetch favicon automatically. Enter PNG icon URL (see https://dashboardicons.com)")
+    ICON_REF=$(gum input --prompt "Icon URL/name> " --placeholder "Could not fetch favicon automatically. Enter PNG icon URL or icon name")
   fi
 
   CUSTOM_EXEC=""
@@ -45,21 +77,24 @@ if [[ -z $APP_NAME || -z $APP_URL ]]; then
   exit 1
 fi
 
-# Resolve icon from URL or from a local icon name.
-mkdir -p "$ICON_DIR"
-
 if [[ -z $ICON_REF ]]; then
   ICON_REF="https://www.google.com/s2/favicons?domain=${APP_URL}&sz=128"
 fi
 
 if [[ $ICON_REF =~ ^https?:// ]]; then
-  ICON_PATH="$ICON_DIR/$APP_NAME.png"
-  if ! curl -fsSL -o "$ICON_PATH" "$ICON_REF" || [[ ! -s $ICON_PATH ]]; then
+  ICON_VALUE=$(safe_icon_name "$APP_NAME")
+  mkdir -p "$ICON_DIR"
+  if ! curl -fsSL -o "$ICON_DIR/$ICON_VALUE.png" "$ICON_REF" || [[ ! -s $ICON_DIR/$ICON_VALUE.png ]]; then
     echo "Error: Failed to download icon."
     exit 1
   fi
+  gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
+elif [[ -f $ICON_REF ]]; then
+  ICON_VALUE=$(install_user_icon "$ICON_REF" "$(safe_icon_name "$APP_NAME")")
 else
-  ICON_PATH="$ICON_DIR/$ICON_REF"
+  # Bundled Omarchy icons are package-owned under /usr/share/icons/hicolor.
+  # Accept either "HEY" or the historical "HEY.png" argument form.
+  ICON_VALUE=$(icon_name_from_ref "$ICON_REF")
 fi
 
 # Use custom exec if provided, otherwise default behavior
@@ -67,6 +102,7 @@ EXEC_COMMAND="${CUSTOM_EXEC:-omarchy-launch-webapp $APP_URL}"
 
 # Create application .desktop file
 DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
+mkdir -p "$(dirname "$DESKTOP_FILE")"
 
 cat >"$DESKTOP_FILE" <<EOF
 [Desktop Entry]
@@ -76,7 +112,7 @@ Comment=$APP_NAME
 Exec=$EXEC_COMMAND
 Terminal=false
 Type=Application
-Icon=$ICON_PATH
+Icon=$ICON_VALUE
 StartupNotify=true
 EOF
 
diff --git a/bin/omarchy-webapp-remove b/bin/omarchy-webapp-remove
index d4db5270..92283286 100755
--- a/bin/omarchy-webapp-remove
+++ b/bin/omarchy-webapp-remove
@@ -1,11 +1,12 @@
 #!/bin/bash
 
-# omarchy:summary=Remove web app desktop launchers
-# omarchy:args=[name...]
+# omarchy:summary=Remove a web app desktop launcher
+# omarchy:args=[name]
 
 set -e
 
-ICON_DIR="$HOME/.local/share/applications/icons"
+ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
+OLD_ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"
 
 if (( $# == 0 )); then
@@ -17,32 +18,24 @@ if (( $# == 0 )); then
   done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)
 
   if ((${#WEB_APPS[@]})); then
-    IFS=$'\n' SORTED_WEB_APPS=($(sort <<<"${WEB_APPS[*]}"))
-    unset IFS
-    APP_NAMES_STRING=$(gum choose --no-limit --header "Select web app to remove..." --selected-prefix="✗ " "${SORTED_WEB_APPS[@]}")
-    # Convert newline-separated string to array
-    APP_NAMES=()
-    while IFS= read -r line; do
-      [[ -n $line ]] && APP_NAMES+=("$line")
-    done <<< "$APP_NAMES_STRING"
+    mapfile -t SORTED_WEB_APPS < <(printf '%s\n' "${WEB_APPS[@]}" | sort)
+    APP_NAME=$(omarchy-menu-select "Select web app to remove" "${SORTED_WEB_APPS[@]}" -- --width 520 --maxheight 520)
   else
     echo "No web apps to remove."
     exit 1
   fi
 else
-  # Use array to preserve spaces in app names
-  APP_NAMES=("$@")
+  APP_NAME="$*"
 fi
 
-if (( ${#APP_NAMES[@]} == 0 )); then
-  echo "You must select at least one web app to remove."
+if [[ -z $APP_NAME ]]; then
+  echo "You must select a web app to remove."
   exit 1
 fi
 
-for APP_NAME in "${APP_NAMES[@]}"; do
-  rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
-  rm -f "$ICON_DIR/$APP_NAME.png"
-  echo "Removed $APP_NAME"
-done
+icon_name=$(printf '%s\n' "$APP_NAME" | tr '[:upper:]' '[:lower:]' | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//')
+rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
+rm -f "$ICON_DIR/$icon_name.png" "$ICON_DIR/$APP_NAME.png" "$OLD_ICON_DIR/$APP_NAME.png"
 
-omarchy-restart-walker
+omarchy-notification-send -g  "Web app removed" "$APP_NAME"
+update-desktop-database "$DESKTOP_DIR" &>/dev/null
diff --git a/bin/omarchy-webapp-remove-all b/bin/omarchy-webapp-remove-all
index 142da29d..1754c4ee 100755
--- a/bin/omarchy-webapp-remove-all
+++ b/bin/omarchy-webapp-remove-all
@@ -5,7 +5,8 @@
 set -e
 
 APP_DIR="${1:-$HOME/.local/share/applications}"
-ICON_DIR="$HOME/.local/share/applications/icons"
+ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
+OLD_ICON_DIR="$HOME/.local/share/applications/icons"
 
 echo "Scanning for web apps in $APP_DIR..."
 
@@ -23,15 +24,14 @@ fi
 
 for file in "${webapp_desktop_files[@]}"; do
   app_name=$(basename "$file" .desktop)
+  icon_name=$(printf '%s\n' "$app_name" | tr '[:upper:]' '[:lower:]' | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//')
   echo "Removing web app: $app_name"
   rm -f "$file"
-  rm -f "$ICON_DIR/$app_name.png"
+  rm -f "$ICON_DIR/$icon_name.png" "$ICON_DIR/$app_name.png" "$OLD_ICON_DIR/$app_name.png"
 done
 
 if command -v update-desktop-database &>/dev/null; then
   update-desktop-database "$APP_DIR" &>/dev/null || true
 fi
 
-omarchy-restart-walker
-
 echo "Web apps removed successfully."
diff --git a/bin/omarchy-wifi-powersave b/bin/omarchy-wifi-powersave
index 26810e52..d75434a1 100755
--- a/bin/omarchy-wifi-powersave
+++ b/bin/omarchy-wifi-powersave
@@ -3,6 +3,7 @@
 # omarchy:summary=Set Wi-Fi power save mode on wireless interfaces
 # omarchy:args=<on|off>
 
+shopt -s nullglob
 for iface in /sys/class/net/*/wireless; do
   iface="$(basename "$(dirname "$iface")")"
   iw dev "$iface" set power_save "$1" 2>/dev/null
diff --git a/bin/omarchy-windows-vm b/bin/omarchy-windows-vm
index ec918875..67bf7a15 100755
--- a/bin/omarchy-windows-vm
+++ b/bin/omarchy-windows-vm
@@ -44,19 +44,14 @@ install_windows() {
 
   mkdir -p "$HOME/.windows"
   mkdir -p "$HOME/.config/windows"
-  mkdir -p "$HOME/.local/share/applications/icons"
-
-  # Install Windows VM icon and desktop file
-  if [[ -f $OMARCHY_PATH/applications/icons/windows.png ]]; then
-    cp "$OMARCHY_PATH/applications/icons/windows.png" "$HOME/.local/share/applications/icons/windows.png"
-  fi
+  mkdir -p "$HOME/.local/share/applications"
 
   cat << EOF | tee "$HOME/.local/share/applications/windows-vm.desktop" > /dev/null
 [Desktop Entry]
 Name=Windows
 Comment=Start Windows VM via Docker and connect with RDP
 Exec=uwsm app -- omarchy-windows-vm launch
-Icon=$HOME/.local/share/applications/icons/windows.png
+Icon=windows
 Terminal=false
 Type=Application
 Categories=System;Virtualization;
@@ -293,7 +288,7 @@ launch_windows() {
     echo "Starting Windows VM..."
 
     # Send desktop notification
-    notify-send "    Starting Windows VM" "      This can take 15-30 seconds" -t 15000
+    omarchy-notification-send -g  "Starting Windows VM" "This can take 15-30 seconds" -t 15000
 
     if ! docker-compose -f "$COMPOSE_FILE" up -d 2>&1; then
       echo "❌ Failed to start Windows VM!"
diff --git a/boot.sh b/boot.sh
deleted file mode 100755
index e01a52fc..00000000
--- a/boot.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Set install mode to online since boot.sh is used for curl installations
-export OMARCHY_ONLINE_INSTALL=true
-
-ansi_art='                 ▄▄▄
- ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
-███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
-███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
-███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
- ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀
-                                       ███   █▀                                  '
-
-clear
-echo -e "\n$ansi_art\n"
-
-# Use custom branch if instructed, otherwise default to master
-OMARCHY_REF="${OMARCHY_REF:-master}"
-
-# Set mirror based on branch
-if [[ $OMARCHY_REF == "dev" ]]; then
-  export OMARCHY_MIRROR=edge
-  echo 'Server = https://mirror.omarchy.org/$repo/os/$arch' | sudo tee /etc/pacman.d/mirrorlist >/dev/null
-elif [[ $OMARCHY_REF == "rc" ]]; then
-  export OMARCHY_MIRROR=rc
-  echo 'Server = https://rc-mirror.omarchy.org/$repo/os/$arch' | sudo tee /etc/pacman.d/mirrorlist >/dev/null
-else
-  export OMARCHY_MIRROR=stable
-  echo 'Server = https://stable-mirror.omarchy.org/$repo/os/$arch' | sudo tee /etc/pacman.d/mirrorlist >/dev/null
-fi
-
-sudo pacman -Syu --noconfirm --needed git
-
-# Use custom repo if specified, otherwise default to basecamp/omarchy
-OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
-
-echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
-echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
-rm -rf ~/.local/share/omarchy/
-git clone --branch "$OMARCHY_REF" "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
-
-echo -e "\nInstallation starting..."
-source ~/.local/share/omarchy/install.sh
diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml
index dcf34042..d1d90fb2 100644
--- a/config/alacritty/alacritty.toml
+++ b/config/alacritty/alacritty.toml
@@ -21,5 +21,8 @@ decorations = "None"
 bindings = [
 { key = "Insert", mods = "Shift", action = "Paste" },
 { key = "Insert", mods = "Control", action = "Copy" },
-{ key = "Return", mods = "Shift", chars = "\u001B\r" }
+# Send Shift+Return as CSI-u so TUIs can distinguish it from Return without treating it as Alt+Return.
+{ key = "Return", mods = "Shift", chars = "\u001B[13;2u" },
+# Legacy encoding sends Alt+Shift+Return the same as Alt+Return; send CSI-u so tmux can match M-S-Enter.
+{ key = "Return", mods = "Alt|Shift", chars = "\u001B[13;4u" }
 ]
diff --git a/config/chromium-flags.conf b/config/chromium-flags.conf
index 88c8082b..134fa04e 100644
--- a/config/chromium-flags.conf
+++ b/config/chromium-flags.conf
@@ -1,4 +1,4 @@
 --ozone-platform=wayland
 --ozone-platform-hint=wayland
 --enable-features=TouchpadOverscrollHistoryNavigation
---load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url
+--load-extension=/usr/share/omarchy/default/chromium/extensions/copy-url,/usr/share/omarchy/default/chromium/extensions/yt-dlp
diff --git a/config/elephant/calc.toml b/config/elephant/calc.toml
deleted file mode 100644
index 95d00d12..00000000
--- a/config/elephant/calc.toml
+++ /dev/null
@@ -1 +0,0 @@
-async = false
diff --git a/config/elephant/desktopapplications.toml b/config/elephant/desktopapplications.toml
deleted file mode 100644
index de17325b..00000000
--- a/config/elephant/desktopapplications.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-show_actions = false
-only_search_title = true
-history = false
diff --git a/config/elephant/symbols.toml b/config/elephant/symbols.toml
deleted file mode 100644
index fc7926ff..00000000
--- a/config/elephant/symbols.toml
+++ /dev/null
@@ -1 +0,0 @@
-command = 'wl-copy && hyprctl dispatch sendshortcut "SHIFT,Insert,activewindow"'
diff --git a/config/foot/foot.ini b/config/foot/foot.ini
index 9cbd91ec..53bb0ca4 100644
--- a/config/foot/foot.ini
+++ b/config/foot/foot.ini
@@ -14,6 +14,12 @@ style=block
 blink=no
 
 [key-bindings]
-clipboard-copy=Control+Insert
+clipboard-copy=Control+Insert Control+Shift+c XF86Copy
 primary-paste=none
-clipboard-paste=Shift+Insert
+clipboard-paste=Shift+Insert Control+Shift+v XF86Paste
+
+[text-bindings]
+# Send Shift+Return as CSI-u so TUIs can distinguish it from Return.
+\x1b[13;2u=Shift+Return
+# Send Alt+Shift+Return as CSI-u so tmux can match M-S-Enter.
+\x1b[13;4u=Mod1+Shift+Return
diff --git a/config/ghostty/config b/config/ghostty/config
index d53f5c32..b121557b 100644
--- a/config/ghostty/config
+++ b/config/ghostty/config
@@ -25,6 +25,10 @@ shell-integration-features = no-cursor,ssh-env
 # Keyboard bindings
 keybind = shift+insert=paste_from_clipboard
 keybind = control+insert=copy_to_clipboard
+# Send Shift+Enter as CSI-u so TUIs can distinguish it from Enter.
+keybind = shift+enter=csi:13;2u
+# Legacy encoding sends Alt+Shift+Enter the same as Alt+Enter; send CSI-u so tmux can match M-S-Enter.
+keybind = alt+shift+enter=csi:13;4u
 keybind = super+control+shift+alt+arrow_down=resize_split:down,100
 keybind = super+control+shift+alt+arrow_up=resize_split:up,100
 keybind = super+control+shift+alt+arrow_left=resize_split:left,100
diff --git a/config/hypr/.luarc.json b/config/hypr/.luarc.json
new file mode 100644
index 00000000..afb4466c
--- /dev/null
+++ b/config/hypr/.luarc.json
@@ -0,0 +1,11 @@
+{
+  "workspace": {
+    "library": [
+      "/usr/share/hypr/stubs"
+    ],
+    "checkThirdParty": false
+  },
+  "diagnostics": {
+    "globals": ["hl", "o"]
+  }
+}
diff --git a/config/hypr/autostart.conf b/config/hypr/autostart.conf
deleted file mode 100644
index 708b3a29..00000000
--- a/config/hypr/autostart.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Extra autostart processes
-# exec-once = uwsm-app -- my-service
diff --git a/config/hypr/autostart.lua b/config/hypr/autostart.lua
new file mode 100644
index 00000000..de1a69a1
--- /dev/null
+++ b/config/hypr/autostart.lua
@@ -0,0 +1,2 @@
+-- Extra autostart processes.
+-- o.launch_on_start("my-service")
diff --git a/config/hypr/bindings.conf b/config/hypr/bindings.conf
deleted file mode 100644
index e7eb692d..00000000
--- a/config/hypr/bindings.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Application bindings
-bindd = SUPER, RETURN, Terminal, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)"
-bindd = SUPER ALT, RETURN, Tmux, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)" bash -c "tmux attach || tmux new -s Work"
-bindd = SUPER SHIFT, RETURN, Browser, exec, omarchy-launch-browser
-bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
-bindd = SUPER ALT SHIFT, F, File manager (cwd), exec, uwsm-app -- nautilus --new-window "$(omarchy-cmd-terminal-cwd)"
-bindd = SUPER SHIFT, B, Browser, exec, omarchy-launch-browser
-bindd = SUPER SHIFT ALT, B, Browser (private), exec, omarchy-launch-browser --private
-bindd = SUPER SHIFT, M, Music, exec, omarchy-launch-or-focus spotify
-bindd = SUPER SHIFT ALT, M, Music TUI, exec, omarchy-launch-or-focus-tui cliamp
-bindd = SUPER SHIFT, N, Editor, exec, omarchy-launch-editor
-bindd = SUPER SHIFT, D, Docker, exec, omarchy-launch-tui lazydocker
-bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus ^signal$ "uwsm-app -- signal-desktop"
-bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus ^obsidian$ "uwsm-app -- obsidian"
-bindd = SUPER SHIFT, W, Typora, exec, uwsm-app -- typora --enable-wayland-ime
-bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm-app -- 1password
-
-# If your web app url contains #, type it as ## to prevent hyprland treating it as a comment
-bindd = SUPER SHIFT, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com"
-bindd = SUPER SHIFT ALT, A, Grok, exec, omarchy-launch-webapp "https://grok.com"
-bindd = SUPER SHIFT, C, Calendar, exec, omarchy-launch-webapp "https://app.hey.com/calendar/weeks/"
-bindd = SUPER SHIFT, E, Email, exec, omarchy-launch-webapp "https://app.hey.com"
-bindd = SUPER SHIFT, Y, YouTube, exec, omarchy-launch-webapp "https://youtube.com/"
-bindd = SUPER SHIFT ALT, G, WhatsApp, exec, omarchy-launch-or-focus-webapp WhatsApp "https://web.whatsapp.com/"
-bindd = SUPER SHIFT CTRL, G, Google Messages, exec, omarchy-launch-or-focus-webapp "Google Messages" "https://messages.google.com/web/conversations"
-bindd = SUPER SHIFT, P, Google Photos, exec, omarchy-launch-or-focus-webapp "Google Photos" "https://photos.google.com/"
-bindd = SUPER SHIFT, X, X, exec, omarchy-launch-webapp "https://x.com/"
-bindd = SUPER SHIFT ALT, X, X Post, exec, omarchy-launch-webapp "https://x.com/compose/post"
-
-# Add extra bindings
-# bind = SUPER SHIFT, R, exec, alacritty -e ssh your-server
-
-# Overwrite existing bindings, like putting Omarchy Menu on Super + Space
-# unbind = SUPER, SPACE
-# bindd = SUPER, SPACE, Omarchy menu, exec, omarchy-menu
-
-# Logitech MX Keys
-# bind = SUPER SHIFT, S, exec, omarchy-capture-screenshot      # Print Screen Button
-# bind = SUPER, H, exec, voxtype record toggle                 # Dictation Button
-# bind = SUPER, PERIOD, exec, omarchy-launch-walker -m symbols # Emoji Button
diff --git a/config/hypr/bindings.lua b/config/hypr/bindings.lua
new file mode 100644
index 00000000..e006e199
--- /dev/null
+++ b/config/hypr/bindings.lua
@@ -0,0 +1,46 @@
+-- Application bindings.
+o.bind("SUPER + RETURN", "Terminal", { omarchy = "terminal" })
+o.bind("SUPER + ALT + RETURN", "Tmux", { omarchy = "terminal-tmux" })
+o.bind("SUPER + SHIFT + RETURN", "Browser", { omarchy = "browser" })
+o.bind("SUPER + SHIFT + F", "File manager", { omarchy = "nautilus" })
+o.bind("SUPER + ALT + SHIFT + F", "File manager (cwd)", { omarchy = "nautilus-cwd" })
+o.bind("SUPER + SHIFT + B", "Browser", { omarchy = "browser" })
+o.bind("SUPER + SHIFT + ALT + B", "Browser (private)", { omarchy = "browser --private" })
+o.bind("SUPER + SHIFT + M", "Music", { omarchy = "spotify" })
+o.bind("SUPER + SHIFT + ALT + M", "Music TUI", { tui = "cliamp", focus = true })
+o.bind("SUPER + SHIFT + N", "Editor", { omarchy = "editor" })
+o.bind("SUPER + SHIFT + D", "Docker", { tui = "lazydocker" })
+o.bind("SUPER + SHIFT + G", "Signal", { omarchy = "signal" })
+o.bind("SUPER + SHIFT + O", "Obsidian", { launch = "obsidian", focus = "^obsidian$" })
+o.bind("SUPER + SHIFT + W", "Typora", { launch = "typora --enable-wayland-ime" })
+o.bind("SUPER + SHIFT + SLASH", "Passwords", { launch = "1password" })
+
+-- Web app bindings.
+o.bind("SUPER + SHIFT + A", "ChatGPT", { webapp = "https://chatgpt.com" })
+o.bind("SUPER + SHIFT + ALT + A", "Grok", { webapp = "https://grok.com" })
+o.bind("SUPER + SHIFT + C", "Calendar", { webapp = "https://app.hey.com/calendar/weeks/" })
+o.bind("SUPER + SHIFT + E", "Email", { webapp = "https://app.hey.com" })
+o.bind("SUPER + SHIFT + ALT + E", "New email", { webapp = "https://app.hey.com/messages/new?display=standalone&new_window=true" })
+o.bind("SUPER + SHIFT + Y", "YouTube", { webapp = "https://youtube.com/" })
+o.bind("SUPER + SHIFT + ALT + G", "WhatsApp", { webapp = "https://web.whatsapp.com/", focus = true })
+o.bind(
+  "SUPER + SHIFT + CTRL + G",
+  "Google Messages",
+  { webapp = "https://messages.google.com/web/conversations", focus = true }
+)
+o.bind("SUPER + SHIFT + P", "Google Photos", { webapp = "https://photos.google.com/", focus = true })
+o.bind("SUPER + SHIFT + S", "Google Maps", { webapp = "https://maps.google.com/", focus = true })
+o.bind("SUPER + SHIFT + X", "X", { webapp = "https://x.com/" })
+o.bind("SUPER + SHIFT + ALT + X", "X Post", { webapp = "https://x.com/compose/post" })
+
+-- Add extra bindings below.
+-- o.bind("SUPER + SHIFT + R", "SSH", "alacritty -e ssh your-server")
+
+-- Overwrite existing bindings with hl.unbind() first if needed.
+-- hl.unbind("SUPER + SPACE")
+-- o.bind("SUPER + SPACE", "Omarchy menu", "omarchy-menu")
+
+-- Logitech MX Keys examples:
+-- o.bind("SUPER + SHIFT + S", nil, "omarchy-capture-screenshot")
+-- o.bind("SUPER + H", nil, "voxtype record toggle")
+-- o.bind("SUPER + PERIOD", nil, { omarchy = "walker -m symbols" })
diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf
deleted file mode 100644
index 08b27ef8..00000000
--- a/config/hypr/hypridle.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-general {
-    lock_cmd = omarchy-system-lock                         # lock screen and 1password
-    before_sleep_cmd = OMARCHY_LOCK_ONLY=true omarchy-system-lock    # lock before suspend without scheduling display off.
-    after_sleep_cmd = sleep 1 && omarchy-system-wake                 # delay for PAM readiness, then turn on display.
-    inhibit_sleep = 3                                      # wait until screen is locked
-}
-
-# Start screensaver after 2.5 minutes
-listener {
-    timeout = 150
-    on-timeout = pidof hyprlock || omarchy-launch-screensaver
-}
-
-# Lock system after 5 minutes (screensaver resets idle timer, so have to just do half + 2s margin)
-listener {
-    timeout = 152
-    on-timeout = omarchy-system-lock
-    on-resume = omarchy-system-wake
-}
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
deleted file mode 100644
index cf4f9ad0..00000000
--- a/config/hypr/hyprland.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Learn how to configure Hyprland: https://wiki.hypr.land/Configuring/
-
-# Use defaults Omarchy defaults (but don't edit these directly!)
-source = ~/.local/share/omarchy/default/hypr/autostart.conf
-source = ~/.local/share/omarchy/default/hypr/bindings/media.conf
-source = ~/.local/share/omarchy/default/hypr/bindings/clipboard.conf
-source = ~/.local/share/omarchy/default/hypr/bindings/tiling-v2.conf
-source = ~/.local/share/omarchy/default/hypr/bindings/utilities.conf
-source = ~/.local/share/omarchy/default/hypr/envs.conf
-source = ~/.local/share/omarchy/default/hypr/looknfeel.conf
-source = ~/.local/share/omarchy/default/hypr/input.conf
-source = ~/.local/share/omarchy/default/hypr/windows.conf
-source = ~/.config/omarchy/current/theme/hyprland.conf
-
-# Change your own setup in these files (and overwrite any settings from defaults!)
-source = ~/.config/hypr/monitors.conf
-source = ~/.config/hypr/input.conf
-source = ~/.config/hypr/bindings.conf
-source = ~/.config/hypr/looknfeel.conf
-source = ~/.config/hypr/autostart.conf
-
-# Toggle config flags dynamically
-source = ~/.local/state/omarchy/toggles/hypr/*.conf
-
-# Add any other personal Hyprland configuration below
-# windowrule = workspace 5, match:class qemu
diff --git a/config/hypr/hyprland.lua b/config/hypr/hyprland.lua
new file mode 100644
index 00000000..a47cf60d
--- /dev/null
+++ b/config/hypr/hyprland.lua
@@ -0,0 +1,31 @@
+-- Learn how to configure Hyprland: https://wiki.hypr.land/Configuring/Start/
+
+-- Drop cached omarchy modules so hyprctl reload re-reads them from disk.
+for k in pairs(package.loaded) do
+  if k:match("^default%.hypr") or k:match("^hypr%.") then
+    package.loaded[k] = nil
+  end
+end
+
+-- Load user modules from ~/.config and Omarchy defaults from $OMARCHY_PATH.
+package.path = os.getenv("HOME")
+  .. "/.config/?.lua;"
+  .. (os.getenv("OMARCHY_PATH") or "/usr/share/omarchy")
+  .. "/?.lua;"
+  .. package.path
+
+-- All Omarchy default setups
+require("default.hypr.omarchy")
+
+-- Change your own setup in these files and override defaults.
+require("hypr.monitors")
+require("hypr.input")
+require("hypr.bindings")
+require("hypr.looknfeel")
+require("hypr.autostart")
+
+-- Toggle config flags dynamically.
+require("default.hypr.toggles")
+
+-- Add any other personal Hyprland configuration below.
+-- o.window("qemu", { workspace = "5" })
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
deleted file mode 100644
index 9550b656..00000000
--- a/config/hypr/hyprlock.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-source = ~/.config/omarchy/current/theme/hyprlock.conf
-
-general {
-    ignore_empty_input = true
-}
-
-background {
-    monitor =
-    color = $color
-    path = ~/.config/omarchy/current/background
-    blur_passes = 3
-}
-
-animations {
-    enabled = false
-}
-
-input-field {
-    monitor =
-    size = 650, 100
-    position = 0, 0
-    halign = center
-    valign = center
-
-    inner_color = $inner_color
-    outer_color = $outer_color
-    outline_thickness = 4
-
-    font_family = JetBrainsMono Nerd Font
-    font_color = $font_color
-
-    placeholder_text = Enter Password
-    check_color = $check_color
-    fail_text = <i>$FAIL ($ATTEMPTS)</i>
-
-    rounding = 0
-    shadow_passes = 0
-    fade_on_empty = false
-}
-
-auth {
-    fingerprint:enabled = false
-}
diff --git a/config/hypr/input.conf b/config/hypr/input.conf
deleted file mode 100644
index ad15ddaf..00000000
--- a/config/hypr/input.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# Control your input devices
-# See https://wiki.hypr.land/Configuring/Basics/Variables/#input
-input {
-  # Use multiple keyboard layouts and switch between them with Left Alt + Right Alt
-  # kb_layout = us,dk,eu
-
-  # Use a specific keyboard variant if needed (e.g. intl for international keyboards)
-  # kb_variant = intl
-
-  kb_options = compose:caps # ,grp:alts_toggle
-
-  # Change speed of keyboard repeat
-  repeat_rate = 40
-  repeat_delay = 250
-
-  # Start with numlock on by default
-  numlock_by_default = true
-
-  # Increase sensitivity for mouse/trackpad (default: 0)
-  # sensitivity = 0.35
-
-  # Turn off mouse acceleration (default: adaptive)
-  # accel_profile = flat
-
-  touchpad {
-    # Use natural (inverse) scrolling
-    # natural_scroll = true
-
-    # Use two-finger clicks for right-click instead of lower-right corner
-    clickfinger_behavior = true
-
-    # Control the speed of your scrolling
-    scroll_factor = 0.4
-
-    # Enable the touchpad while typing
-    # disable_while_typing = false
-
-    # Left-click-and-drag with three fingers
-    # drag_3fg = 1
-  }
-}
-
-# Scroll nicely in the terminal
-windowrule = match:class (Alacritty|kitty|foot), scroll_touchpad 1.5
-windowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2
-
-# Enable touchpad gestures for changing workspaces
-# See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Gestures/
-# gesture = 3, horizontal, workspace
-
-# Enable touchpad gestures for moving focus (helpful on scrolling layout)
-# gesture = 3, left,  dispatcher, movefocus, l
-# gesture = 3, right, dispatcher, movefocus, r
diff --git a/config/hypr/input.lua b/config/hypr/input.lua
new file mode 100644
index 00000000..03e32bde
--- /dev/null
+++ b/config/hypr/input.lua
@@ -0,0 +1,55 @@
+-- Control your input devices.
+-- See https://wiki.hypr.land/Configuring/Basics/Variables/#input
+hl.config({
+  input = {
+    -- Use multiple keyboard layouts and switch between them with Left Alt + Right Alt.
+    -- kb_layout = "us,dk,eu",
+
+    -- Use a specific keyboard variant if needed (e.g. intl for international keyboards).
+    -- kb_variant = "intl",
+
+    kb_options = "compose:caps", -- ,grp:alts_toggle
+
+    -- Change speed of keyboard repeat.
+    repeat_rate = 40,
+    repeat_delay = 250,
+
+    -- Start with numlock on by default.
+    numlock_by_default = true,
+
+    -- Increase sensitivity for mouse/trackpad (default: 0).
+    -- sensitivity = 0.35,
+
+    -- Turn off mouse acceleration (default: adaptive).
+    -- accel_profile = "flat",
+
+    touchpad = {
+      -- Use natural (inverse) scrolling.
+      -- natural_scroll = true,
+
+      -- Use two-finger clicks for right-click instead of lower-right corner.
+      clickfinger_behavior = true,
+
+      -- Control the speed of your scrolling.
+      scroll_factor = 0.4,
+
+      -- Enable the touchpad while typing.
+      -- disable_while_typing = false,
+
+      -- Left-click-and-drag with three fingers.
+      -- drag_3fg = 1,
+    },
+  },
+})
+
+-- Scroll nicely in the terminal.
+o.window("(Alacritty|kitty|foot)", { scroll_touchpad = 1.5 })
+o.window("com.mitchellh.ghostty", { scroll_touchpad = 0.2 })
+
+-- Enable touchpad gestures for changing workspaces.
+-- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Gestures/
+-- hl.gesture({ fingers = 3, direction = "horizontal", action = "workspace" })
+
+-- Enable touchpad gestures for moving focus (helpful on scrolling layout).
+-- hl.gesture({ fingers = 3, direction = "left", action = function() hl.dispatch(hl.dsp.focus({ direction = "l" })) end })
+-- hl.gesture({ fingers = 3, direction = "right", action = function() hl.dispatch(hl.dsp.focus({ direction = "r" })) end })
diff --git a/config/hypr/looknfeel.conf b/config/hypr/looknfeel.conf
deleted file mode 100644
index ea30461d..00000000
--- a/config/hypr/looknfeel.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Change the default Omarchy look'n'feel
-
-# https://wiki.hypr.land/Configuring/Basics/Variables/#general
-general {
-    # No gaps between windows or borders
-    # gaps_in = 0
-    # gaps_out = 0
-    # border_size = 0
-
-    # Change to niri-like side-scrolling layout
-    # layout = scrolling
-}
-
-# https://wiki.hypr.land/Configuring/Basics/Variables/#decoration
-decoration {
-    # Use round window corners
-    # rounding = 8
-
-    # Dim unfocused windows (0.0 = no dim, 1.0 = fully dimmed)
-    # dim_inactive = true
-    # dim_strength = 0.15
-}
-
-# https://wiki.hypr.land/Configuring/Basics/Variables/#animations
-animations {
-    # Disable all animations
-    # enabled = no
-}
-
-# https://wiki.hypr.land/Configuring/Basics/Variables/#layout
-layout {
-    # Avoid overly wide single-window layouts on wide screens
-    # single_window_aspect_ratio = 1 1
-}
-
-# https://wiki.hypr.land/Configuring/Layouts/Scrolling-Layout/
-scrolling {
-    # See only one column per screen instead of two
-    # column_width = 0.97
-}
diff --git a/config/hypr/looknfeel.lua b/config/hypr/looknfeel.lua
new file mode 100644
index 00000000..a86d053e
--- /dev/null
+++ b/config/hypr/looknfeel.lua
@@ -0,0 +1,50 @@
+-- Change the default Omarchy look'n'feel.
+
+-- https://wiki.hypr.land/Configuring/Basics/Variables/#general
+-- hl.config({
+--   general = {
+--     -- No gaps between windows or borders.
+--     gaps_in = 0,
+--     gaps_out = 0,
+--     border_size = 0,
+--
+--     -- Change to niri-like side-scrolling layout.
+--     layout = "scrolling",
+--   },
+-- })
+
+-- https://wiki.hypr.land/Configuring/Basics/Variables/#decoration
+-- hl.config({
+--   decoration = {
+--     -- Use round window corners.
+--     rounding = 8,
+--
+--     -- Dim unfocused windows (0.0 = no dim, 1.0 = fully dimmed).
+--     dim_inactive = true,
+--     dim_strength = 0.15,
+--   },
+-- })
+
+-- https://wiki.hypr.land/Configuring/Basics/Variables/#animations
+-- hl.config({
+--   animations = {
+--     -- Disable all animations.
+--     enabled = false,
+--   },
+-- })
+
+-- https://wiki.hypr.land/Configuring/Basics/Variables/#layout
+-- hl.config({
+--   layout = {
+--     -- Avoid overly wide single-window layouts on wide screens.
+--     single_window_aspect_ratio = { 1, 1 },
+--   },
+-- })
+
+-- https://wiki.hypr.land/Configuring/Layouts/Scrolling-Layout/
+-- hl.config({
+--   scrolling = {
+--     -- See only one column per screen instead of two.
+--     column_width = 0.97,
+--   },
+-- })
diff --git a/config/hypr/monitors.conf b/config/hypr/monitors.conf
deleted file mode 100644
index 455c80fe..00000000
--- a/config/hypr/monitors.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# See https://wiki.hypr.land/Configuring/Basics/Monitors/
-# List current monitors and resolutions possible: hyprctl monitors
-# Format: monitor = [port], resolution, position, scale
-
-# Optimized for retina-class 2x displays, like 13" 2.8K, 27" 5K, 32" 6K.
-env = GDK_SCALE,2
-monitor=,preferred,auto,auto
-
-# Good compromise for 27" or 32" 4K monitors (but fractional!)
-# env = GDK_SCALE,1.75
-# monitor=,preferred,auto,1.6
-
-# Straight 1x setup for low-resolution displays like 1080p or 1440p
-# Or for ultrawide monitors like 34" 3440x1440 or 49" 5120x1440
-# env = GDK_SCALE,1
-# monitor=,preferred,auto,1
-
-# Portrait/rotated secondary monitor (transform: 1 = 90°, 3 = 270°)
-# monitor = DP-2, preferred, auto, 1, transform, 1
-
-# Example for Framework 13 w/ 6K XDR Apple display
-# monitor = DP-5, 6016x3384@60, auto, 2
-# monitor = eDP-1, 2880x1920@120, auto, 2
-
-# Disable the second ghost monitor on an Apple 6K XDR over Thunderbolt
-# monitor=DP-2,disable
diff --git a/config/hypr/monitors.lua b/config/hypr/monitors.lua
new file mode 100644
index 00000000..dbca4b5c
--- /dev/null
+++ b/config/hypr/monitors.lua
@@ -0,0 +1,11 @@
+-- See https://wiki.hypr.land/Configuring/Basics/Monitors/
+-- List current monitors and resolutions possible: hyprctl monitors all
+
+local omarchy_gdk_scale = 2
+local omarchy_monitor_scale = "auto"
+
+hl.env("GDK_SCALE", tostring(omarchy_gdk_scale))
+hl.monitor({ output = "", mode = "preferred", position = "auto", scale = omarchy_monitor_scale })
+
+-- Portrait/rotated secondary monitor (transform: 1 = 90°, 3 = 270°)
+-- hl.monitor({ output = "DP-2", mode = "preferred", position = "auto", scale = 1, transform = 1 })
diff --git a/config/imv/config b/config/imv/config
index 46493240..e515d966 100644
--- a/config/imv/config
+++ b/config/imv/config
@@ -3,11 +3,14 @@
 # Print the current image file
 <Ctrl+p> = exec lp "$imv_current_file"
 
-# Delete the current image and quit the viewer
-<Ctrl+x> = exec rm "$imv_current_file"; quit
+# Trash the current image and quit the viewer (recoverable from Trash)
+<Ctrl+x> = exec gio trash -- "$imv_current_file"; quit
 
-# Delete the current image and move to the next one
-<Ctrl+Shift+X> = exec rm "$imv_current_file"; close
+# Trash the current image and move to the next one
+<Ctrl+Shift+X> = exec gio trash -- "$imv_current_file"; close
 
 # Rotate the currently open image by 90 degrees
 <Ctrl+r> = exec mogrify -rotate 90 "$imv_current_file"
+
+# Edit the current image in Satty and quit the viewer
+<Ctrl+e> = exec satty --filename "$imv_current_file" & ; quit
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 7d550d78..48710ba6 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -13,6 +13,10 @@ confirm_os_window_close 0
 # Keybindings
 map ctrl+insert copy_to_clipboard
 map shift+insert paste_from_clipboard
+# Send Shift+Enter as CSI-u so TUIs can distinguish it from Enter.
+map shift+enter send_text all \e[13;2u
+# Kitty legacy encoding sends Alt+Shift+Enter the same as Alt+Enter; send CSI-u so tmux can match M-S-Enter.
+map alt+shift+enter send_text all \e[13;4u
 
 # Allow remote access
 allow_remote_control yes
diff --git a/config/omarchy/bar.json b/config/omarchy/bar.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/config/omarchy/bar.json
@@ -0,0 +1 @@
+{}
diff --git a/config/omarchy/extensions/menu.sh b/config/omarchy/extensions/menu.sh
deleted file mode 100644
index f7d0b277..00000000
--- a/config/omarchy/extensions/menu.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-# Overwrite parts of the omarchy-menu with user-specific submenus.
-# See $OMARCHY_PATH/bin/omarchy-menu for functions that can be overwritten.
-#
-# WARNING: Overwritten functions will obviously not be updated when Omarchy changes.
-#
-# Example of minimal system menu:
-#
-# show_system_menu() {
-#   case $(menu "System" "  Lock\n󰐥  Shutdown") in
-#   *Lock*) omarchy-system-lock ;;
-#   *Shutdown*) omarchy-system-shutdown ;;
-#   *) back_to show_main_menu ;;
-#   esac
-# }
-#
-# Example of overriding just the about menu action: (Using zsh instead of bash (default))
-#
-# show_about() {
-#   exec omarchy-launch-or-focus-tui "zsh -c 'fastfetch; read -k 1'"
-# }
diff --git a/config/omarchy/extensions/omarchy-menu.jsonc b/config/omarchy/extensions/omarchy-menu.jsonc
new file mode 100644
index 00000000..ca9e95f6
--- /dev/null
+++ b/config/omarchy/extensions/omarchy-menu.jsonc
@@ -0,0 +1,31 @@
+{
+  // Extend the Quickshell Omarchy menu with JSONC.
+  //
+  // IDs are object keys. The parent is inferred from the dotted id, so
+  // "personal.notes" appears under "personal", and "personal" appears on the
+  // root menu. Reuse an existing id to override/extend it.
+  //
+  // Fields:
+  //   icon        Nerd Font glyph shown in the icon column.
+  //   label       Visible row title.
+  //   action      Shell command to run. If omitted, the row is a submenu.
+  //   target      Existing submenu id to open. Use for links/aliases.
+  //   provider    Runtime provider function/command returning JSON rows.
+  //   aliases     alternate `omarchy menu summon <name>` routes; also searchable.
+  //   keywords    Extra search terms beyond id/label/aliases.
+  //   description Optional subtitle and extra search text.
+  //   when        Shell condition; hide row when it fails.
+  //   checked     Shell condition; append ✓ when it succeeds.
+  //
+  // Examples:
+  // "personal": {"icon":"","label":"Personal","keywords":"notes projects"},
+  // "personal.notes": {"icon":"󰎞","label":"Notes","action":"omarchy-launch-editor ~/notes","keywords":"notes"},
+  // "personal.files": {"icon":"","label":"Files","action":"uwsm-app -- nautilus ~/Documents","keywords":"files documents"},
+  //
+  // Only use provider when a provider_name function or command named "name"
+  // returns JSON rows. Static submenus only need dotted ids.
+  //
+  // Example: replace the default About action by reusing the same id. Existing
+  // fields are kept unless overridden.
+  // "about": {"icon":"","label":"About","action":"omarchy-launch-or-focus-tui \"zsh -c 'fastfetch; read -k 1'\""},
+}
diff --git a/config/omarchy/hooks/pre-refresh-pacman.d/add-custom-repo.sample b/config/omarchy/hooks/pre-refresh-pacman.d/add-custom-repo.sample
new file mode 100644
index 00000000..cebec4fc
--- /dev/null
+++ b/config/omarchy/hooks/pre-refresh-pacman.d/add-custom-repo.sample
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# This hook is called by `omarchy refresh pacman` AFTER the channel template
+# is copied to /etc/pacman.conf and BEFORE `pacman -Syyuu` runs. Use it to
+# layer customizations onto the freshly-written pacman.conf so they're
+# respected by the upgrade — common cases are adding a custom repository
+# (e.g. CachyOS, Chaotic-AUR, an internal company repo) or extra IgnorePkg
+# lines.
+#
+# The hook runs as the invoking user with a warm sudo cache.
+#
+# To put it into use, remove .sample from this file name.
+
+# Example: add an Include line above [core] for a custom repo.
+# Maintain the repo entries in /etc/pacman.d/custom-repos.conf yourself.
+
+CONF=/etc/pacman.conf
+SNIPPET=/etc/pacman.d/custom-repos.conf
+MARKER="Include = $SNIPPET"
+
+[[ -r $SNIPPET ]] || exit 0
+grep -qxF "$MARKER" "$CONF" && exit 0
+
+sudo sed -i "0,/^\[core\]/s||$MARKER\n\n[core]|" "$CONF"
diff --git a/config/omarchy/shell.json b/config/omarchy/shell.json
new file mode 100644
index 00000000..a1d73f13
--- /dev/null
+++ b/config/omarchy/shell.json
@@ -0,0 +1,60 @@
+{
+  "version": 1,
+  "idle": {
+    "screensaver": 150,
+    "lock": 300
+  },
+  "bar": {
+    "position": "top",
+    "transparent": false,
+    "centerAnchor": "omarchy.clock",
+    "layout": {
+      "left": [
+        {
+          "id": "omarchy.menu"
+        },
+        {
+          "id": "omarchy.workspaces"
+        }
+      ],
+      "center": [
+        {
+          "id": "omarchy.clock",
+          "format": "dddd HH:mm",
+          "formatAlt": "d MMMM 'W'ww yyyy",
+          "verticalFormat": "HH\n\u2014\nmm"
+        },
+        {
+          "id": "omarchy.weather"
+        },
+        {
+          "id": "omarchy.system-update"
+        },
+        {
+          "id": "omarchy.indicators"
+        }
+      ],
+      "right": [
+        {
+          "id": "omarchy.tray"
+        },
+        {
+          "id": "omarchy.bluetooth"
+        },
+        {
+          "id": "omarchy.network"
+        },
+        {
+          "id": "omarchy.audio"
+        },
+        {
+          "id": "omarchy.monitor"
+        },
+        {
+          "id": "omarchy.power"
+        }
+      ]
+    }
+  },
+  "plugins": []
+}
diff --git a/config/omarchy/themed/alacritty.toml.tpl.sample b/config/omarchy/themed/alacritty.toml.tpl.sample
index b86516e2..bfb3f0e4 100644
--- a/config/omarchy/themed/alacritty.toml.tpl.sample
+++ b/config/omarchy/themed/alacritty.toml.tpl.sample
@@ -25,6 +25,10 @@
 #   {{ color0 }} through {{ color15 }} - Standard 16-color terminal palette
 #     color0-7:  Normal colors (black, red, green, yellow, blue, magenta, cyan, white)
 #     color8-15: Bright variants
+#   Semantic aliases are also available: {{ bg }}, {{ fg }}, {{ red }}, {{ green }},
+#   {{ yellow }}, {{ blue }}, {{ magenta }}, {{ cyan }}, {{ muted }} and the
+#   {{ bright_* }} variants. The two forms are kept in sync by
+#   bin/omarchy-theme-set-templates.
 #
 # VARIABLE MODIFIERS:
 #   {{ variable_strip }} - Hex color without the # prefix (e.g., "1a1b26")
@@ -51,11 +55,11 @@ cursor = "{{ cursor }}"
 
 [colors.search.matches]
 foreground = "{{ background }}"
-background = "{{ color3 }}"
+background = "{{ yellow }}"
 
 [colors.search.focused_match]
 foreground = "{{ background }}"
-background = "{{ color1 }}"
+background = "{{ red }}"
 
 [colors.footer_bar]
 foreground = "{{ background }}"
@@ -66,21 +70,21 @@ text = "{{ selection_foreground }}"
 background = "{{ selection_background }}"
 
 [colors.normal]
-black = "{{ color0 }}"
-red = "{{ color1 }}"
-green = "{{ color2 }}"
-yellow = "{{ color3 }}"
-blue = "{{ color4 }}"
-magenta = "{{ color5 }}"
-cyan = "{{ color6 }}"
-white = "{{ color7 }}"
+black = "{{ bg }}"
+red = "{{ red }}"
+green = "{{ green }}"
+yellow = "{{ yellow }}"
+blue = "{{ blue }}"
+magenta = "{{ magenta }}"
+cyan = "{{ cyan }}"
+white = "{{ fg }}"
 
 [colors.bright]
-black = "{{ color8 }}"
-red = "{{ color9 }}"
-green = "{{ color10 }}"
-yellow = "{{ color11 }}"
-blue = "{{ color12 }}"
-magenta = "{{ color13 }}"
-cyan = "{{ color14 }}"
-white = "{{ color15 }}"
+black = "{{ muted }}"
+red = "{{ bright_red }}"
+green = "{{ bright_green }}"
+yellow = "{{ bright_yellow }}"
+blue = "{{ bright_blue }}"
+magenta = "{{ bright_magenta }}"
+cyan = "{{ bright_cyan }}"
+white = "{{ bright_fg }}"
diff --git a/config/swayosd/config.toml b/config/swayosd/config.toml
deleted file mode 100644
index 759cbe1f..00000000
--- a/config/swayosd/config.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[server]
-show_percentage = true
-max_volume = 100
-style = "~/.config/swayosd/style.css"
diff --git a/config/swayosd/style.css b/config/swayosd/style.css
deleted file mode 100644
index b95ab9f3..00000000
--- a/config/swayosd/style.css
+++ /dev/null
@@ -1,28 +0,0 @@
-@import "../omarchy/current/theme/swayosd.css";
-
-window {
-  border-radius: 0;
-  opacity: 0.97;
-  border: 2px solid @border-color;
-
-  background-color: @background-color;
-}
-
-label {
-  font-family: 'JetBrainsMono Nerd Font';
-  font-size: 11pt;
-
-  color: @label;
-}
-
-image {
-  color: @image;
-}
-
-progressbar {
-  border-radius: 0;
-}
-
-progress {
-  background-color: @progress;
-}
diff --git a/config/systemd/user/omarchy-battery-monitor.service b/config/systemd/user/omarchy-battery-monitor.service
deleted file mode 100644
index 6e2e8e99..00000000
--- a/config/systemd/user/omarchy-battery-monitor.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Omarchy Battery Monitor Check
-After=graphical-session.target
-
-[Service]
-Type=oneshot
-ExecStart=%h/.local/share/omarchy/bin/omarchy-battery-monitor
-Environment=DISPLAY=:0
-LogLevelMax=warning
diff --git a/config/systemd/user/omarchy-battery-monitor.timer b/config/systemd/user/omarchy-battery-monitor.timer
deleted file mode 100644
index dc43763e..00000000
--- a/config/systemd/user/omarchy-battery-monitor.timer
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Omarchy Battery Monitor Timer
-Requires=omarchy-battery-monitor.service
-
-[Timer]
-OnBootSec=1min
-OnUnitActiveSec=30sec
-AccuracySec=10sec
-
-[Install]
-WantedBy=timers.target
\ No newline at end of file
diff --git a/config/systemd/user/swayosd-server.service b/config/systemd/user/swayosd-server.service
deleted file mode 100644
index 55c7f9c2..00000000
--- a/config/systemd/user/swayosd-server.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=SwayOSD server
-PartOf=graphical-session.target
-After=graphical-session.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/swayosd-server
-Restart=always
-RestartSec=2
-
-[Install]
-WantedBy=graphical-session.target
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index de772031..f24361d7 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -3,8 +3,9 @@ set -g prefix C-Space
 set -g prefix2 C-b
 bind C-Space send-prefix
 
-# Reload config
+# Config and help
 bind q source-file ~/.config/tmux/tmux.conf \; display "Configuration reloaded"
+bind ? display-popup -E -w 80% -h 70% -T "Tmux keybindings" "omarchy-menu-tmux-keybindings --print | less -R"
 
 # Vi mode for copy
 setw -g mode-keys vi
@@ -12,6 +13,10 @@ bind -T copy-mode-vi v send -X begin-selection
 bind -T copy-mode-vi y send -X copy-selection-and-cancel
 
 # Pane Controls
+bind -n M-Enter split-window -v -c "#{pane_current_path}"
+bind -n M-S-Enter split-window -h -c "#{pane_current_path}"
+bind -n M-Escape kill-pane
+
 bind h split-window -v -c "#{pane_current_path}"
 bind v split-window -h -c "#{pane_current_path}"
 bind x kill-pane
@@ -72,6 +77,7 @@ setw -g aggressive-resize on
 set -g detach-on-destroy off
 set -g extended-keys on
 set -g extended-keys-format csi-u
+set -g terminal-features[3] "xterm-kitty:extkeys"
 set -sg escape-time 10
 
 # Status bar
diff --git a/config/uwsm/env b/config/uwsm/env
deleted file mode 100644
index 18ff78cb..00000000
--- a/config/uwsm/env
+++ /dev/null
@@ -1,11 +0,0 @@
-# Changes require a restart to take effect.
-
-# Ensure Omarchy bins are in the path
-export OMARCHY_PATH=$HOME/.local/share/omarchy
-export PATH=$OMARCHY_PATH/bin:$PATH:$HOME/.local/bin
-
-# Set default terminal and editor
-source ~/.config/uwsm/default
-
-# Activate mise if present on the system
-omarchy-cmd-present mise && eval "$(mise activate bash --shims)"
diff --git a/config/walker/config.toml b/config/walker/config.toml
deleted file mode 100644
index 7638097c..00000000
--- a/config/walker/config.toml
+++ /dev/null
@@ -1,49 +0,0 @@
-force_keyboard_focus = true                                                 # forces keyboard forcus to stay in Walker
-selection_wrap = true                                                       # wrap list if at bottom or top
-theme = "omarchy-default"                                                   # theme to use
-additional_theme_location = "~/.local/share/omarchy/default/walker/themes/"
-hide_action_hints = true                                                    # globally hide the action hints
-
-[placeholders]
-"default" = { input = " Search...", list = "No Results" } # placeholders for input and empty list, key is the providers name, so f.e. "desktopapplications" or "menus:other"
-
-[keybinds]
-quick_activate = []
-
-[columns]
-symbols = 1 # providers to be queried by default
-
-[providers]
-max_results = 256 # 256 should be enough for everyone
-default = [
-  "desktopapplications",
-  "websearch",
-]
-
-[[providers.prefixes]]
-prefix = "/"
-provider = "providerlist"
-
-[[providers.prefixes]]
-prefix = "."
-provider = "files"
-
-[[providers.prefixes]]
-prefix = ":"
-provider = "symbols"
-
-[[providers.prefixes]]
-prefix = "="
-provider = "calc"
-
-[[providers.prefixes]]
-prefix = "@"
-provider = "websearch"
-
-[[providers.prefixes]]
-prefix = "$"
-provider = "clipboard"
-
-[[emergencies]]
-text = "Restart Walker"
-command = "omarchy-restart-walker"
diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
deleted file mode 100644
index 2b3783b2..00000000
--- a/config/waybar/config.jsonc
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-  "reload_style_on_change": true,
-  "layer": "top",
-  "position": "top",
-  "spacing": 0,
-  "height": 26,
-  "modules-left": ["custom/omarchy", "hyprland/workspaces"],
-  "modules-center": ["clock", "custom/weather", "custom/update", "custom/voxtype", "custom/screenrecording-indicator", "custom/idle-indicator", "custom/notification-silencing-indicator"],
-  "modules-right": [
-    "group/tray-expander",
-    "bluetooth",
-    "network",
-    "pulseaudio",
-    "cpu",
-    "battery"
-  ],
-  "hyprland/workspaces": {
-    "on-click": "activate",
-    "format": "{icon}",
-    "format-icons": {
-      "default": "",
-      "1": "1",
-      "2": "2",
-      "3": "3",
-      "4": "4",
-      "5": "5",
-      "6": "6",
-      "7": "7",
-      "8": "8",
-      "9": "9",
-      "10": "0",
-      "active": "󱓻"
-    },
-    "persistent-workspaces": {
-      "1": [],
-      "2": [],
-      "3": [],
-      "4": [],
-      "5": []
-    }
-  },
-  "custom/omarchy": {
-    "format": "<span font='omarchy'>\ue900</span>",
-    "on-click": "omarchy-menu",
-    "on-click-right": "xdg-terminal-exec",
-    "tooltip-format": "Omarchy Menu\n\nSuper + Alt + Space"
-  },
-  "custom/update": {
-    "format": "",
-    "exec": "omarchy-update-available",
-    "on-click": "omarchy-launch-floating-terminal-with-presentation omarchy-update",
-    "tooltip-format": "Omarchy update available",
-    "signal": 7,
-    "interval": 21600
-  },
-
-  "cpu": {
-    "interval": 5,
-    "format": "󰍛",
-    "on-click": "omarchy-launch-or-focus-tui btop",
-    "on-click-right": "alacritty"
-  },
-  "clock": {
-    "format": "{:L%A %H:%M}",
-    "format-alt": "{:L%d %B W%V %Y}",
-    "tooltip": false,
-    "on-click-right": "omarchy-launch-floating-terminal-with-presentation omarchy-tz-select"
-  },
-  "custom/weather": {
-    "exec": "$OMARCHY_PATH/default/waybar/weather.sh",
-    "return-type": "json",
-    "interval": 60,
-    "tooltip": false,
-    "on-click": "notify-send -u low \"$(omarchy-weather-status)\""
-  },
-  "network": {
-    "format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
-    "format": "{icon}",
-    "format-wifi": "{icon}",
-    "format-ethernet": "󰀂",
-    "format-disconnected": "󰤮",
-    "tooltip-format-wifi": "{essid} ({frequency} GHz)",
-    "tooltip-format-ethernet": "Connected",
-    "tooltip-format-disconnected": "Disconnected",
-    "interval": 3,
-    "spacing": 1,
-    "on-click": "omarchy-launch-wifi"
-  },
-  "battery": {
-    "format": "{capacity}% {icon}",
-    "format-discharging": "{icon}",
-    "format-charging": "{icon}",
-    "format-plugged": "",
-    "format-icons": {
-      "charging": ["󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"],
-      "default": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"]
-    },
-    "format-full": "󰂅",
-    "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
-    "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
-    "interval": 5,
-    "on-click": "omarchy-menu power",
-    "on-click-right": "notify-send -u low \"$(omarchy-battery-status)\"",
-    "states": {
-      "warning": 20,
-      "critical": 10
-    }
-  },
-  "bluetooth": {
-    "format": "",
-    "format-off": "󰂲",
-    "format-disabled": "󰂲",
-    "format-connected": "󰂱",
-    "format-no-controller": "",
-    "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "omarchy-launch-bluetooth"
-  },
-  "pulseaudio": {
-    "format": "{icon}",
-    "on-click": "omarchy-launch-audio",
-    "on-click-right": "pamixer -t",
-    "tooltip-format": "Playing at {volume}%",
-    "scroll-step": 5,
-    "format-muted": "",
-    "format-icons": {
-      "headphone": "",
-      "headset": "",
-      "default": ["", "", ""]
-    }
-  },
-  "group/tray-expander": {
-    "orientation": "inherit",
-    "drawer": {
-      "transition-duration": 600,
-      "children-class": "tray-group-item"
-    },
-    "modules": ["custom/expand-icon", "tray"]
-  },
-  "custom/expand-icon": {
-    "format": "",
-    "tooltip": false,
-    "on-scroll-up": "",
-    "on-scroll-down": "",
-    "on-scroll-left": "",
-    "on-scroll-right": ""
-  },
-  "custom/screenrecording-indicator": {
-    "on-click": "omarchy-capture-screenrecording",
-    "exec": "$OMARCHY_PATH/default/waybar/indicators/screen-recording.sh",
-    "signal": 8,
-    "return-type": "json"
-  },
-  "custom/idle-indicator": {
-    "on-click": "omarchy-toggle-idle",
-    "exec": "$OMARCHY_PATH/default/waybar/indicators/idle.sh",
-    "signal": 9,
-    "return-type": "json"
-  },
-  "custom/notification-silencing-indicator": {
-    "on-click": "omarchy-toggle-notification-silencing",
-    "exec": "$OMARCHY_PATH/default/waybar/indicators/notification-silencing.sh",
-    "signal": 10,
-    "return-type": "json"
-  },
-  "custom/voxtype": {
-    "exec": "omarchy-voxtype-status",
-    "return-type": "json",
-    "format": "{icon}",
-    "format-icons": {
-      "idle": "",
-      "recording": "󰍬",
-      "transcribing": "󰔟"
-    },
-    "tooltip": true,
-    "on-click-right": "omarchy-voxtype-config",
-    "on-click": "omarchy-voxtype-model"
-  },
-  "tray": {
-    "icon-size": 12,
-    "spacing": 17
-  }
-}
diff --git a/config/waybar/style.css b/config/waybar/style.css
deleted file mode 100644
index 63302efa..00000000
--- a/config/waybar/style.css
+++ /dev/null
@@ -1,111 +0,0 @@
-@import "../omarchy/current/theme/waybar.css";
-
-* {
-  background-color: @background;
-  color: @foreground;
-
-  border: none;
-  border-radius: 0;
-  min-height: 0;
-  font-family: 'JetBrainsMono Nerd Font';
-  font-size: 12px;
-}
-
-.modules-left {
-  margin-left: 8px;
-}
-
-.modules-right {
-  margin-right: 8px;
-}
-
-#workspaces button {
-  all: initial;
-  padding: 0 6px;
-  margin: 0 1.5px;
-  min-width: 9px;
-}
-
-#workspaces button.empty {
-  opacity: 0.5;
-}
-
-#cpu,
-#battery,
-#pulseaudio,
-#custom-omarchy,
-#custom-update {
-  min-width: 12px;
-  margin: 0 7.5px;
-}
-
-#tray {
-  margin-right: 16px;
-}
-
-#bluetooth {
-  margin-right: 17px;
-}
-
-#network {
-  margin-right: 13px;
-}
-
-#custom-expand-icon {
-  margin-right: 18px;
-}
-
-tooltip {
-  padding: 2px;
-}
-
-#custom-update {
-  font-size: 10px;
-}
-
-#clock {
-  margin-left: 8.75px;
-}
-
-#custom-weather {
-  margin-left: 7.5px;
-  margin-right: 7.5px;
-}
-
-#custom-weather.unavailable {
-  min-width: 0;
-  margin: 0;
-  padding: 0;
-}
-
-.hidden {
-  opacity: 0;
-}
-
-#custom-screenrecording-indicator,
-#custom-idle-indicator,
-#custom-notification-silencing-indicator {
-  min-width: 12px;
-  margin-left: 5px;
-  margin-right: 0;
-  font-size: 10px;
-  padding-bottom: 1px;
-}
-
-#custom-screenrecording-indicator.active {
-  color: #a55555;
-}
-
-#custom-idle-indicator.active,
-#custom-notification-silencing-indicator.active {
-  color: #a55555;
-}
-
-#custom-voxtype {
-  min-width: 12px;
-  margin: 0 0 0 7.5px;
-}
-
-#custom-voxtype.recording {
-  color: #a55555;
-}
diff --git a/config/wiremix/wiremix.toml b/config/wiremix/wiremix.toml
deleted file mode 100644
index 07f9747c..00000000
--- a/config/wiremix/wiremix.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-# overwrites default wiremix configuration
-# defaults: https://github.com/tsowell/wiremix/blob/main/wiremix.toml
-
-[char_sets.default]
-default_device = "⮞"
diff --git a/default/wireplumber/wireplumber.conf.d/bluetooth-a2dp-autoconnect.conf b/config/wireplumber/wireplumber.conf.d/bluetooth-a2dp-autoconnect.conf
similarity index 100%
rename from default/wireplumber/wireplumber.conf.d/bluetooth-a2dp-autoconnect.conf
rename to config/wireplumber/wireplumber.conf.d/bluetooth-a2dp-autoconnect.conf
diff --git a/config/xournalpp/settings.xml b/config/xournalpp/settings.xml
index 5f98a901..020c8372 100644
--- a/config/xournalpp/settings.xml
+++ b/config/xournalpp/settings.xml
@@ -6,9 +6,9 @@
   <property name="pressureMultiplier" value="1"/>
   <property name="zoomGesturesEnabled" value="true"/>
   <property name="selectedToolbar" value="Portrait"/>
-  <property name="lastSavePath" value="/home/dhh/Downloads"/>
+  <property name="lastSavePath" value=""/>
   <property name="lastOpenPath" value=""/>
-  <property name="lastImagePath" value="/home/dhh/Dropbox/Images"/>
+  <property name="lastImagePath" value=""/>
   <property name="edgePanSpeed" value="20"/>
   <property name="edgePanMaxMult" value="5"/>
   <property name="zoomStep" value="10"/>
diff --git a/applications/Alacritty.desktop b/default/alacritty/Alacritty.desktop
similarity index 100%
rename from applications/Alacritty.desktop
rename to default/alacritty/Alacritty.desktop
diff --git a/default/applications/mimeapps.list b/default/applications/mimeapps.list
new file mode 100644
index 00000000..61079e82
--- /dev/null
+++ b/default/applications/mimeapps.list
@@ -0,0 +1,49 @@
+[Default Applications]
+inode/directory=org.gnome.Nautilus.desktop
+
+image/png=imv.desktop
+image/jpeg=imv.desktop
+image/gif=imv.desktop
+image/webp=imv.desktop
+image/bmp=imv.desktop
+image/tiff=imv.desktop
+
+application/pdf=org.gnome.Evince.desktop
+
+x-scheme-handler/http=chromium.desktop
+x-scheme-handler/https=chromium.desktop
+x-scheme-handler/mailto=HEY.desktop
+
+video/mp4=mpv.desktop
+video/x-msvideo=mpv.desktop
+video/x-matroska=mpv.desktop
+video/x-flv=mpv.desktop
+video/x-ms-wmv=mpv.desktop
+video/mpeg=mpv.desktop
+video/ogg=mpv.desktop
+video/webm=mpv.desktop
+video/quicktime=mpv.desktop
+video/3gpp=mpv.desktop
+video/3gpp2=mpv.desktop
+video/x-ms-asf=mpv.desktop
+video/x-ogm+ogg=mpv.desktop
+video/x-theora+ogg=mpv.desktop
+application/ogg=mpv.desktop
+
+text/plain=nvim.desktop
+text/english=nvim.desktop
+text/x-makefile=nvim.desktop
+text/x-c++hdr=nvim.desktop
+text/x-c++src=nvim.desktop
+text/x-chdr=nvim.desktop
+text/x-csrc=nvim.desktop
+text/x-java=nvim.desktop
+text/x-moc=nvim.desktop
+text/x-pascal=nvim.desktop
+text/x-tcl=nvim.desktop
+text/x-tex=nvim.desktop
+application/x-shellscript=nvim.desktop
+text/x-c=nvim.desktop
+text/x-c++=nvim.desktop
+application/xml=nvim.desktop
+text/xml=nvim.desktop
diff --git a/default/bash/aliases b/default/bash/aliases
index 656d145f..df42d923 100644
--- a/default/bash/aliases
+++ b/default/bash/aliases
@@ -45,6 +45,7 @@ alias ....='cd ../../..'
 # Tools
 alias c='opencode'
 alias cx='printf "\033[2J\033[3J\033[H" && claude --permission-mode bypassPermissions'
+alias cy='codex -s danger-full-access -a never'
 alias d='docker'
 alias r='rails'
 alias t='tmux attach || tmux new -s Work'
diff --git a/default/bash/completions b/default/bash/completions
index 8a827137..0b693423 100644
--- a/default/bash/completions
+++ b/default/bash/completions
@@ -40,14 +40,79 @@ _omarchy_complete() {
     candidates+=("--all" "--json" "--markdown" "--check")
   fi
 
-  if (( ${#candidates[@]} == 0 )) && [[ -x $bin_dir/$prefix ]]; then
-    local args enum
-    args=$(grep -m 1 '^# omarchy:args=<' "$bin_dir/$prefix" 2>/dev/null)
-    enum="${args#*<}"
-    enum="${enum%%>*}"
+  if (( ${#candidates[@]} == 0 )); then
+    local command_prefix command_path first_arg_index n j
+    for ((n = COMP_CWORD - 1; n >= 0; n--)); do
+      command_prefix="omarchy"
+      for ((j = 1; j <= n; j++)); do
+        part="${COMP_WORDS[j]}"
+        [[ -z $part || $part == -* ]] && continue
+        command_prefix+="-$part"
+      done
 
-    if [[ $enum == *"|"* && $enum != *" "* ]]; then
-      read -r -a candidates <<<"${enum//|/ }"
+      command_path="$bin_dir/$command_prefix"
+      if [[ -x $command_path ]]; then
+        first_arg_index=$((n + 1))
+        break
+      fi
+    done
+
+    if [[ -n ${command_path:-} && -x $command_path ]]; then
+      local args spec alt token actual alts value match current_arg_index
+      args=$(grep -m 1 '^# omarchy:args=' "$command_path" 2>/dev/null)
+      args="${args#*omarchy:args=}"
+      current_arg_index=$((COMP_CWORD - first_arg_index))
+
+      alts="${args// | /$'\n'}"
+      while IFS= read -r alt; do
+        read -r -a spec <<<"$alt"
+        match=true
+
+        for ((j = 0; j < current_arg_index; j++)); do
+          token="${spec[j]:-}"
+          actual="${COMP_WORDS[first_arg_index + j]:-}"
+          if [[ -z $token ]]; then
+            match=false
+            break
+          fi
+
+          if [[ $token == \<*\> || $token == \[*\] ]]; then
+            value="${token#<}"
+            value="${value#\[}"
+            value="${value%>}"
+            value="${value%\]}"
+            if [[ $value == *"|"* ]]; then
+              [[ " ${value//|/ } " == *" $actual "* ]] || match=false
+            fi
+          elif [[ $token != "$actual" ]]; then
+            match=false
+          fi
+        done
+
+        [[ $match == true ]] || continue
+
+        token="${spec[current_arg_index]:-}"
+        [[ -n $token ]] || continue
+
+        if [[ $token == \<*\> || $token == \[*\] ]]; then
+          value="${token#<}"
+          value="${value#\[}"
+          value="${value%>}"
+          value="${value%\]}"
+          if [[ $value == *"|"* ]]; then
+            read -r -a spec <<<"${value//|/ }"
+            for actual in "${spec[@]}"; do
+              [[ -n ${seen[$actual]:-} ]] && continue
+              seen[$actual]=1
+              candidates+=("$actual")
+            done
+          fi
+        else
+          [[ -n ${seen[$token]:-} ]] && continue
+          seen[$token]=1
+          candidates+=("$token")
+        fi
+      done <<<"$alts"
     fi
   fi
 
diff --git a/default/bash/env-bootstrap b/default/bash/env-bootstrap
new file mode 100644
index 00000000..c1d759de
--- /dev/null
+++ b/default/bash/env-bootstrap
@@ -0,0 +1,28 @@
+# Single source of truth for OMARCHY_PATH + PATH adjustments. Sourced by:
+#   /etc/profile.d/omarchy.sh                 (system login shells)
+#   /etc/skel/.bashrc                         (interactive shells)
+#   /usr/share/uwsm/env.d/10-omarchy          (Hyprland session via uwsm)
+#   /usr/share/omarchy/default/bash/envs      (bash rc chain; SSH/non-login)
+
+# /etc/omarchy.conf is written by omarchy-dev-link and reset by
+# omarchy-dev-unlink. When absent, force the packaged default instead of
+# preserving a stale inherited value.
+if [ -f /etc/omarchy.conf ]; then
+  . /etc/omarchy.conf
+  : "${OMARCHY_PATH:=/usr/share/omarchy}"
+else
+  OMARCHY_PATH=/usr/share/omarchy
+fi
+export OMARCHY_PATH
+
+# Only prepend in dev-link mode. On a production install, the binaries are
+# already on PATH as /usr/bin/omarchy-* via the omarchy package — prepending
+# /usr/share/omarchy/bin would just be noise. omarchy-dev-unlink strips its
+# checkout bin/ from the active PATH explicitly, so we don't dedupe here.
+if [ "$OMARCHY_PATH" != /usr/share/omarchy ]; then
+  case ":$PATH:" in
+    *":${OMARCHY_PATH%/}/bin:"*) ;;
+    *) PATH="${OMARCHY_PATH%/}/bin:$PATH" ;;
+  esac
+  export PATH
+fi
diff --git a/default/bash/envs b/default/bash/envs
index a8d01dda..ba36cb33 100644
--- a/default/bash/envs
+++ b/default/bash/envs
@@ -6,6 +6,11 @@ export BAT_THEME=ansi
 export MANROFFOPT="-c"
 export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 
-# Duplicated from .config/uwsm/env so SSH works too
-export OMARCHY_PATH=$HOME/.local/share/omarchy
-export PATH=$OMARCHY_PATH/bin:$PATH:$HOME/.local/bin
+# Idempotent — already sourced by /etc/skel/.bashrc; re-source here so SSH and
+# other non-interactive non-login bash sessions still get OMARCHY_PATH.
+[ -r /usr/share/omarchy/default/bash/env-bootstrap ] && . /usr/share/omarchy/default/bash/env-bootstrap
+
+case ":$PATH:" in
+  *":$HOME/.local/bin:"*) ;;
+  *) export PATH="$PATH:$HOME/.local/bin" ;;
+esac
diff --git a/default/bash/fns/tmux b/default/bash/fns/tmux
index 0144f2eb..de62c625 100644
--- a/default/bash/fns/tmux
+++ b/default/bash/fns/tmux
@@ -34,6 +34,33 @@ tdl() {
   tmux send-keys -t "$editor_pane" "$EDITOR ." C-m
 
   # Select the nvim pane for focus
+  tmux select-pane -t "$opencode_pane"
+}
+
+# Create a Tmux Dev Square layout with editor, diff watch, terminal, and opencode
+# Usage: tds
+tds() {
+  [[ -n $1 ]] && { echo "Usage: tds"; return 1; }
+  [[ -z $TMUX ]] && { echo "You must start tmux to use tds."; return 1; }
+
+  local current_dir="${PWD}"
+  local editor_pane diff_pane terminal_pane opencode_pane
+
+  editor_pane="$TMUX_PANE"
+
+  tmux rename-window -t "$editor_pane" "$(basename "$current_dir")"
+
+  terminal_pane=$(tmux split-window -v -p 50 -t "$editor_pane" -c "$current_dir" -P -F '#{pane_id}')
+  diff_pane=$(tmux split-window -h -p 50 -t "$editor_pane" -c "$current_dir" -P -F '#{pane_id}')
+  opencode_pane=$(tmux split-window -h -p 50 -t "$terminal_pane" -c "$current_dir" -P -F '#{pane_id}')
+
+  tmux send-keys -t "$editor_pane" -l "nvim ."
+  tmux send-keys -t "$editor_pane" C-m
+  tmux send-keys -t "$diff_pane" -l "hunk diff --watch"
+  tmux send-keys -t "$diff_pane" C-m
+  tmux send-keys -t "$opencode_pane" -l "opencode"
+  tmux send-keys -t "$opencode_pane" C-m
+
   tmux select-pane -t "$editor_pane"
 }
 
diff --git a/default/bash/fns/transcoding b/default/bash/fns/transcoding
deleted file mode 100644
index 017ddb66..00000000
--- a/default/bash/fns/transcoding
+++ /dev/null
@@ -1,33 +0,0 @@
-# Transcoding helpers have moved to omarchy-transcode.
-
-transcode-video-1080p() {
-  omarchy-transcode "$1" mp4 1080p
-}
-
-transcode-video-4K() {
-  omarchy-transcode "$1" mp4 4k
-}
-
-transcode-video-gif() {
-  omarchy-transcode "$1" gif 1080p
-}
-
-img2jpg() {
-  omarchy-transcode "$1" jpg high
-}
-
-img2jpg-small() {
-  omarchy-transcode "$1" jpg low
-}
-
-img2jpg-medium() {
-  omarchy-transcode "$1" jpg medium
-}
-
-img2jpg-large() {
-  omarchy-transcode "$1" jpg high
-}
-
-img2png() {
-  omarchy-transcode "$1" png high
-}
diff --git a/default/bash/rc b/default/bash/rc
index 3042e427..63e62497 100644
--- a/default/bash/rc
+++ b/default/bash/rc
@@ -1,6 +1,7 @@
-source ~/.local/share/omarchy/default/bash/envs
-source ~/.local/share/omarchy/default/bash/shell
-source ~/.local/share/omarchy/default/bash/aliases
-source ~/.local/share/omarchy/default/bash/functions
-source ~/.local/share/omarchy/default/bash/init
-[[ $- == *i* ]] && bind -f ~/.local/share/omarchy/default/bash/inputrc
+: "${OMARCHY_PATH:=/usr/share/omarchy}"
+source "$OMARCHY_PATH/default/bash/envs"
+source "$OMARCHY_PATH/default/bash/shell"
+source "$OMARCHY_PATH/default/bash/aliases"
+source "$OMARCHY_PATH/default/bash/functions"
+source "$OMARCHY_PATH/default/bash/init"
+[[ $- == *i* ]] && bind -f "$OMARCHY_PATH/default/bash/inputrc"
diff --git a/default/bashrc b/default/bashrc
index eaf13c66..43810a91 100644
--- a/default/bashrc
+++ b/default/bashrc
@@ -3,7 +3,8 @@
 
 # All the default Omarchy aliases and functions
 # (don't mess with these directly, just overwrite them here!)
-source ~/.local/share/omarchy/default/bash/rc
+[[ -r /usr/share/omarchy/default/bash/env-bootstrap ]] && source /usr/share/omarchy/default/bash/env-bootstrap
+source "$OMARCHY_PATH/default/bash/rc"
 
 # Add your own exports, aliases, and functions here.
 #
diff --git a/default/chromium/extensions/copy-url/background.js b/default/chromium/extensions/copy-url/background.js
index a2537c50..8853a311 100644
--- a/default/chromium/extensions/copy-url/background.js
+++ b/default/chromium/extensions/copy-url/background.js
@@ -11,7 +11,7 @@ chrome.commands.onCommand.addListener((command) => {
       }).then(() => {
         chrome.notifications.create({
           type: 'basic',
-          iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8/5+hHgAHggJ/PchI7wAAAABJRU5ErkJggg==',
+          iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVR4nGNgAAIAAAUAAXpeqz8AAAAASUVORK5CYII=',
           title: '   URL copied to clipboard',
           message: ''
         });
diff --git a/default/chromium/extensions/yt-dlp/background.js b/default/chromium/extensions/yt-dlp/background.js
new file mode 100644
index 00000000..07006501
--- /dev/null
+++ b/default/chromium/extensions/yt-dlp/background.js
@@ -0,0 +1,41 @@
+function sendUrl(url) {
+  if (!url || !/^https?:/i.test(url)) return;
+
+  // The native messaging host runs yt-dlp and owns all the desktop
+  // notifications, so we just hand off the URL and ignore the reply.
+  chrome.runtime.sendNativeMessage('com.omarchy.ytdlp', { url }, () => {
+    void chrome.runtime.lastError;
+  });
+}
+
+function triggerDownload(tab) {
+  if (!tab) return;
+
+  // The activeTab permission exposes tab.url whenever the user invokes the
+  // extension — both via the toolbar click and the keyboard shortcut.
+  if (tab.url) {
+    sendUrl(tab.url);
+    return;
+  }
+
+  // Fallback: read the URL straight from the page.
+  if (tab.id === undefined) return;
+  chrome.scripting
+    .executeScript({ target: { tabId: tab.id }, func: () => location.href })
+    .then((results) => sendUrl(results && results[0] && results[0].result))
+    .catch(() => {});
+}
+
+// Keyboard shortcut (Alt+Shift+D).
+chrome.commands.onCommand.addListener((command) => {
+  if (command === 'download-video') {
+    chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
+      triggerDownload(tabs[0]);
+    });
+  }
+});
+
+// Clicking the extension's toolbar icon.
+chrome.action.onClicked.addListener((tab) => {
+  triggerDownload(tab);
+});
diff --git a/default/chromium/extensions/yt-dlp/download-video.svg b/default/chromium/extensions/yt-dlp/download-video.svg
new file mode 100644
index 00000000..d3731d19
--- /dev/null
+++ b/default/chromium/extensions/yt-dlp/download-video.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" viewBox="0 0 512 468.553"><path fill-rule="nonzero" d="M97.632 0h316.736c26.861 0 51.272 10.989 68.953 28.673C501.017 46.363 512 70.787 512 97.632v273.293c0 26.841-10.995 51.255-28.682 68.945-17.691 17.691-42.112 28.683-68.95 28.683H97.632c-26.845 0-51.269-10.986-68.959-28.676C10.989 422.193 0 397.785 0 370.925V97.632c0-26.867 10.983-51.281 28.667-68.965C46.351 10.983 70.765 0 97.632 0zm140.509 314.599l-3.333-105.58 36.408-1.151 3.276 103.999 42.188-43.498 26.112 25.404-87.819 90.577-85.765-88.532 26.125-25.404 42.808 44.188v-.003zM28.619 122.962H88.37l36.214-92.199c.286-.726.62-1.441.999-2.144H97.632c-18.963 0-36.218 7.77-48.731 20.282-12.512 12.513-20.282 29.768-20.282 48.731v25.33zm122.084-94.343l-37.057 94.343h108.69l36.129-91.983c.315-.798.687-1.587 1.116-2.36H150.703zm133.744 0l-37.054 94.343h105.793l36.215-92.199c.286-.726.62-1.441.998-2.144H284.447zm131.067.009l-37.051 94.334h104.918v-25.33c0-18.947-7.776-36.205-20.295-48.724-12.258-12.261-29.068-19.974-47.572-20.28zm67.867 122.947H28.619v219.35c0 18.956 7.776 36.204 20.289 48.717 12.519 12.518 29.777 20.292 48.724 20.292h316.736c18.941 0 36.196-7.78 48.715-20.299 12.518-12.518 20.298-29.773 20.298-48.71v-219.35z"/></svg>
\ No newline at end of file
diff --git a/default/chromium/extensions/yt-dlp/icon.png b/default/chromium/extensions/yt-dlp/icon.png
new file mode 100644
index 00000000..838c9e77
Binary files /dev/null and b/default/chromium/extensions/yt-dlp/icon.png differ
diff --git a/default/chromium/extensions/yt-dlp/manifest.json b/default/chromium/extensions/yt-dlp/manifest.json
new file mode 100644
index 00000000..26e14fa7
--- /dev/null
+++ b/default/chromium/extensions/yt-dlp/manifest.json
@@ -0,0 +1,23 @@
+{
+  "manifest_version": 3,
+  "name": "Download Video",
+  "version": "1.0",
+  "description": "Download the current page's video, this extension is installed by Omarchy",
+  "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4fww2jejSazrS0dpOBYyx8IfWRkRmek213PnIOaqzAuLK1jE1T+rR+SqBaKnC9j311O6sGrQ+MZJHotJfZyXoKBvSlfiay2z3NU0+Qv1Xa2VaRDuFoHzpfc4OcPvN1B/dGutLCxcLjvSBWEomGVSV1RpK+fgcOeJPFOjKLVrajedv9RnV3JE/Mz3VqBIpkzCUBtsM2eEpZZYWOWuyyk+h6RlbGkHXwudzizf7uJ7bA6RzZKF92wqnbgKDvGji0TwolzAJKALFTul44JzYNiU3Cy7FJXv/aXAKXwAf1VOXXMKie6udXv/M0E1vZAIWHv1sGhkxZZFxZ3C33svlXfg7wIDAQAB",
+  "permissions": ["activeTab", "scripting", "nativeMessaging"],
+  "icons": {
+    "16": "icon.png",
+    "48": "icon.png",
+    "128": "icon.png"
+  },
+  "action": {
+    "default_title": "Download Video"
+  },
+  "commands": {
+    "download-video": {
+      "suggested_key": {"default": "Alt+Shift+D"},
+      "description": "Download Video"
+    }
+  },
+  "background": {"service_worker": "background.js"}
+}
diff --git a/default/chromium/native-messaging-hosts/com.omarchy.ytdlp.json b/default/chromium/native-messaging-hosts/com.omarchy.ytdlp.json
new file mode 100644
index 00000000..963a8211
--- /dev/null
+++ b/default/chromium/native-messaging-hosts/com.omarchy.ytdlp.json
@@ -0,0 +1,9 @@
+{
+  "name": "com.omarchy.ytdlp",
+  "description": "Omarchy yt-dlp download host",
+  "path": "__HOST_PATH__",
+  "type": "stdio",
+  "allowed_origins": [
+    "chrome-extension://dedjgknigfeelejglamclffonmophnfl/"
+  ]
+}
diff --git a/default/elephant/omarchy_background_selector.lua b/default/elephant/omarchy_background_selector.lua
deleted file mode 100644
index 38bc2bf1..00000000
--- a/default/elephant/omarchy_background_selector.lua
+++ /dev/null
@@ -1,73 +0,0 @@
-Name = "omarchyBackgroundSelector"
-NamePretty = "Omarchy Background Selector"
-Cache = false
-HideFromProviderlist = true
-SearchName = true
-
-local function ShellEscape(s)
-  return "'" .. s:gsub("'", "'\\''") .. "'"
-end
-
-function FormatName(filename)
-  -- Remove leading number and dash
-  local name = filename:gsub("^%d+", ""):gsub("^%-", "")
-  -- Remove extension
-  name = name:gsub("%.[^%.]+$", "")
-  -- Replace dashes with spaces
-  name = name:gsub("-", " ")
-  -- Capitalize each word
-  name = name:gsub("%S+", function(word)
-    return word:sub(1, 1):upper() .. word:sub(2):lower()
-  end)
-  return name
-end
-
-function GetEntries()
-  local entries = {}
-  local home = os.getenv("HOME")
-
-  -- Read current theme name
-  local theme_name_file = io.open(home .. "/.config/omarchy/current/theme.name", "r")
-  local theme_name = theme_name_file and theme_name_file:read("*l") or nil
-  if theme_name_file then
-    theme_name_file:close()
-  end
-
-  -- Directories to search
-  local dirs = {
-    home .. "/.config/omarchy/current/theme/backgrounds",
-  }
-  if theme_name then
-    table.insert(dirs, home .. "/.config/omarchy/backgrounds/" .. theme_name)
-  end
-
-  -- Track added files to avoid duplicates
-  local seen = {}
-
-  for _, wallpaper_dir in ipairs(dirs) do
-    local handle = io.popen(
-      "find -L " .. ShellEscape(wallpaper_dir)
-        .. " -maxdepth 1 -type f \\( -name '*.jpg' -o -name '*.jpeg' -o -name '*.png' -o -name '*.gif' -o -name '*.bmp' -o -name '*.webp' \\) 2>/dev/null | sort"
-    )
-    if handle then
-      for background in handle:lines() do
-        local filename = background:match("([^/]+)$")
-        if filename and not seen[filename] then
-          seen[filename] = true
-          table.insert(entries, {
-            Text = FormatName(filename),
-            Value = background,
-            Actions = {
-              activate = "omarchy-theme-bg-set " .. ShellEscape(background),
-            },
-            Preview = background,
-            PreviewType = "file",
-          })
-        end
-      end
-      handle:close()
-    end
-  end
-
-  return entries
-end
diff --git a/default/elephant/omarchy_themes.lua b/default/elephant/omarchy_themes.lua
deleted file mode 100644
index e892f3e4..00000000
--- a/default/elephant/omarchy_themes.lua
+++ /dev/null
@@ -1,96 +0,0 @@
---
--- Dynamic Omarchy Theme Menu for Elephant/Walker
---
-Name = "omarchythemes"
-NamePretty = "Omarchy Themes"
-HideFromProviderlist = true
-
--- Check if file exists using Lua (no subprocess)
-local function file_exists(path)
-  local f = io.open(path, "r")
-  if f then
-    f:close()
-    return true
-  end
-  return false
-end
-
--- Get first matching file from directory using ls (single call for fallback)
-local function first_image_in_dir(dir)
-  local handle = io.popen("ls -1 '" .. dir .. "' 2>/dev/null | head -n 1")
-  if handle then
-    local file = handle:read("*l")
-    handle:close()
-    if file and file ~= "" then
-      return dir .. "/" .. file
-    end
-  end
-  return nil
-end
-
--- Find preview.png, preview.jpg, or first backgrounds/ image in a theme dir
-local function find_preview_path(dir)
-  local png = dir .. "/preview.png"
-  local jpg = dir .. "/preview.jpg"
-  if file_exists(png) then return png end
-  if file_exists(jpg) then return jpg end
-  return first_image_in_dir(dir .. "/backgrounds")
-end
-
--- The main function elephant will call
-function GetEntries()
-  local entries = {}
-  local user_theme_dir = os.getenv("HOME") .. "/.config/omarchy/themes"
-  local omarchy_path = os.getenv("OMARCHY_PATH") or ""
-  local default_theme_dir = omarchy_path .. "/themes"
-
-  local seen_themes = {}
-
-  -- Helper function to process themes from a directory
-  local function process_themes_from_dir(theme_dir)
-    -- Single find call to get all theme directories
-    local handle = io.popen("find -L '" .. theme_dir .. "' -mindepth 1 -maxdepth 1 -type d 2>/dev/null")
-    if not handle then
-      return
-    end
-
-    for theme_path in handle:lines() do
-      local theme_name = theme_path:match(".*/(.+)$")
-
-      if theme_name and not seen_themes[theme_name] then
-        seen_themes[theme_name] = true
-
-        -- Check the theme dir, then fall back to the default theme dir
-        -- (for partial user customizations that don't ship a preview)
-        local preview_path = find_preview_path(theme_path)
-          or find_preview_path(default_theme_dir .. "/" .. theme_name)
-
-        if preview_path and preview_path ~= "" then
-          local display_name = theme_name:gsub("_", " "):gsub("%-", " ")
-          display_name = display_name:gsub("(%a)([%w_']*)", function(first, rest)
-            return first:upper() .. rest:lower()
-          end)
-          display_name = display_name .. "  "
-
-          table.insert(entries, {
-            Text = display_name,
-            Preview = preview_path,
-            PreviewType = "file",
-            Actions = {
-              activate = "omarchy-theme-set " .. theme_name,
-            },
-          })
-        end
-      end
-    end
-
-    handle:close()
-  end
-
-  -- Process user themes first (they take precedence)
-  process_themes_from_dir(user_theme_dir)
-  -- Then process default themes (only if not already seen)
-  process_themes_from_dir(default_theme_dir)
-
-  return entries
-end
diff --git a/default/elephant/omarchy_unlocks.lua b/default/elephant/omarchy_unlocks.lua
deleted file mode 100644
index 8aacaccd..00000000
--- a/default/elephant/omarchy_unlocks.lua
+++ /dev/null
@@ -1,92 +0,0 @@
---
--- Dynamic Omarchy Unlocks Menu for Elephant/Walker
---
--- A "Default" entry restores the omarchy-shipped Plymouth via
--- omarchy-plymouth-reset. After that, every theme that has a preview-unlock.png
--- appears as a customised unlock; picking one runs omarchy-plymouth-set-by-theme
--- <theme>. Both run in a floating terminal so sudo can prompt.
---
-Name = "omarchyunlocks"
-NamePretty = "Omarchy Unlocks"
-HideFromProviderlist = true
-FixedOrder = true
-
-local function file_exists(path)
-  local f = io.open(path, "r")
-  if f then
-    f:close()
-    return true
-  end
-  return false
-end
-
-local function shell_escape(s)
-  return "'" .. s:gsub("'", "'\\''") .. "'"
-end
-
-function GetEntries()
-  local entries = {}
-  local home = os.getenv("HOME")
-  local user_themes_dir = home .. "/.config/omarchy/themes"
-  local omarchy_path = os.getenv("OMARCHY_PATH") or ""
-  local default_themes_dir = omarchy_path .. "/themes"
-  local default_preview = omarchy_path .. "/default/plymouth/preview-unlock.png"
-
-  local seen_themes = {}
-
-  local function process_themes_from_dir(themes_dir)
-    local handle = io.popen("find -L '" .. themes_dir .. "' -mindepth 1 -maxdepth 1 -type d 2>/dev/null")
-    if not handle then
-      return
-    end
-
-    for theme_path in handle:lines() do
-      local theme_name = theme_path:match(".*/(.+)$")
-
-      if theme_name and not seen_themes[theme_name] then
-        seen_themes[theme_name] = true
-
-        local preview_path = theme_path .. "/preview-unlock.png"
-
-        if file_exists(preview_path) then
-          local display_name = theme_name:gsub("_", " "):gsub("%-", " ")
-          display_name = display_name:gsub("(%a)([%w_']*)", function(first, rest)
-            return first:upper() .. rest:lower()
-          end)
-          display_name = display_name .. "  "
-
-          table.insert(entries, {
-            Text = display_name,
-            Preview = preview_path,
-            PreviewType = "file",
-            Actions = {
-              activate = "omarchy-launch-floating-terminal-with-presentation "
-                .. shell_escape("omarchy-plymouth-set-by-theme " .. shell_escape(theme_name)),
-            },
-          })
-        end
-      end
-    end
-
-    handle:close()
-  end
-
-  process_themes_from_dir(user_themes_dir)
-  process_themes_from_dir(default_themes_dir)
-
-  -- Default entry last — restores the shipped Plymouth.
-  local default_entry = {
-    Text = "Default  ",
-    Actions = {
-      activate = "omarchy-launch-floating-terminal-with-presentation "
-        .. shell_escape("omarchy-plymouth-reset"),
-    },
-  }
-  if file_exists(default_preview) then
-    default_entry.Preview = default_preview
-    default_entry.PreviewType = "file"
-  end
-  table.insert(entries, default_entry)
-
-  return entries
-end
diff --git a/config/environment.d/fcitx.conf b/default/environment.d/10-omarchy-fcitx.conf
similarity index 100%
rename from config/environment.d/fcitx.conf
rename to default/environment.d/10-omarchy-fcitx.conf
diff --git a/config/fontconfig/fonts.conf b/default/fontconfig/conf.avail/50-omarchy.conf
similarity index 88%
rename from config/fontconfig/fonts.conf
rename to default/fontconfig/conf.avail/50-omarchy.conf
index 2d873761..80317901 100644
--- a/config/fontconfig/fonts.conf
+++ b/default/fontconfig/conf.avail/50-omarchy.conf
@@ -56,9 +56,18 @@
     </prefer>
   </alias>
 
+  <alias>
+    <family>Liberation Sans</family>
+    <accept>
+      <family>JetBrainsMono Nerd Font</family>
+      <family>Noto Color Emoji</family>
+    </accept>
+  </alias>
+
   <alias>
     <family>sans-serif</family>
     <accept>
+      <family>JetBrainsMono Nerd Font</family>
       <family>Noto Color Emoji</family>
     </accept>
   </alias>
diff --git a/config/omarchy.ttf b/default/fonts/omarchy/omarchy.ttf
similarity index 100%
rename from config/omarchy.ttf
rename to default/fonts/omarchy/omarchy.ttf
diff --git a/default/hypr/apps.conf b/default/hypr/apps.conf
deleted file mode 100644
index f64c6e39..00000000
--- a/default/hypr/apps.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# App-specific tweaks
-source = ~/.local/share/omarchy/default/hypr/apps/1password.conf
-source = ~/.local/share/omarchy/default/hypr/apps/bitwarden.conf
-source = ~/.local/share/omarchy/default/hypr/apps/browser.conf
-source = ~/.local/share/omarchy/default/hypr/apps/hyprshot.conf
-source = ~/.local/share/omarchy/default/hypr/apps/jetbrains.conf
-source = ~/.local/share/omarchy/default/hypr/apps/localsend.conf
-source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
-source = ~/.local/share/omarchy/default/hypr/apps/qemu.conf
-source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf
-source = ~/.local/share/omarchy/default/hypr/apps/steam.conf
-source = ~/.local/share/omarchy/default/hypr/apps/geforce.conf
-source = ~/.local/share/omarchy/default/hypr/apps/moonlight.conf
-source = ~/.local/share/omarchy/default/hypr/apps/system.conf
-source = ~/.local/share/omarchy/default/hypr/apps/telegram.conf
-source = ~/.local/share/omarchy/default/hypr/apps/typora.conf
-source = ~/.local/share/omarchy/default/hypr/apps/terminals.conf
-source = ~/.local/share/omarchy/default/hypr/apps/walker.conf
-source = ~/.local/share/omarchy/default/hypr/apps/webcam-overlay.conf
diff --git a/default/hypr/apps.lua b/default/hypr/apps.lua
new file mode 100644
index 00000000..c2301594
--- /dev/null
+++ b/default/hypr/apps.lua
@@ -0,0 +1,5 @@
+-- App-specific tweaks.
+local paths = require("default.hypr.paths")
+local require_all = require("default.hypr.require_all")
+
+require_all.files(paths.omarchy_path .. "/default/hypr/apps", "default.hypr.apps")
diff --git a/default/hypr/apps/1password.conf b/default/hypr/apps/1password.conf
deleted file mode 100644
index a666430c..00000000
--- a/default/hypr/apps/1password.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-windowrule = no_screen_share on, match:class ^(1[p|P]assword)$
-windowrule = tag +floating-window, match:class ^(1[p|P]assword)$
diff --git a/default/hypr/apps/1password.lua b/default/hypr/apps/1password.lua
new file mode 100644
index 00000000..d57bf651
--- /dev/null
+++ b/default/hypr/apps/1password.lua
@@ -0,0 +1 @@
+o.window("^(1[p|P]assword)$", { no_screen_share = true, tag = "+floating-window" })
diff --git a/default/hypr/apps/battlenet.lua b/default/hypr/apps/battlenet.lua
new file mode 100644
index 00000000..13231d07
--- /dev/null
+++ b/default/hypr/apps/battlenet.lua
@@ -0,0 +1,16 @@
+-- Battle.net launches under Proton; all its windows share class steam_app_battlenet.
+
+-- The actual launcher: float-centered.
+o.window({ class = "^steam_app_battlenet$", title = "^Battle\\.net$" }, {
+  float = true,
+  center = true,
+  size = { 1280, 800 },
+})
+
+-- Installer: drop decorations and backdrop blur/shadow so the Blizzard chrome
+-- isn't framed by the WM.
+o.window({ class = "^steam_app_battlenet$", title = "^Battle\\.net Setup$" }, {
+  decorate = false,
+  no_blur = true,
+  no_shadow = true,
+})
diff --git a/default/hypr/apps/bitwarden.conf b/default/hypr/apps/bitwarden.conf
deleted file mode 100644
index 8ffb5688..00000000
--- a/default/hypr/apps/bitwarden.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-windowrule = no_screen_share on, match:class ^(Bitwarden)$
-windowrule = tag +floating-window, match:class ^(Bitwarden)$
-
-# Bitwarden Chrome Extension
-windowrule = no_screen_share on, match:class chrome-nngceckbapebfimnlniiiahkandclblb-Default
-windowrule = tag +floating-window, match:class chrome-nngceckbapebfimnlniiiahkandclblb-Default
diff --git a/default/hypr/apps/bitwarden.lua b/default/hypr/apps/bitwarden.lua
new file mode 100644
index 00000000..ec2e7bf6
--- /dev/null
+++ b/default/hypr/apps/bitwarden.lua
@@ -0,0 +1,6 @@
+o.window("^(Bitwarden)$", { no_screen_share = true, tag = "+floating-window" })
+
+o.window("chrome-nngceckbapebfimnlniiiahkandclblb-Default", {
+  no_screen_share = true,
+  tag = "+floating-window",
+})
diff --git a/default/hypr/apps/browser.conf b/default/hypr/apps/browser.conf
deleted file mode 100644
index 53acc6df..00000000
--- a/default/hypr/apps/browser.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Browser types
-windowrule = tag +chromium-based-browser, match:class ((google-)?[cC]hrom(e|ium)|[bB]rave-browser|[mM]icrosoft-edge|Vivaldi-stable|helium)
-windowrule = tag +firefox-based-browser, match:class ([fF]irefox|zen|librewolf)
-windowrule = tag -default-opacity, match:tag chromium-based-browser
-windowrule = tag -default-opacity, match:tag firefox-based-browser
-
-# Video apps: remove chromium browser tag so they don't get opacity applied
-windowrule = tag -chromium-based-browser, match:class (chrome-youtube.com__-Default|chrome-app.zoom.us__wc_home-Default)
-windowrule = tag -default-opacity, match:class (chrome-youtube.com__-Default|chrome-app.zoom.us__wc_home-Default)
-
-# Force chromium-based browsers into a tile to deal with --app bug
-windowrule = tile on, match:tag chromium-based-browser
-
-# Only a subtle opacity change, but not for video sites
-windowrule = opacity 1.0 0.97, match:tag chromium-based-browser
-windowrule = opacity 1.0 0.97, match:tag firefox-based-browser
-
-# Hide the screen-sharing notification bar (the "Hide" button on it is broken on Wayland)
-windowrule = workspace special silent, match:title .*is sharing.*
diff --git a/default/hypr/apps/browser.lua b/default/hypr/apps/browser.lua
new file mode 100644
index 00000000..06bb1905
--- /dev/null
+++ b/default/hypr/apps/browser.lua
@@ -0,0 +1,12 @@
+-- Browser tags and styling.
+o.window("((google-)?[cC]hrom(e|ium)|[bB]rave-browser|[mM]icrosoft-edge|Vivaldi-stable|helium)", { tag = "+chromium-based-browser" })
+o.window("([fF]irefox|zen|librewolf)", { tag = "+firefox-based-browser" })
+o.window({ tag = "chromium-based-browser" }, { tag = "-default-opacity", tile = true, opacity = "1.0 0.97" })
+o.window({ tag = "firefox-based-browser" }, { tag = "-default-opacity", opacity = "1.0 0.97" })
+
+-- Video apps: remove chromium browser tag so they don't get opacity applied.
+o.window("(chrome-youtube.com__-Default|chrome-app.zoom.us__wc_home-Default)", { tag = "-chromium-based-browser" })
+o.window("(chrome-youtube.com__-Default|chrome-app.zoom.us__wc_home-Default)", { tag = "-default-opacity" })
+
+-- Hide screen sharing notification windows.
+o.window({ title = ".*is sharing.*" }, { workspace = "special silent" })
diff --git a/default/hypr/apps/davinci-resolve.conf b/default/hypr/apps/davinci-resolve.conf
deleted file mode 100644
index 9067fdf6..00000000
--- a/default/hypr/apps/davinci-resolve.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Focus floating DaVinci Resolve dialog windows
-windowrule = stay_focused on, match:class .*[Rr]esolve.*, match:float 1
diff --git a/default/hypr/apps/davinci-resolve.lua b/default/hypr/apps/davinci-resolve.lua
new file mode 100644
index 00000000..ba81e12c
--- /dev/null
+++ b/default/hypr/apps/davinci-resolve.lua
@@ -0,0 +1,2 @@
+-- DaVinci Resolve dialog focus handling.
+o.window(".*[Rr]esolve.*", { float = true, stay_focused = true })
diff --git a/default/hypr/apps/geforce.conf b/default/hypr/apps/geforce.conf
deleted file mode 100644
index fb2e5a30..00000000
--- a/default/hypr/apps/geforce.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-windowrule {
-  name = geforce
-  match:class = GeForceNOW
-  idle_inhibit = fullscreen
-}
diff --git a/default/hypr/apps/geforce.lua b/default/hypr/apps/geforce.lua
new file mode 100644
index 00000000..d89db006
--- /dev/null
+++ b/default/hypr/apps/geforce.lua
@@ -0,0 +1 @@
+o.window("GeForceNOW", { idle_inhibit = "fullscreen" })
diff --git a/default/hypr/apps/hyprshot.conf b/default/hypr/apps/hyprshot.conf
deleted file mode 100644
index 795ac396..00000000
--- a/default/hypr/apps/hyprshot.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Remove 1px border around hyprshot screenshots
-layerrule = no_anim on, match:namespace selection
diff --git a/default/hypr/apps/hyprshot.lua b/default/hypr/apps/hyprshot.lua
new file mode 100644
index 00000000..dde19803
--- /dev/null
+++ b/default/hypr/apps/hyprshot.lua
@@ -0,0 +1,2 @@
+-- Remove 1px border around hyprshot screenshots.
+hl.layer_rule({ match = { namespace = "selection" }, no_anim = true, animation = "none" })
diff --git a/default/hypr/apps/jetbrains.conf b/default/hypr/apps/jetbrains.conf
deleted file mode 100644
index b1eea6a0..00000000
--- a/default/hypr/apps/jetbrains.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Disable mouse focus (see https://github.com/basecamp/omarchy/pull/5183#issuecomment-4189299971)
-windowrule {
-    name = jetbrains-focus
-    no_follow_mouse = on
-    match:class = ^(jetbrains-.*)$
-}
diff --git a/default/hypr/apps/jetbrains.lua b/default/hypr/apps/jetbrains.lua
new file mode 100644
index 00000000..678e823e
--- /dev/null
+++ b/default/hypr/apps/jetbrains.lua
@@ -0,0 +1,2 @@
+-- Disable mouse focus (see https://github.com/basecamp/omarchy/pull/5183#issuecomment-4189299971).
+o.window("^(jetbrains-.*)$", { no_follow_mouse = true })
diff --git a/default/hypr/apps/localsend.conf b/default/hypr/apps/localsend.conf
deleted file mode 100644
index c4f6a552..00000000
--- a/default/hypr/apps/localsend.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Float LocalSend and fzf file picker
-windowrule = float on, match:class (Share|localsend)
-windowrule = center on, match:class (Share|localsend)
-windowrule = size 1100 700, match:class localsend
diff --git a/default/hypr/apps/localsend.lua b/default/hypr/apps/localsend.lua
new file mode 100644
index 00000000..6e7ec132
--- /dev/null
+++ b/default/hypr/apps/localsend.lua
@@ -0,0 +1,3 @@
+-- Float LocalSend and fzf file picker.
+o.window("(Share|localsend)", { float = true, center = true })
+o.window("localsend", { size = { 1100, 700 } })
diff --git a/default/hypr/apps/moonlight.conf b/default/hypr/apps/moonlight.conf
deleted file mode 100644
index 271a11c1..00000000
--- a/default/hypr/apps/moonlight.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-windowrule {
-  name = moonlight
-  match:class = com.moonlight_stream.Moonlight
-  fullscreen = 1
-  idle_inhibit = fullscreen
-}
diff --git a/default/hypr/apps/moonlight.lua b/default/hypr/apps/moonlight.lua
new file mode 100644
index 00000000..d7f3489e
--- /dev/null
+++ b/default/hypr/apps/moonlight.lua
@@ -0,0 +1 @@
+o.window("com.moonlight_stream.Moonlight", { fullscreen = true, idle_inhibit = "fullscreen" })
diff --git a/default/hypr/apps/omarchy-shell.lua b/default/hypr/apps/omarchy-shell.lua
new file mode 100644
index 00000000..efdbc351
--- /dev/null
+++ b/default/hypr/apps/omarchy-shell.lua
@@ -0,0 +1,14 @@
+-- Window and layer rules for the Omarchy Quickshell surfaces. The
+-- shell-wide bar / menu / popouts are layer-shell.
+
+-- Keep the bar instant: no layer-shell fade/slide animation.
+hl.layer_rule({ match = { namespace = "omarchy-bar" }, no_anim = true, animation = "none" })
+
+-- Launcher, image selector, emojis, clipboard overlays, and keyboard-driven
+-- panels should pop without compositor layer fades. Panels keep their own
+-- QML opacity transition for normal open/close, and skip it for panel handoff.
+hl.layer_rule({ match = { namespace = "^(omarchy-menu|omarchy-launcher|omarchy-image-selector|omarchy-emojis|omarchy-clipboard|omarchy-keyboard-panel)$" }, no_anim = true, animation = "none" })
+
+-- Dev gallery is the main shell workbench; open it maximized like
+-- SUPER+ALT+F so component previews have the whole workspace.
+o.window({ class = "^org.quickshell$", title = "^Omarchy shell – dev gallery$" }, { maximize = true })
diff --git a/default/hypr/apps/pip.conf b/default/hypr/apps/pip.conf
deleted file mode 100644
index 417edc91..00000000
--- a/default/hypr/apps/pip.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Picture-in-picture overlays
-windowrule = tag +pip, match:title (Picture.?in.?[Pp]icture)
-windowrule = tag -default-opacity, match:tag pip
-windowrule = float on, match:tag pip
-windowrule = pin on, match:tag pip
-windowrule = size 600 338, match:tag pip
-windowrule = keep_aspect_ratio on, match:tag pip
-windowrule = border_size 0, match:tag pip
-windowrule = opacity 1 1, match:tag pip
-windowrule = move (monitor_w-window_w-40) (monitor_h*0.04), match:tag pip
diff --git a/default/hypr/apps/pip.lua b/default/hypr/apps/pip.lua
new file mode 100644
index 00000000..791152da
--- /dev/null
+++ b/default/hypr/apps/pip.lua
@@ -0,0 +1,24 @@
+-- Picture-in-picture overlays.
+o.window({ title = "(Picture.?in.?[Pp]icture)" }, { tag = "+pip" })
+o.window({ tag = "pip" }, {
+  tag = "-default-opacity",
+  float = true,
+  pin = true,
+  size = { 600, 338 },
+  keep_aspect_ratio = true,
+  border_size = 0,
+  opacity = "1 1",
+  move = { "(monitor_w-window_w-40)", "(monitor_h*0.04)" },
+})
+
+-- Google Meet PiP uses the meeting title instead of "Picture-in-Picture".
+o.window({ tag = "chromium-based-browser", title = "^Meet - .+" }, {
+  tag = "-default-opacity",
+  float = true,
+  pin = true,
+  size = { 600, 338 },
+  keep_aspect_ratio = true,
+  border_size = 0,
+  opacity = "1 1",
+  move = { "(monitor_w-window_w-40)", "(monitor_h-window_h-40)" },
+})
diff --git a/default/hypr/apps/qemu.conf b/default/hypr/apps/qemu.conf
deleted file mode 100644
index 6dcce0e0..00000000
--- a/default/hypr/apps/qemu.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-windowrule = tag -default-opacity, match:class qemu
-windowrule = opacity 1 1, match:class qemu
diff --git a/default/hypr/apps/qemu.lua b/default/hypr/apps/qemu.lua
new file mode 100644
index 00000000..c919bcec
--- /dev/null
+++ b/default/hypr/apps/qemu.lua
@@ -0,0 +1 @@
+o.window("qemu", { tag = "-default-opacity", opacity = "1 1" })
diff --git a/default/hypr/apps/retroarch.conf b/default/hypr/apps/retroarch.conf
deleted file mode 100644
index 556f0fd8..00000000
--- a/default/hypr/apps/retroarch.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-windowrule = fullscreen on, match:class com.libretro.RetroArch
-windowrule = tag -default-opacity, match:class com.libretro.RetroArch
-windowrule = opacity 1 1, match:class com.libretro.RetroArch
-windowrule = idle_inhibit fullscreen, match:class com.libretro.RetroArch
diff --git a/default/hypr/apps/retroarch.lua b/default/hypr/apps/retroarch.lua
new file mode 100644
index 00000000..0bc8a218
--- /dev/null
+++ b/default/hypr/apps/retroarch.lua
@@ -0,0 +1,6 @@
+o.window("com.libretro.RetroArch", {
+  fullscreen = true,
+  tag = "-default-opacity",
+  opacity = "1 1",
+  idle_inhibit = "fullscreen",
+})
diff --git a/default/hypr/apps/steam.conf b/default/hypr/apps/steam.conf
deleted file mode 100644
index a42a6e68..00000000
--- a/default/hypr/apps/steam.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Float Steam
-windowrule = float on, match:class steam
-windowrule = center on, match:class steam, match:title Steam
-windowrule = tag -default-opacity, match:class steam.*
-windowrule = opacity 1 1, match:class steam.*
-windowrule = size 1100 700, match:class steam, match:title Steam
-windowrule = size 460 800, match:class steam, match:title Friends List
-windowrule = idle_inhibit fullscreen, match:class steam
diff --git a/default/hypr/apps/steam.lua b/default/hypr/apps/steam.lua
new file mode 100644
index 00000000..152aff64
--- /dev/null
+++ b/default/hypr/apps/steam.lua
@@ -0,0 +1,4 @@
+o.window("steam", { float = true, idle_inhibit = "fullscreen" })
+o.window({ class = "steam", title = "Steam" }, { center = true, size = { 1100, 700 } })
+o.window("steam.*", { tag = "-default-opacity", opacity = "1 1" })
+o.window({ class = "steam", title = "Friends List" }, { size = { 460, 800 } })
diff --git a/default/hypr/apps/system.conf b/default/hypr/apps/system.conf
deleted file mode 100644
index 6f82aa35..00000000
--- a/default/hypr/apps/system.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Floating windows
-windowrule = float on, match:tag floating-window
-windowrule = center on, match:tag floating-window
-windowrule = size 875 600, match:tag floating-window
-
-windowrule = tag +floating-window, match:class (org.omarchy.bluetui|org.omarchy.impala|org.omarchy.wiremix|org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.codeberg.dnkl.foot|org.gnome.NautilusPreviewer|org.gnome.Evince|com.gabm.satty|Omarchy|About|TUI.float|imv|mpv)
-windowrule = tag +floating-window, match:class (xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), match:title ^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)
-windowrule = float on, match:class org.gnome.Calculator
-
-# Fullscreen screensaver
-windowrule = fullscreen on, match:class org.omarchy.screensaver
-windowrule = float on, match:class org.omarchy.screensaver
-windowrule = animation slide, match:class org.omarchy.screensaver
-
-# No transparency on media windows
-windowrule = tag -default-opacity, match:class ^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
-windowrule = opacity 1 1, match:class ^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
-
-# Popped window rounding
-windowrule = rounding 8, match:tag pop
-
-# Prevent idle while open
-windowrule = idle_inhibit always, match:tag noidle
diff --git a/default/hypr/apps/system.lua b/default/hypr/apps/system.lua
new file mode 100644
index 00000000..77380582
--- /dev/null
+++ b/default/hypr/apps/system.lua
@@ -0,0 +1,35 @@
+-- Floating windows.
+o.window({ tag = "floating-window" }, { float = true })
+o.window({ tag = "floating-window" }, { center = true })
+o.window({ tag = "floating-window" }, { size = { 875, 600 } })
+
+o.window("(org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.codeberg.dnkl.foot|org.gnome.NautilusPreviewer|org.gnome.Evince|com.gabm.satty|Omarchy|About|TUI.float|imv|mpv)", {
+  tag = "+floating-window",
+})
+o.window(
+  {
+    class = "(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus)",
+    title = "^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)",
+  },
+  { tag = "+floating-window" }
+)
+o.window("org.gnome.Calculator", { float = true })
+
+-- Fullscreen screensaver.
+o.window("org.omarchy.screensaver", { fullscreen = true })
+o.window("org.omarchy.screensaver", { float = true })
+o.window("org.omarchy.screensaver", { animation = "slide" })
+
+-- No transparency on media windows.
+o.window("^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$", {
+  tag = "-default-opacity",
+})
+o.window("^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$", {
+  opacity = "1 1",
+})
+
+-- Popped window rounding.
+o.window({ tag = "pop" }, { rounding = 8 })
+
+-- Prevent idle while open.
+o.window({ tag = "noidle" }, { idle_inhibit = "always" })
diff --git a/default/hypr/apps/telegram.conf b/default/hypr/apps/telegram.conf
deleted file mode 100644
index 5a621fdb..00000000
--- a/default/hypr/apps/telegram.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Prevent Telegram from stealing focus on new messages
-windowrule = focus_on_activate off, match:class org.telegram.desktop
diff --git a/default/hypr/apps/telegram.lua b/default/hypr/apps/telegram.lua
new file mode 100644
index 00000000..ff0f03a6
--- /dev/null
+++ b/default/hypr/apps/telegram.lua
@@ -0,0 +1,2 @@
+-- Prevent Telegram from stealing focus on new messages.
+o.window("org.telegram.desktop", { focus_on_activate = false })
diff --git a/default/hypr/apps/terminals.conf b/default/hypr/apps/terminals.conf
deleted file mode 100644
index b4940720..00000000
--- a/default/hypr/apps/terminals.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Define terminal tag to style them uniformly
-windowrule = tag +terminal, match:class (Alacritty|kitty|com.mitchellh.ghostty|foot)
-windowrule = tag -default-opacity, match:tag terminal
-windowrule = opacity 0.97 0.9, match:tag terminal
diff --git a/default/hypr/apps/terminals.lua b/default/hypr/apps/terminals.lua
new file mode 100644
index 00000000..85629187
--- /dev/null
+++ b/default/hypr/apps/terminals.lua
@@ -0,0 +1,3 @@
+-- Define terminal tag to style them uniformly.
+o.window("(Alacritty|kitty|com.mitchellh.ghostty|foot|wezterm)", { tag = "+terminal" })
+o.window({ tag = "terminal" }, { tag = "-default-opacity", opacity = "0.97 0.9" })
diff --git a/default/hypr/apps/typora.conf b/default/hypr/apps/typora.conf
deleted file mode 100644
index 873c82e6..00000000
--- a/default/hypr/apps/typora.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Float Typora print dialog
-windowrule = match:class ^Typora$, match:title ^Print$, float on, center on
diff --git a/default/hypr/apps/typora.lua b/default/hypr/apps/typora.lua
new file mode 100644
index 00000000..4249db4c
--- /dev/null
+++ b/default/hypr/apps/typora.lua
@@ -0,0 +1,2 @@
+-- Typora print dialog.
+o.window({ class = "^Typora$", title = "^Print$" }, { float = true, center = true })
diff --git a/default/hypr/apps/walker.conf b/default/hypr/apps/walker.conf
deleted file mode 100644
index 127e3b42..00000000
--- a/default/hypr/apps/walker.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Application-specific animation
-layerrule = no_anim on, match:namespace walker
diff --git a/default/hypr/apps/webcam-overlay.conf b/default/hypr/apps/webcam-overlay.conf
deleted file mode 100644
index 307d6864..00000000
--- a/default/hypr/apps/webcam-overlay.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Webcam overlay for screen recording
-windowrule = float on, match:title WebcamOverlay
-windowrule = pin on, match:title WebcamOverlay
-windowrule = no_initial_focus on, match:title WebcamOverlay
-windowrule = no_dim on, match:title WebcamOverlay
-windowrule = move (monitor_w-window_w-40) (monitor_h-window_h-40), match:title WebcamOverlay
diff --git a/default/hypr/apps/webcam-overlay.lua b/default/hypr/apps/webcam-overlay.lua
new file mode 100644
index 00000000..4e0ce501
--- /dev/null
+++ b/default/hypr/apps/webcam-overlay.lua
@@ -0,0 +1,10 @@
+-- Webcam overlay window.
+o.window({ title = "WebcamOverlay" }, {
+  tag = "-default-opacity",
+  float = true,
+  pin = true,
+  no_initial_focus = true,
+  no_dim = true,
+  opacity = "1 1",
+  move = { "(monitor_w-window_w-40)", "(monitor_h-window_h-40)" },
+})
diff --git a/default/hypr/autostart.conf b/default/hypr/autostart.conf
deleted file mode 100644
index 0a226db1..00000000
--- a/default/hypr/autostart.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-exec-once = uwsm-app -- hypridle
-exec-once = uwsm-app -- mako
-exec-once = ! omarchy-toggle-enabled waybar-off && uwsm-app -- waybar
-exec-once = uwsm-app -- fcitx5 --disable notificationitem
-exec-once = uwsm-app -- swaybg -i ~/.config/omarchy/current/background -m fill
-exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec-once = omarchy-first-run
-exec-once = omarchy-powerprofiles-init
-exec-once = uwsm-app -- omarchy-hyprland-monitor-watch
-
-# Slow app launch fix -- set systemd vars
-exec-once = systemctl --user import-environment $(env | cut -d'=' -f 1)
-exec-once = dbus-update-activation-environment --systemd --all
-
-# Run post-boot hooks after startup config has loaded
-exec-once = sleep 2 && omarchy-hook post-boot
diff --git a/default/hypr/autostart.lua b/default/hypr/autostart.lua
new file mode 100644
index 00000000..a55ade89
--- /dev/null
+++ b/default/hypr/autostart.lua
@@ -0,0 +1,15 @@
+hl.on("hyprland.start", function()
+  -- Slow app launch fix -- set systemd vars before starting session services.
+  hl.exec_cmd("systemctl --user import-environment $(env | cut -d'=' -f 1)")
+  hl.exec_cmd("dbus-update-activation-environment --systemd --all")
+
+  hl.exec_cmd("quickshell -n -p $OMARCHY_PATH/shell")
+  hl.exec_cmd(o.launch("fcitx5 --disable notificationitem"))
+  hl.exec_cmd("omarchy-first-run")
+  hl.exec_cmd("omarchy-powerprofiles-init")
+  hl.exec_cmd(o.launch("omarchy-hyprland-monitor-watch"))
+  hl.exec_cmd(o.launch("udiskie --automount --notify --no-tray"))
+
+  -- Run post-boot hooks after startup config has loaded.
+  hl.exec_cmd("sleep 2 && omarchy-hook post-boot")
+end)
diff --git a/default/hypr/bindings.conf b/default/hypr/bindings.conf
deleted file mode 100644
index 4daf95a0..00000000
--- a/default/hypr/bindings.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Deprecated bindings file. New installations include everything directly.
-
-bindd = SUPER, RETURN, Terminal, exec, $terminal
-bindd = SUPER, F, File manager, exec, $fileManager
-bindd = SUPER, B, Web browser, exec, $browser
-bindd = SUPER, M, Music player, exec, $music
-bindd = SUPER, N, Neovim, exec, $terminal -e nvim
-bindd = SUPER, T, Top, exec, $terminal -e btop
-bindd = SUPER, D, Lazy Docker, exec, $terminal -e lazydocker
-bindd = SUPER, G, Messenger, exec, $messenger
-bindd = SUPER, O, Obsidian, exec, obsidian
-bindd = SUPER, SLASH, Password manager, exec, $passwordManager
-
-source = ~/.local/share/omarchy/default/hypr/bindings/media.conf
-source = ~/.local/share/omarchy/default/hypr/bindings/tiling.conf
-source = ~/.local/share/omarchy/default/hypr/bindings/utilities.conf
diff --git a/default/hypr/bindings.lua b/default/hypr/bindings.lua
new file mode 100644
index 00000000..405d8449
--- /dev/null
+++ b/default/hypr/bindings.lua
@@ -0,0 +1,4 @@
+local paths = require("default.hypr.paths")
+local require_all = require("default.hypr.require_all")
+
+require_all.files(paths.omarchy_path .. "/default/hypr/bindings", "default.hypr.bindings")
diff --git a/default/hypr/bindings/clipboard.conf b/default/hypr/bindings/clipboard.conf
deleted file mode 100644
index 214d2586..00000000
--- a/default/hypr/bindings/clipboard.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copy / Paste
-bindd = SUPER, C, Universal copy, sendshortcut, CTRL, Insert, activewindow
-bindd = SUPER, V, Universal paste, sendshortcut, SHIFT, Insert, activewindow
-bindd = SUPER, X, Universal cut, sendshortcut, CTRL, X, activewindow
-bindd = SUPER CTRL, V, Clipboard manager, exec, omarchy-launch-walker -m clipboard
diff --git a/default/hypr/bindings/clipboard.lua b/default/hypr/bindings/clipboard.lua
new file mode 100644
index 00000000..10a2f6df
--- /dev/null
+++ b/default/hypr/bindings/clipboard.lua
@@ -0,0 +1,43 @@
+-- Work around Hyprland send_shortcut sometimes leaving synthetic key state stuck/repeating.
+-- https://github.com/hyprwm/Hyprland/discussions/14099
+local function send_shortcut_once(mods, key)
+  return function()
+    hl.dispatch(hl.dsp.send_key_state({ mods = mods, key = key, state = "down", window = "activewindow" }))
+
+    hl.timer(function()
+      hl.dispatch(hl.dsp.send_key_state({ mods = mods, key = key, state = "up", window = "activewindow" }))
+    end, { timeout = 50, type = "oneshot" })
+  end
+end
+
+local terminal_classes = {
+  alacritty = true,
+  ["com.mitchellh.ghostty"] = true,
+  foot = true,
+  kitty = true,
+  wezterm = true,
+}
+
+local function active_window_is_terminal()
+  local window = hl.get_active_window()
+  if not window or not window.class then
+    return false
+  end
+
+  return terminal_classes[window.class:lower()] == true
+end
+
+local function universal_clipboard_shortcut(default_mods, default_key, terminal_mods, terminal_key)
+  return function()
+    if active_window_is_terminal() then
+      send_shortcut_once(terminal_mods, terminal_key)()
+    else
+      send_shortcut_once(default_mods, default_key)()
+    end
+  end
+end
+
+o.bind("SUPER + C", "Universal copy", universal_clipboard_shortcut("CTRL", "C", "CTRL", "Insert"))
+o.bind("SUPER + V", "Universal paste", universal_clipboard_shortcut("CTRL", "V", "SHIFT", "Insert"))
+o.bind("SUPER + X", "Universal cut", send_shortcut_once("CTRL", "X"))
+o.bind("SUPER + CTRL + V", "Clipboard manager", "omarchy-shell shell toggle omarchy.clipboard")
diff --git a/default/hypr/bindings/media.conf b/default/hypr/bindings/media.conf
deleted file mode 100644
index d18f5aa5..00000000
--- a/default/hypr/bindings/media.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# Laptop multimedia keys for volume and LCD brightness (with OSD)
-bindeld = ,XF86AudioRaiseVolume, Volume up, exec, omarchy-swayosd-client --output-volume raise
-bindeld = ,XF86AudioLowerVolume, Volume down, exec, omarchy-swayosd-client --output-volume lower
-bindeld = ,XF86AudioMute, Mute, exec, omarchy-swayosd-client --output-volume mute-toggle
-bindeld = ,XF86AudioMicMute, Mute microphone, exec, omarchy-audio-input-mute
-bindeld = ,XF86MonBrightnessUp, Brightness up, exec, omarchy-brightness-display +5%
-bindeld = ,XF86MonBrightnessDown, Brightness down, exec, omarchy-brightness-display 5%-
-bindeld = SHIFT, XF86MonBrightnessUp, Brightness maximum, exec, omarchy-brightness-display 100%
-bindeld = SHIFT, XF86MonBrightnessDown, Brightness minimum, exec, omarchy-brightness-display 1%
-bindeld = ,XF86KbdBrightnessUp, Keyboard brightness up, exec, omarchy-brightness-keyboard up
-bindeld = ,XF86KbdBrightnessDown, Keyboard brightness down, exec, omarchy-brightness-keyboard down
-bindld = ,XF86KbdLightOnOff, Keyboard backlight cycle, exec, omarchy-brightness-keyboard cycle
-bindld = ,XF86TouchpadToggle, Toggle touchpad, exec, omarchy-toggle-touchpad
-bindld = ,XF86TouchpadOn, Enable touchpad, exec, omarchy-toggle-touchpad on
-bindld = ,XF86TouchpadOff, Disable touchpad, exec, omarchy-toggle-touchpad off
-
-# Precise 1% multimedia adjustments with Alt modifier
-bindeld = ALT, XF86AudioRaiseVolume, Volume up precise, exec, omarchy-swayosd-client --output-volume +1
-bindeld = ALT, XF86AudioLowerVolume, Volume down precise, exec, omarchy-swayosd-client --output-volume -1
-bindeld = ALT, XF86MonBrightnessUp, Brightness up precise, exec, omarchy-brightness-display +1%
-bindeld = ALT, XF86MonBrightnessDown, Brightness down precise, exec, omarchy-brightness-display 1%-
-
-# Requires playerctl
-bindld = , XF86AudioNext, Next track, exec, omarchy-swayosd-client --playerctl next
-bindld = , XF86AudioPause, Pause, exec, omarchy-swayosd-client --playerctl play-pause
-bindld = , XF86AudioPlay, Play, exec, omarchy-swayosd-client --playerctl play-pause
-bindld = , XF86AudioPrev, Previous track, exec, omarchy-swayosd-client --playerctl previous
-
-# Switch audio output with Super + Mute
-bindld = SUPER, XF86AudioMute, Switch audio output, exec, omarchy-audio-output-switch
diff --git a/default/hypr/bindings/media.lua b/default/hypr/bindings/media.lua
new file mode 100644
index 00000000..a75392de
--- /dev/null
+++ b/default/hypr/bindings/media.lua
@@ -0,0 +1,31 @@
+-- Volume, brightness, keyboard backlight, and touchpad controls.
+o.bind("XF86AudioRaiseVolume", "Volume up", "omarchy-audio-output-volume raise", { locked = true, repeating = true })
+o.bind("XF86AudioLowerVolume", "Volume down", "omarchy-audio-output-volume lower", { locked = true, repeating = true })
+o.bind("XF86AudioMute", "Mute", "omarchy-audio-output-volume mute-toggle", { locked = true })
+o.bind("XF86AudioMicMute", "Mute microphone", "omarchy-audio-input-mute", { locked = true })
+o.bind("XF86MonBrightnessUp", "Brightness up", "omarchy-brightness-display +5%", { locked = true, repeating = true })
+o.bind("XF86MonBrightnessDown", "Brightness down", "omarchy-brightness-display 5%-", { locked = true, repeating = true })
+o.bind("SHIFT + XF86MonBrightnessUp", "Brightness maximum", "omarchy-brightness-display 100%", { locked = true, repeating = true })
+o.bind("SHIFT + XF86MonBrightnessDown", "Brightness minimum", "omarchy-brightness-display 1%", { locked = true, repeating = true })
+o.bind("XF86KbdBrightnessUp", "Keyboard brightness up", "omarchy-brightness-keyboard up", { locked = true, repeating = true })
+o.bind("XF86KbdBrightnessDown", "Keyboard brightness down", "omarchy-brightness-keyboard down", { locked = true, repeating = true })
+o.bind("XF86KbdLightOnOff", "Keyboard backlight cycle", "omarchy-brightness-keyboard cycle", { locked = true })
+o.bind_toggle("XF86TouchpadToggle", "Toggle touchpad", "touchpad", { locked = true })
+o.bind("XF86TouchpadOn", "Enable touchpad", "omarchy-toggle-touchpad on", { locked = true })
+o.bind("XF86TouchpadOff", "Disable touchpad", "omarchy-toggle-touchpad off", { locked = true })
+
+-- Precise volume and brightness controls.
+o.bind("ALT + XF86AudioRaiseVolume", "Volume up precise", "omarchy-audio-output-volume +1", { locked = true, repeating = true })
+o.bind("ALT + XF86AudioLowerVolume", "Volume down precise", "omarchy-audio-output-volume -1", { locked = true, repeating = true })
+o.bind("ALT + XF86MonBrightnessUp", "Brightness up precise", "omarchy-brightness-display +1%", { locked = true, repeating = true })
+o.bind("ALT + XF86MonBrightnessDown", "Brightness down precise", "omarchy-brightness-display 1%-", { locked = true, repeating = true })
+
+-- Media controls.
+o.bind("XF86AudioNext", "Next track", "omarchy-shell media next", { locked = true })
+o.bind("XF86AudioPause", "Pause", "omarchy-shell media playPause", { locked = true })
+o.bind("XF86AudioPlay", "Play", "omarchy-shell media playPause", { locked = true })
+o.bind("XF86AudioPrev", "Previous track", "omarchy-shell media previous", { locked = true })
+
+o.bind("SHIFT + XF86AudioMute", "Switch audio output", "omarchy-audio-output-switch", { locked = true })
+o.bind("SHIFT + XF86AudioPause", "Switch media source", "omarchy-audio-source-switch", { locked = true })
+o.bind("SHIFT + XF86AudioPlay", "Switch media source", "omarchy-audio-source-switch", { locked = true })
diff --git a/default/hypr/bindings/tiling-v2.conf b/default/hypr/bindings/tiling-v2.conf
deleted file mode 100644
index cdb928c3..00000000
--- a/default/hypr/bindings/tiling-v2.conf
+++ /dev/null
@@ -1,133 +0,0 @@
-# Close windows
-bindd = SUPER, W, Close window, killactive,
-bindd = CTRL ALT, DELETE, Close all windows, exec, omarchy-hyprland-window-close-all
-
-# Control tiling
-bindd = SUPER, J, Toggle window split, layoutmsg, togglesplit
-bindd = SUPER, P, Pseudo window, pseudo, # dwindle
-bindd = SUPER, T, Toggle window floating/tiling, togglefloating,
-bindd = SUPER, F, Full screen, fullscreen, 0
-bindd = SUPER CTRL, F, Tiled full screen, fullscreenstate, 0 2
-bindd = SUPER ALT, F, Full width, fullscreen, 1
-bindd = SUPER, O, Pop window out (float & pin), exec, omarchy-hyprland-window-pop
-bindd = SUPER, L, Toggle workspace layout, exec, omarchy-hyprland-workspace-layout-toggle
-
-# Move focus with SUPER + arrow keys
-bindd = SUPER, LEFT, Focus on left window, movefocus, l
-bindd = SUPER, RIGHT, Focus on right window, movefocus, r
-bindd = SUPER, UP, Focus on above window, movefocus, u
-bindd = SUPER, DOWN, Focus on below window, movefocus, d
-
-# Switch workspaces with SUPER + [1-9; 0]
-bindd = SUPER, code:10, Switch to workspace 1, workspace, 1
-bindd = SUPER, code:11, Switch to workspace 2, workspace, 2
-bindd = SUPER, code:12, Switch to workspace 3, workspace, 3
-bindd = SUPER, code:13, Switch to workspace 4, workspace, 4
-bindd = SUPER, code:14, Switch to workspace 5, workspace, 5
-bindd = SUPER, code:15, Switch to workspace 6, workspace, 6
-bindd = SUPER, code:16, Switch to workspace 7, workspace, 7
-bindd = SUPER, code:17, Switch to workspace 8, workspace, 8
-bindd = SUPER, code:18, Switch to workspace 9, workspace, 9
-bindd = SUPER, code:19, Switch to workspace 10, workspace, 10
-
-# Move active window to a workspace with SUPER + SHIFT + [1-9; 0]
-bindd = SUPER SHIFT, code:10, Move window to workspace 1, movetoworkspace, 1
-bindd = SUPER SHIFT, code:11, Move window to workspace 2, movetoworkspace, 2
-bindd = SUPER SHIFT, code:12, Move window to workspace 3, movetoworkspace, 3
-bindd = SUPER SHIFT, code:13, Move window to workspace 4, movetoworkspace, 4
-bindd = SUPER SHIFT, code:14, Move window to workspace 5, movetoworkspace, 5
-bindd = SUPER SHIFT, code:15, Move window to workspace 6, movetoworkspace, 6
-bindd = SUPER SHIFT, code:16, Move window to workspace 7, movetoworkspace, 7
-bindd = SUPER SHIFT, code:17, Move window to workspace 8, movetoworkspace, 8
-bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9
-bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10
-
-# Move active window silently to a workspace with SUPER + SHIFT + ALT + [1-9; 0]
-bindd = SUPER SHIFT ALT, code:10, Move window silently to workspace 1, movetoworkspacesilent, 1
-bindd = SUPER SHIFT ALT, code:11, Move window silently to workspace 2, movetoworkspacesilent, 2
-bindd = SUPER SHIFT ALT, code:12, Move window silently to workspace 3, movetoworkspacesilent, 3
-bindd = SUPER SHIFT ALT, code:13, Move window silently to workspace 4, movetoworkspacesilent, 4
-bindd = SUPER SHIFT ALT, code:14, Move window silently to workspace 5, movetoworkspacesilent, 5
-bindd = SUPER SHIFT ALT, code:15, Move window silently to workspace 6, movetoworkspacesilent, 6
-bindd = SUPER SHIFT ALT, code:16, Move window silently to workspace 7, movetoworkspacesilent, 7
-bindd = SUPER SHIFT ALT, code:17, Move window silently to workspace 8, movetoworkspacesilent, 8
-bindd = SUPER SHIFT ALT, code:18, Move window silently to workspace 9, movetoworkspacesilent, 9
-bindd = SUPER SHIFT ALT, code:19, Move window silently to workspace 10, movetoworkspacesilent, 10
-
-# Control scratchpad
-bindd = SUPER, S, Toggle scratchpad, togglespecialworkspace, scratchpad
-bindd = SUPER ALT, S, Move window to scratchpad, movetoworkspacesilent, special:scratchpad
-
-# TAB between workspaces
-bindd = SUPER, TAB, Next workspace, workspace, e+1
-bindd = SUPER SHIFT, TAB, Previous workspace, workspace, e-1
-bindd = SUPER CTRL, TAB, Former workspace, workspace, previous
-
-# Move workspaces to other monitors
-bindd = SUPER SHIFT ALT, LEFT, Move workspace to left monitor, movecurrentworkspacetomonitor, l
-bindd = SUPER SHIFT ALT, RIGHT, Move workspace to right monitor, movecurrentworkspacetomonitor, r
-bindd = SUPER SHIFT ALT, UP, Move workspace to up monitor, movecurrentworkspacetomonitor, u
-bindd = SUPER SHIFT ALT, DOWN, Move workspace to down monitor, movecurrentworkspacetomonitor, d
-
-# Swap active window with the one next to it with SUPER + SHIFT + arrow keys
-bindd = SUPER SHIFT, LEFT, Swap window to the left, swapwindow, l
-bindd = SUPER SHIFT, RIGHT, Swap window to the right, swapwindow, r
-bindd = SUPER SHIFT, UP, Swap window up, swapwindow, u
-bindd = SUPER SHIFT, DOWN, Swap window down, swapwindow, d
-
-# Cycle through applications on active workspace
-bindd = ALT, TAB, Focus on next window, cyclenext
-bindd = ALT SHIFT, TAB, Focus on previous window, cyclenext, prev
-bindd = ALT, TAB, Reveal active window on top, bringactivetotop
-bindd = ALT SHIFT, TAB, Reveal active window on top, bringactivetotop
-
-# Cycle through monitors
-bindd = CTRL ALT, TAB, Focus on next monitor, focusmonitor, +1
-bindd = CTRL ALT SHIFT, TAB, Focus on previous monitor, focusmonitor, -1
-
-# Resize active window
-bindd = SUPER, code:20, Expand window left, resizeactive, -100 0    # - key
-bindd = SUPER, code:21, Shrink window left, resizeactive, 100 0     # = key
-bindd = SUPER SHIFT, code:20, Shrink window up, resizeactive, 0 -100
-bindd = SUPER SHIFT, code:21, Expand window down, resizeactive, 0 100
-
-# Scroll through existing workspaces with SUPER + scroll
-bindd = SUPER, mouse_down, Scroll active workspace forward, workspace, e+1
-bindd = SUPER, mouse_up, Scroll active workspace backward, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindmd = SUPER, mouse:272, Move window, movewindow
-bindmd = SUPER, mouse:273, Resize window, resizewindow
-
-# Toggle groups
-bindd = SUPER, G, Toggle window grouping, togglegroup
-bindd = SUPER ALT, G, Move active window out of group, moveoutofgroup
-
-# Join groups
-bindd = SUPER ALT, LEFT, Move window to group on left, moveintogroup, l
-bindd = SUPER ALT, RIGHT, Move window to group on right, moveintogroup, r
-bindd = SUPER ALT, UP, Move window to group on top, moveintogroup, u
-bindd = SUPER ALT, DOWN, Move window to group on bottom, moveintogroup, d
-
-# Navigate a single set of grouped windows
-bindd = SUPER ALT, TAB, Next window in group, changegroupactive, f
-bindd = SUPER ALT SHIFT, TAB, Previous window in group, changegroupactive, b
-
-# Window navigation for grouped windows
-bindd = SUPER CTRL, LEFT, Move grouped window focus left, changegroupactive, b
-bindd = SUPER CTRL, RIGHT, Move grouped window focus right, changegroupactive, f
-
-# Scroll through a set of grouped windows with SUPER + ALT + scroll
-bindd = SUPER ALT, mouse_down, Next window in group, changegroupactive, f
-bindd = SUPER ALT, mouse_up, Previous window in group, changegroupactive, b
-
-# Activate window in a group by number
-bindd = SUPER ALT, code:10, Switch to group window 1, changegroupactive, 1
-bindd = SUPER ALT, code:11, Switch to group window 2, changegroupactive, 2
-bindd = SUPER ALT, code:12, Switch to group window 3, changegroupactive, 3
-bindd = SUPER ALT, code:13, Switch to group window 4, changegroupactive, 4
-bindd = SUPER ALT, code:14, Switch to group window 5, changegroupactive, 5
-
-# Cycle monitor scaling with SUPER + /
-bindd = SUPER, code:61, Cycle monitor scaling, exec, omarchy-hyprland-monitor-scaling-cycle
-bindd = SUPER ALT, code:61, Cycle monitor scaling backwards, exec, omarchy-hyprland-monitor-scaling-cycle --reverse
diff --git a/default/hypr/bindings/tiling-v2.lua b/default/hypr/bindings/tiling-v2.lua
new file mode 100644
index 00000000..9221004a
--- /dev/null
+++ b/default/hypr/bindings/tiling-v2.lua
@@ -0,0 +1,95 @@
+o.bind("SUPER + W", "Close window", hl.dsp.window.close())
+o.bind("CTRL + ALT + DELETE", "Close all windows", "omarchy-hyprland-window-close-all")
+
+o.bind("SUPER + J", "Toggle window split", hl.dsp.layout("togglesplit"))
+o.bind("SUPER + P", "Pseudo window", hl.dsp.window.pseudo())
+o.bind("SUPER + T", "Toggle window floating/tiling", hl.dsp.window.float({ action = "toggle" }))
+o.bind("SUPER + F", "Full screen", hl.dsp.window.fullscreen({ mode = "fullscreen" }))
+o.bind("SUPER + CTRL + F", "Tiled full screen", "omarchy-hyprland-window-tiled-fullscreen-toggle")
+o.bind("SUPER + ALT + F", "Full width", hl.dsp.window.fullscreen({ mode = "maximized" }))
+o.bind("SUPER + O", "Pop window out (float & pin)", "omarchy-hyprland-window-pop")
+o.bind("SUPER + ALT + Home", "Save window width", "omarchy-hyprland-window-width save")
+o.bind("SUPER + Home", "Restore window width", "omarchy-hyprland-window-width restore")
+o.bind("SUPER + L", "Toggle workspace layout", "omarchy-hyprland-workspace-layout-toggle")
+
+o.bind("SUPER + LEFT", "Focus on left window", hl.dsp.focus({ direction = "l" }))
+o.bind("SUPER + RIGHT", "Focus on right window", hl.dsp.focus({ direction = "r" }))
+o.bind("SUPER + UP", "Focus on above window", hl.dsp.focus({ direction = "u" }))
+o.bind("SUPER + DOWN", "Focus on below window", hl.dsp.focus({ direction = "d" }))
+
+for workspace = 1, 10 do
+  local key = "code:" .. tostring(workspace + 9)
+  o.bind("SUPER + " .. key, "Switch to workspace " .. workspace, hl.dsp.focus({ workspace = tostring(workspace) }))
+  o.bind("SUPER + SHIFT + " .. key, "Move window to workspace " .. workspace, hl.dsp.window.move({ workspace = tostring(workspace) }))
+  o.bind("SUPER + SHIFT + ALT + " .. key, "Move window silently to workspace " .. workspace, hl.dsp.window.move({ workspace = tostring(workspace), follow = false }))
+end
+
+o.bind("SUPER + S", "Toggle scratchpad", hl.dsp.workspace.toggle_special("scratchpad"))
+o.bind("SUPER + ALT + S", "Move window to scratchpad", hl.dsp.window.move({ workspace = "special:scratchpad", follow = false }))
+
+o.bind("SUPER + TAB", "Next workspace", hl.dsp.focus({ workspace = "e+1" }))
+o.bind("SUPER + SHIFT + TAB", "Previous workspace", hl.dsp.focus({ workspace = "e-1" }))
+o.bind("SUPER + CTRL + TAB", "Former workspace", hl.dsp.focus({ workspace = "previous" }))
+
+o.bind("SUPER + SHIFT + ALT + LEFT", "Move workspace to left monitor", hl.dsp.workspace.move({ monitor = "l" }))
+o.bind("SUPER + SHIFT + ALT + RIGHT", "Move workspace to right monitor", hl.dsp.workspace.move({ monitor = "r" }))
+o.bind("SUPER + SHIFT + ALT + UP", "Move workspace to up monitor", hl.dsp.workspace.move({ monitor = "u" }))
+o.bind("SUPER + SHIFT + ALT + DOWN", "Move workspace to down monitor", hl.dsp.workspace.move({ monitor = "d" }))
+
+o.bind("SUPER + SHIFT + LEFT", "Swap window to the left", hl.dsp.window.swap({ direction = "l" }))
+o.bind("SUPER + SHIFT + RIGHT", "Swap window to the right", hl.dsp.window.swap({ direction = "r" }))
+o.bind("SUPER + SHIFT + UP", "Swap window up", hl.dsp.window.swap({ direction = "u" }))
+o.bind("SUPER + SHIFT + DOWN", "Swap window down", hl.dsp.window.swap({ direction = "d" }))
+
+o.bind("ALT + TAB", "Focus on next window", hl.dsp.window.cycle_next())
+o.bind("ALT + SHIFT + TAB", "Focus on previous window", hl.dsp.window.cycle_next({ next = false }))
+o.bind("ALT + TAB", "Reveal active window on top", hl.dsp.window.bring_to_top())
+o.bind("ALT + SHIFT + TAB", "Reveal active window on top", hl.dsp.window.bring_to_top())
+
+o.bind("CTRL + ALT + TAB", "Focus on next monitor", hl.dsp.focus({ monitor = "+1" }))
+o.bind("CTRL + ALT + SHIFT + TAB", "Focus on previous monitor", hl.dsp.focus({ monitor = "-1" }))
+
+o.bind("SUPER + code:20", "Expand window left", hl.dsp.window.resize({ x = -100, y = 0, relative = true }))
+o.bind("SUPER + code:21", "Shrink window left", hl.dsp.window.resize({ x = 100, y = 0, relative = true }))
+o.bind("SUPER + SHIFT + code:20", "Shrink window up", hl.dsp.window.resize({ x = 0, y = -100, relative = true }))
+o.bind("SUPER + SHIFT + code:21", "Expand window down", hl.dsp.window.resize({ x = 0, y = 100, relative = true }))
+
+o.bind("SUPER + ALT + code:20", "Expand window left a little", hl.dsp.window.resize({ x = -25, y = 0, relative = true }))
+o.bind("SUPER + ALT + code:21", "Shrink window left a little", hl.dsp.window.resize({ x = 25, y = 0, relative = true }))
+o.bind("SUPER + SHIFT + ALT + code:20", "Shrink window up a little", hl.dsp.window.resize({ x = 0, y = -25, relative = true }))
+o.bind("SUPER + SHIFT + ALT + code:21", "Expand window down a little", hl.dsp.window.resize({ x = 0, y = 25, relative = true }))
+
+o.bind("SUPER + CTRL + code:20", "Expand window left a lot", hl.dsp.window.resize({ x = -300, y = 0, relative = true }))
+o.bind("SUPER + CTRL + code:21", "Shrink window left a lot", hl.dsp.window.resize({ x = 300, y = 0, relative = true }))
+o.bind("SUPER + CTRL + SHIFT + code:20", "Shrink window up a lot", hl.dsp.window.resize({ x = 0, y = -300, relative = true }))
+o.bind("SUPER + CTRL + SHIFT + code:21", "Expand window down a lot", hl.dsp.window.resize({ x = 0, y = 300, relative = true }))
+
+o.bind("SUPER + mouse_down", "Scroll active workspace forward", hl.dsp.focus({ workspace = "e+1" }))
+o.bind("SUPER + mouse_up", "Scroll active workspace backward", hl.dsp.focus({ workspace = "e-1" }))
+
+o.bind("SUPER + mouse:272", "Move window", hl.dsp.window.drag(), { mouse = true })
+o.bind("SUPER + mouse:273", "Resize window", hl.dsp.window.resize(), { mouse = true })
+
+o.bind("SUPER + G", "Toggle window grouping", hl.dsp.group.toggle())
+o.bind("SUPER + ALT + G", "Move active window out of group", hl.dsp.window.move({ out_of_group = true }))
+
+o.bind("SUPER + ALT + LEFT", "Move window to group on left", hl.dsp.window.move({ into_group = "l" }))
+o.bind("SUPER + ALT + RIGHT", "Move window to group on right", hl.dsp.window.move({ into_group = "r" }))
+o.bind("SUPER + ALT + UP", "Move window to group on top", hl.dsp.window.move({ into_group = "u" }))
+o.bind("SUPER + ALT + DOWN", "Move window to group on bottom", hl.dsp.window.move({ into_group = "d" }))
+
+o.bind("SUPER + ALT + TAB", "Next window in group", hl.dsp.group.next())
+o.bind("SUPER + ALT + SHIFT + TAB", "Previous window in group", hl.dsp.group.prev())
+
+o.bind("SUPER + CTRL + LEFT", "Move grouped window focus left", hl.dsp.group.prev())
+o.bind("SUPER + CTRL + RIGHT", "Move grouped window focus right", hl.dsp.group.next())
+
+o.bind("SUPER + ALT + mouse_down", "Next window in group", hl.dsp.group.next())
+o.bind("SUPER + ALT + mouse_up", "Previous window in group", hl.dsp.group.prev())
+
+for index = 1, 5 do
+  o.bind("SUPER + ALT + code:" .. tostring(index + 9), "Switch to group window " .. index, hl.dsp.group.active({ index = index }))
+end
+
+o.bind("SUPER + code:61", "Monitor scaling up", "omarchy-hyprland-monitor-scaling up")
+o.bind("SUPER + ALT + code:61", "Monitor scaling down", "omarchy-hyprland-monitor-scaling down")
diff --git a/default/hypr/bindings/tiling.conf b/default/hypr/bindings/tiling.conf
deleted file mode 100644
index 62ad1cde..00000000
--- a/default/hypr/bindings/tiling.conf
+++ /dev/null
@@ -1,74 +0,0 @@
-# This is now a deprecated file meant for those who did not wish to learn the latest Omarchy hotkeys.
-# Do not make changes here, but bring them to tiling-v2.conf instead.
-
-# Close windows
-bindd = SUPER, W, Close window, killactive,
-bindd = CTRL ALT, DELETE, Close all windows, exec, omarchy-hyprland-window-close-all
-
-# Control tiling
-bindd = SUPER, J, Toggle window split, layoutmsg, togglesplit
-bindd = SUPER, P, Pseudo window, pseudo, # dwindle
-bindd = SUPER SHIFT, V, Toggle window floating/tiling, togglefloating,
-bindd = SHIFT, F11, Force full screen, fullscreen, 0
-bindd = ALT, F11, Full width, fullscreen, 1
-
-# Move focus with SUPER + arrow keys
-bindd = SUPER, LEFT, Move focus left, movefocus, l
-bindd = SUPER, RIGHT, Move focus right, movefocus, r
-bindd = SUPER, UP, Move focus up, movefocus, u
-bindd = SUPER, DOWN, Move focus down, movefocus, d
-
-# Switch workspaces with SUPER + [0-9]
-bindd = SUPER, code:10, Switch to workspace 1, workspace, 1
-bindd = SUPER, code:11, Switch to workspace 2, workspace, 2
-bindd = SUPER, code:12, Switch to workspace 3, workspace, 3
-bindd = SUPER, code:13, Switch to workspace 4, workspace, 4
-bindd = SUPER, code:14, Switch to workspace 5, workspace, 5
-bindd = SUPER, code:15, Switch to workspace 6, workspace, 6
-bindd = SUPER, code:16, Switch to workspace 7, workspace, 7
-bindd = SUPER, code:17, Switch to workspace 8, workspace, 8
-bindd = SUPER, code:18, Switch to workspace 9, workspace, 9
-bindd = SUPER, code:19, Switch to workspace 10, workspace, 10
-
-# Move active window to a workspace with SUPER + SHIFT + [0-9]
-bindd = SUPER SHIFT, code:10, Move window to workspace 1, movetoworkspace, 1
-bindd = SUPER SHIFT, code:11, Move window to workspace 2, movetoworkspace, 2
-bindd = SUPER SHIFT, code:12, Move window to workspace 3, movetoworkspace, 3
-bindd = SUPER SHIFT, code:13, Move window to workspace 4, movetoworkspace, 4
-bindd = SUPER SHIFT, code:14, Move window to workspace 5, movetoworkspace, 5
-bindd = SUPER SHIFT, code:15, Move window to workspace 6, movetoworkspace, 6
-bindd = SUPER SHIFT, code:16, Move window to workspace 7, movetoworkspace, 7
-bindd = SUPER SHIFT, code:17, Move window to workspace 8, movetoworkspace, 8
-bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9
-bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10
-
-# TAB between workspaces
-bindd = SUPER, TAB, Next workspace, workspace, e+1
-bindd = SUPER SHIFT, TAB, Previous workspace, workspace, e-1
-bindd = SUPER CTRL, TAB, Former workspace, workspace, previous
-
-# Swap active window with the one next to it with SUPER + SHIFT + arrow keys
-bindd = SUPER SHIFT, LEFT, Swap window to the left, swapwindow, l
-bindd = SUPER SHIFT, RIGHT, Swap window to the right, swapwindow, r
-bindd = SUPER SHIFT, UP, Swap window up, swapwindow, u
-bindd = SUPER SHIFT, DOWN, Swap window down, swapwindow, d
-
-# Cycle through applications on active workspace
-bindd = ALT, TAB, Cycle to next window, cyclenext
-bindd = ALT SHIFT, TAB, Cycle to prev window, cyclenext, prev
-bindd = ALT, TAB, Reveal active window on top, bringactivetotop
-bindd = ALT SHIFT, TAB, Reveal active window on top, bringactivetotop
-
-# Resize active window
-bindd = SUPER, code:20, Expand window left, resizeactive, -100 0    # - key
-bindd = SUPER, code:21, Shrink window left, resizeactive, 100 0     # = key
-bindd = SUPER SHIFT, code:20, Shrink window up, resizeactive, 0 -100
-bindd = SUPER SHIFT, code:21, Expand window down, resizeactive, 0 100
-
-# Scroll through existing workspaces with SUPER + scroll
-bindd = SUPER, MOUSE_DOWN, Scroll active workspace forward, workspace, e+1
-bindd = SUPER, MOUSE_UP, Scroll active workspace backward, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindmd = SUPER, mouse:272, Move window, movewindow
-bindmd = SUPER, mouse:273, Resize window, resizewindow
diff --git a/default/hypr/bindings/utilities.conf b/default/hypr/bindings/utilities.conf
deleted file mode 100644
index ef8ef0d3..00000000
--- a/default/hypr/bindings/utilities.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# Menus
-bindd = SUPER, SPACE, Launch apps, exec, omarchy-launch-walker
-bindd = SUPER CTRL, E, Emoji picker, exec, omarchy-launch-walker -m symbols
-bindd = SUPER CTRL, C, Capture menu, exec, omarchy-menu capture
-bindd = SUPER CTRL, O, Toggle menu, exec, omarchy-menu toggle
-bindd = SUPER CTRL, H, Hardware menu, exec, omarchy-menu hardware
-bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu
-bindd = SUPER SHIFT, code:201, Omarchy menu, exec, omarchy-menu
-bindd = SUPER, ESCAPE, System menu, exec, omarchy-menu system
-bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system
-bindd = SUPER, K, Show key bindings, exec, omarchy-menu-keybindings
-bindd = , XF86Calculator, Calculator, exec, gnome-calculator
-
-# Aesthetics
-bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, omarchy-toggle-waybar
-bindd = SUPER CTRL, SPACE, Theme background menu, exec, omarchy-menu background
-bindd = SUPER SHIFT CTRL, SPACE, Theme menu, exec, omarchy-menu theme
-bindd = SUPER, BACKSPACE, Toggle window transparency, exec, omarchy-hyprland-window-transparency-toggle
-bindd = SUPER SHIFT, BACKSPACE, Toggle window gaps, exec, omarchy-hyprland-window-gaps-toggle
-bindd = SUPER CTRL, BACKSPACE, Toggle single-window square aspect, exec, omarchy-hyprland-window-single-square-aspect-toggle
-
-# Notifications
-bindd = SUPER, COMMA, Dismiss last notification, exec, makoctl dismiss
-bindd = SUPER SHIFT, COMMA, Dismiss all notifications, exec, makoctl dismiss --all
-bindd = SUPER CTRL, COMMA, Toggle silencing notifications, exec, omarchy-toggle-notification-silencing
-bindd = SUPER ALT, COMMA, Invoke last notification, exec, makoctl invoke
-bindd = SUPER SHIFT ALT, COMMA, Restore last notification, exec, makoctl restore
-
-# Toggles
-bindd = SUPER CTRL, I, Toggle locking on idle, exec, omarchy-toggle-idle
-bindd = SUPER CTRL, N, Toggle nightlight, exec, omarchy-toggle-nightlight
-bindd = SUPER CTRL, Delete, Toggle laptop display, exec, omarchy-hyprland-monitor-internal toggle
-bindd = SUPER CTRL ALT, Delete, Toggle laptop display mirroring, exec, omarchy-hyprland-monitor-internal-mirror toggle
-bindl = , switch:on:Lid Switch, exec, omarchy-hw-external-monitors && omarchy-hyprland-monitor-internal off
-bindl = , switch:off:Lid Switch, exec, omarchy-hyprland-monitor-internal on
-
-# Captures
-bindd = , PRINT, Screenshot, exec, omarchy-capture-screenshot
-bindd = ALT, PRINT, Screenrecording, exec, omarchy-menu screenrecord
-bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a
-bindd = SUPER CTRL, PRINT, Extract text (OCR) from screenshot, exec, omarchy-capture-text-extraction
-
-# File sharing
-bindd = SUPER CTRL, S, Share, exec, omarchy-menu share
-
-# Transcoding
-bindd = SUPER CTRL, PERIOD, Transcode, exec, omarchy-transcode
-
-# Reminders
-bindd = SUPER CTRL, R, Set reminder, exec, omarchy-menu reminder-set
-bindd = SUPER CTRL ALT, R, Show reminders, exec, omarchy-reminder show
-bindd = SUPER SHIFT CTRL, R, Clear reminders, exec, omarchy-reminder clear
-
-# Waybar-less information
-bindd = SUPER CTRL ALT, T, Show time, exec, notify-send -u low "    $(date +"%A %H:%M  ·  %d %B %Y  ·  Week %V")"
-bindd = SUPER CTRL ALT, B, Show battery remaining, exec, notify-send -u low "$(omarchy-battery-status)"
-bindd = SUPER CTRL ALT, W, Show weather, exec, notify-send -u low "$(omarchy-weather-status)"
-
-# Control panels
-bindd = SUPER CTRL, A, Audio controls, exec, omarchy-launch-audio
-bindd = SUPER CTRL, B, Bluetooth controls, exec, omarchy-launch-bluetooth
-bindd = SUPER CTRL, W, Wifi controls, exec, omarchy-launch-wifi
-bindd = SUPER CTRL, T, Activity, exec, omarchy-launch-tui btop
-
-# Dictation
-bindd = SUPER CTRL, X, Toggle dictation, exec, voxtype record toggle
-
-bindd  = , F9, Start dictation (push-to-talk), exec, voxtype record start
-binddr = , F9, Stop dictation (push-to-talk),  exec, voxtype record stop
-
-# Zoom
-bindd = SUPER CTRL, Z, Zoom in, exec, hyprctl keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor -j | jq '.float + 1')
-bindd = SUPER CTRL ALT, Z, Reset zoom, exec, hyprctl keyword cursor:zoom_factor 1
-
-# Lock system
-bindd = SUPER CTRL, L, Lock system, exec, omarchy-system-lock
diff --git a/default/hypr/bindings/utilities.lua b/default/hypr/bindings/utilities.lua
new file mode 100644
index 00000000..00720bf7
--- /dev/null
+++ b/default/hypr/bindings/utilities.lua
@@ -0,0 +1,72 @@
+o.bind("SUPER + SPACE", "Launch apps", "omarchy-shell shell toggle omarchy.launcher \"{}\"")
+o.bind("SUPER + CTRL + E", "Emojis", "omarchy-shell shell toggle omarchy.emojis")
+o.bind("SUPER + CTRL + C", "Capture menu", "omarchy-menu toggle capture")
+o.bind("SUPER + CTRL + O", "Toggle menu", "omarchy-menu toggle toggle")
+o.bind("SUPER + CTRL + H", "Hardware menu", "omarchy-menu toggle hardware")
+o.bind("SUPER + ALT + SPACE", "Omarchy menu", "omarchy-menu toggle root")
+o.bind("SUPER + SHIFT + code:201", "Omarchy menu", "omarchy-menu toggle root")
+o.bind("SUPER + ESCAPE", "System menu", "omarchy-menu toggle system")
+o.bind("XF86PowerOff", "Power menu", "omarchy-menu toggle system", { locked = true })
+o.bind("SUPER + K", "Show key bindings", "omarchy-menu-keybindings")
+o.bind("SUPER + ALT + K", "Show Tmux key bindings", "omarchy-menu-tmux-keybindings")
+o.bind("XF86Calculator", "Calculator", "gnome-calculator")
+
+o.bind_toggle("SUPER + SHIFT + SPACE", "Toggle top bar", "bar")
+o.bind("SUPER + SHIFT + CTRL + UP", "Move bar to top", "omarchy-style-bar-position top")
+o.bind("SUPER + SHIFT + CTRL + DOWN", "Move bar to bottom", "omarchy-style-bar-position bottom")
+o.bind("SUPER + SHIFT + CTRL + LEFT", "Move bar to left", "omarchy-style-bar-position left")
+o.bind("SUPER + SHIFT + CTRL + RIGHT", "Move bar to right", "omarchy-style-bar-position right")
+o.bind("SUPER + CTRL + SPACE", "Background switcher", "omarchy-menu toggle background")
+o.bind("SUPER + SHIFT + CTRL + SPACE", "Theme menu", "omarchy-menu toggle theme")
+o.bind("SUPER + BACKSPACE", "Toggle window transparency", "omarchy-hyprland-window-transparency-toggle")
+o.bind("SUPER + SHIFT + BACKSPACE", "Toggle window gaps", "omarchy-hyprland-window-gaps-toggle")
+o.bind("SUPER + CTRL + BACKSPACE", "Toggle single-window square aspect", "omarchy-hyprland-window-single-square-aspect-toggle")
+
+-- xkbcommon names the comma keysym "comma"; the upper-case "COMMA" does not match.
+o.bind("SUPER + comma", "Dismiss last notification", "omarchy-shell notifications dismissOne")
+o.bind("SUPER + SHIFT + comma", "Dismiss all notifications", "omarchy-shell notifications dismissAll")
+o.bind_toggle("SUPER + CTRL + comma", "Toggle silencing notifications", "notification-silencing")
+o.bind("SUPER + ALT + comma", "Invoke last notification", "omarchy-shell notifications invokeLast")
+o.bind("SUPER + SHIFT + ALT + comma", "Open notification history", "omarchy-shell notifications showHistory")
+
+o.bind_toggle("SUPER + CTRL + I", "Toggle locking on idle", "idle")
+o.bind_toggle("SUPER + CTRL + N", "Toggle nightlight", "nightlight")
+o.bind("SUPER + CTRL + Delete", "Toggle laptop display", "omarchy-hyprland-monitor-internal toggle")
+o.bind("SUPER + CTRL + ALT + Delete", "Toggle laptop display mirroring", "omarchy-hyprland-monitor-internal-mirror toggle")
+o.bind("switch:on:Lid Switch", nil, "omarchy-hw-external-monitors && omarchy-hyprland-monitor-internal off", { locked = true })
+o.bind("switch:off:Lid Switch", nil, "omarchy-hyprland-monitor-internal on", { locked = true })
+
+o.bind("PRINT", "Screenshot", "omarchy-capture-screenshot")
+o.bind("ALT + PRINT", "Screenrecording", "omarchy-capture-screenrecording --stop-recording || omarchy-menu toggle trigger.capture.screenrecord")
+o.bind("SUPER + PRINT", "Color picker", "pkill hyprpicker || hyprpicker -a")
+o.bind("SUPER + CTRL + PRINT", "Extract text (OCR) from screenshot", "omarchy-capture-text-extraction")
+
+o.bind("SUPER + CTRL + S", "Share", "omarchy-menu toggle share")
+
+o.bind("SUPER + CTRL + PERIOD", "Transcode", "omarchy-transcode")
+
+o.bind("SUPER + CTRL + R", "Set reminder", "omarchy-menu toggle reminder-set")
+o.bind("SUPER + CTRL + ALT + R", "Show reminders", "omarchy-reminder show")
+o.bind("SUPER + SHIFT + CTRL + R", "Clear reminders", "omarchy-reminder clear")
+
+o.bind("SUPER + CTRL + ALT + T", "Show time", "omarchy-notification-time")
+o.bind("SUPER + CTRL + ALT + B", "Show battery remaining", "omarchy-notification-battery")
+o.bind("SUPER + CTRL + ALT + W", "Toggle weather", "omarchy-notification-weather")
+
+o.bind("SUPER + CTRL + A", "Audio", "omarchy-shell omarchy.audio toggle")
+o.bind("SUPER + CTRL + B", "Bluetooth", "omarchy-shell omarchy.bluetooth toggle")
+o.bind("SUPER + CTRL + D", "Display", "omarchy-shell omarchy.monitor toggle")
+o.bind("SUPER + CTRL + W", "Network", "omarchy-shell omarchy.network toggle")
+o.bind("SUPER + CTRL + P", "Power", "omarchy-shell omarchy.power toggle")
+o.bind("SUPER + CTRL + T", "Activity", { tui = "btop" })
+
+o.bind("SUPER + CTRL + Z", "Zoom in", function()
+  local zoom = hl.get_config("cursor.zoom_factor") or 1
+  hl.config({ cursor = { zoom_factor = zoom + 1 } })
+end)
+
+o.bind("SUPER + CTRL + ALT + Z", "Reset zoom", function()
+  hl.config({ cursor = { zoom_factor = 1 } })
+end)
+
+o.bind("SUPER + CTRL + L", "Lock system", "omarchy-system-lock")
diff --git a/default/hypr/envs.conf b/default/hypr/envs.conf
deleted file mode 100644
index 9210f594..00000000
--- a/default/hypr/envs.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-# GUM environment variables for styling purposes
-# hyprlang noerror true
-source = ~/.config/omarchy/current/theme/gum.env.conf
-# hyprlang noerror false
-
-# Cursor size
-env = XCURSOR_SIZE,24
-env = HYPRCURSOR_SIZE,24
-
-# Force all apps to use Wayland
-env = GDK_BACKEND,wayland,x11,*
-env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_STYLE_OVERRIDE,kvantum
-env = MOZ_ENABLE_WAYLAND,1
-env = ELECTRON_OZONE_PLATFORM_HINT,wayland
-env = OZONE_PLATFORM,wayland
-env = XDG_SESSION_TYPE,wayland
-
-# Allow better support for screen sharing (Google Meet, Discord, etc)
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_DESKTOP,Hyprland
-
-xwayland {
-  force_zero_scaling = true
-}
-
-# Use XCompose file
-env = XCOMPOSEFILE,~/.XCompose
-
-# Don't show update on first launch
-ecosystem {
-  no_update_news = true
-}
diff --git a/default/hypr/envs.lua b/default/hypr/envs.lua
new file mode 100644
index 00000000..11909844
--- /dev/null
+++ b/default/hypr/envs.lua
@@ -0,0 +1,49 @@
+local paths = require("default.hypr.paths")
+local require_optional = require("default.hypr.require_optional")
+
+-- GUM environment variables for styling purposes.
+require_optional.module("omarchy.current.theme.gum_env")
+
+-- Cursor size.
+hl.env("XCURSOR_SIZE", "24")
+hl.env("HYPRCURSOR_SIZE", "24")
+
+-- Force all apps to use Wayland.
+hl.env("GDK_BACKEND", "wayland,x11,*")
+hl.env("QT_QPA_PLATFORM", "wayland;xcb")
+hl.env("QT_STYLE_OVERRIDE", "kvantum")
+hl.env("MOZ_ENABLE_WAYLAND", "1")
+hl.env("ELECTRON_OZONE_PLATFORM_HINT", "wayland")
+hl.env("OZONE_PLATFORM", "wayland")
+hl.env("XDG_SESSION_TYPE", "wayland")
+
+-- Allow better support for screen sharing (Google Meet, Discord, etc).
+hl.env("XDG_CURRENT_DESKTOP", "Hyprland")
+hl.env("XDG_SESSION_DESKTOP", "Hyprland")
+
+-- Use XCompose file.
+hl.env("XCOMPOSEFILE", paths.home .. "/.XCompose")
+
+-- hyprctl setenv doesn't reach keybind dispatcher env; use hl.env.
+hl.env("OMARCHY_PATH", paths.omarchy_path)
+
+local bin_dir = paths.omarchy_path .. "/bin"
+local kept = {}
+for entry in (os.getenv("PATH") or "/usr/local/bin:/usr/bin"):gmatch("[^:]+") do
+  if entry ~= bin_dir then table.insert(kept, entry) end
+end
+table.insert(kept, 1, bin_dir)
+hl.env("PATH", table.concat(kept, ":"))
+
+-- Hardware-specific environment.
+require("default.hypr.nvidia")
+
+hl.config({
+  xwayland = {
+    force_zero_scaling = true,
+  },
+
+  ecosystem = {
+    no_update_news = true,
+  },
+})
diff --git a/default/hypr/helpers.lua b/default/hypr/helpers.lua
new file mode 100644
index 00000000..80aa5747
--- /dev/null
+++ b/default/hypr/helpers.lua
@@ -0,0 +1,114 @@
+-- Shared helpers for Hyprland Lua configuration.
+
+o = o or {}
+
+local function shell_quote(value)
+  return "'" .. tostring(value):gsub("'", "'\\''") .. "'"
+end
+
+o.shell_quote = shell_quote
+
+function o.shell_succeeds(command)
+  local ok, _, code = os.execute(command .. " >/dev/null 2>&1")
+  return ok == true or ok == 0 or code == 0
+end
+
+function o.cmd_present(command)
+  return o.shell_succeeds("command -v " .. shell_quote(command))
+end
+
+function o.cmd_missing(command)
+  return not o.cmd_present(command)
+end
+
+local function command_from(value, description)
+  if type(value) ~= "table" then
+    return value
+  end
+
+  if value.omarchy then
+    return "omarchy-launch-" .. value.omarchy
+  elseif value.focus and value.launch then
+    return o.launch_sole(value.focus, value.launch)
+  elseif value.launch then
+    return o.launch(value.launch)
+  elseif value.webapp then
+    if value.focus then
+      return o.launch_webapp_sole(description, value.webapp)
+    else
+      return o.launch_webapp(value.webapp)
+    end
+  elseif value.tui then
+    if value.focus then
+      return "omarchy-launch-or-focus-tui " .. shell_quote(value.tui)
+    else
+      return "omarchy-launch-tui " .. shell_quote(value.tui)
+    end
+  end
+
+  return value
+end
+
+function o.bind(keys, description, dispatcher, options)
+  local opts = options or {}
+
+  if description then
+    opts.description = description
+  end
+
+  dispatcher = command_from(dispatcher, description)
+
+  if type(dispatcher) == "string" then
+    dispatcher = hl.dsp.exec_cmd(dispatcher)
+  end
+
+  hl.bind(keys, dispatcher, opts)
+end
+
+function o.launch(command)
+  return "uwsm-app -- " .. command
+end
+
+function o.exec_on_start(command)
+  hl.on("hyprland.start", function()
+    hl.exec_cmd(command)
+  end)
+end
+
+function o.launch_on_start(command)
+  o.exec_on_start(o.launch(command))
+end
+
+function o.launch_webapp(url)
+  return "omarchy-launch-webapp " .. shell_quote(url)
+end
+
+function o.launch_webapp_sole(name, url)
+  return "omarchy-launch-or-focus-webapp " .. shell_quote(name) .. " " .. shell_quote(url)
+end
+
+function o.launch_sole(match, command)
+  return "omarchy-launch-or-focus " .. shell_quote(match) .. " " .. shell_quote(o.launch(command))
+end
+
+function o.bind_toggle(keys, description, toggle, options)
+  o.bind(keys, description, "omarchy-toggle-" .. toggle, options)
+end
+
+function o.notify(message)
+  return "notify-send -u low " .. shell_quote(message)
+end
+
+function o.window(match, rules)
+  rules.match = rules.match or {}
+
+  if type(match) == "string" then
+    rules.match.class = match
+  else
+    for key, value in pairs(match) do
+      rules.match[key] = value
+    end
+  end
+
+  hl.window_rule(rules)
+end
diff --git a/default/hypr/input.conf b/default/hypr/input.conf
deleted file mode 100644
index 14e9ccb6..00000000
--- a/default/hypr/input.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# https://wiki.hypr.land/Configuring/Basics/Variables/#input
-input {
-    kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options = compose:caps
-    kb_rules =
-
-    follow_mouse = 1
-
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-
-    touchpad {
-        natural_scroll = false
-    }
-}
-
-misc {
-    key_press_enables_dpms = true  # key press will trigger wake
-    mouse_move_enables_dpms = true # mouse move will trigger wake
-}
diff --git a/default/hypr/input.lua b/default/hypr/input.lua
new file mode 100644
index 00000000..1f003936
--- /dev/null
+++ b/default/hypr/input.lua
@@ -0,0 +1,21 @@
+-- https://wiki.hypr.land/Configuring/Basics/Variables/#input
+hl.config({
+  input = {
+    kb_layout = "us",
+    kb_variant = "",
+    kb_model = "",
+    kb_options = "compose:caps",
+    kb_rules = "",
+    follow_mouse = 1,
+    sensitivity = 0,
+
+    touchpad = {
+      natural_scroll = false,
+    },
+  },
+
+  misc = {
+    key_press_enables_dpms = true,
+    mouse_move_enables_dpms = true,
+  },
+})
diff --git a/default/hypr/looknfeel.conf b/default/hypr/looknfeel.conf
deleted file mode 100644
index 85896054..00000000
--- a/default/hypr/looknfeel.conf
+++ /dev/null
@@ -1,143 +0,0 @@
-# Refer to https://wiki.hypr.land/Configuring/Basics/Variables/
-
-# Variables
-$activeBorderColor = rgba(33ccffee) rgba(00ff99ee) 45deg
-$inactiveBorderColor = rgba(595959aa)
-
-# https://wiki.hypr.land/Configuring/Basics/Variables/#general
-general {
-    gaps_in = 5
-    gaps_out = 10
-
-    border_size = 2
-
-    # https://wiki.hypr.land/Configuring/Basics/Variables/#variable-types for info about colors
-    col.active_border = $activeBorderColor
-    col.inactive_border = $inactiveBorderColor
-
-    # Set to true enable resizing windows by clicking and dragging on borders and gaps
-    resize_on_border = false
-
-    # Please see https://wiki.hypr.land/Configuring/Advanced-and-Cool/Tearing/ before you turn this on
-    allow_tearing = false
-
-    layout = dwindle
-}
-
-# https://wiki.hypr.land/Configuring/Basics/Variables/#decoration
-decoration {
-    rounding = 0
-
-    shadow {
-        enabled = true
-        range = 2
-        render_power = 3
-        color = rgba(1a1a1aee)
-    }
-
-    # https://wiki.hypr.land/Configuring/Basics/Variables/#blur
-    blur {
-        enabled = true
-        size = 2
-        passes = 2
-        special = true
-        brightness = 0.60
-        contrast = 0.75
-    }
-}
-
-# https://wiki.hypr.land/Configuring/Basics/Variables/#group
-group {
-    col.border_active = $activeBorderColor
-    col.border_inactive = $inactiveBorderColor
-    col.border_locked_active = $activeBorderColor
-    col.border_locked_inactive = $inactiveBorderColor
-
-    groupbar {
-        font_size = 12
-        font_family = monospace
-        font_weight_active = ultraheavy
-        font_weight_inactive = normal
-
-        indicator_height = 0
-        indicator_gap = 5
-        height = 22
-        gaps_in = 5
-        gaps_out = 0
-
-        text_color = rgb(ffffff)
-        text_color_inactive = rgba(ffffff90)
-        col.active = rgba(00000040)
-        col.inactive = rgba(00000020)
-
-        gradients = true
-        gradient_rounding = 0
-        gradient_round_only_edges = false
-    }
-}
-
-
-# https://wiki.hypr.land/Configuring/Basics/Variables/#animations
-animations {
-    enabled = yes, please :)
-
-    # Default animations, see https://wiki.hypr.land/Configuring/Advanced-and-Cool/Animations/ for more
-
-    bezier = easeOutQuint,0.23,1,0.32,1
-    bezier = easeInOutCubic,0.65,0.05,0.36,1
-    bezier = linear,0,0,1,1
-    bezier = almostLinear,0.5,0.5,0.75,1.0
-    bezier = quick,0.15,0,0.1,1
-
-    animation = global, 1, 10, default
-    animation = border, 1, 5.39, easeOutQuint
-    animation = windows, 1, 3.79, easeOutQuint
-    animation = windowsIn, 1, 4.1, easeOutQuint, popin 87%
-    animation = windowsOut, 1, 1.49, linear, popin 87%
-    animation = fadeIn, 1, 1.73, almostLinear
-    animation = fadeOut, 1, 1.46, almostLinear
-    animation = fade, 1, 3.03, quick
-    animation = layers, 1, 3.81, easeOutQuint
-    animation = layersIn, 1, 4, easeOutQuint, fade
-    animation = layersOut, 1, 1.5, linear, fade
-    animation = fadeLayersIn, 1, 1.79, almostLinear
-    animation = fadeLayersOut, 1, 1.39, almostLinear
-    animation = workspaces, 0, 0, ease
-    animation = specialWorkspace, 1, 3, easeOutQuint, slidevert
-}
-
-# See https://wiki.hypr.land/Configuring/Layouts/Dwindle-Layout/ for more
-dwindle {
-    preserve_split = true
-    force_split = 2
-}
-
-scrolling {
-    column_width = 0.49
-}
-
-# See https://wiki.hypr.land/Configuring/Layouts/Master-Layout/ for more
-master {
-    new_status = master
-}
-
-# https://wiki.hypr.land/Configuring/Basics/Variables/#misc
-misc {
-    disable_hyprland_logo = true
-    disable_splash_rendering  = true
-    disable_scale_notification = true
-    focus_on_activate = true
-    anr_missed_pings = 3
-    on_focus_under_fullscreen = 1
-}
-
-# https://wiki.hypr.land/Configuring/Basics/Variables/#cursor
-cursor {
-    hide_on_key_press = true
-    warp_on_change_workspace = 1
-}
-
-# Auto toggle scratchpad on switching workspace from scratchpad
-binds {
-    hide_special_on_workspace_change = true
-}
diff --git a/default/hypr/looknfeel.lua b/default/hypr/looknfeel.lua
new file mode 100644
index 00000000..9339ad82
--- /dev/null
+++ b/default/hypr/looknfeel.lua
@@ -0,0 +1,129 @@
+-- Refer to https://wiki.hypr.land/Configuring/Basics/Variables/
+
+local active_border_color = { colors = { "rgba(33ccffee)", "rgba(00ff99ee)" }, angle = 45 }
+local inactive_border_color = "rgba(595959aa)"
+
+hl.config({
+  general = {
+    gaps_in = 5,
+    gaps_out = 10,
+    border_size = 2,
+
+    col = {
+      active_border = active_border_color,
+      inactive_border = inactive_border_color,
+    },
+
+    resize_on_border = false,
+    allow_tearing = false,
+    layout = "dwindle",
+  },
+
+  decoration = {
+    rounding = 0,
+
+    shadow = {
+      enabled = true,
+      range = 2,
+      render_power = 3,
+      color = "rgba(1a1a1aee)",
+    },
+
+    blur = {
+      enabled = true,
+      size = 2,
+      passes = 2,
+      special = true,
+      brightness = 0.60,
+      contrast = 0.75,
+    },
+  },
+
+  group = {
+    col = {
+      border_active = active_border_color,
+      border_inactive = inactive_border_color,
+    },
+
+    groupbar = {
+      font_size = 12,
+      font_family = "monospace",
+      font_weight_active = "ultraheavy",
+      font_weight_inactive = "normal",
+      indicator_height = 0,
+      indicator_gap = 5,
+      height = 22,
+      gaps_in = 5,
+      gaps_out = 0,
+      text_color = "rgb(ffffff)",
+      text_color_inactive = "rgba(ffffff90)",
+      col = {
+        active = "rgba(00000040)",
+        inactive = "rgba(00000020)",
+      },
+      gradients = true,
+      gradient_rounding = 0,
+      gradient_round_only_edges = false,
+    },
+  },
+
+  animations = {
+    enabled = true,
+  },
+})
+
+-- Default animations, see https://wiki.hypr.land/Configuring/Advanced-and-Cool/Animations/
+hl.curve("easeOutQuint", { type = "bezier", points = { { 0.23, 1 }, { 0.32, 1 } } })
+hl.curve("easeInOutCubic", { type = "bezier", points = { { 0.65, 0.05 }, { 0.36, 1 } } })
+hl.curve("linear", { type = "bezier", points = { { 0, 0 }, { 1, 1 } } })
+hl.curve("almostLinear", { type = "bezier", points = { { 0.5, 0.5 }, { 0.75, 1.0 } } })
+hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } })
+
+hl.animation({ leaf = "global", enabled = true, speed = 10, bezier = "default" })
+hl.animation({ leaf = "border", enabled = true, speed = 5.39, bezier = "easeOutQuint" })
+hl.animation({ leaf = "windows", enabled = true, speed = 3.79, bezier = "easeOutQuint" })
+hl.animation({ leaf = "windowsIn", enabled = true, speed = 4.1, bezier = "easeOutQuint", style = "popin 87%" })
+hl.animation({ leaf = "windowsOut", enabled = true, speed = 1.49, bezier = "linear", style = "popin 87%" })
+hl.animation({ leaf = "fadeIn", enabled = true, speed = 1.73, bezier = "almostLinear" })
+hl.animation({ leaf = "fadeOut", enabled = true, speed = 1.46, bezier = "almostLinear" })
+hl.animation({ leaf = "fade", enabled = true, speed = 3.03, bezier = "quick" })
+hl.animation({ leaf = "layers", enabled = true, speed = 3.81, bezier = "easeOutQuint" })
+hl.animation({ leaf = "layersIn", enabled = true, speed = 4, bezier = "easeOutQuint", style = "fade" })
+hl.animation({ leaf = "layersOut", enabled = true, speed = 1.5, bezier = "linear", style = "fade" })
+hl.animation({ leaf = "fadeLayersIn", enabled = true, speed = 1.79, bezier = "almostLinear" })
+hl.animation({ leaf = "fadeLayersOut", enabled = true, speed = 1.39, bezier = "almostLinear" })
+hl.animation({ leaf = "workspaces", enabled = false })
+hl.animation({ leaf = "specialWorkspace", enabled = true, speed = 3, bezier = "easeOutQuint", style = "slidevert" })
+
+hl.config({
+  dwindle = {
+    preserve_split = true,
+    force_split = 2,
+  },
+
+  scrolling = {
+    column_width = 0.49,
+  },
+
+  master = {
+    new_status = "master",
+  },
+
+  misc = {
+    disable_hyprland_logo = true,
+    disable_splash_rendering = true,
+    disable_scale_notification = true,
+    focus_on_activate = true,
+    anr_missed_pings = 3,
+    on_focus_under_fullscreen = 1,
+  },
+
+  cursor = {
+    hide_on_key_press = true,
+    warp_on_change_workspace = 1,
+  },
+
+  binds = {
+    hide_special_on_workspace_change = true,
+  },
+})
diff --git a/default/hypr/nvidia.lua b/default/hypr/nvidia.lua
new file mode 100644
index 00000000..3f6c8daf
--- /dev/null
+++ b/default/hypr/nvidia.lua
@@ -0,0 +1,15 @@
+local paths = require("default.hypr.paths")
+
+local nvidia_gsp = paths.omarchy_path .. "/bin/omarchy-hw-nvidia-gsp"
+local nvidia_without_gsp = paths.omarchy_path .. "/bin/omarchy-hw-nvidia-without-gsp"
+
+if o.shell_succeeds("lspci | grep -qi nvidia") then
+  if o.shell_succeeds(o.shell_quote(nvidia_gsp)) then
+    hl.env("NVD_BACKEND", "direct")
+    hl.env("LIBVA_DRIVER_NAME", "nvidia")
+    hl.env("__GLX_VENDOR_LIBRARY_NAME", "nvidia")
+  elseif o.shell_succeeds(o.shell_quote(nvidia_without_gsp)) then
+    hl.env("NVD_BACKEND", "egl")
+    hl.env("__GLX_VENDOR_LIBRARY_NAME", "nvidia")
+  end
+end
diff --git a/default/hypr/omarchy.lua b/default/hypr/omarchy.lua
new file mode 100644
index 00000000..657ac887
--- /dev/null
+++ b/default/hypr/omarchy.lua
@@ -0,0 +1,17 @@
+-- Omarchy Hyprland setup: helpers, defaults, and current theme overrides.
+
+require("default.hypr.helpers")
+
+-- Use Omarchy defaults, but don't edit these directly.
+require("default.hypr.autostart")
+require("default.hypr.bindings.media")
+require("default.hypr.bindings.clipboard")
+require("default.hypr.bindings.tiling-v2")
+require("default.hypr.bindings.utilities")
+require("default.hypr.envs")
+require("default.hypr.looknfeel")
+require("default.hypr.input")
+require("default.hypr.windows")
+
+-- Current theme overrides.
+require("default.hypr.require_optional").module("omarchy.current.theme.hyprland")
diff --git a/default/hypr/paths.lua b/default/hypr/paths.lua
new file mode 100644
index 00000000..4990eb81
--- /dev/null
+++ b/default/hypr/paths.lua
@@ -0,0 +1,29 @@
+-- Shared path constants for Omarchy's Hyprland Lua modules.
+-- Lua files loaded with require() have separate local scopes, so modules that
+-- need these paths import this table instead of repeating os.getenv() lookups.
+
+local home = os.getenv("HOME")
+
+-- /etc/omarchy.conf wins over process env so dev-link/unlink survives stale sessions.
+local function read_dev_link_omarchy_path()
+  local f = io.open("/etc/omarchy.conf", "r")
+  if not f then return nil end
+  local value
+  for line in f:lines() do
+    local v = line:match('^%s*export%s+OMARCHY_PATH=%s*"?([^"\n]+)"?')
+    if v and #v > 0 then value = v end
+  end
+  f:close()
+  return value
+end
+
+local omarchy_path = read_dev_link_omarchy_path()
+  or os.getenv("OMARCHY_PATH")
+  or "/usr/share/omarchy"
+
+return {
+  home = home,
+  config_home = os.getenv("XDG_CONFIG_HOME") or (home .. "/.config"),
+  state_home = os.getenv("XDG_STATE_HOME") or (home .. "/.local/state"),
+  omarchy_path = omarchy_path,
+}
diff --git a/default/hypr/plain-bindings.conf b/default/hypr/plain-bindings.conf
deleted file mode 100644
index 81a47062..00000000
--- a/default/hypr/plain-bindings.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Application bindings
-bindd = SUPER, RETURN, Terminal, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)"
-bindd = SUPER SHIFT, RETURN, Browser, exec, omarchy-launch-browser
-bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
-bindd = SUPER ALT SHIFT, F, File manager (cwd), exec, uwsm-app -- nautilus --new-window "$(omarchy-cmd-terminal-cwd)"
-bindd = SUPER SHIFT, B, Browser, exec, omarchy-launch-browser
-bindd = SUPER SHIFT ALT, B, Browser (private), exec, omarchy-launch-browser --private
-bindd = SUPER SHIFT, N, Editor, exec, omarchy-launch-editor
-
-# Add extra bindings
-# bindd = SUPER SHIFT, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com"
-# bindd = SUPER SHIFT, R, exec, alacritty -e ssh your-server
-
-# Overwrite existing bindings, like putting Omarchy Menu on Super + Space
-# unbind = SUPER, SPACE
-# bindd = SUPER, SPACE, Omarchy menu, exec, omarchy-menu
diff --git a/default/hypr/plain-bindings.lua b/default/hypr/plain-bindings.lua
new file mode 100644
index 00000000..5f132a84
--- /dev/null
+++ b/default/hypr/plain-bindings.lua
@@ -0,0 +1,13 @@
+require("default.hypr.bindings.media")
+require("default.hypr.bindings.clipboard")
+require("default.hypr.bindings.tiling-v2")
+require("default.hypr.bindings.utilities")
+
+-- Application bindings without Omarchy's preinstalled web apps, TUIs, or desktop apps.
+o.bind("SUPER + RETURN", "Terminal", { omarchy = "terminal" })
+o.bind("SUPER + SHIFT + RETURN", "Browser", { omarchy = "browser" })
+o.bind("SUPER + SHIFT + F", "File manager", { omarchy = "nautilus" })
+o.bind("SUPER + ALT + SHIFT + F", "File manager (cwd)", { omarchy = "nautilus-cwd" })
+o.bind("SUPER + SHIFT + B", "Browser", { omarchy = "browser" })
+o.bind("SUPER + SHIFT + ALT + B", "Browser (private)", { omarchy = "browser --private" })
+o.bind("SUPER + SHIFT + N", "Editor", { omarchy = "editor" })
diff --git a/default/hypr/require_all.lua b/default/hypr/require_all.lua
new file mode 100644
index 00000000..56153a00
--- /dev/null
+++ b/default/hypr/require_all.lua
@@ -0,0 +1,33 @@
+-- Require every *.lua file in a directory in sorted order.
+-- Used for Omarchy extension-style folders such as default/hypr/apps,
+-- default/hypr/bindings, and ~/.local/state/omarchy/toggles/hypr.
+-- Pass a module prefix for normal package.path modules, e.g.
+--   require_all.files(paths.omarchy_path .. "/default/hypr/apps", "default.hypr.apps")
+-- Pass nil as the prefix when the directory itself has been added to package.path.
+
+local M = {}
+
+local function shell_quote(path)
+  return "'" .. path:gsub("'", "'\\''") .. "'"
+end
+
+function M.files(dir, module_prefix, options)
+  local handle = io.popen("find " .. shell_quote(dir) .. " -maxdepth 1 -type f -name '*.lua' -printf '%f\\n' 2>/dev/null | sort")
+  if handle then
+    for filename in handle:lines() do
+      local module = filename:gsub("%.lua$", "")
+      if module_prefix then
+        module = module_prefix .. "." .. module
+      end
+
+      if options and options.reload then
+        package.loaded[module] = nil
+      end
+
+      require(module)
+    end
+    handle:close()
+  end
+end
+
+return M
diff --git a/default/hypr/require_optional.lua b/default/hypr/require_optional.lua
new file mode 100644
index 00000000..68549bc2
--- /dev/null
+++ b/default/hypr/require_optional.lua
@@ -0,0 +1,12 @@
+-- Require a module only when it can be found on package.path.
+-- Errors inside existing modules still surface normally.
+
+local M = {}
+
+function M.module(module)
+  if package.searchpath(module, package.path) then
+    return require(module)
+  end
+end
+
+return M
diff --git a/default/hypr/toggles.lua b/default/hypr/toggles.lua
new file mode 100644
index 00000000..5f24e1cf
--- /dev/null
+++ b/default/hypr/toggles.lua
@@ -0,0 +1,7 @@
+local paths = require("default.hypr.paths")
+local require_all = require("default.hypr.require_all")
+
+local toggles_dir = paths.state_home .. "/omarchy/toggles/hypr"
+package.path = toggles_dir .. "/?.lua;" .. package.path
+
+require_all.files(toggles_dir, nil, { reload = true })
diff --git a/default/hypr/toggles/flags.conf b/default/hypr/toggles/flags.conf
deleted file mode 100644
index a6334225..00000000
--- a/default/hypr/toggles/flags.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# This directory is intended for permanent config toggle flags.
-# Do not remove this file (as the directory always needs at least one file).
diff --git a/default/hypr/toggles/flags.lua b/default/hypr/toggles/flags.lua
new file mode 100644
index 00000000..790e67ca
--- /dev/null
+++ b/default/hypr/toggles/flags.lua
@@ -0,0 +1,2 @@
+-- This directory is intended for permanent config toggle flags.
+-- Do not remove this file; the directory always needs at least one file.
diff --git a/default/hypr/toggles/single-window-aspect-ratio.conf b/default/hypr/toggles/single-window-aspect-ratio.conf
deleted file mode 100644
index b51d0e41..00000000
--- a/default/hypr/toggles/single-window-aspect-ratio.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Avoid overly wide single-window layouts on wide screens
-layout {
-    single_window_aspect_ratio = 1 1
-}
-
diff --git a/default/hypr/toggles/single-window-aspect-ratio.lua b/default/hypr/toggles/single-window-aspect-ratio.lua
new file mode 100644
index 00000000..43839022
--- /dev/null
+++ b/default/hypr/toggles/single-window-aspect-ratio.lua
@@ -0,0 +1,6 @@
+-- Avoid overly wide single-window layouts on wide screens.
+hl.config({
+  layout = {
+    single_window_aspect_ratio = { 1, 1 },
+  },
+})
diff --git a/default/hypr/toggles/voxtype.lua b/default/hypr/toggles/voxtype.lua
new file mode 100644
index 00000000..aa1b81b4
--- /dev/null
+++ b/default/hypr/toggles/voxtype.lua
@@ -0,0 +1,3 @@
+o.bind("SUPER + CTRL + X", "Toggle dictation", "voxtype record toggle")
+o.bind("F9", "Start dictation (push-to-talk)", "voxtype record start")
+o.bind("F9", "Stop dictation (push-to-talk)", "voxtype record stop", { release = true })
diff --git a/default/hypr/toggles/window-no-gaps.conf b/default/hypr/toggles/window-no-gaps.conf
deleted file mode 100644
index 47520e80..00000000
--- a/default/hypr/toggles/window-no-gaps.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Remove all window gaps and borders
-general {
-    gaps_out = 0
-    gaps_in = 0
-    border_size = 0
-}
-
-decoration {
-    rounding = 0
-}
diff --git a/default/hypr/toggles/window-no-gaps.lua b/default/hypr/toggles/window-no-gaps.lua
new file mode 100644
index 00000000..9e086a91
--- /dev/null
+++ b/default/hypr/toggles/window-no-gaps.lua
@@ -0,0 +1,12 @@
+-- Remove all window gaps and borders.
+hl.config({
+  general = {
+    gaps_out = 0,
+    gaps_in = 0,
+    border_size = 0,
+  },
+
+  decoration = {
+    rounding = 0,
+  },
+})
diff --git a/default/hypr/windows.conf b/default/hypr/windows.conf
deleted file mode 100644
index 3ceca48f..00000000
--- a/default/hypr/windows.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# See https://wiki.hypr.land/Configuring/Basics/Window-Rules/ for more
-# Hyprland 0.53+ syntax
-windowrule = suppress_event maximize, match:class .*
-
-# Tag all windows for default opacity (apps can override with -default-opacity tag)
-windowrule = tag +default-opacity, match:class .*
-
-# Fix some dragging issues with XWayland
-windowrule = no_focus on, match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0
-
-# App-specific tweaks (may remove default-opacity tag)
-source = ~/.local/share/omarchy/default/hypr/apps.conf
-
-# Apply default opacity after apps have had a chance to opt out
-windowrule = opacity 0.97 0.9, match:tag default-opacity
diff --git a/default/hypr/windows.lua b/default/hypr/windows.lua
new file mode 100644
index 00000000..9d09232b
--- /dev/null
+++ b/default/hypr/windows.lua
@@ -0,0 +1,25 @@
+-- See https://wiki.hypr.land/Configuring/Basics/Window-Rules/
+
+o.window(".*", { suppress_event = "maximize" })
+
+-- Tag all windows for default opacity (apps can override with -default-opacity tag).
+o.window(".*", { tag = "+default-opacity" })
+
+-- Fix some dragging issues with XWayland.
+o.window(
+  {
+    class = "^$",
+    title = "^$",
+    xwayland = true,
+    float = true,
+    fullscreen = false,
+    pin = false,
+  },
+  { no_focus = true }
+)
+
+-- App-specific tweaks (may remove default-opacity tag).
+require("default.hypr.apps")
+
+-- Apply default opacity after apps have had a chance to opt out.
+o.window({ tag = "default-opacity" }, { opacity = "0.97 0.9" })
diff --git a/default/libalpm/hooks/00-omarchy-update-guard.hook b/default/libalpm/hooks/00-omarchy-update-guard.hook
new file mode 100644
index 00000000..e6a250b5
--- /dev/null
+++ b/default/libalpm/hooks/00-omarchy-update-guard.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Upgrade
+Type = Package
+Target = *
+
+[Action]
+Description = Checking Omarchy update entrypoint...
+When = PreTransaction
+Depends = omarchy
+Exec = /usr/bin/omarchy-update-pacman-guard
+AbortOnFail
diff --git a/default/limine/default.conf b/default/limine/default.conf
index 9beedcd4..3f3ea0a8 100644
--- a/default/limine/default.conf
+++ b/default/limine/default.conf
@@ -1,20 +1,3 @@
-TARGET_OS_NAME="Omarchy"
-
 ESP_PATH="/boot"
 
 KERNEL_CMDLINE[default]+="@@CMDLINE@@"
-KERNEL_CMDLINE[default]+=" quiet splash loglevel=0 systemd.show_status=false rd.udev.log_level=0 vt.global_cursor_default=0"
-
-ENABLE_UKI=yes
-CUSTOM_UKI_NAME="omarchy"
-
-ENABLE_LIMINE_FALLBACK=yes
-
-# Find and add other bootloaders
-FIND_BOOTLOADERS=yes
-
-BOOT_ORDER="*, *fallback, Snapshots"
-
-MAX_SNAPSHOT_ENTRIES=5
-
-SNAPSHOT_FORMAT_CHOICE=5
diff --git a/default/mako/core.ini b/default/mako/core.ini
deleted file mode 100644
index d8837b92..00000000
--- a/default/mako/core.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-anchor=top-right
-group-by=app-name,summary,body
-default-timeout=5000
-width=420
-outer-margin=20
-padding=10,15
-border-size=2
-max-icon-size=32
-font=sans-serif 14px
-
-[app-name=Spotify]
-invisible=1
-
-[mode=do-not-disturb]
-invisible=true
-
-[mode=do-not-disturb app-name=notify-send]
-invisible=false
-
-[urgency=critical]
-default-timeout=0
-layer=overlay
-
-[summary~="Setup Wi-Fi"]
-on-button-left=exec sh -c 'omarchy-notification-dismiss "Setup Wi-Fi"; omarchy-launch-wifi'
-
-[summary~="Update System"]
-on-button-left=exec sh -c 'omarchy-notification-dismiss "Update System"; omarchy-launch-floating-terminal-with-presentation omarchy-update'
-
-[summary~="Learn Keybindings"]
-on-button-left=exec sh -c 'omarchy-notification-dismiss "Learn Keybindings"; omarchy-menu-keybindings'
-
-[summary~="Install Dictation with Voxtype"]
-on-button-left=exec sh -c 'omarchy-notification-dismiss "Install Dictation with Voxtype"; omarchy-launch-floating-terminal-with-presentation omarchy-voxtype-install'
-
-[summary~="Screenshot copied & saved"]
-max-icon-size=80
-format=<b>%s</b>\n%b
diff --git a/default/omarchy-skill/SKILL.md b/default/omarchy-skill/SKILL.md
index 37ae3d12..c992328e 100644
--- a/default/omarchy-skill/SKILL.md
+++ b/default/omarchy-skill/SKILL.md
@@ -2,13 +2,13 @@
 name: omarchy
 description: >
   REQUIRED for end-user customization of Linux desktop, window manager, or system config.
-  Use when editing ~/.config/hypr/, ~/.config/waybar/, ~/.config/walker/,
-  ~/.config/alacritty/, ~/.config/foot/, ~/.config/kitty/, ~/.config/ghostty/, ~/.config/mako/,
-  or ~/.config/omarchy/. Triggers: Hyprland, window rules, animations, keybindings,
-  monitors, gaps, borders, blur, opacity, waybar, walker, terminal config, themes,
-  wallpaper, night light, idle, lock screen, screenshots, reminders, layer rules,
-  workspace settings, display config, and user-facing omarchy commands. Excludes Omarchy
-  source development in ~/.local/share/omarchy/ and `omarchy dev` workflows.
+  Use when editing ~/.config/hypr/, ~/.config/omarchy/,
+  ~/.config/alacritty/, ~/.config/foot/, ~/.config/kitty/, or ~/.config/ghostty/.
+  Triggers: Hyprland, window rules, animations, keybindings, monitors, gaps, borders,
+  blur, opacity, omarchy-shell, bar, terminal config, themes, background,
+  night light, idle, lock screen, screenshots, reminders, layer rules, workspace
+  settings, display config, and user-facing omarchy commands. Excludes Omarchy
+  source development through `omarchy dev link` workflows.
 ---
 
 # Omarchy Skill
@@ -23,22 +23,22 @@ It is not for contributing to Omarchy source code.
 **ALWAYS invoke this skill for end-user requests involving ANY of these:**
 
 - Editing ANY file in `~/.config/hypr/` (window rules, animations, keybindings, monitors, etc.)
-- Editing ANY file in `~/.config/waybar/`, `~/.config/walker/`, `~/.config/mako/`
+- Editing `~/.config/omarchy/shell.json` (status bar layout, widgets)
 - Editing terminal configs (alacritty, foot, kitty, ghostty)
 - Editing ANY file in `~/.config/omarchy/`
 - Window behavior, animations, opacity, blur, gaps, borders
 - Layer rules, workspace settings, display/monitor configuration
-- Themes, wallpapers, fonts, appearance changes
+- Themes, backgrounds, fonts, appearance changes
 - User-facing `omarchy` commands (`omarchy theme ...`, `omarchy refresh ...`, `omarchy restart ...`, etc.)
 - Screenshots, screen recording, reminders, night light, idle behavior, lock screen
 
 **If you're about to edit a config file in ~/.config/ on this system, STOP and use this skill first.**
 
-**Do NOT use this skill for Omarchy development tasks** (editing files in `~/.local/share/omarchy/`, creating migrations, or running `omarchy dev ...` workflows).
+**Do NOT use this skill for Omarchy development tasks** (editing the Omarchy source tree, creating migrations, or running `omarchy dev ...` workflows).
 
 ## Critical Safety Rules
 
-**For end-user customization tasks, NEVER modify anything in `~/.local/share/omarchy/`** - but READING is safe and encouraged.
+**For end-user customization tasks, NEVER modify anything in `/usr/share/omarchy/`** - but READING is safe and encouraged.
 
 This directory contains Omarchy's source files managed by git. Any changes will be:
 - Lost on next `omarchy update`
@@ -46,20 +46,21 @@ This directory contains Omarchy's source files managed by git. Any changes will
 - Break the system's update mechanism
 
 ```
-~/.local/share/omarchy/     # READ-ONLY - NEVER EDIT (reading is OK)
+/usr/share/omarchy/     # READ-ONLY - NEVER EDIT (reading is OK)
 ├── bin/                    # Source scripts (symlinked to PATH)
 ├── config/                 # Default config templates
 ├── themes/                 # Stock themes
 ├── default/                # System defaults
+├── shell/                  # Omarchy shell source and defaults
 ├── migrations/             # Update migrations
 └── install/                # Installation scripts
 ```
 
-**Reading `~/.local/share/omarchy/` is SAFE and useful** - do it freely to:
+**Reading `/usr/share/omarchy/` is SAFE and useful** - do it freely to:
 - Understand how omarchy commands work: `omarchy theme set --help` or `cat $(which omarchy-theme-set)`
-- See default configs before customizing: `cat ~/.local/share/omarchy/config/waybar/config.jsonc`
+- See default configs before customizing: `cat /usr/share/omarchy/config/omarchy/shell.json`
 - Check stock theme files to copy for customization
-- Reference default hyprland settings: `cat ~/.local/share/omarchy/default/hypr/*`
+- Reference default hyprland settings: `cat /usr/share/omarchy/default/hypr/*`
 
 **Always use these safe locations instead:**
 - `~/.config/` - User configuration (safe to edit)
@@ -76,11 +77,10 @@ Omarchy is built on:
 |-----------|---------|-----------------|
 | **Arch Linux** | Base OS | `/etc/`, `~/.config/` |
 | **Hyprland** | Wayland compositor/WM | `~/.config/hypr/` |
-| **Waybar** | Status bar | `~/.config/waybar/` |
-| **Walker** | App launcher | `~/.config/walker/` |
+| **Omarchy shell** | Status bar + notifications (Quickshell) | `~/.config/omarchy/shell.json` |
+| **Launcher** | Quickshell launcher | `~/.config/omarchy/shell.json` |
 | **Alacritty/Foot/Kitty/Ghostty** | Terminals | `~/.config/<terminal>/` |
-| **Mako** | Notifications | `~/.config/mako/` |
-| **SwayOSD** | On-screen display | `~/.config/swayosd/` |
+| **Omarchy OSD** | On-screen display | Quickshell plugin |
 
 ## Command Discovery
 
@@ -111,8 +111,8 @@ Run `omarchy --help` for the full list. The most common groups:
 
 | Group | Purpose | Example |
 |-------|---------|---------|
-| `omarchy refresh` | Reset config to defaults (backs up first) | `omarchy refresh waybar` |
-| `omarchy restart` | Restart a service/app | `omarchy restart waybar` |
+| `omarchy refresh` | Reset config to defaults (backs up first) | `omarchy refresh shell` |
+| `omarchy restart` | Restart a service/app | `omarchy-restart-shell` |
 | `omarchy toggle` | Toggle feature on/off | `omarchy toggle nightlight` |
 | `omarchy theme` | Theme management | `omarchy theme set <name>` |
 | `omarchy install` | Install optional software / packages | `omarchy install docker dbs` |
@@ -136,8 +136,7 @@ Run `omarchy --help` for the full list. The most common groups:
 ├── looknfeel.conf     # Appearance (gaps, borders, animations)
 ├── envs.conf          # Environment variables
 ├── autostart.conf     # Startup applications
-├── hypridle.conf      # Idle behavior (screen off, lock, suspend)
-├── hyprlock.conf      # Lock screen appearance
+├── shell.json         # Omarchy shell, bar, idle, and lock settings
 └── hyprsunset.conf    # Night light / blue light filter
 ```
 
@@ -148,17 +147,20 @@ Run `omarchy --help` for the full list. The most common groups:
 - If `hyprctl configerrors` reports errors, address them and rerun validation until clean or until a real blocker is identified
 - Use `omarchy refresh hyprland` to reset to defaults
 
-### Waybar (Status Bar)
+### Omarchy shell (Status Bar + Notifications)
+
+The bar, notification daemon, settings panel, and assorted overlays all run
+inside a single long-running Quickshell process (`omarchy-shell`).
 
 ```
-~/.config/waybar/
-├── config.jsonc       # Bar layout and modules (JSONC format)
-└── style.css          # Styling
+~/.config/omarchy/shell.json      # User overrides: bar.position, bar.layout, plugins[]
+/usr/share/omarchy/config/omarchy/shell.json   # Canonical defaults
 ```
 
-**Waybar does NOT auto-reload.** You MUST run `omarchy restart waybar` after any config changes.
+The shell hot-reloads `shell.json` on save — no restart needed for layout
+changes. For more invasive changes (new plugin, packaged update):
 
-**Commands:** `omarchy restart waybar`, `omarchy refresh waybar`, `omarchy toggle waybar`
+**Commands:** `omarchy-restart-shell`, `omarchy refresh shell`, `omarchy launch bar settings`
 
 ### Terminals
 
@@ -176,11 +178,10 @@ Run `omarchy --help` for the full list. The most common groups:
 | App | Location |
 |-----|----------|
 | btop | `~/.config/btop/btop.conf` |
-| fastfetch | `~/.config/fastfetch/config.jsonc` |
+| fastfetch | `/etc/fastfetch/config.jsonc` default; `~/.config/fastfetch/config.jsonc` user override |
 | lazygit | `~/.config/lazygit/config.yml` |
 | starship | `~/.config/starship.toml` |
 | git | `~/.config/git/config` |
-| walker | `~/.config/walker/config.toml` |
 
 ## Safe Customization Patterns
 
@@ -199,15 +200,15 @@ cp ~/.config/hypr/bindings.conf ~/.config/hypr/bindings.conf.bak.$(date +%s)
 
 # 4. Apply changes
 # - Hyprland: auto-reloads on save, but MUST validate with `hyprctl reload` and `hyprctl configerrors`
-# - Waybar: MUST restart with `omarchy restart waybar`
-# - Walker: MUST restart with `omarchy restart walker`
+# - Omarchy shell: shell.json hot-reloads; use `omarchy plugin rescan` for plugin/widget code changes
+# - Launcher: restart with `omarchy restart shell`
 # - Terminals: MUST restart with `omarchy restart terminal`
 ```
 
 ### Pattern 2: Make a new theme
 
 1. Create a directory under ~/.config/omarchy/themes.
-2. See how an existing theme is done via ~/.local/share/omarchy/themes/catppuccin.
+2. See how an existing theme is done via /usr/share/omarchy/themes/catppuccin.
 3. Download a matching background (or several) from the internet and put them in ~/.config/omarchy/themes/[name-of-new-theme]
 4. When done with the theme, run `omarchy theme set "Name of new theme"`
 
@@ -237,12 +238,12 @@ When customizations go wrong:
 
 ```bash
 # Reset specific config (creates backup automatically)
-omarchy refresh waybar
+omarchy refresh shell
 omarchy refresh hyprland
 
 # The refresh command:
 # 1. Backs up current config with timestamp
-# 2. Copies default from ~/.local/share/omarchy/config/
+# 2. Copies default from /usr/share/omarchy/config/
 # 3. Restarts the component
 ```
 
@@ -254,7 +255,7 @@ omarchy refresh hyprland
 omarchy theme list              # Show available themes
 omarchy theme current           # Show current theme
 omarchy theme set <name>        # Apply theme (use "Tokyo Night" not "tokyo-night")
-omarchy theme bg next           # Cycle wallpaper
+omarchy theme bg next           # Cycle background
 omarchy theme install <url>     # Install from git repo
 ```
 
@@ -341,7 +342,7 @@ omarchy refresh <app>
 
 # Refresh specific config file
 # config-file path is relative to ~/.config/
-# eg. `omarchy refresh config hypr/hyprlock.conf` will refresh ~/.config/hypr/hyprlock.conf
+# eg. `omarchy refresh config hypr/hyprland.lua` will refresh ~/.config/hypr/hyprland.lua
 omarchy refresh config <config-file>
 
 # Full reinstall of configs (nuclear option)
@@ -353,7 +354,7 @@ omarchy reinstall
 When user requests system changes:
 
 1. **Is it a stock omarchy command?** Use it directly
-2. **Is it a config edit?** Edit in `~/.config/`, never `~/.local/share/omarchy/`
+2. **Is it a config edit?** Edit in `~/.config/`, never `/usr/share/omarchy/`
 3. **Is it a theme customization?** Create a NEW custom theme directory
 4. **Is it automation?** Use hooks in `~/.config/omarchy/hooks/`
 5. **Is it a package install?** Use `omarchy pkg add <pkgs...>` (or `omarchy pkg aur add <pkgs...>` for AUR-only packages)
@@ -373,7 +374,7 @@ omarchy reminder clear
 ## Out of Scope
 
 This skill intentionally does not cover Omarchy source development. Do not use this skill for:
-- Editing files in `~/.local/share/omarchy/` (`bin/`, `config/`, `default/`, `themes/`, `migrations/`, etc.)
+- Editing files in `/usr/share/omarchy/` (`bin/`, `config/`, `default/`, `shell/`, `themes/`, `migrations/`, etc.)
 - Creating or editing migrations
 - Running `omarchy dev ...` commands
 
@@ -389,4 +390,4 @@ This skill intentionally does not cover Omarchy source development. Do not use t
 - "Clear all reminders" -> `omarchy reminder clear`
 - "Customize the catppuccin theme colors" -> Create `~/.config/omarchy/themes/catppuccin-custom/` by copying from stock, then edit
 - "Run a script every time I change themes" -> Create `~/.config/omarchy/hooks/theme-set`
-- "Reset waybar to defaults" -> `omarchy refresh waybar`
+- "Reset shell/bar to defaults" -> `omarchy refresh shell`
diff --git a/default/omarchy/launcher.hides b/default/omarchy/launcher.hides
new file mode 100644
index 00000000..113565c7
--- /dev/null
+++ b/default/omarchy/launcher.hides
@@ -0,0 +1,38 @@
+avahi-discover
+bssh
+btop
+bvnc
+cmake-gui
+cups
+dropbox
+electron34
+electron36
+electron37
+fcitx5-configtool
+fcitx5-wayland-launcher
+foot-server
+footclient
+java-java-openjdk
+jconsole-java-openjdk
+jshell-java-openjdk
+kbd-layout-viewer5
+kcm_fcitx5
+kcm_kaccounts
+kvantummanager
+libreoffice-base
+libreoffice-draw
+libreoffice-math
+libreoffice-startcenter
+libreoffice-xsltfilter
+limine-snapper-restore
+lstopo
+org.fcitx.Fcitx5
+org.fcitx.fcitx5-config-qt
+org.fcitx.fcitx5-migrator
+org.fcitx.fcitx5-qt5-gui-wrapper
+org.fcitx.fcitx5-qt6-gui-wrapper
+qv4l2
+qvidcap
+uuctl
+xgps
+xgpsspeed
diff --git a/default/omarchy/omarchy-menu.jsonc b/default/omarchy/omarchy-menu.jsonc
new file mode 100644
index 00000000..478c3792
--- /dev/null
+++ b/default/omarchy/omarchy-menu.jsonc
@@ -0,0 +1,315 @@
+{
+  // Omarchy menu definition.
+  // JSONC is used for Neovim-friendly highlighting, comments, and trailing commas.
+  // IDs are object keys. Dotted IDs imply hierarchy: trigger.share.file belongs
+  // under trigger.share.
+  // Kind is inferred: action -> action, target -> link, otherwise submenu.
+  // Dotted IDs define the tree. Use provider:"name" only when the submenu
+  // calls provider_name() or a command named "name" to return JSON rows.
+  // Optional fields:
+  //   aliases        alternate `omarchy menu summon <name>` routes; also searchable
+  //   keywords       extra search terms beyond id/label/aliases
+  //   when           shell condition; hide row when it fails
+  //   checked        shell condition; append ✓ when it succeeds
+
+  // Root Menu
+  "apps": {"icon":"󰀻","label":"Apps","aliases":["app","applications"],"keywords":"","action":"omarchy-shell shell summon omarchy.launcher"},
+  "learn": {"icon":"󰧑","label":"Learn","keywords":"manual docs help"},
+  "trigger": {"icon":"󱓞","label":"Trigger","keywords":""},
+  "style": {"icon":"","label":"Style","keywords":""},
+  "setup": {"icon":"","label":"Setup","aliases":["settings"],"keywords":""},
+  "install": {"icon":"󰉉","label":"Install","keywords":""},
+  "remove": {"icon":"󰭌","label":"Remove","aliases":["uninstall"],"keywords":""},
+  "update": {"icon":"","label":"Update","aliases":["restart","refresh"],"keywords":"upgrade channel firmware timezone"},
+  "about": {"icon":"","label":"About","keywords":"omarchy system information","action":"omarchy-launch-about"},
+  "system": {"icon":"","label":"System","aliases":["power-menu"],"keywords":"lock logout restart shutdown suspend hibernate"},
+
+  // System
+  "system.screensaver": {"icon":"󱄄","label":"Screensaver","action":"omarchy-launch-screensaver force"},
+  "system.lock": {"icon":"","label":"Lock","keywords":"screen","action":"omarchy-system-lock"},
+  "system.suspend": {"icon":"󰒲","label":"Suspend","keywords":"sleep","when":"! omarchy-toggle-enabled suspend-off","action":"systemctl suspend"},
+  "system.hibernate": {"icon":"󰤁","label":"Hibernate","keywords":"sleep","when":"omarchy-hibernation-available","action":"systemctl hibernate"},
+  "system.logout": {"icon":"󰍃","label":"Logout","keywords":"sign out","action":"omarchy-system-logout"},
+  "system.restart": {"icon":"󰜉","label":"Restart","keywords":"reboot","action":"omarchy-system-reboot"},
+  "system.shutdown": {"icon":"󰐥","label":"Shutdown","keywords":"power off","action":"omarchy-system-shutdown"},
+
+  // Learn
+  "learn.keybindings": {"icon":"","label":"Keybindings","keywords":"keyboard shortcuts bindings","action":"omarchy-menu-keybindings"},
+  "learn.tmux-keybindings": {"icon":"","label":"Tmux keybindings","keywords":"keyboard shortcuts bindings terminal","action":"omarchy-menu-tmux-keybindings"},
+  "learn.omarchy": {"icon":"","label":"Omarchy","keywords":"manual documentation","action":"omarchy-launch-webapp 'https://learn.omacom.io/2/the-omarchy-manual'"},
+  "learn.hyprland": {"icon":"","label":"Hyprland","keywords":"wiki docs","action":"omarchy-launch-webapp 'https://wiki.hypr.land/'"},
+  "learn.arch": {"icon":"󰣇","label":"Arch","keywords":"linux wiki docs","action":"omarchy-launch-webapp 'https://wiki.archlinux.org/title/Main_page'"},
+  "learn.neovim": {"icon":"","label":"Neovim","keywords":"lazyvim keymaps docs","action":"omarchy-launch-webapp 'https://www.lazyvim.org/keymaps'"},
+  "learn.bash": {"icon":"󱆃","label":"Bash","keywords":"shell cheatsheet","action":"omarchy-launch-webapp 'https://devhints.io/bash'"},
+
+  // Trigger
+  "trigger.reminder": {"icon":"󰢌","label":"Reminder","aliases":["reminder"],"keywords":"timer notification remind"},
+  "trigger.capture": {"icon":"","label":"Capture","aliases":["capture","screenshot","screenrecord","screen-record","screenrecording"],"keywords":"color text extraction"},
+  "trigger.capture.screenshot": {"icon":"","label":"Screenshot","keywords":"picture","action":"omarchy-capture-screenshot"},
+  "trigger.capture.screenrecord.stop": {"icon":"","label":"Stop Screenrecording","keywords":"recording video","when":"pgrep -f '^gpu-screen-recorder' >/dev/null","action":"omarchy-capture-screenrecording --stop-recording"},
+  "trigger.capture.screenrecord": {"icon":"","label":"Screenrecord","keywords":"record screen video"},
+  "trigger.capture.text": {"icon":"󰴑","label":"Text","keywords":"ocr text extraction","action":"omarchy-capture-text-extraction"},
+  "trigger.capture.color": {"icon":"󰃉","label":"Color","keywords":"picker hyprpicker","action":"pkill hyprpicker || hyprpicker -a"},
+  "trigger.capture.screenrecord.no-audio": {"icon":"","label":"With no audio","action":"omarchy-capture-screenrecording"},
+  "trigger.capture.screenrecord.desktop-audio": {"icon":"","label":"With desktop audio","action":"omarchy-capture-screenrecording --with-desktop-audio"},
+  "trigger.capture.screenrecord.microphone": {"icon":"","label":"With desktop + microphone audio","keywords":"mic","action":"omarchy-capture-screenrecording --with-desktop-audio --with-microphone-audio"},
+  "trigger.capture.screenrecord.webcam": {"icon":"","label":"With desktop + microphone audio + webcam","keywords":"camera","action":"omarchy-capture-screenrecording-with-webcam"},
+  "trigger.transcode": {"icon":"󰧸","label":"Transcode","keywords":"convert image video","action":"omarchy-transcode"},
+  "trigger.share": {"icon":"","label":"Share","aliases":["share"],"keywords":"clipboard file folder localsend"},
+  "trigger.toggle": {"icon":"󰔎","label":"Toggle","aliases":["toggle","toggles"],"keywords":"screensaver nightlight idle notifications bar quickshell"},
+  "trigger.hardware": {"icon":"","label":"Hardware","aliases":["hardware","hw"],"keywords":"monitor touchpad touchscreen gpu"},
+  "trigger.hardware.laptop-display": {"icon":"󰛧","label":"Laptop Display","keywords":"monitor","action":"omarchy-hyprland-monitor-internal toggle"},
+  "trigger.hardware.mirror-display": {"icon":"󰍹","label":"Mirror Display","keywords":"monitor","action":"omarchy-hyprland-monitor-internal-mirror toggle"},
+  "trigger.hardware.hybrid-gpu": {"icon":"","label":"Hybrid GPU","keywords":"graphics","when":"omarchy-hw-hybrid-gpu >/dev/null","action":"omarchy-launch-floating-terminal-with-presentation omarchy-toggle-hybrid-gpu"},
+  "trigger.hardware.touchpad": {"icon":"󰟸","label":"Touchpad","keywords":"trackpad","when":"omarchy-hw-touchpad >/dev/null","action":"omarchy-toggle-touchpad"},
+  "trigger.hardware.touchpad-haptics": {"icon":"󰌌","label":"Touchpad Haptics","when":"omarchy-hw-dell-xps-haptic-touchpad >/dev/null && omarchy-cmd-present dell-xps-touchpad-haptics"},
+  "trigger.hardware.touchpad-haptics.low": {"icon":"󰌌","label":"low","when":"omarchy-hw-dell-xps-haptic-touchpad >/dev/null && omarchy-cmd-present dell-xps-touchpad-haptics","checked":"[[ \"$(dell-xps-touchpad-haptics get)\" == \"low\" ]]","action":"dell-xps-touchpad-haptics set low"},
+  "trigger.hardware.touchpad-haptics.mid": {"icon":"󰌌","label":"mid","keywords":"medium","when":"omarchy-hw-dell-xps-haptic-touchpad >/dev/null && omarchy-cmd-present dell-xps-touchpad-haptics","checked":"[[ \"$(dell-xps-touchpad-haptics get)\" == \"mid\" ]]","action":"dell-xps-touchpad-haptics set mid"},
+  "trigger.hardware.touchpad-haptics.high": {"icon":"󰌌","label":"high","when":"omarchy-hw-dell-xps-haptic-touchpad >/dev/null && omarchy-cmd-present dell-xps-touchpad-haptics","checked":"[[ \"$(dell-xps-touchpad-haptics get)\" == \"high\" ]]","action":"dell-xps-touchpad-haptics set high"},
+  "trigger.hardware.touchscreen": {"icon":"󰆽","label":"Touchscreen","keywords":"tablet","when":"omarchy-hw-touchscreen >/dev/null","action":"omarchy-toggle-touchscreen"},
+  "trigger.reminder.set": {"icon":"󰢌","label":"Set one","aliases":["reminder-set","remind"],"keywords":"timer","action":"omarchy-reminder -i"},
+  "trigger.reminder.show": {"icon":"󰢌","label":"Show all","keywords":"list","action":"omarchy-reminder show"},
+  "trigger.reminder.clear": {"icon":"󰢌","label":"Clear all","keywords":"delete","action":"omarchy-reminder clear"},
+  "trigger.share.clipboard": {"icon":"","label":"Clipboard","action":"omarchy-menu-share clipboard"},
+  "trigger.share.file": {"icon":"","label":"File","action":"xdg-terminal-exec --app-id=org.omarchy.terminal bash -c 'omarchy-menu-share file'"},
+  "trigger.share.folder": {"icon":"","label":"Folder","keywords":"directory","action":"xdg-terminal-exec --app-id=org.omarchy.terminal bash -c 'omarchy-menu-share folder'"},
+  "trigger.share.receive": {"icon":"󰥦","label":"Receive","keywords":"localsend","action":"uwsm-app -- localsend"},
+  "trigger.toggle.screensaver": {"icon":"󱄄","label":"Screensaver","action":"omarchy-toggle-screensaver"},
+  "trigger.toggle.nightlight": {"icon":"󰔎","label":"Nightlight","keywords":"night light hyprsunset","action":"omarchy-toggle-nightlight"},
+  "trigger.toggle.idle-lock": {"icon":"󱫖","label":"Idle Lock","keywords":"idle quickshell","action":"omarchy-toggle-idle"},
+  "trigger.toggle.notifications": {"icon":"󰂛","label":"Notifications","keywords":"silence dnd","action":"omarchy-toggle-notification-silencing"},
+  "trigger.toggle.top-bar": {"icon":"󰍜","label":"Bar","keywords":"top bar quickshell","action":"omarchy-toggle-bar"},
+  "trigger.toggle.workspace-layout": {"icon":"󱂬","label":"Workspace Layout","action":"omarchy-hyprland-workspace-layout-toggle"},
+  "trigger.toggle.window-gaps": {"icon":"","label":"Window Gaps","action":"omarchy-hyprland-window-gaps-toggle"},
+  "trigger.toggle.one-window-ratio": {"icon":"","label":"1-Window Ratio","keywords":"square","action":"omarchy-hyprland-window-single-square-aspect-toggle"},
+  "trigger.toggle.direct-boot": {"icon":"","label":"Direct Boot","action":"omarchy-launch-floating-terminal-with-presentation omarchy-config-direct-boot"},
+  "trigger.toggle.passwordless-sudo": {"icon":"󰟵","label":"Passwordless Sudo","action":"omarchy-launch-floating-terminal-with-presentation omarchy-sudo-passwordless"},
+
+  // Style
+  "style.theme": {"icon":"󰸌","label":"Theme","aliases":["theme","themes"],"keywords":"colors","action":"theme=$(omarchy-theme-switcher); [[ -n $theme ]] && omarchy-theme-set \"$theme\""},
+  "style.font": {"icon":"","label":"Font","keywords":"typeface","provider":"fonts"},
+  "style.background": {"icon":"","label":"Background","aliases":["background","wallpaper"],"action":"background=$(omarchy-theme-bg-switcher); [[ -n $background ]] && omarchy-theme-bg-set \"$background\""},
+  "style.bar": {"icon":"󰍜","label":"Bar","keywords":"quickshell top bottom left right settings"},
+  "style.hyprland": {"icon":"","label":"Hyprland","keywords":"look feel","action":"omarchy-launch-config-editor \"$HOME/.config/hypr/looknfeel.lua\""},
+  "style.screensaver": {"icon":"󱄄","label":"Screensaver","keywords":"branding"},
+  "style.about": {"icon":"","label":"About","keywords":"branding"},
+  "style.install": {"icon":"󰉉","label":"Install","keywords":"theme background font"},
+  "style.bar.top": {"icon":"󰁝","label":"Top","keywords":"position","action":"omarchy-style-bar-position top"},
+  "style.bar.bottom": {"icon":"󰁅","label":"Bottom","keywords":"position","action":"omarchy-style-bar-position bottom"},
+  "style.bar.left": {"icon":"󰁍","label":"Left","keywords":"position","action":"omarchy-style-bar-position left"},
+  "style.bar.right": {"icon":"󰁔","label":"Right","keywords":"position","action":"omarchy-style-bar-position right"},
+  "style.about.text": {"icon":"","label":"Edit Text","keywords":"branding","action":"omarchy-branding-about text"},
+  "style.about.image": {"icon":"","label":"Set From Image","keywords":"branding","action":"omarchy-branding-about image"},
+  "style.about.default": {"icon":"","label":"Restore Default","keywords":"branding","action":"omarchy-branding-about reset"},
+  "style.screensaver.text": {"icon":"","label":"Edit Text","keywords":"branding","action":"omarchy-branding-screensaver text"},
+  "style.screensaver.image": {"icon":"","label":"Set From Image","keywords":"branding","action":"omarchy-branding-screensaver image"},
+  "style.screensaver.default": {"icon":"","label":"Restore Default","keywords":"branding","action":"omarchy-branding-screensaver reset"},
+  "style.install.theme": {"icon":"󰸌","label":"Theme","action":"omarchy-launch-floating-terminal-with-presentation omarchy-theme-install"},
+  "style.install.background": {"icon":"","label":"Background","keywords":"wallpaper","action":"omarchy-theme-bg-install"},
+  "style.install.font": {"icon":"","label":"Font"},
+  "style.install.font.cascadia": {"icon":"","label":"Cascadia Mono","action":"omarchy-install-font 'Cascadia Mono' ttf-cascadia-mono-nerd 'CaskaydiaMono Nerd Font'"},
+  "style.install.font.meslo": {"icon":"","label":"Meslo LG Mono","action":"omarchy-install-font 'Meslo LG Mono' ttf-meslo-nerd 'MesloLGL Nerd Font'"},
+  "style.install.font.fira": {"icon":"","label":"Fira Code","action":"omarchy-install-font 'Fira Code' ttf-firacode-nerd 'FiraCode Nerd Font'"},
+  "style.install.font.victor": {"icon":"","label":"Victor Code","action":"omarchy-install-font 'Victor Code' ttf-victor-mono-nerd 'VictorMono Nerd Font'"},
+  "style.install.font.bitstream": {"icon":"","label":"Bitstream Vera Mono","action":"omarchy-install-font 'Bitstream Vera Code' ttf-bitstream-vera-mono-nerd 'BitstromWera Nerd Font'"},
+  "style.install.font.iosevka": {"icon":"","label":"Iosevka","action":"omarchy-install-font Iosevka ttf-iosevka-nerd 'Iosevka Nerd Font Mono'"},
+
+  // Setup
+  "setup.monitors": {"icon":"󰍹","label":"Monitors","keywords":"monitor display hyprland","action":"omarchy-launch-config-editor \"$HOME/.config/hypr/monitors.lua\""},
+  "setup.keybindings": {"icon":"","label":"Keybindings","keywords":"keyboard shortcuts","when":"[[ -f ~/.config/hypr/bindings.lua ]]","action":"omarchy-launch-config-editor \"$HOME/.config/hypr/bindings.lua\""},
+  "setup.input": {"icon":"","label":"Input","keywords":"keyboard touchpad mouse","when":"[[ -f ~/.config/hypr/input.lua ]]","action":"omarchy-launch-config-editor \"$HOME/.config/hypr/input.lua\""},
+  "setup.default": {"icon":"","label":"Defaults","aliases":["default","defaults"],"keywords":"browser terminal editor"},
+  "setup.default.browser": {"icon":"","label":"Browser"},
+  "setup.default.browser.chromium": {"icon":"","label":"Chromium","when":"omarchy-cmd-present chromium","checked":"[[ \"$(omarchy-default-browser)\" == \"chromium\" ]]","action":"omarchy-default-browser chromium"},
+  "setup.default.browser.chrome": {"icon":"󰊯","label":"Chrome","keywords":"google","when":"omarchy-cmd-present google-chrome-stable","checked":"[[ \"$(omarchy-default-browser)\" == \"chrome\" ]]","action":"omarchy-default-browser chrome"},
+  "setup.default.browser.brave": {"icon":"󰖟","label":"Brave","when":"omarchy-cmd-present brave","checked":"[[ \"$(omarchy-default-browser)\" == \"brave\" ]]","action":"omarchy-default-browser brave"},
+  "setup.default.browser.brave-origin": {"icon":"󰖟","label":"Brave Origin","when":"omarchy-cmd-present brave-origin-beta","checked":"[[ \"$(omarchy-default-browser)\" == \"brave-origin\" ]]","action":"omarchy-default-browser brave-origin"},
+  "setup.default.browser.edge": {"icon":"󰇩","label":"Edge","when":"omarchy-cmd-present microsoft-edge-stable","checked":"[[ \"$(omarchy-default-browser)\" == \"edge\" ]]","action":"omarchy-default-browser edge"},
+  "setup.default.browser.firefox": {"icon":"󰈹","label":"Firefox","when":"omarchy-cmd-present firefox","checked":"[[ \"$(omarchy-default-browser)\" == \"firefox\" ]]","action":"omarchy-default-browser firefox"},
+  "setup.default.browser.zen": {"icon":"󰖟","label":"Zen","when":"omarchy-cmd-present zen-browser","checked":"[[ \"$(omarchy-default-browser)\" == \"zen\" ]]","action":"omarchy-default-browser zen"},
+  "setup.default.terminal": {"icon":"","label":"Terminal"},
+  "setup.default.terminal.alacritty": {"icon":"","label":"Alacritty","when":"omarchy-cmd-present alacritty","checked":"[[ \"$(omarchy-default-terminal)\" == \"alacritty\" ]]","action":"omarchy-default-terminal alacritty"},
+  "setup.default.terminal.foot": {"icon":"","label":"Foot","when":"omarchy-cmd-present foot","checked":"[[ \"$(omarchy-default-terminal)\" == \"foot\" ]]","action":"omarchy-default-terminal foot"},
+  "setup.default.terminal.ghostty": {"icon":"","label":"Ghostty","when":"omarchy-cmd-present ghostty","checked":"[[ \"$(omarchy-default-terminal)\" == \"ghostty\" ]]","action":"omarchy-default-terminal ghostty"},
+  "setup.default.terminal.kitty": {"icon":"","label":"Kitty","when":"omarchy-cmd-present kitty","checked":"[[ \"$(omarchy-default-terminal)\" == \"kitty\" ]]","action":"omarchy-default-terminal kitty"},
+  "setup.default.editor": {"icon":"","label":"Editor"},
+  "setup.default.editor.neovim": {"icon":"","label":"Neovim","keywords":"nvim","when":"omarchy-cmd-present nvim","checked":"[[ \"$(omarchy-default-editor)\" == \"nvim\" ]]","action":"omarchy-default-editor nvim"},
+  "setup.default.editor.vscode": {"icon":"","label":"VSCode","keywords":"code","when":"omarchy-cmd-present code","checked":"[[ \"$(omarchy-default-editor)\" == \"code\" ]]","action":"omarchy-default-editor code"},
+  "setup.default.editor.cursor": {"icon":"","label":"Cursor","when":"omarchy-cmd-present cursor","checked":"[[ \"$(omarchy-default-editor)\" == \"cursor\" ]]","action":"omarchy-default-editor cursor"},
+  "setup.default.editor.zed": {"icon":"","label":"Zed","when":"omarchy-cmd-present zeditor","checked":"[[ \"$(omarchy-default-editor)\" == \"zeditor\" ]]","action":"omarchy-default-editor zed"},
+  "setup.default.editor.sublime": {"icon":"","label":"Sublime Text","when":"omarchy-cmd-present sublime_text","checked":"[[ \"$(omarchy-default-editor)\" == \"sublime_text\" ]]","action":"omarchy-default-editor sublime_text"},
+  "setup.default.editor.helix": {"icon":"","label":"Helix","when":"omarchy-cmd-present helix","checked":"[[ \"$(omarchy-default-editor)\" == \"helix\" ]]","action":"omarchy-default-editor helix"},
+  "setup.default.editor.vim": {"icon":"","label":"Vim","when":"omarchy-cmd-present vim","checked":"[[ \"$(omarchy-default-editor)\" == \"vim\" ]]","action":"omarchy-default-editor vim"},
+  "setup.default.editor.emacs": {"icon":"","label":"Emacs","when":"omarchy-cmd-present emacs","checked":"[[ \"$(omarchy-default-editor)\" == \"emacs\" ]]","action":"omarchy-default-editor emacs"},
+  "setup.security": {"icon":"","label":"Security","keywords":"fingerprint fido2"},
+  "setup.config": {"icon":"","label":"Config","keywords":"files hyprland bar quickshell"},
+  "setup.security.fingerprint": {"icon":"󰈷","label":"Fingerprint","action":"omarchy-launch-floating-terminal-with-presentation omarchy-setup-security-fingerprint"},
+  "setup.security.fido2": {"icon":"","label":"Fido2","keywords":"key","action":"omarchy-launch-floating-terminal-with-presentation omarchy-setup-security-fido2"},
+  "setup.config.hyprland": {"icon":"","label":"Hyprland","action":"omarchy-launch-config-editor \"$HOME/.config/hypr/hyprland.lua\""},
+  "setup.config.hyprsunset": {"icon":"","label":"Hyprsunset","keywords":"night light","action":"omarchy-launch-config-editor ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset"},
+  "setup.config.bar": {"icon":"󰍜","label":"Bar","keywords":"quickshell shell config settings widgets position","action":"omarchy-launch-bar-settings"},
+  "setup.config.xcompose": {"icon":"󰞅","label":"XCompose","keywords":"compose key","action":"omarchy-launch-config-editor ~/.XCompose && omarchy-restart-xcompose"},
+
+  // Install
+  "install.package": {"icon":"󰣇","label":"Package","keywords":"pacman aur","action":"xdg-terminal-exec --app-id=org.omarchy.terminal omarchy-pkg-install"},
+  "install.aur": {"icon":"󰣇","label":"AUR","keywords":"package","action":"xdg-terminal-exec --app-id=org.omarchy.terminal omarchy-pkg-aur-install"},
+  "install.webapp": {"icon":"","label":"Web App","keywords":"pwa","action":"omarchy-launch-floating-terminal-with-presentation omarchy-webapp-install"},
+  "install.tui": {"icon":"","label":"TUI","keywords":"terminal app","action":"omarchy-launch-floating-terminal-with-presentation omarchy-tui-install"},
+  "install.service": {"icon":"","label":"Service","keywords":"dropbox tailscale vpn"},
+  "install.style": {"icon":"","label":"Style","keywords":"theme background font","target":"style.install"},
+  "install.development": {"icon":"󰵮","label":"Development","keywords":"languages programming"},
+  "install.editor": {"icon":"","label":"Editor","keywords":"ide"},
+  "install.terminal": {"icon":"","label":"Terminal","keywords":"emulator"},
+  "install.browser": {"icon":"","label":"Browser","keywords":"web"},
+  "install.ai": {"icon":"󱚤","label":"AI","keywords":"dictation ollama lm studio crush"},
+  "install.gaming": {"icon":"","label":"Gaming","keywords":"steam battlenet retroarch minecraft lutris heroic blizzard"},
+  "install.windows": {"icon":"󰍲","label":"Windows","keywords":"vm","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-windows-vm install'"},
+  "install.browser.chrome": {"icon":"","label":"Chrome","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-browser chrome'"},
+  "install.browser.edge": {"icon":"","label":"Edge","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-browser edge'"},
+  "install.browser.brave": {"icon":"","label":"Brave","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-browser brave'"},
+  "install.browser.brave-origin": {"icon":"","label":"Brave Origin","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-browser brave-origin'"},
+  "install.browser.firefox": {"icon":"","label":"Firefox","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-browser firefox'"},
+  "install.browser.zen": {"icon":"󰖟","label":"Zen","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-browser zen'"},
+  "install.service.1password": {"icon":"󰢁","label":"1Password","keywords":"password","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-service-1password"},
+  "install.service.dropbox": {"icon":"","label":"Dropbox","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-service-dropbox"},
+  "install.service.spotify": {"icon":"󰓇","label":"Spotify","keywords":"music","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-service-spotify"},
+  "install.service.signal": {"icon":"󰭹","label":"Signal","keywords":"messenger chat","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-service-signal"},
+  "install.service.tailscale": {"icon":"","label":"Tailscale","keywords":"vpn","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-service-tailscale"},
+  "install.service.nordvpn": {"icon":"󱇱","label":"NordVPN [AUR]","keywords":"vpn","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-service-nordvpn"},
+  "install.service.once": {"icon":"󰏖","label":"ONCE","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-service-once"},
+  "install.service.bitwarden": {"icon":"󰟵","label":"Bitwarden","keywords":"password","action":"omarchy-install-and-launch Bitwarden 'bitwarden bitwarden-cli' bitwarden"},
+  "install.service.chromium-account": {"icon":"","label":"Chromium Account","keywords":"google","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-chromium-google-account"},
+  "install.editor.vscode": {"icon":"","label":"VSCode","keywords":"code","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-editor-vscode"},
+  "install.editor.cursor": {"icon":"","label":"Cursor","action":"omarchy-install-and-launch Cursor cursor-bin cursor"},
+  "install.editor.zed": {"icon":"","label":"Zed","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-editor-zed"},
+  "install.editor.sublime": {"icon":"","label":"Sublime Text","action":"omarchy-install-and-launch 'Sublime Text' sublime-text-4 sublime_text"},
+  "install.editor.helix": {"icon":"","label":"Helix","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-editor-helix"},
+  "install.editor.vim": {"icon":"","label":"Vim","action":"omarchy-install-app Vim vim"},
+  "install.editor.emacs": {"icon":"","label":"Emacs","action":"omarchy-install-app Emacs emacs-wayland && systemctl --user enable --now emacs.service"},
+  "install.terminal.alacritty": {"icon":"","label":"Alacritty","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-terminal alacritty'"},
+  "install.terminal.foot": {"icon":"","label":"Foot","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-terminal foot'"},
+  "install.terminal.ghostty": {"icon":"","label":"Ghostty","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-terminal ghostty'"},
+  "install.terminal.kitty": {"icon":"","label":"Kitty","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-terminal kitty'"},
+  "install.ai.dictation": {"icon":"","label":"Dictation","keywords":"voice","action":"omarchy-launch-floating-terminal-with-presentation omarchy-voxtype-install"},
+  "install.ai.lm-studio": {"icon":"󱚤","label":"LM Studio","action":"omarchy-install-app 'LM Studio' lmstudio-bin"},
+  "install.ai.ollama": {"icon":"󱚤","label":"Ollama","action":"if omarchy-cmd-present nvidia-smi; then ollama_pkg=ollama-cuda; elif omarchy-cmd-present rocminfo; then ollama_pkg=ollama-rocm; else ollama_pkg=ollama; fi; install Ollama \"$ollama_pkg\""},
+  "install.ai.crush": {"icon":"󱚤","label":"Crush","action":"omarchy-install-app Crush crush-bin"},
+  "install.gaming.steam": {"icon":"","label":"Steam","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-steam"},
+  "install.gaming.retroarch": {"icon":"󰯉","label":"RetroArch","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-retroarch"},
+  "install.gaming.minecraft": {"icon":"󰍳","label":"Minecraft","action":"omarchy-install-and-launch Minecraft minecraft-launcher minecraft-launcher"},
+  "install.gaming.geforce-now": {"icon":"󰢹","label":"NVIDIA GeForce NOW","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-geforce-now"},
+  "install.gaming.xbox-cloud": {"icon":"","label":"Xbox Cloud Gaming","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-xbox-cloud"},
+  "install.gaming.xbox-controllers": {"icon":"󰂯","label":"Xbox Controllers","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-xbox-controllers"},
+  "install.gaming.battlenet": {"icon":"","label":"Battle.net","keywords":"blizzard wow overwatch diablo","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-battlenet"},
+  "install.gaming.lutris": {"icon":"","label":"Lutris","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-lutris"},
+  "install.gaming.heroic": {"icon":"󱓟","label":"Heroic (Epic Games)","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-gaming-heroic"},
+  "install.gaming.retro-launcher": {"icon":"󰯉","label":"RetroArch Game Launcher","action":"omarchy-games-retro-install"},
+  "install.development.rails": {"icon":"󰫏","label":"Ruby on Rails","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env ruby'"},
+  "install.development.docker-dbs": {"icon":"","label":"Docker DB","keywords":"databases","action":"omarchy-launch-floating-terminal-with-presentation omarchy-install-docker-dbs"},
+  "install.development.javascript": {"icon":"","label":"JavaScript","keywords":"node bun deno"},
+  "install.development.go": {"icon":"","label":"Go","keywords":"golang","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env go'"},
+  "install.development.php": {"icon":"","label":"PHP","keywords":"laravel symfony"},
+  "install.development.python": {"icon":"","label":"Python","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env python'"},
+  "install.development.elixir": {"icon":"","label":"Elixir","keywords":"phoenix"},
+  "install.development.zig": {"icon":"","label":"Zig","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env zig'"},
+  "install.development.rust": {"icon":"","label":"Rust","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env rust'"},
+  "install.development.java": {"icon":"","label":"Java","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env java'"},
+  "install.development.dotnet": {"icon":"","label":".NET","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env dotnet'"},
+  "install.development.ocaml": {"icon":"","label":"OCaml","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env ocaml'"},
+  "install.development.clojure": {"icon":"","label":"Clojure","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env clojure'"},
+  "install.development.scala": {"icon":"","label":"Scala","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env scala'"},
+  "install.development.javascript.node": {"icon":"","label":"Node.js","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env node'"},
+  "install.development.javascript.bun": {"icon":"","label":"Bun","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env bun'"},
+  "install.development.javascript.deno": {"icon":"","label":"Deno","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env deno'"},
+  "install.development.php.php": {"icon":"","label":"PHP","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env php'"},
+  "install.development.php.laravel": {"icon":"","label":"Laravel","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env laravel'"},
+  "install.development.php.symfony": {"icon":"","label":"Symfony","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env symfony'"},
+  "install.development.elixir.elixir": {"icon":"","label":"Elixir","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env elixir'"},
+  "install.development.elixir.phoenix": {"icon":"","label":"Phoenix","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-install-dev-env phoenix'"},
+
+  // Remove
+  "remove.package": {"icon":"󰣇","label":"Package","keywords":"uninstall","action":"xdg-terminal-exec --app-id=org.omarchy.terminal omarchy-pkg-remove"},
+  "remove.webapp": {"icon":"","label":"Web App","keywords":"uninstall","action":"omarchy-webapp-remove"},
+  "remove.tui": {"icon":"","label":"TUI","keywords":"uninstall terminal app","action":"omarchy-tui-remove"},
+  "remove.development": {"icon":"󰵮","label":"Development","keywords":"uninstall languages"},
+  "remove.theme": {"icon":"󰸌","label":"Theme","keywords":"uninstall","action":"omarchy-theme-remove"},
+  "remove.browser": {"icon":"","label":"Browser","keywords":"uninstall"},
+  "remove.dictation": {"icon":"","label":"Dictation","keywords":"uninstall voice","action":"omarchy-launch-floating-terminal-with-presentation omarchy-voxtype-remove"},
+  "remove.gaming": {"icon":"","label":"Gaming","keywords":"uninstall steam retroarch minecraft"},
+  "remove.service": {"icon":"","label":"Services","keywords":"uninstall dropbox tailscale vpn","when":"omarchy-pkg-present dropbox || omarchy-pkg-present tailscale"},
+  "remove.windows": {"icon":"󰍲","label":"Windows","keywords":"uninstall vm","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-windows-vm remove'"},
+  "remove.preinstalls": {"icon":"󰏓","label":"Preinstalls","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-preinstalls"},
+  "remove.security": {"icon":"","label":"Security","keywords":"fingerprint fido2"},
+  "remove.security.fingerprint": {"icon":"󰈷","label":"Fingerprint","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-security-fingerprint"},
+  "remove.security.fido2": {"icon":"","label":"Fido2","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-security-fido2"},
+  "remove.browser.chrome": {"icon":"","label":"Chrome","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-browser chrome'"},
+  "remove.browser.edge": {"icon":"","label":"Edge","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-browser edge'"},
+  "remove.browser.brave": {"icon":"","label":"Brave","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-browser brave'"},
+  "remove.browser.brave-origin": {"icon":"","label":"Brave Origin","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-browser brave-origin'"},
+  "remove.browser.firefox": {"icon":"","label":"Firefox","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-browser firefox'"},
+  "remove.browser.zen": {"icon":"","label":"Zen","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-browser zen'"},
+  "remove.service.dropbox": {"icon":"","label":"Dropbox","when":"omarchy-pkg-present dropbox","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-service-dropbox"},
+  "remove.service.tailscale": {"icon":"","label":"Tailscale","keywords":"vpn","when":"omarchy-pkg-present tailscale","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-service-tailscale"},
+  "remove.gaming.steam": {"icon":"","label":"Steam","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-steam"},
+  "remove.gaming.retroarch": {"icon":"","label":"RetroArch","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-retroarch"},
+  "remove.gaming.minecraft": {"icon":"󰍳","label":"Minecraft","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-minecraft"},
+  "remove.gaming.geforce-now": {"icon":"󰢹","label":"NVIDIA GeForce NOW","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-geforce-now"},
+  "remove.gaming.xbox-cloud": {"icon":"","label":"Xbox Cloud Gaming","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-xbox-cloud"},
+  "remove.gaming.xbox-controllers": {"icon":"󰖺","label":"Xbox Controllers (󰂯)","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-xbox-controllers"},
+  "remove.gaming.moonlight": {"icon":"󰍹","label":"Moonlight (GameStream)","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-moonlight"},
+  "remove.gaming.battlenet": {"icon":"","label":"Battle.net","when":"[[ -d $HOME/Games/battlenet ]]","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-battlenet"},
+  "remove.gaming.lutris": {"icon":"","label":"Lutris","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-lutris"},
+  "remove.gaming.heroic": {"icon":"󱓟","label":"Heroic (Epic Games)","action":"omarchy-launch-floating-terminal-with-presentation omarchy-remove-gaming-heroic"},
+  "remove.development.rails": {"icon":"󰫏","label":"Ruby on Rails","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env ruby'"},
+  "remove.development.javascript": {"icon":"","label":"JavaScript","keywords":"node bun deno"},
+  "remove.development.go": {"icon":"","label":"Go","keywords":"golang","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env go'"},
+  "remove.development.php": {"icon":"","label":"PHP","keywords":"laravel symfony"},
+  "remove.development.python": {"icon":"","label":"Python","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env python'"},
+  "remove.development.elixir": {"icon":"","label":"Elixir","keywords":"phoenix"},
+  "remove.development.zig": {"icon":"","label":"Zig","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env zig'"},
+  "remove.development.rust": {"icon":"","label":"Rust","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env rust'"},
+  "remove.development.java": {"icon":"","label":"Java","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env java'"},
+  "remove.development.dotnet": {"icon":"","label":".NET","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env dotnet'"},
+  "remove.development.ocaml": {"icon":"","label":"OCaml","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env ocaml'"},
+  "remove.development.clojure": {"icon":"","label":"Clojure","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env clojure'"},
+  "remove.development.scala": {"icon":"","label":"Scala","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env scala'"},
+  "remove.development.javascript.node": {"icon":"","label":"Node.js","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env node'"},
+  "remove.development.javascript.bun": {"icon":"","label":"Bun","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env bun'"},
+  "remove.development.javascript.deno": {"icon":"","label":"Deno","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env deno'"},
+  "remove.development.php.php": {"icon":"","label":"PHP","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env php'"},
+  "remove.development.php.laravel": {"icon":"","label":"Laravel","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env laravel'"},
+  "remove.development.php.symfony": {"icon":"","label":"Symfony","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env symfony'"},
+  "remove.development.elixir.elixir": {"icon":"","label":"Elixir","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env elixir'"},
+  "remove.development.elixir.phoenix": {"icon":"","label":"Phoenix","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-remove-dev-env phoenix'"},
+
+  // Update
+  "update.omarchy": {"icon":"","label":"Omarchy","keywords":"system","action":"omarchy-launch-floating-terminal-with-presentation omarchy-update"},
+  "update.channel": {"icon":"󰔫","label":"Channel","keywords":"stable rc edge dev"},
+  "update.config": {"icon":"","label":"Config","keywords":"refresh default"},
+  "update.themes": {"icon":"󰸌","label":"Extra Themes","action":"omarchy-launch-floating-terminal-with-presentation omarchy-theme-update"},
+  "update.process": {"icon":"","label":"Process","keywords":"restart services"},
+  "update.hardware": {"icon":"󰇅","label":"Hardware","keywords":"restart audio wifi bluetooth trackpad"},
+  "update.firmware": {"icon":"","label":"Firmware","keywords":"fwupd","action":"omarchy-launch-floating-terminal-with-presentation omarchy-update-firmware"},
+  "update.password": {"icon":"","label":"Password","keywords":"drive user"},
+  "update.timezone": {"icon":"","label":"Timezone","keywords":"time zone","action":"omarchy-menu-timezone"},
+  "update.time": {"icon":"","label":"Time","keywords":"clock ntp","action":"omarchy-launch-floating-terminal-with-presentation omarchy-update-time"},
+  "update.channel.stable": {"icon":"🟢","label":"Stable","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-channel-set stable'"},
+  "update.channel.rc": {"icon":"🟡","label":"RC","keywords":"release candidate","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-channel-set rc'"},
+  "update.channel.edge": {"icon":"🟠","label":"Edge","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-channel-set edge'"},
+  "update.channel.dev": {"icon":"🔴","label":"Dev","keywords":"development","action":"omarchy-launch-floating-terminal-with-presentation 'omarchy-channel-set dev'"},
+  "update.process.hyprsunset": {"icon":"","label":"Hyprsunset","keywords":"restart","action":"omarchy-restart-hyprsunset"},
+  "update.process.osd": {"icon":"","label":"OSD","keywords":"restart","action":"omarchy-restart-shell"},
+  "update.process.shell": {"icon":"󰍜","label":"Shell","keywords":"restart bar quickshell omarchy-shell","action":"omarchy-restart-shell"},
+  "update.config.hyprland": {"icon":"","label":"Hyprland","keywords":"refresh","action":"omarchy-launch-floating-terminal-with-presentation omarchy-refresh-hyprland"},
+  "update.config.hyprsunset": {"icon":"","label":"Hyprsunset","keywords":"refresh","action":"omarchy-launch-floating-terminal-with-presentation omarchy-refresh-hyprsunset"},
+  "update.config.plymouth": {"icon":"󱣴","label":"Plymouth","keywords":"refresh","action":"omarchy-launch-floating-terminal-with-presentation omarchy-refresh-plymouth"},
+  "update.config.osd": {"icon":"","label":"OSD","keywords":"refresh","action":"omarchy-restart-shell"},
+  "update.config.tmux": {"icon":"","label":"Tmux","keywords":"refresh","action":"omarchy-launch-floating-terminal-with-presentation omarchy-refresh-tmux"},
+  "update.config.shell": {"icon":"󰍜","label":"Shell","keywords":"refresh bar quickshell","action":"omarchy-launch-floating-terminal-with-presentation omarchy-refresh-shell"},
+  "update.hardware.audio": {"icon":"","label":"Audio","keywords":"restart audio pipewire speakers usb","action":"omarchy-launch-floating-terminal-with-presentation omarchy-restart-audio"},
+  "update.hardware.wifi": {"icon":"󱚾","label":"Wi-Fi","keywords":"restart wireless","action":"omarchy-launch-floating-terminal-with-presentation omarchy-restart-wifi"},
+  "update.hardware.bluetooth": {"icon":"󰂯","label":"Bluetooth","keywords":"restart","action":"omarchy-launch-floating-terminal-with-presentation omarchy-restart-bluetooth"},
+  "update.hardware.trackpad": {"icon":"󰟸","label":"Trackpad","keywords":"restart touchpad","action":"omarchy-launch-floating-terminal-with-presentation omarchy-restart-trackpad"},
+  "update.password.drive": {"icon":"","label":"Drive Encryption","action":"omarchy-launch-floating-terminal-with-presentation omarchy-drive-password"},
+  "update.password.user": {"icon":"","label":"User","keywords":"passwd","action":"omarchy-launch-floating-terminal-with-presentation passwd"},
+}
diff --git a/default/pi/agent/extensions/omarchy-system-theme.ts b/default/pi/agent/extensions/omarchy-system-theme.ts
deleted file mode 100644
index 2c54f2a1..00000000
--- a/default/pi/agent/extensions/omarchy-system-theme.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Syncs pi's light/dark theme with the active Omarchy theme.
- *
- * Omarchy light themes include:
- *   ~/.config/omarchy/current/theme/light.mode
- */
-
-import { existsSync } from "node:fs";
-import { join } from "node:path";
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-
-const home = process.env.HOME ?? "";
-const lightModePath = join(home, ".config/omarchy/current/theme/light.mode");
-
-function omarchyPiTheme(): "light" | "dark" {
-	return existsSync(lightModePath) ? "light" : "dark";
-}
-
-export default function (pi: ExtensionAPI) {
-	let intervalId: ReturnType<typeof setInterval> | null = null;
-
-	pi.on("session_start", (_event, ctx) => {
-		let currentTheme = omarchyPiTheme();
-		ctx.ui.setTheme(currentTheme);
-
-		intervalId = setInterval(() => {
-			const nextTheme = omarchyPiTheme();
-			if (nextTheme !== currentTheme) {
-				currentTheme = nextTheme;
-				ctx.ui.setTheme(currentTheme);
-			}
-		}, 2000);
-	});
-
-	pi.on("session_shutdown", () => {
-		if (intervalId) {
-			clearInterval(intervalId);
-			intervalId = null;
-		}
-	});
-}
diff --git a/default/sddm/hyprland.conf b/default/sddm/hyprland.conf
deleted file mode 100644
index 4ce15a75..00000000
--- a/default/sddm/hyprland.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Minimal Hyprland config for the SDDM Wayland greeter.
-# SDDM starts the greeter itself after the compositor is ready.
-misc {
-  disable_hyprland_logo = true
-  disable_splash_rendering = true
-  force_default_wallpaper = 0
-}
-
-animations {
-  enabled = false
-}
diff --git a/default/sddm/hyprland.lua b/default/sddm/hyprland.lua
new file mode 100644
index 00000000..977ae17e
--- /dev/null
+++ b/default/sddm/hyprland.lua
@@ -0,0 +1,13 @@
+-- Minimal Hyprland config for the SDDM Wayland greeter.
+-- SDDM starts the greeter itself after the compositor is ready.
+hl.config({
+  misc = {
+    disable_hyprland_logo = true,
+    disable_splash_rendering = true,
+    force_default_wallpaper = 0,
+  },
+
+  animations = {
+    enabled = false,
+  },
+})
diff --git a/default/systemd/user/bt-agent.service b/default/systemd/user/bt-agent.service
new file mode 100644
index 00000000..cad87cef
--- /dev/null
+++ b/default/systemd/user/bt-agent.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Bluetooth pairing agent (auto-accept)
+Documentation=man:bt-agent(1)
+ConditionPathIsDirectory=/sys/class/bluetooth
+# bluez must be reachable on the system bus before we can register.
+After=dbus.socket
+Requires=dbus.socket
+
+[Service]
+Type=simple
+# If bluetoothd is unavailable (for example in VMs or machines without a
+# usable adapter), skip cleanly instead of entering a restart loop.
+ExecCondition=/usr/bin/systemctl is-active --quiet bluetooth.service
+# NoInputNoOutput auto-accepts pair requests. Safe because the adapter
+# is only `pairable: true` when the user explicitly opens the omarchy
+# bluetoothPanel and starts scanning; outside that window bluez refuses
+# inbound pair attempts at a lower layer.
+ExecStart=/usr/bin/bt-agent -c NoInputNoOutput
+Restart=on-failure
+RestartSec=2
+
+[Install]
+WantedBy=graphical-session.target
diff --git a/config/systemd/user/omarchy-recover-internal-monitor.service b/default/systemd/user/omarchy-recover-internal-monitor.service
similarity index 73%
rename from config/systemd/user/omarchy-recover-internal-monitor.service
rename to default/systemd/user/omarchy-recover-internal-monitor.service
index fef52180..1e32afc7 100644
--- a/config/systemd/user/omarchy-recover-internal-monitor.service
+++ b/default/systemd/user/omarchy-recover-internal-monitor.service
@@ -1,11 +1,11 @@
 [Unit]
 Description=Recover the internal monitor toggle when no external display is connected
 Before=graphical-session-pre.target
-ConditionPathExists=%h/.local/state/omarchy/toggles/hypr/internal-monitor-disable.conf
+ConditionPathExists=%h/.local/state/omarchy/toggles/hypr/internal-monitor-disable.lua
 
 [Service]
 Type=oneshot
-ExecStart=%h/.local/share/omarchy/bin/omarchy-hw-recover-internal-monitor
+ExecStart=/usr/bin/omarchy-hw-recover-internal-monitor
 
 [Install]
 WantedBy=graphical-session-pre.target
diff --git a/default/systemd/user/omarchy-sleep-lock.service b/default/systemd/user/omarchy-sleep-lock.service
new file mode 100644
index 00000000..8bf696fe
--- /dev/null
+++ b/default/systemd/user/omarchy-sleep-lock.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Lock Omarchy before suspend
+After=dbus.socket
+Requires=dbus.socket
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/omarchy-system-sleep-monitor
+Restart=always
+RestartSec=2
+
+[Install]
+WantedBy=graphical-session.target
diff --git a/default/systemd/user/omarchy-update-user-notify.path b/default/systemd/user/omarchy-update-user-notify.path
new file mode 100644
index 00000000..2eb100eb
--- /dev/null
+++ b/default/systemd/user/omarchy-update-user-notify.path
@@ -0,0 +1,10 @@
+[Unit]
+Description=Watch for Omarchy user migrations
+
+[Path]
+PathExistsGlob=/usr/share/omarchy/migrations/user/*.sh
+PathModified=/usr/share/omarchy/migrations/user
+Unit=omarchy-update-user-notify.service
+
+[Install]
+WantedBy=graphical-session.target
diff --git a/default/systemd/user/omarchy-update-user-notify.service b/default/systemd/user/omarchy-update-user-notify.service
new file mode 100644
index 00000000..ae4c98b8
--- /dev/null
+++ b/default/systemd/user/omarchy-update-user-notify.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Notify about pending Omarchy user migrations
+ConditionPathExistsGlob=/usr/share/omarchy/migrations/user/*.sh
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/omarchy-migrate-notify
diff --git a/default/themed/alacritty.toml.tpl b/default/themed/alacritty.toml.tpl
index ff8bc8df..ca328bb8 100644
--- a/default/themed/alacritty.toml.tpl
+++ b/default/themed/alacritty.toml.tpl
@@ -12,11 +12,11 @@ cursor = "{{ cursor }}"
 
 [colors.search.matches]
 foreground = "{{ background }}"
-background = "{{ color3 }}"
+background = "{{ yellow }}"
 
 [colors.search.focused_match]
 foreground = "{{ background }}"
-background = "{{ color1 }}"
+background = "{{ red }}"
 
 [colors.footer_bar]
 foreground = "{{ background }}"
@@ -27,21 +27,21 @@ text = "{{ selection_foreground }}"
 background = "{{ selection_background }}"
 
 [colors.normal]
-black = "{{ color0 }}"
-red = "{{ color1 }}"
-green = "{{ color2 }}"
-yellow = "{{ color3 }}"
-blue = "{{ color4 }}"
-magenta = "{{ color5 }}"
-cyan = "{{ color6 }}"
-white = "{{ color7 }}"
+black = "{{ bg }}"
+red = "{{ red }}"
+green = "{{ green }}"
+yellow = "{{ yellow }}"
+blue = "{{ blue }}"
+magenta = "{{ magenta }}"
+cyan = "{{ cyan }}"
+white = "{{ fg }}"
 
 [colors.bright]
-black = "{{ color8 }}"
-red = "{{ color9 }}"
-green = "{{ color10 }}"
-yellow = "{{ color11 }}"
-blue = "{{ color12 }}"
-magenta = "{{ color13 }}"
-cyan = "{{ color14 }}"
-white = "{{ color15 }}"
+black = "{{ muted }}"
+red = "{{ bright_red }}"
+green = "{{ bright_green }}"
+yellow = "{{ bright_yellow }}"
+blue = "{{ bright_blue }}"
+magenta = "{{ bright_magenta }}"
+cyan = "{{ bright_cyan }}"
+white = "{{ bright_fg }}"
diff --git a/default/themed/btop.theme.tpl b/default/themed/btop.theme.tpl
index 7b1b299d..0a77fd1c 100644
--- a/default/themed/btop.theme.tpl
+++ b/default/themed/btop.theme.tpl
@@ -11,73 +11,83 @@ theme[title]="{{ foreground }}"
 theme[hi_fg]="{{ accent }}"
 
 # Background color of selected item in processes box
-theme[selected_bg]="{{ color8 }}"
+theme[selected_bg]="{{ selection }}"
 
 # Foreground color of selected item in processes box
 theme[selected_fg]="{{ accent }}"
 
 # Color of inactive/disabled text
-theme[inactive_fg]="{{ color8 }}"
+theme[inactive_fg]="{{ muted }}"
 
 # Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="{{ foreground }}"
+theme[graph_text]="{{ light_fg }}"
 
 # Background color of the percentage meters
-theme[meter_bg]="{{ color8 }}"
+theme[meter_bg]="{{ selection }}"
 
 # Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="{{ foreground }}"
+theme[proc_misc]="{{ light_fg }}"
 
 # CPU, Memory, Network, Proc box outline colors
-theme[cpu_box]="{{ color5 }}"
-theme[mem_box]="{{ color2 }}"
-theme[net_box]="{{ color1 }}"
+theme[cpu_box]="{{ magenta }}"
+theme[mem_box]="{{ green }}"
+theme[net_box]="{{ red }}"
 theme[proc_box]="{{ accent }}"
 
 # Box divider line and small boxes line color
-theme[div_line]="{{ color8 }}"
+theme[div_line]="{{ muted }}"
 
 # Temperature graph color (Green -> Yellow -> Red)
-theme[temp_start]="{{ color2 }}"
-theme[temp_mid]="{{ color3 }}"
-theme[temp_end]="{{ color1 }}"
+theme[temp_start]="{{ green }}"
+theme[temp_mid]="{{ yellow }}"
+theme[temp_end]="{{ red }}"
 
-# CPU graph colors (Teal -> Lavender)
-theme[cpu_start]="{{ color6 }}"
-theme[cpu_mid]="{{ color4 }}"
-theme[cpu_end]="{{ color5 }}"
+# CPU graph colors (Teal -> Blue -> Magenta)
+theme[cpu_start]="{{ cyan }}"
+theme[cpu_mid]="{{ blue }}"
+theme[cpu_end]="{{ magenta }}"
 
-# Mem/Disk free meter (Mauve -> Lavender -> Blue)
-theme[free_start]="{{ color5 }}"
-theme[free_mid]="{{ color4 }}"
-theme[free_end]="{{ color6 }}"
+# Mem/Disk free meter
+theme[free_start]="{{ magenta }}"
+theme[free_mid]="{{ blue }}"
+theme[free_end]="{{ cyan }}"
 
-# Mem/Disk cached meter (Sapphire -> Lavender)
-theme[cached_start]="{{ color4 }}"
-theme[cached_mid]="{{ color6 }}"
-theme[cached_end]="{{ color5 }}"
+# Mem/Disk cached meter
+theme[cached_start]="{{ blue }}"
+theme[cached_mid]="{{ cyan }}"
+theme[cached_end]="{{ magenta }}"
 
-# Mem/Disk available meter (Peach -> Red)
-theme[available_start]="{{ color3 }}"
-theme[available_mid]="{{ color1 }}"
-theme[available_end]="{{ color1 }}"
+# Mem/Disk available meter
+theme[available_start]="{{ yellow }}"
+theme[available_mid]="{{ red }}"
+theme[available_end]="{{ red }}"
 
-# Mem/Disk used meter (Green -> Sky)
-theme[used_start]="{{ color2 }}"
-theme[used_mid]="{{ color6 }}"
-theme[used_end]="{{ color4 }}"
+# Mem/Disk used meter (Green -> Teal -> Blue)
+theme[used_start]="{{ green }}"
+theme[used_mid]="{{ cyan }}"
+theme[used_end]="{{ blue }}"
 
-# Download graph colors (Peach -> Red)
-theme[download_start]="{{ color3 }}"
-theme[download_mid]="{{ color1 }}"
-theme[download_end]="{{ color1 }}"
+# Download graph colors
+theme[download_start]="{{ yellow }}"
+theme[download_mid]="{{ red }}"
+theme[download_end]="{{ red }}"
 
-# Upload graph colors (Green -> Sky)
-theme[upload_start]="{{ color2 }}"
-theme[upload_mid]="{{ color6 }}"
-theme[upload_end]="{{ color4 }}"
+# Upload graph colors (Green -> Teal -> Blue)
+theme[upload_start]="{{ green }}"
+theme[upload_mid]="{{ cyan }}"
+theme[upload_end]="{{ blue }}"
 
-# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
-theme[process_start]="{{ color6 }}"
-theme[process_mid]="{{ color4 }}"
-theme[process_end]="{{ color5 }}"
+# Process box color gradient for threads, mem and cpu usage
+theme[process_start]="{{ cyan }}"
+theme[process_mid]="{{ blue }}"
+theme[process_end]="{{ magenta }}"
+
+# Graph gradient colors (spectrum shades from background to foreground)
+theme[gradient_color_0]="{{ bg }}"
+theme[gradient_color_1]="{{ lighter_bg }}"
+theme[gradient_color_2]="{{ selection }}"
+theme[gradient_color_3]="{{ muted }}"
+theme[gradient_color_4]="{{ dark_fg }}"
+theme[gradient_color_5]="{{ fg }}"
+theme[gradient_color_6]="{{ light_fg }}"
+theme[gradient_color_7]="{{ bright_fg }}"
diff --git a/default/themed/foot.ini.tpl b/default/themed/foot.ini.tpl
index c56dc610..9191942e 100644
--- a/default/themed/foot.ini.tpl
+++ b/default/themed/foot.ini.tpl
@@ -6,20 +6,20 @@ selection-background={{ selection_background_strip }}
 
 cursor={{ background_strip }} {{ cursor_strip }}
 
-regular0={{ color0_strip }}
-regular1={{ color1_strip }}
-regular2={{ color2_strip }}
-regular3={{ color3_strip }}
-regular4={{ color4_strip }}
-regular5={{ color5_strip }}
-regular6={{ color6_strip }}
-regular7={{ color7_strip }}
+regular0={{ bg_strip }}
+regular1={{ red_strip }}
+regular2={{ green_strip }}
+regular3={{ yellow_strip }}
+regular4={{ blue_strip }}
+regular5={{ purple_strip }}
+regular6={{ cyan_strip }}
+regular7={{ fg_strip }}
 
-bright0={{ color8_strip }}
-bright1={{ color9_strip }}
-bright2={{ color10_strip }}
-bright3={{ color11_strip }}
-bright4={{ color12_strip }}
-bright5={{ color13_strip }}
-bright6={{ color14_strip }}
-bright7={{ color15_strip }}
+bright0={{ muted_strip }}
+bright1={{ bright_red_strip }}
+bright2={{ bright_green_strip }}
+bright3={{ bright_yellow_strip }}
+bright4={{ bright_blue_strip }}
+bright5={{ bright_magenta_strip }}
+bright6={{ bright_cyan_strip }}
+bright7={{ bright_fg_strip }}
diff --git a/default/themed/ghostty.conf.tpl b/default/themed/ghostty.conf.tpl
index bafc6498..6e76b09c 100644
--- a/default/themed/ghostty.conf.tpl
+++ b/default/themed/ghostty.conf.tpl
@@ -4,19 +4,19 @@ cursor-color = {{ cursor }}
 selection-background = {{ selection_background }}
 selection-foreground = {{ selection_foreground }}
 
-palette = 0={{ color0 }}
-palette = 1={{ color1 }}
-palette = 2={{ color2 }}
-palette = 3={{ color3 }}
-palette = 4={{ color4 }}
-palette = 5={{ color5 }}
-palette = 6={{ color6 }}
-palette = 7={{ color7 }}
-palette = 8={{ color8 }}
-palette = 9={{ color9 }}
-palette = 10={{ color10 }}
-palette = 11={{ color11 }}
-palette = 12={{ color12 }}
-palette = 13={{ color13 }}
-palette = 14={{ color14 }}
-palette = 15={{ color15 }}
+palette = 0={{ bg }}
+palette = 1={{ red }}
+palette = 2={{ green }}
+palette = 3={{ yellow }}
+palette = 4={{ blue }}
+palette = 5={{ magenta }}
+palette = 6={{ cyan }}
+palette = 7={{ fg }}
+palette = 8={{ muted }}
+palette = 9={{ bright_red }}
+palette = 10={{ bright_green }}
+palette = 11={{ bright_yellow }}
+palette = 12={{ bright_blue }}
+palette = 13={{ bright_magenta }}
+palette = 14={{ bright_cyan }}
+palette = 15={{ bright_fg }}
diff --git a/default/themed/gum.env.conf.tpl b/default/themed/gum.env.conf.tpl
deleted file mode 100644
index 616f5a5f..00000000
--- a/default/themed/gum.env.conf.tpl
+++ /dev/null
@@ -1,137 +0,0 @@
-# Gum Style (generic) Variables
-env = FOREGROUND,#{{ foreground }}
-env = BACKGROUND,#{{ background }}
-env = BORDER_FOREGROUND,#{{ accent }}
-env = BORDER_BACKGROUND,#{{ background }}
-
-# Gum Confirm Style Variables
-env = GUM_CONFIRM_PROMPT_FOREGROUND,#{{ accent }}
-env = GUM_CONFIRM_PROMPT_BACKGROUND,#{{ background }}
-env = GUM_CONFIRM_SELECTED_FOREGROUND,#{{ selection_foreground }}
-env = GUM_CONFIRM_SELECTED_BACKGROUND,#{{ selection_background }}
-env = GUM_CONFIRM_UNSELECTED_FOREGROUND,#{{ foreground }}
-env = GUM_CONFIRM_UNSELECTED_BACKGROUND,#{{ background }}
-
-# Gum Input Style Variables
-env = GUM_INPUT_PROMPT_FOREGROUND,#{{ accent }}
-env = GUM_INPUT_PROMPT_BACKGROUND,#{{ background }}
-env = GUM_INPUT_PLACEHOLDER_FOREGROUND,#{{ color8 }}
-env = GUM_INPUT_PLACEHOLDER_BACKGROUND,#{{ background }}
-env = GUM_INPUT_CURSOR_FOREGROUND,#{{ cursor }}
-env = GUM_INPUT_CURSOR_BACKGROUND,#{{ background }}
-env = GUM_INPUT_HEADER_FOREGROUND,#{{ foreground }}
-env = GUM_INPUT_HEADER_BACKGROUND,#{{ background }}
-
-# Gum Choose Style Variables
-env = GUM_CHOOSE_CURSOR_FOREGROUND,#{{ accent }}
-env = GUM_CHOOSE_CURSOR_BACKGROUND,#{{ background }}
-env = GUM_CHOOSE_HEADER_FOREGROUND,#{{ foreground }}
-env = GUM_CHOOSE_HEADER_BACKGROUND,#{{ background }}
-env = GUM_CHOOSE_ITEM_FOREGROUND,#{{ foreground }}
-env = GUM_CHOOSE_ITEM_BACKGROUND,#{{ background }}
-env = GUM_CHOOSE_SELECTED_FOREGROUND,#{{ selection_foreground }}
-env = GUM_CHOOSE_SELECTED_BACKGROUND,#{{ selection_background }}
-
-# Gum Filter Style Variables
-env = GUM_FILTER_PROMPT_FOREGROUND,#{{ accent }}
-env = GUM_FILTER_PROMPT_BACKGROUND,#{{ background }}
-env = GUM_FILTER_TEXT_FOREGROUND,#{{ foreground }}
-env = GUM_FILTER_TEXT_BACKGROUND,#{{ background }}
-env = GUM_FILTER_MATCH_FOREGROUND,#{{ accent }}
-env = GUM_FILTER_CURSOR_TEXT_FOREGROUND,#{{ cursor }}
-env = GUM_FILTER_CURSOR_TEXT_BACKGROUND,#{{ background }}
-env = GUM_FILTER_SELECTED_FOREGROUND,#{{ selection_foreground }}
-env = GUM_FILTER_SELECTED_BACKGROUND,#{{ selection_background }}
-env = GUM_FILTER_INDICATOR_FOREGROUND,#{{ accent }}
-env = GUM_FILTER_HEADER_FOREGROUND,#{{ foreground }}
-env = GUM_FILTER_MATCH_BACKGROUND,#{{ background }}
-env = GUM_FILTER_HEADER_BACKGROUND,#{{ background }}
-env = GUM_FILTER_PLACEHOLDER_FOREGROUND,#{{ color8 }}
-env = GUM_FILTER_PLACEHOLDER_BACKGROUND,#{{ background }}
-env = GUM_FILTER_INDICATOR_BACKGROUND,#{{ background }}
-env = GUM_FILTER_SELECTED_PREFIX_FOREGROUND,#{{ selection_foreground }}
-env = GUM_FILTER_SELECTED_PREFIX_BACKGROUND,#{{ selection_background }}
-env = GUM_FILTER_UNSELECTED_PREFIX_FOREGROUND,#{{ color8 }}
-env = GUM_FILTER_UNSELECTED_PREFIX_BACKGROUND,#{{ background }}
-
-# Gum Table Style Variables
-env = GUM_TABLE_HEADER_FOREGROUND,#{{ foreground }}
-env = GUM_TABLE_HEADER_BACKGROUND,#{{ background }}
-env = GUM_TABLE_CELL_FOREGROUND,#{{ foreground }}
-env = GUM_TABLE_CELL_BACKGROUND,#{{ background }}
-env = GUM_TABLE_BORDER_FOREGROUND,#{{ color8 }}
-env = GUM_TABLE_BORDER_BACKGROUND,#{{ background }}
-env = GUM_TABLE_SELECTED_FOREGROUND,#{{ selection_foreground }}
-env = GUM_TABLE_SELECTED_BACKGROUND,#{{ selection_background }}
-
-# Gum Spin Style Variables
-env = GUM_SPIN_SPINNER_FOREGROUND,#{{ accent }}
-env = GUM_SPIN_SPINNER_BACKGROUND,#{{ background }}
-env = GUM_SPIN_TITLE_FOREGROUND,#{{ foreground }}
-env = GUM_SPIN_TITLE_BACKGROUND,#{{ background }}
-
-# Gum File Style Variables
-env = GUM_FILE_CURSOR_FOREGROUND,#{{ cursor }}
-env = GUM_FILE_CURSOR_BACKGROUND,#{{ background }}
-env = GUM_FILE_SYMLINK_FOREGROUND,#{{ foreground }}
-env = GUM_FILE_SYMLINK_BACKGROUND,#{{ background }}
-env = GUM_FILE_DIRECTORY_FOREGROUND,#{{ foreground }}
-env = GUM_FILE_DIRECTORY_BACKGROUND,#{{ background }}
-env = GUM_FILE_FILE_FOREGROUND,#{{ foreground }}
-env = GUM_FILE_FILE_BACKGROUND,#{{ background }}
-env = GUM_FILE_PERMISSIONS_FOREGROUND,#{{ color8 }}
-env = GUM_FILE_PERMISSIONS_BACKGROUND,#{{ background }}
-env = GUM_FILE_SELECTED_FOREGROUND,#{{ selection_foreground }}
-env = GUM_FILE_SELECTED_BACKGROUND,#{{ selection_background }}
-env = GUM_FILE_FILE_SIZE_FOREGROUND,#{{ color8 }}
-env = GUM_FILE_FILE_SIZE_BACKGROUND,#{{ background }}
-env = GUM_FILE_HEADER_FOREGROUND,#{{ foreground }}
-env = GUM_FILE_HEADER_BACKGROUND,#{{ background }}
-
-# Gum Pager Style Variables
-env = GUM_PAGER_FOREGROUND,#{{ foreground }}
-env = GUM_PAGER_BACKGROUND,#{{ background }}
-env = GUM_PAGER_LINE_NUMBER_FOREGROUND,#{{ color8 }}
-env = GUM_PAGER_LINE_NUMBER_BACKGROUND,#{{ background }}
-env = GUM_PAGER_MATCH_FOREGROUND,#{{ accent }}
-env = GUM_PAGER_MATCH_BACKGROUND,#{{ background }}
-env = GUM_PAGER_MATCH_HIGH_FOREGROUND,#{{ accent }}
-env = GUM_PAGER_MATCH_HIGH_BACKGROUND,#{{ background }}
-env = GUM_PAGER_HELP_FOREGROUND,#{{ color8 }}
-env = GUM_PAGER_HELP_BACKGROUND,#{{ background }}
-
-# Gum Write Style Variables
-env = GUM_WRITE_BASE_FOREGROUND,#{{ foreground }}
-env = GUM_WRITE_BASE_BACKGROUND,#{{ background }}
-env = GUM_WRITE_CURSOR_LINE_NUMBER_FOREGROUND,#{{ color8 }}
-env = GUM_WRITE_CURSOR_LINE_NUMBER_BACKGROUND,#{{ background }}
-env = GUM_WRITE_CURSOR_LINE_FOREGROUND,#{{ foreground }}
-env = GUM_WRITE_CURSOR_LINE_BACKGROUND,#{{ selection_background }}
-env = GUM_WRITE_CURSOR_FOREGROUND,#{{ cursor }}
-env = GUM_WRITE_CURSOR_BACKGROUND,#{{ background }}
-env = GUM_WRITE_END_OF_BUFFER_FOREGROUND,#{{ color8 }}
-env = GUM_WRITE_END_OF_BUFFER_BACKGROUND,#{{ background }}
-env = GUM_WRITE_LINE_NUMBER_FOREGROUND,#{{ color8 }}
-env = GUM_WRITE_LINE_NUMBER_BACKGROUND,#{{ background }}
-env = GUM_WRITE_HEADER_FOREGROUND,#{{ foreground }}
-env = GUM_WRITE_HEADER_BACKGROUND,#{{ background }}
-env = GUM_WRITE_PLACEHOLDER_FOREGROUND,#{{ color8 }}
-env = GUM_WRITE_PLACEHOLDER_BACKGROUND,#{{ background }}
-env = GUM_WRITE_PROMPT_FOREGROUND,#{{ foreground }}
-env = GUM_WRITE_PROMPT_BACKGROUND,#{{ background }}
-
-# Gum Log Style Variables
-env = GUM_LOG_LEVEL_FOREGROUND,#{{ accent }}
-env = GUM_LOG_LEVEL_BACKGROUND,#{{ background }}
-env = GUM_LOG_TIME_FOREGROUND,#{{ color8 }}
-env = GUM_LOG_TIME_BACKGROUND,#{{ background }}
-env = GUM_LOG_PREFIX_FOREGROUND,#{{ foreground }}
-env = GUM_LOG_PREFIX_BACKGROUND,#{{ background }}
-env = GUM_LOG_MESSAGE_FOREGROUND,#{{ foreground }}
-env = GUM_LOG_MESSAGE_BACKGROUND,#{{ background }}
-env = GUM_LOG_KEY_FOREGROUND,#{{ foreground }}
-env = GUM_LOG_KEY_BACKGROUND,#{{ background }}
-env = GUM_LOG_VALUE_FOREGROUND,#{{ foreground }}
-env = GUM_LOG_VALUE_BACKGROUND,#{{ background }}
-env = GUM_LOG_SEPARATOR_FOREGROUND,#{{ color8 }}
-env = GUM_LOG_SEPARATOR_BACKGROUND,#{{ background }}
\ No newline at end of file
diff --git a/default/themed/gum_env.lua.tpl b/default/themed/gum_env.lua.tpl
new file mode 100644
index 00000000..704ec1bb
--- /dev/null
+++ b/default/themed/gum_env.lua.tpl
@@ -0,0 +1,137 @@
+-- Gum Style (generic) Variables
+hl.env("FOREGROUND", "{{ foreground }}")
+hl.env("BACKGROUND", "{{ background }}")
+hl.env("BORDER_FOREGROUND", "{{ accent }}")
+hl.env("BORDER_BACKGROUND", "{{ background }}")
+
+-- Gum Confirm Style Variables
+hl.env("GUM_CONFIRM_PROMPT_FOREGROUND", "{{ accent }}")
+hl.env("GUM_CONFIRM_PROMPT_BACKGROUND", "{{ background }}")
+hl.env("GUM_CONFIRM_SELECTED_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_CONFIRM_SELECTED_BACKGROUND", "{{ selection_background }}")
+hl.env("GUM_CONFIRM_UNSELECTED_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_CONFIRM_UNSELECTED_BACKGROUND", "{{ background }}")
+
+-- Gum Input Style Variables
+hl.env("GUM_INPUT_PROMPT_FOREGROUND", "{{ accent }}")
+hl.env("GUM_INPUT_PROMPT_BACKGROUND", "{{ background }}")
+hl.env("GUM_INPUT_PLACEHOLDER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_INPUT_PLACEHOLDER_BACKGROUND", "{{ background }}")
+hl.env("GUM_INPUT_CURSOR_FOREGROUND", "{{ cursor }}")
+hl.env("GUM_INPUT_CURSOR_BACKGROUND", "{{ background }}")
+hl.env("GUM_INPUT_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_INPUT_HEADER_BACKGROUND", "{{ background }}")
+
+-- Gum Choose Style Variables
+hl.env("GUM_CHOOSE_CURSOR_FOREGROUND", "{{ accent }}")
+hl.env("GUM_CHOOSE_CURSOR_BACKGROUND", "{{ background }}")
+hl.env("GUM_CHOOSE_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_CHOOSE_HEADER_BACKGROUND", "{{ background }}")
+hl.env("GUM_CHOOSE_ITEM_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_CHOOSE_ITEM_BACKGROUND", "{{ background }}")
+hl.env("GUM_CHOOSE_SELECTED_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_CHOOSE_SELECTED_BACKGROUND", "{{ selection_background }}")
+
+-- Gum Filter Style Variables
+hl.env("GUM_FILTER_PROMPT_FOREGROUND", "{{ accent }}")
+hl.env("GUM_FILTER_PROMPT_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_TEXT_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILTER_TEXT_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_MATCH_FOREGROUND", "{{ accent }}")
+hl.env("GUM_FILTER_CURSOR_TEXT_FOREGROUND", "{{ cursor }}")
+hl.env("GUM_FILTER_CURSOR_TEXT_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_SELECTED_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_FILTER_SELECTED_BACKGROUND", "{{ selection_background }}")
+hl.env("GUM_FILTER_INDICATOR_FOREGROUND", "{{ accent }}")
+hl.env("GUM_FILTER_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILTER_MATCH_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_HEADER_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_PLACEHOLDER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_FILTER_PLACEHOLDER_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_INDICATOR_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILTER_SELECTED_PREFIX_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_FILTER_SELECTED_PREFIX_BACKGROUND", "{{ selection_background }}")
+hl.env("GUM_FILTER_UNSELECTED_PREFIX_FOREGROUND", "{{ muted }}")
+hl.env("GUM_FILTER_UNSELECTED_PREFIX_BACKGROUND", "{{ background }}")
+
+-- Gum Table Style Variables
+hl.env("GUM_TABLE_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_TABLE_HEADER_BACKGROUND", "{{ background }}")
+hl.env("GUM_TABLE_CELL_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_TABLE_CELL_BACKGROUND", "{{ background }}")
+hl.env("GUM_TABLE_BORDER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_TABLE_BORDER_BACKGROUND", "{{ background }}")
+hl.env("GUM_TABLE_SELECTED_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_TABLE_SELECTED_BACKGROUND", "{{ selection_background }}")
+
+-- Gum Spin Style Variables
+hl.env("GUM_SPIN_SPINNER_FOREGROUND", "{{ accent }}")
+hl.env("GUM_SPIN_SPINNER_BACKGROUND", "{{ background }}")
+hl.env("GUM_SPIN_TITLE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_SPIN_TITLE_BACKGROUND", "{{ background }}")
+
+-- Gum File Style Variables
+hl.env("GUM_FILE_CURSOR_FOREGROUND", "{{ cursor }}")
+hl.env("GUM_FILE_CURSOR_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_SYMLINK_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILE_SYMLINK_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_DIRECTORY_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILE_DIRECTORY_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_FILE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILE_FILE_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_PERMISSIONS_FOREGROUND", "{{ muted }}")
+hl.env("GUM_FILE_PERMISSIONS_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_SELECTED_FOREGROUND", "{{ selection_foreground }}")
+hl.env("GUM_FILE_SELECTED_BACKGROUND", "{{ selection_background }}")
+hl.env("GUM_FILE_FILE_SIZE_FOREGROUND", "{{ muted }}")
+hl.env("GUM_FILE_FILE_SIZE_BACKGROUND", "{{ background }}")
+hl.env("GUM_FILE_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_FILE_HEADER_BACKGROUND", "{{ background }}")
+
+-- Gum Pager Style Variables
+hl.env("GUM_PAGER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_PAGER_BACKGROUND", "{{ background }}")
+hl.env("GUM_PAGER_LINE_NUMBER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_PAGER_LINE_NUMBER_BACKGROUND", "{{ background }}")
+hl.env("GUM_PAGER_MATCH_FOREGROUND", "{{ accent }}")
+hl.env("GUM_PAGER_MATCH_BACKGROUND", "{{ background }}")
+hl.env("GUM_PAGER_MATCH_HIGH_FOREGROUND", "{{ accent }}")
+hl.env("GUM_PAGER_MATCH_HIGH_BACKGROUND", "{{ background }}")
+hl.env("GUM_PAGER_HELP_FOREGROUND", "{{ muted }}")
+hl.env("GUM_PAGER_HELP_BACKGROUND", "{{ background }}")
+
+-- Gum Write Style Variables
+hl.env("GUM_WRITE_BASE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_WRITE_BASE_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_CURSOR_LINE_NUMBER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_WRITE_CURSOR_LINE_NUMBER_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_CURSOR_LINE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_WRITE_CURSOR_LINE_BACKGROUND", "{{ selection_background }}")
+hl.env("GUM_WRITE_CURSOR_FOREGROUND", "{{ cursor }}")
+hl.env("GUM_WRITE_CURSOR_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_END_OF_BUFFER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_WRITE_END_OF_BUFFER_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_LINE_NUMBER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_WRITE_LINE_NUMBER_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_HEADER_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_WRITE_HEADER_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_PLACEHOLDER_FOREGROUND", "{{ muted }}")
+hl.env("GUM_WRITE_PLACEHOLDER_BACKGROUND", "{{ background }}")
+hl.env("GUM_WRITE_PROMPT_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_WRITE_PROMPT_BACKGROUND", "{{ background }}")
+
+-- Gum Log Style Variables
+hl.env("GUM_LOG_LEVEL_FOREGROUND", "{{ accent }}")
+hl.env("GUM_LOG_LEVEL_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_TIME_FOREGROUND", "{{ muted }}")
+hl.env("GUM_LOG_TIME_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_PREFIX_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_LOG_PREFIX_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_MESSAGE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_LOG_MESSAGE_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_KEY_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_LOG_KEY_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_VALUE_FOREGROUND", "{{ foreground }}")
+hl.env("GUM_LOG_VALUE_BACKGROUND", "{{ background }}")
+hl.env("GUM_LOG_SEPARATOR_FOREGROUND", "{{ muted }}")
+hl.env("GUM_LOG_SEPARATOR_BACKGROUND", "{{ background }}")
diff --git a/default/themed/helix.toml.tpl b/default/themed/helix.toml.tpl
index 3cbe3067..17fd8695 100644
--- a/default/themed/helix.toml.tpl
+++ b/default/themed/helix.toml.tpl
@@ -121,12 +121,12 @@ foreground = "{{ foreground }}"
 cursor = "{{ cursor }}"
 selection_background = "{{ selection_background }}"
 selection_foreground = "{{ selection_foreground }}"
-color0 = "{{ color0 }}"
-color1 = "{{ color1 }}"
-color2 = "{{ color2 }}"
-color3 = "{{ color3 }}"
-color4 = "{{ color4 }}"
-color5 = "{{ color5 }}"
-color6 = "{{ color6 }}"
-color7 = "{{ color7 }}"
-color8 = "{{ color8 }}"
+color0 = "{{ background }}"
+color1 = "{{ red }}"
+color2 = "{{ green }}"
+color3 = "{{ yellow }}"
+color4 = "{{ blue }}"
+color5 = "{{ magenta }}"
+color6 = "{{ cyan }}"
+color7 = "{{ foreground }}"
+color8 = "{{ muted }}"
diff --git a/default/themed/hyprland-preview-share-picker.css.tpl b/default/themed/hyprland-preview-share-picker.css.tpl
index 07e5e4e8..f62f8b17 100644
--- a/default/themed/hyprland-preview-share-picker.css.tpl
+++ b/default/themed/hyprland-preview-share-picker.css.tpl
@@ -1,10 +1,10 @@
 @define-color foreground {{ foreground }};
 @define-color background {{ background }};
 @define-color accent {{ accent }};
-@define-color muted {{ color8 }};
-@define-color card_bg {{ color0 }};
+@define-color muted {{ muted }};
+@define-color card_bg {{ lighter_bg }};
 @define-color text_dark {{ background }};
-@define-color accent_hover {{ color12 }};
+@define-color accent_hover {{ bright_blue }};
 @define-color selected_tab {{ accent }};
 @define-color text {{ foreground }};
 
diff --git a/default/themed/hyprland.conf.tpl b/default/themed/hyprland.conf.tpl
deleted file mode 100644
index e4dbf3c3..00000000
--- a/default/themed/hyprland.conf.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb({{ accent_strip }})
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/default/themed/hyprland.lua.tpl b/default/themed/hyprland.lua.tpl
new file mode 100644
index 00000000..1a2d6d1a
--- /dev/null
+++ b/default/themed/hyprland.lua.tpl
@@ -0,0 +1,18 @@
+local active_border_color = {{ hypr_gradient hyprland_active_border accent }}
+local inactive_border_color = {{ hypr_gradient hyprland_inactive_border rgba(595959aa) }}
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+      inactive_border = inactive_border_color,
+    },
+  },
+
+  group = {
+    col = {
+      border_active = active_border_color,
+      border_inactive = inactive_border_color,
+    },
+  },
+})
diff --git a/default/themed/hyprlock.conf.tpl b/default/themed/hyprlock.conf.tpl
deleted file mode 100644
index 1b4cac3c..00000000
--- a/default/themed/hyprlock.conf.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba({{ background_rgb }}, 1.0)
-$inner_color = rgba({{ background_rgb }}, 0.8)
-$outer_color = rgba({{ foreground_rgb }}, 1.0)
-$font_color = rgba({{ foreground_rgb }}, 1.0)
-$check_color = rgba({{ accent_rgb }}, 1.0)
diff --git a/default/themed/kitty.conf.tpl b/default/themed/kitty.conf.tpl
index e74a5bbc..7abecff0 100644
--- a/default/themed/kitty.conf.tpl
+++ b/default/themed/kitty.conf.tpl
@@ -9,19 +9,19 @@ cursor_text_color {{ background }}
 active_border_color {{ accent }}
 active_tab_background {{ accent }}
 
-color0 {{ color0 }}
-color1 {{ color1 }}
-color2 {{ color2 }}
-color3 {{ color3 }}
-color4 {{ color4 }}
-color5 {{ color5 }}
-color6 {{ color6 }}
-color7 {{ color7 }}
-color8 {{ color8 }}
-color9 {{ color9 }}
-color10 {{ color10 }}
-color11 {{ color11 }}
-color12 {{ color12 }}
-color13 {{ color13 }}
-color14 {{ color14 }}
-color15 {{ color15 }}
+color0 {{ bg }}
+color1 {{ red }}
+color2 {{ green }}
+color3 {{ yellow }}
+color4 {{ blue }}
+color5 {{ magenta }}
+color6 {{ cyan }}
+color7 {{ fg }}
+color8 {{ muted }}
+color9 {{ bright_red }}
+color10 {{ bright_green }}
+color11 {{ bright_yellow }}
+color12 {{ bright_blue }}
+color13 {{ bright_magenta }}
+color14 {{ bright_cyan }}
+color15 {{ bright_fg }}
diff --git a/default/themed/mako.ini.tpl b/default/themed/mako.ini.tpl
deleted file mode 100644
index 5abc7988..00000000
--- a/default/themed/mako.ini.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color={{ foreground }}
-border-color={{ accent }}
-background-color={{ background }}
diff --git a/default/themed/neovim.lua.tpl b/default/themed/neovim.lua.tpl
new file mode 100644
index 00000000..e28534fa
--- /dev/null
+++ b/default/themed/neovim.lua.tpl
@@ -0,0 +1,52 @@
+return {
+  {
+    "bjarneo/aether.nvim",
+    branch = "v3",
+    name = "aether",
+    priority = 1000,
+    opts = {
+      colors = {
+        bg = "{{ bg }}",
+        dark_bg = "{{ dark_bg }}",
+        darker_bg = "{{ darker_bg }}",
+        lighter_bg = "{{ lighter_bg }}",
+
+        fg = "{{ fg }}",
+        dark_fg = "{{ dark_fg }}",
+        light_fg = "{{ light_fg }}",
+        bright_fg = "{{ bright_fg }}",
+        muted = "{{ muted }}",
+
+        red = "{{ red }}",
+        yellow = "{{ yellow }}",
+        orange = "{{ orange }}",
+        green = "{{ green }}",
+        cyan = "{{ cyan }}",
+        blue = "{{ blue }}",
+        magenta = "{{ magenta }}",
+        brown = "{{ brown }}",
+
+        bright_red = "{{ bright_red }}",
+        bright_yellow = "{{ bright_yellow }}",
+        bright_green = "{{ bright_green }}",
+        bright_cyan = "{{ bright_cyan }}",
+        bright_blue = "{{ bright_blue }}",
+        bright_magenta = "{{ bright_magenta }}",
+
+        accent = "{{ accent }}",
+        cursor = "{{ cursor }}",
+        foreground = "{{ foreground }}",
+        background = "{{ background }}",
+        selection = "{{ selection }}",
+        selection_foreground = "{{ selection_foreground }}",
+        selection_background = "{{ selection_background }}",
+      },
+    },
+  },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "aether",
+    },
+  },
+}
diff --git a/default/themed/obsidian.css.tpl b/default/themed/obsidian.css.tpl
index e255b0e5..e3702d45 100644
--- a/default/themed/obsidian.css.tpl
+++ b/default/themed/obsidian.css.tpl
@@ -12,18 +12,18 @@
   --text-selection: {{ selection_background }};
 
   /* Border color */
-  --background-modifier-border: {{ color8 }};
+  --background-modifier-border: {{ muted }};
 
   /* Semantic heading colors */
-  --text-title-h1: {{ color1 }};
-  --text-title-h2: {{ color2 }};
-  --text-title-h3: {{ color3 }};
-  --text-title-h4: {{ color4 }};
-  --text-title-h5: {{ color5 }};
-  --text-title-h6: {{ color5 }};
+  --text-title-h1: {{ red }};
+  --text-title-h2: {{ green }};
+  --text-title-h3: {{ yellow }};
+  --text-title-h4: {{ blue }};
+  --text-title-h5: {{ magenta }};
+  --text-title-h6: {{ magenta }};
 
   /* Links and accents */
-  --text-link: {{ color4 }};
+  --text-link: {{ blue }};
   --text-accent: {{ accent }};
   --text-accent-hover: {{ accent }};
   --interactive-accent: {{ accent }};
@@ -34,23 +34,23 @@
   --text-faint: color-mix(in srgb, {{ foreground }} 55%, transparent);
 
   /* Code */
-  --code-normal: {{ color6 }};
+  --code-normal: {{ cyan }};
 
   /* Errors and success */
-  --text-error: {{ color1 }};
-  --text-error-hover: {{ color1 }};
-  --text-success: {{ color2 }};
+  --text-error: {{ red }};
+  --text-error-hover: {{ red }};
+  --text-success: {{ green }};
 
   /* Tags */
-  --tag-color: {{ color6 }};
-  --tag-background: {{ color8 }};
+  --tag-color: {{ cyan }};
+  --tag-background: {{ muted }};
 
   /* Graph */
-  --graph-line: {{ color8 }};
+  --graph-line: {{ muted }};
   --graph-node: {{ accent }};
-  --graph-node-focused: {{ color4 }};
-  --graph-node-tag: {{ color6 }};
-  --graph-node-attachment: {{ color2 }};
+  --graph-node-focused: {{ blue }};
+  --graph-node-tag: {{ cyan }};
+  --graph-node-attachment: {{ green }};
 }
 
 /* Headers */
@@ -63,16 +63,16 @@
 
 /* Code blocks */
 .markdown-rendered code {
-  color: {{ color6 }};
+  color: {{ cyan }};
 }
 
 /* Syntax highlighting */
-.cm-s-obsidian span.cm-keyword { color: {{ color1 }}; }
-.cm-s-obsidian span.cm-string { color: {{ color2 }}; }
-.cm-s-obsidian span.cm-number { color: {{ color3 }}; }
-.cm-s-obsidian span.cm-comment { color: {{ color8 }}; }
-.cm-s-obsidian span.cm-operator { color: {{ color4 }}; }
-.cm-s-obsidian span.cm-def { color: {{ color4 }}; }
+.cm-s-obsidian span.cm-keyword { color: {{ red }}; }
+.cm-s-obsidian span.cm-string { color: {{ green }}; }
+.cm-s-obsidian span.cm-number { color: {{ yellow }}; }
+.cm-s-obsidian span.cm-comment { color: {{ muted }}; }
+.cm-s-obsidian span.cm-operator { color: {{ blue }}; }
+.cm-s-obsidian span.cm-def { color: {{ blue }}; }
 
 /* Links */
 .markdown-rendered a {
diff --git a/default/themed/pi.json.tpl b/default/themed/pi.json.tpl
new file mode 100644
index 00000000..25e133fd
--- /dev/null
+++ b/default/themed/pi.json.tpl
@@ -0,0 +1,95 @@
+{
+  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "name": "omarchy-system",
+  "vars": {
+    "background": "{{ background }}",
+    "foreground": "{{ foreground }}",
+    "accent": "{{ accent }}",
+    "selectionBackground": "{{ selection_background }}",
+    "selectionForeground": "{{ selection_foreground }}",
+    "selectedBackground": "{{ mix background accent 22% }}",
+    "color0": "{{ background }}",
+    "color1": "{{ red }}",
+    "color2": "{{ green }}",
+    "color3": "{{ yellow }}",
+    "color4": "{{ blue }}",
+    "color5": "{{ magenta }}",
+    "color6": "{{ cyan }}",
+    "color7": "{{ foreground }}",
+    "color8": "{{ muted }}",
+    "color9": "{{ bright_red }}",
+    "color10": "{{ bright_green }}",
+    "color11": "{{ bright_yellow }}",
+    "color12": "{{ bright_blue }}",
+    "color13": "{{ bright_magenta }}",
+    "color14": "{{ bright_cyan }}",
+    "color15": "{{ bright_fg }}",
+    "panel": "{{ mix background foreground 6% }}",
+    "panelAlt": "{{ mix background foreground 10% }}",
+    "panelPending": "{{ mix background accent 12% }}",
+    "panelSuccess": "{{ mix background green 12% }}",
+    "panelError": "{{ mix background red 12% }}",
+    "border": "{{ mix background foreground 30% }}",
+    "borderMuted": "{{ mix background foreground 20% }}",
+    "mutedText": "{{ mix foreground background 34% }}",
+    "dimText": "{{ mix foreground background 52% }}"
+  },
+  "colors": {
+    "accent": "accent",
+    "border": "border",
+    "borderAccent": "accent",
+    "borderMuted": "borderMuted",
+    "success": "color2",
+    "error": "color1",
+    "warning": "color3",
+    "muted": "mutedText",
+    "dim": "dimText",
+    "text": "foreground",
+    "thinkingText": "dimText",
+    "selectedBg": "selectedBackground",
+    "userMessageBg": "panel",
+    "userMessageText": "foreground",
+    "customMessageBg": "panel",
+    "customMessageText": "foreground",
+    "customMessageLabel": "accent",
+    "toolPendingBg": "panelPending",
+    "toolSuccessBg": "panelSuccess",
+    "toolErrorBg": "panelError",
+    "toolTitle": "accent",
+    "toolOutput": "foreground",
+    "mdHeading": "color5",
+    "mdLink": "accent",
+    "mdLinkUrl": "color6",
+    "mdCode": "color6",
+    "mdCodeBlock": "foreground",
+    "mdCodeBlockBorder": "borderMuted",
+    "mdQuote": "mutedText",
+    "mdQuoteBorder": "borderMuted",
+    "mdHr": "borderMuted",
+    "mdListBullet": "color5",
+    "toolDiffAdded": "color2",
+    "toolDiffRemoved": "color1",
+    "toolDiffContext": "mutedText",
+    "syntaxComment": "dimText",
+    "syntaxKeyword": "color5",
+    "syntaxFunction": "color4",
+    "syntaxVariable": "accent",
+    "syntaxString": "color2",
+    "syntaxNumber": "color3",
+    "syntaxType": "color4",
+    "syntaxOperator": "color5",
+    "syntaxPunctuation": "mutedText",
+    "thinkingOff": "borderMuted",
+    "thinkingMinimal": "accent",
+    "thinkingLow": "color4",
+    "thinkingMedium": "color5",
+    "thinkingHigh": "color3",
+    "thinkingXhigh": "color1",
+    "bashMode": "color3"
+  },
+  "export": {
+    "pageBg": "{{ background }}",
+    "cardBg": "{{ mix background foreground 6% }}",
+    "infoBg": "{{ mix background foreground 10% }}"
+  }
+}
diff --git a/default/themed/shell.toml.tpl b/default/themed/shell.toml.tpl
new file mode 100644
index 00000000..b0a68d8b
--- /dev/null
+++ b/default/themed/shell.toml.tpl
@@ -0,0 +1,237 @@
+# Omarchy shell surfaces. Colors derive from colors.toml; sizes and the
+# typographic scale come from the keys below. Themes can ship
+# themes/<name>/shell.toml to replace this generated file.
+
+[bar]
+# Alpha companions (where present) range from 0 (invisible) to 1 (opaque).
+background       = "{{ background }}"
+background-alpha = 1.0
+text             = "{{ foreground }}"
+# Modules calling attention to themselves (recording, voxtype, alerts, updates)
+active           = "{{ red }}"
+# Cross-axis size at font base-size 12. size-horizontal is the height of
+# top/bottom bars; size-vertical is the width of left/right bars. With
+# scale-with-font enabled, these grow/shrink with [font] base-size.
+scale-with-font  = true
+size-horizontal  = 26
+size-vertical    = 28
+
+[hyprland]
+# Shared Hyprland-derived border tokens. Surface sections reference these so
+# lock, notifications, popups, and menu-style cards stay aligned with the
+# current Hyprland active-border gradient.
+active-border            = "{{ shell_gradient hyprland_active_border accent }}"
+active-border-foreground = "{{ shell_gradient hyprland_active_border foreground }}"
+
+[controls]
+# Shared state tokens for interactive control chrome (buttons, dropdowns,
+# tab strips, etc).
+
+# Normal: idle control chrome. Border widths accept one CSS-style scalar/list:
+# N, "Y X", "T X B", or "T R B L". Per-side keys like
+# normal-border-width-left override the list. Each *-border accepts either a
+# solid color or a Hyprland-style gradient, e.g. "rgba(...) rgba(...) 45deg".
+normal-color        = "{{ foreground }}"
+normal-fill-alpha   = 0.04
+normal-border       = "{{ foreground }}"
+normal-border-width = 1
+normal-border-alpha = 0.4
+
+# Hover-cursor: mouse hover and the panel keyboard cursor.
+hover-cursor-color        = "{{ foreground }}"
+hover-cursor-fill-alpha   = 0.08
+hover-cursor-border       = "{{ foreground }}"
+hover-cursor-border-width = 1
+hover-cursor-border-alpha = 0.25
+
+# Focus: Qt activeFocus. Mirror the hover-cursor values by default so
+# mouse hover, keyboard cursor, and tab focus all read as the same state
+# — themes that want focus to stand out override these four lines.
+focus-color        = "{{ foreground }}"
+focus-fill-alpha   = 0.08
+focus-border       = "{{ foreground }}"
+focus-border-width = 1
+focus-border-alpha = 0.25
+
+# Selected: persistent chosen/current state.
+selected-color        = "{{ foreground }}"
+selected-fill-alpha   = 0.18
+selected-border       = "{{ foreground }}"
+selected-border-width = 0
+selected-border-alpha = 1.0
+
+# Momentary fills.
+pressed-fill-alpha   = 0.22
+selection-fill-alpha = 0.35
+
+[spacing]
+# `scale` multiplies shared margins, gaps, padding, controls, and panel
+# dimensions; components keep their proportions. With scale-with-font
+# enabled, those dimensions grow/shrink with [font] base-size too. Per-token
+# overrides (in px) below pin individual values without affecting the rest
+# of the scale. Uncomment any to tune a specific surface.
+scale = 1.0
+scale-with-font = true
+# xxs                       = 2
+# xs                        = 3
+# sm                        = 4
+# md                        = 6
+# lg                        = 8
+# xl                        = 10
+# xxl                       = 12
+# xxxl                      = 14
+# huge                      = 18
+# control-gap               = 8
+# control-padding-x         = 10
+# control-padding-y         = 6
+# input-padding-y           = 7
+# control-height            = 28
+# popup-row-height          = 28
+# row-gap                   = 8
+# row-padding-x             = 12
+# label-gap                 = 4
+# panel-gap                 = 14
+# panel-padding             = 18
+# popup-padding             = 14
+# dropdown-width            = 240
+# searchable-dropdown-width = 260
+# number-field-width        = 120
+# searchable-popup-min-height = 220
+
+[font]
+# base-size is the rem root for the type scale. Every Style.font.<token>
+# derives from it (e.g. body = base, subtitle ≈ base * 1.083,
+# heading ≈ base * 1.333). The shell only floors this at 1px; increase it
+# as much as you want.
+base-size = 12
+# Per-token overrides, in px. Uncomment any to pin a specific size without
+# affecting the rest of the scale. Useful for stylistic emphasis (a
+# minimalist theme that wants a bigger heading without scaling everything).
+# caption       = 10
+# body-small    = 11
+# body          = 12
+# subtitle      = 13
+# title         = 14
+# heading       = 16
+# display       = 24
+# display-large = 28
+# icon-small    = 11
+# icon          = 14
+# icon-large    = 18
+
+[popups]
+# Shared by every bar flyout (dropdowns, OSD, popup cards).
+# Border accepts either a solid color or a Hyprland-style gradient. Border
+# widths accept one CSS-style scalar/list: N, "Y X", "T X B", or "T R B L";
+# individual border-width-top/right/bottom/left keys override the list.
+background       = "{{ background }}"
+background-alpha = 1.0
+text             = "{{ foreground }}"
+border           = "hyprland.active-border"
+border-alpha     = 1.0
+# border-width     = 2
+
+[tooltip]
+# Hover tooltips across the bar, panels, and buttons. background-alpha of
+# 0.97 mirrors the legacy hard-coded tooltip opacity.
+background       = "{{ background }}"
+background-alpha = 0.97
+text             = "{{ foreground }}"
+border           = "hyprland.active-border-foreground"
+border-alpha     = 1.0
+
+[notifications]
+background       = "{{ background }}"
+background-alpha = 1.0
+text             = "{{ foreground }}"
+# Conventionally matches the Hyprland active-window border. Border accepts
+# either a solid color or the full active-border gradient.
+border           = "hyprland.active-border"
+border-alpha     = 1.0
+# border-width     = 2
+countdown        = "{{ accent }}"
+
+[launcher]
+# Same six tokens as [menu], applied to the launcher overlay. Alpha
+# companions go from 0 (invisible) to 1 (opaque). scrim is the full-screen
+# dim layer behind the card; background is the card itself. Defaults
+# mirror [menu] with the card at 0.95 to preserve the legacy translucency.
+background                = "{{ background }}"
+background-alpha          = 0.95
+text                      = "{{ foreground }}"
+border                    = "hyprland.active-border-foreground"
+border-alpha              = 1.0
+scrim                     = "{{ background }}"
+scrim-alpha               = 0.5
+selected-background       = "{{ foreground }}"
+selected-background-alpha = 0.08
+selected-text             = "{{ accent }}"
+selected-border           = "hyprland.active-border-foreground"
+selected-border-alpha     = 0.25
+
+[menu]
+# Cards, rows, and selected-row treatment. Alpha companions (where present)
+# go from 0 (invisible) to 1 (opaque). scrim is the full-screen dim layer
+# behind the card. Clipboard and emojis inherit these tokens.
+background                = "{{ background }}"
+background-alpha          = 1.0
+text                      = "{{ foreground }}"
+border                    = "hyprland.active-border-foreground"
+border-alpha              = 1.0
+scrim                     = "{{ background }}"
+scrim-alpha               = 0.5
+selected-background       = "{{ foreground }}"
+selected-background-alpha = 0.08
+selected-text             = "{{ accent }}"
+selected-border           = "hyprland.active-border-foreground"
+selected-border-alpha     = 0.25
+
+[polkit]
+# Polkit authentication prompt (sudo/password dialogs). scrim is the
+# darkening layer behind the card; background is the card itself.
+# text-error tints the lock icon, password text, and placeholder when
+# authentication fails. border-alpha applies to both border and
+# border-error (the two states are mutually exclusive in time).
+background       = "{{ background }}"
+background-alpha = 1.0
+text             = "{{ foreground }}"
+text-error       = "{{ red }}"
+border           = "hyprland.active-border"
+border-error     = "{{ red }}"
+border-alpha     = 1.0
+scrim            = "{{ background }}"
+scrim-alpha      = 0.5
+# accent is the lock-icon glyph color + text-selection tint.
+accent           = "{{ accent }}"
+
+[lock]
+# Lock screen password input. background/background-alpha control the
+# centered input field card; border/border-active/border-error cycle
+# through idle, typing/authenticating, and wrong-password states.
+# border-alpha applies to all three border states (they are mutually
+# exclusive in time).
+background       = "{{ background }}"
+background-alpha = 0.8
+text             = "{{ foreground }}"
+placeholder      = "{{ mix foreground background 34% }}"
+text-error       = "{{ red }}"
+border           = "hyprland.active-border"
+border-active    = "hyprland.active-border"
+border-error     = "{{ red }}"
+border-alpha     = 1.0
+# selection is the text-selection tint inside the input field.
+selection        = "{{ accent }}"
+selection-alpha  = 0.45
+
+[image-picker]
+# Carousel-style picker. The picker has no card surface, so `scrim` is
+# the full-screen wash. Per-slice dim overlays and text outlines on top
+# of the scrim track the foundational background color directly.
+# unselected-border-alpha softens carousel slices that aren't selected.
+scrim                   = "{{ background }}"
+scrim-alpha             = 0.5
+text                    = "{{ foreground }}"
+selected-border         = "{{ accent }}"
+selected-border-alpha   = 1.0
+unselected-border       = "{{ foreground }}"
+unselected-border-alpha = 0.28
diff --git a/default/themed/swayosd.css.tpl b/default/themed/swayosd.css.tpl
deleted file mode 100644
index e06402c4..00000000
--- a/default/themed/swayosd.css.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-@define-color background-color {{ background }};
-@define-color border-color {{ foreground }};
-@define-color label {{ foreground }};
-@define-color image {{ foreground }};
-@define-color progress {{ accent }};
diff --git a/default/themed/vscode-theme.json.tpl b/default/themed/vscode-theme.json.tpl
new file mode 100644
index 00000000..388f83a4
--- /dev/null
+++ b/default/themed/vscode-theme.json.tpl
@@ -0,0 +1,1340 @@
+{
+    "name": "Omarchy",
+    "$schema": "vscode://schemas/color-theme",
+    "type": "{{ theme_type }}",
+    "semanticHighlighting": true,
+    "semanticTokenColors": {
+        "parameter": "{{ cyan }}",
+        "parameter.declaration": "{{ cyan }}",
+        "variable": "{{ foreground }}",
+        "variable.declaration": "{{ foreground }}",
+        "variable.readonly": "{{ bright_yellow }}",
+        "variable.defaultLibrary": "{{ foreground }}",
+        "property": "{{ cyan }}",
+        "property.declaration": "{{ cyan }}",
+        "property.readonly": "{{ cyan }}",
+        "function": "{{ blue }}",
+        "function.declaration": "{{ blue }}",
+        "function.defaultLibrary": "{{ cyan }}",
+        "method": "{{ blue }}",
+        "method.declaration": "{{ blue }}",
+        "class": "{{ yellow }}",
+        "class.declaration": "{{ yellow }}",
+        "class.defaultLibrary": "{{ yellow }}",
+        "interface": "{{ yellow }}",
+        "interface.declaration": "{{ yellow }}",
+        "enum": "{{ yellow }}",
+        "enumMember": "{{ orange }}",
+        "type": "{{ yellow }}",
+        "type.declaration": "{{ yellow }}",
+        "type.defaultLibrary": "{{ foreground }}",
+        "typeParameter": "{{ yellow }}",
+        "namespace": "{{ blue }}",
+        "macro": "{{ cyan }}",
+        "decorator": "{{ blue }}",
+        "string": "{{ green }}",
+        "number": "{{ orange }}",
+        "boolean": "{{ orange }}",
+        "regexp": "{{ bright_cyan }}",
+        "operator": "{{ bright_blue }}",
+        "keyword": "{{ bright_magenta }}",
+        "comment": {"foreground": "{{ muted }}", "fontStyle": "italic"},
+        "comment.documentation": {"foreground": "{{ muted }}", "fontStyle": "italic"}
+    },
+    "colors": {
+        "foreground": "{{ foreground }}",
+        "disabledForeground": "{{ dark_fg }}",
+        "focusBorder": "{{ accent }}80",
+        "widget.shadow": "{{ bg }}80",
+        "selection.background": "{{ selection_background }}80",
+        "descriptionForeground": "{{ muted }}",
+        "errorForeground": "{{ red }}",
+        "icon.foreground": "{{ foreground }}",
+        "sash.hoverBorder": "{{ accent }}",
+
+        "textBlockQuote.background": "{{ bg }}",
+        "textBlockQuote.border": "{{ accent }}",
+        "textCodeBlock.background": "{{ bg }}",
+        "textLink.activeForeground": "{{ bright_blue }}",
+        "textLink.foreground": "{{ blue }}",
+        "textPreformat.foreground": "{{ cyan }}",
+        "textPreformat.background": "{{ bg }}",
+        "textSeparator.foreground": "{{ muted }}",
+
+        "toolbar.hoverBackground": "{{ bg }}",
+        "toolbar.activeBackground": "{{ muted }}",
+
+        "button.background": "{{ accent }}",
+        "button.foreground": "{{ background }}",
+        "button.hoverBackground": "{{ blue }}",
+        "button.secondaryForeground": "{{ foreground }}",
+        "button.secondaryBackground": "{{ muted }}",
+        "button.secondaryHoverBackground": "{{ bg }}",
+        "button.border": "{{ accent }}20",
+        "checkbox.background": "{{ bg }}",
+        "checkbox.foreground": "{{ foreground }}",
+        "checkbox.border": "{{ muted }}",
+        "checkbox.selectBackground": "{{ accent }}",
+        "checkbox.selectBorder": "{{ accent }}",
+
+        "dropdown.background": "{{ bg }}",
+        "dropdown.listBackground": "{{ bg }}",
+        "dropdown.border": "{{ muted }}",
+        "dropdown.foreground": "{{ foreground }}",
+
+        "input.background": "{{ bg }}",
+        "input.border": "{{ muted }}",
+        "input.foreground": "{{ foreground }}",
+        "input.placeholderForeground": "{{ muted }}",
+        "inputOption.activeBackground": "{{ accent }}40",
+        "inputOption.activeBorder": "{{ accent }}",
+        "inputOption.activeForeground": "{{ foreground }}",
+        "inputOption.hoverBackground": "{{ muted }}",
+        "inputValidation.errorBackground": "{{ red }}20",
+        "inputValidation.errorForeground": "{{ red }}",
+        "inputValidation.errorBorder": "{{ red }}",
+        "inputValidation.infoBackground": "{{ blue }}20",
+        "inputValidation.infoForeground": "{{ blue }}",
+        "inputValidation.infoBorder": "{{ blue }}",
+        "inputValidation.warningBackground": "{{ yellow }}20",
+        "inputValidation.warningForeground": "{{ yellow }}",
+        "inputValidation.warningBorder": "{{ yellow }}",
+
+        "scrollbar.shadow": "{{ bg }}",
+        "scrollbarSlider.activeBackground": "{{ accent }}80",
+        "scrollbarSlider.background": "{{ muted }}40",
+        "scrollbarSlider.hoverBackground": "{{ muted }}80",
+
+        "badge.background": "{{ accent }}",
+        "badge.foreground": "{{ background }}",
+
+        "progressBar.background": "{{ accent }}",
+
+        "list.activeSelectionBackground": "{{ accent }}30",
+        "list.activeSelectionForeground": "{{ foreground }}",
+        "list.activeSelectionIconForeground": "{{ foreground }}",
+        "list.dropBackground": "{{ accent }}20",
+        "list.focusBackground": "{{ accent }}20",
+        "list.focusForeground": "{{ foreground }}",
+        "list.focusOutline": "{{ accent }}60",
+        "list.highlightForeground": "{{ accent }}",
+        "list.hoverBackground": "{{ bg }}",
+        "list.hoverForeground": "{{ foreground }}",
+        "list.inactiveSelectionBackground": "{{ muted }}40",
+        "list.inactiveSelectionForeground": "{{ foreground }}",
+        "list.inactiveFocusBackground": "{{ muted }}40",
+        "list.inactiveFocusOutline": "{{ muted }}",
+        "list.invalidItemForeground": "{{ red }}",
+        "list.errorForeground": "{{ red }}",
+        "list.warningForeground": "{{ yellow }}",
+        "listFilterWidget.background": "{{ bg }}",
+        "listFilterWidget.outline": "{{ accent }}",
+        "listFilterWidget.noMatchesOutline": "{{ red }}",
+        "list.filterMatchBackground": "{{ accent }}30",
+        "list.filterMatchBorder": "{{ accent }}",
+        "tree.indentGuidesStroke": "{{ muted }}",
+        "tree.inactiveIndentGuidesStroke": "{{ muted }}60",
+        "tree.tableColumnsBorder": "{{ muted }}",
+        "tree.tableOddRowsBackground": "{{ bg }}40",
+
+        "activityBar.background": "{{ background }}",
+        "activityBar.dropBorder": "{{ accent }}",
+        "activityBar.foreground": "{{ foreground }}",
+        "activityBar.inactiveForeground": "{{ muted }}",
+        "activityBar.border": "{{ bg }}",
+        "activityBarBadge.background": "{{ accent }}",
+        "activityBarBadge.foreground": "{{ background }}",
+        "activityBar.activeBorder": "{{ accent }}",
+        "activityBar.activeBackground": "{{ bg }}40",
+
+        "sideBar.background": "{{ bg }}",
+        "sideBar.foreground": "{{ foreground }}",
+        "sideBar.border": "{{ bg }}",
+        "sideBar.dropBackground": "{{ accent }}20",
+        "sideBarTitle.foreground": "{{ foreground }}",
+        "sideBarSectionHeader.background": "{{ bg }}",
+        "sideBarSectionHeader.foreground": "{{ foreground }}",
+        "sideBarSectionHeader.border": "{{ muted }}40",
+
+        "minimap.findMatchHighlight": "{{ accent }}80",
+        "minimap.selectionHighlight": "{{ accent }}60",
+        "minimap.errorHighlight": "{{ red }}",
+        "minimap.warningHighlight": "{{ yellow }}",
+        "minimap.background": "{{ background }}",
+        "minimap.selectionOccurrenceHighlight": "{{ accent }}40",
+        "minimap.foregroundOpacity": "{{ background }}c0",
+        "minimapSlider.background": "{{ muted }}20",
+        "minimapSlider.hoverBackground": "{{ muted }}40",
+        "minimapSlider.activeBackground": "{{ muted }}60",
+        "minimapGutter.addedBackground": "{{ green }}",
+        "minimapGutter.modifiedBackground": "{{ orange }}",
+        "minimapGutter.deletedBackground": "{{ red }}",
+
+        "editorGroup.border": "{{ muted }}40",
+        "editorGroup.dropBackground": "{{ accent }}20",
+        "editorGroup.dropIntoPromptForeground": "{{ foreground }}",
+        "editorGroup.dropIntoPromptBackground": "{{ bg }}",
+        "editorGroup.dropIntoPromptBorder": "{{ accent }}",
+        "editorGroupHeader.noTabsBackground": "{{ bg }}",
+        "editorGroupHeader.tabsBackground": "{{ bg }}",
+        "editorGroupHeader.tabsBorder": "{{ bg }}",
+        "editorGroupHeader.border": "{{ bg }}",
+        "editorGroup.emptyBackground": "{{ background }}",
+        "tab.activeBackground": "{{ background }}",
+        "tab.unfocusedActiveBackground": "{{ background }}",
+        "tab.activeForeground": "{{ foreground }}",
+        "tab.activeBorder": "{{ accent }}",
+        "tab.activeBorderTop": "{{ accent }}",
+        "tab.unfocusedActiveBorder": "{{ muted }}",
+        "tab.unfocusedActiveBorderTop": "{{ muted }}",
+        "tab.border": "{{ bg }}",
+        "tab.inactiveBackground": "{{ bg }}",
+        "tab.inactiveForeground": "{{ muted }}",
+        "tab.unfocusedActiveForeground": "{{ fg }}",
+        "tab.unfocusedInactiveForeground": "{{ muted }}",
+        "tab.hoverBackground": "{{ muted }}40",
+        "tab.unfocusedHoverBackground": "{{ muted }}40",
+        "tab.hoverForeground": "{{ foreground }}",
+        "tab.hoverBorder": "{{ accent }}40",
+        "tab.activeModifiedBorder": "{{ yellow }}",
+        "tab.inactiveModifiedBorder": "{{ yellow }}80",
+        "tab.unfocusedActiveModifiedBorder": "{{ yellow }}80",
+        "tab.unfocusedInactiveModifiedBorder": "{{ yellow }}60",
+        "tab.lastPinnedBorder": "{{ muted }}",
+        "editorPane.background": "{{ background }}",
+
+        "editor.background": "{{ background }}",
+        "editor.foreground": "{{ foreground }}",
+        "editorLineNumber.foreground": "{{ muted }}",
+        "editorLineNumber.activeForeground": "{{ foreground }}",
+        "editorLineNumber.dimmedForeground": "{{ muted }}80",
+        "editorCursor.background": "{{ background }}",
+        "editorCursor.foreground": "{{ cursor }}",
+        "editor.selectionBackground": "{{ selection_background }}60",
+        "editor.selectionForeground": "{{ selection_foreground }}",
+        "editor.inactiveSelectionBackground": "{{ selection_background }}30",
+        "editor.selectionHighlightBackground": "{{ accent }}20",
+        "editor.selectionHighlightBorder": "{{ accent }}40",
+        "editor.wordHighlightBackground": "{{ accent }}20",
+        "editor.wordHighlightBorder": "{{ accent }}40",
+        "editor.wordHighlightStrongBackground": "{{ accent }}30",
+        "editor.wordHighlightStrongBorder": "{{ accent }}60",
+        "editor.wordHighlightTextBackground": "{{ accent }}15",
+        "editor.wordHighlightTextBorder": "{{ accent }}30",
+        "editor.findMatchBackground": "{{ yellow }}40",
+        "editor.findMatchBorder": "{{ yellow }}",
+        "editor.findMatchHighlightBackground": "{{ yellow }}25",
+        "editor.findMatchHighlightBorder": "{{ yellow }}60",
+        "editor.findRangeHighlightBackground": "{{ accent }}15",
+        "editor.findRangeHighlightBorder": "{{ accent }}30",
+        "searchEditor.findMatchBackground": "{{ yellow }}40",
+        "searchEditor.findMatchBorder": "{{ yellow }}",
+        "editor.hoverHighlightBackground": "{{ accent }}20",
+        "editor.lineHighlightBackground": "{{ bg }}60",
+        "editor.lineHighlightBorder": "{{ bg }}00",
+        "editorLink.activeForeground": "{{ blue }}",
+        "editor.rangeHighlightBackground": "{{ accent }}10",
+        "editor.rangeHighlightBorder": "{{ accent }}20",
+        "editor.symbolHighlightBackground": "{{ accent }}20",
+        "editor.symbolHighlightBorder": "{{ accent }}40",
+        "editorWhitespace.foreground": "{{ muted }}60",
+        "editorIndentGuide.background1": "{{ muted }}30",
+        "editorIndentGuide.background2": "{{ muted }}30",
+        "editorIndentGuide.background3": "{{ muted }}30",
+        "editorIndentGuide.background4": "{{ muted }}30",
+        "editorIndentGuide.background5": "{{ muted }}30",
+        "editorIndentGuide.background6": "{{ muted }}30",
+        "editorIndentGuide.activeBackground1": "{{ muted }}80",
+        "editorIndentGuide.activeBackground2": "{{ muted }}80",
+        "editorIndentGuide.activeBackground3": "{{ muted }}80",
+        "editorIndentGuide.activeBackground4": "{{ muted }}80",
+        "editorIndentGuide.activeBackground5": "{{ muted }}80",
+        "editorIndentGuide.activeBackground6": "{{ muted }}80",
+        "editorInlayHint.background": "{{ muted }}30",
+        "editorInlayHint.foreground": "{{ muted }}",
+        "editorInlayHint.typeBackground": "{{ yellow }}15",
+        "editorInlayHint.typeForeground": "{{ yellow }}",
+        "editorInlayHint.parameterBackground": "{{ bright_magenta }}15",
+        "editorInlayHint.parameterForeground": "{{ bright_magenta }}",
+        "editorRuler.foreground": "{{ muted }}40",
+        "editorCodeLens.foreground": "{{ muted }}",
+        "editorLightBulb.foreground": "{{ yellow }}",
+        "editorLightBulbAutoFix.foreground": "{{ green }}",
+        "editorLightBulbAi.foreground": "{{ magenta }}",
+        "editorBracketMatch.background": "{{ accent }}30",
+        "editorBracketMatch.border": "{{ accent }}",
+        "editorBracketHighlight.foreground1": "{{ blue }}",
+        "editorBracketHighlight.foreground2": "{{ yellow }}",
+        "editorBracketHighlight.foreground3": "{{ green }}",
+        "editorBracketHighlight.foreground4": "{{ cyan }}",
+        "editorBracketHighlight.foreground5": "{{ magenta }}",
+        "editorBracketHighlight.foreground6": "{{ orange }}",
+        "editorBracketHighlight.unexpectedBracket.foreground": "{{ red }}",
+        "editorBracketPairGuide.activeBackground1": "{{ blue }}60",
+        "editorBracketPairGuide.activeBackground2": "{{ yellow }}60",
+        "editorBracketPairGuide.activeBackground3": "{{ green }}60",
+        "editorBracketPairGuide.activeBackground4": "{{ cyan }}60",
+        "editorBracketPairGuide.activeBackground5": "{{ magenta }}60",
+        "editorBracketPairGuide.activeBackground6": "{{ orange }}60",
+        "editorBracketPairGuide.background1": "{{ blue }}30",
+        "editorBracketPairGuide.background2": "{{ yellow }}30",
+        "editorBracketPairGuide.background3": "{{ green }}30",
+        "editorBracketPairGuide.background4": "{{ cyan }}30",
+        "editorBracketPairGuide.background5": "{{ magenta }}30",
+        "editorBracketPairGuide.background6": "{{ orange }}30",
+        "editorOverviewRuler.background": "{{ background }}",
+        "editorOverviewRuler.border": "{{ muted }}20",
+        "editorOverviewRuler.findMatchForeground": "{{ yellow }}80",
+        "editorOverviewRuler.rangeHighlightForeground": "{{ accent }}60",
+        "editorOverviewRuler.selectionHighlightForeground": "{{ accent }}80",
+        "editorOverviewRuler.wordHighlightForeground": "{{ accent }}60",
+        "editorOverviewRuler.wordHighlightStrongForeground": "{{ accent }}80",
+        "editorOverviewRuler.wordHighlightTextForeground": "{{ accent }}40",
+        "editorOverviewRuler.modifiedForeground": "{{ orange }}80",
+        "editorOverviewRuler.addedForeground": "{{ green }}80",
+        "editorOverviewRuler.deletedForeground": "{{ red }}80",
+        "editorOverviewRuler.errorForeground": "{{ red }}",
+        "editorOverviewRuler.warningForeground": "{{ yellow }}",
+        "editorOverviewRuler.infoForeground": "{{ blue }}",
+        "editorOverviewRuler.bracketMatchForeground": "{{ accent }}",
+        "editorError.foreground": "{{ red }}",
+        "editorError.background": "{{ red }}15",
+        "editorError.border": "{{ red }}00",
+        "editorWarning.foreground": "{{ yellow }}",
+        "editorWarning.background": "{{ yellow }}15",
+        "editorWarning.border": "{{ yellow }}00",
+        "editorInfo.foreground": "{{ blue }}",
+        "editorInfo.background": "{{ blue }}15",
+        "editorInfo.border": "{{ blue }}00",
+        "editorHint.foreground": "{{ cyan }}",
+        "editorHint.border": "{{ cyan }}00",
+        "problemsErrorIcon.foreground": "{{ red }}",
+        "problemsWarningIcon.foreground": "{{ yellow }}",
+        "problemsInfoIcon.foreground": "{{ blue }}",
+        "editorUnnecessaryCode.opacity": "{{ background }}80",
+        "editorUnnecessaryCode.border": "{{ muted }}",
+        "editorGutter.background": "{{ background }}",
+        "editorGutter.modifiedBackground": "{{ orange }}",
+        "editorGutter.addedBackground": "{{ green }}",
+        "editorGutter.deletedBackground": "{{ red }}",
+        "editorGutter.commentRangeForeground": "{{ muted }}",
+        "editorGutter.commentGlyphForeground": "{{ accent }}",
+        "editorGutter.commentUnresolvedGlyphForeground": "{{ yellow }}",
+        "editorGutter.foldingControlForeground": "{{ muted }}",
+        "editorCommentsWidget.resolvedBorder": "{{ green }}",
+        "editorCommentsWidget.unresolvedBorder": "{{ yellow }}",
+        "editorCommentsWidget.rangeBackground": "{{ accent }}10",
+        "editorCommentsWidget.rangeActiveBackground": "{{ accent }}20",
+
+        "diffEditor.insertedTextBackground": "{{ green }}20",
+        "diffEditor.insertedTextBorder": "{{ green }}00",
+        "diffEditor.removedTextBackground": "{{ red }}20",
+        "diffEditor.removedTextBorder": "{{ red }}00",
+        "diffEditor.insertedLineBackground": "{{ green }}15",
+        "diffEditor.removedLineBackground": "{{ red }}15",
+        "diffEditorGutter.insertedLineBackground": "{{ green }}30",
+        "diffEditorGutter.removedLineBackground": "{{ red }}30",
+        "diffEditorOverview.insertedForeground": "{{ green }}80",
+        "diffEditorOverview.removedForeground": "{{ red }}80",
+        "diffEditor.diagonalFill": "{{ muted }}30",
+        "diffEditor.unchangedRegionBackground": "{{ bg }}",
+        "diffEditor.unchangedRegionForeground": "{{ muted }}",
+        "diffEditor.unchangedCodeBackground": "{{ bg }}40",
+        "diffEditor.move.border": "{{ cyan }}80",
+        "diffEditor.moveActive.border": "{{ cyan }}",
+
+        "editorWidget.foreground": "{{ foreground }}",
+        "editorWidget.background": "{{ bg }}",
+        "editorWidget.border": "{{ muted }}",
+        "editorWidget.resizeBorder": "{{ accent }}",
+        "editorSuggestWidget.background": "{{ bg }}",
+        "editorSuggestWidget.border": "{{ muted }}",
+        "editorSuggestWidget.foreground": "{{ foreground }}",
+        "editorSuggestWidget.focusHighlightForeground": "{{ accent }}",
+        "editorSuggestWidget.highlightForeground": "{{ accent }}",
+        "editorSuggestWidget.selectedBackground": "{{ accent }}30",
+        "editorSuggestWidget.selectedForeground": "{{ foreground }}",
+        "editorSuggestWidget.selectedIconForeground": "{{ foreground }}",
+        "editorSuggestWidgetStatus.foreground": "{{ muted }}",
+        "editorHoverWidget.foreground": "{{ foreground }}",
+        "editorHoverWidget.background": "{{ bg }}",
+        "editorHoverWidget.border": "{{ muted }}",
+        "editorHoverWidget.highlightForeground": "{{ accent }}",
+        "editorHoverWidget.statusBarBackground": "{{ muted }}30",
+        "editorGhostText.foreground": "{{ muted }}",
+        "editorGhostText.background": "{{ muted }}10",
+        "editorGhostText.border": "{{ muted }}00",
+        "editorStickyScroll.background": "{{ bg }}",
+        "editorStickyScrollHover.background": "{{ muted }}40",
+        "debugExceptionWidget.background": "{{ red }}20",
+        "debugExceptionWidget.border": "{{ red }}",
+        "editorMarkerNavigation.background": "{{ bg }}",
+        "editorMarkerNavigationError.background": "{{ red }}20",
+        "editorMarkerNavigationError.headerBackground": "{{ red }}15",
+        "editorMarkerNavigationWarning.background": "{{ yellow }}20",
+        "editorMarkerNavigationWarning.headerBackground": "{{ yellow }}15",
+        "editorMarkerNavigationInfo.background": "{{ blue }}20",
+        "editorMarkerNavigationInfo.headerBackground": "{{ blue }}15",
+
+        "peekView.border": "{{ accent }}",
+        "peekViewEditor.background": "{{ bg }}",
+        "peekViewEditorGutter.background": "{{ bg }}",
+        "peekViewEditor.matchHighlightBackground": "{{ yellow }}30",
+        "peekViewEditor.matchHighlightBorder": "{{ yellow }}",
+        "peekViewResult.background": "{{ background }}",
+        "peekViewResult.fileForeground": "{{ foreground }}",
+        "peekViewResult.lineForeground": "{{ muted }}",
+        "peekViewResult.matchHighlightBackground": "{{ yellow }}30",
+        "peekViewResult.selectionBackground": "{{ accent }}30",
+        "peekViewResult.selectionForeground": "{{ foreground }}",
+        "peekViewTitle.background": "{{ bg }}",
+        "peekViewTitleDescription.foreground": "{{ muted }}",
+        "peekViewTitleLabel.foreground": "{{ foreground }}",
+
+        "merge.currentContentBackground": "{{ cyan }}20",
+        "merge.currentHeaderBackground": "{{ cyan }}40",
+        "merge.incomingContentBackground": "{{ green }}20",
+        "merge.incomingHeaderBackground": "{{ green }}40",
+        "merge.commonContentBackground": "{{ muted }}20",
+        "merge.commonHeaderBackground": "{{ muted }}40",
+        "merge.border": "{{ muted }}",
+        "editorOverviewRuler.currentContentForeground": "{{ cyan }}",
+        "editorOverviewRuler.incomingContentForeground": "{{ green }}",
+        "editorOverviewRuler.commonContentForeground": "{{ muted }}",
+        "mergeEditor.change.background": "{{ accent }}15",
+        "mergeEditor.change.word.background": "{{ accent }}30",
+        "mergeEditor.conflict.handledUnfocused.border": "{{ green }}80",
+        "mergeEditor.conflict.handled.minimapOverViewRuler": "{{ green }}",
+        "mergeEditor.conflict.unhandledUnfocused.border": "{{ yellow }}80",
+        "mergeEditor.conflict.unhandled.minimapOverViewRuler": "{{ yellow }}",
+        "mergeEditor.conflictingLines.background": "{{ yellow }}15",
+        "mergeEditor.changeBase.background": "{{ muted }}20",
+        "mergeEditor.changeBase.word.background": "{{ muted }}40",
+
+        "panel.background": "{{ background }}",
+        "panel.border": "{{ muted }}40",
+        "panel.dropBorder": "{{ accent }}",
+        "panelTitle.activeBorder": "{{ accent }}",
+        "panelTitle.activeForeground": "{{ foreground }}",
+        "panelTitle.inactiveForeground": "{{ muted }}",
+        "panelInput.border": "{{ muted }}",
+        "panelSection.border": "{{ muted }}40",
+        "panelSection.dropBackground": "{{ accent }}20",
+        "panelSectionHeader.background": "{{ bg }}",
+        "panelSectionHeader.foreground": "{{ foreground }}",
+        "panelSectionHeader.border": "{{ muted }}40",
+
+        "outputView.background": "{{ background }}",
+        "outputViewStickyScroll.background": "{{ bg }}",
+
+        "statusBar.background": "{{ bg }}",
+        "statusBar.foreground": "{{ foreground }}",
+        "statusBar.border": "{{ bg }}",
+        "statusBar.debuggingBackground": "{{ yellow }}",
+        "statusBar.debuggingForeground": "{{ background }}",
+        "statusBar.debuggingBorder": "{{ yellow }}",
+        "statusBar.noFolderBackground": "{{ bg }}",
+        "statusBar.noFolderForeground": "{{ foreground }}",
+        "statusBar.noFolderBorder": "{{ bg }}",
+        "statusBar.focusBorder": "{{ accent }}",
+        "statusBarItem.activeBackground": "{{ muted }}",
+        "statusBarItem.hoverBackground": "{{ muted }}60",
+        "statusBarItem.hoverForeground": "{{ foreground }}",
+        "statusBarItem.prominentForeground": "{{ foreground }}",
+        "statusBarItem.prominentBackground": "{{ accent }}",
+        "statusBarItem.prominentHoverBackground": "{{ accent }}80",
+        "statusBarItem.remoteBackground": "{{ accent }}",
+        "statusBarItem.remoteForeground": "{{ background }}",
+        "statusBarItem.remoteHoverBackground": "{{ accent }}80",
+        "statusBarItem.errorBackground": "{{ red }}",
+        "statusBarItem.errorForeground": "{{ background }}",
+        "statusBarItem.errorHoverBackground": "{{ red }}80",
+        "statusBarItem.warningBackground": "{{ yellow }}",
+        "statusBarItem.warningForeground": "{{ background }}",
+        "statusBarItem.warningHoverBackground": "{{ yellow }}80",
+        "statusBarItem.compactHoverBackground": "{{ muted }}",
+        "statusBarItem.focusBorder": "{{ accent }}",
+
+        "titleBar.activeBackground": "{{ bg }}",
+        "titleBar.activeForeground": "{{ foreground }}",
+        "titleBar.inactiveBackground": "{{ bg }}",
+        "titleBar.inactiveForeground": "{{ muted }}",
+        "titleBar.border": "{{ bg }}",
+
+        "menubar.selectionForeground": "{{ foreground }}",
+        "menubar.selectionBackground": "{{ accent }}30",
+        "menubar.selectionBorder": "{{ accent }}00",
+        "menu.foreground": "{{ foreground }}",
+        "menu.background": "{{ bg }}",
+        "menu.selectionForeground": "{{ foreground }}",
+        "menu.selectionBackground": "{{ accent }}30",
+        "menu.selectionBorder": "{{ accent }}00",
+        "menu.separatorBackground": "{{ muted }}",
+        "menu.border": "{{ muted }}",
+
+        "commandCenter.foreground": "{{ foreground }}",
+        "commandCenter.activeForeground": "{{ foreground }}",
+        "commandCenter.background": "{{ bg }}",
+        "commandCenter.activeBackground": "{{ muted }}",
+        "commandCenter.border": "{{ muted }}",
+        "commandCenter.inactiveForeground": "{{ muted }}",
+        "commandCenter.inactiveBorder": "{{ muted }}",
+        "commandCenter.activeBorder": "{{ accent }}",
+        "commandCenter.debuggingBackground": "{{ yellow }}20",
+
+        "notificationCenter.border": "{{ muted }}",
+        "notificationCenterHeader.foreground": "{{ foreground }}",
+        "notificationCenterHeader.background": "{{ bg }}",
+        "notificationToast.border": "{{ muted }}",
+        "notifications.foreground": "{{ foreground }}",
+        "notifications.background": "{{ bg }}",
+        "notifications.border": "{{ muted }}",
+        "notificationLink.foreground": "{{ accent }}",
+        "notificationsErrorIcon.foreground": "{{ red }}",
+        "notificationsWarningIcon.foreground": "{{ yellow }}",
+        "notificationsInfoIcon.foreground": "{{ blue }}",
+
+        "banner.background": "{{ accent }}20",
+        "banner.foreground": "{{ foreground }}",
+        "banner.iconForeground": "{{ accent }}",
+
+        "extensionButton.prominentBackground": "{{ accent }}",
+        "extensionButton.prominentForeground": "{{ background }}",
+        "extensionButton.prominentHoverBackground": "{{ accent }}80",
+        "extensionButton.background": "{{ muted }}",
+        "extensionButton.foreground": "{{ foreground }}",
+        "extensionButton.hoverBackground": "{{ muted }}80",
+        "extensionButton.separator": "{{ background }}",
+        "extensionBadge.remoteBackground": "{{ accent }}",
+        "extensionBadge.remoteForeground": "{{ background }}",
+        "extensionIcon.starForeground": "{{ yellow }}",
+        "extensionIcon.verifiedForeground": "{{ cyan }}",
+        "extensionIcon.preReleaseForeground": "{{ yellow }}",
+        "extensionIcon.sponsorForeground": "{{ magenta }}",
+
+        "pickerGroup.border": "{{ muted }}",
+        "pickerGroup.foreground": "{{ accent }}",
+        "quickInput.background": "{{ bg }}",
+        "quickInput.foreground": "{{ foreground }}",
+        "quickInputList.focusBackground": "{{ accent }}30",
+        "quickInputList.focusForeground": "{{ foreground }}",
+        "quickInputList.focusIconForeground": "{{ foreground }}",
+        "quickInputTitle.background": "{{ bg }}",
+
+        "keybindingLabel.background": "{{ muted }}40",
+        "keybindingLabel.foreground": "{{ foreground }}",
+        "keybindingLabel.border": "{{ muted }}",
+        "keybindingLabel.bottomBorder": "{{ muted }}",
+        "keybindingTable.headerBackground": "{{ bg }}",
+        "keybindingTable.rowsBackground": "{{ bg }}40",
+
+        "terminal.background": "{{ background }}",
+        "terminal.foreground": "{{ foreground }}",
+        "terminal.border": "{{ muted }}40",
+        "terminal.selectionBackground": "{{ selection_background }}60",
+        "terminal.selectionForeground": "{{ selection_foreground }}",
+        "terminal.inactiveSelectionBackground": "{{ selection_background }}30",
+        "terminal.findMatchBackground": "{{ yellow }}40",
+        "terminal.findMatchBorder": "{{ yellow }}",
+        "terminal.findMatchHighlightBackground": "{{ yellow }}25",
+        "terminal.findMatchHighlightBorder": "{{ yellow }}60",
+        "terminal.hoverHighlightBackground": "{{ accent }}20",
+        "terminalCursor.background": "{{ background }}",
+        "terminalCursor.foreground": "{{ cursor }}",
+        "terminal.ansiBlack": "{{ bg }}",
+        "terminal.ansiRed": "{{ red }}",
+        "terminal.ansiGreen": "{{ green }}",
+        "terminal.ansiYellow": "{{ yellow }}",
+        "terminal.ansiBlue": "{{ blue }}",
+        "terminal.ansiMagenta": "{{ magenta }}",
+        "terminal.ansiCyan": "{{ cyan }}",
+        "terminal.ansiWhite": "{{ fg }}",
+        "terminal.ansiBrightBlack": "{{ muted }}",
+        "terminal.ansiBrightRed": "{{ bright_red }}",
+        "terminal.ansiBrightGreen": "{{ bright_green }}",
+        "terminal.ansiBrightYellow": "{{ bright_yellow }}",
+        "terminal.ansiBrightBlue": "{{ bright_blue }}",
+        "terminal.ansiBrightMagenta": "{{ bright_magenta }}",
+        "terminal.ansiBrightCyan": "{{ bright_cyan }}",
+        "terminal.ansiBrightWhite": "{{ bright_fg }}",
+        "terminal.tab.activeBorder": "{{ accent }}",
+        "terminalCommandDecoration.defaultBackground": "{{ muted }}",
+        "terminalCommandDecoration.successBackground": "{{ green }}",
+        "terminalCommandDecoration.errorBackground": "{{ red }}",
+        "terminalOverviewRuler.cursorForeground": "{{ cursor }}",
+        "terminalOverviewRuler.findMatchForeground": "{{ yellow }}",
+        "terminalStickyScroll.background": "{{ bg }}",
+        "terminalStickyScrollHover.background": "{{ muted }}40",
+
+        "debugToolBar.background": "{{ bg }}",
+        "debugToolBar.border": "{{ muted }}",
+        "debugView.stateLabelForeground": "{{ foreground }}",
+        "debugView.stateLabelBackground": "{{ accent }}30",
+        "debugView.valueChangedHighlight": "{{ cyan }}40",
+        "debugView.exceptionLabelForeground": "{{ background }}",
+        "debugView.exceptionLabelBackground": "{{ red }}",
+        "debugTokenExpression.name": "{{ magenta }}",
+        "debugTokenExpression.value": "{{ foreground }}",
+        "debugTokenExpression.string": "{{ green }}",
+        "debugTokenExpression.boolean": "{{ orange }}",
+        "debugTokenExpression.number": "{{ orange }}",
+        "debugTokenExpression.error": "{{ red }}",
+
+        "testing.iconFailed": "{{ red }}",
+        "testing.iconErrored": "{{ red }}",
+        "testing.iconPassed": "{{ green }}",
+        "testing.runAction": "{{ green }}",
+        "testing.iconQueued": "{{ yellow }}",
+        "testing.iconUnset": "{{ muted }}",
+        "testing.iconSkipped": "{{ yellow }}",
+        "testing.peekBorder": "{{ accent }}",
+        "testing.peekHeaderBackground": "{{ bg }}",
+        "testing.message.error.decorationForeground": "{{ red }}",
+        "testing.message.error.lineBackground": "{{ red }}15",
+        "testing.message.info.decorationForeground": "{{ blue }}",
+        "testing.message.info.lineBackground": "{{ blue }}15",
+
+        "welcomePage.background": "{{ background }}",
+        "welcomePage.tileBackground": "{{ bg }}",
+        "welcomePage.tileHoverBackground": "{{ muted }}40",
+        "welcomePage.tileBorder": "{{ muted }}",
+        "welcomePage.progress.background": "{{ muted }}",
+        "welcomePage.progress.foreground": "{{ accent }}",
+        "walkThrough.embeddedEditorBackground": "{{ bg }}",
+        "walkthrough.stepTitle.foreground": "{{ foreground }}",
+
+        "gitDecoration.addedResourceForeground": "{{ green }}",
+        "gitDecoration.modifiedResourceForeground": "{{ orange }}",
+        "gitDecoration.deletedResourceForeground": "{{ red }}",
+        "gitDecoration.renamedResourceForeground": "{{ cyan }}",
+        "gitDecoration.stageModifiedResourceForeground": "{{ orange }}",
+        "gitDecoration.stageDeletedResourceForeground": "{{ red }}",
+        "gitDecoration.untrackedResourceForeground": "{{ green }}",
+        "gitDecoration.ignoredResourceForeground": "{{ muted }}",
+        "gitDecoration.conflictingResourceForeground": "{{ yellow }}",
+        "gitDecoration.submoduleResourceForeground": "{{ magenta }}",
+
+        "settings.headerForeground": "{{ foreground }}",
+        "settings.modifiedItemIndicator": "{{ accent }}",
+        "settings.dropdownBackground": "{{ bg }}",
+        "settings.dropdownForeground": "{{ foreground }}",
+        "settings.dropdownBorder": "{{ muted }}",
+        "settings.dropdownListBorder": "{{ muted }}",
+        "settings.checkboxBackground": "{{ bg }}",
+        "settings.checkboxForeground": "{{ foreground }}",
+        "settings.checkboxBorder": "{{ muted }}",
+        "settings.rowHoverBackground": "{{ bg }}",
+        "settings.textInputBackground": "{{ bg }}",
+        "settings.textInputForeground": "{{ foreground }}",
+        "settings.textInputBorder": "{{ muted }}",
+        "settings.numberInputBackground": "{{ bg }}",
+        "settings.numberInputForeground": "{{ foreground }}",
+        "settings.numberInputBorder": "{{ muted }}",
+        "settings.focusedRowBackground": "{{ accent }}10",
+        "settings.focusedRowBorder": "{{ accent }}40",
+        "settings.headerBorder": "{{ muted }}",
+        "settings.sashBorder": "{{ muted }}",
+        "settings.settingsHeaderHoverForeground": "{{ accent }}",
+
+        "breadcrumb.foreground": "{{ muted }}",
+        "breadcrumb.background": "{{ background }}",
+        "breadcrumb.focusForeground": "{{ foreground }}",
+        "breadcrumb.activeSelectionForeground": "{{ foreground }}",
+        "breadcrumbPicker.background": "{{ bg }}",
+
+        "editor.snippetTabstopHighlightBackground": "{{ accent }}20",
+        "editor.snippetTabstopHighlightBorder": "{{ accent }}40",
+        "editor.snippetFinalTabstopHighlightBackground": "{{ green }}20",
+        "editor.snippetFinalTabstopHighlightBorder": "{{ green }}40",
+
+        "symbolIcon.arrayForeground": "{{ orange }}",
+        "symbolIcon.booleanForeground": "{{ orange }}",
+        "symbolIcon.classForeground": "{{ yellow }}",
+        "symbolIcon.colorForeground": "{{ cyan }}",
+        "symbolIcon.constantForeground": "{{ bright_yellow }}",
+        "symbolIcon.constructorForeground": "{{ blue }}",
+        "symbolIcon.enumeratorForeground": "{{ yellow }}",
+        "symbolIcon.enumeratorMemberForeground": "{{ orange }}",
+        "symbolIcon.eventForeground": "{{ yellow }}",
+        "symbolIcon.fieldForeground": "{{ foreground }}",
+        "symbolIcon.fileForeground": "{{ foreground }}",
+        "symbolIcon.folderForeground": "{{ foreground }}",
+        "symbolIcon.functionForeground": "{{ blue }}",
+        "symbolIcon.interfaceForeground": "{{ yellow }}",
+        "symbolIcon.keyForeground": "{{ bright_magenta }}",
+        "symbolIcon.keywordForeground": "{{ bright_magenta }}",
+        "symbolIcon.methodForeground": "{{ blue }}",
+        "symbolIcon.moduleForeground": "{{ yellow }}",
+        "symbolIcon.namespaceForeground": "{{ blue }}",
+        "symbolIcon.nullForeground": "{{ orange }}",
+        "symbolIcon.numberForeground": "{{ orange }}",
+        "symbolIcon.objectForeground": "{{ yellow }}",
+        "symbolIcon.operatorForeground": "{{ bright_blue }}",
+        "symbolIcon.packageForeground": "{{ yellow }}",
+        "symbolIcon.propertyForeground": "{{ foreground }}",
+        "symbolIcon.referenceForeground": "{{ bright_magenta }}",
+        "symbolIcon.snippetForeground": "{{ green }}",
+        "symbolIcon.stringForeground": "{{ green }}",
+        "symbolIcon.structForeground": "{{ yellow }}",
+        "symbolIcon.textForeground": "{{ foreground }}",
+        "symbolIcon.typeParameterForeground": "{{ yellow }}",
+        "symbolIcon.unitForeground": "{{ orange }}",
+        "symbolIcon.variableForeground": "{{ bright_magenta }}",
+
+        "debugIcon.breakpointForeground": "{{ red }}",
+        "debugIcon.breakpointDisabledForeground": "{{ muted }}",
+        "debugIcon.breakpointUnverifiedForeground": "{{ yellow }}",
+        "debugIcon.breakpointCurrentStackframeForeground": "{{ yellow }}",
+        "debugIcon.breakpointStackframeForeground": "{{ green }}",
+        "debugIcon.startForeground": "{{ green }}",
+        "debugIcon.pauseForeground": "{{ yellow }}",
+        "debugIcon.stopForeground": "{{ red }}",
+        "debugIcon.disconnectForeground": "{{ red }}",
+        "debugIcon.restartForeground": "{{ green }}",
+        "debugIcon.stepOverForeground": "{{ blue }}",
+        "debugIcon.stepIntoForeground": "{{ cyan }}",
+        "debugIcon.stepOutForeground": "{{ magenta }}",
+        "debugIcon.continueForeground": "{{ green }}",
+        "debugIcon.stepBackForeground": "{{ yellow }}",
+        "debugConsole.infoForeground": "{{ blue }}",
+        "debugConsole.warningForeground": "{{ yellow }}",
+        "debugConsole.errorForeground": "{{ red }}",
+        "debugConsole.sourceForeground": "{{ foreground }}",
+        "debugConsoleInputIcon.foreground": "{{ accent }}",
+
+        "notebook.editorBackground": "{{ background }}",
+        "notebook.cellBorderColor": "{{ muted }}40",
+        "notebook.cellHoverBackground": "{{ bg }}40",
+        "notebook.cellInsertionIndicator": "{{ accent }}",
+        "notebook.cellStatusBarItemHoverBackground": "{{ muted }}",
+        "notebook.cellToolbarSeparator": "{{ muted }}",
+        "notebook.cellEditorBackground": "{{ bg }}",
+        "notebook.focusedCellBackground": "{{ bg }}60",
+        "notebook.focusedCellBorder": "{{ accent }}",
+        "notebook.focusedEditorBorder": "{{ accent }}",
+        "notebook.inactiveFocusedCellBorder": "{{ muted }}",
+        "notebook.inactiveSelectedCellBorder": "{{ muted }}",
+        "notebook.outputContainerBackgroundColor": "{{ bg }}",
+        "notebook.outputContainerBorderColor": "{{ muted }}40",
+        "notebook.selectedCellBackground": "{{ accent }}15",
+        "notebook.selectedCellBorder": "{{ accent }}40",
+        "notebook.symbolHighlightBackground": "{{ accent }}20",
+        "notebookStatusErrorIcon.foreground": "{{ red }}",
+        "notebookStatusRunningIcon.foreground": "{{ accent }}",
+        "notebookStatusSuccessIcon.foreground": "{{ green }}",
+        "notebookEditorOverviewRuler.runningCellForeground": "{{ accent }}",
+
+        "charts.foreground": "{{ foreground }}",
+        "charts.lines": "{{ muted }}",
+        "charts.red": "{{ red }}",
+        "charts.blue": "{{ blue }}",
+        "charts.yellow": "{{ yellow }}",
+        "charts.orange": "{{ orange }}",
+        "charts.green": "{{ green }}",
+        "charts.purple": "{{ magenta }}",
+
+        "ports.iconRunningProcessForeground": "{{ accent }}",
+
+        "commentsView.resolvedIcon": "{{ green }}",
+        "commentsView.unresolvedIcon": "{{ yellow }}",
+
+        "editorWatermark.foreground": "{{ muted }}",
+
+        "inlineChat.background": "{{ bg }}",
+        "inlineChat.border": "{{ muted }}",
+        "inlineChat.shadow": "{{ bg }}80",
+        "inlineChatInput.border": "{{ muted }}",
+        "inlineChatInput.focusBorder": "{{ accent }}",
+        "inlineChatInput.placeholderForeground": "{{ muted }}",
+        "inlineChatInput.background": "{{ background }}",
+        "inlineChatDiff.inserted": "{{ green }}20",
+        "inlineChatDiff.removed": "{{ red }}20",
+
+        "chat.requestBackground": "{{ bg }}",
+        "chat.requestBorder": "{{ muted }}"
+    },
+    "tokenColors": [
+        {
+            "name": "Comment",
+            "scope": ["comment", "punctuation.definition.comment"],
+            "settings": {
+                "fontStyle": "italic",
+                "foreground": "{{ muted }}"
+            }
+        },
+        {
+            "name": "Variable",
+            "scope": ["variable", "string constant.other.placeholder"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "Variable Parameter",
+            "scope": ["variable.parameter", "entity.name.variable.parameter", "meta.function.parameter"],
+            "settings": {
+                "foreground": "{{ cyan }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Variable Property",
+            "scope": ["variable.other.property", "variable.other.object.property"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Variable Constant",
+            "scope": ["variable.other.constant"],
+            "settings": {
+                "foreground": "{{ bright_yellow }}"
+            }
+        },
+        {
+            "name": "Enum Member",
+            "scope": ["variable.other.enummember"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "Invalid",
+            "scope": ["invalid", "invalid.illegal"],
+            "settings": {
+                "foreground": "{{ red }}",
+                "fontStyle": "strikethrough"
+            }
+        },
+        {
+            "name": "Invalid Deprecated",
+            "scope": ["invalid.deprecated"],
+            "settings": {
+                "foreground": "{{ yellow }}",
+                "fontStyle": "strikethrough"
+            }
+        },
+        {
+            "name": "Keyword",
+            "scope": ["keyword", "storage.type.class", "storage.type.function"],
+            "settings": {
+                "foreground": "{{ bright_magenta }}"
+            }
+        },
+        {
+            "name": "Storage Modifier",
+            "scope": ["storage.modifier"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Keyword Control",
+            "scope": ["keyword.control", "keyword.control.flow"],
+            "settings": {
+                "foreground": "{{ bright_magenta }}"
+            }
+        },
+        {
+            "name": "Keyword Import",
+            "scope": ["keyword.control.import", "keyword.control.export", "keyword.control.from", "keyword.control.as"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Keyword Operator",
+            "scope": ["keyword.operator", "keyword.operator.new", "keyword.operator.expression", "keyword.operator.logical", "keyword.operator.comparison"],
+            "settings": {
+                "foreground": "{{ bright_blue }}"
+            }
+        },
+        {
+            "name": "Operator",
+            "scope": ["punctuation.accessor", "punctuation.separator.key-value"],
+            "settings": {
+                "foreground": "{{ bright_blue }}"
+            }
+        },
+        {
+            "name": "Type",
+            "scope": ["storage.type", "entity.name.type"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Type Builtin",
+            "scope": ["storage.type.primitive", "support.type"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "Type Class",
+            "scope": ["entity.name.type.class", "support.class", "entity.other.inherited-class"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Type Interface",
+            "scope": ["entity.name.type.interface"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Type Enum",
+            "scope": ["entity.name.type.enum"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Type Parameter",
+            "scope": ["entity.name.type.parameter"],
+            "settings": {
+                "foreground": "{{ yellow }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Namespace",
+            "scope": ["entity.name.namespace", "entity.name.type.module"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Function",
+            "scope": ["entity.name.function", "meta.function-call.generic"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Function Builtin",
+            "scope": ["support.function"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Function Method",
+            "scope": ["entity.name.function.method", "meta.method.declaration"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Function Decorator",
+            "scope": ["entity.name.function.decorator", "meta.decorator", "punctuation.decorator"],
+            "settings": {
+                "foreground": "{{ cyan }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Punctuation",
+            "scope": ["punctuation", "meta.brace", "meta.bracket"],
+            "settings": {
+                "foreground": "{{ dark_fg }}"
+            }
+        },
+        {
+            "name": "Constant Numeric",
+            "scope": ["constant.numeric", "constant.numeric.integer", "constant.numeric.float", "constant.numeric.hex", "constant.numeric.octal", "constant.numeric.binary"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "Constant Boolean",
+            "scope": ["constant.language.boolean"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "Constant Builtin",
+            "scope": ["constant.language", "constant.language.null", "constant.language.undefined"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Constant Character",
+            "scope": ["constant.character"],
+            "settings": {
+                "foreground": "{{ green }}"
+            }
+        },
+        {
+            "name": "Constant Character Escape",
+            "scope": ["constant.character.escape"],
+            "settings": {
+                "foreground": "{{ bright_magenta }}"
+            }
+        },
+        {
+            "name": "String",
+            "scope": ["string", "string.quoted", "string.template"],
+            "settings": {
+                "foreground": "{{ green }}"
+            }
+        },
+        {
+            "name": "String Interpolation",
+            "scope": ["punctuation.definition.template-expression", "punctuation.section.embedded", "meta.embedded.line"],
+            "settings": {
+                "foreground": "{{ bright_blue }}"
+            }
+        },
+        {
+            "name": "String Regexp",
+            "scope": ["string.regexp", "constant.other.character-class.regexp", "constant.character.escape.regexp"],
+            "settings": {
+                "foreground": "{{ bright_cyan }}"
+            }
+        },
+        {
+            "name": "Support",
+            "scope": ["support.type.property-name", "support.constant"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Tag",
+            "scope": ["entity.name.tag", "meta.tag"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "Tag Attribute",
+            "scope": ["entity.other.attribute-name"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "CSS Property",
+            "scope": ["support.type.property-name.css", "support.type.vendored.property-name.css", "meta.property-name.css"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "CSS Value",
+            "scope": ["support.constant.property-value.css", "meta.property-value.css"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "CSS Selector",
+            "scope": ["entity.other.attribute-name.class.css", "entity.other.attribute-name.id.css"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "CSS Pseudo",
+            "scope": ["entity.other.attribute-name.pseudo-class.css", "entity.other.attribute-name.pseudo-element.css"],
+            "settings": {
+                "foreground": "{{ cyan }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "CSS Units",
+            "scope": ["keyword.other.unit.css"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 0",
+            "scope": ["source.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 1",
+            "scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 2",
+            "scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 3",
+            "scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ bright_magenta }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 4",
+            "scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "JSON Key Level 5+",
+            "scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
+            "settings": {
+                "foreground": "{{ green }}"
+            }
+        },
+        {
+            "name": "Markdown Heading",
+            "scope": ["markup.heading", "entity.name.section.markdown", "punctuation.definition.heading.markdown"],
+            "settings": {
+                "foreground": "{{ blue }}",
+                "fontStyle": "bold"
+            }
+        },
+        {
+            "name": "Markdown Bold",
+            "scope": ["markup.bold", "punctuation.definition.bold.markdown"],
+            "settings": {
+                "foreground": "{{ foreground }}",
+                "fontStyle": "bold"
+            }
+        },
+        {
+            "name": "Markdown Italic",
+            "scope": ["markup.italic", "punctuation.definition.italic.markdown"],
+            "settings": {
+                "foreground": "{{ foreground }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Markdown Link",
+            "scope": ["markup.underline.link", "string.other.link.title.markdown", "string.other.link.description.markdown"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Markdown Code",
+            "scope": ["markup.inline.raw", "markup.fenced_code.block", "markup.raw.block"],
+            "settings": {
+                "foreground": "{{ green }}"
+            }
+        },
+        {
+            "name": "Markdown Quote",
+            "scope": ["markup.quote", "punctuation.definition.quote.begin.markdown"],
+            "settings": {
+                "foreground": "{{ muted }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Markdown List",
+            "scope": ["punctuation.definition.list.begin.markdown", "markup.list.numbered", "markup.list.unnumbered"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Diff Inserted",
+            "scope": ["markup.inserted", "punctuation.definition.inserted"],
+            "settings": {
+                "foreground": "{{ green }}"
+            }
+        },
+        {
+            "name": "Diff Deleted",
+            "scope": ["markup.deleted", "punctuation.definition.deleted"],
+            "settings": {
+                "foreground": "{{ red }}"
+            }
+        },
+        {
+            "name": "Diff Changed",
+            "scope": ["markup.changed", "punctuation.definition.changed"],
+            "settings": {
+                "foreground": "{{ orange }}"
+            }
+        },
+        {
+            "name": "This/Self",
+            "scope": ["variable.language.this", "variable.language.self", "variable.language.special.self"],
+            "settings": {
+                "foreground": "{{ foreground }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Object Keys",
+            "scope": ["meta.object-literal.key", "string.unquoted.label.js"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "Rust Lifetime",
+            "scope": ["entity.name.type.lifetime.rust", "punctuation.definition.lifetime.rust"],
+            "settings": {
+                "foreground": "{{ cyan }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Rust Macro",
+            "scope": ["entity.name.function.macro.rust", "support.function.macro.rust"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Shell Variable",
+            "scope": ["variable.other.normal.shell", "variable.other.positional.shell", "variable.other.bracket.shell"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "Shell Command",
+            "scope": ["entity.name.command.shell"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Shell Builtin",
+            "scope": ["support.function.builtin.shell"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "YAML Key",
+            "scope": ["entity.name.tag.yaml"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "TOML Key",
+            "scope": ["keyword.key.toml", "support.type.property-name.toml"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "TOML Table",
+            "scope": ["entity.other.attribute-name.table.toml", "support.type.property-name.table.toml"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "INI Section",
+            "scope": ["entity.name.section.group-title.ini", "punctuation.definition.entity.ini"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "INI Key",
+            "scope": ["keyword.other.definition.ini"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "Make Target",
+            "scope": ["entity.name.function.target.makefile"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Make Variable",
+            "scope": ["variable.other.makefile"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "Go Package",
+            "scope": ["entity.name.package.go"],
+            "settings": {
+                "foreground": "{{ blue }}"
+            }
+        },
+        {
+            "name": "Python Self",
+            "scope": ["variable.parameter.function.language.special.self.python"],
+            "settings": {
+                "foreground": "{{ foreground }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "Python Magic",
+            "scope": ["support.function.magic.python", "support.variable.magic.python"],
+            "settings": {
+                "foreground": "{{ cyan }}",
+                "fontStyle": "italic"
+            }
+        },
+        {
+            "name": "PHP Variable",
+            "scope": ["variable.other.php", "punctuation.definition.variable.php"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        },
+        {
+            "name": "C Preprocessor",
+            "scope": ["meta.preprocessor.c", "meta.preprocessor.include.c", "keyword.control.directive.include.c"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "C# Attribute",
+            "scope": ["meta.attribute.csharp", "entity.name.type.attribute.csharp"],
+            "settings": {
+                "foreground": "{{ cyan }}"
+            }
+        },
+        {
+            "name": "SQL Keyword",
+            "scope": ["keyword.other.DML.sql", "keyword.other.DDL.sql"],
+            "settings": {
+                "foreground": "{{ bright_magenta }}"
+            }
+        },
+        {
+            "name": "GraphQL Type",
+            "scope": ["support.type.graphql", "entity.name.type.graphql"],
+            "settings": {
+                "foreground": "{{ yellow }}"
+            }
+        },
+        {
+            "name": "GraphQL Field",
+            "scope": ["variable.graphql", "variable.other.graphql"],
+            "settings": {
+                "foreground": "{{ foreground }}"
+            }
+        }
+    ]
+}
diff --git a/default/themed/walker.css.tpl b/default/themed/walker.css.tpl
deleted file mode 100644
index 123ca92c..00000000
--- a/default/themed/walker.css.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text {{ accent }};
-@define-color text {{ foreground }};
-@define-color base {{ background }};
-@define-color border {{ foreground }};
-@define-color foreground {{ foreground }};
-@define-color background {{ background }};
diff --git a/config/uwsm/default b/default/uwsm/default
similarity index 61%
rename from config/uwsm/default
rename to default/uwsm/default
index 946fbe5f..107bf9f2 100644
--- a/config/uwsm/default
+++ b/default/uwsm/default
@@ -3,8 +3,11 @@
 # Install other terminals via Install > Terminal
 export TERMINAL=xdg-terminal-exec
 
-# Use code for VSCode
-export EDITOR=nvim
+# Used by terminal programs (like gh) to open URLs detached from the terminal process tree
+export BROWSER=omarchy-launch-browser
+
+# Used by terminal programs to open files with the selected Omarchy default editor
+export EDITOR="omarchy-launch-editor --inline"
 
 # Use a custom directory for screenshots (remember to make the directory!)
 # export OMARCHY_SCREENSHOT_DIR="$HOME/Pictures/Screenshots"
diff --git a/default/uwsm/env.d/10-omarchy b/default/uwsm/env.d/10-omarchy
new file mode 100644
index 00000000..05485643
--- /dev/null
+++ b/default/uwsm/env.d/10-omarchy
@@ -0,0 +1,20 @@
+# Changes require a restart to take effect.
+
+# UWSM doesn't source /etc/profile.d, so pull the env bootstrap in directly.
+[ -r /usr/share/omarchy/default/bash/env-bootstrap ] && . /usr/share/omarchy/default/bash/env-bootstrap
+
+# Omarchy session defaults. Users can override these in ~/.config/uwsm/default
+# or, preferably, ~/.config/uwsm/env.d/*.
+if [ -f "${OMARCHY_PATH%/}/default/uwsm/default" ]; then
+  . "${OMARCHY_PATH%/}/default/uwsm/default"
+else
+  export TERMINAL=xdg-terminal-exec
+  export BROWSER=omarchy-launch-browser
+  export EDITOR="omarchy-launch-editor --inline"
+fi
+
+# Optional user overrides kept for compatibility with older installs.
+[ -f "$HOME/.config/uwsm/default" ] && . "$HOME/.config/uwsm/default"
+
+# Activate mise if present on the system
+omarchy-cmd-present mise && eval "$(mise activate bash --shims)"
diff --git a/default/walker/restart.conf b/default/walker/restart.conf
deleted file mode 100644
index 57940311..00000000
--- a/default/walker/restart.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-Restart=always
-RestartSec=2
diff --git a/default/walker/themes/omarchy-default/layout.xml b/default/walker/themes/omarchy-default/layout.xml
deleted file mode 100644
index 3b7bda71..00000000
--- a/default/walker/themes/omarchy-default/layout.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk" version="4.0"></requires>
-  <object class="GtkWindow" id="Window">
-    <style>
-      <class name="window"></class>
-    </style>
-    <property name="resizable">true</property>
-    <property name="title">Walker</property>
-    <child>
-      <object class="GtkBox" id="BoxWrapper">
-        <style>
-          <class name="box-wrapper"></class>
-        </style>
-        <property name="width-request">644</property>
-        <property name="overflow">hidden</property>
-        <property name="orientation">horizontal</property>
-        <property name="valign">center</property>
-        <property name="halign">center</property>
-        <child>
-          <object class="GtkBox" id="Box">
-            <style>
-              <class name="box"></class>
-            </style>
-            <property name="orientation">vertical</property>
-            <property name="hexpand-set">true</property>
-            <property name="hexpand">true</property>
-            <property name="spacing">10</property>
-            <child>
-              <object class="GtkBox" id="SearchContainer">
-                <style>
-                  <class name="search-container"></class>
-                </style>
-                <property name="overflow">hidden</property>
-                <property name="orientation">horizontal</property>
-                <property name="halign">fill</property>
-                <property name="hexpand-set">true</property>
-                <property name="hexpand">true</property>
-                <child>
-                  <object class="GtkEntry" id="Input">
-                    <style>
-                      <class name="input"></class>
-                    </style>
-                    <property name="halign">fill</property>
-                    <property name="hexpand-set">true</property>
-                    <property name="hexpand">true</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox" id="ContentContainer">
-                <style>
-                  <class name="content-container"></class>
-                </style>
-                <property name="orientation">horizontal</property>
-                <property name="spacing">10</property>
-                <property name="vexpand">true</property>
-                <property name="vexpand-set">true</property>
-                <child>
-                  <object class="GtkLabel" id="ElephantHint">
-                    <style>
-                      <class name="elephant-hint"></class>
-                    </style>
-                    <property name="hexpand">true</property>
-                    <property name="height-request">100</property>
-                    <property name="label">Waiting for elephant...</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="Placeholder">
-                    <style>
-                      <class name="placeholder"></class>
-                    </style>
-                    <property name="label">No Results</property>
-                    <property name="yalign">0.0</property>
-                    <property name="hexpand">true</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" id="Scroll">
-                    <style>
-                      <class name="scroll"></class>
-                    </style>
-                    <property name="hexpand">true</property>
-                    <property name="can_focus">false</property>
-                    <property name="overlay-scrolling">true</property>
-                    <property name="max-content-width">600</property>
-                    <property name="max-content-height">300</property>
-                    <property name="min-content-height">0</property>
-                    <property name="propagate-natural-height">true</property>
-                    <property name="propagate-natural-width">true</property>
-                    <property name="hscrollbar-policy">automatic</property>
-                    <property name="vscrollbar-policy">automatic</property>
-                    <child>
-                      <object class="GtkGridView" id="List">
-                        <style>
-                          <class name="list"></class>
-                        </style>
-                        <property name="max_columns">1</property>
-                        <property name="can_focus">false</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox" id="Preview">
-                    <style>
-                      <class name="preview"></class>
-                    </style>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox" id="Keybinds">
-                <property name="hexpand">true</property>
-                <property name="margin-top">10</property>
-                <style>
-                  <class name="keybinds"></class>
-                </style>
-                <child>
-                  <object class="GtkBox" id="GlobalKeybinds">
-                    <property name="spacing">10</property>
-                    <style>
-                      <class name="global-keybinds"></class>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox" id="ItemKeybinds">
-                    <property name="hexpand">true</property>
-                    <property name="halign">end</property>
-                    <property name="spacing">10</property>
-                    <style>
-                      <class name="item-keybinds"></class>
-                    </style>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="Error">
-                <style>
-                  <class name="error"></class>
-                </style>
-                <property name="xalign">0</property>
-                <property name="visible">false</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
diff --git a/default/walker/themes/omarchy-default/style.css b/default/walker/themes/omarchy-default/style.css
deleted file mode 100644
index 81ff4e00..00000000
--- a/default/walker/themes/omarchy-default/style.css
+++ /dev/null
@@ -1,121 +0,0 @@
-@import "../../../../../../../.config/omarchy/current/theme/walker.css";
-
-* {
-  all: unset;
-}
-
-* {
-  font-family: monospace;
-  font-size: 18px;
-  color: @text;
-}
-
-scrollbar {
-  opacity: 0;
-}
-
-.normal-icons {
-  -gtk-icon-size: 16px;
-}
-
-.large-icons {
-  -gtk-icon-size: 32px;
-}
-
-.box-wrapper {
-  background: alpha(@base, 0.95);
-  padding: 20px;
-  border: 2px solid @border;
-}
-
-.preview-box {
-}
-
-.box {
-}
-
-.search-container {
-  background: @base;
-  padding: 10px;
-}
-
-.input placeholder {
-  opacity: 0.5;
-}
-
-.input {
-}
-
-.input:focus,
-.input:active {
-  box-shadow: none;
-  outline: none;
-}
-
-.content-container {
-}
-
-.placeholder {
-}
-
-.scroll {
-}
-
-.list {
-}
-
-child,
-child > * {
-}
-
-child:hover .item-box {
-}
-
-child:selected .item-box {
-}
-
-child:selected .item-box * {
-  color: @selected-text;
-}
-
-child:selected {
-  background: alpha(@text, 0.07);
-}
-
-.item-box {
-  padding-left: 14px;
-}
-
-.item-text-box {
-  all: unset;
-  padding: 14px 0;
-}
-
-.item-text {
-}
-
-.item-subtext {
-  font-size: 0px;
-  min-height: 0px;
-  margin: 0px;
-  padding: 0px;
-}
-
-.item-image {
-  margin-right: 14px;
-  -gtk-icon-transform: scale(0.9);
-}
-
-.current {
-  font-style: italic;
-}
-
-.keybind-hints {
-  background: @background;
-  padding: 10px;
-  margin-top: 10px;
-}
-
-.preview {
-}
-
diff --git a/default/walker/walker.desktop b/default/walker/walker.desktop
deleted file mode 100644
index fa7bdfe2..00000000
--- a/default/walker/walker.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Walker
-Comment=Walker Service
-Exec=walker --gapplication-service
-StartupNotify=false
-Terminal=false
-Type=Application
diff --git a/default/waybar/indicators/idle.sh b/default/waybar/indicators/idle.sh
deleted file mode 100755
index ebb5f4f5..00000000
--- a/default/waybar/indicators/idle.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if pgrep -x hypridle >/dev/null; then
-  echo '{"text": ""}'
-else
-  echo '{"text": "󱫖", "tooltip": "Idle lock disabled", "class": "active"}'
-fi
diff --git a/default/waybar/indicators/notification-silencing.sh b/default/waybar/indicators/notification-silencing.sh
deleted file mode 100755
index d5a68276..00000000
--- a/default/waybar/indicators/notification-silencing.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if makoctl mode | grep -q 'do-not-disturb'; then
-  echo '{"text": "󰂛", "tooltip": "Notifications silenced", "class": "active"}'
-else
-  echo '{"text": ""}'
-fi
diff --git a/default/waybar/indicators/screen-recording.sh b/default/waybar/indicators/screen-recording.sh
deleted file mode 100755
index 80038e0e..00000000
--- a/default/waybar/indicators/screen-recording.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if pgrep -f "^gpu-screen-recorder" >/dev/null; then
-  echo '{"text": "󰻂", "tooltip": "Stop recording", "class": "active"}'
-else
-  echo '{"text": ""}'
-fi
diff --git a/config/xdg-terminals.list b/default/xdg-terminal-exec/hyprland-xdg-terminals.list
similarity index 85%
rename from config/xdg-terminals.list
rename to default/xdg-terminal-exec/hyprland-xdg-terminals.list
index 0821cf0d..8e7f5ca6 100644
--- a/config/xdg-terminals.list
+++ b/default/xdg-terminal-exec/hyprland-xdg-terminals.list
@@ -1,3 +1,3 @@
 # Terminal emulator preference order for xdg-terminal-exec
 # The first found and valid terminal will be used
-Alacritty.desktop
+foot.desktop
diff --git a/docs/file-layout.md b/docs/file-layout.md
new file mode 100644
index 00000000..19814dec
--- /dev/null
+++ b/docs/file-layout.md
@@ -0,0 +1,287 @@
+# File layout
+
+How `omarchy/` is organized and where everything ends up on an installed
+system.
+
+## Mental model
+
+Two Arch packages are built from this one repo (PKGBUILDs live in
+`omarchy-pkgs/pkgbuilds/`):
+
+- **`omarchy`** — runtime binaries (`bin/`, including `bin/omarchy-dev-*`),
+  install/finalize scripts (`install/`), migrations, themes, and the
+  Quickshell desktop (`shell/`). Depends on `omarchy-settings`.
+- **`omarchy-settings`** — everything that has to be on the target *before*
+  the omarchy package installs (specifically before `useradd -m` and the
+  limine bootloader install): all `/etc/skel/**`, `/etc/` drop-ins,
+  package-owned system files under `/usr/share` and `/usr/lib`, fonts,
+  plymouth theme, sddm theme, branding, plus the limine/snapper configs
+  (mkinitcpio hooks, limine-entry-tool drop-ins, snapper template, the
+  `default/limine/` and `default/snapper/` trees, and the boot/snapshot
+  story end-to-end). Also ships the three debug binaries
+  (`omarchy-debug`, `omarchy-debug-idle`, `omarchy-upload-log`) needed by
+  the live ISO env.
+
+Two other packages live in `omarchy-pkgs/` but stand alone:
+`omarchy-keyring` (GPG keys for pacman) and `omarchy-nvim` (the Neovim
+setup; independently seeds `/etc/skel`).
+
+Three layers populate `$HOME`:
+
+1. **Seed** — `omarchy-settings` ships static defaults to `/etc/skel/`.
+   Arch's `useradd -m` copies that tree into a new user's `$HOME` at user
+   creation. This is the only mechanism that touches a brand-new user's home
+   for these files.
+2. **Finalize** — `omarchy-finalize-user` runs once per user and handles the
+   things `/etc/skel` can't do because they need `$HOME` expansion, the live
+   `$OMARCHY_PATH`, or runtime detection of system state.
+3. **Resync** — `omarchy-reinstall-configs` is the explicit, destructive
+   command for an existing user to clobber their configs back to shipped
+   defaults.
+
+`/etc/skel` only fires at user creation. Existing users picking up new
+defaults must use the resync command.
+
+## Build-time map (repo → installed paths)
+
+```
+omarchy/                            built into          installed at
+─────────────────────────           ──────────────      ────────────────────────────────────
+
+bin/omarchy-*                  ──►  omarchy             /usr/bin/omarchy-*
+                                                        (and symlinks in /usr/share/omarchy/bin/)
+bin/omarchy-debug,
+bin/omarchy-debug-idle,
+bin/omarchy-upload-log         ──►  omarchy-settings    /usr/bin/  (needed before omarchy is installed)
+
+default/libalpm/hooks/00-omarchy-update-guard.hook
+                                ──►  omarchy             /usr/share/libalpm/hooks/00-omarchy-update-guard.hook
+
+install/**                     ──►  omarchy             /usr/share/omarchy/install/
+migrations/system/**           ──►  omarchy             /usr/share/omarchy/migrations/system/
+migrations/user/**             ──►  omarchy             /usr/share/omarchy/migrations/user/
+themes/**                      ──►  omarchy             /usr/share/omarchy/themes/
+shell/**                       ──►  omarchy             /usr/share/omarchy/shell/
+version                        ──►  omarchy             /usr/share/omarchy/version
+                                                        + /etc/skel/.local/state/omarchy/migrations/user/*
+
+config/**                      ──►  omarchy-settings    /etc/skel/.config/**         (seeds new users)
+                                                        /usr/share/omarchy/config/** (resync source)
+etc/fastfetch/config.jsonc     ──►  omarchy-settings    /etc/fastfetch/config.jsonc
+
+applications/*.desktop         ──►  omarchy-settings    /etc/skel/.local/share/applications/
+                                                        /usr/share/omarchy/applications/
+applications/icons/*           ──►  omarchy-settings    /usr/share/icons/hicolor/{48,256,scalable}/apps/
+
+etc/**                         ──►  omarchy-settings    /etc/**           (drop-ins we own outright)
+  ├─ mkinitcpio.conf.d/{omarchy_hooks,thunderbolt_module}.conf
+  └─ limine-entry-tool.d/{omarchy-defaults,omarchy-uki}.conf
+
+default/limine/limine.conf     ──►  omarchy-settings    /usr/share/omarchy/default/limine/limine.conf
+default/limine/default.conf    ──►  omarchy-settings    /usr/share/omarchy/default/limine/default.conf
+                                                        (template; ISO substitutes @@CMDLINE@@ → /etc/default/limine)
+default/snapper/root           ──►  omarchy-settings    /etc/snapper/config-templates/omarchy
+                                                        (+ /usr/share/omarchy/default/snapper/root)
+
+default/**                     ──►  omarchy-settings    /usr/share/omarchy/default/
+  ├─ bash/env-bootstrap                                 /usr/share/omarchy/default/bash/env-bootstrap
+  │                                                       (sourced by every shell/session entry point; see "Env bootstrap")
+  ├─ bashrc                                             /usr/share/omarchy/etc-overrides/dot.bashrc
+  │                                                       → /etc/skel/.bashrc (post_install cp -f)
+  ├─ hypr/toggles/flags.lua                             /etc/skel/.local/state/omarchy/toggles/hypr/
+  ├─ nautilus-python/extensions/*.py                    /etc/skel/.local/share/nautilus-python/extensions/
+  ├─ uwsm/env.d/10-omarchy                              /usr/share/uwsm/env.d/
+  ├─ environment.d/*.conf                               /usr/lib/environment.d/
+  ├─ fontconfig/conf.avail/50-omarchy.conf              /usr/share/fontconfig/conf.avail/
+  │                                                       + symlink /etc/fonts/conf.d/50-omarchy.conf
+  ├─ xdg-terminal-exec/*.list                           /usr/share/xdg-terminal-exec/
+  ├─ applications/mimeapps.list                         /usr/share/applications/mimeapps.list
+  ├─ systemd/user/*.{service,path}                      /usr/lib/systemd/user/
+  ├─ systemd/system-sleep/unmount-fuse                  /usr/lib/systemd/system-sleep/
+  ├─ fonts/omarchy/omarchy.ttf                          /usr/share/fonts/omarchy/
+  ├─ sddm/omarchy/                                      /usr/share/sddm/themes/omarchy/
+  ├─ sddm/hyprland.lua                                  /usr/share/sddm/hyprland.lua
+  ├─ wayland-sessions/omarchy.desktop                   /usr/local/share/wayland-sessions/
+  ├─ plymouth/                                          /usr/share/plymouth/themes/omarchy/
+  └─ security/faillock, nsswitch, cups-browsed,
+     plymouthd.conf, os-release                         /usr/share/omarchy/etc-overrides/
+                                                          → /etc/* (post_install cp -f, see below)
+
+logo.{txt,svg}, icon.{txt,png}  ──► omarchy-settings    /usr/share/omarchy/  (resync source)
+                                                        /usr/share/pixmaps/omarchy.png
+                                                        /usr/share/icons/hicolor/256x256/apps/omarchy.png
+                                                        /etc/skel/.config/omarchy/branding/{about,screensaver}.txt
+```
+
+### Why `etc-overrides/` exists
+
+Some files under `/etc/` (`.bashrc` in `/etc/skel`, `nsswitch.conf`,
+`security/faillock.conf`, `cups/cups-browsed.conf`, `plymouth/plymouthd.conf`,
+`os-release`) are owned by upstream Arch packages, so we can't install over
+them via pacman without a file conflict. Instead they ship at
+`/usr/share/omarchy/etc-overrides/` and the `omarchy-settings` `post_install`
+/ `post_upgrade` scriptlet `cp -f`'s them into place.
+
+Tradeoff: user edits to those files get clobbered on every `omarchy-settings`
+upgrade. This is documented in the PKGBUILD.
+
+## Env bootstrap (`default/bash/env-bootstrap`)
+
+Single source of truth for `OMARCHY_PATH` and dev-link-aware `PATH`. It:
+
+- Sources `/etc/omarchy.conf` (written by `omarchy-dev-link`, reset to the
+  package path by `omarchy-dev-unlink`) if present; otherwise forces
+  `OMARCHY_PATH=/usr/share/omarchy` so a stale inherited value can't survive
+  an `omarchy-dev-unlink`.
+- Prepends `$OMARCHY_PATH/bin` to `PATH` **only when** `OMARCHY_PATH` is
+  not `/usr/share/omarchy`. On a production install the binaries are
+  already on `PATH` as `/usr/bin/omarchy-*` via the `omarchy` package.
+
+Sourced by every entry point that needs the env set:
+
+```
+/etc/profile.d/omarchy.sh                      (system login shells)
+/etc/skel/.bashrc                              (interactive shells)
+/usr/share/uwsm/env.d/10-omarchy               (Hyprland session via uwsm)
+/usr/share/omarchy/default/bash/envs           (SSH / non-login bash)
+```
+
+Idempotent — safe to source more than once in the same shell.
+
+## Runtime finalization (`omarchy-finalize-user`)
+
+Runs once per user. It does **not** copy `~/.config/**`, `~/.bashrc`,
+`flags.lua`, or the nautilus extensions — `/etc/skel` already seeded those.
+It only does the things `/etc/skel` can't:
+
+- Skill symlinks `~/.{agents,claude,codex,pi/agent}/skills/omarchy` →
+  `$OMARCHY_PATH/default/omarchy-skill`. Symlinks (not copies) so
+  `omarchy dev link` against a dev checkout repoints them correctly.
+- `xdg-user-dirs-update` (Templates/Public/Desktop folded back into `$HOME`)
+  and `~/.config/gtk-3.0/bookmarks` (needs `$HOME` expansion).
+- Sync `XKBLAYOUT` / `XKBVARIANT` from `/etc/vconsole.conf` into
+  `~/.config/hypr/input.lua`.
+- `xdg-settings set default-web-browser chromium.desktop` and
+  `xdg-mime default HEY.desktop x-scheme-handler/mailto` (XDG-aware paths).
+- `omarchy-refresh-applications` (composes generated `.desktop` launchers).
+- Sources `install/user/all.sh` — theme, git, mise, keyring, per-user
+  hardware quirks (asus mic/mixer, framework f13 audio, …).
+- On `--first-install`, marks every shipped user migration as already applied
+  for the freshly-created user.
+
+Idempotency marker: `~/.local/state/omarchy/finalize-user.done`.
+
+The ISO calls it as `omarchy-finalize-user --force --first-install` in the
+target chroot as the install user, after `omarchy-setup-system` has finished
+the root-side work.
+
+## Migrations (`omarchy-migrate`)
+
+See [`migrations.md`](migrations.md) for the full migration model, authoring
+guidelines, and troubleshooting notes.
+
+Omarchy migrations are split by scope:
+
+- `migrations/system/*.sh` — root, noninteractive, safe to run from pacman.
+  The `omarchy` package `post_upgrade()` runs `omarchy-migrate-system` after an
+  `omarchy` package upgrade, so even explicit direct-pacman bypasses still get
+  system migrations applied. Completion state lives in
+  `/var/lib/omarchy/migrations/system/`.
+- `migrations/user/*.sh` — current user/session, may be interactive, and may
+  touch `~/.config`, `~/.local`, user systemd, DBus, browser prefs, etc.
+  Completion state lives in `~/.local/state/omarchy/migrations/user/`.
+
+Package upgrades happen as root, but user migrations must run as each user and
+may be interactive. There is no root-owned "user migration required" marker. A
+user migration is pending only when a script exists in `migrations/user/` and
+that user's matching state file is missing.
+
+Each graphical user has `omarchy-update-user-notify.path` watching the packaged
+user migration directory. When that directory changes, or when the path unit is
+started on login, `omarchy-update-user-notify.service` runs
+`omarchy-migrate-notify` as that user. The notifier checks
+`omarchy-migrate --pending user`. If this user has missing migration state, it
+shows a notification that opens a terminal for `omarchy-migrate`. The notifier
+never runs user migrations in the background.
+
+`omarchy-migrate` waits for any active pacman transaction to finish, runs
+pending system migrations, then runs pending user migrations. It does not need
+`--force`; migrations happen when state files are missing. For watchers and
+diagnostics, `omarchy-migrate --pending [all|system|user]` prints
+scope-prefixed pending migration filenames and exits `0` when any are pending.
+`omarchy update` runs `omarchy-migrate` after the package transaction in the
+already-visible update terminal, then runs `omarchy-hook post-update`.
+
+## First-run (`omarchy-first-run`)
+
+Runs once on first interactive login, after the user manager is live. Used
+for steps that need a running graphical session and/or a working user
+systemd instance:
+
+- `omarchy-hook-install post-update install-voxtype.hook` — register the
+  Voxtype post-update hook.
+- `install/user/first-run/enable-user-units.sh` — `systemctl --user enable`
+  the shipped user units (`bt-agent`, `omarchy-sleep-lock`,
+  `omarchy-recover-internal-monitor`, `omarchy-update-user-notify.path`). Done here, not at finalize, because
+  the user manager isn't reachable from the ISO chroot; `ConditionPath*`
+  in the unit files keeps services inert when they don't apply.
+- `install/user/first-run/gnome-theme.sh`,
+  `install/user/first-run/gtk-primary-paste.sh` — GNOME/GTK settings that
+  need the dconf daemon.
+- `install/user/first-run/welcome.sh`,
+  `install/user/first-run/wifi.sh` — welcome and Wi-Fi/update toasts
+  (waits for a live notification server before firing).
+
+Idempotency marker: `~/.local/state/omarchy/first-run-user.done`. On
+failure the marker is not written and the failed step retries next login.
+
+## Root-side install orchestration
+
+`omarchy-setup-system` (root, in chroot) runs target-side setup at ISO
+finalization. It sources:
+
+- `install/config/*.sh` — theme links, lockout limits, lockscreen PAM,
+  powerprofilesctl shebang fix, docker setup, service enablement, firewall.
+- `install/hardware/all.sh` via `omarchy-setup-hardware` — vendor- and
+  device-specific kernel modules, udev rules, microcode, wireless regdom,
+  ASUS / Framework / Intel / Apple / Lenovo quirks.
+- `install/login/*.sh` — SDDM theme/session config.
+- `install/post-install/*.sh` — final pacman/udev/localdb passes.
+
+Logging goes to `/var/log/omarchy-install.log` via
+`install/helpers/logging.sh`.
+
+## Explicit resync (`omarchy-reinstall-configs`)
+
+When an existing user wants to reset to shipped defaults:
+
+```
+~/  ←  cp -af /etc/skel/.
+```
+
+Replaying `/etc/skel` over `$HOME` is exactly what `useradd -m` does for a
+brand-new user, so this one copy resyncs `.bashrc`, `.config/**`,
+`.local/share/applications/`, the nautilus-python extensions, hypr toggles,
+branding files, and the shipped migration markers in a single pass.
+
+Then it runs `omarchy-refresh-limine`, `omarchy-refresh-plymouth`, and the
+nvim refresh. Destructive: existing user files copied from `/etc/skel` are
+clobbered without backup. Fastfetch is package-owned at
+`/etc/fastfetch/config.jsonc`; delete `~/.config/fastfetch/config.jsonc` to
+return to the packaged default.
+
+## Quick reference: where does X live?
+
+| Goal | Touch |
+| --- | --- |
+| Default file at `~/.config/foo/` | `config/foo/` |
+| `/etc/` drop-in we own outright | `etc/` |
+| `/etc/` file owned by an upstream package | `default/`, then add to `etc-overrides` in `omarchy-settings` PKGBUILD + scriptlet |
+| Package-owned system file (e.g. systemd user service/path in `/usr/lib`) | `default/`, document the mapping in `default/package-defaults.tsv`, then add the `install -Dm644` line in `omarchy-settings` PKGBUILD |
+| Per-user file that's static but lives outside `~/.config` | `default/`, then add `install -Dm644 ... $pkgdir/etc/skel/...` in `omarchy-settings` PKGBUILD |
+| Runtime tweak that needs `$HOME` or live system state | extend `omarchy-finalize-user`, or add a per-user leaf under `install/user/` and wire into `install/user/all.sh` |
+| One-time root-side setup step | `install/config/*.sh` or `install/hardware/*.sh`, wire into `omarchy-setup-system` or `install/hardware/all.sh` |
+| Noninteractive root fix for existing installs | `migrations/system/<unix-timestamp>.sh` |
+| User/session fix for existing installs | `migrations/user/<unix-timestamp>.sh` |
+| User-facing `omarchy-*` command | `bin/omarchy-<group>-<verb>` — see `GROUP_DESCRIPTIONS` in `bin/omarchy` |
+| New theme | `themes/<name>/` (+ matching templates under `default/themed/` if they need theme colors) |
diff --git a/docs/migrations.md b/docs/migrations.md
new file mode 100644
index 00000000..7e0e58fb
--- /dev/null
+++ b/docs/migrations.md
@@ -0,0 +1,304 @@
+# Omarchy migrations
+
+Omarchy migrations are one-time repair scripts for existing installs. They are
+used when a package update needs to change state that pacman cannot safely own by
+itself.
+
+## The two migration scopes
+
+Omarchy migrations are split by execution context:
+
+```text
+migrations/system/*.sh
+migrations/user/*.sh
+```
+
+### System migrations
+
+System migrations run as root and must be noninteractive.
+
+Use system migrations for machine-wide state, for example:
+
+- `/etc` drop-ins or legacy config cleanup
+- `/boot` / bootloader cleanup
+- systemd system units or service state
+- hardware quirks
+- package-owned layout transitions
+
+Note that it's not necessary to write a migration for any file that will be package-owned.
+
+State lives in:
+
+```text
+/var/lib/omarchy/migrations/system/<migration filename>
+```
+
+### User migrations
+
+User migrations run as the current graphical/login user and may be interactive.
+
+Use user migrations for per-user or session-aware state, for example:
+
+- `~/.config` changes
+- `~/.local` state
+- user systemd units
+- browser/editor preferences
+- DBus/session-dependent updates
+- prompts that need to happen in a visible terminal
+
+State lives in:
+
+```text
+~/.local/state/omarchy/migrations/user/<migration filename>
+```
+
+A user migration is pending for a given user only when the script exists under
+`/usr/share/omarchy/migrations/user/` and that user's matching state file is
+missing.
+
+There is no global root-owned “user migrations required” queue.
+
+## When migrations run
+
+### During `omarchy update`
+
+`omarchy update` is the normal update path. It runs package updates, then:
+
+```bash
+omarchy-migrate
+omarchy-hook post-update
+```
+
+`omarchy-migrate`:
+
+1. waits for any active pacman transaction to finish
+2. runs pending system migrations
+3. runs pending user migrations for the current user
+
+System migrations usually already ran during the pacman transaction via the
+`omarchy` package `post_upgrade()`, but the second check is intentional and
+idempotent.
+
+### During direct pacman updates
+
+Raw `sudo pacman -Syu` is guarded. Users should normally run:
+
+```bash
+omarchy update
+```
+
+If a user explicitly bypasses the guard, the `omarchy` package still runs system
+migrations from `post_upgrade()`:
+
+```bash
+omarchy-migrate-system
+```
+
+User migrations are never run by pacman. Instead, the user session watches the
+packaged user migration directory and runs a notifier. The notifier checks:
+
+```bash
+omarchy-migrate --pending user
+```
+
+If that user has pending user migrations, it shows a notification that opens a
+terminal for:
+
+```bash
+omarchy-migrate
+```
+
+The notifier never runs user migrations silently in the background.
+
+### Manually
+
+Users can safely run:
+
+```bash
+omarchy-migrate
+```
+
+at any time. Already-completed migrations are skipped.
+
+## Inspecting pending migrations
+
+Use:
+
+```bash
+omarchy-migrate --pending
+omarchy-migrate --pending system
+omarchy-migrate --pending user
+```
+
+Exit behavior:
+
+- `0` — one or more matching migrations are pending
+- non-zero — no matching migrations are pending
+
+Output is scope-prefixed:
+
+```text
+system/100-system.sh
+user/200-user.sh
+```
+
+The lower-level runners also support `--pending` and print filenames without the
+scope prefix:
+
+```bash
+omarchy-migrate-system --pending
+omarchy-migrate-user --pending
+```
+
+Prefer `omarchy-migrate --pending ...` in user-facing tools and watchers.
+
+## Writing migrations
+
+Create a migration with:
+
+```bash
+omarchy-dev-add-migration system --no-edit
+omarchy-dev-add-migration user --no-edit
+```
+
+Choose the scope based on the state being changed, not on convenience.
+
+### File format
+
+Migrations are plain shell files:
+
+- filename: unix timestamp, generated by `omarchy-dev-add-migration`
+- mode: `0644`
+- no shebang
+- start with an `echo` describing the migration
+- use `$OMARCHY_PATH` for Omarchy-owned files
+- should be idempotent
+- should be as simple as possible to accomplish the task
+
+Example system migration:
+
+```bash
+echo "Remove legacy Limine config"
+
+rm -f /boot/EFI/limine/limine.conf
+```
+
+Example user migration:
+
+```bash
+echo "Refresh user app launchers"
+
+omarchy-refresh-applications
+```
+
+### Execution model
+
+Migration runners execute scripts with strict shell settings:
+
+```bash
+bash -euo pipefail <migration>
+```
+
+`$OMARCHY_PATH` is exported into the migration process.
+
+A migration is marked complete only after the script exits successfully. If it
+fails, the marker is not written and the migration will be retried later.
+
+Because failed migrations can be retried after doing partial work, migrations
+must be idempotent. Prefer operations that are safe to run more than once:
+
+```bash
+mkdir -p ~/.config/example
+rm -f ~/.config/example/legacy.conf
+install -Dm644 "$OMARCHY_PATH/default/example.conf" ~/.config/example/example.conf
+systemctl --user enable --now some-unit.service || true
+```
+
+Use `|| true` only when a failure is genuinely acceptable.
+
+## What belongs in a migration?
+
+Good migration uses:
+
+- deleting or moving legacy files that block the packaged layout
+- marking or enabling new service state
+- migrating old config paths to new config paths
+- repairing known bad state from an earlier Omarchy release
+- one-time compatibility for existing installs
+
+Bad migration uses:
+
+- fresh-install setup that belongs in `install/` or `/etc/skel`
+- package installation that belongs in package dependencies or package lists
+- recurring maintenance
+- arbitrary cleanup that should be a user command
+- pre-4 upgrade work that belongs in `omarchy-upgrade-to-4`
+- hidden user/session work from pacman
+
+## Fresh installs and new users
+
+Fresh users created from the packaged layout should not have to run historical
+user migrations. The package seeds user migration markers into `/etc/skel` so
+new users start with shipped user migrations marked complete.
+
+The ISO/finalization path also marks shipped user migrations complete for the
+freshly-created install user when running:
+
+```bash
+omarchy-finalize-user --first-install
+```
+
+Existing users keep their own migration state and run only migrations whose
+state files are missing.
+
+## Troubleshooting
+
+### See what is pending
+
+```bash
+omarchy-migrate --pending
+```
+
+### Retry failed migrations
+
+Fix the underlying problem, then run:
+
+```bash
+omarchy-migrate
+```
+
+A failed migration is not marked complete, so it will retry.
+
+### Re-run a completed migration manually
+
+Remove its marker, then run the migration command again:
+
+```bash
+rm ~/.local/state/omarchy/migrations/user/<migration>.sh
+omarchy-migrate
+```
+
+For system migrations:
+
+```bash
+sudo rm /var/lib/omarchy/migrations/system/<migration>.sh
+omarchy-migrate
+```
+
+Be careful: migrations should be idempotent, but manually removing markers is an
+advanced troubleshooting step.
+
+## Agent checklist
+
+Before adding a migration:
+
+1. Is this a one-time repair for existing installs?
+2. Is it system state or user/session state?
+3. Can it run safely more than once?
+4. Will it fail loudly if the important work fails?
+5. Does it avoid hidden interactive work from pacman?
+6. Does it belong in `omarchy-upgrade-to-4` instead?
+7. Did you add or update tests if behavior changed?
+
+If the answer to any of these is unclear, stop and ask before adding the
+migration.
diff --git a/docs/omarchy-shell.md b/docs/omarchy-shell.md
new file mode 100644
index 00000000..87c50af4
--- /dev/null
+++ b/docs/omarchy-shell.md
@@ -0,0 +1,347 @@
+# omarchy-shell
+
+A single long-running [Quickshell](https://quickshell.org/) instance
+that hosts the Omarchy desktop. The bar, panels, overlays, menus, and
+services all run inside as plugins. IPC is the canonical way for CLIs
+to talk to a running shell — `omarchy-shell-ipc` auto-starts it on
+first call.
+
+## Plugin manifest
+
+```json
+{
+  "schemaVersion": 1,
+  "id": "my.org.cool-clock",
+  "name": "Cool clock",
+  "version": "1.0.0",
+  "author": "You",
+  "description": "A clock that does cool things",
+  "kinds": ["bar-widget"],
+  "entryPoints": { "barWidget": "Widget.qml" }
+}
+```
+
+`kinds` (a manifest may declare more than one):
+
+| Kind         | What it is                                  |
+|--------------|---------------------------------------------|
+| `bar-widget` | Component the active bar drops into a section |
+| `bar`        | Full bar option that can replace `omarchy.bar` |
+| `panel`      | Floating window (e.g. OSD)                     |
+| `overlay`    | Fullscreen overlay (e.g. background picker)    |
+| `menu`       | Summoned menu surface                          |
+| `service`    | Headless singleton, no UI                      |
+
+Only one full bar option is active at a time. The built-in `omarchy.bar` is
+used when `bar.id` is omitted or when a selected third-party bar cannot load.
+Panels, overlays, and menus are loaded when summoned. Plugins can set
+`keepLoaded: true` to survive between summons. First-party services are
+loaded at startup.
+
+Full schema: [`shell/services/PluginRegistry.qml`](../shell/services/PluginRegistry.qml).
+
+## Installing a third-party plugin
+
+Plugins come from **source repos** — a git repo where every top-level folder is
+a plugin with its own `manifest.json`. Trust a repo, then install from it:
+
+```bash
+omarchy plugin source add https://github.com/owner/omarchy-plugins.git
+omarchy plugin available             # what your sources offer
+omarchy plugin add some-widget       # validate, copy, offer to enable
+omarchy plugin update --all          # shows a diff before applying
+omarchy plugin remove some-widget
+```
+
+Plugins run as **unsandboxed code** inside `omarchy-shell`. Adding a source and
+installing both warn you and let you review the manifest, the files, and (on
+update) a diff before anything is copied or enabled. Commands prompt when run
+bare in a terminal and run unattended when given arguments — add `--yes` to skip
+every prompt (the path for scripts and agents).
+
+Sources are recorded in `~/.config/omarchy/plugins/sources.json` and cloned into
+`~/.cache/omarchy/plugin-sources/`. You can still install by hand: drop a plugin
+into `~/.config/omarchy/plugins/<id>/`, run `omarchy plugin rescan`, then
+`omarchy plugin enable <id>` (bar widgets also need `omarchy plugin bar add <id>`;
+full bar replacements are selected with `omarchy plugin bar use <id>`).
+The lower-level IPC methods remain available through `omarchy-shell shell ...`.
+
+## IPC
+
+The shell exposes a `shell` target plus extra targets registered by
+individual plugins (`bar`, `image-selector`, …).
+
+| Method                                | Effect                          |
+|---------------------------------------|---------------------------------|
+| `ping`                                | health check                    |
+| `summon <id> <payloadJson>`           | load + open a plugin            |
+| `hide <id>`                           | close a previously-summoned     |
+| `toggle <id> <payloadJson>`           | summon if closed, hide if open  |
+| `call <id> <method> <arg>`            | call an already-loaded plugin   |
+| `rescanPlugins`                       | re-walk plugin dirs and hot-reload plugin code |
+| `reloadConfig`                        | reload shell.json               |
+| `setPluginEnabled <id> <"true"\|…>`   | flip enabled bit (`ok` / `unknown`) |
+| `listPlugins`                         | JSON of every discovered plugin |
+
+`setPluginEnabled` takes a string; only literal `"true"` enables.
+
+## shell.json
+
+```json
+{
+  "version": 1,
+  "idle": {
+    "screensaver": 150,
+    "lock": 300
+  },
+  "bar": {
+    "id": "omarchy.bar",
+    "position": "top",
+    "transparent": false,
+    "centerAnchor": "calendar",
+    "fontFamily": "JetBrainsMono Nerd Font",
+    "layout": {
+      "left":   [ { "id": "omarchy.menu" } ],
+      "center": [ { "id": "omarchy.clock", "format": "HH:mm" } ],
+      "right":  [ { "id": "omarchy.audio" } ]
+    }
+  },
+  "plugins": [
+    { "id": "community.weather-extra" }
+  ]
+}
+```
+
+Rules:
+
+1. The active bar option is `bar.id`. Omit it or set it to `omarchy.bar` for
+   the built-in bar; set it to a plugin whose manifest declares `kind: "bar"`
+   to replace the full bar.
+2. Every plugin instance is one entry — `bar.layout.<section>` for
+   bar widgets, `plugins[]` for everything else.
+3. Settings are inline on the entry. No `config:` sub-object, no
+   merge layers.
+4. Built-in bar widget ids are namespaced (`omarchy.clock`, `omarchy.audio`, …).
+   The migration rewrites older ids such as `Clock` and `AudioPanel` forward.
+5. Third-party enabled ⇔ present; for full bar options that means `bar.id`.
+   First-party non-bar plugins are always enabled.
+6. `allowMultiple: true` in the manifest permits multiple instances.
+7. `idle.screensaver` and `idle.lock` are seconds since user idle began.
+8. `version: 1` is required.
+
+`config/omarchy/shell.json` describes the fresh-install state. When no
+user `shell.json` exists, defaults are used verbatim. Once the user
+customizes, `shell.json` is canonical — there is no deep-merge.
+
+## Theme tokens
+
+See [`theming.md`](theming.md) for the full theme/template workflow,
+including generated `*.tpl` files, gradient helpers, and shell border syntax.
+
+Themes ship colors in `themes/<name>/colors.toml` and surface roles +
+sizing in `themes/<name>/shell.toml`. Defaults are generated from
+`default/themed/shell.toml.tpl`; a theme may also drop a hand-written
+`shell.toml` next to its `colors.toml` to replace the generated file.
+
+The shell exposes these tokens to QML via two singletons in
+`qs.Commons`:
+
+- `Color` — palette (`foreground`, `background`, `accent`, `urgent`)
+  and per-surface roles (`Color.bar.*`, `Color.popups.*`,
+  `Color.tooltip.*`, `Color.notifications.*`, `Color.menu.*`,
+  `Color.launcher.*`, `Color.imagePicker.*`, `Color.polkit.*`,
+  `Color.lock.*`). Clipboard and emojis share `Color.menu.*`.
+- `Style` — structural tokens (`cornerRadius`), shared interactive
+  state tokens/helpers, spacing (`Style.spacing.*` / `Style.space(px)`),
+  the type scale (`Style.font.*`), and bar dimensions
+  (`Style.bar.sizeHorizontal` / `Style.bar.sizeVertical`).
+- `Border` — border-spec helpers for QML surfaces. Use with
+  `BorderSurface` from `qs.Ui` when a border should honor shell theme
+  gradients or per-side widths. `Color.<section>.border` is only the
+  flat-color fallback for code that cannot render a real border.
+
+### Interactive states
+
+`[controls]` standardizes reusable control chrome (buttons, dropdowns,
+tab strips, etc.) around four states: `normal`, `hover-cursor`, `focus`,
+and `selected`. State colors and border tokens accept palette roles
+(`foreground`, `accent`, `urgent`, `background`) or hex strings; border
+values may also be gradients. Fill alpha applies to the state color;
+border alpha applies to the state's border token.
+
+Surfaces like `[menu]`, `[launcher]`, and `[image-picker]` define
+their own `selected-*` tokens and do **not** inherit from `[controls]`.
+`[controls]` only governs the shared button/dropdown chrome.
+
+| State | Color token | Fill alpha | Border token | Border width | Border alpha |
+|-------|-------------|------------|--------------|--------------|--------------|
+| Normal idle chrome | `normal-color` | `normal-fill-alpha` | `normal-border` | `normal-border-width` | `normal-border-alpha` |
+| Hover / keyboard cursor | `hover-cursor-color` | `hover-cursor-fill-alpha` | `hover-cursor-border` | `hover-cursor-border-width` | `hover-cursor-border-alpha` |
+| Qt activeFocus | `focus-color` | `focus-fill-alpha` | `focus-border` | `focus-border-width` | `focus-border-alpha` |
+| Persistent selected/current | `selected-color` | `selected-fill-alpha` | `selected-border` | `selected-border-width` | `selected-border-alpha` |
+
+The template ships `focus-*` adjacent to `hover-cursor-*` with the same
+values so mouse hover, keyboard cursor, and tab focus read identically.
+Themes that want focus to stand out override the `focus-*` keys.
+
+Border widths are the theme-level on/off switches for state borders; set
+a width to `0` to keep the fill while removing that state border. The
+default keeps selected borders off globally (`selected-border-width =
+0`); explicitly bordered controls keep their normal border when selected.
+
+```toml
+[controls]
+# Accent-tinted cursor/focus, foreground-tinted selected state.
+hover-cursor-color = "accent"
+focus-color        = "accent"
+selected-color     = "foreground"
+focus-border       = "rgba(33ccffee) rgba(00ff99ee) 45deg"
+
+# Keep selected fills but remove selected-state borders.
+selected-border-width = 0
+```
+
+Momentary fills use `pressed-fill-alpha` for button press feedback and
+`selection-fill-alpha` for text selection. Themes may also provide
+`pressed-color` or `selection-color`; they fall back to hover-cursor and
+foreground respectively.
+
+The section was previously named `[style]`. Hand-written theme
+`shell.toml` files using the old name still apply — the parser accepts
+both `[controls]` and `[style]`.
+
+### Spacing
+
+`[spacing] scale` multiplies the shell's shared margins, gaps, padding,
+control sizes, and panel dimensions. The default is `1.0`; values above
+`1.0` create more breathing room while values below `1.0` make controls
+dense. By default `scale-with-font = true`, so increasing `[font]
+base-size` also scales buttons, popup widths, row heights, and panel
+padding proportionally.
+
+```toml
+[spacing]
+scale = 1.15
+scale-with-font = true  # grow controls and panels with [font] base-size
+```
+
+QML components should prefer semantic tokens where possible:
+
+| Token | Default use |
+|-------|-------------|
+| `Style.spacing.controlPaddingX` / `controlPaddingY` | Button and tooltip padding |
+| `Style.spacing.inputPaddingY` | Text-field vertical padding |
+| `Style.spacing.controlHeight` / `popupRowHeight` | Dropdown and number-field row heights |
+| `Style.spacing.dropdownWidth` / `searchableDropdownWidth` / `numberFieldWidth` | Default field widths |
+| `Style.spacing.searchablePopupMinHeight` | Minimum searchable dropdown popup height |
+| `Style.spacing.controlGap` | Gap between icon and label inside controls |
+| `Style.spacing.labelGap` | Label-to-control and compact list gaps |
+| `Style.spacing.rowGap` / `rowPaddingX` | Form rows and list row content |
+| `Style.spacing.panelGap` / `panelPadding` | Panel section spacing and interior padding |
+| `Style.spacing.popupPadding` | Popout interior padding |
+
+Popout placement deliberately follows Hyprland's `general:gaps_out`
+(`Style.gapsOut`) so panels align with tiled windows. Use a theme's
+`hyprland.lua` to change that outer alignment; `[spacing]` controls the
+interior breathing room.
+
+For one-off proportional constants, use `Style.space(px)` to preserve the
+old default at scale `1.0` and `base-size = 12` while still responding to
+the theme scale and font scale. Use `Style.spaceReal(px)` only for
+fractional geometry that should not be rounded, such as bar widget text
+margins. Themes can override any semantic token directly in `[spacing]`,
+e.g.:
+
+```toml
+[spacing]
+scale = 1.0
+panel-padding = 22
+row-gap = 10
+```
+
+### Typography
+
+`[font] base-size` is the rem root for the scale. Every
+`Style.font.<token>` derives from it via a fixed multiplier, so
+bumping `base-size` rescales the whole shell proportionally:
+
+| Token                 | Multiplier | Default |
+|-----------------------|------------|---------|
+| `Style.font.caption`      | 0.833 | 10 |
+| `Style.font.bodySmall`    | 0.917 | 11 |
+| `Style.font.body`         | 1.0   | 12 |
+| `Style.font.subtitle`     | 1.083 | 13 |
+| `Style.font.title`        | 1.167 | 14 |
+| `Style.font.heading`      | 1.333 | 16 |
+| `Style.font.display`      | 2.0   | 24 |
+| `Style.font.displayLarge` | 2.333 | 28 |
+| `Style.font.iconSmall`    | bodySmall | 11 |
+| `Style.font.icon`         | title     | 14 |
+| `Style.font.iconLarge`    | 1.5       | 18 |
+
+A theme can either scale everything by tweaking `base-size`:
+
+```toml
+[font]
+base-size = 13   # roomier
+```
+
+…or pin individual tokens for stylistic emphasis without affecting
+the rest of the scale:
+
+```toml
+[font]
+base-size = 12
+heading       = 20
+display-large = 36
+```
+
+Recognized override keys: `base-size`, `caption`, `body-small`,
+`body`, `subtitle`, `title`, `heading`, `display`, `display-large`,
+`icon-small`, `icon`, `icon-large`.
+
+`base-size` has no upper clamp; the shell only floors it at **1px** to
+avoid nonsensical zero/negative sizes. Per-token overrides aren't clamped
+either. The shell font family is the fontconfig `monospace` alias —
+themes don't set it, the user does via `omarchy font set <name>`.
+
+### Bar size
+
+`[bar] size-horizontal` / `size-vertical` set the cross-axis dimension
+of top/bottom and left/right bars respectively, measured at the default
+12px font base. By default `scale-with-font = true`, so increasing
+`[font] base-size` also increases the bar's cross-axis size:
+
+```toml
+[bar]
+scale-with-font = true
+size-horizontal = 26   # top/bottom bar height at base-size 12
+size-vertical   = 28   # left/right bar width at base-size 12
+```
+
+Set `scale-with-font = false` to keep those bar sizes as fixed pixels.
+
+## Custom bar modules
+
+If a full plugin is overkill, declare a one-off module inline in
+`bar.layout.<section>`:
+
+```json
+{ "id": "vpn", "type": "command", "exec": "~/.config/omarchy/bar/scripts/vpn-status",
+  "interval": 5, "tooltip": "VPN", "onClick": "nm-connection-editor" }
+```
+
+Output is plain text or Waybar-style JSON (`{ "text": ..., "tooltip": ..., "class": ... }`).
+
+For a custom QML widget:
+
+```json
+{ "id": "gpu", "type": "qml" }
+```
+
+Then `~/.config/omarchy/bar/modules/gpu.qml` (or set `source` to point
+elsewhere). The module is an `Item` and receives `bar`, `moduleName`,
+`settings` properties. `bar` exposes `foreground` / `background` /
+`urgent` / `fontFamily` / `position` / `vertical` / `barSize`, plus
+`run(cmd)`, `shellQuote(v)`, `showTooltip(t, s)` / `hideTooltip(t)`,
+`requestPopout(o)` / `releasePopout(o)`.
diff --git a/docs/theming.md b/docs/theming.md
new file mode 100644
index 00000000..7fb32dec
--- /dev/null
+++ b/docs/theming.md
@@ -0,0 +1,309 @@
+# Omarchy theming
+
+Omarchy themes live under `themes/<name>/` in the source tree, with optional
+user themes under `~/.config/omarchy/themes/<name>/`. A theme normally starts
+with a `colors.toml`; Omarchy generates the rest of the theme files from
+`default/themed/*.tpl` when `omarchy-theme-set <name>` runs.
+
+## Theme activation flow
+
+`omarchy-theme-set <name>` builds a clean staging directory at
+`~/.config/omarchy/current/next-theme`:
+
+1. Copy the first-party theme from `themes/<name>/`.
+2. Overlay any user theme files from `~/.config/omarchy/themes/<name>/`.
+3. If needed, generate `colors.toml` from `alacritty.toml`.
+4. Run `omarchy-theme-set-templates` to render templates into the staging
+   theme.
+5. Move the staging theme into `~/.config/omarchy/current/theme` and notify the
+   running shell.
+
+Template rendering only happens when the staged theme has `colors.toml`.
+Existing files are never overwritten by a template, so a hand-written
+`themes/<name>/shell.toml` or `hyprland.lua` wins over
+`default/themed/shell.toml.tpl` or `hyprland.lua.tpl`.
+
+User templates in `~/.config/omarchy/themed/*.tpl` are processed before the
+built-in templates. If a user template has the same output filename as a
+built-in template, the built-in output is skipped.
+
+## `colors.toml`
+
+`colors.toml` provides the palette keys used by templates. Common keys are:
+
+```toml
+foreground = "#a9b1d6"
+background = "#1a1b26"
+accent     = "#7aa2f7"
+color1     = "#f7768e"
+color4     = "#7aa2f7"
+```
+
+Any key can be referenced from a template with `{{ key }}`. The shell also
+uses a few semantic palette keys directly:
+
+- `foreground`
+- `background`
+- `accent` — preferred when present; otherwise some places fall back to
+  `color4`
+- `urgent` / `color1`
+
+## Template placeholders
+
+Templates are plain files ending in `.tpl`. `omarchy-theme-set-templates`
+replaces placeholders with values from `colors.toml`.
+
+### Color placeholders
+
+For a color key such as `accent = "#7aa2f7"`:
+
+| Placeholder | Output |
+|-------------|--------|
+| `{{ accent }}` | `#7aa2f7` |
+| `{{ accent_strip }}` | `7aa2f7` |
+| `{{ accent_rgb }}` | `122,162,247` |
+
+### Color mixing
+
+`mix`, `mix_strip`, and `mix_rgb` blend two hex colors by a fraction or
+percentage:
+
+```text
+{{ mix background foreground 15% }}
+{{ mix_strip background accent 0.35 }}
+{{ mix_rgb color0 color7 50 }}
+```
+
+### Gradient helpers
+
+Some theme keys can be either a solid color or a Hyprland-style gradient:
+
+```toml
+hyprland_active_border = "rgba(33ccffee) rgba(00ff99ee) 45deg"
+```
+
+Gradient helper placeholders understand those values:
+
+| Helper | Use | Example output |
+|--------|-----|----------------|
+| `{{ hypr_gradient hyprland_active_border accent }}` | Hyprland Lua config | `{ colors = { "rgba(33ccffee)", "rgba(00ff99ee)" }, angle = 45 }` |
+| `{{ shell_gradient hyprland_active_border accent }}` | shell border tokens | `rgba(33ccffee) rgba(00ff99ee) 45deg` |
+| `{{ gradient_start hyprland_active_border accent }}` | flat-color-only consumers | `#33ccff` |
+
+The second argument is a fallback. For example,
+`{{ shell_gradient hyprland_active_border accent }}` means: use
+`hyprland_active_border` if the theme defines it; otherwise use `accent`.
+The helper does not choose the first color unless you use `gradient_start`.
+
+## `shell.toml`
+
+`shell.toml` contains shell surface roles, control states, spacing, typography,
+and bar sizing. The default generated file comes from
+`default/themed/shell.toml.tpl`.
+
+Themes can override the entire generated file by shipping `shell.toml`, or just
+one section by shipping `shell.<section>.toml`. For example,
+`shell.lock.toml` replaces only the `[lock]` section after the default
+`shell.toml` has been generated:
+
+```toml
+text        = "#ffffff"
+placeholder = "#ffffff"
+border      = "#ffffff"
+```
+
+The filename decides the target section, so the `[lock]` header is optional.
+
+The running shell reads `shell.toml` into two QML singletons:
+
+- `Color` for palette and surface roles like `Color.menu.border`.
+- `Style` for controls, spacing, font scale, corner radius, and bar sizing.
+
+### Borders
+
+Shell border tokens accept either a solid color or a gradient in the same key:
+
+```toml
+[notifications]
+border = "#7aa2f7"
+```
+
+or:
+
+```toml
+[notifications]
+border = "rgba(33ccffee) rgba(00ff99ee) 45deg"
+```
+
+Do not add a separate `border-gradient` key for new themes. The parser still
+accepts `border-gradient` and `*-border-gradient` for compatibility with older
+configs, but the canonical form is the border key itself.
+
+Border alphas apply to solid borders and to every gradient stop:
+
+```toml
+[notifications]
+border       = "rgba(33ccffee) rgba(00ff99ee) 45deg"
+border-alpha = 0.8
+```
+
+If a color stop already includes alpha, the stop alpha and `border-alpha` are
+combined.
+
+### Border widths
+
+Border widths accept CSS-style lists:
+
+```toml
+border-width = 2          # all sides
+border-width = "2 4"      # top/bottom, right/left
+border-width = "2 4 6"    # top, right/left, bottom
+border-width = "2 4 6 8"  # top, right, bottom, left
+```
+
+Per-side keys override the list:
+
+```toml
+[notifications]
+border-width = 2
+border-width-left = 6
+```
+
+That gives notifications a 2px border on the top, right, and bottom, and a 6px
+left edge.
+
+State-specific borders follow the same pattern. A selected menu row can use a
+different width from the card border:
+
+```toml
+[menu]
+selected-border = "accent"
+selected-border-width = "1 1 1 4"
+```
+
+For state-specific surfaces such as lock and polkit, the token name prefixes
+the width key:
+
+```toml
+[lock]
+border-active = "rgba(33ccffee) rgba(00ff99ee) 45deg"
+border-active-width-left = 6
+```
+
+### Control borders
+
+`[controls]` governs shared controls such as buttons, dropdowns, text fields,
+toggles, and cursor rows. Each state has a fill color, optional border value,
+border width, and border alpha:
+
+```toml
+[controls]
+normal-color        = "#a9b1d6"
+normal-border       = "#a9b1d6"
+normal-border-width = 1
+normal-border-alpha = 0.4
+
+hover-cursor-color        = "#a9b1d6"
+hover-cursor-border       = "#a9b1d6"
+hover-cursor-border-width = 1
+hover-cursor-border-alpha = 0.25
+```
+
+The `*-border` keys can also be gradients:
+
+```toml
+[controls]
+focus-border = "rgba(33ccffee) rgba(00ff99ee) 45deg"
+focus-border-width = "2 2 2 4"
+```
+
+Set a border width to `0` to keep the fill but remove that state border.
+
+### Surface sections
+
+Common shell sections include:
+
+- `[bar]`
+- `[controls]`
+- `[popups]`
+- `[tooltip]`
+- `[notifications]`
+- `[launcher]`
+- `[menu]`
+- `[polkit]`
+- `[lock]`
+- `[image-picker]`
+- `[spacing]`
+- `[font]`
+
+Clipboard and emojis inherit menu tokens. Popups are used by bar flyouts,
+dropdowns, OSD, and popup cards.
+
+## QML border API
+
+Plugin and shell QML should use `BorderSurface` for theme-aware borders:
+
+```qml
+import qs.Commons
+import qs.Ui
+
+BorderSurface {
+  color: Color.popups.background
+  borderSpec: Border.surfaceSpec("popups", "border", Color.popups.border, 2)
+  padding: Style.spacing.popupPadding
+
+  Item {
+    anchors.fill: parent
+    anchors.topMargin: parent.contentTopInset
+    anchors.rightMargin: parent.contentRightInset
+    anchors.bottomMargin: parent.contentBottomInset
+    anchors.leftMargin: parent.contentLeftInset
+  }
+}
+```
+
+Use `Border.surfaceSpec(section, token, fallbackColor, fallbackWidth)` for
+shell theme tokens, `Border.controlSpec(state, foreground, accent)` for shared
+controls, and `Border.flat(color, width)` for a deliberate local border that
+should not be overridden by the active theme. `Color.<section>.border` is the
+flat first-stop color for consumers that cannot render full border specs.
+
+## Hyprland templates
+
+Hyprland theme output is generated from `default/themed/hyprland.lua.tpl`.
+Use `hypr_gradient` for border values because Hyprland's Lua config wants a
+Lua string for solid colors and a Lua table for gradients:
+
+```lua
+local active_border_color = {{ hypr_gradient hyprland_active_border accent }}
+```
+
+For a solid fallback this renders:
+
+```lua
+local active_border_color = "#7aa2f7"
+```
+
+For a gradient it renders:
+
+```lua
+local active_border_color = { colors = { "rgba(33ccffee)", "rgba(00ff99ee)" }, angle = 45 }
+```
+
+## Adding or overriding theme files
+
+- Add palette values to `themes/<name>/colors.toml`.
+- Prefer generated files when the theme can be expressed with templates.
+- Add a hand-written file in `themes/<name>/` only when that theme needs to
+  override the generated output entirely.
+- Add a new built-in template under `default/themed/<file>.tpl` when every
+  theme should generate that file.
+- Add a user-wide template under `~/.config/omarchy/themed/<file>.tpl` when a
+  local customization should apply across themes.
+
+When changing templates or theme helpers, run focused tests such as:
+
+```bash
+./test/cli
+./test/shell
+```
diff --git a/docs/update-process.md b/docs/update-process.md
new file mode 100644
index 00000000..ca6d202a
--- /dev/null
+++ b/docs/update-process.md
@@ -0,0 +1,318 @@
+# Omarchy update process
+
+This document describes the intended update behavior now that Omarchy is
+package-backed. It covers the blessed update path plus what happens when a user attempts to
+bypass it:
+
+1. `omarchy update` — the blessed interactive Omarchy update flow.
+2. `sudo pacman -Syu` — guarded by Omarchy and aborted with instructions unless
+   the user explicitly bypasses the guard.
+
+The design goal is:
+
+- System/root migrations should run automatically from package transactions when
+  safe.
+- User/session migrations should never run invisibly from pacman because they may
+  need `$HOME`, DBus/session state, a graphical session, or user interaction.
+- Users who bypass `omarchy update` should still get system migrations from
+  pacman and should be notified only when their own user migration state is
+  missing a shipped user migration.
+
+## State and coordination files
+
+| Path | Owner | Purpose |
+| --- | --- | --- |
+| `${XDG_RUNTIME_DIR:-/tmp}/omarchy-update.lock` | user | Prevent overlapping update runs. Owned by `omarchy-update`; compatibility wrappers inherit/respect it. |
+| `/tmp/omarchy-update.log` | user | Transcript of `omarchy update`, used by `omarchy-update-analyze-logs`. |
+| `~/.local/state/omarchy/updates/` | user | Update-check state for the shell widget (`packages`, `aur`, `available`, `checked-at`, `error`). |
+| `/var/lib/omarchy/migrations/system/` | root | System migration markers. |
+| `~/.local/state/omarchy/migrations/user/` | user | User migration markers. |
+| `~/.local/state/omarchy/reboot-required` | user | Optional reboot marker checked by `omarchy-update-restart`. |
+| `~/.local/state/omarchy/restart-*-required` | user | Optional service/app restart markers checked by `omarchy-update-restart`. |
+
+## Migration layout
+
+See [`migrations.md`](migrations.md) for the full migration model, authoring
+guidelines, and troubleshooting notes.
+
+Migrations are scoped by directory:
+
+```text
+migrations/system/*.sh
+migrations/user/*.sh
+```
+
+### System migrations
+
+System migrations are root-owned, noninteractive fixes for existing installs.
+They may touch `/etc`, `/usr`, `/boot`, system services, hardware configuration,
+and other machine-wide state.
+
+Runner:
+
+```bash
+omarchy-migrate-system
+```
+
+Completion state:
+
+```text
+/var/lib/omarchy/migrations/system/<migration filename>
+```
+
+Pacman integration:
+
+```text
+pkgbuilds/omarchy/omarchy.install post_upgrade()
+```
+
+The `omarchy` package calls `omarchy-migrate-system` from `post_upgrade()`.
+The runner is idempotent, so repeated calls only check the state files.
+
+### User migrations
+
+User migrations are current-user/session fixes. They may touch `~/.config`,
+`~/.local`, user systemd units, browser/editor preferences, DBus/session state,
+or ask questions.
+
+Runner:
+
+```bash
+omarchy-migrate-user
+```
+
+Public command:
+
+```bash
+omarchy-migrate
+```
+
+Completion state:
+
+```text
+~/.local/state/omarchy/migrations/user/<migration filename>
+```
+
+A user migration is pending only when a script exists in `migrations/user/` and
+that user's matching state file is missing. There is no global root-owned queue
+for user migrations.
+
+`omarchy-migrate` is the public command. It waits for any active pacman
+transaction to finish, runs pending system migrations, then runs pending user
+migrations. It does not need `--force`; migrations should happen when they are
+pending.
+
+For watchers and diagnostics, `omarchy-migrate --pending [all|system|user]`
+prints pending migration names and exits `0` when any are pending. Output is
+scope-prefixed, for example:
+
+```text
+system/100-system.sh
+user/200-user.sh
+```
+
+When no matching migrations are pending, it prints nothing and exits non-zero.
+
+## Raw pacman guard
+
+The `omarchy` package installs an ALPM pre-transaction hook alongside its guard
+binary:
+
+```text
+/usr/share/libalpm/hooks/00-omarchy-update-guard.hook
+/usr/bin/omarchy-update-pacman-guard
+```
+
+It triggers on package upgrades and runs:
+
+```bash
+omarchy-update-pacman-guard
+```
+
+The guard detects direct pacman system-upgrade commands like `pacman -Syu` or
+`pacman --sync --refresh --sysupgrade`. If the upgrade was not launched by an
+Omarchy update command, the hook exits non-zero with `AbortOnFail`, which stops
+the transaction before packages are changed.
+
+`omarchy-update-system-pkgs`, `omarchy-refresh-pacman`, `omarchy-reinstall-pkgs`,
+and the v4 upgrader run pacman through:
+
+```bash
+env OMARCHY_UPDATE_PACMAN=1 pacman ...
+```
+
+so the guard allows Omarchy-owned update flows. A user can intentionally bypass
+the guard with:
+
+```bash
+sudo env OMARCHY_ALLOW_DIRECT_PACMAN=1 pacman -Syu
+```
+
+The guard does not start `omarchy update` itself because pacman is already in a
+transaction setup path; it only aborts with instructions.
+
+## Path 1: `omarchy update`
+
+High-level flow:
+
+```text
+omarchy-update
+  ├─ ensure transcript logging through script(1) → /tmp/omarchy-update.log
+  ├─ acquire update lock
+  ├─ confirm unless -y
+  ├─ create snapper snapshot, if snapper is installed
+  └─ run update pipeline
+       ├─ block system sleep and temporarily enable shell stay-awake mode
+       ├─ omarchy-update-keyring
+       ├─ omarchy-update-system-pkgs
+       ├─ omarchy-migrate
+       ├─ omarchy-hook post-update
+       ├─ omarchy-update-aur-pkgs
+       ├─ omarchy-update-mise
+       ├─ omarchy-update-orphan-pkgs
+       ├─ omarchy-update-analyze-logs
+       ├─ omarchy-update-available, then refresh/clear shell indicator
+       ├─ omarchy-update-restart
+       └─ release sleep inhibitor and restore shell idle state, if changed
+```
+
+Important behavior:
+
+- `omarchy update` checks/runs system and user migrations in the same visible
+  terminal via `omarchy-migrate`.
+- `omarchy update` still benefits from pacman-triggered system migrations
+  because the system migration hook runs as part of the pacman transaction.
+- A failure should leave enough output in `/tmp/omarchy-update.log` and the
+  terminal transcript to debug.
+
+## Path 2: direct `sudo pacman -Syu` attempt
+
+High-level flow:
+
+```text
+sudo pacman -Syu
+  ├─ pre-transaction guard aborts and tells the user to run omarchy update
+  └─ if explicitly bypassed, upgrades omarchy and related packages
+  ├─ omarchy post_upgrade runs omarchy-migrate-system as root
+  └─ user session notices migration directory changes
+       ├─ omarchy-update-user-notify.path triggers, if enabled
+       ├─ omarchy-migrate-notify checks omarchy-migrate --pending user
+       ├─ if this user has missing migration state, show notification
+       └─ click opens terminal: omarchy-migrate
+```
+
+Fallbacks:
+
+- `omarchy-first-run` enables the user notification path unit.
+- `omarchy-first-run` also invokes `omarchy-migrate-notify` on graphical
+  startup, so users who updated before the path unit existed still get prompted
+  if they have missing user migration state.
+- The notifier is only a prompt. It does not run user migrations in the
+  background.
+- Direct pacman updates do not run `omarchy-hook post-update` unless the user
+  explicitly runs that hook; without a package-update marker, the only user-side
+  pending state we can derive is missing user migration markers.
+
+## Shell update indicator
+
+The bar widget `omarchy.system-update` runs:
+
+```bash
+omarchy-update-available
+```
+
+`omarchy-update-available` uses `checkupdates` with a temporary database when
+available, plus `yay -Qua` for AUR updates when foreign packages are installed.
+It stores the result in:
+
+```text
+~/.local/state/omarchy/updates/packages
+~/.local/state/omarchy/updates/aur
+~/.local/state/omarchy/updates/available
+~/.local/state/omarchy/updates/checked-at
+~/.local/state/omarchy/updates/error
+```
+
+Exit codes:
+
+- `0` — updates are available; stdout is the update list.
+- non-zero — no updates are available; stdout says the system is up to date.
+
+The widget uses the line count to show/hide itself. It also watches the
+`available` state file, so manually running `omarchy-update-available` updates
+the widget as soon as the file changes. Hovering the update icon opens a panel
+that lists Omarchy packages first, then all other package updates.
+
+## Update-related binaries
+
+This inventory is intentionally opinionated. Some commands are useful as stable
+leaf commands; others exist mostly because the old update flow accreted small
+scripts.
+
+| Binary | Current purpose | Keep? / Question |
+| --- | --- | --- |
+| `omarchy-update` | Public user command. Adds transcript logging, lock, confirmation, snapshot, sleep/idle inhibitors, package updates, migrations, hooks, update-state refresh, and restart checks. | **Keep.** This is the blessed entry point and owns the update pipeline. |
+| `omarchy-update-perform` | Hidden compatibility wrapper for `omarchy-update -y`. | **Temporary.** Keep only for old callers; new code should call `omarchy-update` directly. |
+| `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-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 targeted transition `--overwrite` entries so the ALPM guard allows the transaction and early package-layout conflicts are handled. | **Keep for now.** Small leaf command, clear/testable. |
+| `omarchy-migrate-system` | Runs root/system migrations from `migrations/system`. Called by `omarchy` package `post_upgrade()` and by `omarchy-migrate` when system migration state is missing. | **Keep.** This is the important direct-`pacman -Syu` integration. |
+| `omarchy-migrate-user` | Checks `migrations/user` against this user's state and runs only missing user migrations. Supports `--pending` and prints pending filenames. | **Keep internal.** Public users should generally run `omarchy-migrate`. |
+| `omarchy-migrate` | Public migration command. Waits for pacman, then runs pending system and user migrations. Supports `--pending [all|system|user]` and prints scope-prefixed pending filenames. | **Keep.** This replaces the discarded `omarchy-update-user-finalize` name and no longer needs `--force`. |
+| `omarchy-update-pacman-guard` | ALPM pre-transaction guard that aborts direct `pacman -Syu` style upgrades unless Omarchy set `OMARCHY_UPDATE_PACMAN=1` or the user explicitly set `OMARCHY_ALLOW_DIRECT_PACMAN=1`. | **Keep internal/hidden.** This is what nudges users back to `omarchy update`. |
+| `omarchy-migrate-notify` | Internal notification helper for direct pacman updates. Uses `omarchy-migrate --pending user` and shows notification only when this user has pending migrations. | **Keep internal/hidden.** Clear name now that the public command is `omarchy-migrate`. |
+| `omarchy-update-user-notify` | Hidden compatibility wrapper for `omarchy-migrate-notify`. | **Temporary.** Keep only for old callers. |
+| `omarchy-update-available` | Update checker for shell widget and post-update refresh. Writes update state. | **Keep.** Could eventually be renamed `omarchy-update-check`, but current name matches widget semantics. |
+| `omarchy-update-aur-pkgs` | Updates AUR packages with `yay -Sua` if foreign packages exist and AUR is reachable. | **Question.** Omarchy is package-backed now, but users may still install AUR packages. Keep for now. |
+| `omarchy-update-mise` | Runs `mise up` for mise-managed tools. | **Keep.** Mise-managed tools are intentionally part of the blessed update path. |
+| `omarchy-update-orphan-pkgs` | Lists orphans and prompts before removal; noninteractive mode never removes. | **Keep for now.** Safe because it is prompt-only. |
+| `omarchy-update-analyze-logs` | Scans `/tmp/omarchy-update.log` for known failure patterns, currently initramfs generation. | **Keep/expand.** Useful safety net; should grow only for high-signal checks. |
+| `omarchy-update-restart` | Prompts for reboot after kernel/Hyprland updates and restarts components with `restart-*-required` markers. | **Keep.** Important final step; may eventually include service-restart checks. |
+| `omarchy-update-firmware` | Manual firmware update command using fwupd. Not part of the normal update pipeline. | **Keep separate.** Firmware is not a routine system update step. |
+| `omarchy-update-time` | Restarts `systemd-timesyncd`. | **Question.** Not really an update command. Consider renaming/moving under system/time maintenance. |
+
+## Closed decisions
+
+1. **System migrations run from the `omarchy` package**
+   - `omarchy.install post_upgrade()` calls `omarchy-migrate-system`.
+   - We do not need a separate system-migration ALPM hook from
+     `omarchy-settings`.
+
+2. **Root vs user migrations stay separate**
+   - Do not use `su {user}` from pacman to run user migrations.
+   - User migrations need the user's real session and should be visible.
+   - Pending user work is determined only by comparing `migrations/user/*.sh`
+     against `~/.local/state/omarchy/migrations/user/`.
+
+3. **Migration notification naming**
+   - The real helper is `omarchy-migrate-notify`.
+   - `omarchy-update-user-notify` remains only as a hidden compatibility wrapper.
+
+4. **Update pipeline ownership**
+   - `omarchy-update` owns the full update pipeline now.
+   - `omarchy-update-perform` is only a hidden compatibility wrapper for
+     `omarchy-update -y`.
+
+5. **Mise remains in the blessed update path**
+   - `omarchy-update-mise` intentionally runs as part of `omarchy update`.
+
+6. **Orphan cleanup stays in the update path for now**
+   - It is prompt-only and never removes packages noninteractively.
+
+7. **Direct pacman user follow-up is based on actual migration state**
+   - Direct `sudo pacman -Syu` no longer uses a fake user-update marker.
+   - User notifications are shown only when `omarchy-migrate --pending user`
+     finds missing per-user migration state.
+
+## Remaining concerns
+
+1. **Pacman guard scope**
+   - The guard detects direct pacman sysupgrade invocations and allows Omarchy
+     commands that set `OMARCHY_UPDATE_PACMAN=1`.
+   - We may regret blocking some legitimate package-manager frontends or
+     maintenance flows. Keep an eye on what should be allowed versus redirected
+     to `omarchy update`.
+
+2. **Pacnew/pacsave handling is still missing**
+   - Package-backed Omarchy should warn about or help process `.pacnew` and
+     `.pacsave` files after updates.
diff --git a/etc/cups/cups-browsed.conf b/etc/cups/cups-browsed.conf
new file mode 100644
index 00000000..ed1bdbad
--- /dev/null
+++ b/etc/cups/cups-browsed.conf
@@ -0,0 +1,4 @@
+# Omarchy override of cups-browsed's shipped config. The only behavioural
+# change vs the upstream default (all-commented) is enabling auto-registration
+# of remote IPP printers discovered via Avahi/mDNS.
+CreateRemotePrinters Yes
diff --git a/etc/docker/daemon.json b/etc/docker/daemon.json
new file mode 100644
index 00000000..f1097647
--- /dev/null
+++ b/etc/docker/daemon.json
@@ -0,0 +1,6 @@
+{
+    "log-driver": "json-file",
+    "log-opts": { "max-size": "10m", "max-file": "5" },
+    "dns": ["172.17.0.1"],
+    "bip": "172.17.0.1/16"
+}
diff --git a/config/fastfetch/config.jsonc b/etc/fastfetch/config.jsonc
similarity index 96%
rename from config/fastfetch/config.jsonc
rename to etc/fastfetch/config.jsonc
index ea6b59e1..0bacc465 100644
--- a/config/fastfetch/config.jsonc
+++ b/etc/fastfetch/config.jsonc
@@ -66,13 +66,13 @@
       "type": "command",
       "key": "\ue900 OS",
       "keyColor": "blue",
-      "text": "version=$(omarchy-version); echo \"Omarchy $version\""
+      "text": "version=$(omarchy-version) && echo \"Omarchy $version\""
     },
     {
       "type": "command",
       "key": "│ ├󰘬",
       "keyColor": "blue",
-      "text": "branch=$(omarchy-version-branch); echo \"$branch\""
+      "text": "omarchy-version-branch"
     },
     {
       "type": "command",
diff --git a/etc/gnupg/dirmngr.conf b/etc/gnupg/dirmngr.conf
new file mode 100644
index 00000000..8d327907
--- /dev/null
+++ b/etc/gnupg/dirmngr.conf
@@ -0,0 +1,7 @@
+keyserver hkps://keyserver.ubuntu.com
+keyserver hkps://pgp.surfnet.nl
+keyserver hkps://keys.mailvelope.com
+keyserver hkps://keyring.debian.org
+keyserver hkps://pgp.mit.edu
+
+connect-quick-timeout 4
diff --git a/etc/limine-entry-tool.d/omarchy-defaults.conf b/etc/limine-entry-tool.d/omarchy-defaults.conf
new file mode 100644
index 00000000..01e4044c
--- /dev/null
+++ b/etc/limine-entry-tool.d/omarchy-defaults.conf
@@ -0,0 +1,15 @@
+TARGET_OS_NAME="Omarchy"
+
+KERNEL_CMDLINE[default]+=" quiet splash loglevel=0 systemd.show_status=false rd.udev.log_level=0 vt.global_cursor_default=0"
+
+CUSTOM_UKI_NAME="omarchy"
+ENABLE_LIMINE_FALLBACK=yes
+
+# Find and add other bootloaders
+FIND_BOOTLOADERS=yes
+
+BOOT_ORDER="*, *fallback, Snapshots"
+
+MAX_SNAPSHOT_ENTRIES=5
+
+SNAPSHOT_FORMAT_CHOICE=5
diff --git a/etc/limine-entry-tool.d/omarchy-uki.conf b/etc/limine-entry-tool.d/omarchy-uki.conf
new file mode 100644
index 00000000..04b69ac9
--- /dev/null
+++ b/etc/limine-entry-tool.d/omarchy-uki.conf
@@ -0,0 +1 @@
+ENABLE_UKI=yes
diff --git a/etc/mkinitcpio.conf.d/omarchy_hooks.conf b/etc/mkinitcpio.conf.d/omarchy_hooks.conf
new file mode 100644
index 00000000..9b087df6
--- /dev/null
+++ b/etc/mkinitcpio.conf.d/omarchy_hooks.conf
@@ -0,0 +1 @@
+HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs)
diff --git a/etc/mkinitcpio.conf.d/thunderbolt_module.conf b/etc/mkinitcpio.conf.d/thunderbolt_module.conf
new file mode 100644
index 00000000..9518f8b1
--- /dev/null
+++ b/etc/mkinitcpio.conf.d/thunderbolt_module.conf
@@ -0,0 +1 @@
+MODULES+=(thunderbolt)
diff --git a/etc/modprobe.d/omarchy-usb-autosuspend.conf b/etc/modprobe.d/omarchy-usb-autosuspend.conf
new file mode 100644
index 00000000..b66d637e
--- /dev/null
+++ b/etc/modprobe.d/omarchy-usb-autosuspend.conf
@@ -0,0 +1 @@
+options usbcore autosuspend=-1
diff --git a/etc/nsswitch.conf b/etc/nsswitch.conf
new file mode 100644
index 00000000..15b6555d
--- /dev/null
+++ b/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# Name Service Switch configuration file.
+# See nsswitch.conf(5) for details.
+
+passwd: files systemd
+group: files [SUCCESS=merge] systemd
+shadow: files systemd
+gshadow: files systemd
+
+publickey: files
+
+hosts: mymachines mdns_minimal [NOTFOUND=return] resolve files myhostname dns
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
diff --git a/etc/plymouth/plymouthd.conf b/etc/plymouth/plymouthd.conf
new file mode 100644
index 00000000..8bd07aed
--- /dev/null
+++ b/etc/plymouth/plymouthd.conf
@@ -0,0 +1,2 @@
+[Daemon]
+Theme=omarchy
diff --git a/etc/profile.d/omarchy.sh b/etc/profile.d/omarchy.sh
new file mode 100644
index 00000000..884ffb05
--- /dev/null
+++ b/etc/profile.d/omarchy.sh
@@ -0,0 +1 @@
+[ -r /usr/share/omarchy/default/bash/env-bootstrap ] && . /usr/share/omarchy/default/bash/env-bootstrap
diff --git a/etc/sddm.conf.d/10-theme.conf b/etc/sddm.conf.d/10-theme.conf
new file mode 100644
index 00000000..5c9cef9b
--- /dev/null
+++ b/etc/sddm.conf.d/10-theme.conf
@@ -0,0 +1,2 @@
+[Theme]
+Current=omarchy
diff --git a/etc/sddm.conf.d/10-wayland.conf b/etc/sddm.conf.d/10-wayland.conf
new file mode 100644
index 00000000..2ecb22e8
--- /dev/null
+++ b/etc/sddm.conf.d/10-wayland.conf
@@ -0,0 +1,5 @@
+[General]
+DisplayServer=wayland
+
+[Wayland]
+CompositorCommand=start-hyprland -- --config /usr/share/sddm/hyprland.lua
diff --git a/etc/security/faillock.conf b/etc/security/faillock.conf
new file mode 100644
index 00000000..431f5e75
--- /dev/null
+++ b/etc/security/faillock.conf
@@ -0,0 +1,7 @@
+# Omarchy override of /etc/security/faillock.conf (upstream owned by `pam`).
+# The only behavioural change vs upstream defaults is raising `deny` from 3 to
+# 10 so users get more attempts before lockout.
+#
+# All other settings remain at upstream defaults (commented out). See
+# faillock.conf(5) for the full option list.
+deny = 10
diff --git a/etc/sudoers.d/omarchy-asdcontrol b/etc/sudoers.d/omarchy-asdcontrol
new file mode 100644
index 00000000..a8483b62
--- /dev/null
+++ b/etc/sudoers.d/omarchy-asdcontrol
@@ -0,0 +1 @@
+%wheel ALL=(ALL) NOPASSWD: /usr/bin/asdcontrol
diff --git a/etc/sudoers.d/omarchy-passwd-tries b/etc/sudoers.d/omarchy-passwd-tries
new file mode 100644
index 00000000..b87e3573
--- /dev/null
+++ b/etc/sudoers.d/omarchy-passwd-tries
@@ -0,0 +1 @@
+Defaults passwd_tries=10
diff --git a/etc/sudoers.d/omarchy-tzupdate b/etc/sudoers.d/omarchy-tzupdate
new file mode 100644
index 00000000..913fa174
--- /dev/null
+++ b/etc/sudoers.d/omarchy-tzupdate
@@ -0,0 +1 @@
+%wheel ALL=(root) NOPASSWD: /usr/bin/tzupdate, /usr/bin/timedatectl set-timezone *
diff --git a/etc/sysctl.d/90-omarchy-file-watchers.conf b/etc/sysctl.d/90-omarchy-file-watchers.conf
new file mode 100644
index 00000000..4d5e4e8a
--- /dev/null
+++ b/etc/sysctl.d/90-omarchy-file-watchers.conf
@@ -0,0 +1,3 @@
+# Raise inotify limits so VS Code, webpack, and similar dev tools don't hit the
+# default 8192 ceiling.
+fs.inotify.max_user_watches=524288
diff --git a/etc/sysctl.d/99-omarchy-sysctl.conf b/etc/sysctl.d/99-omarchy-sysctl.conf
new file mode 100644
index 00000000..b8845467
--- /dev/null
+++ b/etc/sysctl.d/99-omarchy-sysctl.conf
@@ -0,0 +1,2 @@
+# Solve common flakiness with SSH (MTU discovery on flaky links).
+net.ipv4.tcp_mtu_probing=1
diff --git a/etc/systemd/logind.conf.d/10-ignore-power-button.conf b/etc/systemd/logind.conf.d/10-ignore-power-button.conf
new file mode 100644
index 00000000..d86b8662
--- /dev/null
+++ b/etc/systemd/logind.conf.d/10-ignore-power-button.conf
@@ -0,0 +1,2 @@
+[Login]
+HandlePowerKey=ignore
diff --git a/etc/systemd/resolved.conf.d/10-disable-multicast.conf b/etc/systemd/resolved.conf.d/10-disable-multicast.conf
new file mode 100644
index 00000000..14798f6e
--- /dev/null
+++ b/etc/systemd/resolved.conf.d/10-disable-multicast.conf
@@ -0,0 +1,3 @@
+[Resolve]
+LLMNR=no
+MulticastDNS=no
diff --git a/etc/systemd/resolved.conf.d/20-docker-dns.conf b/etc/systemd/resolved.conf.d/20-docker-dns.conf
new file mode 100644
index 00000000..2c7f5276
--- /dev/null
+++ b/etc/systemd/resolved.conf.d/20-docker-dns.conf
@@ -0,0 +1,2 @@
+[Resolve]
+DNSStubListenerExtra=172.17.0.1
diff --git a/etc/systemd/system.conf.d/10-faster-shutdown.conf b/etc/systemd/system.conf.d/10-faster-shutdown.conf
new file mode 100644
index 00000000..90dce4f6
--- /dev/null
+++ b/etc/systemd/system.conf.d/10-faster-shutdown.conf
@@ -0,0 +1,2 @@
+[Manager]
+DefaultTimeoutStopSec=5s
diff --git a/etc/systemd/system.conf.d/20-omarchy-nofile.conf b/etc/systemd/system.conf.d/20-omarchy-nofile.conf
new file mode 100644
index 00000000..663a249d
--- /dev/null
+++ b/etc/systemd/system.conf.d/20-omarchy-nofile.conf
@@ -0,0 +1,2 @@
+[Manager]
+DefaultLimitNOFILE=65536:524288
diff --git a/etc/systemd/system/docker.service.d/no-block-boot.conf b/etc/systemd/system/docker.service.d/no-block-boot.conf
new file mode 100644
index 00000000..911bbfa0
--- /dev/null
+++ b/etc/systemd/system/docker.service.d/no-block-boot.conf
@@ -0,0 +1,2 @@
+[Unit]
+DefaultDependencies=no
diff --git a/etc/systemd/system/plocate-updatedb.service.d/ac-only.conf b/etc/systemd/system/plocate-updatedb.service.d/ac-only.conf
new file mode 100644
index 00000000..4e53123c
--- /dev/null
+++ b/etc/systemd/system/plocate-updatedb.service.d/ac-only.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionACPower=true
diff --git a/etc/systemd/system/user@.service.d/10-faster-shutdown.conf b/etc/systemd/system/user@.service.d/10-faster-shutdown.conf
new file mode 100644
index 00000000..449242ce
--- /dev/null
+++ b/etc/systemd/system/user@.service.d/10-faster-shutdown.conf
@@ -0,0 +1,2 @@
+[Service]
+TimeoutStopSec=5s
diff --git a/etc/systemd/user.conf.d/20-omarchy-nofile.conf b/etc/systemd/user.conf.d/20-omarchy-nofile.conf
new file mode 100644
index 00000000..663a249d
--- /dev/null
+++ b/etc/systemd/user.conf.d/20-omarchy-nofile.conf
@@ -0,0 +1,2 @@
+[Manager]
+DefaultLimitNOFILE=65536:524288
diff --git a/etc/udev/rules.d/99-omarchy-power-profile.rules b/etc/udev/rules.d/99-omarchy-power-profile.rules
new file mode 100644
index 00000000..258cc93d
--- /dev/null
+++ b/etc/udev/rules.d/99-omarchy-power-profile.rules
@@ -0,0 +1,2 @@
+SUBSYSTEM=="power_supply", ATTR{type}=="Mains", RUN+="/usr/bin/systemd-run --no-block --collect --unit=omarchy-power-profile --property=After=power-profiles-daemon.service /usr/bin/omarchy-powerprofiles-set"
+SUBSYSTEM=="power_supply", ATTR{type}=="USB",   RUN+="/usr/bin/systemd-run --no-block --collect --unit=omarchy-power-profile --property=After=power-profiles-daemon.service /usr/bin/omarchy-powerprofiles-set"
diff --git a/etc/udev/rules.d/99-omarchy-wifi-powersave.rules b/etc/udev/rules.d/99-omarchy-wifi-powersave.rules
new file mode 100644
index 00000000..87950af6
--- /dev/null
+++ b/etc/udev/rules.d/99-omarchy-wifi-powersave.rules
@@ -0,0 +1,2 @@
+SUBSYSTEM=="power_supply", ATTR{type}=="Mains", ATTR{online}=="0", RUN+="/usr/bin/systemd-run --no-block --collect --unit=omarchy-wifi-powersave-on  /usr/bin/omarchy-wifi-powersave on"
+SUBSYSTEM=="power_supply", ATTR{type}=="Mains", ATTR{online}=="1", RUN+="/usr/bin/systemd-run --no-block --collect --unit=omarchy-wifi-powersave-off /usr/bin/omarchy-wifi-powersave off"
diff --git a/install.sh b/install.sh
deleted file mode 100644
index 5b1b6bdd..00000000
--- a/install.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Exit immediately if a command exits with a non-zero status
-set -eEo pipefail
-
-# Define Omarchy locations
-export OMARCHY_PATH="$HOME/.local/share/omarchy"
-export OMARCHY_INSTALL="$OMARCHY_PATH/install"
-export OMARCHY_INSTALL_LOG_FILE="/var/log/omarchy-install.log"
-export PATH="$OMARCHY_PATH/bin:$PATH"
-
-# Install
-source "$OMARCHY_INSTALL/helpers/all.sh"
-source "$OMARCHY_INSTALL/preflight/all.sh"
-source "$OMARCHY_INSTALL/packaging/all.sh"
-source "$OMARCHY_INSTALL/config/all.sh"
-source "$OMARCHY_INSTALL/login/all.sh"
-source "$OMARCHY_INSTALL/post-install/all.sh"
diff --git a/install/config/all.sh b/install/config/all.sh
index 9938570a..f5a70796 100644
--- a/install/config/all.sh
+++ b/install/config/all.sh
@@ -1,73 +1,7 @@
-run_logged $OMARCHY_INSTALL/config/config.sh
-run_logged $OMARCHY_INSTALL/config/theme.sh
-run_logged $OMARCHY_INSTALL/config/branding.sh
-run_logged $OMARCHY_INSTALL/config/git.sh
-run_logged $OMARCHY_INSTALL/config/gpg.sh
-run_logged $OMARCHY_INSTALL/config/timezones.sh
-run_logged $OMARCHY_INSTALL/config/increase-sudo-tries.sh
-run_logged $OMARCHY_INSTALL/config/increase-lockout-limit.sh
-run_logged $OMARCHY_INSTALL/config/ssh-flakiness.sh
-run_logged $OMARCHY_INSTALL/config/increase-file-watchers.sh
-run_logged $OMARCHY_INSTALL/config/increase-fd-limit.sh
-run_logged $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
-run_logged $OMARCHY_INSTALL/config/xcompose.sh
-run_logged $OMARCHY_INSTALL/config/mise-work.sh
-run_logged $OMARCHY_INSTALL/config/fix-powerprofilesctl-shebang.sh
-run_logged $OMARCHY_INSTALL/config/docker.sh
-run_logged $OMARCHY_INSTALL/config/mimetypes.sh
-run_logged $OMARCHY_INSTALL/config/user-dirs.sh
-run_logged $OMARCHY_INSTALL/config/nautilus-python.sh
-run_logged $OMARCHY_INSTALL/config/localdb.sh
-run_logged $OMARCHY_INSTALL/config/walker-elephant.sh
-run_logged $OMARCHY_INSTALL/config/fast-shutdown.sh
-run_logged $OMARCHY_INSTALL/config/unmount-fuse.sh
-run_logged $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
-run_logged $OMARCHY_INSTALL/config/input-group.sh
-run_logged $OMARCHY_INSTALL/config/omarchy-ai-skill.sh
-run_logged $OMARCHY_INSTALL/config/pi.sh
-run_logged $OMARCHY_INSTALL/config/omarchy-toggles.sh
-run_logged $OMARCHY_INSTALL/config/kernel-modules-hook.sh
-run_logged $OMARCHY_INSTALL/config/powerprofilesctl-rules.sh
-run_logged $OMARCHY_INSTALL/config/wifi-powersave-rules.sh
-run_logged $OMARCHY_INSTALL/config/plocate-ac-only.sh
-
-run_logged $OMARCHY_INSTALL/config/hardware/network.sh
-run_logged $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh
-run_logged $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh
-run_logged $OMARCHY_INSTALL/config/hardware/bluetooth.sh
-run_logged $OMARCHY_INSTALL/config/hardware/printer.sh
-run_logged $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh
-run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
-run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh
-run_logged $OMARCHY_INSTALL/config/hardware/vulkan.sh
-
-run_logged $OMARCHY_INSTALL/config/hardware/intel/video-acceleration.sh
-run_logged $OMARCHY_INSTALL/config/hardware/intel/lpmd.sh
-run_logged $OMARCHY_INSTALL/config/hardware/intel/thermald.sh
-run_logged $OMARCHY_INSTALL/config/hardware/intel/ipu7-camera.sh
-run_logged $OMARCHY_INSTALL/config/hardware/intel/ptl-kernel.sh
-run_logged $OMARCHY_INSTALL/config/hardware/intel/fred.sh
-run_logged $OMARCHY_INSTALL/config/hardware/intel/fix-wifi7-eht.sh
-run_logged $OMARCHY_INSTALL/config/hardware/intel/sof-firmware.sh
-
-run_logged $OMARCHY_INSTALL/config/hardware/asus/fix-asus-ptl-display-backlight.sh
-run_logged $OMARCHY_INSTALL/config/hardware/asus/fix-asus-ptl-b9406-display.sh
-run_logged $OMARCHY_INSTALL/config/hardware/asus/fix-asus-ptl-b9406-touchpad.sh
-run_logged $OMARCHY_INSTALL/config/hardware/asus/fix-audio-mixer.sh
-run_logged $OMARCHY_INSTALL/config/hardware/asus/fix-mic.sh
-run_logged $OMARCHY_INSTALL/config/hardware/asus/fix-z13-touchpad.sh
-
-run_logged $OMARCHY_INSTALL/config/hardware/framework/fix-f13-amd-audio-input.sh
-run_logged $OMARCHY_INSTALL/config/hardware/framework/qmk-hid.sh
-
-run_logged $OMARCHY_INSTALL/config/hardware/apple/fix-spi-keyboard.sh
-run_logged $OMARCHY_INSTALL/config/hardware/apple/fix-suspend-nvme.sh
-run_logged $OMARCHY_INSTALL/config/hardware/apple/fix-t2.sh
-
-run_logged $OMARCHY_INSTALL/config/hardware/lenovo/fix-yoga-pro7-bass-speakers.sh
-
-run_logged $OMARCHY_INSTALL/config/hardware/fix-bcm43xx.sh
-run_logged $OMARCHY_INSTALL/config/hardware/fix-surface-keyboard.sh
-run_logged $OMARCHY_INSTALL/config/hardware/fix-yt6801-ethernet-adapter.sh
-run_logged $OMARCHY_INSTALL/config/hardware/fix-synaptic-touchpad.sh
-run_logged $OMARCHY_INSTALL/config/hardware/fix-tuxedo-backlight.sh
+run_logged "$OMARCHY_INSTALL/config/theme-system.sh"
+run_logged "$OMARCHY_INSTALL/config/increase-lockout-limit.sh"
+run_logged "$OMARCHY_INSTALL/config/lockscreen-pam.sh"
+run_logged "$OMARCHY_INSTALL/config/fix-powerprofilesctl-shebang.sh"
+run_logged "$OMARCHY_INSTALL/config/docker.sh"
+run_logged "$OMARCHY_INSTALL/config/enable-services.sh"
+run_logged "$OMARCHY_INSTALL/config/firewall.sh"
diff --git a/install/config/branding.sh b/install/config/branding.sh
deleted file mode 100644
index bad55f09..00000000
--- a/install/config/branding.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Allow the user to change the branding for fastfetch and screensaver
-mkdir -p ~/.config/omarchy/branding
-cp ~/.local/share/omarchy/icon.txt ~/.config/omarchy/branding/about.txt
-cp ~/.local/share/omarchy/logo.txt ~/.config/omarchy/branding/screensaver.txt
diff --git a/install/config/config.sh b/install/config/config.sh
deleted file mode 100644
index 62f1417b..00000000
--- a/install/config/config.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copy over Omarchy configs
-mkdir -p ~/.config
-cp -R ~/.local/share/omarchy/config/* ~/.config/
-
-# Use default bashrc from Omarchy
-cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
diff --git a/install/config/detect-keyboard-layout.sh b/install/config/detect-keyboard-layout.sh
deleted file mode 100644
index aaaee4f8..00000000
--- a/install/config/detect-keyboard-layout.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copy over the keyboard layout that's been set in Arch during install to Hyprland
-conf="/etc/vconsole.conf"
-hyprconf="$HOME/.config/hypr/input.conf"
-
-if grep -q '^XKBLAYOUT=' "$conf"; then
-  layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
-  sed -i "/^[[:space:]]*kb_options *=/i\  kb_layout = $layout" "$hyprconf"
-fi
-
-if grep -q '^XKBVARIANT=' "$conf"; then
-  variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
-  sed -i "/^[[:space:]]*kb_options *=/i\  kb_variant = $variant" "$hyprconf"
-fi
diff --git a/install/config/docker.sh b/install/config/docker.sh
index 1499f9c8..00604855 100644
--- a/install/config/docker.sh
+++ b/install/config/docker.sh
@@ -1,32 +1 @@
-# Configure Docker daemon:
-# - limit log size to avoid running out of disk
-# - use host's DNS resolver
-sudo mkdir -p /etc/docker
-sudo tee /etc/docker/daemon.json >/dev/null <<'EOF'
-{
-    "log-driver": "json-file",
-    "log-opts": { "max-size": "10m", "max-file": "5" },
-    "dns": ["172.17.0.1"],
-    "bip": "172.17.0.1/16"
-}
-EOF
-
-# Expose systemd-resolved to our Docker network
-sudo mkdir -p /etc/systemd/resolved.conf.d
-echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
-sudo systemctl restart systemd-resolved
-
-# Start Docker on-demand
-sudo systemctl enable docker.socket
-
-# Give this user privileged Docker access
-sudo usermod -aG docker ${USER}
-
-# Prevent Docker from preventing boot for network-online.target
-sudo mkdir -p /etc/systemd/system/docker.service.d
-sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
-[Unit]
-DefaultDependencies=no
-EOF
-
-sudo systemctl daemon-reload
+usermod -aG docker "$OMARCHY_INSTALL_USER"
diff --git a/install/config/enable-services.sh b/install/config/enable-services.sh
new file mode 100644
index 00000000..8df4f171
--- /dev/null
+++ b/install/config/enable-services.sh
@@ -0,0 +1,11 @@
+# Enable services only. Installs are followed by reboot, so don't start/reload
+# daemons mid-install. UFW and hardware-gated services stay in their own scripts.
+systemctl enable cups.service
+systemctl enable cups-browsed.service
+systemctl enable avahi-daemon.service
+systemctl enable linux-modules-cleanup.service
+systemctl enable docker.socket
+systemctl enable systemd-resolved.service
+systemctl enable NetworkManager.service
+systemctl enable power-profiles-daemon.service
+systemctl enable sddm.service
diff --git a/install/config/fast-shutdown.sh b/install/config/fast-shutdown.sh
deleted file mode 100644
index c7cc7827..00000000
--- a/install/config/fast-shutdown.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-sudo mkdir -p /etc/systemd/system.conf.d
-sudo cp "$OMARCHY_PATH/default/systemd/faster-shutdown.conf" /etc/systemd/system.conf.d/10-faster-shutdown.conf
-sudo mkdir -p /etc/systemd/system/user@.service.d
-sudo cp "$OMARCHY_PATH/default/systemd/user@.service.d/faster-shutdown.conf" /etc/systemd/system/user@.service.d/faster-shutdown.conf
-sudo systemctl daemon-reload
diff --git a/install/config/firewall.sh b/install/config/firewall.sh
new file mode 100644
index 00000000..de389431
--- /dev/null
+++ b/install/config/firewall.sh
@@ -0,0 +1,54 @@
+# Allow nothing in, everything out.
+ufw default deny incoming
+ufw default allow outgoing
+
+# Allow ports for LocalSend.
+ufw allow 53317/udp
+ufw allow 53317/tcp
+
+# Allow Docker containers to use DNS on host.
+ufw allow in proto udp from 172.16.0.0/12 to 172.17.0.1 port 53 comment 'allow-docker-dns'
+ufw allow in proto udp from 192.168.0.0/16 to 172.17.0.1 port 53 comment 'allow-docker-dns'
+
+# Turn on Docker protections. ufw-docker refuses to install its after.rules
+# block unless UFW is already active, but during ISO finalization the target
+# chroot shares the live installer's kernel firewall. Keep the live firewall
+# untouched: for this config-file-only install action, satisfy ufw-docker's
+# status preflight without activating UFW.
+install_ufw_docker_rules() {
+  local shim_dir status ufw_docker_bin
+
+  ufw_docker_bin=$(command -v ufw-docker)
+  shim_dir=$(mktemp -d)
+  cat >"$shim_dir/ufw" <<'EOF'
+#!/bin/bash
+if [[ ${1:-} == "status" ]]; then
+  echo "Status: active"
+  exit 0
+fi
+
+exec /usr/bin/ufw "$@"
+EOF
+
+  # The packaged ufw-docker pins PATH internally, so run a temporary copy whose
+  # PATH can see the status shim above.
+  sed "0,/^PATH=/s#^PATH=.*#PATH=\"$shim_dir:/bin:/usr/bin:/sbin:/usr/sbin:/snap/bin/\"#" \
+    "$ufw_docker_bin" >"$shim_dir/ufw-docker"
+  chmod 755 "$shim_dir/ufw" "$shim_dir/ufw-docker"
+
+  if "$shim_dir/ufw-docker" install; then
+    status=0
+  else
+    status=$?
+  fi
+
+  rm -rf "$shim_dir"
+  return "$status"
+}
+
+install_ufw_docker_rules
+
+# Installs are followed by reboot, so configure UFW to start on the installed
+# system instead of mutating the live install session's firewall.
+sed -i 's/^ENABLED=.*/ENABLED=yes/' /etc/ufw/ufw.conf
+systemctl enable ufw
diff --git a/install/config/fix-powerprofilesctl-shebang.sh b/install/config/fix-powerprofilesctl-shebang.sh
index 61cac432..60b8509b 100644
--- a/install/config/fix-powerprofilesctl-shebang.sh
+++ b/install/config/fix-powerprofilesctl-shebang.sh
@@ -1,2 +1,4 @@
 # Ensure we use system python3 and not mise's python3
-sudo sed -i '/env python3/ c\#!/bin/python3' /usr/bin/powerprofilesctl
+if [[ -f /usr/bin/powerprofilesctl ]]; then
+  sudo sed -i '/env python3/ c\#!/bin/python3' /usr/bin/powerprofilesctl
+fi
diff --git a/install/config/gpg.sh b/install/config/gpg.sh
deleted file mode 100644
index 7e209f65..00000000
--- a/install/config/gpg.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Setup GPG configuration with multiple keyservers for better reliability
-sudo mkdir -p /etc/gnupg
-sudo cp ~/.local/share/omarchy/default/gpg/dirmngr.conf /etc/gnupg/
-sudo chmod 644 /etc/gnupg/dirmngr.conf
-sudo gpgconf --kill dirmngr || true
-sudo gpgconf --launch dirmngr || true
diff --git a/install/config/hardware/bluetooth.sh b/install/config/hardware/bluetooth.sh
deleted file mode 100644
index d0c0389f..00000000
--- a/install/config/hardware/bluetooth.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Turn on bluetooth by default
-chrootable_systemctl_enable bluetooth.service
-
-mkdir -p ~/.config/wireplumber/wireplumber.conf.d/
-cp "$OMARCHY_PATH/default/wireplumber/wireplumber.conf.d/bluetooth-a2dp-autoconnect.conf" ~/.config/wireplumber/wireplumber.conf.d/
diff --git a/install/config/hardware/ignore-power-button.sh b/install/config/hardware/ignore-power-button.sh
deleted file mode 100644
index 8e514f69..00000000
--- a/install/config/hardware/ignore-power-button.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Disable shutting system down on power button to bind it to power menu afterwards
-sudo sed -i 's/.*HandlePowerKey=.*/HandlePowerKey=ignore/' /etc/systemd/logind.conf
diff --git a/install/config/hardware/network.sh b/install/config/hardware/network.sh
deleted file mode 100644
index 65f9fdbb..00000000
--- a/install/config/hardware/network.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Ensure iwd service will be started
-sudo systemctl enable iwd.service
-
-# Prevent systemd-networkd-wait-online timeout on boot
-sudo systemctl disable systemd-networkd-wait-online.service
-sudo systemctl mask systemd-networkd-wait-online.service
diff --git a/install/config/hardware/nvidia.sh b/install/config/hardware/nvidia.sh
deleted file mode 100644
index dddcf7e4..00000000
--- a/install/config/hardware/nvidia.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-if lspci | grep -qi 'nvidia'; then
-  # Check which kernel is installed and set appropriate headers package
-  KERNEL_HEADERS="$(pacman -Qqs '^linux(-zen|-lts|-hardened)?$' | head -1)-headers"
-
-  if omarchy-hw-nvidia-gsp; then
-    PACKAGES=(nvidia-open-dkms nvidia-utils lib32-nvidia-utils libva-nvidia-driver)
-    GPU_ARCH="turing_plus"
-  elif omarchy-hw-nvidia-without-gsp; then
-    PACKAGES=(nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils)
-    GPU_ARCH="maxwell_pascal_volta"
-  fi
-  # Bail if no supported GPU
-  if [[ -z ${PACKAGES+x} ]]; then
-    echo "No compatible driver for your NVIDIA GPU. See: https://wiki.archlinux.org/title/NVIDIA"
-    exit 0
-  fi
-
-  omarchy-pkg-add "$KERNEL_HEADERS" "${PACKAGES[@]}"
-
-  # Configure modprobe for early KMS
-  sudo tee /etc/modprobe.d/nvidia.conf <<EOF >/dev/null
-options nvidia_drm modeset=1
-EOF
-
-  # Configure mkinitcpio for early loading
-  sudo tee /etc/mkinitcpio.conf.d/nvidia.conf <<EOF >/dev/null
-MODULES+=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)
-EOF
-
-  # Add NVIDIA environment variables based on GPU architecture
-  if [[ $GPU_ARCH = "turing_plus" ]]; then
-    # Turing+ (RTX 20xx, GTX 16xx, and newer) with GSP firmware support
-    cat >>"$HOME/.config/hypr/envs.conf" <<'EOF'
-
-# NVIDIA (Turing+ with GSP firmware)
-env = NVD_BACKEND,direct
-env = LIBVA_DRIVER_NAME,nvidia
-env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-EOF
-  elif [[ $GPU_ARCH = "maxwell_pascal_volta" ]]; then
-    # Maxwell/Pascal/Volta (GTX 9xx/10xx, GT 10xx, Quadro P/M/GV, MX series, Titan X/Xp/V) lack GSP firmware
-    cat >>"$HOME/.config/hypr/envs.conf" <<'EOF'
-
-# NVIDIA (Maxwell/Pascal/Volta without GSP firmware)
-env = NVD_BACKEND,egl
-env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-EOF
-  fi
-fi
diff --git a/install/config/hardware/printer.sh b/install/config/hardware/printer.sh
deleted file mode 100644
index 244368e6..00000000
--- a/install/config/hardware/printer.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-chrootable_systemctl_enable cups.service
-
-# Disable multicast dns in resolved. Avahi will provide this for better network printer discovery
-sudo mkdir -p /etc/systemd/resolved.conf.d
-echo -e "[Resolve]\nMulticastDNS=no" | sudo tee /etc/systemd/resolved.conf.d/10-disable-multicast.conf
-chrootable_systemctl_enable avahi-daemon.service
-
-# Enable mDNS resolution for .local domains
-sudo sed -i 's/^hosts:.*/hosts: mymachines mdns_minimal [NOTFOUND=return] resolve files myhostname dns/' /etc/nsswitch.conf
-
-# Enable automatically adding remote printers
-if ! grep -q '^CreateRemotePrinters Yes' /etc/cups/cups-browsed.conf; then
-  echo 'CreateRemotePrinters Yes' | sudo tee -a /etc/cups/cups-browsed.conf
-fi
-
-chrootable_systemctl_enable cups-browsed.service
diff --git a/install/config/hardware/set-wireless-regdom.sh b/install/config/hardware/set-wireless-regdom.sh
deleted file mode 100644
index 8524f2d3..00000000
--- a/install/config/hardware/set-wireless-regdom.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-# First check that wireless-regdb is there
-if [[ -f "/etc/conf.d/wireless-regdom" ]]; then
-  unset WIRELESS_REGDOM
-  . /etc/conf.d/wireless-regdom
-fi
-
-# If the region is already set, we're done
-if [[ ! -n ${WIRELESS_REGDOM} ]]; then
-  # Get the current timezone
-  if [[ -e "/etc/localtime" ]]; then
-    TIMEZONE=$(readlink -f /etc/localtime)
-    TIMEZONE=${TIMEZONE#/usr/share/zoneinfo/}
-
-    # Some timezones are formatted with the two letter country code at the start
-    COUNTRY="${TIMEZONE%%/*}"
-
-    # If we don't have a two letter country, get it from the timezone table
-    if [[ ! $COUNTRY =~ ^[A-Z]{2}$ ]] && [[ -f /usr/share/zoneinfo/zone.tab ]]; then
-      COUNTRY=$(awk -v tz="$TIMEZONE" '$3 == tz {print $1; exit}' /usr/share/zoneinfo/zone.tab)
-    fi
-
-    # Check if we have a two letter country code
-    if [[ $COUNTRY =~ ^[A-Z]{2}$ ]]; then
-      # Append it to the wireless-regdom conf file that is used at boot
-      echo "WIRELESS_REGDOM=\"$COUNTRY\"" | sudo tee -a /etc/conf.d/wireless-regdom >/dev/null
-
-      # Also set it one off now
-      if command -v iw &>/dev/null; then
-        sudo iw reg set ${COUNTRY}
-      fi
-    fi
-  fi
-fi
diff --git a/install/config/hardware/usb-autosuspend.sh b/install/config/hardware/usb-autosuspend.sh
deleted file mode 100644
index 91323846..00000000
--- a/install/config/hardware/usb-autosuspend.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Disable USB autosuspend to prevent peripheral disconnection issues
-if [[ ! -f /etc/modprobe.d/disable-usb-autosuspend.conf ]]; then
-  echo "options usbcore autosuspend=-1" | sudo tee /etc/modprobe.d/disable-usb-autosuspend.conf
-fi
-
diff --git a/install/config/increase-fd-limit.sh b/install/config/increase-fd-limit.sh
deleted file mode 100644
index eb35c0af..00000000
--- a/install/config/increase-fd-limit.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Raise soft file descriptor limit from systemd's default of 1024 to 65536
-# so dev tools (VS Code, Docker, dev servers, databases) get the headroom they need
-sudo mkdir -p /etc/systemd/system.conf.d /etc/systemd/user.conf.d
-
-sudo tee /etc/systemd/system.conf.d/99-omarchy-nofile.conf >/dev/null <<'EOF'
-[Manager]
-DefaultLimitNOFILE=65536:524288
-EOF
-
-sudo cp /etc/systemd/system.conf.d/99-omarchy-nofile.conf \
-        /etc/systemd/user.conf.d/99-omarchy-nofile.conf
diff --git a/install/config/increase-file-watchers.sh b/install/config/increase-file-watchers.sh
deleted file mode 100644
index a6be761a..00000000
--- a/install/config/increase-file-watchers.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Increase inotify file watchers for VS Code, webpack, and other dev tools (default 8192 is too low)
-echo "fs.inotify.max_user_watches=524288" | sudo tee /etc/sysctl.d/90-omarchy-file-watchers.conf >/dev/null
-sudo sysctl --system >/dev/null 2>&1
diff --git a/install/config/increase-lockout-limit.sh b/install/config/increase-lockout-limit.sh
index 5932906f..e0fd9511 100644
--- a/install/config/increase-lockout-limit.sh
+++ b/install/config/increase-lockout-limit.sh
@@ -1,7 +1,12 @@
-# Increase lockout limit to 10 and decrease timeout to 2 minutes
-sudo sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
-sudo sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
+# /etc/pam.d/{system-auth,sddm-autologin} are upstream-owned and the changes
+# are insertions, not full-file overrides, so they stay scripted.
+sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' \
+           /etc/pam.d/system-auth
+sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' \
+           /etc/pam.d/system-auth
 
-# Ensure lockout limit is reset on restart
-sudo sed -i '/pam_faillock\.so preauth/d' /etc/pam.d/sddm-autologin
-sudo sed -i '/auth.*pam_permit\.so/a auth        required    pam_faillock.so authsucc' /etc/pam.d/sddm-autologin
+# Drop both lines before re-adding authsucc so reruns don't duplicate it.
+sed -i '/pam_faillock\.so preauth/d'  /etc/pam.d/sddm-autologin
+sed -i '/pam_faillock\.so authsucc/d' /etc/pam.d/sddm-autologin
+sed -i '/auth.*pam_permit\.so/a auth        required    pam_faillock.so authsucc' \
+           /etc/pam.d/sddm-autologin
diff --git a/install/config/increase-sudo-tries.sh b/install/config/increase-sudo-tries.sh
deleted file mode 100644
index af5a61a6..00000000
--- a/install/config/increase-sudo-tries.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Give the user 10 instead of 3 tries to fat finger their password before lockout
-echo "Defaults passwd_tries=10" | sudo tee /etc/sudoers.d/passwd-tries
-sudo chmod 440 /etc/sudoers.d/passwd-tries
-
-# Set for hyprlock too
-sudo sed -i 's/^# *deny = .*/deny = 10/' /etc/security/faillock.conf
diff --git a/install/config/kernel-modules-hook.sh b/install/config/kernel-modules-hook.sh
deleted file mode 100644
index 29d0ec4d..00000000
--- a/install/config/kernel-modules-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-chrootable_systemctl_enable linux-modules-cleanup.service
diff --git a/install/config/localdb.sh b/install/config/localdb.sh
deleted file mode 100644
index 73721488..00000000
--- a/install/config/localdb.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Update localdb so that locate will find everything installed
-sudo updatedb
diff --git a/install/config/lockscreen-pam.sh b/install/config/lockscreen-pam.sh
new file mode 100644
index 00000000..6056f2dc
--- /dev/null
+++ b/install/config/lockscreen-pam.sh
@@ -0,0 +1 @@
+omarchy-setup-lock
diff --git a/install/config/mimetypes.sh b/install/config/mimetypes.sh
deleted file mode 100644
index 4d7a32bf..00000000
--- a/install/config/mimetypes.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-omarchy-refresh-applications
-update-desktop-database ~/.local/share/applications
-
-# Open directories in file manager
-xdg-mime default org.gnome.Nautilus.desktop inode/directory
-
-# Open all images with imv
-xdg-mime default imv.desktop image/png
-xdg-mime default imv.desktop image/jpeg
-xdg-mime default imv.desktop image/gif
-xdg-mime default imv.desktop image/webp
-xdg-mime default imv.desktop image/bmp
-xdg-mime default imv.desktop image/tiff
-
-# Open PDFs with the Document Viewer
-xdg-mime default org.gnome.Evince.desktop application/pdf
-
-# Use Chromium as the default browser
-xdg-settings set default-web-browser chromium.desktop
-xdg-mime default chromium.desktop x-scheme-handler/http
-xdg-mime default chromium.desktop x-scheme-handler/https
-
-# Open video files with mpv
-xdg-mime default mpv.desktop video/mp4
-xdg-mime default mpv.desktop video/x-msvideo
-xdg-mime default mpv.desktop video/x-matroska
-xdg-mime default mpv.desktop video/x-flv
-xdg-mime default mpv.desktop video/x-ms-wmv
-xdg-mime default mpv.desktop video/mpeg
-xdg-mime default mpv.desktop video/ogg
-xdg-mime default mpv.desktop video/webm
-xdg-mime default mpv.desktop video/quicktime
-xdg-mime default mpv.desktop video/3gpp
-xdg-mime default mpv.desktop video/3gpp2
-xdg-mime default mpv.desktop video/x-ms-asf
-xdg-mime default mpv.desktop video/x-ogm+ogg
-xdg-mime default mpv.desktop video/x-theora+ogg
-xdg-mime default mpv.desktop application/ogg
-
-# Use Hey for mailto: links
-xdg-mime default HEY.desktop x-scheme-handler/mailto
-
-# Open text files with nvim
-xdg-mime default nvim.desktop text/plain
-xdg-mime default nvim.desktop text/english
-xdg-mime default nvim.desktop text/x-makefile
-xdg-mime default nvim.desktop text/x-c++hdr
-xdg-mime default nvim.desktop text/x-c++src
-xdg-mime default nvim.desktop text/x-chdr
-xdg-mime default nvim.desktop text/x-csrc
-xdg-mime default nvim.desktop text/x-java
-xdg-mime default nvim.desktop text/x-moc
-xdg-mime default nvim.desktop text/x-pascal
-xdg-mime default nvim.desktop text/x-tcl
-xdg-mime default nvim.desktop text/x-tex
-xdg-mime default nvim.desktop application/x-shellscript
-xdg-mime default nvim.desktop text/x-c
-xdg-mime default nvim.desktop text/x-c++
-xdg-mime default nvim.desktop application/xml
-xdg-mime default nvim.desktop text/xml
diff --git a/install/config/nautilus-python.sh b/install/config/nautilus-python.sh
deleted file mode 100644
index 76266353..00000000
--- a/install/config/nautilus-python.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTENSIONS_DIR="$HOME/.local/share/nautilus-python/extensions"
-
-mkdir -p "$EXTENSIONS_DIR"
-cp "$OMARCHY_PATH/default/nautilus-python/extensions/localsend.py" "$EXTENSIONS_DIR/"
-cp "$OMARCHY_PATH/default/nautilus-python/extensions/transcode.py" "$EXTENSIONS_DIR/"
diff --git a/install/config/omarchy-ai-skill.sh b/install/config/omarchy-ai-skill.sh
deleted file mode 100644
index 8eec4b95..00000000
--- a/install/config/omarchy-ai-skill.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Place in each assistant's global skills directory so the Omarchy skill is available on first install
-mkdir -p ~/.agents/skills ~/.claude/skills ~/.codex/skills ~/.pi/agent/skills
-ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.agents/skills/omarchy
-ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.claude/skills/omarchy
-ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.codex/skills/omarchy
-ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.pi/agent/skills/omarchy
diff --git a/install/config/omarchy-toggles.sh b/install/config/omarchy-toggles.sh
deleted file mode 100644
index b4b5ea93..00000000
--- a/install/config/omarchy-toggles.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Toggles are used to turn certain features on/off in a persistent way
-mkdir -p ~/.local/state/omarchy/toggles/hypr
-cp $OMARCHY_PATH/default/hypr/toggles/flags.conf ~/.local/state/omarchy/toggles/hypr/
diff --git a/install/config/pi.sh b/install/config/pi.sh
deleted file mode 100644
index 4afefecb..00000000
--- a/install/config/pi.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p ~/.pi/agent/extensions
-cp "$OMARCHY_PATH/default/pi/agent/extensions/omarchy-system-theme.ts" ~/.pi/agent/extensions/
diff --git a/install/config/plocate-ac-only.sh b/install/config/plocate-ac-only.sh
deleted file mode 100644
index 31cd088f..00000000
--- a/install/config/plocate-ac-only.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-sudo install -d /etc/systemd/system/plocate-updatedb.service.d
-printf '%s\n' '[Unit]' 'ConditionACPower=true' | sudo tee /etc/systemd/system/plocate-updatedb.service.d/ac-only.conf >/dev/null
-sudo systemctl daemon-reload
diff --git a/install/config/powerprofilesctl-rules.sh b/install/config/powerprofilesctl-rules.sh
deleted file mode 100644
index 0715a1c6..00000000
--- a/install/config/powerprofilesctl-rules.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-if omarchy-battery-present; then
-  cat <<EOF | sudo tee "/etc/udev/rules.d/99-power-profile.rules"
-SUBSYSTEM=="power_supply", ATTR{type}=="Mains", RUN+="/usr/bin/systemd-run --no-block --collect --unit=omarchy-power-profile --property=After=power-profiles-daemon.service $HOME/.local/share/omarchy/bin/omarchy-powerprofiles-set"
-SUBSYSTEM=="power_supply", ATTR{type}=="USB", RUN+="/usr/bin/systemd-run --no-block --collect --unit=omarchy-power-profile --property=After=power-profiles-daemon.service $HOME/.local/share/omarchy/bin/omarchy-powerprofiles-set"
-EOF
-
-  sudo systemctl enable power-profiles-daemon
-
-  sudo udevadm control --reload 2>/dev/null
-  sudo udevadm trigger --subsystem-match=power_supply 2>/dev/null
-fi
diff --git a/install/config/ssh-flakiness.sh b/install/config/ssh-flakiness.sh
deleted file mode 100644
index 906e68aa..00000000
--- a/install/config/ssh-flakiness.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Solve common flakiness with SSH
-echo "net.ipv4.tcp_mtu_probing=1" | sudo tee -a /etc/sysctl.d/99-sysctl.conf
diff --git a/install/config/sudoless-asdcontrol.sh b/install/config/sudoless-asdcontrol.sh
deleted file mode 100644
index 5ae03563..00000000
--- a/install/config/sudoless-asdcontrol.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Setup sudo-less controls for controlling brightness on Apple Displays
-echo "$USER ALL=(ALL) NOPASSWD: /usr/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
-sudo chmod 440 /etc/sudoers.d/asdcontrol
diff --git a/install/config/theme-system.sh b/install/config/theme-system.sh
new file mode 100644
index 00000000..2902e1cd
--- /dev/null
+++ b/install/config/theme-system.sh
@@ -0,0 +1,16 @@
+# Set links for Nautilus action icons
+mkdir -p /usr/share/icons/Yaru/scalable/actions
+ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-previous-symbolic.svg \
+          /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg
+ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-next-symbolic.svg \
+          /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg
+gtk-update-icon-cache /usr/share/icons/Yaru &>/dev/null || true
+
+# Chromium policy directory for theme
+mkdir -p /etc/chromium/policies/managed
+chmod a+rw /etc/chromium/policies/managed
+
+# Default Chromium to follow system appearance ("device") instead of dark
+mkdir -p /usr/lib/chromium
+echo '{"browser":{"theme":{"color_scheme":0,"color_scheme2":0}}}' > \
+  /usr/lib/chromium/initial_preferences
diff --git a/install/config/theme.sh b/install/config/theme.sh
deleted file mode 100644
index fe7e9112..00000000
--- a/install/config/theme.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-# Set links for Nautilus action icons
-sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-previous-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg
-sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-next-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg
-
-# Setup user theme folder
-mkdir -p ~/.config/omarchy/themes
-
-# Chromium policy directory for theme
-sudo mkdir -p /etc/chromium/policies/managed
-sudo chmod a+rw /etc/chromium/policies/managed
-
-# Set initial theme
-omarchy-theme-set "Tokyo Night"
-rm -rf ~/.config/chromium/SingletonLock # otherwise archiso will own the chromium singleton
-
-# Set specific app links for current theme
-mkdir -p ~/.config/btop/themes
-ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme
-
-mkdir -p ~/.config/mako
-ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config
-
-# Default Chromium to follow system appearance ("device") instead of dark
-echo '{"browser":{"theme":{"color_scheme":0,"color_scheme2":0}}}' | sudo tee /usr/lib/chromium/initial_preferences >/dev/null
diff --git a/install/config/timezones.sh b/install/config/timezones.sh
deleted file mode 100644
index 24e96a0f..00000000
--- a/install/config/timezones.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Ensure timezone can be updated without needing to sudo
-sudo tee /etc/sudoers.d/omarchy-tzupdate >/dev/null <<EOF
-%wheel ALL=(root) NOPASSWD: /usr/bin/tzupdate, /usr/bin/timedatectl
-EOF
-sudo chmod 0440 /etc/sudoers.d/omarchy-tzupdate
diff --git a/install/config/unmount-fuse.sh b/install/config/unmount-fuse.sh
deleted file mode 100644
index 9c44e17f..00000000
--- a/install/config/unmount-fuse.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-sudo mkdir -p /usr/lib/systemd/system-sleep
-sudo install -m 0755 -o root -g root "$OMARCHY_PATH/default/systemd/system-sleep/unmount-fuse" /usr/lib/systemd/system-sleep/
diff --git a/install/config/user-dirs.sh b/install/config/user-dirs.sh
deleted file mode 100644
index 26d1adc2..00000000
--- a/install/config/user-dirs.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-mkdir -p ~/Downloads ~/Pictures ~/Videos ~/.config/gtk-3.0
-
-xdg-user-dirs-update --set TEMPLATES "$HOME"
-xdg-user-dirs-update --set PUBLICSHARE "$HOME"
-xdg-user-dirs-update --set DESKTOP "$HOME"
-
-rmdir ~/Templates ~/Public ~/Desktop 2>/dev/null || true
-
-touch ~/.config/gtk-3.0/bookmarks
-for dir in Downloads Projects Pictures Videos; do
-  printf 'file://%s/%s %s\n' "$HOME" "$dir" "$dir" >>~/.config/gtk-3.0/bookmarks
-done
diff --git a/install/config/walker-elephant.sh b/install/config/walker-elephant.sh
deleted file mode 100644
index a06f8c39..00000000
--- a/install/config/walker-elephant.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-# Ensure Walker service is started automatically on boot
-mkdir -p ~/.config/autostart/
-cp $OMARCHY_PATH/default/walker/walker.desktop ~/.config/autostart/
-
-# And is restarted if it crashes or is killed
-mkdir -p ~/.config/systemd/user/app-walker@autostart.service.d/
-cp $OMARCHY_PATH/default/walker/restart.conf ~/.config/systemd/user/app-walker@autostart.service.d/restart.conf
-
-# Create pacman hook to restart walker after updates
-sudo mkdir -p /etc/pacman.d/hooks
-sudo tee /etc/pacman.d/hooks/walker-restart.hook > /dev/null << EOF
-[Trigger]
-Type = Package
-Operation = Upgrade
-Target = walker
-Target = walker-debug
-Target = elephant*
-
-[Action]
-Description = Restarting Walker services after system update
-When = PostTransaction
-Exec = $OMARCHY_PATH/bin/omarchy-restart-walker
-EOF
-
-# Link the visual theme menu config
-mkdir -p ~/.config/elephant/menus
-ln -snf $OMARCHY_PATH/default/elephant/omarchy_themes.lua ~/.config/elephant/menus/omarchy_themes.lua
-ln -snf $OMARCHY_PATH/default/elephant/omarchy_background_selector.lua ~/.config/elephant/menus/omarchy_background_selector.lua
-ln -snf $OMARCHY_PATH/default/elephant/omarchy_unlocks.lua ~/.config/elephant/menus/omarchy_unlocks.lua
diff --git a/install/config/wifi-powersave-rules.sh b/install/config/wifi-powersave-rules.sh
deleted file mode 100644
index 55739059..00000000
--- a/install/config/wifi-powersave-rules.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if omarchy-battery-present; then
-  cat <<EOF | sudo tee "/etc/udev/rules.d/99-wifi-powersave.rules"
-SUBSYSTEM=="power_supply", ATTR{type}=="Mains", ATTR{online}=="0", RUN+="/usr/bin/systemd-run --no-block --collect --unit=omarchy-wifi-powersave-on $HOME/.local/share/omarchy/bin/omarchy-wifi-powersave on"
-SUBSYSTEM=="power_supply", ATTR{type}=="Mains", ATTR{online}=="1", RUN+="/usr/bin/systemd-run --no-block --collect --unit=omarchy-wifi-powersave-off $HOME/.local/share/omarchy/bin/omarchy-wifi-powersave off"
-EOF
-
-  sudo udevadm control --reload
-  sudo udevadm trigger --subsystem-match=power_supply
-fi
diff --git a/install/first-run/battery-monitor.sh b/install/first-run/battery-monitor.sh
deleted file mode 100644
index a8f05522..00000000
--- a/install/first-run/battery-monitor.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-if omarchy-battery-present; then
-  powerprofilesctl set balanced || true
-
-  # Enable battery monitoring timer for low battery notifications
-  systemctl --user enable --now omarchy-battery-monitor.timer
-else
-  powerprofilesctl set performance || true
-fi
diff --git a/install/first-run/cleanup-reboot-sudoers.sh b/install/first-run/cleanup-reboot-sudoers.sh
deleted file mode 100644
index ccc9966b..00000000
--- a/install/first-run/cleanup-reboot-sudoers.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if sudo test -f /etc/sudoers.d/99-omarchy-installer-reboot; then
-  sudo rm -f /etc/sudoers.d/99-omarchy-installer-reboot
-fi
diff --git a/install/first-run/dns-resolver.sh b/install/first-run/dns-resolver.sh
deleted file mode 100644
index bf46388a..00000000
--- a/install/first-run/dns-resolver.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# https://wiki.archlinux.org/title/Systemd-resolved
-echo "Symlink resolved stub-resolv to /etc/resolv.conf"
-
-sudo ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
diff --git a/install/first-run/elephant.sh b/install/first-run/elephant.sh
deleted file mode 100644
index 9517f6b9..00000000
--- a/install/first-run/elephant.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-elephant service enable
-systemctl --user start elephant.service
diff --git a/install/first-run/firewall.sh b/install/first-run/firewall.sh
deleted file mode 100644
index 96210c8b..00000000
--- a/install/first-run/firewall.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Allow nothing in, everything out
-sudo ufw default deny incoming
-sudo ufw default allow outgoing
-
-# Allow ports for LocalSend
-sudo ufw allow 53317/udp
-sudo ufw allow 53317/tcp
-
-# Allow Docker containers to use DNS on host
-sudo ufw allow in proto udp from 172.16.0.0/12 to 172.17.0.1 port 53 comment 'allow-docker-dns'
-sudo ufw allow in proto udp from 192.168.0.0/16 to 172.17.0.1 port 53 comment 'allow-docker-dns'
-
-# Turn on the firewall
-sudo ufw --force enable
-
-# Enable UFW systemd service to start on boot
-sudo systemctl enable ufw
-
-# Turn on Docker protections
-sudo ufw-docker install
-sudo ufw reload
diff --git a/install/first-run/install-voxtype.hook b/install/first-run/install-voxtype.hook
deleted file mode 100644
index 5513c4e6..00000000
--- a/install/first-run/install-voxtype.hook
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Remove this hook after use
-rm -f "$0"
-
-notify-send "    Install Dictation with Voxtype" "Click to install voice dictation for Omarchy." -u critical
diff --git a/install/first-run/recover-internal-monitor.sh b/install/first-run/recover-internal-monitor.sh
deleted file mode 100644
index c1e84fc0..00000000
--- a/install/first-run/recover-internal-monitor.sh
+++ /dev/null
@@ -1 +0,0 @@
-systemctl --user enable omarchy-recover-internal-monitor.service
diff --git a/install/first-run/swayosd.sh b/install/first-run/swayosd.sh
deleted file mode 100644
index 49db63f3..00000000
--- a/install/first-run/swayosd.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-systemctl --user daemon-reload
-systemctl --user enable --now swayosd-server.service
diff --git a/install/first-run/welcome.sh b/install/first-run/welcome.sh
deleted file mode 100644
index 9c5d06af..00000000
--- a/install/first-run/welcome.sh
+++ /dev/null
@@ -1 +0,0 @@
-notify-send "    Learn Keybindings" "Super + K for cheatsheet.\nSuper + Space for application launcher.\nSuper + Alt + Space for Omarchy Menu." -u critical
diff --git a/install/first-run/wifi.sh b/install/first-run/wifi.sh
deleted file mode 100644
index f8d7fc8f..00000000
--- a/install/first-run/wifi.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if ! ping -c3 -W1 1.1.1.1 >/dev/null 2>&1; then
-  notify-send "    Update System" "When you have internet, click to update the system." -u critical
-  notify-send "󰖩    Click to Setup Wi-Fi" "Tab to navigate, Space to select, ? for help." -u critical
-else
-  notify-send "    Update System" "Click to update the system." -u critical
-fi
diff --git a/install/hardware/all.sh b/install/hardware/all.sh
new file mode 100644
index 00000000..2ad7f096
--- /dev/null
+++ b/install/hardware/all.sh
@@ -0,0 +1,41 @@
+run_logged "$OMARCHY_INSTALL/hardware/asus-rog.sh"
+run_logged "$OMARCHY_INSTALL/hardware/framework16.sh"
+run_logged "$OMARCHY_INSTALL/hardware/dell-xps-touchpad-haptics.sh"
+run_logged "$OMARCHY_INSTALL/hardware/surface.sh"
+
+run_logged "$OMARCHY_INSTALL/hardware/network.sh"
+run_logged "$OMARCHY_INSTALL/hardware/input-group.sh"
+run_logged "$OMARCHY_INSTALL/hardware/set-wireless-regdom.sh"
+run_logged "$OMARCHY_INSTALL/hardware/fix-fkeys.sh"
+run_logged "$OMARCHY_INSTALL/hardware/fix-synaptic-touchpad.sh"
+run_logged "$OMARCHY_INSTALL/hardware/bluetooth.sh"
+run_logged "$OMARCHY_INSTALL/hardware/nvidia.sh"
+run_logged "$OMARCHY_INSTALL/hardware/vulkan.sh"
+
+run_logged "$OMARCHY_INSTALL/hardware/intel/video-acceleration.sh"
+run_logged "$OMARCHY_INSTALL/hardware/intel/lpmd.sh"
+run_logged "$OMARCHY_INSTALL/hardware/intel/thermald.sh"
+run_logged "$OMARCHY_INSTALL/hardware/intel/ipu7-camera.sh"
+run_logged "$OMARCHY_INSTALL/hardware/intel/ptl-kernel.sh"
+run_logged "$OMARCHY_INSTALL/hardware/intel/fred.sh"
+run_logged "$OMARCHY_INSTALL/hardware/intel/fix-wifi7-eht.sh"
+run_logged "$OMARCHY_INSTALL/hardware/intel/sof-firmware.sh"
+
+run_logged "$OMARCHY_INSTALL/hardware/asus/fix-asus-ptl-display-backlight.sh"
+run_logged "$OMARCHY_INSTALL/hardware/asus/fix-asus-ptl-b9406-display.sh"
+run_logged "$OMARCHY_INSTALL/hardware/asus/fix-asus-ptl-b9406-touchpad.sh"
+run_logged "$OMARCHY_INSTALL/hardware/asus/fix-z13-touchpad.sh"
+
+run_logged "$OMARCHY_INSTALL/hardware/framework/qmk-hid.sh"
+
+run_logged "$OMARCHY_INSTALL/hardware/apple/fix-spi-keyboard.sh"
+run_logged "$OMARCHY_INSTALL/hardware/apple/fix-suspend-nvme.sh"
+run_logged "$OMARCHY_INSTALL/hardware/apple/fix-t2.sh"
+
+run_logged "$OMARCHY_INSTALL/hardware/lenovo/fix-yoga-pro7-bass-speakers.sh"
+
+run_logged "$OMARCHY_INSTALL/hardware/fix-bcm43xx.sh"
+run_logged "$OMARCHY_INSTALL/hardware/fix-surface-keyboard.sh"
+run_logged "$OMARCHY_INSTALL/hardware/fix-yt6801-ethernet-adapter.sh"
+run_logged "$OMARCHY_INSTALL/hardware/fix-tuxedo-backlight.sh"
+run_logged "$OMARCHY_INSTALL/hardware/pacman.sh"
diff --git a/install/config/hardware/apple/fix-spi-keyboard.sh b/install/hardware/apple/fix-spi-keyboard.sh
similarity index 71%
rename from install/config/hardware/apple/fix-spi-keyboard.sh
rename to install/hardware/apple/fix-spi-keyboard.sh
index d2aa6c4b..330081b7 100644
--- a/install/config/hardware/apple/fix-spi-keyboard.sh
+++ b/install/hardware/apple/fix-spi-keyboard.sh
@@ -4,9 +4,12 @@ if [[ $product_name =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPr
   echo "Detected MacBook with SPI keyboard"
 
   omarchy-pkg-add macbook12-spi-driver-dkms
+  sudo mkdir -p /etc/mkinitcpio.conf.d
   if [[ $product_name == "MacBook8,1" ]]; then
-    echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
+    echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | \
+      sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
   else
-    echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
+    echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | \
+      sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
   fi
 fi
diff --git a/install/config/hardware/apple/fix-suspend-nvme.sh b/install/hardware/apple/fix-suspend-nvme.sh
similarity index 81%
rename from install/config/hardware/apple/fix-suspend-nvme.sh
rename to install/hardware/apple/fix-suspend-nvme.sh
index 863242a1..27e0270e 100644
--- a/install/config/hardware/apple/fix-suspend-nvme.sh
+++ b/install/hardware/apple/fix-suspend-nvme.sh
@@ -10,7 +10,8 @@ if [[ $MACBOOK_MODEL =~ MacBook(8,1|9,1|10,1)|MacBookPro13,[123]|MacBookPro14,[1
   if [[ -f $NVME_DEVICE ]]; then
     echo "Applying NVMe suspend fix..."
 
-    cat <<EOF | sudo tee /etc/systemd/system/omarchy-nvme-suspend-fix.service >/dev/null
+    sudo mkdir -p /etc/systemd/system
+    sudo tee /etc/systemd/system/omarchy-nvme-suspend-fix.service >/dev/null <<'EOF'
 [Unit]
 Description=Omarchy NVMe Suspend Fix for MacBook
 
@@ -21,8 +22,7 @@ ExecStart=/bin/bash -c 'echo 0 > /sys/bus/pci/devices/0000\:01\:00.0/d3cold_allo
 WantedBy=multi-user.target
 EOF
 
-    chrootable_systemctl_enable omarchy-nvme-suspend-fix.service
-    sudo systemctl daemon-reload
+    sudo systemctl enable omarchy-nvme-suspend-fix.service
   else
     echo "Warning: NVMe device not found at expected PCI address (0000:01:00.0)"
     echo "This fix may not be needed for this MacBook model"
diff --git a/install/config/hardware/apple/fix-t2.sh b/install/hardware/apple/fix-t2.sh
similarity index 59%
rename from install/config/hardware/apple/fix-t2.sh
rename to install/hardware/apple/fix-t2.sh
index 815ed72f..ed1913fa 100644
--- a/install/config/hardware/apple/fix-t2.sh
+++ b/install/hardware/apple/fix-t2.sh
@@ -12,29 +12,35 @@ if lspci -nn | grep -q "106b:180[12]"; then
     tiny-dfr
 
   # Add user to video group (required for tiny-dfr to access /dev/dri devices)
-  sudo usermod -aG video ${USER}
+  usermod -aG video "$OMARCHY_INSTALL_USER"
 
   # Enable T2 services
-  sudo systemctl enable t2fanrd.service
-  sudo systemctl enable tiny-dfr.service
+  systemctl enable t2fanrd.service
+  systemctl enable tiny-dfr.service
 
-  echo "apple-bce" | sudo tee /etc/modules-load.d/t2.conf >/dev/null
-  echo "hci_bcm4377" | sudo tee -a /etc/modules-load.d/t2.conf >/dev/null
+  mkdir -p /etc/modules-load.d
+  {
+    echo "apple-bce"
+    echo "hci_bcm4377"
+  } > /etc/modules-load.d/t2.conf
 
-  echo "MODULES+=(apple-bce usbhid hid_apple hid_generic xhci_pci xhci_hcd)" | sudo tee /etc/mkinitcpio.conf.d/apple-t2.conf >/dev/null
+  mkdir -p /etc/mkinitcpio.conf.d
+  echo "MODULES+=(apple-bce usbhid hid_apple hid_generic xhci_pci xhci_hcd)" > \
+    /etc/mkinitcpio.conf.d/apple-t2.conf
 
-  cat <<EOF | sudo tee /etc/modprobe.d/brcmfmac.conf >/dev/null
+  mkdir -p /etc/modprobe.d
+  cat > /etc/modprobe.d/brcmfmac.conf <<'EOF'
 # Fix for T2 MacBook WiFi connectivity issues
 options brcmfmac feature_disable=0x82000
 EOF
 
-  sudo mkdir -p /etc/limine-entry-tool.d
-  cat <<EOF | sudo tee /etc/limine-entry-tool.d/t2-mac.conf >/dev/null
+  mkdir -p /etc/limine-entry-tool.d
+  cat > /etc/limine-entry-tool.d/t2-mac.conf <<'EOF'
 # Generated by Omarchy installer for T2 Mac support
 KERNEL_CMDLINE[default]+=" intel_iommu=on iommu=pt pcie_ports=compat"
 EOF
 
-  cat <<EOF | sudo tee /etc/t2fand.conf >/dev/null
+  cat > /etc/t2fand.conf <<'EOF'
 [Fan1]
 low_temp=55
 high_temp=75
diff --git a/install/packaging/asus-rog.sh b/install/hardware/asus-rog.sh
similarity index 100%
rename from install/packaging/asus-rog.sh
rename to install/hardware/asus-rog.sh
diff --git a/install/config/hardware/asus/fix-asus-ptl-b9406-display.sh b/install/hardware/asus/fix-asus-ptl-b9406-display.sh
similarity index 81%
rename from install/config/hardware/asus/fix-asus-ptl-b9406-display.sh
rename to install/hardware/asus/fix-asus-ptl-b9406-display.sh
index b77a45c4..7c6cb23a 100644
--- a/install/config/hardware/asus/fix-asus-ptl-b9406-display.sh
+++ b/install/hardware/asus/fix-asus-ptl-b9406-display.sh
@@ -7,8 +7,8 @@
 # xe.enable_psr=0 knob does not cover Panel Replay.
 
 if omarchy-hw-asus-expertbook-b9406; then
-  sudo mkdir -p /etc/limine-entry-tool.d
-  cat <<EOF | sudo tee /etc/limine-entry-tool.d/asus-expertbook-b9406-display.conf >/dev/null
+  mkdir -p /etc/limine-entry-tool.d
+  cat > /etc/limine-entry-tool.d/asus-expertbook-b9406-display.conf <<'EOF'
 # ASUS ExpertBook B9406 (Panther Lake / Xe3) display workaround
 KERNEL_CMDLINE[default]+=" xe.enable_panel_replay=0"
 EOF
diff --git a/install/config/hardware/asus/fix-asus-ptl-b9406-touchpad.sh b/install/hardware/asus/fix-asus-ptl-b9406-touchpad.sh
similarity index 88%
rename from install/config/hardware/asus/fix-asus-ptl-b9406-touchpad.sh
rename to install/hardware/asus/fix-asus-ptl-b9406-touchpad.sh
index d39da070..265e8114 100644
--- a/install/config/hardware/asus/fix-asus-ptl-b9406-touchpad.sh
+++ b/install/hardware/asus/fix-asus-ptl-b9406-touchpad.sh
@@ -10,8 +10,8 @@
 # Asus UX302LA entry in libinput's shipped 50-system-asus.quirks.
 
 if omarchy-hw-asus-expertbook-b9406; then
-  sudo mkdir -p /etc/libinput
-  sudo tee /etc/libinput/asus-expertbook-b9406.quirks >/dev/null <<EOF
+  mkdir -p /etc/libinput
+  cat > /etc/libinput/asus-expertbook-b9406.quirks <<'EOF'
 [ASUS ExpertBook B9406 Touchpad]
 MatchBus=i2c
 MatchUdevType=touchpad
diff --git a/install/config/hardware/asus/fix-asus-ptl-display-backlight.sh b/install/hardware/asus/fix-asus-ptl-display-backlight.sh
similarity index 88%
rename from install/config/hardware/asus/fix-asus-ptl-display-backlight.sh
rename to install/hardware/asus/fix-asus-ptl-display-backlight.sh
index cc851061..0ca01031 100644
--- a/install/config/hardware/asus/fix-asus-ptl-display-backlight.sh
+++ b/install/hardware/asus/fix-asus-ptl-display-backlight.sh
@@ -9,7 +9,7 @@
 
 if omarchy-hw-asus-expertbook-b9406 || omarchy-hw-asus-zenbook-ux5406aa; then
   sudo mkdir -p /etc/limine-entry-tool.d
-  cat <<EOF | sudo tee /etc/limine-entry-tool.d/asus-ptl-display-backlight.conf >/dev/null
+  sudo tee /etc/limine-entry-tool.d/asus-ptl-display-backlight.conf >/dev/null <<'EOF'
 # ASUS Panther Lake display backlight fix
 KERNEL_CMDLINE[default]+=" xe.enable_dpcd_backlight=1"
 EOF
diff --git a/install/config/hardware/asus/fix-z13-touchpad.sh b/install/hardware/asus/fix-z13-touchpad.sh
similarity index 94%
rename from install/config/hardware/asus/fix-z13-touchpad.sh
rename to install/hardware/asus/fix-z13-touchpad.sh
index 0df729ff..5a710f42 100644
--- a/install/config/hardware/asus/fix-z13-touchpad.sh
+++ b/install/hardware/asus/fix-z13-touchpad.sh
@@ -11,8 +11,8 @@
 # so dwt can properly pair it with the keyboard.
 
 if omarchy-hw-asus-rog && omarchy-hw-match "GZ302"; then
-  sudo tee /etc/udev/rules.d/99-omarchy-asus-z13-touchpad.rules > /dev/null <<'EOF'
+  sudo mkdir -p /etc/udev/rules.d
+  sudo tee /etc/udev/rules.d/99-omarchy-asus-z13-touchpad.rules >/dev/null <<'EOF'
 ACTION=="add|change", KERNEL=="event*", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1a30", ENV{ID_INPUT_TOUCHPAD}=="1", ENV{ID_INPUT_TOUCHPAD_INTEGRATION}="internal"
 EOF
-  sudo udevadm control --reload-rules
 fi
diff --git a/install/hardware/bluetooth.sh b/install/hardware/bluetooth.sh
new file mode 100644
index 00000000..5ef25061
--- /dev/null
+++ b/install/hardware/bluetooth.sh
@@ -0,0 +1,6 @@
+systemctl enable bluetooth.service
+
+# Persist last power state across reboots (default AutoEnable=true overrides it)
+if [[ -f /etc/bluetooth/main.conf ]]; then
+  sed -i 's/^#\?AutoEnable=.*/AutoEnable=false/' /etc/bluetooth/main.conf
+fi
diff --git a/install/packaging/dell-xps-touchpad-haptics.sh b/install/hardware/dell-xps-touchpad-haptics.sh
similarity index 100%
rename from install/packaging/dell-xps-touchpad-haptics.sh
rename to install/hardware/dell-xps-touchpad-haptics.sh
diff --git a/install/config/hardware/fix-bcm43xx.sh b/install/hardware/fix-bcm43xx.sh
similarity index 100%
rename from install/config/hardware/fix-bcm43xx.sh
rename to install/hardware/fix-bcm43xx.sh
diff --git a/install/config/hardware/fix-fkeys.sh b/install/hardware/fix-fkeys.sh
similarity index 78%
rename from install/config/hardware/fix-fkeys.sh
rename to install/hardware/fix-fkeys.sh
index d0b43154..ae7fee52 100644
--- a/install/config/hardware/fix-fkeys.sh
+++ b/install/hardware/fix-fkeys.sh
@@ -1,4 +1,5 @@
 # Ensure that F-keys on Apple-like keyboards (such as Lofree Flow84) are always F-keys
 if [[ ! -f /etc/modprobe.d/hid_apple.conf ]]; then
-  echo "options hid_apple fnmode=2" | sudo tee /etc/modprobe.d/hid_apple.conf
+  sudo mkdir -p /etc/modprobe.d
+  echo "options hid_apple fnmode=2" | sudo tee /etc/modprobe.d/hid_apple.conf >/dev/null
 fi
diff --git a/install/config/hardware/fix-surface-keyboard.sh b/install/hardware/fix-surface-keyboard.sh
similarity index 71%
rename from install/config/hardware/fix-surface-keyboard.sh
rename to install/hardware/fix-surface-keyboard.sh
index 2211db62..8f71c9be 100644
--- a/install/config/hardware/fix-surface-keyboard.sh
+++ b/install/hardware/fix-surface-keyboard.sh
@@ -11,13 +11,13 @@ if omarchy-hw-surface; then
   fi
 
   echo "Attempting to autodetect required pinctrl module"
-  pinctrl_module=$(lsmod | grep pinctrl_ | cut -f 1 -d" ")
+  pinctrl_module=$(lsmod | grep pinctrl_ | cut -f 1 -d" " || true)
   if [[ -z $pinctrl_module ]]; then
     echo "Failed to autodetect pinctrl module."
   else
     echo "Detected pinctrl module: $pinctrl_module"
+    mkdir -p /etc/mkinitcpio.conf.d
+    echo "MODULES=(${pinctrl_module} surface_aggregator surface_aggregator_registry surface_aggregator_hub surface_hid_core surface_hid surface_kbd intel_lpss_pci 8250_dw)" > \
+      /etc/mkinitcpio.conf.d/surface_device_modules.conf
   fi
-
-  echo "MODULES=(${pinctrl_module} surface_aggregator surface_aggregator_registry surface_aggregator_hub surface_hid_core surface_hid surface_kbd intel_lpss_pci 8250_dw)" | sudo tee /etc/mkinitcpio.conf.d/surface_device_modules.conf >/dev/null
-
 fi
diff --git a/install/config/hardware/fix-synaptic-touchpad.sh b/install/hardware/fix-synaptic-touchpad.sh
similarity index 78%
rename from install/config/hardware/fix-synaptic-touchpad.sh
rename to install/hardware/fix-synaptic-touchpad.sh
index cc726520..d30dd271 100644
--- a/install/config/hardware/fix-synaptic-touchpad.sh
+++ b/install/hardware/fix-synaptic-touchpad.sh
@@ -2,5 +2,5 @@
 
 if grep -qi synaptics /proc/bus/input/devices \
    && ! lsmod | grep -q '^psmouse'; then
-    modprobe psmouse synaptics_intertouch=1
-fi
\ No newline at end of file
+  modprobe psmouse synaptics_intertouch=1
+fi
diff --git a/install/config/hardware/fix-tuxedo-backlight.sh b/install/hardware/fix-tuxedo-backlight.sh
similarity index 83%
rename from install/config/hardware/fix-tuxedo-backlight.sh
rename to install/hardware/fix-tuxedo-backlight.sh
index 87440873..caf9803b 100644
--- a/install/config/hardware/fix-tuxedo-backlight.sh
+++ b/install/hardware/fix-tuxedo-backlight.sh
@@ -6,10 +6,11 @@ if cat /sys/class/dmi/id/sys_vendor 2>/dev/null | grep -qi "TUXEDO\|Slimbook"; t
   # Blacklist the legacy clevo_xsm_wmi module which conflicts with the tuxedo-drivers
   # clevo_wmi module. When clevo_xsm_wmi loads first, it grabs the Clevo WMI GUIDs,
   # preventing tuxedo-drivers from initializing the keyboard backlight properly.
-  echo "blacklist clevo_xsm_wmi" | sudo tee /etc/modprobe.d/blacklist-clevo-xsm-wmi.conf > /dev/null
+  mkdir -p /etc/modprobe.d
+  echo "blacklist clevo_xsm_wmi" > /etc/modprobe.d/blacklist-clevo-xsm-wmi.conf
 
   # Remove any orphaned clevo_xsm_wmi module files not managed by a package
   for f in /lib/modules/*/extra/clevo-xsm-wmi.ko; do
-    [ -f "$f" ] && sudo rm "$f"
+    [ -f "$f" ] && rm "$f"
   done
 fi
diff --git a/install/config/hardware/fix-yt6801-ethernet-adapter.sh b/install/hardware/fix-yt6801-ethernet-adapter.sh
similarity index 100%
rename from install/config/hardware/fix-yt6801-ethernet-adapter.sh
rename to install/hardware/fix-yt6801-ethernet-adapter.sh
diff --git a/install/config/hardware/framework/qmk-hid.sh b/install/hardware/framework/qmk-hid.sh
similarity index 52%
rename from install/config/hardware/framework/qmk-hid.sh
rename to install/hardware/framework/qmk-hid.sh
index 5fb46847..19561332 100644
--- a/install/config/hardware/framework/qmk-hid.sh
+++ b/install/hardware/framework/qmk-hid.sh
@@ -1,9 +1,8 @@
 # Allow unprivileged access to the Framework 16 keyboard for RGB control via qmk_hid.
 
 if omarchy-hw-framework16; then
+  sudo mkdir -p /etc/udev/rules.d
   if [[ ! -f /etc/udev/rules.d/50-framework16-qmk-hid.rules ]]; then
-    sudo cp "$OMARCHY_PATH/default/udev/framework16-qmk-hid.rules" /etc/udev/rules.d/50-framework16-qmk-hid.rules
-    sudo udevadm control --reload-rules
-    sudo udevadm trigger
+    sudo cp -f "$OMARCHY_PATH/default/udev/framework16-qmk-hid.rules" /etc/udev/rules.d/50-framework16-qmk-hid.rules
   fi
 fi
diff --git a/install/packaging/framework16.sh b/install/hardware/framework16.sh
similarity index 100%
rename from install/packaging/framework16.sh
rename to install/hardware/framework16.sh
diff --git a/install/config/input-group.sh b/install/hardware/input-group.sh
similarity index 67%
rename from install/config/input-group.sh
rename to install/hardware/input-group.sh
index 82935b97..2180af1a 100644
--- a/install/config/input-group.sh
+++ b/install/hardware/input-group.sh
@@ -1,2 +1,2 @@
 # Give this user privileged input access for dictation tools + xbox controllers to work
-sudo usermod -aG input ${USER}
+usermod -aG input "$OMARCHY_INSTALL_USER"
diff --git a/install/config/hardware/intel/fix-wifi7-eht.sh b/install/hardware/intel/fix-wifi7-eht.sh
similarity index 88%
rename from install/config/hardware/intel/fix-wifi7-eht.sh
rename to install/hardware/intel/fix-wifi7-eht.sh
index 9ca048cb..8d73095c 100644
--- a/install/config/hardware/intel/fix-wifi7-eht.sh
+++ b/install/hardware/intel/fix-wifi7-eht.sh
@@ -6,7 +6,8 @@
 # This should be removed when Intel fixes the firmware/driver.
 
 if lspci -nn | grep -qE '\[8086:(e440|272b)\]'; then
-  sudo tee /etc/modprobe.d/iwlwifi-disable-eht.conf <<'EOF'
+  mkdir -p /etc/modprobe.d
+  cat > /etc/modprobe.d/iwlwifi-disable-eht.conf <<'EOF'
 # Temporary fix Dell XPS 14/16 on Panther lake
 # Disable WiFi 7 (EHT) on Intel BE200/BE211 — broken RX rate adaptation
 # Remove this file when fixes land in the iwlwifi EHT data path
diff --git a/install/config/hardware/intel/fred.sh b/install/hardware/intel/fred.sh
similarity index 69%
rename from install/config/hardware/intel/fred.sh
rename to install/hardware/intel/fred.sh
index c25e4c79..af8d43bf 100644
--- a/install/config/hardware/intel/fred.sh
+++ b/install/hardware/intel/fred.sh
@@ -1,7 +1,6 @@
 # Enable Flexible Return and Event Delivery on Intel Panther Lake.
 
 DROP_IN="/etc/limine-entry-tool.d/intel-panther-lake-fred.conf"
-DEFAULT_LIMINE="/etc/default/limine"
 
 if omarchy-hw-intel-ptl; then
   if [[ ! -f $DROP_IN ]] || ! grep -q 'fred=on' "$DROP_IN"; then
@@ -11,8 +10,4 @@ if omarchy-hw-intel-ptl; then
 KERNEL_CMDLINE[default]+=" fred=on"
 EOF
   fi
-
-  if [[ -f $DEFAULT_LIMINE ]] && ! grep -q 'fred=on' "$DEFAULT_LIMINE"; then
-    sudo tee -a "$DEFAULT_LIMINE" < "$DROP_IN" >/dev/null
-  fi
 fi
diff --git a/install/config/hardware/intel/ipu7-camera.sh b/install/hardware/intel/ipu7-camera.sh
similarity index 100%
rename from install/config/hardware/intel/ipu7-camera.sh
rename to install/hardware/intel/ipu7-camera.sh
diff --git a/install/config/hardware/intel/lpmd.sh b/install/hardware/intel/lpmd.sh
similarity index 100%
rename from install/config/hardware/intel/lpmd.sh
rename to install/hardware/intel/lpmd.sh
diff --git a/install/config/hardware/intel/ptl-kernel.sh b/install/hardware/intel/ptl-kernel.sh
similarity index 65%
rename from install/config/hardware/intel/ptl-kernel.sh
rename to install/hardware/intel/ptl-kernel.sh
index d914cf25..65de3c3b 100644
--- a/install/config/hardware/intel/ptl-kernel.sh
+++ b/install/hardware/intel/ptl-kernel.sh
@@ -5,12 +5,10 @@ if omarchy-hw-match "XPS" && omarchy-hw-intel-ptl; then
   echo "Detected Dell XPS Panther Lake, installing PTL kernel..."
 
   omarchy-pkg-add linux-ptl linux-ptl-headers
-  for pkg in linux linux-headers; do
-    sudo pacman -Rdd --noconfirm "$pkg" 2>/dev/null || true
-  done
+  pacman -Rdd --noconfirm linux linux-headers 2>/dev/null || true
 
-  sudo mkdir -p /etc/limine-entry-tool.d
-  cat <<EOF | sudo tee /etc/limine-entry-tool.d/dell-xps-panther-lake.conf >/dev/null
+  mkdir -p /etc/limine-entry-tool.d
+  cat > /etc/limine-entry-tool.d/dell-xps-panther-lake.conf <<'EOF'
 # Only show Panther Lake kernel in boot menu on Dell XPS Panther Lake
 BOOT_ORDER="linux-ptl*, *fallback, Snapshots"
 EOF
diff --git a/install/config/hardware/intel/sof-firmware.sh b/install/hardware/intel/sof-firmware.sh
similarity index 100%
rename from install/config/hardware/intel/sof-firmware.sh
rename to install/hardware/intel/sof-firmware.sh
diff --git a/install/config/hardware/intel/thermald.sh b/install/hardware/intel/thermald.sh
similarity index 86%
rename from install/config/hardware/intel/thermald.sh
rename to install/hardware/intel/thermald.sh
index af771bbc..3ccd4340 100644
--- a/install/config/hardware/intel/thermald.sh
+++ b/install/hardware/intel/thermald.sh
@@ -4,8 +4,9 @@
 if omarchy-hw-intel; then
   # Check if Sandy Bridge or newer (model >= 42). Sandy Bridge: model 42 (mobile), 45 (desktop)
   cpu_model=$(grep -m1 "^model\s*:" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | tr -d ' ')
+  cpu_model=${cpu_model:-0}
   if ((cpu_model >= 42)) && omarchy-battery-present; then
     omarchy-pkg-add thermald
-    sudo systemctl enable thermald
+    sudo systemctl enable thermald.service
   fi
 fi
diff --git a/install/config/hardware/intel/video-acceleration.sh b/install/hardware/intel/video-acceleration.sh
similarity index 100%
rename from install/config/hardware/intel/video-acceleration.sh
rename to install/hardware/intel/video-acceleration.sh
diff --git a/install/config/hardware/lenovo/fix-yoga-pro7-bass-speakers.sh b/install/hardware/lenovo/fix-yoga-pro7-bass-speakers.sh
similarity index 79%
rename from install/config/hardware/lenovo/fix-yoga-pro7-bass-speakers.sh
rename to install/hardware/lenovo/fix-yoga-pro7-bass-speakers.sh
index 4459f0ae..ce0e72ae 100644
--- a/install/config/hardware/lenovo/fix-yoga-pro7-bass-speakers.sh
+++ b/install/hardware/lenovo/fix-yoga-pro7-bass-speakers.sh
@@ -4,7 +4,8 @@
 # Reference: https://wiki.archlinux.org/title/Lenovo_Yoga_9i_2022_(14AiPI7)
 
 if omarchy-hw-match "Yoga Pro 7 14IAH10"; then
-  sudo tee /etc/modprobe.d/lenovo-yoga-pro7-bass.conf <<'EOF'
+  sudo mkdir -p /etc/modprobe.d
+  sudo tee /etc/modprobe.d/lenovo-yoga-pro7-bass.conf >/dev/null <<'EOF'
 options snd-sof-intel-hda-generic hda_model=alc287-yoga9-bass-spk-pin
 EOF
 fi
diff --git a/install/hardware/network.sh b/install/hardware/network.sh
new file mode 100644
index 00000000..e8adbc43
--- /dev/null
+++ b/install/hardware/network.sh
@@ -0,0 +1,6 @@
+# NetworkManager enablement is centralized in enable-services.sh.
+systemctl disable iwd.service 2>/dev/null || true
+
+# Prevent systemd-networkd-wait-online timeout on boot
+systemctl disable systemd-networkd-wait-online.service
+systemctl mask systemd-networkd-wait-online.service
diff --git a/install/hardware/nvidia.sh b/install/hardware/nvidia.sh
new file mode 100644
index 00000000..e7370995
--- /dev/null
+++ b/install/hardware/nvidia.sh
@@ -0,0 +1,33 @@
+if lspci | grep -qi 'nvidia'; then
+  # Check which kernel is installed and set appropriate headers package
+  KERNEL_PACKAGE=$(pacman -Qqs '^linux(-zen|-lts|-hardened|-t2|-ptl)?$' | head -1 || true)
+  [[ -n $KERNEL_PACKAGE ]] && omarchy-pkg-add "$KERNEL_PACKAGE-headers"
+
+  if omarchy-hw-nvidia-gsp; then
+    PACKAGES=(nvidia-open-dkms nvidia-utils lib32-nvidia-utils libva-nvidia-driver)
+  elif omarchy-hw-nvidia-without-gsp; then
+    PACKAGES=(nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils)
+  fi
+
+  # Bail if no supported GPU
+  if [[ -z ${PACKAGES+x} ]]; then
+    echo "No compatible driver for your NVIDIA GPU. See: https://wiki.archlinux.org/title/NVIDIA"
+    exit 0
+  fi
+
+  omarchy-pkg-add "${PACKAGES[@]}"
+
+  # Per-session Hyprland NVIDIA env vars are handled by default/hypr/nvidia.lua.
+
+  # Configure modprobe for early KMS
+  mkdir -p /etc/modprobe.d
+  cat > /etc/modprobe.d/nvidia.conf <<'EOF'
+options nvidia_drm modeset=1
+EOF
+
+  # Configure mkinitcpio for early loading
+  mkdir -p /etc/mkinitcpio.conf.d
+  cat > /etc/mkinitcpio.conf.d/nvidia.conf <<'EOF'
+MODULES+=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)
+EOF
+fi
diff --git a/install/hardware/pacman.sh b/install/hardware/pacman.sh
new file mode 100644
index 00000000..9d2266bf
--- /dev/null
+++ b/install/hardware/pacman.sh
@@ -0,0 +1,12 @@
+# Hardware-specific pacman repository extensions that must survive the final
+# pacman.conf restore.
+if lspci -nn | grep -q "106b:180[12]"; then
+  if ! grep -q '^\[arch-mact2\]' /etc/pacman.conf; then
+    cat >> /etc/pacman.conf <<'EOF'
+
+[arch-mact2]
+Server = https://github.com/NoaHimesaka1873/arch-mact2-mirror/releases/download/release
+SigLevel = Never
+EOF
+  fi
+fi
diff --git a/install/hardware/set-wireless-regdom.sh b/install/hardware/set-wireless-regdom.sh
new file mode 100644
index 00000000..0a5f6f81
--- /dev/null
+++ b/install/hardware/set-wireless-regdom.sh
@@ -0,0 +1,24 @@
+# Persist wireless regulatory domain based on the target timezone. Install is
+# followed by reboot, so don't mutate live Wi-Fi state with `iw reg set`.
+regdom_file=/etc/conf.d/wireless-regdom
+[[ -f $regdom_file ]] || exit 0
+
+if grep -q '^WIRELESS_REGDOM=' "$regdom_file"; then
+  exit 0
+fi
+
+timezone=""
+if [[ -e /etc/localtime ]]; then
+  timezone=$(readlink -f /etc/localtime || true)
+  timezone=${timezone#/usr/share/zoneinfo/}
+fi
+
+country="${timezone%%/*}"
+zone_tab=/usr/share/zoneinfo/zone.tab
+if [[ ! $country =~ ^[A-Z]{2}$ && -n $timezone && -f $zone_tab ]]; then
+  country=$(awk -v tz="$timezone" '$3 == tz {print $1; exit}' "$zone_tab")
+fi
+
+if [[ $country =~ ^[A-Z]{2}$ ]]; then
+  echo "WIRELESS_REGDOM=\"$country\"" | sudo tee -a "$regdom_file" >/dev/null
+fi
diff --git a/install/packaging/surface.sh b/install/hardware/surface.sh
similarity index 100%
rename from install/packaging/surface.sh
rename to install/hardware/surface.sh
diff --git a/install/config/hardware/vulkan.sh b/install/hardware/vulkan.sh
similarity index 100%
rename from install/config/hardware/vulkan.sh
rename to install/hardware/vulkan.sh
diff --git a/install/helpers/all.sh b/install/helpers/all.sh
deleted file mode 100644
index 0fc48100..00000000
--- a/install/helpers/all.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $OMARCHY_INSTALL/helpers/chroot.sh
-source $OMARCHY_INSTALL/helpers/presentation.sh
-source $OMARCHY_INSTALL/helpers/errors.sh
-source $OMARCHY_INSTALL/helpers/logging.sh
diff --git a/install/helpers/chroot.sh b/install/helpers/chroot.sh
deleted file mode 100644
index b9541972..00000000
--- a/install/helpers/chroot.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Starting the installer with OMARCHY_CHROOT_INSTALL=1 will put it into chroot mode
-chrootable_systemctl_enable() {
-  if [[ -n ${OMARCHY_CHROOT_INSTALL:-} ]]; then
-    sudo systemctl enable $1
-  else
-    sudo systemctl enable --now $1
-  fi
-}
-
-# Export the function so it's available in subshells
-export -f chrootable_systemctl_enable
diff --git a/install/helpers/errors.sh b/install/helpers/errors.sh
deleted file mode 100644
index d6683917..00000000
--- a/install/helpers/errors.sh
+++ /dev/null
@@ -1,163 +0,0 @@
-# Directs user to Omarchy Discord
-QR_CODE='
-█▀▀▀▀▀█ ▄ ▄ ▀▄▄▄█ █▀▀▀▀▀█
-█ ███ █ ▄▄▄▄▀▄▀▄▀ █ ███ █
-█ ▀▀▀ █ ▄█  ▄█▄▄▀ █ ▀▀▀ █
-▀▀▀▀▀▀▀ ▀▄█ █ █ █ ▀▀▀▀▀▀▀
-▀▀█▀▀▄▀▀▀▀▄█▀▀█  ▀ █ ▀ █
-█▄█ ▄▄▀▄▄ ▀ ▄ ▀█▄▄▄▄ ▀ ▀█
-▄ ▄▀█ ▀▄▀▀▀▄ ▄█▀▄█▀▄▀▄▀█▀
-█ ▄▄█▄▀▄█ ▄▄▄  ▀ ▄▀██▀ ▀█
-▀ ▀   ▀ █ ▀▄  ▀▀█▀▀▀█▄▀
-█▀▀▀▀▀█ ▀█  ▄▀▀ █ ▀ █▄▀██
-█ ███ █ █▀▄▄▀ █▀███▀█▄██▄
-█ ▀▀▀ █ ██  ▀ █▄█ ▄▄▄█▀ █
-▀▀▀▀▀▀▀ ▀ ▀ ▀▀▀  ▀ ▀▀▀▀▀▀'
-
-# Track if we're already handling an error to prevent double-trapping
-ERROR_HANDLING=false
-
-# Cursor is usually hidden while we install
-show_cursor() {
-  printf "\033[?25h"
-}
-
-# Display truncated log lines from the install log
-show_log_tail() {
-  if [[ -f $OMARCHY_INSTALL_LOG_FILE ]]; then
-    local log_lines=$((TERM_HEIGHT - LOGO_HEIGHT - 35))
-    local max_line_width=$((LOGO_WIDTH - 4))
-
-    tail -n $log_lines "$OMARCHY_INSTALL_LOG_FILE" | while IFS= read -r line; do
-      if ((${#line} > max_line_width)); then
-        local truncated_line="${line:0:$max_line_width}..."
-      else
-        local truncated_line="$line"
-      fi
-
-      gum style "$truncated_line"
-    done
-
-    echo
-  fi
-}
-
-# Display the failed command or script name
-show_failed_script_or_command() {
-  if [[ -n ${CURRENT_SCRIPT:-} ]]; then
-    gum style "Failed script: $CURRENT_SCRIPT"
-  else
-    # Truncate long command lines to fit the display
-    local cmd="$BASH_COMMAND"
-    local max_cmd_width=$((LOGO_WIDTH - 4))
-
-    if ((${#cmd} > max_cmd_width)); then
-      cmd="${cmd:0:$max_cmd_width}..."
-    fi
-
-    gum style "$cmd"
-  fi
-}
-
-# Save original stdout and stderr for trap to use
-save_original_outputs() {
-  exec 3>&1 4>&2
-}
-
-# Restore stdout and stderr to original (saved in FD 3 and 4)
-# This ensures output goes to screen, not log file
-restore_outputs() {
-  if [[ -e /proc/self/fd/3 ]] && [[ -e /proc/self/fd/4 ]]; then
-    exec 1>&3 2>&4
-  fi
-}
-
-# Error handler
-catch_errors() {
-  # Prevent recursive error handling
-  if [[ $ERROR_HANDLING == "true" ]]; then
-    return
-  else
-    ERROR_HANDLING=true
-  fi
-
-  # Store exit code immediately before it gets overwritten
-  local exit_code=$?
-
-  stop_log_output
-  restore_outputs
-
-  clear_logo
-  show_cursor
-
-  gum style --foreground 1 --padding "1 0 1 $PADDING_LEFT" "Omarchy installation stopped!"
-  show_log_tail
-
-  gum style "This command halted with exit code $exit_code:"
-  show_failed_script_or_command
-
-  gum style "$QR_CODE"
-  echo
-  gum style "Get help from the community via QR code or at https://discord.gg/tXFUdasqhY"
-
-  # Offer options menu
-  while true; do
-    options=()
-
-    # If online install, show retry first
-    if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
-      options+=("Retry installation")
-    fi
-
-    # Add upload option if internet is available
-    if ping -c 1 -W 1 1.1.1.1 >/dev/null 2>&1; then
-      options+=("Upload log for support")
-    fi
-
-    # Add remaining options
-    options+=("View full log")
-    options+=("Exit")
-
-    choice=$(gum choose "${options[@]}" --header "What would you like to do?" --height 6 --padding "1 $PADDING_LEFT")
-
-    case "$choice" in
-    "Retry installation")
-      bash ~/.local/share/omarchy/install.sh
-      break
-      ;;
-    "View full log")
-      if command -v less &>/dev/null; then
-        less "$OMARCHY_INSTALL_LOG_FILE"
-      else
-        tail "$OMARCHY_INSTALL_LOG_FILE"
-      fi
-      ;;
-    "Upload log for support")
-      omarchy-upload-log
-      ;;
-    "Exit" | "")
-      exit 1
-      ;;
-    esac
-  done
-}
-
-# Exit handler - ensures cleanup happens on any exit
-exit_handler() {
-  local exit_code=$?
-
-  # Only run if we're exiting with an error and haven't already handled it
-  if (( exit_code != 0 )) && [[ $ERROR_HANDLING != "true" ]]; then
-    catch_errors
-  else
-    stop_log_output
-    show_cursor
-  fi
-}
-
-# Set up traps
-trap catch_errors ERR INT TERM
-trap exit_handler EXIT
-
-# Save original outputs in case we trap
-save_original_outputs
diff --git a/install/helpers/logging.sh b/install/helpers/logging.sh
index 88693657..e325d83e 100644
--- a/install/helpers/logging.sh
+++ b/install/helpers/logging.sh
@@ -1,133 +1,79 @@
-start_log_output() {
-  local ANSI_SAVE_CURSOR="\033[s"
-  local ANSI_RESTORE_CURSOR="\033[u"
-  local ANSI_CLEAR_LINE="\033[2K"
-  local ANSI_HIDE_CURSOR="\033[?25l"
-  local ANSI_RESET="\033[0m"
-  local ANSI_GRAY="\033[90m"
-
-  # Save cursor position and hide cursor
-  printf $ANSI_SAVE_CURSOR
-  printf $ANSI_HIDE_CURSOR
-
-  (
-    local log_lines=20
-    local max_line_width=$((LOGO_WIDTH - 4))
-
-    while true; do
-      # Read the last N lines into an array
-      mapfile -t current_lines < <(tail -n $log_lines "$OMARCHY_INSTALL_LOG_FILE" 2>/dev/null)
-
-      # Build complete output buffer with escape sequences
-      output=""
-      for ((i = 0; i < log_lines; i++)); do
-        line="${current_lines[i]:-}"
-
-        # Truncate if needed
-        if (( ${#line} > max_line_width )); then
-          line="${line:0:$max_line_width}..."
-        fi
-
-        # Add clear line escape and formatted output for each line
-        if [[ -n $line ]]; then
-          output+="${ANSI_CLEAR_LINE}${ANSI_GRAY}${PADDING_LEFT_SPACES}  → ${line}${ANSI_RESET}\n"
-        else
-          output+="${ANSI_CLEAR_LINE}${PADDING_LEFT_SPACES}\n"
-        fi
-      done
-
-      printf "${ANSI_RESTORE_CURSOR}%b" "$output"
-
-      sleep 0.1
-    done
-  ) &
-  monitor_pid=$!
+omarchy_log_to_stdout() {
+  [[ ${OMARCHY_LOG_TO_STDOUT:-} == "1" || -z ${OMARCHY_INSTALL_LOG_FILE:-} ]]
 }
 
-stop_log_output() {
-  if [[ -n ${monitor_pid:-} ]]; then
-    kill $monitor_pid 2>/dev/null || true
-    wait $monitor_pid 2>/dev/null || true
-    unset monitor_pid
+omarchy_log_line() {
+  if omarchy_log_to_stdout; then
+    echo "$1"
+  else
+    echo "$1" >>"$OMARCHY_INSTALL_LOG_FILE"
   fi
 }
 
 start_install_log() {
-  sudo touch "$OMARCHY_INSTALL_LOG_FILE"
-  sudo chmod 666 "$OMARCHY_INSTALL_LOG_FILE"
+  if ! omarchy_log_to_stdout; then
+    mkdir -p "$(dirname "$OMARCHY_INSTALL_LOG_FILE")"
+    touch "$OMARCHY_INSTALL_LOG_FILE"
+    chmod 666 "$OMARCHY_INSTALL_LOG_FILE" 2>/dev/null || true
+  fi
 
-  export OMARCHY_START_TIME=$(date '+%Y-%m-%d %H:%M:%S')
+  export OMARCHY_START_TIME="${OMARCHY_START_TIME:-$(date '+%Y-%m-%d %H:%M:%S')}"
+  export OMARCHY_START_EPOCH="${OMARCHY_START_EPOCH:-$(date +%s)}"
 
-  echo "=== Omarchy Installation Started: $OMARCHY_START_TIME ===" >>"$OMARCHY_INSTALL_LOG_FILE"
-  start_log_output
+  omarchy_log_line "=== Omarchy Setup Started: $OMARCHY_START_TIME ==="
 }
 
 stop_install_log() {
-  stop_log_output
-  show_cursor
+  local end_time end_epoch duration mins secs
+  end_time=$(date '+%Y-%m-%d %H:%M:%S')
+  end_epoch=$(date +%s)
 
-  if [[ -n ${OMARCHY_INSTALL_LOG_FILE:-} ]]; then
-    OMARCHY_END_TIME=$(date '+%Y-%m-%d %H:%M:%S')
-    echo "=== Omarchy Installation Completed: $OMARCHY_END_TIME ===" >>"$OMARCHY_INSTALL_LOG_FILE"
-    echo "" >>"$OMARCHY_INSTALL_LOG_FILE"
-    echo "=== Installation Time Summary ===" >>"$OMARCHY_INSTALL_LOG_FILE"
+  omarchy_log_line "=== Omarchy Setup Completed: $end_time ==="
 
-    if [[ -f "/var/log/archinstall/install.log" ]]; then
-      ARCHINSTALL_START=$(grep -m1 '^\[' /var/log/archinstall/install.log 2>/dev/null | sed 's/^\[\([^]]*\)\].*/\1/' || true)
-      ARCHINSTALL_END=$(grep 'Installation completed without any errors' /var/log/archinstall/install.log 2>/dev/null | sed 's/^\[\([^]]*\)\].*/\1/' || true)
-
-      if [[ -n $ARCHINSTALL_START ]] && [[ -n $ARCHINSTALL_END ]]; then
-        ARCH_START_EPOCH=$(date -d "$ARCHINSTALL_START" +%s)
-        ARCH_END_EPOCH=$(date -d "$ARCHINSTALL_END" +%s)
-        ARCH_DURATION=$((ARCH_END_EPOCH - ARCH_START_EPOCH))
-
-        ARCH_MINS=$((ARCH_DURATION / 60))
-        ARCH_SECS=$((ARCH_DURATION % 60))
-
-        echo "Archinstall: ${ARCH_MINS}m ${ARCH_SECS}s" >>"$OMARCHY_INSTALL_LOG_FILE"
-      fi
-    fi
-
-    if [[ -n $OMARCHY_START_TIME ]]; then
-      OMARCHY_START_EPOCH=$(date -d "$OMARCHY_START_TIME" +%s)
-      OMARCHY_END_EPOCH=$(date -d "$OMARCHY_END_TIME" +%s)
-      OMARCHY_DURATION=$((OMARCHY_END_EPOCH - OMARCHY_START_EPOCH))
-
-      OMARCHY_MINS=$((OMARCHY_DURATION / 60))
-      OMARCHY_SECS=$((OMARCHY_DURATION % 60))
-
-      echo "Omarchy:     ${OMARCHY_MINS}m ${OMARCHY_SECS}s" >>"$OMARCHY_INSTALL_LOG_FILE"
-
-      if [[ -n $ARCH_DURATION ]]; then
-        TOTAL_DURATION=$((ARCH_DURATION + OMARCHY_DURATION))
-        TOTAL_MINS=$((TOTAL_DURATION / 60))
-        TOTAL_SECS=$((TOTAL_DURATION % 60))
-        echo "Total:       ${TOTAL_MINS}m ${TOTAL_SECS}s" >>"$OMARCHY_INSTALL_LOG_FILE"
-      fi
-    fi
-    echo "=================================" >>"$OMARCHY_INSTALL_LOG_FILE"
-
-    echo "Rebooting system..." >>"$OMARCHY_INSTALL_LOG_FILE"
+  if [[ -n ${OMARCHY_START_EPOCH:-} ]]; then
+    duration=$((end_epoch - OMARCHY_START_EPOCH))
+    mins=$((duration / 60))
+    secs=$((duration % 60))
+    omarchy_log_line "Omarchy setup: ${mins}m ${secs}s"
   fi
 }
 
 run_logged() {
   local script="$1"
+  local exit_code errexit_was_set=0
 
-  export CURRENT_SCRIPT="$script"
+  omarchy_log_line "[$(date '+%Y-%m-%d %H:%M:%S')] Starting: $script"
 
-  echo "[$(date '+%Y-%m-%d %H:%M:%S')] Starting: $script" >>"$OMARCHY_INSTALL_LOG_FILE"
+  case $- in
+    *e*)
+      errexit_was_set=1
+      set +e
+      ;;
+  esac
 
-  # Use bash -c to create a clean subshell
-  bash -c "source '$script'" </dev/null >>"$OMARCHY_INSTALL_LOG_FILE" 2>&1
+  if omarchy_log_to_stdout; then
+    if [[ ${OMARCHY_INSTALL_DEBUG:-} == "1" ]]; then
+      PS4='+ ${BASH_SOURCE[0]##*/}:${LINENO}:${FUNCNAME[0]:-main}: ' \
+        bash -x -eE -c 'source "$1"' bash "$script" </dev/null 2>&1
+    else
+      bash -eE -c 'source "$1"' bash "$script" </dev/null 2>&1
+    fi
+  else
+    if [[ ${OMARCHY_INSTALL_DEBUG:-} == "1" ]]; then
+      PS4='+ ${BASH_SOURCE[0]##*/}:${LINENO}:${FUNCNAME[0]:-main}: ' \
+        bash -x -eE -c 'source "$1"' bash "$script" </dev/null >>"$OMARCHY_INSTALL_LOG_FILE" 2>&1
+    else
+      bash -eE -c 'source "$1"' bash "$script" </dev/null >>"$OMARCHY_INSTALL_LOG_FILE" 2>&1
+    fi
+  fi
 
-  local exit_code=$?
+  exit_code=$?
+  (( errexit_was_set )) && set -e
 
   if (( exit_code == 0 )); then
-    echo "[$(date '+%Y-%m-%d %H:%M:%S')] Completed: $script" >>"$OMARCHY_INSTALL_LOG_FILE"
-    unset CURRENT_SCRIPT
+    omarchy_log_line "[$(date '+%Y-%m-%d %H:%M:%S')] Completed: $script"
   else
-    echo "[$(date '+%Y-%m-%d %H:%M:%S')] Failed: $script (exit code: $exit_code)" >>"$OMARCHY_INSTALL_LOG_FILE"
+    omarchy_log_line "[$(date '+%Y-%m-%d %H:%M:%S')] Failed: $script (exit code: $exit_code)"
   fi
 
   return $exit_code
diff --git a/install/helpers/presentation.sh b/install/helpers/presentation.sh
deleted file mode 100644
index 3f4c0656..00000000
--- a/install/helpers/presentation.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-# Ensure we have gum available
-if ! command -v gum &>/dev/null; then
-  omarchy-pkg-add gum
-fi
-
-# Get terminal size from /dev/tty (works in all scenarios: direct, sourced, or piped)
-if [[ -e /dev/tty ]]; then
-  TERM_SIZE=$(stty size 2>/dev/null </dev/tty)
-
-  if [[ -n $TERM_SIZE ]]; then
-    export TERM_HEIGHT=$(echo "$TERM_SIZE" | cut -d' ' -f1)
-    export TERM_WIDTH=$(echo "$TERM_SIZE" | cut -d' ' -f2)
-  else
-    # Fallback to reasonable defaults if stty fails
-    export TERM_WIDTH=80
-    export TERM_HEIGHT=24
-  fi
-else
-  # No terminal available (e.g., non-interactive environment)
-  export TERM_WIDTH=80
-  export TERM_HEIGHT=24
-fi
-
-export LOGO_PATH="$OMARCHY_PATH/logo.txt"
-export LOGO_WIDTH=$(awk '{ if (length > max) max = length } END { print max+0 }' "$LOGO_PATH" 2>/dev/null || echo 0)
-export LOGO_HEIGHT=$(wc -l <"$LOGO_PATH" 2>/dev/null || echo 0)
-
-export PADDING_LEFT=$(((TERM_WIDTH - LOGO_WIDTH) / 2))
-export PADDING_LEFT_SPACES=$(printf "%*s" $PADDING_LEFT "")
-
-# Tokyo Night theme for gum confirm
-export GUM_CONFIRM_PROMPT_FOREGROUND="6"     # Cyan for prompt
-export GUM_CONFIRM_SELECTED_FOREGROUND="0"   # Black text on selected
-export GUM_CONFIRM_SELECTED_BACKGROUND="2"   # Green background for selected
-export GUM_CONFIRM_UNSELECTED_FOREGROUND="7" # White for unselected
-export GUM_CONFIRM_UNSELECTED_BACKGROUND="0" # Black background for unselected
-export PADDING="0 0 0 $PADDING_LEFT"         # Gum Style
-export GUM_CHOOSE_PADDING="$PADDING"
-export GUM_FILTER_PADDING="$PADDING"
-export GUM_INPUT_PADDING="$PADDING"
-export GUM_SPIN_PADDING="$PADDING"
-export GUM_TABLE_PADDING="$PADDING"
-export GUM_CONFIRM_PADDING="$PADDING"
-
-clear_logo() {
-  printf "\033[H\033[2J" # Clear screen and move cursor to top-left
-  gum style --foreground 2 --padding "1 0 0 $PADDING_LEFT" "$(<"$LOGO_PATH")"
-}
diff --git a/install/login/all.sh b/install/login/all.sh
deleted file mode 100644
index 4d76d3f9..00000000
--- a/install/login/all.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-run_logged $OMARCHY_INSTALL/login/plymouth.sh
-run_logged $OMARCHY_INSTALL/login/default-keyring.sh
-run_logged $OMARCHY_INSTALL/login/sddm.sh
-run_logged $OMARCHY_INSTALL/login/hibernation.sh
-run_logged $OMARCHY_INSTALL/login/limine-snapper.sh
diff --git a/install/login/hibernation.sh b/install/login/hibernation.sh
deleted file mode 100644
index 5983020d..00000000
--- a/install/login/hibernation.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Run before limine-snapper.sh so the resume hook + cmdline drop-ins are in
-# place when `pacman -S limine-mkinitcpio-hook` triggers its single full UKI
-# rebuild. The --no-rebuild flag tells the script to skip its own rebuild —
-# limine-snapper's pacman install will produce a UKI that already includes
-# hibernation.
-omarchy-hibernation-setup --force --no-rebuild
diff --git a/install/login/limine-snapper.sh b/install/login/limine-snapper.sh
deleted file mode 100644
index ce9fffbb..00000000
--- a/install/login/limine-snapper.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-if command -v limine &>/dev/null; then
-  sudo tee /etc/mkinitcpio.conf.d/omarchy_hooks.conf <<EOF >/dev/null
-HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs)
-EOF
-  sudo tee /etc/mkinitcpio.conf.d/thunderbolt_module.conf <<EOF >/dev/null
-MODULES+=(thunderbolt)
-EOF
-
-  # Detect boot mode
-  [[ -d /sys/firmware/efi ]] && EFI=true
-
-  # Find config location
-  if [[ -f /boot/EFI/arch-limine/limine.conf ]]; then
-    limine_config="/boot/EFI/arch-limine/limine.conf"
-  elif [[ -f /boot/EFI/BOOT/limine.conf ]]; then
-    limine_config="/boot/EFI/BOOT/limine.conf"
-  elif [[ -f /boot/EFI/limine/limine.conf ]]; then
-    limine_config="/boot/EFI/limine/limine.conf"
-  elif [[ -f /boot/limine/limine.conf ]]; then
-    limine_config="/boot/limine/limine.conf"
-  elif [[ -f /boot/limine.conf ]]; then
-    limine_config="/boot/limine.conf"
-  else
-    echo "Error: Limine config not found" >&2
-    exit 1
-  fi
-
-  CMDLINE=$(grep "^[[:space:]]*cmdline:" "$limine_config" | head -1 | sed 's/^[[:space:]]*cmdline:[[:space:]]*//')
-
-  # Write /etc/default/limine *before* installing limine-mkinitcpio-hook, whose
-  # post-transaction deploy hook runs limine-install and reads this file. Without
-  # it, ESP_PATH falls back to bootctl, which in a chroot prints a warning that
-  # gets captured as the path and trips a spurious "invalid ESP" error.
-  sudo cp $OMARCHY_PATH/default/limine/default.conf /etc/default/limine
-  sudo sed -i "s|@@CMDLINE@@|$CMDLINE|g" /etc/default/limine
-
-  # Append any drop-in kernel cmdline configs (from hardware fix scripts, etc.)
-  for dropin in /etc/limine-entry-tool.d/*.conf; do
-    [ -f "$dropin" ] && cat "$dropin" | sudo tee -a /etc/default/limine >/dev/null
-  done
-
-  # UKI and EFI fallback are EFI only
-  if [[ -z $EFI ]]; then
-    sudo sed -i '/^ENABLE_UKI=/d; /^ENABLE_LIMINE_FALLBACK=/d' /etc/default/limine
-  fi
-
-  # Remove the original config file if it's not /boot/limine.conf, so the deploy
-  # hook doesn't see conflicting configs on the same ESP.
-  if [[ $limine_config != "/boot/limine.conf" ]] && [[ -f $limine_config ]]; then
-    sudo rm "$limine_config"
-  fi
-
-  # We overwrite the whole thing knowing the limine-update will add the entries for us
-  sudo cp $OMARCHY_PATH/default/limine/limine.conf /boot/limine.conf
-
-  sudo pacman -S --noconfirm --needed limine-snapper-sync limine-mkinitcpio-hook
-
-  # Only snapshot root — /home is user data; rolling it back loses user work
-  if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then
-    sudo snapper -c root create-config /
-  fi
-  sudo cp $OMARCHY_PATH/default/snapper/root /etc/snapper/configs/root
-
-  # Disable btrfs quotas — full qgroup accounting is a major performance drag
-  sudo btrfs quota disable / 2>/dev/null || true
-
-  chrootable_systemctl_enable limine-snapper-sync.service
-fi
-
-echo "Re-enabling mkinitcpio hooks..."
-
-# Restore the specific mkinitcpio pacman hooks
-if [[ -f /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled ]]; then
-  sudo mv /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled /usr/share/libalpm/hooks/90-mkinitcpio-install.hook
-fi
-
-if [[ -f /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled ]]; then
-  sudo mv /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook
-fi
-
-echo "mkinitcpio hooks re-enabled"
-
-# Installing limine-mkinitcpio-hook above already triggered a full UKI rebuild
-# (via 80-limine-efi-deploy.hook + 90-mkinitcpio-install.hook), which writes the
-# boot entries into /boot/limine.conf. Only fall back to limine-update if those
-# hooks didn't run for some reason — running it unconditionally rebuilds every
-# UKI a second time.
-if ! grep -q "^/+" /boot/limine.conf; then
-  sudo limine-update
-fi
-
-if ! grep -q "^/+" /boot/limine.conf; then
-  echo "Error: failed to add boot entries to /boot/limine.conf" >&2
-  exit 1
-fi
-
-if [[ -n $EFI ]] && efibootmgr &>/dev/null; then
-  # Remove the archinstall-created Limine entry
-  while IFS= read -r bootnum; do
-    sudo efibootmgr -b "$bootnum" -B >/dev/null 2>&1
-  done < <(efibootmgr | grep -E "^Boot[0-9]{4}\*? Arch Linux Limine" | sed 's/^Boot\([0-9]\{4\}\).*/\1/')
-fi
diff --git a/install/login/plymouth.sh b/install/login/plymouth.sh
deleted file mode 100644
index 291c47ab..00000000
--- a/install/login/plymouth.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-if [[ $(plymouth-set-default-theme) != "omarchy" ]]; then
-  sudo cp -r "$HOME/.local/share/omarchy/default/plymouth" /usr/share/plymouth/themes/omarchy/
-  sudo plymouth-set-default-theme omarchy
-fi
diff --git a/install/login/sddm.sh b/install/login/sddm.sh
index f97243cb..250ce80e 100644
--- a/install/login/sddm.sh
+++ b/install/login/sddm.sh
@@ -1,37 +1,7 @@
-# Install omarchy SDDM theme
-omarchy-refresh-sddm
-
-# Setup SDDM login service
-sudo mkdir -p /usr/local/share/wayland-sessions
-sudo cp "$OMARCHY_PATH/default/wayland-sessions/omarchy.desktop" /usr/local/share/wayland-sessions/omarchy.desktop
-sudo cp "$OMARCHY_PATH/default/sddm/hyprland.conf" /usr/share/sddm/hyprland.conf
-
-sudo mkdir -p /etc/sddm.conf.d
-cat <<EOF | sudo tee /etc/sddm.conf.d/10-wayland.conf >/dev/null
-[General]
-DisplayServer=wayland
-
-[Wayland]
-CompositorCommand=start-hyprland -- --config /usr/share/sddm/hyprland.conf
-EOF
-
-if [[ ! -f /etc/sddm.conf.d/autologin.conf ]]; then
-  cat <<EOF | sudo tee /etc/sddm.conf.d/autologin.conf
-[Autologin]
-User=$USER
-Session=omarchy
-
-[Theme]
-Current=omarchy
-EOF
-else
-  sudo sed -i 's/^Session=hyprland-uwsm$/Session=omarchy/' /etc/sddm.conf.d/autologin.conf
-fi
-
 # Prevent password-based SDDM logins from creating an encrypted login keyring
-# (which conflicts with the passwordless Default_keyring used for auto-unlock)
-sudo sed -i '/-auth.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
-sudo sed -i '/-password.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
-
-# Don't use chrootable here as --now will cause issues for manual installs
-sudo systemctl enable sddm.service
+# that conflicts with Omarchy's passwordless default keyring behavior. The ISO
+# owns autologin/session state because it knows whether the target is encrypted.
+if [[ -f /etc/pam.d/sddm ]]; then
+  sed -i '/-auth.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
+  sed -i '/-password.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
+fi
diff --git a/install/login/system.sh b/install/login/system.sh
new file mode 100644
index 00000000..a68f5567
--- /dev/null
+++ b/install/login/system.sh
@@ -0,0 +1 @@
+run_logged "$OMARCHY_INSTALL/login/sddm.sh"
diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages
index acdddc47..06e69547 100644
--- a/install/omarchy-base.packages
+++ b/install/omarchy-base.packages
@@ -1,22 +1,20 @@
-# Omarchy core package list installed via install/packaging/base.sh
-# This file is also used by the ISO builder when determining needs
+# Omarchy core package list pacstrapped by the ISO.
+# The ISO builder also reads this file when constructing the offline mirror.
 
-1password-beta
-1password-cli
 aether
-alacritty
 alsa-utils
 asdcontrol
 avahi
 bash-completion
 bat
-bluetui
+bluez
+bluez-tools
+bluez-utils
 bolt
 brightnessctl
 btop
 chromium
 clang
-claude-code
 cliamp
 cups
 cups-browsed
@@ -32,6 +30,7 @@ evince
 exfatprogs
 expac
 eza
+fakeroot
 fastfetch
 fcitx5
 fcitx5-gtk
@@ -39,8 +38,9 @@ fcitx5-qt
 fd
 ffmpegthumbnailer
 fontconfig
+foot
 fzf
-github-cli
+git
 gnome-calculator
 gnome-keyring
 gnome-themes-extra
@@ -50,19 +50,17 @@ gum
 gvfs-mtp
 gvfs-nfs
 gvfs-smb
-hypridle
 hyprland
 hyprland-guiutils
 hyprland-preview-share-picker
-hyprlock
 hyprpicker
 hyprsunset
 imagemagick
-impala
 imv
 inetutils
+inotify-tools
 inxi
-iwd
+networkmanager
 jq
 kdenlive
 kernel-modules-hook
@@ -76,11 +74,12 @@ libqalculate
 libreoffice-fresh
 llvm
 localsend
+lua51
 luarocks
-mako
 man-db
 mariadb-libs
 mise
+moonlight-qt
 mpv
 nautilus
 nautilus-python
@@ -93,32 +92,28 @@ nvim
 obs-studio
 obsidian
 omarchy-nvim
-omarchy-walker
+pacman-contrib
 pamixer
 pinta
-playerctl
 plocate
 plymouth
-polkit-gnome
 postgresql-libs
 power-profiles-daemon
 python-gobject
 python-poetry-core
 python-terminaltexteffects
+qemu-user-static-binfmt
 qt5-wayland
+quickshell
 ripgrep
 ruby
 rust
 satty
 sddm
-signal-desktop
 slurp
-spotify
 socat
 starship
 sushi
-swaybg
-swayosd
 system-config-printer
 tesseract
 tesseract-data-eng
@@ -127,26 +122,26 @@ tree-sitter-cli
 tmux
 tobi-try
 ttf-ia-writer
-ttf-jetbrains-mono-nerd
+ttf-jetbrains-mono-nerd-basic
 typora
 tzupdate
+udiskie
 ufw
 ufw-docker
 unzip
 usage
 uwsm
-waybar
 whois
 wireless-regdb
-wiremix
 wireplumber
 wl-clipboard
+wtype
 woff2-font-awesome
 xdg-desktop-portal-gtk
 xdg-desktop-portal-hyprland
 xdg-terminal-exec
-xmlstarlet
 xournalpp
 yaru-icon-theme
 yay
+yt-dlp
 zoxide
diff --git a/install/omarchy-other.packages b/install/omarchy-other.packages
index 56f7c555..e9df35d0 100644
--- a/install/omarchy-other.packages
+++ b/install/omarchy-other.packages
@@ -9,10 +9,8 @@ broadcom-wl
 btrfs-progs
 dkms
 egl-wayland
-git
 gst-plugin-pipewire
 gtk4-layer-shell
-jdk-openjdk
 libpulse
 intel-ipu7-camera
 intel-lpmd
@@ -71,3 +69,6 @@ linux-t2
 linux-t2-headers
 t2fanrd
 tiny-dfr
+
+# Framework 16
+qmk-hid
diff --git a/install/packaging/all.sh b/install/packaging/all.sh
deleted file mode 100644
index d1db1b91..00000000
--- a/install/packaging/all.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-run_logged $OMARCHY_INSTALL/packaging/base.sh
-run_logged $OMARCHY_INSTALL/packaging/fonts.sh
-run_logged $OMARCHY_INSTALL/packaging/nvim.sh
-run_logged $OMARCHY_INSTALL/packaging/icons.sh
-run_logged $OMARCHY_INSTALL/packaging/webapps.sh
-run_logged $OMARCHY_INSTALL/packaging/tuis.sh
-run_logged $OMARCHY_INSTALL/packaging/npx.sh
-run_logged $OMARCHY_INSTALL/packaging/asus-rog.sh
-run_logged $OMARCHY_INSTALL/packaging/framework16.sh
-run_logged $OMARCHY_INSTALL/packaging/dell-xps-touchpad-haptics.sh
-run_logged $OMARCHY_INSTALL/packaging/surface.sh
diff --git a/install/packaging/base.sh b/install/packaging/base.sh
deleted file mode 100644
index b76e8298..00000000
--- a/install/packaging/base.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Install all base packages
-mapfile -t packages < <(grep -v '^#' "$OMARCHY_INSTALL/omarchy-base.packages" | grep -v '^$')
-omarchy-pkg-add "${packages[@]}"
diff --git a/install/packaging/fonts.sh b/install/packaging/fonts.sh
deleted file mode 100644
index 8d5a35ec..00000000
--- a/install/packaging/fonts.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Omarchy logo in a font for Waybar use
-mkdir -p ~/.local/share/fonts
-cp ~/.local/share/omarchy/config/omarchy.ttf ~/.local/share/fonts/
-fc-cache
diff --git a/install/packaging/icons.sh b/install/packaging/icons.sh
deleted file mode 100644
index 3110afc9..00000000
--- a/install/packaging/icons.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copy all bundled icons to the applications/icons directory
-ICON_DIR="$HOME/.local/share/applications/icons"
-mkdir -p "$ICON_DIR"
-cp ~/.local/share/omarchy/applications/icons/*.png "$ICON_DIR/"
diff --git a/install/packaging/npx.sh b/install/packaging/npx.sh
deleted file mode 100644
index 172a37a2..00000000
--- a/install/packaging/npx.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-omarchy-npx-install @openai/codex codex
-omarchy-npx-install @google/gemini-cli gemini
-omarchy-npx-install @github/copilot copilot
-omarchy-npx-install opencode-ai opencode
-omarchy-npx-install playwright playwright-cli
-omarchy-npx-install @earendil-works/pi-coding-agent pi
-omarchy-npx-install @kitlangton/ghui ghui
diff --git a/install/packaging/nvim.sh b/install/packaging/nvim.sh
deleted file mode 100644
index e045d19e..00000000
--- a/install/packaging/nvim.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Includes lazyvim and the themes
-omarchy-nvim-setup
diff --git a/install/packaging/tuis.sh b/install/packaging/tuis.sh
deleted file mode 100644
index 273a5d70..00000000
--- a/install/packaging/tuis.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-ICON_DIR="$HOME/.local/share/applications/icons"
-
-omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float "$ICON_DIR/Disk Usage.png"
-omarchy-tui-install "Docker" "lazydocker" tile "$ICON_DIR/Docker.png"
diff --git a/install/packaging/webapps.sh b/install/packaging/webapps.sh
deleted file mode 100644
index 19bd0802..00000000
--- a/install/packaging/webapps.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-omarchy-webapp-install "HEY" https://app.hey.com HEY.png "omarchy-webapp-handler-hey %u" "x-scheme-handler/mailto"
-omarchy-webapp-install "Basecamp" https://launchpad.37signals.com Basecamp.png
-omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ WhatsApp.png
-omarchy-webapp-install "Google Photos" https://photos.google.com/ "Google Photos.png"
-omarchy-webapp-install "Google Contacts" https://contacts.google.com/ "Google Contacts.png"
-omarchy-webapp-install "Google Messages" https://messages.google.com/web/conversations "Google Messages.png"
-omarchy-webapp-install "Google Maps" https://maps.google.com "Google Maps.png"
-omarchy-webapp-install "ChatGPT" https://chatgpt.com/ ChatGPT.png
-omarchy-webapp-install "YouTube" https://youtube.com/ YouTube.png
-omarchy-webapp-install "GitHub" https://github.com/ GitHub.png
-omarchy-webapp-install "X" https://x.com/ X.png
-omarchy-webapp-install "Figma" https://figma.com/ Figma.png
-omarchy-webapp-install "Discord" https://discord.com/channels/@me Discord.png
-omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home Zoom.png "omarchy-webapp-handler-zoom %u" "x-scheme-handler/zoommtg;x-scheme-handler/zoomus"
-omarchy-webapp-install "Fizzy" https://app.fizzy.do/ Fizzy.png
diff --git a/install/post-install/all.sh b/install/post-install/all.sh
deleted file mode 100644
index bb5c0839..00000000
--- a/install/post-install/all.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-run_logged $OMARCHY_INSTALL/post-install/pacman.sh
-source $OMARCHY_INSTALL/post-install/allow-reboot.sh
-source $OMARCHY_INSTALL/post-install/finished.sh
diff --git a/install/post-install/allow-reboot.sh b/install/post-install/allow-reboot.sh
deleted file mode 100644
index a5e28d14..00000000
--- a/install/post-install/allow-reboot.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Allow passwordless reboot for the installer - removed in first-run
-sudo tee /etc/sudoers.d/99-omarchy-installer-reboot >/dev/null <<EOF
-$USER ALL=(ALL) NOPASSWD: /usr/bin/reboot
-EOF
-sudo chmod 440 /etc/sudoers.d/99-omarchy-installer-reboot
diff --git a/install/post-install/finished.sh b/install/post-install/finished.sh
deleted file mode 100644
index 5d1d9793..00000000
--- a/install/post-install/finished.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-stop_install_log
-
-echo_in_style() {
-  echo "$1" | tte --canvas-width 0 --anchor-text c --frame-rate 640 print
-}
-
-clear
-echo
-tte -i ~/.local/share/omarchy/logo.txt --canvas-width 0 --anchor-text c --frame-rate 920 laseretch
-echo
-
-# Display installation time if available
-if [[ -f $OMARCHY_INSTALL_LOG_FILE ]] && grep -q "Total:" "$OMARCHY_INSTALL_LOG_FILE" 2>/dev/null; then
-  echo
-  TOTAL_TIME=$(tail -n 20 "$OMARCHY_INSTALL_LOG_FILE" | grep "^Total:" | sed 's/^Total:[[:space:]]*//')
-  if [[ -n $TOTAL_TIME ]]; then
-    echo_in_style "Installed in $TOTAL_TIME"
-  fi
-else
-  echo_in_style "Finished installing"
-fi
-
-if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
-  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
-fi
-
-# Exit gracefully if user chooses not to reboot
-if gum confirm --padding "0 0 0 $((PADDING_LEFT + 32))" --show-help=false --default --affirmative "Reboot Now" --negative "" ""; then
-  # Clear screen to hide any shutdown messages
-  clear
-
-  if [[ -n ${OMARCHY_CHROOT_INSTALL:-} ]]; then
-    touch /var/tmp/omarchy-install-completed
-    exit 0
-  else
-    sudo reboot 2>/dev/null
-  fi
-fi
diff --git a/install/post-install/localdb.sh b/install/post-install/localdb.sh
new file mode 100644
index 00000000..635cf613
--- /dev/null
+++ b/install/post-install/localdb.sh
@@ -0,0 +1,4 @@
+# Update localdb so locate can find the installed system files immediately.
+if omarchy-cmd-present updatedb; then
+  updatedb
+fi
diff --git a/install/post-install/pacman.sh b/install/post-install/pacman.sh
index 9d5747bc..23580b3c 100644
--- a/install/post-install/pacman.sh
+++ b/install/post-install/pacman.sh
@@ -1,12 +1,13 @@
-# Configure pacman
-sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf /etc/pacman.conf
-sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-${OMARCHY_MIRROR:-stable} /etc/pacman.d/mirrorlist
+# Configure pacman after package installation completes. Offline target package
+# installs use the live ISO's offline pacman.conf until this final restore.
+cp -f "$OMARCHY_PATH/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf" /etc/pacman.conf
+cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-${OMARCHY_MIRROR:-stable}" /etc/pacman.d/mirrorlist
 
-if lspci -nn | grep -q "106b:180[12]"; then
-  cat <<EOF | sudo tee -a /etc/pacman.conf >/dev/null
-
-[arch-mact2]
-Server = https://github.com/NoaHimesaka1873/arch-mact2-mirror/releases/download/release
-SigLevel = Never
-EOF
+# omarchy-settings skips this override until cups-browsed is actually present
+# to avoid pacman creating cups-browsed.conf.pacnew during ISO package install.
+if [[ -f $OMARCHY_PATH/etc-overrides/cups-cups-browsed.conf && -d /etc/cups ]]; then
+  cp -f "$OMARCHY_PATH/etc-overrides/cups-cups-browsed.conf" /etc/cups/cups-browsed.conf
+  rm -f /etc/cups/cups-browsed.conf.pacnew
 fi
+
+source "$OMARCHY_INSTALL/hardware/pacman.sh"
diff --git a/install/post-install/system.sh b/install/post-install/system.sh
new file mode 100644
index 00000000..a143c60a
--- /dev/null
+++ b/install/post-install/system.sh
@@ -0,0 +1,3 @@
+run_logged "$OMARCHY_INSTALL/post-install/pacman.sh"
+run_logged "$OMARCHY_INSTALL/post-install/udev.sh"
+run_logged "$OMARCHY_INSTALL/post-install/localdb.sh"
diff --git a/install/post-install/udev.sh b/install/post-install/udev.sh
new file mode 100644
index 00000000..ffb0da18
--- /dev/null
+++ b/install/post-install/udev.sh
@@ -0,0 +1,3 @@
+# Apply package-owned udev rules for the live install session when possible.
+udevadm control --reload 2>/dev/null || true
+udevadm trigger --subsystem-match=power_supply 2>/dev/null || true
diff --git a/install/preflight/all.sh b/install/preflight/all.sh
deleted file mode 100644
index 88354659..00000000
--- a/install/preflight/all.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $OMARCHY_INSTALL/preflight/guard.sh
-source $OMARCHY_INSTALL/preflight/begin.sh
-run_logged $OMARCHY_INSTALL/preflight/show-env.sh
-run_logged $OMARCHY_INSTALL/preflight/pacman.sh
-run_logged $OMARCHY_INSTALL/preflight/migrations.sh
-run_logged $OMARCHY_INSTALL/preflight/first-run-mode.sh
-run_logged $OMARCHY_INSTALL/preflight/disable-mkinitcpio.sh
diff --git a/install/preflight/begin.sh b/install/preflight/begin.sh
deleted file mode 100644
index f83a7c38..00000000
--- a/install/preflight/begin.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-clear_logo
-gum style --foreground 3 --padding "1 0 0 $PADDING_LEFT" "Installing..."
-echo
-start_install_log
diff --git a/install/preflight/disable-mkinitcpio.sh b/install/preflight/disable-mkinitcpio.sh
deleted file mode 100644
index 731816e8..00000000
--- a/install/preflight/disable-mkinitcpio.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Temporarily disable mkinitcpio hooks to prevent multiple regenerations during package installation
-# This speeds up installation significantly
-
-echo "Temporarily disabling mkinitcpio hooks during installation..."
-
-# Move the specific mkinitcpio pacman hooks out of the way if they exist
-if [[ -f /usr/share/libalpm/hooks/90-mkinitcpio-install.hook ]]; then
-  sudo mv /usr/share/libalpm/hooks/90-mkinitcpio-install.hook /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled
-fi
-
-if [[ -f /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook ]]; then
-  sudo mv /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled
-fi
-
-echo "mkinitcpio hooks disabled"
-
diff --git a/install/preflight/first-run-mode.sh b/install/preflight/first-run-mode.sh
deleted file mode 100644
index 536058cc..00000000
--- a/install/preflight/first-run-mode.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Set first-run mode marker so we can install stuff post-installation
-mkdir -p ~/.local/state/omarchy
-touch ~/.local/state/omarchy/first-run.mode
-
-# Setup sudo-less access for first-run
-sudo tee /etc/sudoers.d/first-run >/dev/null <<EOF
-Cmnd_Alias FIRST_RUN_CLEANUP = /bin/rm -f /etc/sudoers.d/first-run
-Cmnd_Alias SYMLINK_RESOLVED = /usr/bin/ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
-$USER ALL=(ALL) NOPASSWD: /usr/bin/systemctl
-$USER ALL=(ALL) NOPASSWD: /usr/bin/ufw
-$USER ALL=(ALL) NOPASSWD: /usr/bin/ufw-docker
-$USER ALL=(ALL) NOPASSWD: /usr/bin/gtk-update-icon-cache
-$USER ALL=(ALL) NOPASSWD: SYMLINK_RESOLVED
-$USER ALL=(ALL) NOPASSWD: FIRST_RUN_CLEANUP
-EOF
-sudo chmod 440 /etc/sudoers.d/first-run
diff --git a/install/preflight/guard.sh b/install/preflight/guard.sh
deleted file mode 100644
index 782614fd..00000000
--- a/install/preflight/guard.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-abort() {
-  echo -e "\e[31mOmarchy install requires: $1\e[0m"
-  echo
-  gum confirm "Proceed anyway on your own accord and without assistance?" || exit 1
-}
-
-# Must be an Arch distro
-if [[ ! -f /etc/arch-release ]]; then
-  abort "Vanilla Arch"
-fi
-
-# Must not be an Arch derivative distro
-for marker in /etc/cachyos-release /etc/eos-release /etc/garuda-release /etc/manjaro-release; do
-  if [[ -f $marker ]]; then
-    abort "Vanilla Arch"
-  fi
-done
-
-# Must not be running as root
-if (( EUID == 0 )); then
-  abort "Running as root (not user)"
-fi
-
-# Must be x86 only to fully work
-if [[ $(uname -m) != "x86_64" ]]; then
-  abort "x86_64 CPU"
-fi
-
-# Must have secure boot disabled
-if bootctl status 2>/dev/null | grep -q 'Secure Boot: enabled'; then
-  abort "Secure Boot disabled"
-fi
-
-# Must not have Gnome or KDE already install
-if pacman -Qe gnome-shell &>/dev/null || pacman -Qe plasma-desktop &>/dev/null; then
-  abort "Fresh + Vanilla Arch"
-fi
-
-# Must have limine installed
-command -v limine &>/dev/null || abort "Limine bootloader"
-
-# Must have btrfs root filesystem
-[[ $(findmnt -n -o FSTYPE /) = "btrfs" ]] || abort "Btrfs root filesystem" 
-
-# Cleared all guards
-echo "Guards: OK"
diff --git a/install/preflight/migrations.sh b/install/preflight/migrations.sh
deleted file mode 100644
index 27819d13..00000000
--- a/install/preflight/migrations.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-OMARCHY_MIGRATIONS_STATE_PATH=~/.local/state/omarchy/migrations
-mkdir -p $OMARCHY_MIGRATIONS_STATE_PATH
-
-for file in ~/.local/share/omarchy/migrations/*.sh; do
-  touch "$OMARCHY_MIGRATIONS_STATE_PATH/$(basename "$file")"
-done
diff --git a/install/preflight/pacman.sh b/install/preflight/pacman.sh
deleted file mode 100644
index c37d828d..00000000
--- a/install/preflight/pacman.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
-  # Install build tools
-  omarchy-pkg-add base-devel
-
-  # Configure pacman
-  sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf /etc/pacman.conf
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-${OMARCHY_MIRROR:-stable} /etc/pacman.d/mirrorlist
-
-  sudo pacman-key --recv-keys 40DFB630FF42BCFFB047046CF0134EE680CAC571 --keyserver keys.openpgp.org
-  sudo pacman-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571
-
-  sudo pacman -Sy
-  omarchy-pkg-add omarchy-keyring
-
-  # Refresh all repos
-  sudo pacman -Syyuu --noconfirm
-fi
diff --git a/install/preflight/show-env.sh b/install/preflight/show-env.sh
deleted file mode 100644
index 1a9319d6..00000000
--- a/install/preflight/show-env.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Show installation environment variables
-gum log --level info "Installation Environment:"
-
-env | grep -E "^(OMARCHY_CHROOT_INSTALL|OMARCHY_ONLINE_INSTALL|OMARCHY_USER_NAME|OMARCHY_USER_EMAIL|USER|HOME|OMARCHY_REPO|OMARCHY_REF|OMARCHY_PATH)=" | sort | while IFS= read -r var; do
-  gum log --level info "  $var"
-done
diff --git a/install/user/all.sh b/install/user/all.sh
new file mode 100644
index 00000000..5140bca2
--- /dev/null
+++ b/install/user/all.sh
@@ -0,0 +1,11 @@
+run_logged "$OMARCHY_INSTALL/user/theme.sh"
+run_logged "$OMARCHY_INSTALL/user/git.sh"
+run_logged "$OMARCHY_INSTALL/user/xcompose.sh"
+run_logged "$OMARCHY_INSTALL/user/mise-work.sh"
+
+run_logged "$OMARCHY_INSTALL/user/hardware/asus/fix-audio-mixer.sh"
+run_logged "$OMARCHY_INSTALL/user/hardware/asus/fix-mic.sh"
+run_logged "$OMARCHY_INSTALL/user/hardware/framework/fix-f13-amd-audio-input.sh"
+
+run_logged "$OMARCHY_INSTALL/user/default-keyring.sh"
+run_logged "$OMARCHY_INSTALL/user/mise.sh"
diff --git a/install/login/default-keyring.sh b/install/user/default-keyring.sh
similarity index 72%
rename from install/login/default-keyring.sh
rename to install/user/default-keyring.sh
index 459a0cb4..63f70798 100644
--- a/install/login/default-keyring.sh
+++ b/install/user/default-keyring.sh
@@ -4,7 +4,8 @@ DEFAULT_FILE="$KEYRING_DIR/default"
 
 mkdir -p "$KEYRING_DIR"
 
-cat << EOF > "$KEYRING_FILE"
+if [[ ! -f $KEYRING_FILE ]]; then
+  cat > "$KEYRING_FILE" <<EOF
 [keyring]
 display-name=Default keyring
 ctime=$(date +%s)
@@ -12,10 +13,13 @@ mtime=0
 lock-on-idle=false
 lock-after=false
 EOF
+fi
 
-cat << EOF > "$DEFAULT_FILE"
+if [[ ! -f $DEFAULT_FILE ]]; then
+  cat > "$DEFAULT_FILE" <<EOF
 Default_keyring
 EOF
+fi
 
 chmod 700 "$KEYRING_DIR"
 chmod 600 "$KEYRING_FILE"
diff --git a/install/user/first-run/enable-user-units.sh b/install/user/first-run/enable-user-units.sh
new file mode 100755
index 00000000..b620df12
--- /dev/null
+++ b/install/user/first-run/enable-user-units.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Enable AND start the user systemd units we ship. Runs at first-run rather
+# than at finalize-user time because the user manager isn't live during the
+# ISO chroot — by first-run, the Hyprland/uwsm session is up and
+# `systemctl --user enable --now` both writes the correct .wants symlinks
+# (based on each unit's [Install]/WantedBy) and starts the services so the
+# first session has bluetooth pairing, sleep lock, etc. live immediately
+# instead of waiting for the next login. ConditionPath* in the unit files
+# keep the enabled units inert on hardware they don't apply to.
+
+set -euo pipefail
+
+systemctl --user daemon-reload
+systemctl --user enable --now \
+  bt-agent.service \
+  omarchy-recover-internal-monitor.service \
+  omarchy-sleep-lock.service \
+  omarchy-update-user-notify.path
diff --git a/install/first-run/gnome-theme.sh b/install/user/first-run/gnome-theme.sh
similarity index 80%
rename from install/first-run/gnome-theme.sh
rename to install/user/first-run/gnome-theme.sh
index 29363126..52082d59 100644
--- a/install/first-run/gnome-theme.sh
+++ b/install/user/first-run/gnome-theme.sh
@@ -1,5 +1,3 @@
 gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
 gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
 gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
-
-sudo gtk-update-icon-cache /usr/share/icons/Yaru
diff --git a/install/first-run/gtk-primary-paste.sh b/install/user/first-run/gtk-primary-paste.sh
similarity index 100%
rename from install/first-run/gtk-primary-paste.sh
rename to install/user/first-run/gtk-primary-paste.sh
diff --git a/install/user/first-run/install-voxtype.hook b/install/user/first-run/install-voxtype.hook
new file mode 100644
index 00000000..07f1882a
--- /dev/null
+++ b/install/user/first-run/install-voxtype.hook
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+(
+  if [[ -n $(omarchy-notification-send -u critical -g  "Install Dictation with Voxtype" "Click to install voice dictation for Omarchy." -a) ]]; then
+    omarchy-launch-floating-terminal-with-presentation omarchy-voxtype-install
+  fi
+) >/dev/null 2>&1 &
+
+# Remove this hook after scheduling the background notification action.
+rm -f "$0"
diff --git a/install/user/first-run/welcome.sh b/install/user/first-run/welcome.sh
new file mode 100644
index 00000000..0ff2ec31
--- /dev/null
+++ b/install/user/first-run/welcome.sh
@@ -0,0 +1,5 @@
+(
+  if [[ -n $(omarchy-notification-send -u critical -g  "Learn Keybindings" "Super + K for cheatsheet.\nSuper + Space for application launcher.\nSuper + Alt + Space for Omarchy Menu." -a) ]]; then
+    omarchy-menu-keybindings
+  fi
+) >/dev/null 2>&1 &
diff --git a/install/user/first-run/wifi.sh b/install/user/first-run/wifi.sh
new file mode 100644
index 00000000..2dc12c9e
--- /dev/null
+++ b/install/user/first-run/wifi.sh
@@ -0,0 +1,22 @@
+notify_update() {
+  (
+    if [[ -n $(omarchy-notification-send -u critical -g  "Update System" "$1" -a) ]]; then
+      omarchy-launch-floating-terminal-with-presentation omarchy-update
+    fi
+  ) >/dev/null 2>&1 &
+}
+
+notify_wifi() {
+  (
+    if [[ -n $(omarchy-notification-send -u critical -g 󰖩 "Click to Setup Wi-Fi" -a) ]]; then
+      omarchy-shell omarchy.network toggle
+    fi
+  ) >/dev/null 2>&1 &
+}
+
+if ! ping -c3 -W1 1.1.1.1 >/dev/null 2>&1; then
+  notify_update "When you have internet, click to update the system."
+  notify_wifi
+else
+  notify_update "Click to update the system."
+fi
diff --git a/install/config/git.sh b/install/user/git.sh
similarity index 100%
rename from install/config/git.sh
rename to install/user/git.sh
diff --git a/install/config/hardware/asus/fix-audio-mixer.sh b/install/user/hardware/asus/fix-audio-mixer.sh
similarity index 78%
rename from install/config/hardware/asus/fix-audio-mixer.sh
rename to install/user/hardware/asus/fix-audio-mixer.sh
index 7380721f..dd30c496 100644
--- a/install/config/hardware/asus/fix-audio-mixer.sh
+++ b/install/user/hardware/asus/fix-audio-mixer.sh
@@ -2,7 +2,7 @@
 
 if omarchy-hw-asus-rog; then
   mkdir -p ~/.config/wireplumber/wireplumber.conf.d/
-  cp $OMARCHY_PATH/default/wireplumber/wireplumber.conf.d/alsa-soft-mixer.conf ~/.config/wireplumber/wireplumber.conf.d/
+  cp "$OMARCHY_PATH/default/wireplumber/wireplumber.conf.d/alsa-soft-mixer.conf" ~/.config/wireplumber/wireplumber.conf.d/
   rm -rf ~/.local/state/wireplumber/default-routes
 
   # Unmute the Master control on the ALC285 card (often muted by default)
diff --git a/install/config/hardware/asus/fix-mic.sh b/install/user/hardware/asus/fix-mic.sh
similarity index 100%
rename from install/config/hardware/asus/fix-mic.sh
rename to install/user/hardware/asus/fix-mic.sh
diff --git a/install/config/hardware/framework/fix-f13-amd-audio-input.sh b/install/user/hardware/framework/fix-f13-amd-audio-input.sh
similarity index 100%
rename from install/config/hardware/framework/fix-f13-amd-audio-input.sh
rename to install/user/hardware/framework/fix-f13-amd-audio-input.sh
diff --git a/install/config/mise-work.sh b/install/user/mise-work.sh
similarity index 68%
rename from install/config/mise-work.sh
rename to install/user/mise-work.sh
index e919dee9..d7799f50 100644
--- a/install/config/mise-work.sh
+++ b/install/user/mise-work.sh
@@ -2,7 +2,6 @@
 mkdir -p "$HOME/Work"
 mkdir -p "$HOME/Work/tries"
 
-# Add ./bin to path for all items in ~/Work
 cat >"$HOME/Work/.mise.toml" <<'EOF'
 [env]
 _.path = "{{ cwd }}/bin"
@@ -10,17 +9,18 @@ EOF
 
 mise trust ~/Work/.mise.toml
 
-if [[ -n ${OMARCHY_CHROOT_INSTALL:-} ]]; then
+if [[ ${OMARCHY_SETUP_CONTEXT:-runtime} == "iso-chroot" ]]; then
   NODE_TARBALL=$(find /opt/packages -name "node-v*-linux-x64.tar.gz" -type f 2>/dev/null | head -n1)
+  if [[ -z $NODE_TARBALL ]]; then
+    echo "Error: bundled Node.js tarball missing from /opt/packages" >&2
+    exit 1
+  fi
 
   NODE_VERSION=$(basename "$NODE_TARBALL" | sed 's/node-v\(.*\)-linux-x64.tar.gz/\1/')
   NODE_INSTALL_DIR="$HOME/.local/share/mise/installs/node/$NODE_VERSION"
 
   mkdir -p "$NODE_INSTALL_DIR"
-  tar -xzf "$NODE_TARBALL" \
-      --strip-components=1 \
-      -C "$NODE_INSTALL_DIR"
-
+  tar -xzf "$NODE_TARBALL" --strip-components=1 -C "$NODE_INSTALL_DIR"
   mise use -g node@"$NODE_VERSION"
 else
   mise use -g node@latest
diff --git a/install/user/mise.sh b/install/user/mise.sh
new file mode 100644
index 00000000..9cab335f
--- /dev/null
+++ b/install/user/mise.sh
@@ -0,0 +1,10 @@
+omarchy-mise-install codex
+omarchy-mise-install claude
+omarchy-mise-install gemini
+omarchy-mise-install gh
+omarchy-mise-install copilot
+omarchy-mise-install opencode
+omarchy-mise-install npm:playwright playwright
+omarchy-mise-install pi
+omarchy-mise-install npm:@kitlangton/ghui ghui
+omarchy-mise-install aqua:modem-dev/hunk hunk
diff --git a/install/user/theme.sh b/install/user/theme.sh
new file mode 100644
index 00000000..c29ab29f
--- /dev/null
+++ b/install/user/theme.sh
@@ -0,0 +1,14 @@
+# Setup user theme folder
+mkdir -p ~/.config/omarchy/themes
+
+if [[ ${OMARCHY_SETUP_CONTEXT:-runtime} == "iso-chroot" ]]; then
+  OMARCHY_THEME_HEADLESS=1 omarchy-theme-set "Tokyo Night"
+else
+  omarchy-theme-set "Tokyo Night"
+fi
+
+rm -rf ~/.config/chromium/SingletonLock
+omarchy-theme-set-pi --activate
+
+mkdir -p ~/.config/btop/themes
+ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme
diff --git a/install/config/xcompose.sh b/install/user/xcompose.sh
similarity index 84%
rename from install/config/xcompose.sh
rename to install/user/xcompose.sh
index 9534abb6..17866bd1 100644
--- a/install/config/xcompose.sh
+++ b/install/user/xcompose.sh
@@ -3,7 +3,7 @@ tee ~/.XCompose >/dev/null <<EOF
 # Run omarchy-restart-xcompose to apply changes
 
 # Include fast emoji access
-include "%H/.local/share/omarchy/default/xcompose"
+include "/usr/share/omarchy/default/xcompose"
 
 # Identification
 <Multi_key> <space> <n> : "$OMARCHY_USER_NAME"
diff --git a/migrations/1751134560.sh b/migrations/1751134560.sh
deleted file mode 100644
index a5761181..00000000
--- a/migrations/1751134560.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-echo "Add UWSM env"
-
-export OMARCHY_PATH="$HOME/.local/share/omarchy"
-export PATH="$OMARCHY_PATH/bin:$PATH"
-
-mkdir -p "$HOME/.config/uwsm/"
-cat <<EOF | tee "$HOME/.config/uwsm/env"
-export OMARCHY_PATH=$HOME/.local/share/omarchy
-export PATH=$OMARCHY_PATH/bin/:$PATH
-EOF
-
-# Ensure we have the latest repos and are ready to pull
-omarchy-update-keyring
-omarchy-refresh-pacman
-sudo systemctl restart systemd-timesyncd
-sudo pacman -Sy # Normally not advisable, but we'll do a full -Syu before finishing
-
-mkdir -p ~/.local/state/omarchy/migrations
-touch ~/.local/state/omarchy/migrations/1751134560.sh
-
-# Remove old AUR packages to prevent a super lengthy build on old Omarchy installs
-omarchy-pkg-drop zoom qt5-remoteobjects wf-recorder wl-screenrec
-
-# Get rid of old AUR packages
-bash $OMARCHY_PATH/migrations/1756060611.sh
-touch ~/.local/state/omarchy/migrations/1756060611.sh
-
-bash omarchy-update-perform
diff --git a/migrations/1751134562.sh b/migrations/1751134562.sh
deleted file mode 100644
index 4f81f615..00000000
--- a/migrations/1751134562.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Ensure all indexes and packages are up to date"
-
-omarchy-update-keyring
-omarchy-refresh-pacman
-sudo pacman -Syu --noconfirm
diff --git a/migrations/1751134563.sh b/migrations/1751134563.sh
deleted file mode 100644
index 19a168f9..00000000
--- a/migrations/1751134563.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Remove obsolete gcc14 AUR package that takes eons to update"
-
-omarchy-pkg-drop gcc14
diff --git a/migrations/1751134564.sh b/migrations/1751134564.sh
deleted file mode 100644
index c61b2a08..00000000
--- a/migrations/1751134564.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Ensure the Arch keyring is up to date"
-
-omarchy-update-keyring
diff --git a/migrations/1751134568.sh b/migrations/1751134568.sh
deleted file mode 100644
index 99cd600f..00000000
--- a/migrations/1751134568.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Turn on bluetooth service so blueberry or bluetui works out the box
-echo "Let's turn on Bluetooth service so the controls work"
-if systemctl is-enabled --quiet bluetooth.service && systemctl is-active --quiet bluetooth.service; then
-  # Bluetooth is already enabled, nothing to change
-  :
-else
-  sudo systemctl enable --now bluetooth.service
-fi
diff --git a/migrations/1751135253.sh b/migrations/1751135253.sh
deleted file mode 100644
index c0766574..00000000
--- a/migrations/1751135253.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add missing installation of bat (used by the ff alias)"
-
-omarchy-pkg-add bat
diff --git a/migrations/1751510848.sh b/migrations/1751510848.sh
deleted file mode 100644
index 6b289d41..00000000
--- a/migrations/1751510848.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Installing missing fd terminal tool for finding files"
-
-omarchy-pkg-add fd
diff --git a/migrations/1751667620.sh b/migrations/1751667620.sh
deleted file mode 100644
index d93c6008..00000000
--- a/migrations/1751667620.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-echo "Switching from vlc to mpv for the default video player"
-if omarchy-cmd-missing mpv; then
-  omarchy-pkg-drop vlc
-  rm ~/.local/share/applications/vlc.desktop
-
-  omarchy-pkg-add mpv
-  xdg-mime default mpv.desktop video/mp4
-  xdg-mime default mpv.desktop video/x-msvideo
-  xdg-mime default mpv.desktop video/x-matroska
-  xdg-mime default mpv.desktop video/x-flv
-  xdg-mime default mpv.desktop video/x-ms-wmv
-  xdg-mime default mpv.desktop video/mpeg
-  xdg-mime default mpv.desktop video/ogg
-  xdg-mime default mpv.desktop video/webm
-  xdg-mime default mpv.desktop video/quicktime
-  xdg-mime default mpv.desktop video/3gpp
-  xdg-mime default mpv.desktop video/3gpp2
-  xdg-mime default mpv.desktop video/x-ms-asf
-  xdg-mime default mpv.desktop video/x-ogm+ogg
-  xdg-mime default mpv.desktop video/x-theora+ogg
-  xdg-mime default mpv.desktop application/ogg
-fi
diff --git a/migrations/1751669258.sh b/migrations/1751669258.sh
deleted file mode 100644
index fc83f3a7..00000000
--- a/migrations/1751669258.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Ensure Docker config is set"
-if [[ ! -f /etc/docker/daemon.json ]]; then
-  sudo mkdir -p /etc/docker
-  echo '{"log-driver":"json-file","log-opts":{"max-size":"10m","max-file":"5"}}' | sudo tee /etc/docker/daemon.json
-fi
diff --git a/migrations/1751672984.sh b/migrations/1751672984.sh
deleted file mode 100644
index f48834bb..00000000
--- a/migrations/1751672984.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Add LocalSend as new default application"
-
-omarchy-pkg-drop localsend-bin
-omarchy-pkg-add localsend
diff --git a/migrations/1751679069.sh b/migrations/1751679069.sh
deleted file mode 100644
index abe68a4a..00000000
--- a/migrations/1751679069.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install ffmpegthumbnailer for video thumbnails in the file manager"
-
-omarchy-pkg-add ffmpegthumbnailer
diff --git a/migrations/1751821819.sh b/migrations/1751821819.sh
deleted file mode 100644
index dc282c2e..00000000
--- a/migrations/1751821819.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install bash-completion"
-
-omarchy-pkg-add bash-completion
diff --git a/migrations/1751887718.sh b/migrations/1751887718.sh
deleted file mode 100644
index 3d3f401b..00000000
--- a/migrations/1751887718.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Install Impala as new wifi selection TUI"
-
-if omarchy-cmd-missing impala; then
-  omarchy-pkg-add impala
-  omarchy-refresh-waybar
-fi
diff --git a/migrations/1752081088.sh b/migrations/1752081088.sh
deleted file mode 100644
index 727988fe..00000000
--- a/migrations/1752081088.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Permanently fix F-keys on Apple-mode keyboards (like Lofree Flow84)"
-
-source $OMARCHY_PATH/install/config/hardware/fix-fkeys.sh
diff --git a/migrations/1752082381.sh b/migrations/1752082381.sh
deleted file mode 100644
index e351fd9c..00000000
--- a/migrations/1752082381.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Adding gnome-keyring to make 1password work with 2FA codes"
-
-omarchy-pkg-add gnome-keyring
diff --git a/migrations/1752091783.sh b/migrations/1752091783.sh
deleted file mode 100644
index b8b53061..00000000
--- a/migrations/1752091783.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Install Plymouth splash screen"
-
-omarchy-pkg-add uwsm plymouth
-source "$OMARCHY_PATH/install/login/plymouth.sh"
diff --git a/migrations/1752104271.sh b/migrations/1752104271.sh
deleted file mode 100644
index dcbda813..00000000
--- a/migrations/1752104271.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Switching to polkit-gnome for better fingerprint authentication compatibility"
-
-if ! command -v /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &>/dev/null; then
-  sudo pacman -S --noconfirm --needed polkit-gnome
-  systemctl --user stop hyprpolkitagent
-  systemctl --user disable hyprpolkitagent
-  sudo pacman -Rns --noconfirm hyprpolkitagent
-  setsid /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
-fi
diff --git a/migrations/1752168292.sh b/migrations/1752168292.sh
deleted file mode 100644
index 0f529134..00000000
--- a/migrations/1752168292.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Enable battery low notifications for laptops"
-
-if ls /sys/class/power_supply/BAT* &>/dev/null && [[ ! -f ~/.local/share/omarchy/config/systemd/user/omarchy-battery-monitor.service ]]; then
-  mkdir -p ~/.config/systemd/user
-
-  cp ~/.local/share/omarchy/config/systemd/user/omarchy-battery-monitor.* ~/.config/systemd/user/
-
-  systemctl --user daemon-reload
-  systemctl --user enable --now omarchy-battery-monitor.timer || true
-fi
diff --git a/migrations/1752188554.sh b/migrations/1752188554.sh
deleted file mode 100644
index 13c5d54c..00000000
--- a/migrations/1752188554.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Update chromium.desktop to ensure we are always using wayland"
-
-xdg-settings set default-web-browser chromium.desktop
-xdg-mime default chromium.desktop x-scheme-handler/http
-xdg-mime default chromium.desktop x-scheme-handler/https
diff --git a/migrations/1752292967.sh b/migrations/1752292967.sh
deleted file mode 100644
index c1b8fa2b..00000000
--- a/migrations/1752292967.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-echo "Update to use UWSM and seamless login"
-
-if omarchy-cmd-missing uwsm; then
-  sudo rm -f /etc/systemd/system/getty@tty1.service.d/override.conf
-  sudo rmdir /etc/systemd/system/getty@tty1.service.d/ 2>/dev/null || true
-
-  if [[ -f $HOME/.bash_profile ]]; then
-    # Remove the specific line
-    sed -i '/^\[\[ -z \$DISPLAY && \$(tty) == \/dev\/tty1 \]\] && exec Hyprland$/d' "$HOME/.bash_profile"
-    echo "Cleaned up .bash_profile"
-  fi
-
-  if [[ -f $HOME/.config/environment.d/fcitx.conf ]]; then
-    echo "Removing GTK_IM_MODULE from fcitx config for Wayland..."
-    sed -i 's/^GTK_IM_MODULE=fcitx$//' "$HOME/.config/environment.d/fcitx.conf"
-  fi
-
-  source $OMARCHY_PATH/install/login/plymouth.sh
-fi
diff --git a/migrations/1752535084.sh b/migrations/1752535084.sh
deleted file mode 100644
index 092c429d..00000000
--- a/migrations/1752535084.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Set a default fontconfig"
-
-if [[ ! -f $HOME/.config/fontconfig/fonts.conf ]]; then
-  mkdir -p ~/.config/fontconfig
-  cp ~/.local/share/omarchy/config/fontconfig/fonts.conf ~/.config/fontconfig/
-  fc-cache -fv
-fi
diff --git a/migrations/1752535341.sh b/migrations/1752535341.sh
deleted file mode 100644
index 9ac311ea..00000000
--- a/migrations/1752535341.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Setting up GPG configuration with multiple keyservers for better reliability"
-
-if [[ ! -f /etc/gnupg/dirmngr.conf ]]; then
-  sudo mkdir -p /etc/gnupg
-  sudo cp ~/.local/share/omarchy/default/gpg/dirmngr.conf /etc/gnupg/
-  sudo chmod 644 /etc/gnupg/dirmngr.conf
-  sudo gpgconf --kill dirmngr || true
-  sudo gpgconf --launch dirmngr || true
-fi
diff --git a/migrations/1752543801.sh b/migrations/1752543801.sh
deleted file mode 100644
index 7c068add..00000000
--- a/migrations/1752543801.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Add color and animation to pacman installs"
-
-grep -q '^Color' /etc/pacman.conf || sudo sed -i '/^\[options\]/a Color' /etc/pacman.conf
-grep -q '^ILoveCandy' /etc/pacman.conf || sudo sed -i '/^\[options\]/a ILoveCandy' /etc/pacman.conf
diff --git a/migrations/1752643269.sh b/migrations/1752643269.sh
deleted file mode 100644
index 47d2cf79..00000000
--- a/migrations/1752643269.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add new matte black theme"
-
-if [[ ! -L $HOME/.config/omarchy/themes/matte-black ]]; then
-  ln -snf ~/.local/share/omarchy/themes/matte-black ~/.config/omarchy/themes/
-fi
diff --git a/migrations/1752678932.sh b/migrations/1752678932.sh
deleted file mode 100644
index 915a74d5..00000000
--- a/migrations/1752678932.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install missing docker-buildx package for out-of-the-box Kamal compatibility"
-
-omarchy-pkg-add docker-buildx
diff --git a/migrations/1752725616.sh b/migrations/1752725616.sh
deleted file mode 100644
index 5afc394b..00000000
--- a/migrations/1752725616.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-echo "Make light themes possible"
-
-if [[ -f ~/.local/share/applications/blueberry.desktop ]]; then
-  rm -f ~/.local/share/applications/blueberry.desktop
-  rm -f ~/.local/share/applications/org.pulseaudio.pavucontrol.desktop
-  update-desktop-database ~/.local/share/applications/
-
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
-
-  omarchy-refresh-waybar
-fi
-
-if [[ ! -L $HOME/.config/omarchy/themes/rose-pine ]]; then
-  ln -snf ~/.local/share/omarchy/themes/rose-pine ~/.config/omarchy/themes/
-fi
diff --git a/migrations/1752793122.sh b/migrations/1752793122.sh
deleted file mode 100644
index 9429d92b..00000000
--- a/migrations/1752793122.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Rename waybar config file for syntax highlighting"
-
-if [[ -f ~/.config/waybar/config ]]; then
-  mv ~/.config/waybar/config ~/.config/waybar/config.jsonc
-fi
diff --git a/migrations/1752797704.sh b/migrations/1752797704.sh
deleted file mode 100644
index b59111fa..00000000
--- a/migrations/1752797704.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-echo "Prevent docker from requiring network readiness on boot"
-
-if [[ ! -f /etc/systemd/system/docker.service.d/no-block-boot.conf ]]; then
-  sudo mkdir -p /etc/systemd/system/docker.service.d/
-  sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
-[Unit]
-DefaultDependencies=no
-EOF
-
-  sudo mkdir -p /etc/systemd/system/plymouth-quit.service.d/
-  sudo tee /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf <<'EOF'
-[Unit]
-After=multi-user.target
-EOF
-
-  sudo systemctl daemon-reload
-  sudo systemctl mask plymouth-quit-wait.service
-fi
diff --git a/migrations/1752874371.sh b/migrations/1752874371.sh
deleted file mode 100644
index 20cd3ad1..00000000
--- a/migrations/1752874371.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add Catppuccin Latte light theme"
-
-if [[ ! -L $HOME/.config/omarchy/themes/catppuccin-latte ]]; then
-  ln -snf ~/.local/share/omarchy/themes/catppuccin-latte ~/.config/omarchy/themes/
-fi
diff --git a/migrations/1752896442.sh b/migrations/1752896442.sh
deleted file mode 100644
index f8fa9a8c..00000000
--- a/migrations/1752896442.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Replace volume control GUI with a TUI"
-
-if omarchy-cmd-missing wiremix; then
-  omarchy-pkg-add wiremix
-  omarchy-pkg-drop pavucontrol
-  omarchy-refresh-applications
-  omarchy-refresh-waybar
-fi
diff --git a/migrations/1752897642.sh b/migrations/1752897642.sh
deleted file mode 100644
index 1b4b1f81..00000000
--- a/migrations/1752897642.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Remove needless fcitx5-configtool package"
-
-omarchy-pkg-drop fcitx5-configtool
diff --git a/migrations/1752955912.sh b/migrations/1752955912.sh
deleted file mode 100644
index fa55477c..00000000
--- a/migrations/1752955912.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install satty for the new screenshot flow"
-
-omarchy-pkg-add satty
diff --git a/migrations/1752981883.sh b/migrations/1752981883.sh
deleted file mode 100644
index 34a53950..00000000
--- a/migrations/1752981883.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Replace wofi with walker as the default launcher"
-
-if omarchy-cmd-missing walker; then
-  omarchy-pkg-add walker-bin libqalculate
-
-  omarchy-pkg-drop wofi
-  rm -rf ~/.config/wofi
-
-  mkdir -p ~/.config/walker
-  cp -r ~/.local/share/omarchy/config/walker/* ~/.config/walker/
-fi
diff --git a/migrations/1753138691.sh b/migrations/1753138691.sh
deleted file mode 100644
index ef55a91f..00000000
--- a/migrations/1753138691.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Install swayOSD to show volume status"
-
-if omarchy-cmd-missing swayosd-server; then
-  omarchy-pkg-add swayosd
-  setsid uwsm-app -- swayosd-server &>/dev/null &
-fi
diff --git a/migrations/1753224615.sh b/migrations/1753224615.sh
deleted file mode 100644
index 6f9dcfb5..00000000
--- a/migrations/1753224615.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Adding SwayOSD theming"
-
-if [[ ! -d ~/.config/swayosd ]]; then
-  mkdir -p ~/.config/swayosd
-  cp -r ~/.local/share/omarchy/config/swayosd/* ~/.config/swayosd/
-
-  pkill swayosd-server
-  setsid uwsm-app -- swayosd-server &>/dev/null &
-fi
diff --git a/migrations/1753495989.sh b/migrations/1753495989.sh
deleted file mode 100644
index 119b4324..00000000
--- a/migrations/1753495989.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Allow updating of timezone by right-clicking on the clock (or running omarchy-cmd-tzupdate)"
-
-if omarchy-cmd-missing tzupdate; then
-  bash "$OMARCHY_PATH/install/config/timezones.sh"
-  omarchy-refresh-waybar
-fi
diff --git a/migrations/1753689791.sh b/migrations/1753689791.sh
deleted file mode 100644
index d7c3145c..00000000
--- a/migrations/1753689791.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add the new ristretto theme as an option"
-
-if [[ ! -L ~/.config/omarchy/themes/ristretto ]]; then
-  ln -nfs ~/.local/share/omarchy/themes/ristretto ~/.config/omarchy/themes/
-fi
diff --git a/migrations/1753908454.sh b/migrations/1753908454.sh
deleted file mode 100644
index 8b603247..00000000
--- a/migrations/1753908454.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-echo "Migrate from manually downloaded fonts to font packages"
-if ! pacman -Q ttf-cascadia-mono-nerd &>/dev/null; then
-  sudo pacman -S --noconfirm ttf-cascadia-mono-nerd
-  rm -rf ~/.local/share/fonts/Caskaydia*
-  fc-cache
-fi
-
-if ! pacman -Q ttf-ia-writer &>/dev/null; then
-  sudo pacman -S --noconfirm ttf-ia-writer
-  rm -rf ~/.local/share/fonts/iAWriterMonoS*
-  fc-cache
-fi
diff --git a/migrations/1754047941.sh b/migrations/1754047941.sh
deleted file mode 100644
index 2e51f3ee..00000000
--- a/migrations/1754047941.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Add icon theme coloring"
-
-if ! pacman -Q yaru-icon-theme &>/dev/null; then
-  sudo pacman -S --noconfirm yaru-icon-theme
-
-  if [[ -f ~/.config/omarchy/current/theme/icons.theme ]]; then
-    gsettings set org.gnome.desktop.interface icon-theme "$(<~/.config/omarchy/current/theme/icons.theme)"
-  fi
-fi
diff --git a/migrations/1754109724.sh b/migrations/1754109724.sh
deleted file mode 100644
index dc39bbd3..00000000
--- a/migrations/1754109724.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Add hyprsunset blue light filter"
-if ! command -v hyprsunset &>/dev/null; then
-  sudo pacman -S --noconfirm --needed hyprsunset
-fi
-
-omarchy-refresh-hyprsunset
diff --git a/migrations/1754215533.sh b/migrations/1754215533.sh
deleted file mode 100644
index 2657b623..00000000
--- a/migrations/1754215533.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-echo "Enable auto-discovery of network printers"
-
-if [[ ! -f /etc/systemd/resolved.conf.d/10-disable-multicast.conf ]]; then
-  omarchy-pkg-add avahi nss-mdns
-
-  # Disable multicast dns in resolved. Avahi will provide this for better network printer discovery
-  sudo mkdir -p /etc/systemd/resolved.conf.d
-  echo "[Resolve]\nMulticastDNS=no" | sudo tee /etc/systemd/resolved.conf.d/10-disable-multicast.conf
-  sudo systemctl enable --now avahi-daemon.service
-fi
-
-if ! grep -q '^CreateRemotePrinters Yes' /etc/cups/cups-browsed.conf; then
-  omarchy-pkg-add cups-browsed
-  # Enable automatically adding remote printers
-  echo 'CreateRemotePrinters Yes' | sudo tee -a /etc/cups/cups-browsed.conf
-  sudo systemctl enable --now cups-browsed.service
-fi
diff --git a/migrations/1754221967.sh b/migrations/1754221967.sh
deleted file mode 100644
index b1e42b7a..00000000
--- a/migrations/1754221967.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add support for accessing Android phone data via file manager"
-
-omarchy-pkg-add gvfs-mtp
diff --git a/migrations/1754228071.sh b/migrations/1754228071.sh
deleted file mode 100644
index e7b69b11..00000000
--- a/migrations/1754228071.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add auto-update icon to waybar when update available"
-
-if ! grep -q "custom/update" ~/.config/waybar/config.jsonc; then
-  omarchy-refresh-waybar
-fi
diff --git a/migrations/1754331529.sh b/migrations/1754331529.sh
deleted file mode 100644
index ae92aae4..00000000
--- a/migrations/1754331529.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Update Waybar for new Omarchy menu"
-
-if ! grep -q "" ~/.config/waybar/config.jsonc; then
-  omarchy-refresh-waybar
-fi
diff --git a/migrations/1754332200.sh b/migrations/1754332200.sh
deleted file mode 100644
index 4e92daa4..00000000
--- a/migrations/1754332200.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Remove old Omarchy TUI app now that we have the Omarchy Menu"
-
-rm -f ~/.local/share/applications/omarchy.desktop
diff --git a/migrations/1754389057.sh b/migrations/1754389057.sh
deleted file mode 100644
index cd591fc1..00000000
--- a/migrations/1754389057.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Offer to reorganize hyprland.conf as per new defaults"
-
-if [[ ! -f ~/.config/hypr/autostarts.conf ]]; then
-  echo -e "\nOmarchy now splits default .config/hypr/hyprland.conf into sub-configs."
-  echo -e "Resetting to defaults will overwrite your configuration, but save it as .bak.\n"
-  if gum confirm "Use new default hyprland.conf config?"; then
-    omarchy-refresh-hyprland || true
-  else
-    echo "Left your existing configuration in place!"
-  fi
-fi
diff --git a/migrations/1754390772.sh b/migrations/1754390772.sh
deleted file mode 100644
index 86c95d65..00000000
--- a/migrations/1754390772.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Set SwayOSD max volume back to 100"
-
-if ! grep -q "max_volume = 100" ~/.config/swayosd/config.toml; then
-  sed -i 's/max_volume = 150/max_volume = 100/' ~/.config/swayosd/config.toml
-  omarchy-restart-swayosd
-fi
diff --git a/migrations/1754509222.sh b/migrations/1754509222.sh
deleted file mode 100644
index 48f3c850..00000000
--- a/migrations/1754509222.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add xmlstarlet needed for updating fonts via Omarchy menu"
-
-omarchy-pkg-add xmlstarlet
diff --git a/migrations/1754514972.sh b/migrations/1754514972.sh
deleted file mode 100644
index 787d8bc7..00000000
--- a/migrations/1754514972.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Fix multicast dns config for printers"
-
-echo -e "[Resolve]\nMulticastDNS=no" | sudo tee /etc/systemd/resolved.conf.d/10-disable-multicast.conf
diff --git a/migrations/1754566681.sh b/migrations/1754566681.sh
deleted file mode 100644
index 56d54afc..00000000
--- a/migrations/1754566681.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Make new Osaka Jade theme available as new default"
-
-if [[ ! -L ~/.config/omarchy/themes/osaka-jade ]]; then
-  rm -rf ~/.config/omarchy/themes/osaka-jade
-  git -C ~/.local/share/omarchy checkout -f themes/osaka-jade
-  ln -nfs ~/.local/share/omarchy/themes/osaka-jade ~/.config/omarchy/themes/osaka-jade
-fi
diff --git a/migrations/1754668999.sh b/migrations/1754668999.sh
deleted file mode 100644
index 7361dcd6..00000000
--- a/migrations/1754668999.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Tune MTU probing for more reliable SSH"
-
-echo "net.ipv4.tcp_mtu_probing=1" | sudo tee -a /etc/sysctl.d/99-sysctl.conf
diff --git a/migrations/1754856741.sh b/migrations/1754856741.sh
deleted file mode 100644
index e6ef2be7..00000000
--- a/migrations/1754856741.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Disable systemd-networkd-wait-online"
-
-sudo rm -rf /etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf
-sudo systemctl disable systemd-networkd-wait-online.service
-sudo systemctl mask systemd-networkd-wait-online.service
diff --git a/migrations/1754860578.sh b/migrations/1754860578.sh
deleted file mode 100644
index a25fdcc6..00000000
--- a/migrations/1754860578.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-echo "Update polkit policy to yield to fingerprint and fido2"
-
-# If fprint exists in polkit, it was wrong and needs reset
-if [[ -f /etc/pam.d/polkit-1 ]] && grep -Fq 'pam_fprintd.so' /etc/pam.d/polkit-1; then
-  sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
-auth      sufficient pam_fprintd.so
-auth      required pam_unix.so
-
-account   required pam_unix.so
-password  required pam_unix.so
-session   required pam_unix.so
-EOF
-fi
-
-# If fido2 is in sudo, it won't be in polkit either way
-if grep -q pam_u2f.so /etc/pam.d/sudo && [[ -f /etc/pam.d/polkit-1 ]] && ! grep -q 'pam_u2f.so' /etc/pam.d/polkit-1; then
-  sudo sed -i '1i auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/polkit-1
-elif grep -q pam_u2f.so /etc/pam.d/sudo && [[ ! -f /etc/pam.d/polkit-1 ]]; then
-  sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
-auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2
-auth      required pam_unix.so
-
-account   required pam_unix.so
-password  required pam_unix.so
-session   required pam_unix.so
-EOF
-fi
diff --git a/migrations/1754984734.sh b/migrations/1754984734.sh
deleted file mode 100644
index 843e4a0b..00000000
--- a/migrations/1754984734.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-echo "Configure Docker to use the host's DNS resolver"
-
-if omarchy-cmd-present docker; then
-  # If the daemon configuration has been changed since we wrote it, leave it as-is
-  ORIGINAL_CONFIG='{"log-driver":"json-file","log-opts":{"max-size":"10m","max-file":"5"}}'
-
-  NEW_CONFIG='{
-      "log-driver": "json-file",
-      "log-opts": { "max-size": "10m", "max-file": "5" },
-      "dns": ["172.17.0.1"],
-      "bip": "172.17.0.1/16"
-  }'
-
-  if grep -Fq "$ORIGINAL_CONFIG" /etc/docker/daemon.json 2>/dev/null; then
-    echo "$NEW_CONFIG" | sudo tee /etc/docker/daemon.json >/dev/null
-  fi
-
-  # Expose systemd-resolved to our Docker network
-  echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
-
-  sudo systemctl restart systemd-resolved
-  sudo systemctl restart docker
-fi
diff --git a/migrations/1754996869.sh b/migrations/1754996869.sh
deleted file mode 100644
index d2be16bb..00000000
--- a/migrations/1754996869.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Increase sudo attempts limit to 10"
-
-source $OMARCHY_PATH/install/config/increase-sudo-tries.sh
diff --git a/migrations/1755109182.sh b/migrations/1755109182.sh
deleted file mode 100644
index 678348d6..00000000
--- a/migrations/1755109182.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-echo "Reset DNS configuration to DHCP (remove forced Cloudflare DNS)"
-
-# Reset DNS to use DHCP by default instead of forcing Cloudflare
-# This preserves local development environments (.local domains, etc.)
-# Users can still opt-in to Cloudflare DNS using: omarchy-setup-dns cloudflare
-
-if [[ -f /etc/systemd/resolved.conf ]]; then
-  # Backup current config with timestamp
-  backup_timestamp=$(date +"%Y%m%d%H%M%S")
-  sudo cp /etc/systemd/resolved.conf "/etc/systemd/resolved.conf.bak.${backup_timestamp}"
-
-  # Remove explicit DNS entries to use DHCP
-  sudo sed -i '/^DNS=/d' /etc/systemd/resolved.conf
-  sudo sed -i '/^FallbackDNS=/d' /etc/systemd/resolved.conf
-
-  # Add empty DNS entries to ensure DHCP is used
-  echo "DNS=" | sudo tee -a /etc/systemd/resolved.conf >/dev/null
-  echo "FallbackDNS=" | sudo tee -a /etc/systemd/resolved.conf >/dev/null
-
-  # Remove any forced DNS config from systemd-networkd
-  if [[ -f /etc/systemd/network/99-omarchy-dns.network ]]; then
-    sudo rm -f /etc/systemd/network/99-omarchy-dns.network
-    sudo systemctl restart systemd-networkd
-  fi
-
-  # Restart systemd-resolved to apply changes
-  sudo systemctl restart systemd-resolved
-
-  echo "DNS configuration reset to use DHCP (router DNS)"
-  echo "To use Cloudflare DNS, run: omarchy-setup-dns Cloudflare"
-fi
\ No newline at end of file
diff --git a/migrations/1755139080.sh b/migrations/1755139080.sh
deleted file mode 100644
index 76325707..00000000
--- a/migrations/1755139080.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Ensure fcitx5 does not overwrite xkb layout"
-
-FCITX5_CONF_DIR="$HOME/.config/fcitx5/conf"
-FCITX5_XCB_CONF="$FCITX5_CONF_DIR/xcb.conf"
-
-if [[ ! -f $FCITX5_XCB_CONF ]]; then
-  mkdir -p "$FCITX5_CONF_DIR"
-  cp "$OMARCHY_PATH/config/fcitx5/conf/xcb.conf" "$FCITX5_XCB_CONF"
-fi
diff --git a/migrations/1755208929.sh b/migrations/1755208929.sh
deleted file mode 100644
index 527f7c0e..00000000
--- a/migrations/1755208929.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Change behaviour of XF86PowerOff button to show omarchy system menu insead of shutting down immediately"
-
-source $OMARCHY_PATH/install/config/hardware/ignore-power-button.sh
-setsid systemd-inhibit --what=handle-power-key --why="Temporary disable power button before restart" sleep infinity &
diff --git a/migrations/1755340533.sh b/migrations/1755340533.sh
deleted file mode 100644
index b94ec59c..00000000
--- a/migrations/1755340533.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add .config/brave-flags.conf by default to ensure Brave runs under Wayland"
-
-if [[ ! -f ~/.config/brave-flags.conf ]]; then
-  cp $OMARCHY_PATH/config/brave-flags.conf ~/.config/
-fi
diff --git a/migrations/1755436367.sh b/migrations/1755436367.sh
deleted file mode 100644
index e7c89706..00000000
--- a/migrations/1755436367.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Add minimal starship prompt to terminal"
-
-if omarchy-cmd-missing starship; then
-  omarchy-pkg-add starship
-  cp $OMARCHY_PATH/config/starship.toml ~/.config/starship.toml
-fi
diff --git a/migrations/1755455095.sh b/migrations/1755455095.sh
deleted file mode 100644
index 2a929fe0..00000000
--- a/migrations/1755455095.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Ensure TTE and dependencies are installed"
-
-omarchy-pkg-add python-poetry-core python-terminaltexteffects
diff --git a/migrations/1755459930.sh b/migrations/1755459930.sh
deleted file mode 100644
index 73af324c..00000000
--- a/migrations/1755459930.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add potentially missing dependency for power profile controls"
-
-omarchy-pkg-add python-gobject
diff --git a/migrations/1755494432.sh b/migrations/1755494432.sh
deleted file mode 100644
index ae6cbc4d..00000000
--- a/migrations/1755494432.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Disable USB autosuspend"
-
-bash "$OMARCHY_PATH/install/config/hardware/usb-autosuspend.sh"
diff --git a/migrations/1755507891.sh b/migrations/1755507891.sh
deleted file mode 100644
index 62ae8ae9..00000000
--- a/migrations/1755507891.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-echo "Migrating to use omarchy-launch-webapp and omarchy-launch-browser"
-for desktop_file in ~/.local/share/applications/*.desktop; do
-  if grep -q 'Exec=chromium --new-window --ozone-platform=wayland --app=' "$desktop_file"; then
-    url=$(grep '^Exec=' "$desktop_file" | sed -n 's/.*--app="\?\([^"]*\)"\?.*/\1/p')
-
-    if [[ -n $url ]]; then
-      sed -i "s|^Exec=.*|Exec=omarchy-launch-webapp \"$url\"|" "$desktop_file"
-    fi
-  fi
-done
-
-echo "Updating Hyprland bindings"
-HYPR_BINDINGS_FILE="$HOME/.config/hypr/bindings.conf"
-if [[ -f $HYPR_BINDINGS_FILE ]]; then
-  sed -i 's/\$browser =.*chromium.*$/\$browser = omarchy-launch-browser/' "$HYPR_BINDINGS_FILE"
-  sed -i 's/\$webapp="/omarchy-launch-webapp "/g' "$HYPR_BINDINGS_FILE"
-  sed -i '/^\$webapp = \$browser --app/d' "$HYPR_BINDINGS_FILE"
-fi
-
diff --git a/migrations/1755795450.sh b/migrations/1755795450.sh
deleted file mode 100644
index 3e2b3e64..00000000
--- a/migrations/1755795450.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Ensure latest uwsm is installed"
-
-sudo pacman -Syu --noconfirm uwsm
diff --git a/migrations/1755865046.sh b/migrations/1755865046.sh
deleted file mode 100644
index c48962e5..00000000
--- a/migrations/1755865046.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Switch from lazydocker-bin to lazydocker official"
-
-omarchy-pkg-drop lazydocker-bin
-omarchy-pkg-add lazydocker
diff --git a/migrations/1755867743.sh b/migrations/1755867743.sh
deleted file mode 100644
index 4da313ab..00000000
--- a/migrations/1755867743.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Copy Omarchy logo to ~/.config/omarchy/branding/screensaver.txt so screensaver can be personalized"
-
-mkdir -p ~/.config/omarchy/branding
-cp $OMARCHY_PATH/logo.txt ~/.config/omarchy/branding/screensaver.txt
diff --git a/migrations/1755870033.sh b/migrations/1755870033.sh
deleted file mode 100644
index d7b6e8f9..00000000
--- a/migrations/1755870033.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Use current terminal shell cwd for new terminal working directories"
-
-if ! grep -q "working-directory" ~/.config/hypr/bindings.conf; then
-  sed -i '/bindd = SUPER, RETURN, Terminal, exec, \$terminal/ s|$| --working-directory=$(omarchy-cmd-terminal-cwd)|' ~/.config/hypr/bindings.conf
-fi
diff --git a/migrations/1755904244.sh b/migrations/1755904244.sh
deleted file mode 100644
index 4d935cf2..00000000
--- a/migrations/1755904244.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Update fastfetch config with new Omarchy logo"
-
-omarchy-refresh-config fastfetch/config.jsonc
-
-mkdir -p ~/.config/omarchy/branding
-cp $OMARCHY_PATH/icon.txt ~/.config/omarchy/branding/about.txt
diff --git a/migrations/1755920552.sh b/migrations/1755920552.sh
deleted file mode 100644
index 665da17c..00000000
--- a/migrations/1755920552.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Use verbose package lists for pacman"
-
-sudo sed -i '/^ILoveCandy$/a VerbosePkgLists' /etc/pacman.conf
diff --git a/migrations/1755930114.sh b/migrations/1755930114.sh
deleted file mode 100644
index fd491d69..00000000
--- a/migrations/1755930114.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add new Omarchy Menu icon to Waybar"
-
-mkdir -p ~/.local/share/fonts
-cp ~/.local/share/omarchy/config/omarchy.ttf ~/.local/share/fonts/
-fc-cache
diff --git a/migrations/1756060611.sh b/migrations/1756060611.sh
deleted file mode 100644
index 2aab819a..00000000
--- a/migrations/1756060611.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-echo "Migrate AUR packages to official repos where possible"
-
-reinstall_package_opr() {
-  if omarchy-pkg-present $1; then
-    sudo pacman -Rns --noconfirm $1
-    sudo pacman -S --noconfirm ${2:-$1}
-  fi
-}
-
-omarchy-pkg-drop yay-bin-debug
-
-reinstall_package_opr yay-bin yay
-reinstall_package_opr obsidian-bin obsidian
-reinstall_package_opr localsend-bin localsend
-reinstall_package_opr omarchy-chromium-bin omarchy-chromium
-reinstall_package_opr python-terminaltexteffects
-reinstall_package_opr tzupdate
-reinstall_package_opr typora
-reinstall_package_opr ttf-ia-writer
diff --git a/migrations/1756115364.sh b/migrations/1756115364.sh
deleted file mode 100644
index a7c3925e..00000000
--- a/migrations/1756115364.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Replace buggy native Zoom client with webapp"
-
-if omarchy-pkg-present zoom; then
-  omarchy-pkg-drop zoom
-  omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/zoom.png
-fi
diff --git a/migrations/1756153445.sh b/migrations/1756153445.sh
deleted file mode 100644
index 63441e2f..00000000
--- a/migrations/1756153445.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Checking and correcting Snapper configs if needed"
-if command -v snapper &>/dev/null; then
-  if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then
-    sudo snapper -c root create-config /
-  fi
-
-  if ! sudo snapper list-configs 2>/dev/null | grep -q "home"; then
-    sudo snapper -c home create-config /home
-  fi
-fi
diff --git a/migrations/1756203383.sh b/migrations/1756203383.sh
deleted file mode 100644
index a21e2aa6..00000000
--- a/migrations/1756203383.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Remove old About, Activity, Audio Settings apps that are in Omarchy Menu or hotkey"
-
-rm -f ~/.local/share/applications/About.desktop
-rm -f ~/.local/share/applications/Activity.desktop
-rm -f ~/.local/share/applications/wiremix.desktop
diff --git a/migrations/1756205202.sh b/migrations/1756205202.sh
deleted file mode 100644
index 8d8cc73a..00000000
--- a/migrations/1756205202.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Symlink files needed for Nautilus navigation icons"
-
-sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-previous-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg
-sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-next-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg
-sudo gtk-update-icon-cache /usr/share/icons/Yaru
-pkill -x nautilus || true
-
diff --git a/migrations/1756300740.sh b/migrations/1756300740.sh
deleted file mode 100644
index adfcf60f..00000000
--- a/migrations/1756300740.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Remove no-longer-needed sudoless package listing updates"
-
-sudo rm -f /etc/sudoers.d/repositories
diff --git a/migrations/1756360552.sh b/migrations/1756360552.sh
deleted file mode 100644
index 0ea76157..00000000
--- a/migrations/1756360552.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Move Omarchy Package Repository after Arch core/extra/multilib and remove AUR"
-
-omarchy-refresh-pacman
-sudo pacman -Syu --noconfirm
diff --git a/migrations/1756371020.sh b/migrations/1756371020.sh
deleted file mode 100644
index f629b598..00000000
--- a/migrations/1756371020.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Stop restarting waybar on unlock to see if we have solved the stacking problem for good"
-
-omarchy-refresh-hypridle
diff --git a/migrations/1756410649.sh b/migrations/1756410649.sh
deleted file mode 100644
index 7347f9b2..00000000
--- a/migrations/1756410649.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Remove any Chaotic-AUR infrastructure packages"
-
-omarchy-pkg-drop chaotic-keyring chaotic-mirrorlist
-
-if sudo pacman-key --list-keys 3056513887B78AEB >/dev/null 2>&1; then
-  sudo pacman-key --delete 3056513887B78AEB
-fi
diff --git a/migrations/1756411333.sh b/migrations/1756411333.sh
deleted file mode 100644
index 5312a6f5..00000000
--- a/migrations/1756411333.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Use new Omarchy mirror as default"
-
-omarchy-refresh-pacman
diff --git a/migrations/1756411865.sh b/migrations/1756411865.sh
deleted file mode 100644
index 8dcf8ef2..00000000
--- a/migrations/1756411865.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add back ttf-ia-writer if it was missing"
-
-omarchy-pkg-add ttf-ia-writer
diff --git a/migrations/1756491748.sh b/migrations/1756491748.sh
deleted file mode 100644
index 882a9c32..00000000
--- a/migrations/1756491748.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Removing UseDNS=no from network files to fix DNS issue"
-
-for file in /etc/systemd/network/*.network; do
-  [[ -f $file ]] || continue
-  sudo sed -i '/^UseDNS=no/d' "$file"
-done
\ No newline at end of file
diff --git a/migrations/1756494998.sh b/migrations/1756494998.sh
deleted file mode 100644
index 1ffe1e8e..00000000
--- a/migrations/1756494998.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Remove opacity from alacritty.toml so Hyprland can control fully"
-
-if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
-  sed -i '/opacity = 0.98/d' ~/.config/alacritty/alacritty.toml
-fi
diff --git a/migrations/1756507384.sh b/migrations/1756507384.sh
deleted file mode 100644
index 77c640e8..00000000
--- a/migrations/1756507384.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Replace JetBrains Mono font with the Nerd Font edition"
-
-omarchy-pkg-add ttf-jetbrains-mono-nerd
-omarchy-pkg-drop ttf-jetbrains-mono
diff --git a/migrations/1756556731.sh b/migrations/1756556731.sh
deleted file mode 100644
index 477b754c..00000000
--- a/migrations/1756556731.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add Samba network drive support to the file manager"
-
-omarchy-pkg-add gvfs-smb
diff --git a/migrations/1756629295.sh b/migrations/1756629295.sh
deleted file mode 100644
index 8f0bea6d..00000000
--- a/migrations/1756629295.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Ensure qt5-wayland is installed so KeepassXC, Nextcloud, Sqlite Browser, and other apps display correctly"
-
-omarchy-pkg-add qt5-wayland
diff --git a/migrations/1756642681.sh b/migrations/1756642681.sh
deleted file mode 100644
index a3d381de..00000000
--- a/migrations/1756642681.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Fix audio input on AMD Framework laptops"
-
-source $OMARCHY_PATH/install/config/hardware/framework/fix-f13-amd-audio-input.sh || true
diff --git a/migrations/1756650507.sh b/migrations/1756650507.sh
deleted file mode 100644
index 7ed6cec7..00000000
--- a/migrations/1756650507.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Fix JetBrains font setting"
-
-if [[ $(omarchy-font-current) == JetBrains* ]]; then
-  omarchy-font-set "JetBrainsMono Nerd Font"
-fi
diff --git a/migrations/1756911131.sh b/migrations/1756911131.sh
deleted file mode 100644
index 6747ab06..00000000
--- a/migrations/1756911131.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Enable UFW systemd service for existing installations"
-
-if omarchy-cmd-present ufw; then
-    if sudo ufw status | grep -q "Status: active\|22/tcp\|53317"; then
-        if ! systemctl is-enabled ufw >/dev/null 2>&1; then
-            sudo systemctl enable ufw --now
-            echo "UFW systemd service enabled"
-        fi
-    fi
-fi
-
diff --git a/migrations/1757021485.sh b/migrations/1757021485.sh
deleted file mode 100644
index ab524755..00000000
--- a/migrations/1757021485.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install Copy URL extension for Chromium"
-
-omarchy-refresh-chromium
diff --git a/migrations/1757147211.sh b/migrations/1757147211.sh
deleted file mode 100644
index f74afe57..00000000
--- a/migrations/1757147211.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Create managed policy directories for Chromium and Brave for theme switching"
-
-sudo mkdir -p /etc/chromium/policies/managed
-sudo chmod a+rw /etc/chromium/policies/managed
-
-sudo mkdir -p /etc/brave/policies/managed
-sudo chmod a+rw /etc/brave/policies/managed
diff --git a/migrations/1757279511.sh b/migrations/1757279511.sh
deleted file mode 100644
index dc4588c1..00000000
--- a/migrations/1757279511.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Add locale to the waybar clock format"
-
-sed -i \
-  -e 's/{:%A %H:%M}/{:L%A %H:%M}/' \
-  -e 's/{:%d %B W%V %Y}/{:L%d %B W%V %Y}/' \
-  "$HOME/.config/waybar/config.jsonc"
\ No newline at end of file
diff --git a/migrations/1757361127.sh b/migrations/1757361127.sh
deleted file mode 100644
index de0d6ed8..00000000
--- a/migrations/1757361127.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Fix DHCP DNS to allow VPN DNS override"
-
-if [[ -f /etc/systemd/resolved.conf ]]; then
-  if grep -q "^DNS=$" /etc/systemd/resolved.conf && grep -q "^FallbackDNS=$" /etc/systemd/resolved.conf; then
-    sudo sed -i '/^DNS=$/d; /^FallbackDNS=$/d' /etc/systemd/resolved.conf
-    sudo systemctl restart systemd-resolved
-  fi
-fi
\ No newline at end of file
diff --git a/migrations/1757361128.sh b/migrations/1757361128.sh
deleted file mode 100644
index 0bd0b407..00000000
--- a/migrations/1757361128.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Enable mDNS resolution for existing Avahi installations"
-
-if systemctl is-enabled avahi-daemon.service >/dev/null 2>&1; then
-  if ! grep -q "mdns_minimal" /etc/nsswitch.conf; then
-    sudo sed -i 's/^hosts:.*/hosts: mymachines mdns_minimal [NOTFOUND=return] resolve files myhostname dns/' /etc/nsswitch.conf
-  fi
-fi
\ No newline at end of file
diff --git a/migrations/1757435811.sh b/migrations/1757435811.sh
deleted file mode 100644
index 8961559d..00000000
--- a/migrations/1757435811.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Copy Omarchy default app icons to .local/share/icons"
-
-source $OMARCHY_PATH/install/packaging/icons.sh
diff --git a/migrations/1757435812.sh b/migrations/1757435812.sh
deleted file mode 100644
index 14b308aa..00000000
--- a/migrations/1757435812.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Update Zoom webapp to handle zoommtg:// and zoomus:// protocol links"
-
-if [[ -f ~/.local/share/applications/Zoom.desktop ]]; then
-  omarchy-webapp-remove Zoom
-  omarchy-webapp-install Zoom https://app.zoom.us/wc/home Zoom.png "omarchy-webapp-handler-zoom %u" "x-scheme-handler/zoommtg;x-scheme-handler/zoomus"
-fi
diff --git a/migrations/1757483378.sh b/migrations/1757483378.sh
deleted file mode 100644
index a0c8d1bb..00000000
--- a/migrations/1757483378.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "6Ghz Wi-Fi + Intel graphics acceleration for existing installations"
-
-bash "$OMARCHY_PATH/install/config/hardware/set-wireless-regdom.sh"
-bash "$OMARCHY_PATH/install/config/hardware/intel/video-acceleration.sh"
diff --git a/migrations/1757511571.sh b/migrations/1757511571.sh
deleted file mode 100644
index 7753a28e..00000000
--- a/migrations/1757511571.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add screen recording indicator to Waybar"
-
-gum confirm "Replace current Waybar config (backup will be made)?" && omarchy-refresh-waybar
diff --git a/migrations/1757515650.sh b/migrations/1757515650.sh
deleted file mode 100644
index 0087257a..00000000
--- a/migrations/1757515650.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Update plymouth theme to avoid freetype2 issue that broke the styled login screen"
-omarchy-refresh-plymouth
diff --git a/migrations/1757535736.sh b/migrations/1757535736.sh
deleted file mode 100644
index 25fcd190..00000000
--- a/migrations/1757535736.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Enabling vim keys in btop"
-
-CONFIG_FILE=~/.config/btop/btop.conf
-
-if [[ -f $CONFIG_FILE ]]; then
-  if grep -q "^vim_keys = " "$CONFIG_FILE"; then
-    sed -i 's/^vim_keys = False/vim_keys = True/' "$CONFIG_FILE"
-  fi
-fi
diff --git a/migrations/1757783204.sh b/migrations/1757783204.sh
deleted file mode 100644
index e5cc9b90..00000000
--- a/migrations/1757783204.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Create ~/Work with ./bin in the path for contained projects"
-
-mise_config="$HOME/Work/.mise.toml"
-
-if [[ -f $mise_config ]]; then
-  cp $mise_config "$mise_config.bak.$(date +%s)"
-fi
-
-source "$OMARCHY_PATH/install/config/mise-work.sh"
diff --git a/migrations/1757861484.sh b/migrations/1757861484.sh
deleted file mode 100644
index fa4cec99..00000000
--- a/migrations/1757861484.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add a blurred background to the lock screen"
-
-omarchy-refresh-hyprlock
diff --git a/migrations/1757866485.sh b/migrations/1757866485.sh
deleted file mode 100644
index ed0905ee..00000000
--- a/migrations/1757866485.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Add SUPER + SHIFT + B to start browser in private mode"
-
-if [[ -f ~/.config/hypr/bindings.conf ]] && grep -q "SUPER, B, Browser, exec" ~/.config/hypr/bindings.conf; then
-  sed -i '/^bindd = SUPER, B, Browser, exec, \$browser$/a\
-bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private' ~/.config/hypr/bindings.conf
-fi
diff --git a/migrations/1757877123.sh b/migrations/1757877123.sh
deleted file mode 100644
index 0a0f3ab7..00000000
--- a/migrations/1757877123.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Obsidian should be using Wayland IME for better compatibility with fcitx5 and other languages"
-
-if [[ -f ~/.config/hypr/bindings.conf ]]; then
-  sed -i '/^bindd = SUPER, O, Obsidian, exec, uwsm app -- obsidian -disable-gpu/{
-    /--enable-wayland-ime/! s/$/ --enable-wayland-ime/
-  }' ~/.config/hypr/bindings.conf
-fi
diff --git a/migrations/1757877852.sh b/migrations/1757877852.sh
deleted file mode 100644
index 51ecd105..00000000
--- a/migrations/1757877852.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Switch select bindings to launch or focus mode"
-
-if [[ -f ~/.config/hypr/bindings.conf ]]; then
-  sed -i '/SUPER, M, Music, exec/ c\bindd = SUPER, M, Music, exec, omarchy-launch-or-focus spotify' ~/.config/hypr/bindings.conf
-  sed -i '/SUPER, O, Obsidian, exec/ c\bindd = SUPER, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"' ~/.config/hypr/bindings.conf
-
-  sed -i '/SUPER, G, Signal, exec/ c\bindd = SUPER, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop"' ~/.config/hypr/bindings.conf
-  sed -i '/SUPER SHIFT, G, WhatsApp, exec/ c\bindd = SUPER SHIFT, G, WhatsApp, exec, omarchy-launch-or-focus-webapp WhatsApp "https://web.whatsapp.com/"' ~/.config/hypr/bindings.conf
-  sed -i '/SUPER ALT, G, Google Messages, exec/ c\bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-or-focus-webapp "Google Messages" "https://messages.google.com/web/conversations"' ~/.config/hypr/bindings.conf
-fi
diff --git a/migrations/1757879836.sh b/migrations/1757879836.sh
deleted file mode 100644
index e15c4415..00000000
--- a/migrations/1757879836.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Ensure .config/hypr/looknfeel.conf is available and included"
-
-if [[ ! -f ~/.config/hypr/looknfeel.conf ]]; then
-  cp $OMARCHY_PATH/config/hypr/looknfeel.conf ~/.config/hypr/looknfeel.conf
-fi
-
-if [[ -f ~/.config/hypr/hyprland.conf ]]; then
-  grep -qx 'source = ~/.config/hypr/looknfeel.conf' ~/.config/hypr/hyprland.conf ||
-    sed -i '/^source = ~\/.config\/hypr\/envs\.conf$/a source = ~/.config/hypr/looknfeel.conf' ~/.config/hypr/hyprland.conf
-fi
diff --git a/migrations/1758019332.sh b/migrations/1758019332.sh
deleted file mode 100644
index 50caed1e..00000000
--- a/migrations/1758019332.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-echo "Set \$TERMINAL and \$EDITOR in ~/.config/uwsm/default so entire system can rely on it"
-
-# Set terminal and editor default in uwsm
-omarchy-refresh-config uwsm/default
-omarchy-refresh-config uwsm/env
-omarchy-state set reboot-required
-
-# Ensure scrolltouchpad setting applies to all terminals
-if grep -q "scrolltouchpad 1.5, class:Alacritty" ~/.config/hypr/input.conf; then
-  sed -i 's/windowrule = scrolltouchpad 1\.5, class:Alacritty/windowrule = scrolltouchpad 1.5, tag:terminal/' ~/.config/hypr/input.conf
-fi
-
-# Use default editor for keybinding
-if grep -q "bindd = SUPER, N, Neovim" ~/.config/hypr/bindings.conf; then
-  sed -i '/SUPER, N, Neovim, exec/ c\bindd = SUPER, N, Editor, exec, omarchy-launch-editor' ~/.config/hypr/bindings.conf
-fi
-
-# Use default terminal for keybinding
-if grep -q "terminal = uwsm app" ~/.config/hypr/bindings.conf; then
-  sed -Ei '/terminal = uwsm[- ]app -- alacritty/ c\$terminal = uwsm-app -- $TERMINAL' ~/.config/hypr/bindings.conf
-fi
diff --git a/migrations/1758051607.sh b/migrations/1758051607.sh
deleted file mode 100644
index e30cae7f..00000000
--- a/migrations/1758051607.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Copy configs for ghostty + kitty so they're available as alternative terminal options"
-
-if [[ ! -f ~/.config/ghostty/config ]]; then
-  mkdir -p ~/.config/ghostty
-  cp -Rpf $OMARCHY_PATH/config/ghostty/config ~/.config/ghostty/config
-fi
-
-if [[ ! -f ~/.config/kitty/kitty.conf ]]; then
-  mkdir -p ~/.config/kitty
-  cp -Rpf $OMARCHY_PATH/config/kitty/kitty.conf ~/.config/kitty/kitty.conf
-fi
diff --git a/migrations/1758104201.sh b/migrations/1758104201.sh
deleted file mode 100644
index 18ac7015..00000000
--- a/migrations/1758104201.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Prevent powerprofilesctl from using Mise python and not working"
-
-bash $OMARCHY_PATH/install/config/fix-powerprofilesctl-shebang.sh
diff --git a/migrations/1758107879.sh b/migrations/1758107879.sh
deleted file mode 100644
index 40cb89d7..00000000
--- a/migrations/1758107879.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-echo "Migrate to Walker 2.0.0"
-
-NEEDS_MIGRATION=false
-
-PACKAGES=(
-  "elephant"
-  "elephant-calc"
-  "elephant-clipboard"
-  "elephant-bluetooth"
-  "elephant-desktopapplications"
-  "elephant-files"
-  "elephant-menus"
-  "elephant-providerlist"
-  "elephant-runner"
-  "elephant-symbols"
-  "elephant-unicode"
-  "elephant-websearch"
-  "elephant-todo"
-  "walker"
-  "libqalculate"
-)
-
-for pkg in "${PACKAGES[@]}"; do
-  if ! omarchy-pkg-present "$pkg"; then
-    NEEDS_MIGRATION=true
-    break
-  fi
-done
-
-WALKER_MAJOR=$(walker -v 2>&1 | grep -oP '^\d+' || echo "0")
-if (( WALKER_MAJOR < 2 )); then
-  NEEDS_MIGRATION=true
-fi
-
-# Ensure basic config is present
-mkdir -p ~/.config/walker
-cp -r ~/.local/share/omarchy/config/walker/* ~/.config/walker/
-
-if $NEEDS_MIGRATION; then
-  kill -9 $(pgrep -x walker) 2>/dev/null || true
-
-  omarchy-pkg-drop walker-bin walker-bin-debug
-
-  omarchy-pkg-add "${PACKAGES[@]}"
-
-  source $OMARCHY_PATH/install/config/walker-elephant.sh
-
-  rm -rf ~/.config/walker/themes
-
-  omarchy-refresh-config walker/config.toml
-  omarchy-refresh-config elephant/calc.toml
-  omarchy-refresh-config elephant/desktopapplications.toml
-fi
-
-echo # Assure final success
diff --git a/migrations/1758111304.sh b/migrations/1758111304.sh
deleted file mode 100644
index 75f4dbb9..00000000
--- a/migrations/1758111304.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Remove Ruby build options to force GCC14 now that GCC15 is compatible"
-
-mise settings unset ruby.ruby_build_opts
diff --git a/migrations/1758142943.sh b/migrations/1758142943.sh
deleted file mode 100644
index e9ed7944..00000000
--- a/migrations/1758142943.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-echo "Turn off VSCode's own auto-update feature (we rely on pacman)"
-
-# Note: We cannot use `jq` to update settings.json because it’s JSONC (allows comments),
-# which jq doesn’t support.
-
-VS_CODE_SETTINGS="$HOME/.config/Code/User/settings.json"
-
-# If VSCode is installed, ensure that the "update.mode" setting is set to "none"
-if omarchy-cmd-present code; then
-  mkdir -p "$(dirname "$VS_CODE_SETTINGS")"
-
-  if [[ ! -f $VS_CODE_SETTINGS ]]; then
-    # If settings.json doesn't exist, create it with just the update.mode setting
-    printf '{\n  "update.mode": "none"\n}\n' > "$VS_CODE_SETTINGS"
- elif ! grep -q '"update.mode"' "$VS_CODE_SETTINGS"; then
-    # Insert "update.mode": "none", immediately after the first "{"
-    # Use sed's first-match range (0,/{/) to only replace the first "{
-    sed -i --follow-symlinks -E '0,/\{/{s/\{/{\
-  "update.mode": "none",/}' "$VS_CODE_SETTINGS"
-  fi
-fi
diff --git a/migrations/1758436991.sh b/migrations/1758436991.sh
deleted file mode 100644
index d8ae9ebb..00000000
--- a/migrations/1758436991.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-echo "Fix Disk Usage and Docker TUIs"
-
-APP_DIR="$HOME/.local/share/applications"
-ICON_DIR="$APP_DIR/icons"
-
-# Don't use omarchy-tui-remove to preserve icons
-
-if [[ -f $APP_DIR/Docker.desktop ]]; then
-  rm "$APP_DIR/Docker.desktop"
-  omarchy-tui-install "Docker" "lazydocker" tile "$ICON_DIR/Docker.png"
-fi
-
-if [[ -f $APP_DIR/"Disk Usage.desktop" ]]; then
-  rm "$APP_DIR/Disk Usage.desktop" 
-  omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float "$ICON_DIR/Disk Usage.png"
-fi
diff --git a/migrations/1758455816.sh b/migrations/1758455816.sh
deleted file mode 100644
index 9c578ffe..00000000
--- a/migrations/1758455816.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-echo "Add thunderbolt support to boot image"
-
-omarchy-pkg-add bolt
-
-if [[ ! -f /etc/mkinitcpio.conf.d/thunderbolt_module.conf ]]; then
-  sudo tee /etc/mkinitcpio.conf.d/thunderbolt_module.conf <<EOF >/dev/null
-MODULES+=(thunderbolt)
-EOF
-fi
-
-if omarchy-cmd-present limine-update; then
-  sudo limine-update
-fi
diff --git a/migrations/1758487660_change_dm_to_sddm.sh b/migrations/1758487660_change_dm_to_sddm.sh
deleted file mode 100644
index 3c10c840..00000000
--- a/migrations/1758487660_change_dm_to_sddm.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-set -e
-
-error_exit() {
-  echo -e "\033[31mERROR: Migration failed! Manual intervention required.\033[0m" >&2
-  echo -e "\033[31mDO NOT REBOOT - System may be in inconsistent state until the error is fixed.\033[0m" >&2
-  exit 1
-}
-
-trap error_exit ERR
-
-echo "Change display manager to SDDM"
-
-omarchy-pkg-add sddm libsecret gnome-keyring || error_exit
-
-sudo mkdir -p /etc/sddm.conf.d
-
-cat <<EOF | sudo tee /etc/sddm.conf.d/autologin.conf
-[Autologin]
-User=$USER
-Session=hyprland-uwsm
-
-[Theme]
-Current=breeze
-EOF
-
-sudo systemctl disable omarchy-seamless-login.service
-sudo systemctl unmask plymouth-quit-wait.service
-sudo systemctl enable getty@tty1.service
-sudo systemctl enable sddm.service
-sudo systemctl daemon-reload
-
-if systemctl is-enabled omarchy-seamless-login.service >/dev/null 2>&1; then
-  echo -e "\033[31mError: omarchy-seamless-login.service is still enabled\033[0m" >&2
-  error_exit
-fi
-
-if systemctl is-masked plymouth-quit-wait.service >/dev/null 2>&1; then
-  echo -e "\033[31mError: plymouth-quit-wait.service is still masked\033[0m" >&2
-  error_exit
-fi
-
-if ! systemctl is-enabled getty@tty1.service >/dev/null 2>&1; then
-  echo -e "\033[31mError: getty@tty1.service is not enabled\033[0m" >&2
-  error_exit
-fi
-
-if ! systemctl is-enabled sddm.service >/dev/null 2>&1; then
-  echo -e "\033[31mError: sddm.service is not enabled\033[0m" >&2
-  error_exit
-fi
-
-sudo rm -f /usr/local/bin/seamless-login
-sudo rm -f /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf
-sudo rm -f /etc/systemd/system/omarchy-seamless-login.service
diff --git a/migrations/1758487662_move_to_custom_uki.sh b/migrations/1758487662_move_to_custom_uki.sh
deleted file mode 100644
index a29376d8..00000000
--- a/migrations/1758487662_move_to_custom_uki.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-echo "Update UKI to custom named entry"
-
-if command -v limine &>/dev/null && [[ -f /etc/default/limine ]]; then
-  if grep -q "^ENABLE_UKI=yes" /etc/default/limine; then
-    if ! grep -q "^CUSTOM_UKI_NAME=" /etc/default/limine; then
-      sudo sed -i '/^ENABLE_UKI=yes/a CUSTOM_UKI_NAME="omarchy"' /etc/default/limine
-    fi
-
-    # Remove the archinstall-created Limine entry
-    while IFS= read -r bootnum; do
-      sudo efibootmgr -b "$bootnum" -B >/dev/null 2>&1
-    done < <(efibootmgr | grep -E "^Boot[0-9]{4}\*? Arch Linux Limine" | sed 's/^Boot\([0-9]\{4\}\).*/\1/')
-
-    sudo limine-update
-
-    uki_file=$(find /boot/EFI/Linux/ -name "omarchy*.efi" -printf "%f\n" 2>/dev/null | head -1)
-
-    if [[ -n $uki_file ]]; then
-      while IFS= read -r bootnum; do
-        sudo efibootmgr -b "$bootnum" -B >/dev/null 2>&1
-      done < <(efibootmgr | grep -E "^Boot[0-9]{4}\*? Omarchy" | sed 's/^Boot\([0-9]\{4\}\).*/\1/')
-
-      # Skip EFI entry creation on Apple hardware
-      if ! cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "Apple"; then
-        sudo efibootmgr --create \
-          --disk "$(findmnt -n -o SOURCE /boot | sed 's/p\?[0-9]*$//')" \
-          --part "$(findmnt -n -o SOURCE /boot | grep -o 'p\?[0-9]*$' | sed 's/^p//')" \
-          --label "Omarchy" \
-          --loader "\\EFI\\Linux\\$uki_file"
-      fi
-    fi
-  else
-    echo "Not using UKI. Not making any changes."
-  fi
-else
-  echo "Boot config is non-standard. Not making any changes."
-fi
-
diff --git a/migrations/1758562032.sh b/migrations/1758562032.sh
deleted file mode 100644
index 5c4c357e..00000000
--- a/migrations/1758562032.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Fix Tailscale split DNS compatibility by removing [!UNAVAIL=return] from nsswitch.conf"
-
-if grep -q '\[!UNAVAIL=return\]' /etc/nsswitch.conf; then
-  sudo sed -i 's/resolve \[!UNAVAIL=return\]/resolve/g' /etc/nsswitch.conf
-fi
\ No newline at end of file
diff --git a/migrations/1758564460.sh b/migrations/1758564460.sh
deleted file mode 100644
index f0b10693..00000000
--- a/migrations/1758564460.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Enable fast shutdown"
-source $OMARCHY_PATH/install/config/fast-shutdown.sh 
diff --git a/migrations/1758734243.sh b/migrations/1758734243.sh
deleted file mode 100644
index a264567e..00000000
--- a/migrations/1758734243.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install tesseract OCR and language data files"
-
-omarchy-pkg-add tesseract tesseract-data-eng
\ No newline at end of file
diff --git a/migrations/1759093827.sh b/migrations/1759093827.sh
deleted file mode 100644
index 69cf8963..00000000
--- a/migrations/1759093827.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Adding hidden entries for electron apps"
-
-cp $OMARCHY_PATH/applications/hidden/electron*.desktop ~/.local/share/applications/
diff --git a/migrations/1759270604.sh b/migrations/1759270604.sh
deleted file mode 100644
index dce79803..00000000
--- a/migrations/1759270604.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Update Hyprlock with better placeholder position and show all fail text"
-
-omarchy-refresh-hyprlock
diff --git a/migrations/1759355846.sh b/migrations/1759355846.sh
deleted file mode 100644
index 40d0098d..00000000
--- a/migrations/1759355846.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-echo "Symlink systemd-resolved to /etc/resolv.conf"
-
-# Backup if /etc/resolv.conf was modified after system birth
-system_birth=$(stat -c %W /)
-resolvconf_modified=$(stat -c %Y /etc/resolv.conf)
-
-# Run a backup if resolv.conf isn't a symlink and was modified after install
-if [[ -s /etc/resolv.conf ]] && [[ ! -L /etc/resolv.conf ]] && [[ $resolvconf_modified > $system_birth ]]; then
-  # Backup the destination file (with timestamp) to avoid clobbering (Ex: resolv.conf.bak.1753817951)
-  backup_file="/etc/resolv.conf.bak.$(date +%s)"
-
-  # Create backup
-  sudo cp -f /etc/resolv.conf "$backup_file" 2>/dev/null
-
-  # Inform users
-  echo -e "\e[31mReplaced /etc/resolv.conf with symlink to systemd-resolved. \nSaved backup as ${backup_file}.\e[0m"
-  echo -e "\e[31mSee https://wiki.archlinux.org/title/Systemd-resolved.\e[0m"
-fi
-
-# Write the symlink
-sudo ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
diff --git a/migrations/1759691413.sh b/migrations/1759691413.sh
deleted file mode 100644
index 37fefa7c..00000000
--- a/migrations/1759691413.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Correct path for sudoless asdcontrol for working Apple Display hotkeys"
-
-if [[ $(command -v asdcontrol) == "/usr/bin/asdcontrol" ]]; then
-  echo "$USER ALL=(ALL) NOPASSWD: /usr/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
-fi
diff --git a/migrations/1759694076.sh b/migrations/1759694076.sh
deleted file mode 100644
index 084d8e2b..00000000
--- a/migrations/1759694076.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Hide OpenJDK applications from app launcher"
-
-cp $OMARCHY_PATH/applications/hidden/*openjdk.desktop ~/.local/share/applications/
-
diff --git a/migrations/1759895423.sh b/migrations/1759895423.sh
deleted file mode 100644
index fcaeb417..00000000
--- a/migrations/1759895423.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Make shift+insert paste and ctrl+insert copy from clipboard in terminal"
-
-# Add keybindings to Alacritty
-sed -i 's/{ key = "F11", action = "ToggleFullscreen" }/{ key = "F11", action = "ToggleFullscreen" },\n{ key = "Insert", mods = "Shift", action = "Paste" },\n{ key = "Insert", mods = "Control", action = "Copy" }/' ~/.config/alacritty/alacritty.toml
-
-# Add keybindings to Ghostty
-sed -i '/keybind = f11=toggle_fullscreen/a keybind = shift+insert=paste_from_clipboard\nkeybind = control+insert=copy_to_clipboard' ~/.config/ghostty/config
-
-# Add keybindings to Kitty
-sed -i '/map F11 toggle_fullscreen/a map ctrl+insert copy_to_clipboard' ~/.config/kitty/kitty.conf
diff --git a/migrations/1759913695.sh b/migrations/1759913695.sh
deleted file mode 100644
index 9b7ddc1b..00000000
--- a/migrations/1759913695.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Fix NVMe suspend issues on MacBook models"
-
-bash $OMARCHY_PATH/install/config/hardware/apple/fix-suspend-nvme.sh
diff --git a/migrations/1760144906.sh b/migrations/1760144906.sh
deleted file mode 100644
index 4745b187..00000000
--- a/migrations/1760144906.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Change omarchy-screenrecord to use gpu-screen-recorder"
-omarchy-pkg-drop wf-recorder wl-screenrec
-
-# Add slurp in case it hadn't been picked up from an old migration
-omarchy-pkg-add slurp gpu-screen-recorder
diff --git a/migrations/1760301290.sh b/migrations/1760301290.sh
deleted file mode 100644
index b383b6fb..00000000
--- a/migrations/1760301290.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add the new Flexoki Light theme"
-
-if [[ ! -L ~/.config/omarchy/themes/flexoki-light ]]; then
-  ln -nfs ~/.local/share/omarchy/themes/flexoki-light ~/.config/omarchy/themes/
-fi
diff --git a/migrations/1760304963.sh b/migrations/1760304963.sh
deleted file mode 100644
index 588d4f46..00000000
--- a/migrations/1760304963.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Add a default keyring for gnome-keyring that unlocks on login"
-
-if [[ -f $HOME/.local/share/keyrings/Default_keyring.keyring ]] || [[ -f $HOME/.local/share/keyrings/default ]]; then
-    if gum confirm "Do you want to replace existing keyring with one that's auto-unlocked on login?"; then
-        bash "$OMARCHY_PATH/install/login/default-keyring.sh"
-    fi
-else
-    bash "$OMARCHY_PATH/install/login/default-keyring.sh"
-fi
diff --git a/migrations/1760434895.sh b/migrations/1760434895.sh
deleted file mode 100644
index e08649f4..00000000
--- a/migrations/1760434895.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Change to omarchy-nvim package"
-omarchy-pkg-drop omarchy-lazyvim
-omarchy-pkg-add omarchy-nvim
-
-# Will trigger to overwrite configs or not to pickup new hot-reload themes
-omarchy-nvim-setup
diff --git a/migrations/1760441237.sh b/migrations/1760441237.sh
deleted file mode 100644
index 1c2d89d3..00000000
--- a/migrations/1760441237.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install Omarchy theme on Obsidian vaults"
-
-omarchy-theme-set-obsidian
diff --git a/migrations/1760462260.sh b/migrations/1760462260.sh
deleted file mode 100644
index fec87d8c..00000000
--- a/migrations/1760462260.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-echo -e "Offer new Omarchy hotkeys\n"
-
-cat <<EOF
-* Add SUPER + C / V for unified clipboard in both terminal and other apps
-* Add SUPER + CTRL + V for clipboard manager
-* Move fullscreen from F11 to SUPER + F
-* Keep terminal on SUPER + RETURN
-* Move app keys from SUPER + [LETTER] to SHIFT + SUPER + [LETTER]
-* Move toggling tiling/floating to SUPER + T
-EOF
-
-echo -e "\nSwitching to new hotkeys will change your existing bindings.\nThe old ones will be backed up as ~/.config/hypr/bindings.conf.bak\n"
-
-if gum confirm "Switch to new hotkeys?"; then
-  cp ~/.config/hypr/bindings.conf ~/.config/hypr/bindings.conf.bak
-
-  sed -i 's/SUPER SHIFT,/SUPER SHIFT ALT,/g' ~/.config/hypr/bindings.conf
-  sed -i 's/SUPER,/SUPER SHIFT,/g' ~/.config/hypr/bindings.conf
-  sed -i 's/SUPER SHIFT, return, Terminal/SUPER, RETURN, Terminal/gI' ~/.config/hypr/bindings.conf
-  sed -i 's/SUPER ALT,/SUPER SHIFT ALT,/g' ~/.config/hypr/bindings.conf
-  sed -i 's/SUPER CTRL,/SUPER SHIFT CTRL,/g' ~/.config/hypr/bindings.conf
-  sed -i 's/SUPER SHIFT ALT, G, Google Messages/SUPER SHIFT CTRL, G, Google Messages/g' ~/.config/hypr/bindings.conf
-
-  sed -i 's|source = ~/.local/share/omarchy/default/hypr/bindings/tiling\.conf|source = ~/.local/share/omarchy/default/hypr/bindings/clipboard.conf\
-source = ~/.local/share/omarchy/default/hypr/bindings/tiling-v2.conf|' ~/.config/hypr/hyprland.conf
-fi
diff --git a/migrations/1760471009.sh b/migrations/1760471009.sh
deleted file mode 100644
index f2418846..00000000
--- a/migrations/1760471009.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Copy over updated application icons"
-
-cp -f $OMARCHY_PATH/applications/icons/GitHub.png ~/.local/share/applications/icons/
-cp -f $OMARCHY_PATH/applications/icons/ChatGPT.png ~/.local/share/applications/icons/
-cp -f $OMARCHY_PATH/applications/icons/X.png ~/.local/share/applications/icons/
diff --git a/migrations/1760684828.sh b/migrations/1760684828.sh
deleted file mode 100644
index e8bae598..00000000
--- a/migrations/1760684828.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Remove any active eza theme"
-
-rm -f ~/.config/eza/theme.yml
diff --git a/migrations/1760693222.sh b/migrations/1760693222.sh
deleted file mode 100644
index cc9828e8..00000000
--- a/migrations/1760693222.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Use explicit timezone selector when right-clicking on clock"
-
-sed -i 's/omarchy-cmd-tzupdate/omarchy-launch-floating-terminal-with-presentation omarchy-tz-select/g' ~/.config/waybar/config.jsonc
diff --git a/migrations/1760724934.sh b/migrations/1760724934.sh
deleted file mode 100644
index e6cb685c..00000000
--- a/migrations/1760724934.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-# Handles changes since 3.1.0-RC
-
-echo "Add shift+insert for kitty"
-# Add shift+insert paste keybinding to kitty.conf if it doesn't exist
-KITTY_CONF="$HOME/.config/kitty/kitty.conf"
-
-if ! grep -q "map shift+insert paste_from_clipboard" "$KITTY_CONF"; then
-  sed -i '/map ctrl+insert copy_to_clipboard/a map shift+insert paste_from_clipboard' "$KITTY_CONF"
-fi
-
-echo "Copy hooks examples"
-cp -r $OMARCHY_PATH/config/omarchy/* $HOME/.config/omarchy/
-
-echo "Add packages for updated omarchy-capture-screenshot"
-omarchy-pkg-add grim slurp
-
-echo "Add nfs support by default to Nautilus"
-omarchy-pkg-add gvfs-nfs
-
-if [[ ! -d $HOME/.config/nvim ]]; then
-  echo "Add missing nvim config"
-  omarchy-nvim-setup
-fi
diff --git a/migrations/1760730253.sh b/migrations/1760730253.sh
deleted file mode 100644
index a67a0063..00000000
--- a/migrations/1760730253.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install Aether for Omarchy theme creation"
-
-omarchy-pkg-add aether
diff --git a/migrations/1760787158.sh b/migrations/1760787158.sh
deleted file mode 100644
index f57cc77d..00000000
--- a/migrations/1760787158.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Update Waybar styles for better spacing between icons"
-
-omarchy-refresh-config waybar/style.css
diff --git a/migrations/1761180745.sh b/migrations/1761180745.sh
deleted file mode 100644
index c0e31eb5..00000000
--- a/migrations/1761180745.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Ensure interactive shell check is at the top of .bashrc"
-
-BASHRC="$HOME/.bashrc"
-
-if [[ -f $BASHRC ]] && ! grep -q '\[\[ $- != \*i\* \]\] && return' "$BASHRC"; then
-  sed -i '1i# If not running interactively, don'\''t do anything (leave this at the top of this file)\n[[ $- != *i* ]] && return\n' "$BASHRC"
-fi
diff --git a/migrations/1761241493.sh b/migrations/1761241493.sh
deleted file mode 100644
index c4b977f0..00000000
--- a/migrations/1761241493.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-echo "Cleanup extra UKI if needed to prevent errors"
-if [[ -f /boot/EFI/linux/omarchy_linux.efi ]] && [[ -f /boot/EFI/linux/$(cat /etc/machine-id)_linux.efi ]]; then
-  sudo rm -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi
-
-  if grep -q "/boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi" /boot/limine.conf; then
-    echo -e "Resetting limine config\n(you may need to re-add other entries via sudo limine-update)"
-
-    sudo mv /boot/limine.conf /boot/limine.conf.bak
-  sudo tee /boot/limine.conf <<EOF >/dev/null
-### Read more at config document: https://github.com/limine-bootloader/limine/blob/trunk/CONFIG.md
-#timeout: 3
-default_entry: 2
-interface_branding: Omarchy Bootloader
-interface_branding_color: 2
-hash_mismatch_panic: no
-
-term_background: 1a1b26
-backdrop: 1a1b26
-
-# Terminal colors (Tokyo Night palette)
-term_palette: 15161e;f7768e;9ece6a;e0af68;7aa2f7;bb9af7;7dcfff;a9b1d6
-term_palette_bright: 414868;f7768e;9ece6a;e0af68;7aa2f7;bb9af7;7dcfff;c0caf5
-
-# Text colors
-term_foreground: c0caf5
-term_foreground_bright: c0caf5
-term_background_bright: 24283b
-
-EOF
-    sudo limine-update
-    sudo limine-snapper-sync
-  fi
-fi
diff --git a/migrations/1761247569.sh b/migrations/1761247569.sh
deleted file mode 100644
index eff3980d..00000000
--- a/migrations/1761247569.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Install expac and inxi for omarchy-debug"
-omarchy-pkg-add expac inxi
diff --git a/migrations/1761269603.sh b/migrations/1761269603.sh
deleted file mode 100644
index 700a3efa..00000000
--- a/migrations/1761269603.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Add right-click terminal action to waybar omarchy menu icon"
-
-WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc"
-
-if [[ -f $WAYBAR_CONFIG ]] && ! grep -A5 '"custom/omarchy"' "$WAYBAR_CONFIG" | grep -q '"on-click-right"'; then
-  sed -i '/"on-click": "omarchy-menu",/a\    "on-click-right": "omarchy-launch-terminal",' "$WAYBAR_CONFIG"
-fi
diff --git a/migrations/1761274806.sh b/migrations/1761274806.sh
deleted file mode 100644
index 7d0f5657..00000000
--- a/migrations/1761274806.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Ensure node is available via mise (for treesitter cli)"
-
-if omarchy-cmd-missing node; then
-  mise use -g node@latest
-fi
diff --git a/migrations/1761274980.sh b/migrations/1761274980.sh
deleted file mode 100644
index 5c85b362..00000000
--- a/migrations/1761274980.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Migrate to proper packages for localsend and asdcontrol"
-
-if omarchy-pkg-present localsend-bin; then
-  omarchy-pkg-drop localsend-bin
-  omarchy-pkg-add localsend
-fi
-
-if omarchy-pkg-present asdcontrol-git; then
-  omarchy-pkg-drop asdcontrol-git
-  omarchy-pkg-add asdcontrol
-fi
diff --git a/migrations/1761569743.sh b/migrations/1761569743.sh
deleted file mode 100644
index 976df478..00000000
--- a/migrations/1761569743.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Add default Ctrl+P binding for imv; backup existing config if present"
-
-if [[ -f ~/.config/imv/config ]]; then
-  cp ~/.config/imv/config ~/.config/imv/config.bak.$(date +%s)
-else
-  mkdir -p ~/.config/imv
-fi
-
-cp ~/.local/share/omarchy/config/imv/config ~/.config/imv/config
diff --git a/migrations/1761585764.sh b/migrations/1761585764.sh
deleted file mode 100644
index bafbfe27..00000000
--- a/migrations/1761585764.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Disable Nvim news alerts box"
-
-cp /usr/share/omarchy-nvim/config/lua/plugins/disable-news-alert.lua ~/.config/nvim/lua/plugins/disable-news-alert.lua
diff --git a/migrations/1761638377.sh b/migrations/1761638377.sh
deleted file mode 100644
index 05a1fb16..00000000
--- a/migrations/1761638377.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Turn off fcitx5 clipboard that is interferring with other applications"
-
-mkdir -p ~/.config/fcitx5/conf
-cp $OMARCHY_PATH/config/fcitx5/conf/clipboard.conf ~/.config/fcitx5/conf/
-
-omarchy-restart-xcompose
diff --git a/migrations/1761758552.sh b/migrations/1761758552.sh
deleted file mode 100644
index 49680d09..00000000
--- a/migrations/1761758552.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-echo "Set nvim as default via xdg-mime"
-
-rm ~/.local/share/applications/nvim.desktop || true
-
-xdg-mime default nvim.desktop text/plain
-xdg-mime default nvim.desktop text/english
-xdg-mime default nvim.desktop text/x-makefile
-xdg-mime default nvim.desktop text/x-c++hdr
-xdg-mime default nvim.desktop text/x-c++src
-xdg-mime default nvim.desktop text/x-chdr
-xdg-mime default nvim.desktop text/x-csrc
-xdg-mime default nvim.desktop text/x-java
-xdg-mime default nvim.desktop text/x-moc
-xdg-mime default nvim.desktop text/x-pascal
-xdg-mime default nvim.desktop text/x-tcl
-xdg-mime default nvim.desktop text/x-tex
-xdg-mime default nvim.desktop application/x-shellscript
-xdg-mime default nvim.desktop text/x-c
-xdg-mime default nvim.desktop text/x-c++
-xdg-mime default nvim.desktop application/xml
-xdg-mime default nvim.desktop text/xml
diff --git a/migrations/1761897226.sh b/migrations/1761897226.sh
deleted file mode 100644
index 34dbc1fd..00000000
--- a/migrations/1761897226.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install Copy URL extension for Brave"
-
-omarchy-refresh-config brave-flags.conf
diff --git a/migrations/1762121828.sh b/migrations/1762121828.sh
deleted file mode 100644
index b7b86c91..00000000
--- a/migrations/1762121828.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-echo "Setting up xdg-terminal-exec for gtk-launch terminal support"
-# Solve for hardcoded glib terminals
-# https://github.com/basecamp/omarchy/issues/1852
-
-# Remove old symlink if it exists -- if someone ran the previous migration early
-if [[ -L /usr/local/bin/xdg-terminal-exec ]]; then
-  sudo rm /usr/local/bin/xdg-terminal-exec
-fi
-
-omarchy-pkg-add xdg-terminal-exec
-
-# Set up xdg-terminals.list based on current $TERMINAL
-if [[ -n $TERMINAL ]]; then
-  case "$TERMINAL" in
-  alacritty) desktop_id="Alacritty.desktop" ;;
-  ghostty) desktop_id="com.mitchellh.ghostty.desktop" ;;
-  kitty) desktop_id="kitty.desktop" ;;
-  esac
-
-  if [[ -n $desktop_id ]]; then
-    mkdir -p ~/.config
-    cat > ~/.config/xdg-terminals.list << EOF
-# Terminal emulator preference order for xdg-terminal-exec
-# The first found and valid terminal will be used
-$desktop_id
-EOF
-  fi
-fi
-
-# Copy custom desktop entries with proper X-TerminalArg* keys
-if command -v alacritty > /dev/null 2>&1; then
-  cp "$OMARCHY_PATH/applications/Alacritty.desktop" ~/.local/share/applications/
-fi
-
-# Update hyprland bindings to use xdg-terminal-exec
-sed -i 's/\$terminal = uwsm-app -- \$TERMINAL/$terminal = uwsm-app -- xdg-terminal-exec/' ~/.config/hypr/bindings.conf
-# Update --working-directory to --dir for xdg-terminal-exec
-sed -i 's/--working-directory=/--dir=/g' ~/.config/hypr/bindings.conf
-
-# Update TERMINAL variable in uwsm config
-sed -i 's/export TERMINAL=.*/export TERMINAL=xdg-terminal-exec/' ~/.config/uwsm/default
-
-# Update waybar config to use xdg-terminal-exec
-waybar_config=~/.config/waybar/config.jsonc
-if [[ -f $waybar_config ]]; then
-  sed -i 's|"on-click-right": "omarchy-launch-terminal"|"on-click-right": "xdg-terminal-exec"|' "$waybar_config"
-  sed -i 's|"on-click": "\$TERMINAL -e btop"|"on-click": "xdg-terminal-exec btop"|' "$waybar_config"
-  sed -i 's|"on-click": "\$TERMINAL --class=Wiremix -e wiremix"|"on-click": "xdg-terminal-exec --app-id=com.omarchy.Wiremix -e wiremix"|' "$waybar_config"
-  omarchy-state set restart-waybar-required
-fi
-
-# Update hyprland window rules to use DNS-format class names
-system_conf=~/.config/hypr/apps/system.conf
-if [[ -f $system_conf ]]; then
-  if grep -q 'class:(.*|Impala|' "$system_conf" || grep -q 'class:(.*|Wiremix|' "$system_conf" || grep -q '|Omarchy|' "$system_conf"; then
-    sed -i 's/\bImpala\b/com.omarchy.Impala/g; s/\bWiremix\b/com.omarchy.Wiremix/g; s/|Omarchy|/|com.omarchy.Omarchy|/g' "$system_conf"
-  fi
-fi
diff --git a/migrations/1762150269.sh b/migrations/1762150269.sh
deleted file mode 100644
index 3314021e..00000000
--- a/migrations/1762150269.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Install omarchy-walker meta package"
-omarchy-pkg-add omarchy-walker
diff --git a/migrations/1762156000.sh b/migrations/1762156000.sh
deleted file mode 100644
index 266daf38..00000000
--- a/migrations/1762156000.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Drop wayfreeze as hyprpicker replaces its function"
-
-omarchy-pkg-drop wayfreeze-git wayfreeze
diff --git a/migrations/1762352101.sh b/migrations/1762352101.sh
deleted file mode 100644
index 9b69745a..00000000
--- a/migrations/1762352101.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Increase Walker limit on how many entries can be shown to 256"
-
-if ! grep -q "max_results" ~/.config/walker/config.toml; then
-  sed -i '/^\[providers\]$/a max_results = 256' ~/.config/walker/config.toml
-fi
diff --git a/migrations/1762417304.sh b/migrations/1762417304.sh
deleted file mode 100644
index a3c9e03c..00000000
--- a/migrations/1762417304.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Replace bluetooth GUI with TUI"
-
-omarchy-pkg-add bluetui
-omarchy-pkg-drop blueberry
-
-if ! grep -q "omarchy-launch-bluetooth" ~/.config/waybar/config.jsonc; then
-  sed -i 's/blueberry/omarchy-launch-bluetooth/' ~/.config/waybar/config.jsonc
-fi
diff --git a/migrations/1762446739.sh b/migrations/1762446739.sh
deleted file mode 100644
index c58de3f5..00000000
--- a/migrations/1762446739.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-echo "Remove alternative limine.conf files"
-
-if omarchy-cmd-present limine; then
-  if [[ ! -f /boot/limine.conf ]]; then
-    echo "Error: /boot/limine.conf does not exist. Do not reboot without resolving this issue!"
-    exit 1
-  fi
-
-  sudo rm -f /boot/EFI/limine/limine.conf
-  sudo rm -f /boot/EFI/BOOT/limine.conf
-  sudo rm -f /boot/limine/limine.conf
-fi
diff --git a/migrations/1762684663.sh b/migrations/1762684663.sh
deleted file mode 100644
index 0d35aecb..00000000
--- a/migrations/1762684663.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-echo "Update hyprlock font to match current system font"
-
-font_name=$(omarchy-font-current)
-
-if [[ -n $font_name ]]; then
-  cp ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak.$(date +%s)
-
-  echo "Found font '$font_name', updating hyprlock"
-  sed -i "s/font_family = .*/font_family = $font_name/g" ~/.config/hypr/hyprlock.conf
-else
-  echo "No font found, skipping migration"
-fi
diff --git a/migrations/1762685081.sh b/migrations/1762685081.sh
deleted file mode 100644
index 5f48b054..00000000
--- a/migrations/1762685081.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-echo "Update hyprlock placeholder text based on fingerprint setup status"
-
-cp ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak.$(date +%s)
-
-# Check if fprintd is installed and has enrolled fingerprints
-if command -v fprintd-list &>/dev/null && fprintd-list "$USER" 2>/dev/null | grep -q "Fingerprints for user"; then
-  echo "Fingerprint detected, updating placeholder text with fingerprint icon"
-  sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password 󰈷 <\/span>/' ~/.config/hypr/hyprlock.conf
-else
-  echo "No fingerprint enrolled, updating placeholder text without fingerprint icon"
-  sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
-fi
diff --git a/migrations/1762711005.sh b/migrations/1762711005.sh
deleted file mode 100644
index 0ebf1d8a..00000000
--- a/migrations/1762711005.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add usage package to provide tab completion for mise"
-
-omarchy-pkg-add usage
diff --git a/migrations/1762768186.sh b/migrations/1762768186.sh
deleted file mode 100644
index 93bc3634..00000000
--- a/migrations/1762768186.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Ensure config/uwsm/default uses generic terminal exec"
-
-sed -i 's/export TERMINAL=.*/export TERMINAL=xdg-terminal-exec/' ~/.config/uwsm/default
diff --git a/migrations/1762770442.sh b/migrations/1762770442.sh
deleted file mode 100644
index f312b393..00000000
--- a/migrations/1762770442.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Slow down Ghostty mouse scrolling to match Alacritty"
-
-if ! grep -q "mouse-scroll-multiplier" ~/.config/ghostty/config; then
-  echo -e "\n# Slowdown mouse scrolling\nmouse-scroll-multiplier = 0.95" >> ~/.config/ghostty/config
-fi
diff --git a/migrations/1762770815.sh b/migrations/1762770815.sh
deleted file mode 100644
index 36e6a4b4..00000000
--- a/migrations/1762770815.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Pull packages from stable Arch mirror"
-
-omarchy-refresh-pacman
diff --git a/migrations/1762781907.sh b/migrations/1762781907.sh
deleted file mode 100644
index 8291dd0f..00000000
--- a/migrations/1762781907.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Add try command for managing quick code experiments"
-
-omarchy-pkg-add ruby tobi-try
-mkdir -p ~/Work/tries
diff --git a/migrations/1762802472.sh b/migrations/1762802472.sh
deleted file mode 100644
index 95856362..00000000
--- a/migrations/1762802472.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Update imv config with new keybindings"
-
-mkdir -p ~/.config/imv
-cp $OMARCHY_PATH/config/imv/config ~/.config/imv/
diff --git a/migrations/1762873545.sh b/migrations/1762873545.sh
deleted file mode 100644
index 91ae2220..00000000
--- a/migrations/1762873545.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Switch Elephant to run as a systemd service and walker to be autostarted on login"
-
-pkill elephant
-elephant service enable
-systemctl --user start elephant.service
-
-pkill walker
-mkdir -p ~/.config/autostart/
-cp $OMARCHY_PATH/default/walker/walker.desktop ~/.config/autostart/
-setsid walker --gapplication-service &
diff --git a/migrations/1763386443.sh b/migrations/1763386443.sh
deleted file mode 100644
index e6d806d4..00000000
--- a/migrations/1763386443.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Uniquely identify terminal apps with custom app-ids using omarchy-launch-tui"
-
-# Replace terminal -e calls with omarchy-launch-tui in bindings
-sed -i 's/\$terminal -e \([^ ]*\)/omarchy-launch-tui \1/g' ~/.config/hypr/bindings.conf
-
-# Update waybar to use omarchy-launch-or-focus with omarchy-launch-tui for TUI apps
-sed -i 's|xdg-terminal-exec btop|omarchy-launch-or-focus-tui btop|' ~/.config/waybar/config.jsonc
-sed -i 's|xdg-terminal-exec --app-id=com\.omarchy\.Wiremix -e wiremix|omarchy-launch-or-focus-tui wiremix|' ~/.config/waybar/config.jsonc
diff --git a/migrations/1763393133.sh b/migrations/1763393133.sh
deleted file mode 100644
index f84cf74d..00000000
--- a/migrations/1763393133.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Link new theme picker config"
-
-mkdir -p ~/.config/elephant/menus
-ln -snf $OMARCHY_PATH/default/elephant/omarchy_themes.lua ~/.config/elephant/menus/omarchy_themes.lua
-sed -i '/"menus",/d' ~/.config/walker/config.toml
-omarchy-restart-walker
diff --git a/migrations/1763409182.sh b/migrations/1763409182.sh
deleted file mode 100644
index 74199ce4..00000000
--- a/migrations/1763409182.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install exfatprogs to support exfat in format-drive"
-
-omarchy-pkg-add exfatprogs
diff --git a/migrations/1763409505.sh b/migrations/1763409505.sh
deleted file mode 100644
index ad1995be..00000000
--- a/migrations/1763409505.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add 10th workspace option to waybar config"
-
-if ! grep -q '"10": "0",' ~/.config/waybar/config.jsonc; then
-  sed -i '/"9": "9",/a\      "10": "0",' ~/.config/waybar/config.jsonc
-fi
diff --git a/migrations/1763478660.sh b/migrations/1763478660.sh
deleted file mode 100644
index f7eec943..00000000
--- a/migrations/1763478660.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Configure XDPH config for screensharing to remember token selection"
-
-cp $OMARCHY_PATH/config/hypr/xdph.conf ~/.config/hypr/
-systemctl --user restart xdg-desktop-portal-hyprland
diff --git a/migrations/1763558828.sh b/migrations/1763558828.sh
deleted file mode 100644
index 3da9eec0..00000000
--- a/migrations/1763558828.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-echo "Make Alacritty compatible with X-TerminalArgs"
-
-if omarchy-pkg-present alacritty; then
-  mkdir -p ~/.local/share/applications
-  cat > ~/.local/share/applications/Alacritty.desktop << EOF
-[Desktop Entry]
-Type=Application
-TryExec=alacritty
-Exec=alacritty
-Icon=Alacritty
-Terminal=false
-Categories=System;TerminalEmulator;
-Name=Alacritty
-GenericName=Terminal
-Comment=A fast, cross-platform, OpenGL terminal emulator
-StartupNotify=true
-StartupWMClass=Alacritty
-Actions=New;
-X-TerminalArgExec=-e
-X-TerminalArgAppId=--class=
-X-TerminalArgTitle=--title=
-X-TerminalArgDir=--working-directory=
-
-[Desktop Action New]
-Name=New Terminal
-Exec=alacritty
-EOF
-fi
diff --git a/migrations/1763560161.sh b/migrations/1763560161.sh
deleted file mode 100644
index b3956966..00000000
--- a/migrations/1763560161.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Hide Bluetooth module in waybar if there's no BT controller"
-
-sed -i '/format-connected": "",/a\    "format-no-controller": "",' ~/.config/waybar/config.jsonc
diff --git a/migrations/1763561396.sh b/migrations/1763561396.sh
deleted file mode 100644
index d69e51e1..00000000
--- a/migrations/1763561396.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Switch to stable Omarchy Package Repository builds"
-
-omarchy-refresh-pacman
diff --git a/migrations/1763583093.sh b/migrations/1763583093.sh
deleted file mode 100644
index 85cd0c2f..00000000
--- a/migrations/1763583093.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Make ethereal available as new theme"
-
-if [[ ! -L ~/.config/omarchy/themes/ethereal ]]; then
-  rm -rf ~/.config/omarchy/themes/ethereal
-  ln -nfs ~/.local/share/omarchy/themes/ethereal ~/.config/omarchy/themes/
-fi
diff --git a/migrations/1763626772.sh b/migrations/1763626772.sh
deleted file mode 100644
index aa02e9f9..00000000
--- a/migrations/1763626772.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Make hackerman available as new theme"
-
-if [[ ! -L ~/.config/omarchy/themes/hackerman ]]; then
-  rm -rf ~/.config/omarchy/themes/hackerman
-  ln -nfs ~/.local/share/omarchy/themes/hackerman ~/.config/omarchy/themes/
-fi
diff --git a/migrations/1763633307.sh b/migrations/1763633307.sh
deleted file mode 100644
index d93893f7..00000000
--- a/migrations/1763633307.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add 100-line split resizing keybindings to Ghostty"
-
-if ! grep -q "resize_split:down,100" ~/.config/ghostty/config; then
-  sed -i "/keybind = control+insert=copy_to_clipboard/a\keybind = super+control+shift+alt+arrow_down=resize_split:down,100\nkeybind = super+control+shift+alt+arrow_up=resize_split:up,100\nkeybind = super+control+shift+alt+arrow_left=resize_split:left,100\nkeybind = super+control+shift+alt+arrow_right=resize_split:right,100" ~/.config/ghostty/config
-fi
diff --git a/migrations/1763634099.sh b/migrations/1763634099.sh
deleted file mode 100644
index 267558b6..00000000
--- a/migrations/1763634099.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Using 󰂱 icon for bluetooth when connected"
-
-sed -i 's/"format-connected": "",/"format-connected": "󰂱",/' ~/.config/waybar/config.jsonc
diff --git a/migrations/1763653692.sh b/migrations/1763653692.sh
deleted file mode 100644
index 46e2af14..00000000
--- a/migrations/1763653692.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Replace Waybar dock icon with something more obvious"
-
-sed -i 's/"format": ""/"format": ""/' ~/.config/waybar/config.jsonc
-sed -i '/#custom-expand-icon {/,/}/ s/margin-right: 20px;/margin-right: 18px;/' ~/.config/waybar/style.css
-omarchy-restart-waybar
diff --git a/migrations/1763743755.sh b/migrations/1763743755.sh
deleted file mode 100644
index db73b86e..00000000
--- a/migrations/1763743755.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Refresh Walker config to ensure compatibility with latest version"
-
-omarchy-refresh-walker
diff --git a/migrations/1763753641.sh b/migrations/1763753641.sh
deleted file mode 100644
index 40d83994..00000000
--- a/migrations/1763753641.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Include pacman mirror and OPR upstreams (edge vs stable) in About"
-
-omarchy-refresh-fastfetch
diff --git a/migrations/1764067068.sh b/migrations/1764067068.sh
deleted file mode 100644
index 01843585..00000000
--- a/migrations/1764067068.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Use Bluetooth off icon in the waybar when BlueTUI has turned off the adapter"
-
-if ! grep -q '"format-off": "󰂲"' ~/.config/waybar/config.jsonc; then
-  sed -i '/"format-disabled": "󰂲",/a\    "format-off": "󰂲",' ~/.config/waybar/config.jsonc
-  omarchy-restart-waybar
-fi
diff --git a/migrations/1764067963.sh b/migrations/1764067963.sh
deleted file mode 100644
index 99590cbb..00000000
--- a/migrations/1764067963.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Ensure lockout limit is reset on reboot"
-
-sudo sed -i '/pam_faillock\.so preauth/d' /etc/pam.d/sddm-autologin
-sudo sed -i '/auth.*pam_permit\.so/a auth        required    pam_faillock.so authsucc' /etc/pam.d/sddm-autologin
diff --git a/migrations/1764272475.sh b/migrations/1764272475.sh
deleted file mode 100644
index 36a7299a..00000000
--- a/migrations/1764272475.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Update Plymouth theme for a smoother progress bar animation"
-omarchy-refresh-plymouth
diff --git a/migrations/1764332115.sh b/migrations/1764332115.sh
deleted file mode 100644
index f9df037d..00000000
--- a/migrations/1764332115.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Ensure emoji menu (Super + Ctrl + E) uses single column design"
-
-omarchy-refresh-walker
diff --git a/migrations/1764333665.sh b/migrations/1764333665.sh
deleted file mode 100644
index e6d5fee5..00000000
--- a/migrations/1764333665.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Ensure you have package repository indexes matching your channel"
-
-sudo pacman -Syyu --noconfirm
diff --git a/migrations/1764378788.sh b/migrations/1764378788.sh
deleted file mode 100644
index de9b5f13..00000000
--- a/migrations/1764378788.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Ignore empty passwords on lock screen"
-
-if ! grep -q "ignore_empty_input" ~/.config/hypr/hyprlock.conf; then
-  sed -i "/source =/a\ \ngeneral {\n    ignore_empty_input = true\n}" ~/.config/hypr/hyprlock.conf
-fi
diff --git a/migrations/1765587218.sh b/migrations/1765587218.sh
deleted file mode 100644
index 6d58bd9e..00000000
--- a/migrations/1765587218.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-echo "Add custom share portal picker"
-omarchy-pkg-add hyprland-preview-share-picker
-
-mkdir -p ~/.config/hyprland-preview-share-picker
-omarchy-refresh-config hyprland-preview-share-picker/config.yaml
-
-if ! grep -q "custom_picker_binary" ~/.config/hypr/xdph.conf; then
-  sed -i '/screencopy {/a\    custom_picker_binary = hyprland-preview-share-picker' ~/.config/hypr/xdph.conf
-fi
-
-sleep 1
-killall -e xdg-desktop-portal-hyprland
-killall -e xdg-desktop-portal-wlr
-killall xdg-desktop-portal
-/usr/lib/xdg-desktop-portal-hyprland &
-sleep 2
-/usr/lib/xdg-desktop-portal &
diff --git a/migrations/1765729055.sh b/migrations/1765729055.sh
deleted file mode 100644
index 23c11e77..00000000
--- a/migrations/1765729055.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Add emergency entry for Walker"
-CONFIG_FILE="$HOME/.config/walker/config.toml"
-
-if [[ -f $CONFIG_FILE ]] && ! grep -q 'command = "omarchy-restart-walker"' "$CONFIG_FILE"; then
-    cat >> "$CONFIG_FILE" << 'EOF'
-
-[[emergencies]]
-text = "Restart Walker"
-command = "omarchy-restart-walker"
-EOF
-fi
diff --git a/migrations/1765739892.sh b/migrations/1765739892.sh
deleted file mode 100644
index 845270b3..00000000
--- a/migrations/1765739892.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-if omarchy-cmd-present btrfs && omarchy-cmd-present snapper; then
-  echo "Adjust snapper space limits & enable btrfs quota"
-
-  sudo sed -i 's/^SPACE_LIMIT="0.5"/SPACE_LIMIT="0.3"/' /etc/snapper/configs/{root,home} 2>/dev/null
-  sudo sed -i 's/^FREE_LIMIT="0.2"/FREE_LIMIT="0.3"/' /etc/snapper/configs/{root,home} 2>/dev/null
-  sudo btrfs quota enable /
-fi
diff --git a/migrations/1765744321.sh b/migrations/1765744321.sh
deleted file mode 100644
index adc32e79..00000000
--- a/migrations/1765744321.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Increase faillock attempts to 10"
-sudo sed -i 's/^# *deny = .*/deny = 10/' /etc/security/faillock.conf
diff --git a/migrations/1765846739.sh b/migrations/1765846739.sh
deleted file mode 100644
index 5c7634be..00000000
--- a/migrations/1765846739.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add missing dotnet 9.0 for Pinta"
-
-omarchy-pkg-add dotnet-runtime-9.0
diff --git a/migrations/1765884267.sh b/migrations/1765884267.sh
deleted file mode 100644
index f418914d..00000000
--- a/migrations/1765884267.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Change to openai-codex instead of openai-codex-bin"
-
-if omarchy-pkg-present openai-codex-bin; then
-    omarchy-pkg-drop openai-codex-bin
-    omarchy-pkg-add openai-codex
-fi
diff --git a/migrations/1766942230.sh b/migrations/1766942230.sh
deleted file mode 100644
index 7e51c021..00000000
--- a/migrations/1766942230.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-echo "Migrate legacy NVIDIA GPUs to nvidia-580xx driver (if needed)"
-
-# Only migrate GTX 9xx or 10xx (Pascal/Maxwell)
-NVIDIA="$(lspci | grep -i 'nvidia')"
-if echo "$NVIDIA" | grep -qE "GTX 9|GTX 10"; then
-  if ! pacman -Qq | grep -qE '^linux(-[a-z0-9]+)?-headers$'; then
-    echo "Error: no linux headers package installed (required for DKMS drivers). Please install the appropriate headers and re-run this migration."
-    exit 1
-  fi
-
-  # Piping yes to override existing packages
-  yes | sudo pacman -S nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils
-
-  # Verify packages were installed
-  if ! pacman -Qq nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils &>/dev/null; then
-    echo "Error: NVIDIA 580xx driver packages failed to install"
-    exit 1
-  fi
-fi
diff --git a/migrations/1767138576.sh b/migrations/1767138576.sh
deleted file mode 100644
index 9771e316..00000000
--- a/migrations/1767138576.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Update terminal scrolltouchpad setting to Hyprland 0.53 style"
-
-if grep -q "scrolltouchpad" ~/.config/hypr/input.conf; then
-  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:\(([^)]+)\)\s*$/windowrule = match:class (\2), scroll_touchpad \1/' ~/.config/hypr/input.conf
-  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:([^ ]+)\s*$/windowrule = match:class \2, scroll_touchpad \1/' ~/.config/hypr/input.conf
-  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), tag:terminal\s*$/windowrule = match:class (Alacritty|kitty), scroll_touchpad 1.5\nwindowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2/' ~/.config/hypr/input.conf
-fi
-
-# Ensure we restart to pair new Hyprland settings with new version
-omarchy-state set reboot-required
diff --git a/migrations/1767227973.sh b/migrations/1767227973.sh
deleted file mode 100644
index 549727c9..00000000
--- a/migrations/1767227973.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Replace Waybar omarchy-launch-or-focus-tui wiremix with omarchy-launch-audio"
-
-sed -i 's/omarchy-launch-or-focus-tui wiremix/omarchy-launch-audio/g' ~/.config/waybar/config.jsonc
diff --git a/migrations/1767306902.sh b/migrations/1767306902.sh
deleted file mode 100644
index 18d1b395..00000000
--- a/migrations/1767306902.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-echo "Migrate to new theme setup"
-
-# Move user-added backgrounds from Omarchy theme folders to user config
-OMARCHY_DIR="$HOME/.local/share/omarchy"
-USER_BACKGROUNDS_DIR="$HOME/.config/omarchy/backgrounds"
-
-if [[ -d $OMARCHY_DIR/themes ]]; then
-  cd "$OMARCHY_DIR"
-
-  # Get list of git-tracked background files (relative to omarchy dir)
-  mapfile -t TRACKED_BACKGROUNDS < <(git ls-files --cached 'themes/*/backgrounds/*' 2>/dev/null)
-
-  # Find all background files and check if they're untracked (user-added)
-  for theme_dir in themes/*/; do
-    theme_name=$(basename "$theme_dir")
-    backgrounds_dir="themes/$theme_name/backgrounds"
-
-    [[ -d $backgrounds_dir ]] || continue
-
-    for bg_file in "$backgrounds_dir"/*; do
-      [[ -f $bg_file ]] || continue
-
-      # Check if this file is tracked by git
-      is_tracked=false
-      for tracked in "${TRACKED_BACKGROUNDS[@]}"; do
-        if [[ $tracked == $bg_file ]]; then
-          is_tracked=true
-          break
-        fi
-      done
-
-      if [[ $is_tracked == "false" ]]; then
-        # This is a user-added background, move it to user config
-        user_theme_bg_dir="$USER_BACKGROUNDS_DIR/$theme_name"
-        mkdir -p "$user_theme_bg_dir"
-        mv "$bg_file" "$user_theme_bg_dir/"
-        echo "Moved user background: $bg_file -> $user_theme_bg_dir/"
-      fi
-    done
-  done
-fi
-
-THEMES_DIR="$HOME/.config/omarchy/themes"
-CURRENT_THEME_LINK="$HOME/.config/omarchy/current/theme"
-
-# Get current theme name before removing anything
-CURRENT_THEME_NAME=""
-if [[ -L $CURRENT_THEME_LINK ]]; then
-  CURRENT_THEME_NAME=$(basename "$(readlink "$CURRENT_THEME_LINK")")
-elif [[ -d $CURRENT_THEME_LINK ]]; then
-  CURRENT_THEME_NAME=$(basename "$CURRENT_THEME_LINK")
-elif [[ -f $HOME/.config/omarchy/current/theme.name ]]; then
-  CURRENT_THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name")
-fi
-
-# Remove all symlinks from ~/.config/omarchy/themes
-find "$THEMES_DIR" -mindepth 1 -maxdepth 1 -type l -delete
-
-# Re-apply the current theme with the new system
-if [[ -n $CURRENT_THEME_NAME ]]; then
-  omarchy-theme-set "$CURRENT_THEME_NAME"
-else
-  # Backup to ensure a theme is set if we can't deduce the name
-  omarchy-theme-set "Tokyo Night"
-fi
diff --git a/migrations/1767414310.sh b/migrations/1767414310.sh
deleted file mode 100644
index a0f3fbe2..00000000
--- a/migrations/1767414310.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Use correct idle-timer sensitive timeouts for lock screen"
-
-sed -i 's/timeout = 300/timeout = 151/' ~/.config/hypr/hypridle.conf
diff --git a/migrations/1767478141.sh b/migrations/1767478141.sh
deleted file mode 100644
index 96d25cf8..00000000
--- a/migrations/1767478141.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add Omarchy AI skill for assistance tailoring the system"
-
-source $OMARCHY_PATH/install/config/omarchy-ai-skill.sh
diff --git a/migrations/1767478687.sh b/migrations/1767478687.sh
deleted file mode 100644
index 3793cb1b..00000000
--- a/migrations/1767478687.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Add opencode with system theming"
-
-omarchy-pkg-add opencode
-
-# Add config using omarchy theme by default
-if [[ ! -f ~/.config/opencode/opencode.json ]]; then
-  mkdir -p ~/.config/opencode
-  cp $OMARCHY_PATH/config/opencode/opencode.json ~/.config/opencode/opencode.json
-fi
diff --git a/migrations/1767685679.sh b/migrations/1767685679.sh
deleted file mode 100644
index 55c7baba..00000000
--- a/migrations/1767685679.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-echo "Add Voxtype to Waybar"
-
-STYLE_FILE=~/.config/waybar/style.css
-CONFIG_FILE=~/.config/waybar/config.jsonc
-
-# Add voxtype CSS if not present
-if ! grep -q "#custom-voxtype" "$STYLE_FILE"; then
-  sed -i 's/margin-left: 8\.75px;/margin-left: 5px;/' "$STYLE_FILE"
-  sed -i '/#custom-screenrecording-indicator {/,/}/ s/font-size: 10px;/font-size: 10px;\n  padding-bottom: 1px;/' "$STYLE_FILE"
-  cat >> "$STYLE_FILE" << 'EOF'
-
-#custom-voxtype {
-  min-width: 12px;
-  margin: 0 0 0 7.5px;
-}
-
-#custom-voxtype.recording {
-  color: #a55555;
-}
-EOF
-fi
-
-# Add voxtype to modules-center if not present
-if ! grep -q "custom/voxtype" "$CONFIG_FILE"; then
-  # Add to modules-center array
-  sed -i 's/"custom\/screenrecording-indicator"]/"custom\/voxtype", "custom\/screenrecording-indicator"]/' "$CONFIG_FILE"
-
-  # Add voxtype config block before tray config
-  sed -i '/"tray": {/i\  "custom/voxtype": {\n    "exec": "omarchy-voxtype-status",\n    "return-type": "json",\n    "format": "{icon}",\n    "format-icons": {\n      "idle": "",\n      "recording": "󰍬",\n      "transcribing": "󰔟"\n    },\n    "tooltip": true,\n    "on-click-right": "omarchy-voxtype-config",\n    "on-click": "omarchy-voxtype-model"\n  },' "$CONFIG_FILE"
-fi
-
-omarchy-restart-waybar
diff --git a/migrations/1767716691.sh b/migrations/1767716691.sh
deleted file mode 100644
index c98ebfb6..00000000
--- a/migrations/1767716691.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-echo "Add icons for additional audio profiles in Waybar"
-
-if ! grep -q '"headphone": ""' "$HOME/.config/waybar/config.jsonc"; then
-  sed -i '
-    /"pulseaudio": {/,/^[ ]*}/{
-      /"format-icons": {/,/^[ ]*}/{
-        /"default":/i\
-\      "headphone": "",
-      }
-    }
-  ' "$HOME/.config/waybar/config.jsonc"
-
-  omarchy-restart-waybar
-fi
diff --git a/migrations/1767865784.sh b/migrations/1767865784.sh
deleted file mode 100644
index ebefa8d2..00000000
--- a/migrations/1767865784.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Ensure Chromium is able to start on first run after ISO 3.3.0 install"
-
-rm -rf ~/.config/chromium/SingletonLock
diff --git a/migrations/1768236764.sh b/migrations/1768236764.sh
deleted file mode 100644
index 38e02bd6..00000000
--- a/migrations/1768236764.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Prevent kernel upgrades from making current modules unavailable"
-
-omarchy-pkg-add kernel-modules-hook
-sudo systemctl enable --now linux-modules-cleanup.service
diff --git a/migrations/1768270644.sh b/migrations/1768270644.sh
deleted file mode 100644
index 59083d19..00000000
--- a/migrations/1768270644.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-echo "Add icon for headset audio profile in Waybar"
-
-if ! grep -q '"headset": ""' "$HOME/.config/waybar/config.jsonc"; then
-  sed -i '
-    /"pulseaudio": {/,/^[ ]*}/{
-      /"format-icons": {/,/^[ ]*}/{
-        /"default":/i\
-\      "headset": "",
-      }
-    }
-  ' "$HOME/.config/waybar/config.jsonc"
-
-  omarchy-restart-waybar
-fi
diff --git a/migrations/1768906440.sh b/migrations/1768906440.sh
deleted file mode 100644
index 19c676cd..00000000
--- a/migrations/1768906440.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-echo "Migrate legacy mobile NVIDIA GPUs to nvidia-580xx driver (if needed)"
-
-# Only migrate MX1xx, 2xx or 3xx (Pascal/Maxwell)
-NVIDIA="$(lspci | grep -i 'nvidia')"
-if echo "$NVIDIA" | grep -qE "MX1|MX2|MX3"; then
-  if ! pacman -Qq | grep -qE '^linux(-[a-z0-9]+)?-headers$'; then
-    echo "Error: no linux headers package installed (required for DKMS drivers). Please install the appropriate headers and re-run this migration."
-    exit 1
-  fi
-
-  # Piping yes to override existing packages
-  yes | sudo pacman -S nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils
-
-  # Verify packages were installed
-  if ! pacman -Qq nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils &>/dev/null; then
-    echo "Error: NVIDIA 580xx driver packages failed to install"
-    exit 1
-  fi
-fi
diff --git a/migrations/1768916735.sh b/migrations/1768916735.sh
deleted file mode 100644
index 3f788800..00000000
--- a/migrations/1768916735.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Fix microphone gain and audio mixing on Asus ROG laptops"
-
-source "$OMARCHY_PATH/install/config/hardware/asus/fix-mic.sh"
-source "$OMARCHY_PATH/install/config/hardware/asus/fix-audio-mixer.sh"
-
-if omarchy-hw-asus-rog; then
-  omarchy-restart-pipewire
-fi
diff --git a/migrations/1769182209.sh b/migrations/1769182209.sh
deleted file mode 100644
index ae4825de..00000000
--- a/migrations/1769182209.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Enable auto-pasting for the emoji picker"
-
-omarchy-refresh-config elephant/symbols.toml
-omarchy-restart-walker
diff --git a/migrations/1769183359.sh b/migrations/1769183359.sh
deleted file mode 100644
index dbdbedf2..00000000
--- a/migrations/1769183359.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add nautilus-python package for 'Open in Ghostty' shortcut in Nautilus"
-
-omarchy-pkg-add nautilus-python
diff --git a/migrations/1769510847.sh b/migrations/1769510847.sh
deleted file mode 100644
index 5ddfd508..00000000
--- a/migrations/1769510847.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Switch back to mainline chromium now that it supports full live theming"
-
-if omarchy-pkg-present omarchy-chromium; then
-  if gum confirm "Ready to switch to mainstream chromium? (Will close Chromium + reset settings)"; then
-    pkill -x chromium
-    omarchy-pkg-drop omarchy-chromium
-    omarchy-pkg-add chromium
-    omarchy-theme-set-browser
-  fi
-fi
diff --git a/migrations/1769543550.sh b/migrations/1769543550.sh
deleted file mode 100644
index 44c657c7..00000000
--- a/migrations/1769543550.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Add SUPER+ALT+SHIFT+F shortcut to open nautilus in cwd"
-
-# Add the new CWD binding if it doesn't exist
-if ! grep -q "SUPER ALT SHIFT, F" ~/.config/hypr/bindings.conf; then
-  sed -i '/bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window/a bindd = SUPER ALT SHIFT, F, File manager (cwd), exec, uwsm-app -- nautilus --new-window "$(omarchy-cmd-terminal-cwd)"' ~/.config/hypr/bindings.conf
-fi
diff --git a/migrations/1769566732.sh b/migrations/1769566732.sh
deleted file mode 100644
index f2df93c0..00000000
--- a/migrations/1769566732.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Set power profile based on source switching (AC or Battery)"
-
-source $OMARCHY_PATH/install/config/powerprofilesctl-rules.sh
diff --git a/migrations/1769616857.sh b/migrations/1769616857.sh
deleted file mode 100644
index 34e57bdf..00000000
--- a/migrations/1769616857.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Turn off opencode's own auto-update feature (we rely on pacman)"
-
-omarchy-refresh-config opencode/opencode.json
diff --git a/migrations/1769619823.sh b/migrations/1769619823.sh
deleted file mode 100644
index 47f1f482..00000000
--- a/migrations/1769619823.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Open directories in file manager using the shell open command"
-
-xdg-mime default org.gnome.Nautilus.desktop inode/directory
diff --git a/migrations/1769964367.sh b/migrations/1769964367.sh
deleted file mode 100644
index 487f4d32..00000000
--- a/migrations/1769964367.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Improve audio controls icon for default selection"
-
-if [[ ! -f ~/.config/wiremix/wiremix.toml ]]; then
-  mkdir -p ~/.config/wiremix
-  cp -f $OMARCHY_PATH/config/wiremix/wiremix.toml ~/.config/wiremix/
-fi
diff --git a/migrations/1770159912.sh b/migrations/1770159912.sh
deleted file mode 100644
index 41d8115d..00000000
--- a/migrations/1770159912.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-echo "Fix NVIDIA environment variables for Maxwell/Pascal/Volta GPUs"
-
-# Detect if user has Maxwell/Pascal/Volta GPU (pre-Turing cards without GSP firmware)
-# Maxwell (GTX 9xx), Pascal (GT/GTX 10xx, Quadro P, MX series), Volta (Titan V, Tesla V100, Quadro GV100)
-NVIDIA="$(lspci | grep -i 'nvidia')"
-if echo "$NVIDIA" | grep -qE "GTX (9[0-9]{2}|10[0-9]{2})|GT 10[0-9]{2}|Quadro [PM][0-9]{3,4}|Quadro GV100|MX *[0-9]+|Titan (X|Xp|V)|Tesla V100"; then
-  ENVS_CONF="$HOME/.config/hypr/envs.conf"
-
-  if [[ -f $ENVS_CONF ]]; then
-    # Check if file contains problematic variables
-    if grep -qE "env = (NVD_BACKEND,direct|LIBVA_DRIVER_NAME,nvidia)" "$ENVS_CONF"; then
-      echo "Removing incompatible NVIDIA environment variables for legacy GPU..."
-
-      # Create backup
-      cp "$ENVS_CONF" "$ENVS_CONF.bak.$(date +%s)"
-
-      # Remove all NVIDIA env lines and section headers (we re-add the correct ones below)
-      sed -i '/^env = \(NVD_BACKEND\|LIBVA_DRIVER_NAME\|__GLX_VENDOR_LIBRARY_NAME\),/d; /^# NVIDIA/d' "$ENVS_CONF"
-
-      # Add correct environment variables for legacy GPUs
-      cat >>"$ENVS_CONF" <<'EOF'
-
-# NVIDIA (Maxwell/Pascal/Volta without GSP firmware)
-env = NVD_BACKEND,egl
-env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-EOF
-
-      echo "NVIDIA environment variables updated. A backup was saved to $ENVS_CONF.bak.*"
-      echo "Please restart Hyprland for changes to take effect."
-    fi
-  fi
-fi
diff --git a/migrations/1770372978.sh b/migrations/1770372978.sh
deleted file mode 100644
index 8ce213b6..00000000
--- a/migrations/1770372978.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Disable fingerprint in hyprlock if fingerprint auth is not configured"
-
-if omarchy-cmd-missing fprintd-list || ! fprintd-list "$USER" 2>/dev/null | grep -q "finger"; then
-  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = false/' ~/.config/hypr/hyprlock.conf
-fi
diff --git a/migrations/1770375655.sh b/migrations/1770375655.sh
deleted file mode 100644
index 8c2f3727..00000000
--- a/migrations/1770375655.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add Super+Shift+Return binding for browser"
-
-if [[ -f ~/.config/hypr/bindings.conf ]] && ! grep -q "SUPER SHIFT, RETURN.*Browser" ~/.config/hypr/bindings.conf; then
-  sed -i '/^bindd = SUPER, RETURN, Terminal/a bindd = SUPER SHIFT, RETURN, Browser, exec, omarchy-launch-browser' ~/.config/hypr/bindings.conf
-fi
diff --git a/migrations/1770375817.sh b/migrations/1770375817.sh
deleted file mode 100644
index 28e03f8a..00000000
--- a/migrations/1770375817.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Ensure walker service is restarted if it's killed or crashes"
-
-mkdir -p ~/.config/systemd/user/app-walker@autostart.service.d/
-cp $OMARCHY_PATH/default/walker/restart.conf ~/.config/systemd/user/app-walker@autostart.service.d/restart.conf
-systemctl --user daemon-reload
-
diff --git a/migrations/1770380577.sh b/migrations/1770380577.sh
deleted file mode 100644
index a9b0ca8b..00000000
--- a/migrations/1770380577.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Use interactive background selector menu"
-
-mkdir -p ~/.config/elephant/menus
-ln -snf $OMARCHY_PATH/default/elephant/omarchy_background_selector.lua ~/.config/elephant/menus/omarchy_background_selector.lua
-omarchy-restart-walker
diff --git a/migrations/1770393078.sh b/migrations/1770393078.sh
deleted file mode 100644
index 79238051..00000000
--- a/migrations/1770393078.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Add async-backend = epoll to ghostty config to fix high IO pressure"
-
-if [[ -f ~/.config/ghostty/config ]] && ! grep -q "^async-backend" ~/.config/ghostty/config; then
-  echo "" >> ~/.config/ghostty/config
-  echo "# Fix general slowness on hyprland (https://github.com/ghostty-org/ghostty/discussions/3224)" >> ~/.config/ghostty/config
-  echo "async-backend = epoll" >> ~/.config/ghostty/config
-fi
diff --git a/migrations/1770483021.sh b/migrations/1770483021.sh
deleted file mode 100644
index d4576694..00000000
--- a/migrations/1770483021.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Install Framework 16 keyboard RGB support"
-
-source $OMARCHY_PATH/install/packaging/framework16.sh
-source $OMARCHY_PATH/install/config/hardware/framework/qmk-hid.sh
diff --git a/migrations/1770638893.sh b/migrations/1770638893.sh
deleted file mode 100644
index 0e5f2e54..00000000
--- a/migrations/1770638893.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Add Tmux as an option with themed styling"
-
-omarchy-pkg-add tmux
-
-if [[ ! -f ~/.config/tmux/tmux.conf ]]; then
-  mkdir -p ~/.config/tmux
-  cp $OMARCHY_PATH/config/tmux/tmux.conf ~/.config/tmux/tmux.conf
-  omarchy-theme-refresh
-fi
diff --git a/migrations/1770811646.sh b/migrations/1770811646.sh
deleted file mode 100644
index efb50931..00000000
--- a/migrations/1770811646.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Disable WiFi power save on AC power"
-
-source $OMARCHY_PATH/install/config/wifi-powersave-rules.sh
diff --git a/migrations/1771002522.sh b/migrations/1771002522.sh
deleted file mode 100644
index a4550bc5..00000000
--- a/migrations/1771002522.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Add full OSC 52 support to Alacritty"
-
-ALACRITTY_CONFIG=~/.config/alacritty/alacritty.toml
-
-if [[ -f $ALACRITTY_CONFIG ]] && ! grep -q 'osc52' "$ALACRITTY_CONFIG"; then
-  cat >> "$ALACRITTY_CONFIG" << 'EOF'
-
-[terminal]
-osc52 = "CopyPaste"
-EOF
-fi
diff --git a/migrations/1771188969.sh b/migrations/1771188969.sh
deleted file mode 100644
index e89716e1..00000000
--- a/migrations/1771188969.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-echo "Remove temporary Wayland color manager disabling flag from existing Chromium configs"
-
-# This reverts the workaround originally added by migration 1760401344.sh
-# Remove flag and comment from chromium-flags.conf only if found
-if [[ -f ~/.config/chromium-flags.conf ]]; then
-    sed -i '/--disable-features=WaylandWpColorManagerV1/d' ~/.config/chromium-flags.conf
-    sed -i '/# Chromium crash workaround for Wayland color management on Hyprland/d' ~/.config/chromium-flags.conf
-fi
-
-# Remove flag and comment from brave-flags.conf only if found
-if [[ -f ~/.config/brave-flags.conf ]]; then
-    sed -i '/--disable-features=WaylandWpColorManagerV1/d' ~/.config/brave-flags.conf
-    sed -i '/# Chromium crash workaround for Wayland color management on Hyprland/d' ~/.config/brave-flags.conf
-fi
diff --git a/migrations/1771345870.sh b/migrations/1771345870.sh
deleted file mode 100644
index 3af93cd5..00000000
--- a/migrations/1771345870.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Switch lmstudio -> lmstudio-bin"
-
-if pacman -Q lmstudio &>/dev/null; then
-  omarchy-pkg-drop lmstudio
-  omarchy-pkg-add lmstudio-bin
-fi
diff --git a/migrations/1771403119.sh b/migrations/1771403119.sh
deleted file mode 100644
index 59bd6bda..00000000
--- a/migrations/1771403119.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Cure Chromium crash bug caused by mixing 145 and 144 sync logs"
-
-rm -f ~/.config/chromium/Default/"Sync Data"/LevelDB/*.log
diff --git a/migrations/1771602477.sh b/migrations/1771602477.sh
deleted file mode 100644
index f7bb4a61..00000000
--- a/migrations/1771602477.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-echo "Add idle lock indicator to Waybar"
-
-STYLE_FILE=~/.config/waybar/style.css
-CONFIG_FILE=~/.config/waybar/config.jsonc
-
-# Add idle-indicator to modules-center if not present
-if ! grep -q "custom/idle-indicator" "$CONFIG_FILE"; then
-  sed -i 's/"custom\/screenrecording-indicator"]/"custom\/screenrecording-indicator", "custom\/idle-indicator"]/' "$CONFIG_FILE"
-
-  sed -i '/"tray": {/i\  "custom/idle-indicator": {\n    "on-click": "omarchy-toggle-idle",\n    "exec": "$OMARCHY_PATH/default/waybar/indicators/idle.sh",\n    "signal": 9,\n    "return-type": "json"\n  },' "$CONFIG_FILE"
-fi
-
-# Add idle-indicator CSS if not present
-if ! grep -q "#custom-idle-indicator" "$STYLE_FILE"; then
-  # Remove screenrecording-indicator from shared margin block and pair it with idle-indicator instead
-  sed -i 's/^#custom-screenrecording-indicator,$//' "$STYLE_FILE"
-
-  # Add shared rule for both indicators and idle-indicator active state
-  sed -i '/#custom-screenrecording-indicator.active {/i\#custom-screenrecording-indicator,\n#custom-idle-indicator {\n  min-width: 12px;\n  margin-left: 5px;\n  margin-right: 0;\n  font-size: 10px;\n  padding-bottom: 1px;\n}\n' "$STYLE_FILE"
-
-  # Remove the now-duplicated properties from the standalone screenrecording block
-  sed -i '/#custom-screenrecording-indicator {/,/^}/ {
-    /min-width:/d
-    /margin-left:/d
-    /font-size:/d
-    /padding-bottom:/d
-    /^#custom-screenrecording-indicator {/d
-    /^}$/d
-  }' "$STYLE_FILE"
-
-  cat >> "$STYLE_FILE" << 'EOF'
-
-#custom-idle-indicator.active {
-  color: #a55555;
-}
-EOF
-fi
diff --git a/migrations/1771602647.sh b/migrations/1771602647.sh
deleted file mode 100644
index fa880780..00000000
--- a/migrations/1771602647.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-echo "Add notification silencing indicator to Waybar"
-
-STYLE_FILE=~/.config/waybar/style.css
-CONFIG_FILE=~/.config/waybar/config.jsonc
-
-# Add notification-silencing-indicator to modules-center if not present
-if ! grep -q "custom/notification-silencing-indicator" "$CONFIG_FILE"; then
-  sed -i 's/"custom\/idle-indicator"]/"custom\/idle-indicator", "custom\/notification-silencing-indicator"]/' "$CONFIG_FILE"
-
-  sed -i '/"tray": {/i\  "custom/notification-silencing-indicator": {\n    "on-click": "omarchy-toggle-notification-silencing",\n    "exec": "$OMARCHY_PATH/default/waybar/indicators/notification-silencing.sh",\n    "signal": 10,\n    "return-type": "json"\n  },' "$CONFIG_FILE"
-fi
-
-# Add notification-silencing-indicator CSS if not present
-if ! grep -q "#custom-notification-silencing-indicator" "$STYLE_FILE"; then
-  # Add to the shared indicator rule
-  sed -i 's/#custom-idle-indicator {/#custom-idle-indicator,\n#custom-notification-silencing-indicator {/' "$STYLE_FILE"
-
-  # Add to the shared active color rule
-  sed -i 's/#custom-idle-indicator.active {/#custom-idle-indicator.active,\n#custom-notification-silencing-indicator.active {/' "$STYLE_FILE"
-fi
-
-omarchy-restart-waybar
diff --git a/migrations/1771606080.sh b/migrations/1771606080.sh
deleted file mode 100644
index da064f38..00000000
--- a/migrations/1771606080.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Increase inotify file watchers for dev tools"
-
-bash $OMARCHY_PATH/install/config/increase-file-watchers.sh
diff --git a/migrations/1771606249.sh b/migrations/1771606249.sh
deleted file mode 100644
index af341555..00000000
--- a/migrations/1771606249.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Re-run scrolltouchpad migration for configs with trailing whitespace"
-
-if grep -q "scrolltouchpad" ~/.config/hypr/input.conf; then
-  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:\(([^)]+)\)\s*$/windowrule = match:class (\2), scroll_touchpad \1/' ~/.config/hypr/input.conf
-  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), class:([^ ]+)\s*$/windowrule = match:class \2, scroll_touchpad \1/' ~/.config/hypr/input.conf
-  sed -Ei 's/^windowrule = scrolltouchpad ([^,]+), tag:terminal\s*$/windowrule = match:class (Alacritty|kitty), scroll_touchpad 1.5\nwindowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2/' ~/.config/hypr/input.conf
-
-  omarchy-state set reboot-required
-fi
diff --git a/migrations/1771615907.sh b/migrations/1771615907.sh
deleted file mode 100644
index dc21029b..00000000
--- a/migrations/1771615907.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add emoji font fallback to fontconfig"
-cp $OMARCHY_PATH/config/fontconfig/fonts.conf ~/.config/fontconfig/fonts.conf
-fc-cache -f
diff --git a/migrations/1771618300.sh b/migrations/1771618300.sh
deleted file mode 100644
index 28794966..00000000
--- a/migrations/1771618300.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Turn off keyboard backlight when idle"
-cp $OMARCHY_PATH/config/hypr/hypridle.conf ~/.config/hypr/hypridle.conf
diff --git a/migrations/1771651931.sh b/migrations/1771651931.sh
deleted file mode 100644
index 2baba8fe..00000000
--- a/migrations/1771651931.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Hide wiremix and limine-snapper-restore from app launcher"
-
-cp $OMARCHY_PATH/applications/hidden/wiremix.desktop ~/.local/share/applications/
-cp $OMARCHY_PATH/applications/hidden/limine-snapper-restore.desktop ~/.local/share/applications/
diff --git a/migrations/1771667323.sh b/migrations/1771667323.sh
deleted file mode 100644
index d93b58af..00000000
--- a/migrations/1771667323.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Fix colored gutter in nvim by making line numbers transparent"
-
-TRANSPARENCY_FILE="$HOME/.config/nvim/plugin/after/transparency.lua"
-
-if [[ -f $TRANSPARENCY_FILE ]] && ! grep -q "LineNr" "$TRANSPARENCY_FILE"; then
-  sed -i '/SignColumn/a vim.api.nvim_set_hl(0, "LineNr", { bg = "none" })\nvim.api.nvim_set_hl(0, "CursorLineNr", { bg = "none" })' "$TRANSPARENCY_FILE"
-fi
diff --git a/migrations/1771670389.sh b/migrations/1771670389.sh
deleted file mode 100644
index 1cc282a1..00000000
--- a/migrations/1771670389.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Add Logout option to system menu"
-
-omarchy-refresh-sddm
-
-if [[ -f /etc/sddm.conf.d/autologin.conf ]]; then
-  sudo sed -i 's/^Current=.*/Current=omarchy/' /etc/sddm.conf.d/autologin.conf
-fi
diff --git a/migrations/1771682500.sh b/migrations/1771682500.sh
deleted file mode 100644
index d84e987f..00000000
--- a/migrations/1771682500.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-echo "Prevent SDDM password login from creating encrypted login keyring"
-
-# Rename the encrypted login keyring if it exists (it conflicts with the passwordless Default_keyring)
-if [[ -f $HOME/.local/share/keyrings/login.keyring ]]; then
-  mv "$HOME/.local/share/keyrings/login.keyring" "$HOME/.local/share/keyrings/login.keyring.bak"
-fi
-
-# Remove gnome-keyring auth/password lines from sddm PAM so password-based logins
-# don't create an encrypted login keyring. Keep the session line to start the daemon,
-# which will auto-unlock the passwordless Default_keyring.
-sudo sed -i '/-auth.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
-sudo sed -i '/-password.*pam_gnome_keyring\.so/d' /etc/pam.d/sddm
diff --git a/migrations/1771683168.sh b/migrations/1771683168.sh
deleted file mode 100644
index f5a47427..00000000
--- a/migrations/1771683168.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Fix User Manager hanging on shutdown"
-source $OMARCHY_PATH/install/config/fast-shutdown.sh
diff --git a/migrations/1771683296.sh b/migrations/1771683296.sh
deleted file mode 100644
index 5a7b9543..00000000
--- a/migrations/1771683296.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-echo "Migrate suspend toggle from opt-in to opt-out"
-
-SUSPEND_ON=~/.local/state/omarchy/toggles/suspend-on
-SUSPEND_OFF=~/.local/state/omarchy/toggles/suspend-off
-
-if [[ -f $SUSPEND_ON ]]; then
-  # User had suspend enabled, remove old file (suspend is now on by default)
-  rm -f $SUSPEND_ON
-else
-  # User had suspend disabled, create opt-out file to preserve their choice
-  mkdir -p "$(dirname $SUSPEND_OFF)"
-  touch $SUSPEND_OFF
-fi
diff --git a/migrations/1771847961.sh b/migrations/1771847961.sh
deleted file mode 100644
index 99808cba..00000000
--- a/migrations/1771847961.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Add Tmux binding (Super+Alt+Return) to hypr/bindings.conf"
-
-bindings_file="$HOME/.config/hypr/bindings.conf"
-
-if [[ -f $bindings_file ]] && ! grep -qE '^bindd?\s*=\s*SUPER\s+ALT\s*,\s*RETURN' "$bindings_file"; then
-  sed -i '1a bindd = SUPER ALT, RETURN, Tmux, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)" tmux new' "$bindings_file"
-fi
diff --git a/migrations/1772051864.sh b/migrations/1772051864.sh
deleted file mode 100644
index 2d9d9861..00000000
--- a/migrations/1772051864.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Disable Ruby compilation in mise (if mise and ruby are installed)"
-
-if omarchy-cmd-present mise && mise which ruby &>/dev/null; then
-  mise settings set ruby.compile false
-fi
diff --git a/migrations/1772211023.sh b/migrations/1772211023.sh
deleted file mode 100644
index fe47860b..00000000
--- a/migrations/1772211023.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Ensure password field doesn't overflow on SDDM login screen"
-
-omarchy-refresh-sddm
diff --git a/migrations/1772293693.sh b/migrations/1772293693.sh
deleted file mode 100644
index bc49afff..00000000
--- a/migrations/1772293693.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Move single_window_aspect_ratio from dwindle to layout in user looknfeel.conf"
-
-looknfeel="$HOME/.config/hypr/looknfeel.conf"
-
-if [[ -f $looknfeel ]] && grep -q 'single_window_aspect_ratio' "$looknfeel"; then
-  sed -i \
-    -e 's|# https://wiki.hypr.land/Configuring/Dwindle-Layout/|# https://wiki.hypr.land/Configuring/Variables/#layout|' \
-    -e 's|^dwindle {|layout {|' \
-    "$looknfeel"
-fi
diff --git a/migrations/1772294096.sh b/migrations/1772294096.sh
deleted file mode 100644
index b00383dc..00000000
--- a/migrations/1772294096.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-echo "Add Alt+Arrow keybindings for tmux window and session navigation"
-
-TMUX_CONF=~/.config/tmux/tmux.conf
-
-if [[ -f $TMUX_CONF ]]; then
-  # Add M-Left/M-Right after M-9 if not present
-  if ! grep -q "bind -n M-Left select-window" "$TMUX_CONF"; then
-    sed -i '/bind -n M-9 select-window -t 9/a\
-bind -n M-Left select-window -t -1\
-bind -n M-Right select-window -t +1' "$TMUX_CONF"
-  fi
-
-  # Add M-Up/M-Down after "bind N switch-client -n" if not present
-  if ! grep -q "bind -n M-Up switch-client" "$TMUX_CONF"; then
-    sed -i '/^bind N switch-client -n$/a\
-bind -n M-Up switch-client -p\
-bind -n M-Down switch-client -n' "$TMUX_CONF"
-  fi
-
-  omarchy-restart-tmux
-fi
diff --git a/migrations/1772379119.sh b/migrations/1772379119.sh
deleted file mode 100644
index 12e10134..00000000
--- a/migrations/1772379119.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-echo "Add Alt+Shift+Arrow keybindings for swapping tmux windows"
-
-TMUX_CONF=~/.config/tmux/tmux.conf
-
-if [[ -f $TMUX_CONF ]]; then
-  if ! grep -q "bind -n M-S-Left swap-window" "$TMUX_CONF"; then
-    sed -i '/bind -n M-Right select-window -t +1/a\
-bind -n M-S-Left swap-window -t -1 \\; select-window -t -1\
-bind -n M-S-Right swap-window -t +1 \\; select-window -t +1' "$TMUX_CONF"
-  fi
-
-  omarchy-restart-tmux
-fi
diff --git a/migrations/1772389838.sh b/migrations/1772389838.sh
deleted file mode 100644
index 8a98a3ea..00000000
--- a/migrations/1772389838.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-echo "Fix nvim transparency to preserve highlight foreground colors"
-
-TRANSPARENCY_FILE="$HOME/.config/nvim/plugin/after/transparency.lua"
-
-if [[ -f "$TRANSPARENCY_FILE" ]]; then
-  cat > "$TRANSPARENCY_FILE" << 'EOF'
--- Make highlight groups transparent while preserving their other attributes
-local function make_transparent(name)
-	local ok, hl = pcall(vim.api.nvim_get_hl, 0, { name = name, link = false })
-	if ok then
-		hl.bg = nil
-		vim.api.nvim_set_hl(0, name, hl)
-	end
-end
-
-local groups = {
-	-- transparent background
-	"Normal",
-	"NormalFloat",
-	"FloatBorder",
-	"Pmenu",
-	"Terminal",
-	"EndOfBuffer",
-	"FoldColumn",
-	"Folded",
-	"SignColumn",
-	"LineNr",
-	"CursorLineNr",
-	"NormalNC",
-	"WhichKeyFloat",
-	"TelescopeBorder",
-	"TelescopeNormal",
-	"TelescopePromptBorder",
-	"TelescopePromptTitle",
-	-- neotree
-	"NeoTreeNormal",
-	"NeoTreeNormalNC",
-	"NeoTreeVertSplit",
-	"NeoTreeWinSeparator",
-	"NeoTreeEndOfBuffer",
-	-- nvim-tree
-	"NvimTreeNormal",
-	"NvimTreeVertSplit",
-	"NvimTreeEndOfBuffer",
-	-- notify
-	"NotifyINFOBody",
-	"NotifyERRORBody",
-	"NotifyWARNBody",
-	"NotifyTRACEBody",
-	"NotifyDEBUGBody",
-	"NotifyINFOTitle",
-	"NotifyERRORTitle",
-	"NotifyWARNTitle",
-	"NotifyTRACETitle",
-	"NotifyDEBUGTitle",
-	"NotifyINFOBorder",
-	"NotifyERRORBorder",
-	"NotifyWARNBorder",
-	"NotifyTRACEBorder",
-	"NotifyDEBUGBorder",
-}
-
-for _, name in ipairs(groups) do
-	make_transparent(name)
-end
-EOF
-fi
diff --git a/migrations/1772632144.sh b/migrations/1772632144.sh
deleted file mode 100644
index 2cfbd84c..00000000
--- a/migrations/1772632144.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Use mise shims in ~/.config/uwsm/env"
-
-UWSM_ENV="$HOME/.config/uwsm/env"
-
-if [[ -f $UWSM_ENV ]] && grep -q 'mise activate bash)' "$UWSM_ENV"; then
-  sed -i 's/mise activate bash)/mise activate bash --shims)/g' "$UWSM_ENV"
-fi
diff --git a/migrations/1772907198.sh b/migrations/1772907198.sh
deleted file mode 100644
index 82f21fe0..00000000
--- a/migrations/1772907198.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Add automatic-rename settings to tmux configuration"
-
-if [[ -f ~/.config/tmux/tmux.conf ]]; then
-  if ! grep -q "set -gw automatic-rename on" ~/.config/tmux/tmux.conf; then
-    sed -i '/set -g window-status-separator ""/a\
-set -gw automatic-rename on\
-set -gw automatic-rename-format '\''#{b:pane_current_path}'\''\
-' ~/.config/tmux/tmux.conf
-    omarchy-restart-tmux
-  fi
-fi
diff --git a/migrations/1772964511.sh b/migrations/1772964511.sh
deleted file mode 100644
index 0de1dedb..00000000
--- a/migrations/1772964511.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Only run plocate indexing on AC power to prevent hangs after sleep"
-
-source $OMARCHY_PATH/install/config/plocate-ac-only.sh
diff --git a/migrations/1772981555.sh b/migrations/1772981555.sh
deleted file mode 100644
index d843150f..00000000
--- a/migrations/1772981555.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Update hyprland-preview-share-picker config to default to outputs page"
-
-CONFIG_FILE=~/.config/hyprland-preview-share-picker/config.yaml
-
-if [[ -f $CONFIG_FILE ]]; then
-  sed -i 's/^default_page: windows$/default_page: outputs/' "$CONFIG_FILE"
-fi
diff --git a/migrations/1772981757.sh b/migrations/1772981757.sh
deleted file mode 100644
index e19c9301..00000000
--- a/migrations/1772981757.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Install Intel GPU hardware acceleration drivers if missing"
-
-if lspci | grep -iE 'vga|3d|display' | grep -qi 'intel'; then
-  source "$OMARCHY_PATH/install/config/hardware/intel/video-acceleration.sh"
-fi
diff --git a/migrations/1772988614.sh b/migrations/1772988614.sh
deleted file mode 100644
index 87b9726b..00000000
--- a/migrations/1772988614.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Add Shift+Return keyboard binding for multi-line as used by Claude Code to Alacritty"
-
-ALACRITTY_CONFIG=~/.config/alacritty/alacritty.toml
-
-if [[ -f $ALACRITTY_CONFIG ]] && ! grep -q 'key = "Return"' "$ALACRITTY_CONFIG"; then
-  sed -i 's/{ key = "Insert", mods = "Control", action = "Copy" }/{ key = "Insert", mods = "Control", action = "Copy" },\n  { key = "Return", mods = "Shift", chars = "\\u001B\\r" }/' "$ALACRITTY_CONFIG"
-fi
diff --git a/migrations/1772990935.sh b/migrations/1772990935.sh
deleted file mode 100644
index 2b58912d..00000000
--- a/migrations/1772990935.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Add sample low battery notification hook"
-
-mkdir -p ~/.config/omarchy/hooks/battery-low.d
-
-if [[ ! -f ~/.config/omarchy/hooks/battery-low.d/play-warning-sound.sample ]]; then
-  cp "$OMARCHY_PATH/config/omarchy/hooks/battery-low.d/play-warning-sound.sample" ~/.config/omarchy/hooks/battery-low.d/play-warning-sound.sample
-fi
diff --git a/migrations/1773012889.sh b/migrations/1773012889.sh
deleted file mode 100644
index d8dd1619..00000000
--- a/migrations/1773012889.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Install system-sleep hook to unmount gvfsd-fuse before suspend/hibernate"
-
-sudo mkdir -p /usr/lib/systemd/system-sleep
-sudo install -m 0755 -o root -g root "$OMARCHY_PATH/default/systemd/system-sleep/unmount-fuse" /usr/lib/systemd/system-sleep/
diff --git a/migrations/1773017819.sh b/migrations/1773017819.sh
deleted file mode 100644
index b4a1d36e..00000000
--- a/migrations/1773017819.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add LocalSend entry to Nautilus context menu"
-
-source $OMARCHY_PATH/install/config/nautilus-python.sh
diff --git a/migrations/1773505447.sh b/migrations/1773505447.sh
deleted file mode 100644
index 02c75c67..00000000
--- a/migrations/1773505447.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Enable thermald for Intel Sandy Bridge and newer laptops"
-
-source "$OMARCHY_PATH/install/config/hardware/intel/thermald.sh"
diff --git a/migrations/1773506226.sh b/migrations/1773506226.sh
deleted file mode 100644
index 88c84a9f..00000000
--- a/migrations/1773506226.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-echo "Enable GPU in voxtype if Vulkan is available"
-
-if omarchy-cmd-present voxtype; then
-  if omarchy-hw-vulkan; then
-    echo "Vulkan is available, enabling GPU in voxtype"
-    voxtype setup gpu --enable || true
-  fi
-
-  # see https://github.com/peteonrails/voxtype/commit/ce6e9919cbe54cb8808dcb3cdd3bcb3260d7b900
-  # earlier versions of voxtype hard-coded the non-GPU backend in the systemd service file,
-  # so we need to re-run setup to update it to use /usr/bin/voxtype (the symlink)
-  voxtype setup systemd
-
-  systemctl --user restart voxtype
-  omarchy-restart-waybar
-fi
diff --git a/migrations/1773598247.sh b/migrations/1773598247.sh
deleted file mode 100644
index 5a57a07c..00000000
--- a/migrations/1773598247.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install npx wrappers for AI CLI tools and playwright"
-
-source "$OMARCHY_PATH/install/packaging/npx.sh"
diff --git a/migrations/1773599943.sh b/migrations/1773599943.sh
deleted file mode 100644
index cd060bd6..00000000
--- a/migrations/1773599943.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Add COPY mode indicator to tmux status bar"
-
-if [[ -f ~/.config/tmux/tmux.conf ]]; then
-  if ! grep -q "pane_in_mode" ~/.config/tmux/tmux.conf; then
-    sed -i 's/#{?client_prefix/#{?pane_in_mode,COPY ,}#{?client_prefix/' ~/.config/tmux/tmux.conf
-    omarchy-restart-tmux
-  fi
-fi
diff --git a/migrations/1774366575.sh b/migrations/1774366575.sh
deleted file mode 100644
index e3ea5551..00000000
--- a/migrations/1774366575.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install Intel Low Power Mode for Intel CPUs"
-
-source "$OMARCHY_PATH/install/config/hardware/intel/lpmd.sh"
diff --git a/migrations/1774401148.sh b/migrations/1774401148.sh
deleted file mode 100644
index cda4c3eb..00000000
--- a/migrations/1774401148.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Fix KERNEL_CMDLINE merge behavior in /etc/default/limine"
-
-if [[ -f /etc/default/limine ]]; then
-  sudo sed -i 's/^KERNEL_CMDLINE\[default\]="/KERNEL_CMDLINE[default]+="/' /etc/default/limine
-  sudo limine-mkinitcpio
-fi
diff --git a/migrations/1774642699.sh b/migrations/1774642699.sh
deleted file mode 100644
index b8fbc834..00000000
--- a/migrations/1774642699.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Load Bluetooth driver module on T2 Macs"
-
-if lspci -nn | grep -q "106b:180[12]"; then
-  if ! grep -q "hci_bcm4377" /etc/modules-load.d/t2.conf 2>/dev/null; then
-    echo "hci_bcm4377" | sudo tee -a /etc/modules-load.d/t2.conf >/dev/null
-  fi
-fi
diff --git a/migrations/1775059710.sh b/migrations/1775059710.sh
deleted file mode 100644
index c385a8ea..00000000
--- a/migrations/1775059710.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Install tuned fan curve for T2 MacBook"
-
-if lspci -nn | grep -q "106b:180[12]" && [[ ! -f /etc/t2fand.conf ]]; then
-  cat <<EOF | sudo tee /etc/t2fand.conf >/dev/null
-[Fan1]
-low_temp=55
-high_temp=75
-speed_curve=linear
-always_full_speed=false
-EOF
-fi
diff --git a/migrations/1775208227.sh b/migrations/1775208227.sh
deleted file mode 100644
index 4a50586d..00000000
--- a/migrations/1775208227.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Remove misleading waybar network transfer speeds"
-
-if grep -q "bandwidthDownBytes" ~/.config/waybar/config.jsonc; then
-  sed -i 's/"tooltip-format-wifi": "{essid} ({frequency} GHz)\\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}"/"tooltip-format-wifi": "{essid} ({frequency} GHz)"/' ~/.config/waybar/config.jsonc
-  sed -i 's/"tooltip-format-ethernet": "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}"/"tooltip-format-ethernet": "Connected"/' ~/.config/waybar/config.jsonc
-  omarchy-restart-waybar
-fi
diff --git a/migrations/1775236589.sh b/migrations/1775236589.sh
deleted file mode 100644
index f78ef54b..00000000
--- a/migrations/1775236589.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Update npx wrappers to run through mise node@latest"
-
-source "$OMARCHY_PATH/install/packaging/npx.sh"
diff --git a/migrations/1775241210.sh b/migrations/1775241210.sh
deleted file mode 100644
index f6e45eeb..00000000
--- a/migrations/1775241210.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-echo "Enable GPU in voxtype if Vulkan is available"
-
-if omarchy-cmd-present voxtype; then
-  if omarchy-hw-vulkan; then
-    echo "Vulkan is available, enabling GPU in voxtype"
-    sudo voxtype setup gpu --enable || true
-  fi
-
-  # see https://github.com/peteonrails/voxtype/commit/ce6e9919cbe54cb8808dcb3cdd3bcb3260d7b900
-  # earlier versions of voxtype hard-coded the non-GPU backend in the systemd service file,
-  # so we need to re-run setup to update it to use /usr/bin/voxtype (the symlink)
-  voxtype setup systemd
-
-  systemctl --user restart voxtype
-  omarchy-restart-waybar
-fi
diff --git a/migrations/1775546086.sh b/migrations/1775546086.sh
deleted file mode 100644
index 403705ae..00000000
--- a/migrations/1775546086.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Enable Intel LPMD service if installed"
-
-if pacman -Q intel-lpmd &>/dev/null; then
-  sudo systemctl enable --now intel_lpmd.service
-fi
diff --git a/migrations/1775691486.sh b/migrations/1775691486.sh
deleted file mode 100644
index e6fdf909..00000000
--- a/migrations/1775691486.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Copy Fcitx5 autostart desktop file to ~/.config/autostart"
-
-mkdir -p ~/.config/autostart/
-cp "$OMARCHY_PATH/config/autostart/org.fcitx.Fcitx5.desktop" ~/.config/autostart/
-
-omarchy-restart-xcompose
diff --git a/migrations/1775897694.sh b/migrations/1775897694.sh
deleted file mode 100644
index aeeefc34..00000000
--- a/migrations/1775897694.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Fix AC power udev rules to use systemd-run"
-
-source $OMARCHY_PATH/install/config/powerprofilesctl-rules.sh
-source $OMARCHY_PATH/install/config/wifi-powersave-rules.sh
diff --git a/migrations/1775946416.sh b/migrations/1775946416.sh
deleted file mode 100644
index 8e537976..00000000
--- a/migrations/1775946416.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Set Chromium appearance mode to device (follow system) by default"
-
-echo '{"browser":{"theme":{"color_scheme":0}}}' | sudo tee /usr/lib/chromium/initial_preferences >/dev/null
-
-# Update existing Chromium profiles to use "device" instead of "dark"
-PREFS="$HOME/.config/chromium/Default/Preferences"
-if [[ -f "$PREFS" ]] && command -v jq &>/dev/null; then
-  jq '.browser.theme.color_scheme = 0' "$PREFS" > "$PREFS.tmp" && mv "$PREFS.tmp" "$PREFS"
-fi
diff --git a/migrations/1775954402.sh b/migrations/1775954402.sh
deleted file mode 100644
index 61101d5c..00000000
--- a/migrations/1775954402.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Remove makima key remapping service (Copilot key now handled natively by Hyprland)"
-
-if systemctl is-enabled makima &>/dev/null; then
-  sudo systemctl disable --now makima
-fi
-
-sudo rm -rf /etc/systemd/system/makima.service.d
-sudo rm -f /etc/udev/rules.d/99-uinput.rules
-rm -rf "$HOME/.config/makima"
-
-omarchy-pkg-drop makima-bin
diff --git a/migrations/1776246235.sh b/migrations/1776246235.sh
deleted file mode 100644
index a58be056..00000000
--- a/migrations/1776246235.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-echo "Fix empty resume_offset in hibernation config"
-
-RESUME_DROP_IN="/etc/limine-entry-tool.d/resume.conf"
-SWAP_FILE="/swap/swapfile"
-
-if [[ -f $RESUME_DROP_IN ]] && grep -q 'resume_offset="$' "$RESUME_DROP_IN" && [[ -f $SWAP_FILE ]]; then
-  RESUME_OFFSET=$(sudo btrfs inspect-internal map-swapfile -r "$SWAP_FILE" 2>/dev/null)
-  if [[ -n $RESUME_OFFSET ]]; then
-    sudo sed -i "s/resume_offset=\"$/resume_offset=$RESUME_OFFSET\"/" "$RESUME_DROP_IN"
-    sudo sed -i "s/resume_offset=\"$/resume_offset=$RESUME_OFFSET\"/" /etc/default/limine
-    sudo limine-mkinitcpio
-    sudo limine-update
-    echo "Fixed: resume_offset=$RESUME_OFFSET"
-  else
-    echo "Warning: Could not determine resume offset for $SWAP_FILE"
-  fi
-fi
diff --git a/migrations/1776346552.sh b/migrations/1776346552.sh
deleted file mode 100644
index ea247d7b..00000000
--- a/migrations/1776346552.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-echo "Enable Bluetooth A2DP auto-connect in WirePlumber"
-
-destination=~/.config/wireplumber/wireplumber.conf.d/bluetooth-a2dp-autoconnect.conf
-
-mkdir -p ~/.config/wireplumber/wireplumber.conf.d/
-
-if [[ ! -f "$destination" ]]; then
-  cp "$OMARCHY_PATH/default/wireplumber/wireplumber.conf.d/bluetooth-a2dp-autoconnect.conf" \
-    "$destination"
-fi
-
-omarchy-state set reboot-required
diff --git a/migrations/1776348723.sh b/migrations/1776348723.sh
deleted file mode 100644
index 8900c9c3..00000000
--- a/migrations/1776348723.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Pin npx wrappers to the matching mise node runtime"
-
-source "$OMARCHY_PATH/install/packaging/npx.sh"
diff --git a/migrations/1776410469.sh b/migrations/1776410469.sh
deleted file mode 100644
index 6f182c04..00000000
--- a/migrations/1776410469.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Add flags sourcing to hyprland.conf"
-
-HYPR_CONF=~/.config/hypr/hyprland.conf
-
-source "$OMARCHY_PATH/install/config/omarchy-toggles.sh"
-
-if [[ -f $HYPR_CONF ]] && ! grep -q "toggles/hypr/\*\.conf" "$HYPR_CONF"; then
-  echo -e "\n# Toggle config flags dynamically\nsource = ~/.local/state/omarchy/toggles/hypr/*.conf" >> "$HYPR_CONF"
-fi
diff --git a/migrations/1776434586.sh b/migrations/1776434586.sh
deleted file mode 100644
index 4caa0aa7..00000000
--- a/migrations/1776434586.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-echo "Move Obsidian flags from Hyprland binding to Obsidian user flags"
-
-OBSIDIAN_FLAGS_FILE="$HOME/.config/obsidian/user-flags.conf"
-OBSIDIAN_DEFAULT_FLAGS_FILE="$OMARCHY_PATH/config/obsidian/user-flags.conf"
-
-mkdir -p "$(dirname "$OBSIDIAN_FLAGS_FILE")"
-
-if [[ ! -f $OBSIDIAN_FLAGS_FILE ]]; then
-  cp "$OBSIDIAN_DEFAULT_FLAGS_FILE" "$OBSIDIAN_FLAGS_FILE"
-else
-  missing_flags=$(grep -vE '^(#|$)' "$OBSIDIAN_DEFAULT_FLAGS_FILE" | grep -vxFf "$OBSIDIAN_FLAGS_FILE" || true)
-
-  if [[ -n $missing_flags ]]; then
-    {
-      echo
-      echo "# Added by Omarchy migration 1776434586: Obsidian launch flags moved from Hyprland binding."
-      printf "%s\n" "$missing_flags"
-    } >>"$OBSIDIAN_FLAGS_FILE"
-  fi
-fi
-
-if [[ -f ~/.config/hypr/bindings.conf ]]; then
-  sed -i '/Obsidian, exec/ {
-    s/ -disable-gpu//g
-    s/ --disable-gpu//g
-    s/ --enable-wayland-ime//g
-    s/"uwsm app -- obsidian/"uwsm-app -- obsidian/g
-  }' ~/.config/hypr/bindings.conf
-fi
diff --git a/migrations/1776611242.sh b/migrations/1776611242.sh
deleted file mode 100644
index aa7e42bf..00000000
--- a/migrations/1776611242.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Install socat so we can reactivate internal display when external display is removed"
-
-omarchy-pkg-add socat
-uwsm-app -- omarchy-hyprland-monitor-watch &
diff --git a/migrations/1776615976.sh b/migrations/1776615976.sh
deleted file mode 100644
index 32bebb60..00000000
--- a/migrations/1776615976.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install missing Intel VPL drivers (libvpl, vpl-gpu-rt) on systems with Intel GPUs"
-
-bash "$OMARCHY_PATH/install/config/hardware/intel/video-acceleration.sh"
diff --git a/migrations/1776617403.sh b/migrations/1776617403.sh
deleted file mode 100644
index 236d02ec..00000000
--- a/migrations/1776617403.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-echo "Enable pause_media in voxtype config"
-
-VOXTYPE_CONF=~/.config/voxtype/config.toml
-
-if [[ -f $VOXTYPE_CONF ]] && ! grep -q 'pause_media' "$VOXTYPE_CONF"; then
-  if grep -q '^\[audio\]' "$VOXTYPE_CONF"; then
-    sed -i '/^\[audio\]/a\
-\
-# Pause MPRIS media players during recording\
-pause_media = true' "$VOXTYPE_CONF"
-  else
-    printf '\n[audio]\n# Pause MPRIS media players during recording\npause_media = true\n' >> "$VOXTYPE_CONF"
-  fi
-fi
diff --git a/migrations/1776781956.sh b/migrations/1776781956.sh
deleted file mode 100644
index 4c9e7406..00000000
--- a/migrations/1776781956.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-echo "Dell XPS Panther Lake display kernel cmdline is no longer necessary"
-
-DROP_IN="/etc/limine-entry-tool.d/dell-xps-ptl-display.conf"
-DEFAULT_LIMINE="/etc/default/limine"
-NEEDS_UPDATE=0
-
-if [[ -f $DROP_IN ]]; then
-  sudo rm -f "$DROP_IN"
-  NEEDS_UPDATE=1
-fi
-
-if [[ -f $DEFAULT_LIMINE ]] && grep -q 'xe\.enable_psr' "$DEFAULT_LIMINE"; then
-  sudo sed -i -E '/^KERNEL_CMDLINE.*xe\.enable_psr/d; /^# .*(Dell XPS|Xe PSR|Panel Replay)/d' "$DEFAULT_LIMINE"
-  NEEDS_UPDATE=1
-fi
-
-if (( NEEDS_UPDATE )); then
-  sudo limine-update
-fi
diff --git a/migrations/1776781957.sh b/migrations/1776781957.sh
deleted file mode 100644
index 806d9dab..00000000
--- a/migrations/1776781957.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Drop vrr,1 from default monitor line as it creates a small lag"
-
-MONITORS_CONF=~/.config/hypr/monitors.conf
-
-if [[ -f $MONITORS_CONF ]]; then
-  sed -i 's/^monitor=,preferred,auto,auto,vrr,1$/monitor=,preferred,auto,auto/' "$MONITORS_CONF"
-fi
diff --git a/migrations/1776784497.sh b/migrations/1776784497.sh
deleted file mode 100644
index ef03e32d..00000000
--- a/migrations/1776784497.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Remove resume boost feature"
-
-if [[ -f /usr/lib/systemd/system-sleep/resume-boost ]]; then
-  sudo rm /usr/lib/systemd/system-sleep/resume-boost
-fi
diff --git a/migrations/1776927490.sh b/migrations/1776927490.sh
deleted file mode 100644
index d2c743d9..00000000
--- a/migrations/1776927490.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-echo "Drop /home snapshots, btrfs quotas, and timeline snapshots (keep 5 root snapshots, never more)"
-
-if ! omarchy-cmd-present snapper btrfs; then
-  exit 0
-fi
-
-# Disable btrfs quotas first — every subvolume delete below would otherwise update
-# all qgroups, which is exactly the performance drag we're removing.
-sudo btrfs quota disable / 2>/dev/null || true
-
-# Remove the home config, all its snapshots, and the .snapshots subvolume.
-# If the snapshots look like someone's been using them manually (pre/post pairs,
-# userdata tags, freeform descriptions), ask before destroying.
-if sudo snapper list-configs 2>/dev/null | grep -q "home"; then
-  drop_home="yes"
-
-  if sudo snapper -c home --csvout list 2>/dev/null | \
-     awk -F, 'NR>1 && ($6=="pre" || $6=="post" || $13!="" || ($12!="current" && $12!="timeline" && $12 !~ /^[0-9]+\.[0-9]+\.[0-9]+/))' | \
-     grep -q .; then
-    gum confirm "Drop unused /home snapshots for better performance?" || drop_home="no"
-  fi
-
-  if [[ $drop_home == "yes" ]]; then
-    sudo snapper -c home list --columns number 2>/dev/null | awk 'NR>2 && $1 != "0" {print $1}' | \
-      xargs -r sudo snapper -c home delete 2>/dev/null
-    sudo snapper -c home delete-config 2>/dev/null
-
-    if [[ -d /home/.snapshots ]]; then
-      for snap in /home/.snapshots/*/snapshot; do
-        [[ -d $snap ]] && sudo btrfs subvolume delete "$snap" 2>/dev/null
-      done
-      sudo rm -rf /home/.snapshots/* 2>/dev/null
-      sudo btrfs subvolume delete /home/.snapshots 2>/dev/null
-    fi
-  fi
-fi
-
-# Ensure root config exists and matches our shipped defaults
-if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then
-  sudo snapper -c root create-config /
-fi
-sudo cp $OMARCHY_PATH/default/snapper/root /etc/snapper/configs/root
-
-# Delete all timeline snapshots — we only want pre-update (cleanup=number) snapshots
-sudo snapper -c root list --columns number,cleanup 2>/dev/null | \
-  awk '$3 == "timeline" {print $1}' | \
-  xargs -r sudo snapper -c root delete 2>/dev/null
-
-# Enforce NUMBER_LIMIT=5 on any existing number snapshots beyond the new cap
-sudo snapper -c root cleanup number 2>/dev/null
diff --git a/migrations/1776935686.sh b/migrations/1776935686.sh
deleted file mode 100644
index 303db7b8..00000000
--- a/migrations/1776935686.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Recover the internal monitor at login when no external display is connected"
-
-SERVICE=omarchy-recover-internal-monitor.service
-
-mkdir -p ~/.config/systemd/user
-cp $OMARCHY_PATH/config/systemd/user/$SERVICE ~/.config/systemd/user/$SERVICE
-
-systemctl --user daemon-reload
-systemctl --user enable $SERVICE
diff --git a/migrations/1777017528.sh b/migrations/1777017528.sh
deleted file mode 100644
index 7f340748..00000000
--- a/migrations/1777017528.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Show battery status notification on right-click of the waybar battery icon"
-
-if ! grep -q 'omarchy-battery-status' ~/.config/waybar/config.jsonc; then
-  sed -i '/"on-click": "omarchy-menu power",/a\    "on-click-right": "notify-send -u low \\"$(omarchy-battery-status)\\"",' ~/.config/waybar/config.jsonc
-  omarchy-restart-waybar
-fi
diff --git a/migrations/1777018408.sh b/migrations/1777018408.sh
deleted file mode 100644
index af644b53..00000000
--- a/migrations/1777018408.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Fix Chromium appearance mode to also set color_scheme2 (the field Chromium actually reads now)"
-
-echo '{"browser":{"theme":{"color_scheme":0,"color_scheme2":0}}}' | sudo tee /usr/lib/chromium/initial_preferences >/dev/null
-
-# Update existing Chromium profiles so color_scheme2 follows the system, not dark
-PREFS="$HOME/.config/chromium/Default/Preferences"
-if [[ -f "$PREFS" ]] && command -v jq &>/dev/null; then
-  jq '.browser.theme.color_scheme = 0 | .browser.theme.color_scheme2 = 0' "$PREFS" > "$PREFS.tmp" && mv "$PREFS.tmp" "$PREFS"
-fi
diff --git a/migrations/1777072987.sh b/migrations/1777072987.sh
deleted file mode 100644
index e2d6080c..00000000
--- a/migrations/1777072987.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Fix disable-while-typing on ASUS ROG Flow Z13 detachable keyboard"
-
-source $OMARCHY_PATH/install/config/hardware/asus/fix-z13-touchpad.sh
-
-if [[ -f /etc/udev/rules.d/99-omarchy-asus-z13-touchpad.rules ]]; then
-  omarchy-state set reboot-required
-fi
diff --git a/migrations/1777098818.sh b/migrations/1777098818.sh
deleted file mode 100644
index a9de7e1b..00000000
--- a/migrations/1777098818.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Fix power profile auto-switching on USB-C only machines and ensure power-profiles-daemon is enabled"
-
-source "$OMARCHY_PATH/install/config/powerprofilesctl-rules.sh"
diff --git a/migrations/1777145626.sh b/migrations/1777145626.sh
deleted file mode 100644
index b6518b5d..00000000
--- a/migrations/1777145626.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install dosfstools for FAT filesystem utilities like fsck.fat and mkfs.fat"
-
-omarchy-pkg-add dosfstools
diff --git a/migrations/1777282771.sh b/migrations/1777282771.sh
deleted file mode 100644
index b350376f..00000000
--- a/migrations/1777282771.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Allow Docker DNS from Docker's 192.168 address pool"
-
-if omarchy-cmd-present ufw && sudo ufw status | grep -q "Status: active"; then
-  sudo ufw allow in proto udp from 192.168.0.0/16 to 172.17.0.1 port 53 comment 'allow-docker-dns'
-fi
diff --git a/migrations/1777382905.sh b/migrations/1777382905.sh
deleted file mode 100644
index f524574f..00000000
--- a/migrations/1777382905.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Use interactive unlock (Plymouth) selector menu"
-
-mkdir -p ~/.config/elephant/menus
-ln -snf $OMARCHY_PATH/default/elephant/omarchy_unlocks.lua ~/.config/elephant/menus/omarchy_unlocks.lua
-omarchy-restart-walker
diff --git a/migrations/1777396666.sh b/migrations/1777396666.sh
deleted file mode 100644
index ea8e4326..00000000
--- a/migrations/1777396666.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Use Omarchy UWSM session without graphical.target startup wait"
-
-sudo mkdir -p /usr/local/share/wayland-sessions
-sudo cp "$OMARCHY_PATH/default/wayland-sessions/omarchy.desktop" /usr/local/share/wayland-sessions/omarchy.desktop
-
-if [[ -f /etc/sddm.conf.d/autologin.conf ]]; then
-  sudo sed -i 's/^Session=hyprland-uwsm$/Session=omarchy/' /etc/sddm.conf.d/autologin.conf
-fi
diff --git a/migrations/1777450869.sh b/migrations/1777450869.sh
deleted file mode 100644
index 6b1fcc8c..00000000
--- a/migrations/1777450869.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Hide shutdown console messages behind Plymouth"
-
-if [[ -f /etc/default/limine ]]; then
-  sudo sed -i 's/ quiet splash/ quiet splash loglevel=0 systemd.show_status=false rd.udev.log_level=0 vt.global_cursor_default=0/' /etc/default/limine
-
-  if omarchy-cmd-present limine-mkinitcpio; then
-    sudo limine-mkinitcpio
-  fi
-fi
diff --git a/migrations/1777464602.sh b/migrations/1777464602.sh
deleted file mode 100644
index 8c845442..00000000
--- a/migrations/1777464602.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Update Waybar screen recording command"
-
-WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc"
-
-if [[ -f $WAYBAR_CONFIG ]] && grep -q 'omarchy-cmd-screenrecord' "$WAYBAR_CONFIG"; then
-  sed -i 's/omarchy-cmd-screenrecord/omarchy-capture-screenrecording/g' "$WAYBAR_CONFIG"
-  omarchy-restart-waybar
-fi
diff --git a/migrations/1777467659.sh b/migrations/1777467659.sh
deleted file mode 100644
index 994c30bf..00000000
--- a/migrations/1777467659.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Rename lock screen command in Hypridle config"
-
-if grep -q 'omarchy-lock-screen' ~/.config/hypr/hypridle.conf; then
-  sed -i 's/omarchy-lock-screen/omarchy-system-lock/g' ~/.config/hypr/hypridle.conf
-  omarchy-restart-hypridle
-fi
diff --git a/migrations/1777546300.sh b/migrations/1777546300.sh
deleted file mode 100644
index fc40e222..00000000
--- a/migrations/1777546300.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Enable FRED on Intel Panther Lake systems"
-
-DEFAULT_LIMINE="/etc/default/limine"
-
-if omarchy-hw-intel-ptl && [[ -f $DEFAULT_LIMINE ]] && ! grep -q 'fred=on' "$DEFAULT_LIMINE"; then
-  source "$OMARCHY_PATH/install/config/hardware/intel/fred.sh"
-
-  sudo limine-update
-fi
diff --git a/migrations/1777570652.sh b/migrations/1777570652.sh
deleted file mode 100644
index 5511fe27..00000000
--- a/migrations/1777570652.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Update interface_ colors for limine 12 (palette index -> RRGGBB)"
-
-if [[ -f /boot/limine.conf ]]; then
-  sudo sed -i -E 's/^interface_branding_colou?r: 2$/interface_branding_color: 9ece6a/' /boot/limine.conf
-  sudo sed -i 's/^interface_branding_colour: /interface_branding_color: /' /boot/limine.conf
-
-  sudo sed -i -E '/^interface_help_colou?r(_bright)?:/d' /boot/limine.conf
-  sudo sed -i '/^interface_branding_color:/a interface_help_color_bright: 9ece6a' /boot/limine.conf
-  sudo sed -i '/^interface_branding_color:/a interface_help_color: 9ece6a' /boot/limine.conf
-fi
diff --git a/migrations/1777572869.sh b/migrations/1777572869.sh
deleted file mode 100644
index b8ffd217..00000000
--- a/migrations/1777572869.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-echo "Restore stock kernel on non-XPS Panther Lake systems"
-
-if omarchy-hw-intel-ptl && ! omarchy-hw-match "XPS"; then
-  omarchy-pkg-add linux linux-headers
-
-  for pkg in linux-ptl linux-ptl-headers; do
-    sudo pacman -Rdd --noconfirm "$pkg" 2>/dev/null || true
-  done
-
-  sudo rm -f /etc/limine-entry-tool.d/intel-panther-lake.conf
-  sudo rm -f /etc/limine-entry-tool.d/dell-xps-panther-lake.conf
-
-  if omarchy-cmd-present limine-update; then
-    sudo limine-update
-  fi
-fi
diff --git a/migrations/1777578316.sh b/migrations/1777578316.sh
deleted file mode 100644
index d9e584c2..00000000
--- a/migrations/1777578316.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Rename screen recording command"
-
-WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc"
-
-if [[ -f $WAYBAR_CONFIG ]] && grep -q 'omarchy-capture-screencording' "$WAYBAR_CONFIG"; then
-  sed -i 's/omarchy-capture-screencording/omarchy-capture-screenrecording/g' "$WAYBAR_CONFIG"
-  omarchy-restart-waybar
-fi
diff --git a/migrations/1777618046.sh b/migrations/1777618046.sh
deleted file mode 100644
index 6c5c8f10..00000000
--- a/migrations/1777618046.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Symlink Brave Origin Beta flags to brave-flags.conf so both browsers share configuration"
-
-if [[ ! -e ~/.config/brave-origin-beta-flags.conf ]]; then
-  ln -s brave-flags.conf ~/.config/brave-origin-beta-flags.conf
-fi
diff --git a/migrations/1777620904.sh b/migrations/1777620904.sh
deleted file mode 100644
index d96a0c5a..00000000
--- a/migrations/1777620904.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Add cliamp music TUI player (Super+Shift+Alt+M)"
-
-if omarchy-pkg-missing cliamp; then
-  omarchy-pkg-add cliamp
-
-  if [[ -f ~/.config/hypr/bindings.conf ]] && ! grep -q "cliamp" ~/.config/hypr/bindings.conf; then
-    sed -i '/^bindd = SUPER SHIFT, M, Music, exec, omarchy-launch-or-focus spotify/a bindd = SUPER SHIFT ALT, M, Music TUI, exec, omarchy-launch-or-focus-tui cliamp' ~/.config/hypr/bindings.conf
-  fi
-fi
diff --git a/migrations/1777653181.sh b/migrations/1777653181.sh
deleted file mode 100644
index e79c782b..00000000
--- a/migrations/1777653181.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-echo "Move Dell XPS touchpad haptics into the packaged service"
-
-if omarchy-hw-dell-xps-haptic-touchpad; then
-  sudo systemctl disable --now dell-xps-haptic-touchpad.service 2>/dev/null || true
-  sudo rm -f /etc/systemd/system/dell-xps-haptic-touchpad.service
-  sudo rm -f /etc/systemd/system/multi-user.target.wants/dell-xps-haptic-touchpad.service
-  sudo rm -rf /etc/systemd/system/dell-xps-haptic-touchpad.service.d
-  sudo rm -f /etc/udev/rules.d/99-dell-xps-haptic-touchpad.rules
-  sudo rm -f /etc/omarchy-dell-haptic-touchpad.env
-  sudo systemctl daemon-reload
-  sudo udevadm control --reload-rules
-
-  source "$OMARCHY_PATH/install/packaging/dell-xps-touchpad-haptics.sh"
-fi
diff --git a/migrations/1777800806.sh b/migrations/1777800806.sh
deleted file mode 100644
index a57a0ae0..00000000
--- a/migrations/1777800806.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-echo "Enable VAAPI hardware video decoding/encoding in Chromium and Brave for h265 and other codecs"
-
-add_flag() {
-  local file=$1
-  local flag=$2
-
-  [[ -f $file ]] || return
-  grep -q "$flag" "$file" && return
-
-  if grep -q "^--enable-features=" "$file"; then
-    sed -i "s/^--enable-features=\(.*\)$/--enable-features=\1,$flag/" "$file"
-  else
-    echo "--enable-features=$flag" >>"$file"
-  fi
-}
-
-for conf in chromium-flags.conf brave-flags.conf; do
-  add_flag "$HOME/.config/$conf" "VaapiVideoDecodeLinuxGL"
-  add_flag "$HOME/.config/$conf" "VaapiVideoEncoder"
-done
diff --git a/migrations/1777813290.sh b/migrations/1777813290.sh
deleted file mode 100644
index e341c7a4..00000000
--- a/migrations/1777813290.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Raise soft file descriptor limit so dev tools have headroom (takes effect after reboot)"
-
-bash $OMARCHY_PATH/install/config/increase-fd-limit.sh
diff --git a/migrations/1777873457.sh b/migrations/1777873457.sh
deleted file mode 100644
index 5c185abe..00000000
--- a/migrations/1777873457.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Install ghui (GitHub TUI) via npx wrapper"
-
-omarchy-npx-install @kitlangton/ghui ghui
diff --git a/migrations/1777909712.sh b/migrations/1777909712.sh
deleted file mode 100644
index 60c738a1..00000000
--- a/migrations/1777909712.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-echo "Remove stale Xe Panel Replay kernel cmdline from Dell XPS Panther Lake systems"
-
-DEFAULT_LIMINE="/etc/default/limine"
-
-if omarchy-hw-match "XPS" && omarchy-hw-intel-ptl; then
-  if [[ -f $DEFAULT_LIMINE ]] && grep -q 'xe\.enable_panel_replay' "$DEFAULT_LIMINE"; then
-    sudo sed -i '/^KERNEL_CMDLINE.*xe\.enable_panel_replay/d' "$DEFAULT_LIMINE"
-    sudo limine-update
-  fi
-fi
diff --git a/migrations/1777929468.sh b/migrations/1777929468.sh
deleted file mode 100644
index 9f1afa87..00000000
--- a/migrations/1777929468.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Enable middle-click primary paste for GTK/Chromium-family apps (Ghostty, Brave, Chromium)"
-
-if command -v gsettings >/dev/null; then
-  gsettings set org.gnome.desktop.interface gtk-enable-primary-paste true || true
-fi
diff --git a/migrations/1777938402.sh b/migrations/1777938402.sh
deleted file mode 100644
index 24099ee5..00000000
--- a/migrations/1777938402.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-echo "Fix display backlight on supported ASUS Panther Lake laptops"
-
-EXPERTBOOK_DROP_IN="/etc/limine-entry-tool.d/asus-expertbook-b9406-display.conf"
-
-if omarchy-hw-asus-expertbook-b9406 || omarchy-hw-asus-zenbook-ux5406aa; then
-  if [[ -f $EXPERTBOOK_DROP_IN ]]; then
-    sudo sed -i '/xe\.enable_dpcd_backlight/d' "$EXPERTBOOK_DROP_IN"
-  fi
-
-  source "$OMARCHY_PATH/install/config/hardware/asus/fix-asus-ptl-display-backlight.sh"
-
-  if omarchy-cmd-present limine-update; then
-    sudo limine-update
-  fi
-fi
diff --git a/migrations/1778001804.sh b/migrations/1778001804.sh
deleted file mode 100644
index 38413d36..00000000
--- a/migrations/1778001804.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Fix bass speakers on Lenovo Yoga Pro 7 14IAH10"
-
-source "$OMARCHY_PATH/install/config/hardware/lenovo/fix-yoga-pro7-bass-speakers.sh"
diff --git a/migrations/1778008689.sh b/migrations/1778008689.sh
deleted file mode 100644
index 2baefc54..00000000
--- a/migrations/1778008689.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "Add Foot terminal window rules where terminals are described"
-
-if [[ -f ~/.config/hypr/input.conf ]]; then
-  sed -Ei 's/match:class \(Alacritty\|kitty\)/match:class (Alacritty|kitty|foot)/' ~/.config/hypr/input.conf
-fi
-
-if [[ -f ~/.config/hypr/apps/terminals.conf ]]; then
-  sed -Ei 's/match:class \(Alacritty\|kitty\|com\.mitchellh\.ghostty\)/match:class (Alacritty|kitty|com.mitchellh.ghostty|foot)/' ~/.config/hypr/apps/terminals.conf
-fi
diff --git a/migrations/1778026496.sh b/migrations/1778026496.sh
deleted file mode 100644
index d9d7b893..00000000
--- a/migrations/1778026496.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Install sof-firmware on Intel Panther Lake to restore DSP audio"
-
-# linux-ptl hard-depped sof-firmware, mainline linux only optdeps it, so the
-# orphan sweep after migration 1777572869 removed it. Force explicit so a
-# subsequent orphan sweep in the same update cycle cannot take it again.
-
-if omarchy-hw-intel-ptl && ! omarchy-hw-match "XPS"; then
-  omarchy-pkg-add sof-firmware
-  sudo pacman -D --asexplicit sof-firmware >/dev/null
-  omarchy-state set reboot-required
-fi
diff --git a/migrations/1778052575.sh b/migrations/1778052575.sh
deleted file mode 100644
index fc6a46cf..00000000
--- a/migrations/1778052575.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Enable extended keyboard support in tmux"
-
-tmux_config="$HOME/.config/tmux/tmux.conf"
-
-if [[ -f $tmux_config ]] && ! grep -qxF "set -g extended-keys on" "$tmux_config"; then
-  sed -i '/^set -g detach-on-destroy off$/a set -g extended-keys on\nset -g extended-keys-format csi-u\nset -sg escape-time 10' "$tmux_config"
-fi
diff --git a/migrations/1778054328.sh b/migrations/1778054328.sh
deleted file mode 100644
index 1722c7b4..00000000
--- a/migrations/1778054328.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Use omarchy-system-lock and omarchy-system-wake in hypridle"
-
-omarchy-refresh-hypridle
diff --git a/migrations/1778079164.sh b/migrations/1778079164.sh
deleted file mode 100644
index 6e8fa632..00000000
--- a/migrations/1778079164.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Update Pi CLI wrapper package"
-
-pi_bin="$HOME/.local/bin/pi"
-
-if [[ -f $pi_bin ]] && grep -q '^package="@mariozechner/pi-coding-agent"$' "$pi_bin"; then
-  sed -i 's|^package="@mariozechner/pi-coding-agent"$|package="@earendil-works/pi-coding-agent"|' "$pi_bin"
-fi
diff --git a/migrations/1778099894.sh b/migrations/1778099894.sh
deleted file mode 100644
index 7a7fec9d..00000000
--- a/migrations/1778099894.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add Transcode entry to Nautilus context menu"
-
-source "$OMARCHY_PATH/install/config/nautilus-python.sh"
diff --git a/migrations/1778139028.sh b/migrations/1778139028.sh
deleted file mode 100644
index d7bc95e1..00000000
--- a/migrations/1778139028.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-echo "Add weather widget to Waybar"
-
-WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc"
-WAYBAR_STYLE="$HOME/.config/waybar/style.css"
-
-if [[ -f $WAYBAR_CONFIG ]]; then
-  if ! grep -q '"custom/weather"' "$WAYBAR_CONFIG"; then
-    sed -i 's/"modules-center": \["clock",/"modules-center": ["clock", "custom\/weather",/' "$WAYBAR_CONFIG"
-    sed -i '/"network": {/i\  "custom/weather": {\n    "exec": "$OMARCHY_PATH/default/waybar/weather.sh",\n    "return-type": "json",\n    "interval": 60,\n    "tooltip": false,\n    "on-click": "notify-send -u low \\"$(omarchy-weather-status)\\""\n  },' "$WAYBAR_CONFIG"
-  fi
-fi
-
-if [[ -f $WAYBAR_STYLE ]] && ! grep -q '#custom-weather' "$WAYBAR_STYLE"; then
-  cat >>"$WAYBAR_STYLE" <<'EOF'
-
-#custom-weather {
-  margin-left: 7.5px;
-  margin-right: 7.5px;
-}
-
-#custom-weather.unavailable {
-  min-width: 0;
-  margin: 0;
-  padding: 0;
-}
-EOF
-fi
-
-omarchy-restart-waybar
diff --git a/migrations/1778148645.sh b/migrations/1778148645.sh
deleted file mode 100644
index c085858e..00000000
--- a/migrations/1778148645.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-echo "Configure SDDM to use Wayland for the greeter"
-
-sudo cp "$OMARCHY_PATH/default/sddm/hyprland.conf" /usr/share/sddm/hyprland.conf
-sudo mkdir -p /etc/sddm.conf.d
-cat <<EOF | sudo tee /etc/sddm.conf.d/10-wayland.conf >/dev/null
-[General]
-DisplayServer=wayland
-
-[Wayland]
-CompositorCommand=start-hyprland -- --config /usr/share/sddm/hyprland.conf
-EOF
diff --git a/migrations/1778151386.sh b/migrations/1778151386.sh
deleted file mode 100644
index 5f9fb388..00000000
--- a/migrations/1778151386.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Add Omarchy pi system theme extension"
-
-mkdir -p "$HOME/.pi/agent/extensions"
-cp "$OMARCHY_PATH/default/pi/agent/extensions/omarchy-system-theme.ts" "$HOME/.pi/agent/extensions/"
diff --git a/migrations/1778165347.sh b/migrations/1778165347.sh
deleted file mode 100644
index cbd35fec..00000000
--- a/migrations/1778165347.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Install hardware video acceleration for Intel GPUs on non-X Panther Lake systems"
-
-if lspci | grep -iE 'vga|3d|display' | grep -i 'intel' | grep -i 'panther lake' | grep -qi 'intel graphics'; then
-  bash "$OMARCHY_PATH/install/config/hardware/intel/video-acceleration.sh"
-fi
diff --git a/migrations/1778171768.sh b/migrations/1778171768.sh
deleted file mode 100644
index ae7e5789..00000000
--- a/migrations/1778171768.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-echo "Run SwayOSD as a supervised session service"
-
-mkdir -p ~/.config/systemd/user
-cp "$OMARCHY_PATH/config/systemd/user/swayosd-server.service" ~/.config/systemd/user/swayosd-server.service
-
-if [[ -f ~/.config/hypr/autostart.conf ]]; then
-  sed -i '/^exec-once = uwsm-app -- swayosd-server$/d' ~/.config/hypr/autostart.conf
-fi
-
-pkill -x swayosd-server || true
-
-bash "$OMARCHY_PATH/install/first-run/swayosd.sh"
diff --git a/migrations/1778222128.sh b/migrations/1778222128.sh
deleted file mode 100644
index d348b389..00000000
--- a/migrations/1778222128.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo "Add sample post-boot hook"
-
-mkdir -p ~/.config/omarchy/hooks/post-boot.d
-
-if [[ ! -f ~/.config/omarchy/hooks/post-boot.d/weather.sample ]]; then
-  cp "$OMARCHY_PATH/config/omarchy/hooks/post-boot.d/weather.sample" ~/.config/omarchy/hooks/post-boot.d/weather.sample
-fi
diff --git a/migrations/1778233760.sh b/migrations/1778233760.sh
deleted file mode 100644
index 522f14ab..00000000
--- a/migrations/1778233760.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Add Omarchy AI skill to pi, Codex, and shared Agent Skills directories"
-
-source "$OMARCHY_PATH/install/config/omarchy-ai-skill.sh"
diff --git a/migrations/1778270869.sh b/migrations/1778270869.sh
deleted file mode 100644
index 1429d454..00000000
--- a/migrations/1778270869.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-echo "Remove VAAPI GL video feature flags from Chromium-based browser configs to prevent crashing on some machines"
-
-remove_chromium_vaapi_features() {
-  local file=$1
-
-  [[ -f $file ]] || return 0
-
-  sed -i --follow-symlinks \
-    -e '/^--enable-features=/ s/VaapiVideoDecodeLinuxGL//g' \
-    -e '/^--enable-features=/ s/VaapiVideoEncoder//g' \
-    -e '/^--enable-features=/ s/,,*/,/g' \
-    -e '/^--enable-features=/ s/=,/=/' \
-    -e '/^--enable-features=/ s/,$//' \
-    -e '/^--enable-features=$/d' \
-    "$file"
-}
-
-for flags_file in "$HOME"/.config/{chromium,chrome,google-chrome,google-chrome-beta,google-chrome-unstable,brave,brave-beta,brave-nightly,brave-origin-beta,microsoft-edge-stable,microsoft-edge-beta,microsoft-edge-dev,vivaldi-stable,vivaldi-snapshot,opera,opera-beta,opera-developer}-flags.conf; do
-  remove_chromium_vaapi_features "$flags_file"
-done
diff --git a/migrations/1778307905.sh b/migrations/1778307905.sh
deleted file mode 100644
index fdcbaeaf..00000000
--- a/migrations/1778307905.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Remove Omarchy cliamp desktop stub and icon (replace by package inclusion)"
-
-rm -f ~/.local/share/applications/Cliamp.desktop
-rm -f ~/.local/share/applications/icons/Cliamp.png
diff --git a/migrations/system/.gitkeep b/migrations/system/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/migrations/user/.gitkeep b/migrations/user/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/migrations/user/1780057136.sh b/migrations/user/1780057136.sh
new file mode 100644
index 00000000..1e6a8c10
--- /dev/null
+++ b/migrations/user/1780057136.sh
@@ -0,0 +1,172 @@
+echo "Make Shift+Enter distinguishable for terminals and Codex"
+
+alacritty_config="$HOME/.config/alacritty/alacritty.toml"
+foot_config="$HOME/.config/foot/foot.ini"
+ghostty_config="$HOME/.config/ghostty/config"
+kitty_config="$HOME/.config/kitty/kitty.conf"
+
+ensure_alacritty_shift_return() {
+  local config="$1"
+
+  [[ -f $config ]] || return 0
+
+  if grep -q 'key = "Return", mods = "Shift", chars = "\\u001B\\r"' "$config"; then
+    sed -i 's/{ key = "Return", mods = "Shift", chars = "\\u001B\\r" }/{ key = "Return", mods = "Shift", chars = "\\u001B[13;2u" }/' "$config"
+  elif ! grep -q 'key = "Return", mods = "Shift", chars = "\\u001B\[13;2u"' "$config"; then
+    if grep -qxF '{ key = "Return", mods = "Alt|Shift", chars = "\u001B[13;4u" }' "$config"; then
+      sed -i '/^{ key = "Return", mods = "Alt|Shift", chars = "\\u001B\[13;4u" }$/i # Send Shift+Return as CSI-u so TUIs can distinguish it from Return without treating it as Alt+Return.\n{ key = "Return", mods = "Shift", chars = "\\u001B[13;2u" },' "$config"
+    elif grep -qxF '{ key = "Insert", mods = "Control", action = "Copy" },' "$config"; then
+      sed -i '/^{ key = "Insert", mods = "Control", action = "Copy" },$/a # Send Shift+Return as CSI-u so TUIs can distinguish it from Return without treating it as Alt+Return.\n{ key = "Return", mods = "Shift", chars = "\\u001B[13;2u" },' "$config"
+    else
+      printf '\n# Send Shift+Return as CSI-u so TUIs can distinguish it from Return without treating it as Alt+Return.\n{ key = "Return", mods = "Shift", chars = "\\u001B[13;2u" }\n' >>"$config"
+    fi
+  fi
+}
+
+ensure_ghostty_binding() {
+  local config="$1"
+  local key="$2"
+  local binding="$3"
+  local comment="$4"
+  local key_regex
+
+  [[ -f $config ]] || return 0
+
+  key_regex=$(printf '%s\n' "$key" | sed 's/[][\\.^$*+?{}|()\/]/\\&/g')
+
+  if grep -Eq "^keybind = $key_regex=.*13;[24]u" "$config"; then
+    sed -i "s/^keybind = $key_regex=.*/keybind = $key=$binding/" "$config"
+  elif ! grep -qF "keybind = $key=" "$config"; then
+    if grep -qxF 'keybind = control+insert=copy_to_clipboard' "$config"; then
+      sed -i "/^keybind = control+insert=copy_to_clipboard$/a $comment\nkeybind = $key=$binding" "$config"
+    else
+      printf '\n%s\nkeybind = %s=%s\n' "$comment" "$key" "$binding" >>"$config"
+    fi
+  fi
+}
+
+ensure_kitty_binding() {
+  local config="$1"
+  local key="$2"
+  local binding="$3"
+  local comment="$4"
+  local key_regex
+  local tmp
+
+  [[ -f $config ]] || return 0
+
+  key_regex=$(printf '%s\n' "$key" | sed 's/[][\\.^$*+?{}|()\/]/\\&/g')
+
+  if grep -Eq "^map[[:space:]]+$key_regex[[:space:]].*13;[24]u" "$config"; then
+    tmp=$(mktemp)
+    KEY="$key" BINDING="$binding" awk '
+      BEGIN {
+        key = ENVIRON["KEY"]
+        binding = ENVIRON["BINDING"]
+      }
+      {
+        split($0, parts, /[[:space:]]+/)
+        if (parts[1] == "map" && parts[2] == key && $0 ~ /13;[24]u/) {
+          $0 = "map " key " " binding
+        }
+        print
+      }
+    ' "$config" >"$tmp" && mv "$tmp" "$config"
+  elif ! grep -Eq "^map[[:space:]]+$key_regex[[:space:]]" "$config"; then
+    if grep -qxF 'map shift+insert paste_from_clipboard' "$config"; then
+      tmp=$(mktemp)
+      KEY="$key" BINDING="$binding" COMMENT="$comment" awk '
+        BEGIN {
+          key = ENVIRON["KEY"]
+          binding = ENVIRON["BINDING"]
+          comment = ENVIRON["COMMENT"]
+        }
+        { print }
+        !inserted && $0 == "map shift+insert paste_from_clipboard" {
+          print comment
+          print "map " key " " binding
+          inserted = 1
+        }
+      ' "$config" >"$tmp" && mv "$tmp" "$config"
+    else
+      printf '\n%s\nmap %s %s\n' "$comment" "$key" "$binding" >>"$config"
+    fi
+  fi
+}
+
+ensure_foot_text_binding() {
+  local config="$1"
+  local sequence="$2"
+  local binding="$3"
+  local comment="$4"
+  local tmp
+
+  [[ -f $config ]] || return 0
+
+  if grep -qF "$sequence=" "$config"; then
+    tmp=$(mktemp)
+    SEQUENCE="$sequence" BINDING="$binding" awk '
+      BEGIN {
+        sequence = ENVIRON["SEQUENCE"]
+        binding = ENVIRON["BINDING"]
+      }
+      index($0, sequence "=") == 1 { $0 = sequence "=" binding }
+      { print }
+    ' "$config" >"$tmp" && mv "$tmp" "$config"
+  elif grep -qxF '[text-bindings]' "$config"; then
+    tmp=$(mktemp)
+    SEQUENCE="$sequence" BINDING="$binding" COMMENT="$comment" awk '
+      BEGIN {
+        sequence = ENVIRON["SEQUENCE"]
+        binding = ENVIRON["BINDING"]
+        comment = ENVIRON["COMMENT"]
+      }
+      { print }
+      !inserted && $0 == "[text-bindings]" {
+        print comment
+        print sequence "=" binding
+        inserted = 1
+      }
+    ' "$config" >"$tmp" && mv "$tmp" "$config"
+  else
+    printf '\n[text-bindings]\n%s\n%s=%s\n' "$comment" "$sequence" "$binding" >>"$config"
+  fi
+}
+
+ensure_alacritty_shift_return "$alacritty_config"
+
+ensure_ghostty_binding \
+  "$ghostty_config" \
+  "shift+enter" \
+  "csi:13;2u" \
+  "# Send Shift+Enter as CSI-u so TUIs can distinguish it from Enter."
+
+ensure_ghostty_binding \
+  "$ghostty_config" \
+  "alt+shift+enter" \
+  "csi:13;4u" \
+  "# Legacy encoding sends Alt+Shift+Enter the same as Alt+Enter; send CSI-u so tmux can match M-S-Enter."
+
+ensure_kitty_binding \
+  "$kitty_config" \
+  "shift+enter" \
+  "send_text all \\e[13;2u" \
+  "# Send Shift+Enter as CSI-u so TUIs can distinguish it from Enter."
+
+ensure_kitty_binding \
+  "$kitty_config" \
+  "alt+shift+enter" \
+  "send_text all \\e[13;4u" \
+  "# Kitty legacy encoding sends Alt+Shift+Enter the same as Alt+Enter; send CSI-u so tmux can match M-S-Enter."
+
+ensure_foot_text_binding \
+  "$foot_config" \
+  "\\x1b[13;2u" \
+  "Shift+Return" \
+  "# Send Shift+Return as CSI-u so TUIs can distinguish it from Return."
+
+ensure_foot_text_binding \
+  "$foot_config" \
+  "\\x1b[13;4u" \
+  "Mod1+Shift+Return" \
+  "# Send Alt+Shift+Return as CSI-u so tmux can match M-S-Enter."
diff --git a/migrations/user/1780294774.sh b/migrations/user/1780294774.sh
new file mode 100644
index 00000000..149276a7
--- /dev/null
+++ b/migrations/user/1780294774.sh
@@ -0,0 +1,31 @@
+echo "Remove leading zero from bar clock date"
+
+config_file="$HOME/.config/omarchy/shell.json"
+
+if [[ -f $config_file ]] && omarchy-cmd-present jq; then
+  tmp=$(mktemp)
+  jq '
+    def update_clock_format:
+      if type == "object" and (.id // "") == "omarchy.clock" and (.formatAlt // "") == "dd MMMM \u0027W\u0027ww yyyy" then
+        .formatAlt = "d MMMM \u0027W\u0027ww yyyy"
+      else
+        .
+      end;
+
+    .bar.layout |= (
+      if type == "object" then
+        with_entries(
+          .value |= (
+            if type == "array" then
+              map(update_clock_format)
+            else
+              .
+            end
+          )
+        )
+      else
+        .
+      end
+    )
+  ' "$config_file" >"$tmp" && mv "$tmp" "$config_file" || rm -f "$tmp"
+fi
diff --git a/migrations/user/1780517689.sh b/migrations/user/1780517689.sh
new file mode 100644
index 00000000..1992f265
--- /dev/null
+++ b/migrations/user/1780517689.sh
@@ -0,0 +1,25 @@
+echo "Add yt-dlp download extension (Alt+Shift+D) to Chromium-based browsers"
+
+YTDLP_EXT="$OMARCHY_PATH/default/chromium/extensions/yt-dlp"
+
+add_ytdlp_extension() {
+  local file=$1
+
+  [[ -f $file ]] || return 0
+  grep -q "extensions/yt-dlp" "$file" && return 0
+
+  if grep -q "^--load-extension=" "$file"; then
+    sed -i --follow-symlinks "s|^--load-extension=\(.*\)$|--load-extension=\1,$YTDLP_EXT|" "$file"
+  else
+    echo "--load-extension=$YTDLP_EXT" >>"$file"
+  fi
+}
+
+for conf in chromium chrome google-chrome brave brave-beta brave-nightly brave-origin-beta microsoft-edge-stable; do
+  add_ytdlp_extension "$HOME/.config/$conf-flags.conf"
+done
+
+omarchy-pkg-add yt-dlp
+
+# Register the native messaging host that runs yt-dlp for the extension.
+omarchy-install-chromium-ytdlp || true
diff --git a/shell/Commons/Border.qml b/shell/Commons/Border.qml
new file mode 100644
index 00000000..948aa782
--- /dev/null
+++ b/shell/Commons/Border.qml
@@ -0,0 +1,242 @@
+pragma Singleton
+import QtQuick
+import "BorderGeometry.js" as Geometry
+
+// Central border-spec factory for shell surfaces and controls. A spec carries
+// color, optional gradient, and top/right/bottom/left widths so renderers can
+// choose the cheap Rectangle path or the Shape-ring path without duplicating
+// theme parsing logic.
+QtObject {
+  id: root
+
+  function none() {
+    return flat("transparent", 0)
+  }
+
+  function flat(color, width) {
+    return {
+      color: color || "transparent",
+      widths: Geometry.parseWidthSpec(width, 0),
+      gradient: { colors: [], angle: 0, enabled: false },
+    }
+  }
+
+  function value(section, key) {
+    var v = Color.shellValues[section + "." + key]
+    return (v === undefined || v === null) ? "" : v
+  }
+
+  function valueOr(section, keys) {
+    for (var i = 0; i < keys.length; i++) {
+      var v = value(section, keys[i])
+      if (String(v).length > 0) return v
+    }
+    return ""
+  }
+
+  function resolveValueRef(raw) {
+    var s = String(raw || "").replace(/^\s+|\s+$/g, "")
+    var seen = {}
+    while (s.match(/^[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+$/) && !seen[s]) {
+      seen[s] = true
+      var next = Color.shellValues[s]
+      if (next === undefined || next === null || String(next).length === 0) break
+      s = String(next).replace(/^\s+|\s+$/g, "")
+    }
+    return s
+  }
+
+  function alpha(section, key, fallback) {
+    var raw = value(section, key)
+    if (String(raw).length === 0) return fallback
+    var n = Number(raw)
+    return isFinite(n) ? Geometry.clampAlpha(n) : fallback
+  }
+
+  function cssColor(color, opacity) {
+    var a = opacity === undefined || opacity === null ? 1 : Geometry.clampAlpha(opacity)
+    if (color && typeof color === "object" && color.r !== undefined) {
+      if (typeof Qt !== "undefined" && Qt.rgba) {
+        return Qt.rgba(color.r, color.g, color.b, (color.a === undefined ? 1 : color.a) * a)
+      }
+      return "#"
+        + Geometry.padHex(color.r * 255)
+        + Geometry.padHex(color.g * 255)
+        + Geometry.padHex(color.b * 255)
+        + Geometry.padHex((color.a === undefined ? 1 : color.a) * a * 255)
+    }
+
+    var s = String(color || "").replace(/^\s+|\s+$/g, "")
+    var role = s.toLowerCase()
+    if (role === "foreground" || role === "text") return cssColor(Color.foreground, a)
+    if (role === "accent") return cssColor(Color.accent, a)
+    if (role === "urgent") return cssColor(Color.urgent, a)
+    if (role === "background") return cssColor(Color.background, a)
+    if (role === "transparent") return "transparent"
+    return Geometry.canonicalColor(s, a)
+  }
+
+  function resolvedGradient(raw, fallbackColor, opacity) {
+    var s = String(raw || "").replace(/^\s+|\s+$/g, "")
+    if (s.length === 0) return { colors: [], angle: 0, enabled: false }
+
+    var parts = s.split(/\s+/)
+    var colors = []
+    var angle = 0
+    for (var i = 0; i < parts.length; i++) {
+      if (parts[i].match(/^-?\d+(?:\.\d+)?deg$/)) angle = Number(parts[i].replace(/deg$/, ""))
+      else colors.push(cssColor(parts[i], opacity))
+    }
+    if (colors.length === 0) colors.push(cssColor(fallbackColor, opacity))
+    return { colors: colors, angle: angle, enabled: colors.length > 1 }
+  }
+
+  function sameColor(a, b) {
+    if (typeof Qt === "undefined" || !Qt.color) return String(a) === String(b)
+    var ca = typeof a === "string" ? Qt.color(a) : a
+    var cb = typeof b === "string" ? Qt.color(b) : b
+    if (!ca || !cb || ca.r === undefined || cb.r === undefined) return String(a) === String(b)
+    return Math.round(ca.r * 255) === Math.round(cb.r * 255)
+      && Math.round(ca.g * 255) === Math.round(cb.g * 255)
+      && Math.round(ca.b * 255) === Math.round(cb.b * 255)
+      && Math.round((ca.a === undefined ? 1 : ca.a) * 255) === Math.round((cb.a === undefined ? 1 : cb.a) * 255)
+  }
+
+  function localOrSurfaceSpec(section, token, localColor, defaultColor, fallbackWidth, alphaKey) {
+    if (!sameColor(localColor, defaultColor)) return flat(localColor, fallbackWidth)
+    return surfaceSpec(section, token, localColor, fallbackWidth, alphaKey)
+  }
+
+  function surfaceWidths(section, token, fallbackWidth) {
+    var base = valueOr(section, token === "border" ? ["border-width"] : [token + "-width", "border-width"])
+    var widths = Geometry.parseWidthSpec(base, fallbackWidth)
+    return Geometry.withSideOverrides(
+      widths,
+      valueOr(section, token === "border" ? ["border-width-top"] : [token + "-width-top", "border-width-top"]),
+      valueOr(section, token === "border" ? ["border-width-right"] : [token + "-width-right", "border-width-right"]),
+      valueOr(section, token === "border" ? ["border-width-bottom"] : [token + "-width-bottom", "border-width-bottom"]),
+      valueOr(section, token === "border" ? ["border-width-left"] : [token + "-width-left", "border-width-left"])
+    )
+  }
+
+  function borderValue(raw, fallbackColor, opacity, legacyGradientRaw) {
+    var fallback = cssColor(fallbackColor, opacity)
+    var primaryRaw = String(raw || "").replace(/^\s+|\s+$/g, "")
+    var primary = resolvedGradient(primaryRaw.length > 0 ? primaryRaw : fallbackColor, fallbackColor, opacity)
+    var color = primary.colors.length > 0 ? primary.colors[0] : fallback
+    var gradient = primary.enabled ? primary : { colors: [], angle: 0, enabled: false }
+
+    // Backward compatibility for existing configs written during the separate
+    // border-gradient experiment. New configs put solid colors and gradients in
+    // the same border token.
+    if (!gradient.enabled && String(legacyGradientRaw || "").replace(/^\s+|\s+$/g, "").length > 0) {
+      var legacy = resolvedGradient(legacyGradientRaw, color, opacity)
+      if (legacy.enabled) gradient = legacy
+    }
+
+    return { color: color, gradient: gradient }
+  }
+
+  function surfaceSpec(section, token, fallbackColor, fallbackWidth, alphaKey) {
+    var opacity = alpha(section, alphaKey || token + "-alpha", 1.0)
+    var legacyGradientRaw = valueOr(section, token === "border" ? ["border-gradient"] : [token + "-gradient", "border-gradient"])
+    var resolved = borderValue(resolveValueRef(value(section, token)), fallbackColor, opacity, legacyGradientRaw)
+
+    return {
+      color: resolved.color,
+      widths: surfaceWidths(section, token, fallbackWidth),
+      gradient: resolved.gradient,
+    }
+  }
+
+  function hyprlandActiveSpec(fallbackColor, fallbackWidth) {
+    var raw = value("hyprland", "active-border")
+    var opacity = alpha("hyprland", "active-border-alpha", 1.0)
+
+    // Existing generated themes predate [hyprland] and already keep the active
+    // border under [notifications]. Use it as the compatibility source until
+    // the next theme refresh writes the shared token.
+    if (String(raw).length === 0) {
+      raw = value("notifications", "border")
+      opacity = alpha("notifications", "border-alpha", opacity)
+    }
+
+    var resolved = borderValue(resolveValueRef(raw), fallbackColor, opacity, "")
+    return {
+      color: resolved.color,
+      widths: Geometry.parseWidthSpec(value("hyprland", "active-border-width"), fallbackWidth),
+      gradient: resolved.gradient,
+    }
+  }
+
+  function controlPrefix(state) {
+    if (state === "hover" || state === "hot") return "hover-cursor"
+    return state || "normal"
+  }
+
+  function controlColor(prefix, foreground, accent, urgent) {
+    if (prefix === "focus") return Style.focusStateColor(foreground, accent, urgent)
+    if (prefix === "hover-cursor") return Style.hoverStateColor(foreground, accent, urgent)
+    if (prefix === "selected") return Style.selectedStateColor(foreground, accent, urgent)
+    return Style.normalStateColor(foreground, accent, urgent)
+  }
+
+  function controlAlpha(prefix) {
+    if (prefix === "focus") return Style.focusBorderAlpha
+    if (prefix === "hover-cursor") return Style.hoverBorderAlpha
+    if (prefix === "selected") return Style.selectedBorderAlpha
+    return Style.normalBorderAlpha
+  }
+
+  function controlFallbackWidth(prefix) {
+    if (prefix === "focus") return Style.focusBorderWidth
+    if (prefix === "hover-cursor") return Style.hoverBorderWidth
+    if (prefix === "selected") return Style.selectedBorderWidth
+    return Style.normalBorderWidth
+  }
+
+  function controlWidths(state) {
+    var prefix = controlPrefix(state)
+    var fallbackWidth = controlFallbackWidth(prefix)
+    var base = Style.styleOverrides[prefix + "-border-width"]
+    var widths = Geometry.parseWidthSpec(base, fallbackWidth)
+    return Geometry.withSideOverrides(
+      widths,
+      Style.styleOverrides[prefix + "-border-width-top"],
+      Style.styleOverrides[prefix + "-border-width-right"],
+      Style.styleOverrides[prefix + "-border-width-bottom"],
+      Style.styleOverrides[prefix + "-border-width-left"]
+    )
+  }
+
+  function controlHasWidth(state) {
+    return Geometry.maxWidth(controlWidths(state)) > 0
+  }
+
+  function controlSpec(state, foreground, accent, urgent) {
+    var prefix = controlPrefix(state)
+    var resolved = borderValue(
+      Style.styleOverrides[prefix + "-border"],
+      controlColor(prefix, foreground, accent, urgent),
+      controlAlpha(prefix),
+      Style.styleOverrides[prefix + "-border-gradient"]
+    )
+
+    return { color: resolved.color, widths: controlWidths(prefix), gradient: resolved.gradient }
+  }
+
+  function withWidth(spec, width) {
+    if (!spec) return flat("transparent", 0)
+    return { color: spec.color, gradient: spec.gradient, widths: Geometry.parseWidthSpec(width, 0) }
+  }
+
+  function isNone(spec) { return !spec || Geometry.maxWidth(spec.widths) <= 0 }
+  function needsOverlay(spec) { return Geometry.needsOverlay(spec) }
+  function canUseNative(spec) { return Geometry.canUseNative(spec) }
+  function top(spec) { return spec && spec.widths ? spec.widths.top : 0 }
+  function right(spec) { return spec && spec.widths ? spec.widths.right : 0 }
+  function bottom(spec) { return spec && spec.widths ? spec.widths.bottom : 0 }
+  function left(spec) { return spec && spec.widths ? spec.widths.left : 0 }
+  function uniformWidth(spec) { return spec && spec.widths ? spec.widths.top : 0 }
+  function color(spec) { return spec ? spec.color : "transparent" }
+}
diff --git a/shell/Commons/BorderGeometry.js b/shell/Commons/BorderGeometry.js
new file mode 100644
index 00000000..96ba838a
--- /dev/null
+++ b/shell/Commons/BorderGeometry.js
@@ -0,0 +1,269 @@
+.pragma library
+
+function clamp(value, min, max) {
+  var n = Number(value)
+  if (!isFinite(n)) return min
+  return Math.max(min, Math.min(max, n))
+}
+
+function clampAlpha(value) {
+  return clamp(value, 0, 1)
+}
+
+function padHex(value) {
+  var n = clamp(Math.round(Number(value)), 0, 255)
+  var h = n.toString(16)
+  return h.length < 2 ? "0" + h : h
+}
+
+function qmlHexColor(rgb, alphaByte) {
+  var rgbPart = String(rgb || "").replace(/^#/, "")
+  var a = clamp(Math.round(Number(alphaByte)), 0, 255)
+
+  if (typeof Qt !== "undefined" && Qt.rgba && rgbPart.length >= 6) {
+    return Qt.rgba(
+      parseInt(rgbPart.substring(0, 2), 16) / 255,
+      parseInt(rgbPart.substring(2, 4), 16) / 255,
+      parseInt(rgbPart.substring(4, 6), 16) / 255,
+      a / 255
+    )
+  }
+
+  var aHex = padHex(a)
+  return aHex.toLowerCase() === "ff" ? "#" + rgbPart : "#" + rgbPart + aHex
+}
+
+function canonicalColor(value, alpha) {
+  var a = alpha === undefined || alpha === null ? 1 : clampAlpha(alpha)
+  var s = String(value || "").replace(/^\s+|\s+$/g, "")
+  var m
+
+  m = s.match(/^#([0-9A-Fa-f]{3})$/)
+  if (m) {
+    var sh = m[1]
+    return qmlHexColor(
+      sh.charAt(0) + sh.charAt(0)
+        + sh.charAt(1) + sh.charAt(1)
+        + sh.charAt(2) + sh.charAt(2),
+      a * 255
+    )
+  }
+
+  m = s.match(/^#([0-9A-Fa-f]{6})([0-9A-Fa-f]{2})?$/)
+  if (m) {
+    var colorAlpha = m[2] ? parseInt(m[2], 16) / 255 : 1
+    return qmlHexColor(m[1], colorAlpha * a * 255)
+  }
+
+  m = s.match(/^[Rr][Gg][Bb]\(([0-9A-Fa-f]{6})\)$/)
+  if (m) return qmlHexColor(m[1], a * 255)
+
+  m = s.match(/^[Rr][Gg][Bb][Aa]\(([0-9A-Fa-f]{6})([0-9A-Fa-f]{2})\)$/)
+  if (m) return qmlHexColor(m[1], (parseInt(m[2], 16) / 255) * a * 255)
+
+  m = s.match(/^[Rr][Gg][Bb]\(([0-9]+),([0-9]+),([0-9]+)\)$/)
+  if (m) return qmlHexColor(padHex(m[1]) + padHex(m[2]) + padHex(m[3]), a * 255)
+
+  m = s.match(/^[Rr][Gg][Bb][Aa]\(([0-9]+),([0-9]+),([0-9]+),([0-9.]+)\)$/)
+  if (m) return qmlHexColor(padHex(m[1]) + padHex(m[2]) + padHex(m[3]), clampAlpha(m[4]) * a * 255)
+
+  m = s.match(/^0x([0-9A-Fa-f]{2})([0-9A-Fa-f]{6})$/)
+  if (m) return qmlHexColor(m[2], (parseInt(m[1], 16) / 255) * a * 255)
+
+  return s
+}
+
+function parseWidthSpec(value, fallback) {
+  var fb = Number(fallback)
+  if (!isFinite(fb) || fb < 0) fb = 0
+
+  if (value === undefined || value === null || value === "") {
+    return { top: fb, right: fb, bottom: fb, left: fb }
+  }
+
+  var parts = String(value).match(/-?\d+(?:\.\d+)?/g) || []
+  var nums = []
+  for (var i = 0; i < parts.length && i < 4; i++) {
+    var n = Number(parts[i])
+    nums.push(isFinite(n) && n > 0 ? n : 0)
+  }
+
+  if (nums.length === 0) nums = [fb]
+  if (nums.length === 1) return { top: nums[0], right: nums[0], bottom: nums[0], left: nums[0] }
+  if (nums.length === 2) return { top: nums[0], right: nums[1], bottom: nums[0], left: nums[1] }
+  if (nums.length === 3) return { top: nums[0], right: nums[1], bottom: nums[2], left: nums[1] }
+  return { top: nums[0], right: nums[1], bottom: nums[2], left: nums[3] }
+}
+
+function withSideOverrides(widths, top, right, bottom, left) {
+  var out = {
+    top: Number(widths && widths.top) || 0,
+    right: Number(widths && widths.right) || 0,
+    bottom: Number(widths && widths.bottom) || 0,
+    left: Number(widths && widths.left) || 0,
+  }
+  if (top !== undefined && top !== null && top !== "") out.top = Math.max(0, Number(top) || 0)
+  if (right !== undefined && right !== null && right !== "") out.right = Math.max(0, Number(right) || 0)
+  if (bottom !== undefined && bottom !== null && bottom !== "") out.bottom = Math.max(0, Number(bottom) || 0)
+  if (left !== undefined && left !== null && left !== "") out.left = Math.max(0, Number(left) || 0)
+  return out
+}
+
+function parseGradientSpec(value, fallbackColor, alpha) {
+  var s = String(value || "").replace(/^\s+|\s+$/g, "")
+  var colors = []
+  var angle = 0
+  var parts = s.length > 0 ? s.split(/\s+/) : []
+
+  for (var i = 0; i < parts.length; i++) {
+    var part = parts[i]
+    var angleMatch = part.match(/^(-?\d+(?:\.\d+)?)deg$/)
+    if (angleMatch) angle = Number(angleMatch[1])
+    else colors.push(canonicalColor(part, alpha))
+  }
+
+  if (colors.length === 0 && fallbackColor !== undefined && fallbackColor !== null)
+    colors.push(canonicalColor(fallbackColor, alpha))
+
+  return {
+    colors: colors,
+    angle: isFinite(angle) ? angle : 0,
+    enabled: colors.length > 1,
+  }
+}
+
+function isUniform(widths) {
+  if (!widths) return true
+  return widths.top === widths.right && widths.top === widths.bottom && widths.top === widths.left
+}
+
+function maxWidth(widths) {
+  if (!widths) return 0
+  return Math.max(widths.top || 0, widths.right || 0, widths.bottom || 0, widths.left || 0)
+}
+
+function needsOverlay(spec) {
+  if (!spec) return false
+  if (maxWidth(spec.widths) <= 0) return false
+  return !!(spec.gradient && spec.gradient.enabled) || !isUniform(spec.widths)
+}
+
+function canUseNative(spec) {
+  return !!spec && maxWidth(spec.widths) > 0 && !needsOverlay(spec)
+}
+
+function normalizeRadii(w, h, r) {
+  var tl = { rx: Math.max(0, Number(r.tlrx) || 0), ry: Math.max(0, Number(r.tlry) || 0) }
+  var tr = { rx: Math.max(0, Number(r.trrx) || 0), ry: Math.max(0, Number(r.trry) || 0) }
+  var br = { rx: Math.max(0, Number(r.brrx) || 0), ry: Math.max(0, Number(r.brry) || 0) }
+  var bl = { rx: Math.max(0, Number(r.blrx) || 0), ry: Math.max(0, Number(r.blry) || 0) }
+  var scale = 1
+
+  if (tl.rx + tr.rx > w && tl.rx + tr.rx > 0) scale = Math.min(scale, w / (tl.rx + tr.rx))
+  if (bl.rx + br.rx > w && bl.rx + br.rx > 0) scale = Math.min(scale, w / (bl.rx + br.rx))
+  if (tl.ry + bl.ry > h && tl.ry + bl.ry > 0) scale = Math.min(scale, h / (tl.ry + bl.ry))
+  if (tr.ry + br.ry > h && tr.ry + br.ry > 0) scale = Math.min(scale, h / (tr.ry + br.ry))
+
+  if (scale < 1) {
+    tl.rx *= scale; tr.rx *= scale; br.rx *= scale; bl.rx *= scale
+    tl.ry *= scale; tr.ry *= scale; br.ry *= scale; bl.ry *= scale
+  }
+
+  return { tl: tl, tr: tr, br: br, bl: bl }
+}
+
+function roundedRectPath(x, y, w, h, radii) {
+  if (w <= 0 || h <= 0) return ""
+  var r = normalizeRadii(w, h, radii)
+  var right = x + w
+  var bottom = y + h
+  var p = []
+
+  p.push("M", x + r.tl.rx, y)
+  p.push("H", right - r.tr.rx)
+  if (r.tr.rx > 0 || r.tr.ry > 0) p.push("A", r.tr.rx, r.tr.ry, 0, 0, 1, right, y + r.tr.ry)
+  p.push("V", bottom - r.br.ry)
+  if (r.br.rx > 0 || r.br.ry > 0) p.push("A", r.br.rx, r.br.ry, 0, 0, 1, right - r.br.rx, bottom)
+  p.push("H", x + r.bl.rx)
+  if (r.bl.rx > 0 || r.bl.ry > 0) p.push("A", r.bl.rx, r.bl.ry, 0, 0, 1, x, bottom - r.bl.ry)
+  p.push("V", y + r.tl.ry)
+  if (r.tl.rx > 0 || r.tl.ry > 0) p.push("A", r.tl.rx, r.tl.ry, 0, 0, 1, x + r.tl.rx, y)
+  p.push("Z")
+
+  return p.join(" ")
+}
+
+function ringPath(w, h, radius, widths) {
+  w = Math.max(0, Number(w) || 0)
+  h = Math.max(0, Number(h) || 0)
+  radius = Math.max(0, Number(radius) || 0)
+  widths = widths || { top: 0, right: 0, bottom: 0, left: 0 }
+
+  var outer = roundedRectPath(0, 0, w, h, {
+    tlrx: radius, tlry: radius,
+    trrx: radius, trry: radius,
+    brrx: radius, brry: radius,
+    blrx: radius, blry: radius,
+  })
+
+  // Shape's OddEven fill can collapse to the outer fill when the inner
+  // cutout touches the outer path on one or more zero-width sides. Keep the
+  // cutout strictly inside the outer path with a subpixel inset so one-sided
+  // borders (for example selected-border-width = "0 0 0 4") render as a
+  // strip instead of painting the whole row.
+  var epsilon = 0.001
+  var left = Math.max(0, widths.left || 0)
+  var top = Math.max(0, widths.top || 0)
+  var right = Math.max(0, widths.right || 0)
+  var bottom = Math.max(0, widths.bottom || 0)
+  var ix = Math.max(left, epsilon)
+  var iy = Math.max(top, epsilon)
+  var ir = Math.max(right, epsilon)
+  var ib = Math.max(bottom, epsilon)
+  var iw = w - ix - ir
+  var ih = h - iy - ib
+  if (iw <= 0 || ih <= 0) return outer
+
+  var inner = roundedRectPath(ix, iy, iw, ih, {
+    tlrx: Math.max(0, radius - left),
+    tlry: Math.max(0, radius - top),
+    trrx: Math.max(0, radius - right),
+    trry: Math.max(0, radius - top),
+    brrx: Math.max(0, radius - right),
+    brry: Math.max(0, radius - bottom),
+    blrx: Math.max(0, radius - left),
+    blry: Math.max(0, radius - bottom),
+  })
+
+  return outer + " " + inner
+}
+
+function gradientEndpoints(w, h, angle) {
+  w = Math.max(1, Number(w) || 1)
+  h = Math.max(1, Number(h) || 1)
+  var rad = (Number(angle) || 0) * Math.PI / 180
+  var dx = Math.cos(rad)
+  var dy = Math.sin(rad)
+  var len = (Math.abs(w * dx) + Math.abs(h * dy)) / 2
+  var cx = w / 2
+  var cy = h / 2
+  return {
+    x1: cx - dx * len,
+    y1: cy - dy * len,
+    x2: cx + dx * len,
+    y2: cy + dy * len,
+  }
+}
+
+function stopColor(colors, index) {
+  if (!colors || colors.length === 0) return "transparent"
+  if (index < colors.length) return colors[index]
+  return colors[colors.length - 1]
+}
+
+function stopPosition(colors, index) {
+  var count = colors ? colors.length : 0
+  if (count <= 1) return index === 0 ? 0 : 1
+  if (index >= count) return 1
+  return index / (count - 1)
+}
diff --git a/shell/Commons/Color.qml b/shell/Commons/Color.qml
new file mode 100644
index 00000000..4c184d73
--- /dev/null
+++ b/shell/Commons/Color.qml
@@ -0,0 +1,210 @@
+pragma Singleton
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import "BorderGeometry.js" as Geometry
+
+// Color surfaces for the shell. Foundational palette (foreground, background,
+// accent, urgent) comes from theme/colors.toml. Per-surface roles come from
+// theme/shell.toml — generated per theme from default/themed/shell.toml.tpl,
+// or shipped directly by a theme to replace the generated file. Surfaces that
+// don't appear in shell.toml fall back to the foundational palette.
+QtObject {
+  id: root
+
+  property color foreground: "#cacccc"
+  property color background: "#101315"
+  property color accent: "#cacccc"
+  property color urgent: "#a55555"
+  property color muted: "#707880"
+
+  // Flat dictionary of "section.key" -> raw string from shell.toml.
+  // Reassigning this whole property is what makes surface bindings below
+  // re-evaluate when the theme swaps; mutating it in place would not.
+  property var shellValues: ({})
+
+  function pick(key, fallback) {
+    var v = shellValues[key]
+    return (typeof v === "string" && v.length > 0) ? v : fallback
+  }
+
+  function pickAlpha(key, fallback) {
+    var v = shellValues[key]
+    if (typeof v !== "string" || v.length === 0) return fallback
+    var n = Number(v)
+    if (!isFinite(n)) return fallback
+    return Util.clampAlpha(n)
+  }
+
+  function firstColorToken(value) {
+    var parts = String(value || "").replace(/^\s+|\s+$/g, "").split(/\s+/)
+    for (var i = 0; i < parts.length; i++) {
+      if (!parts[i].match(/^-?\d+(?:\.\d+)?deg$/)) return parts[i]
+    }
+    return value
+  }
+
+  function flatColor(value, fallback) {
+    var token = firstColorToken(value)
+    var role = String(token || "").replace(/^\s+|\s+$/g, "").toLowerCase()
+    if (root.shellValues[role] && root.shellValues[role] !== token) return flatColor(root.shellValues[role], fallback)
+    if (role === "foreground" || role === "text") return root.foreground
+    if (role === "accent") return root.accent
+    if (role === "urgent") return root.urgent
+    if (role === "muted") return root.muted
+    if (role === "background") return root.background
+    if (role === "transparent") return Qt.rgba(0, 0, 0, 0)
+
+    var color = Geometry.canonicalColor(token, 1)
+    if (typeof color === "string" && color === token && token.charAt(0) !== "#") return fallback
+    return color
+  }
+
+  // Compose a color from a base-color key and its `-alpha` companion. If the
+  // base token is a gradient, color-only consumers use the first stop.
+  function composed(colorKey, alphaKey, colorFallback, alphaFallback) {
+    return Util.alpha(flatColor(pick(colorKey, colorFallback), colorFallback), pickAlpha(alphaKey, alphaFallback))
+  }
+
+  readonly property QtObject bar: QtObject {
+    property color background: root.composed("bar.background", "bar.background-alpha", root.background, 1.0)
+    property color text: root.pick("bar.text", root.foreground)
+    property color active: root.pick("bar.active", root.urgent)
+  }
+  readonly property QtObject popups: QtObject {
+    property color background: root.composed("popups.background", "popups.background-alpha", root.background, 1.0)
+    property color text: root.pick("popups.text", root.foreground)
+    property color border: root.composed("popups.border", "popups.border-alpha", root.accent, 1.0)
+  }
+  readonly property QtObject tooltip: QtObject {
+    property color background: root.composed("tooltip.background", "tooltip.background-alpha", root.background, 1.0)
+    property color text: root.pick("tooltip.text", root.foreground)
+    property color border: root.composed("tooltip.border", "tooltip.border-alpha", root.foreground, 1.0)
+  }
+  readonly property QtObject notifications: QtObject {
+    property color background: root.composed("notifications.background", "notifications.background-alpha", root.background, 1.0)
+    property color text: root.pick("notifications.text", root.foreground)
+    property color border: root.composed("notifications.border", "notifications.border-alpha", root.accent, 1.0)
+    property color countdown: root.pick("notifications.countdown", root.accent)
+  }
+  readonly property QtObject launcher: QtObject {
+    property color background: root.composed("launcher.background", "launcher.background-alpha", root.background, 1.0)
+    property color text: root.pick("launcher.text", root.foreground)
+    property color border: root.composed("launcher.border", "launcher.border-alpha", root.foreground, 1.0)
+    property color scrim: root.composed("launcher.scrim", "launcher.scrim-alpha", root.background, 0.5)
+    property color selectedBackground: root.composed("launcher.selected-background", "launcher.selected-background-alpha", root.foreground, 0.08)
+    property color selectedText: root.pick("launcher.selected-text", root.accent)
+    property color selectedBorder: root.composed("launcher.selected-border", "launcher.selected-border-alpha", root.foreground, 0.0)
+  }
+  readonly property QtObject menu: QtObject {
+    property color background: root.composed("menu.background", "menu.background-alpha", root.background, 1.0)
+    property color text: root.pick("menu.text", root.foreground)
+    property color border: root.composed("menu.border", "menu.border-alpha", root.foreground, 1.0)
+    property color scrim: root.composed("menu.scrim", "menu.scrim-alpha", root.background, 0.5)
+    property color selectedBackground: root.composed("menu.selected-background", "menu.selected-background-alpha", root.foreground, 0.08)
+    property color selectedText: root.pick("menu.selected-text", root.accent)
+    property color selectedBorder: root.composed("menu.selected-border", "menu.selected-border-alpha", root.foreground, 0.0)
+  }
+  // polkit + lock share a single border-alpha across border / border-active /
+  // border-error: the three states are mutually exclusive in time, so one
+  // companion is enough.
+  readonly property QtObject polkit: QtObject {
+    property color background: root.composed("polkit.background", "polkit.background-alpha", root.background, 1.0)
+    property color text: root.pick("polkit.text", root.foreground)
+    property color textError: root.pick("polkit.text-error", root.urgent)
+    property color border: root.composed("polkit.border", "polkit.border-alpha", root.accent, 1.0)
+    property color borderError: root.composed("polkit.border-error", "polkit.border-alpha", root.urgent, 1.0)
+    property color accent: root.pick("polkit.accent", root.accent)
+    property color scrim: root.composed("polkit.scrim", "polkit.scrim-alpha", root.background, 0.5)
+  }
+  readonly property QtObject lock: QtObject {
+    property color background: root.composed("lock.background", "lock.background-alpha", root.background, 0.8)
+    property color text: root.pick("lock.text", root.foreground)
+    property color placeholder: root.shellValues["lock.placeholder"] ? root.flatColor(root.shellValues["lock.placeholder"], Util.alpha(root.foreground, 0.66)) : Util.alpha(root.foreground, 0.66)
+    property color textError: root.pick("lock.text-error", root.urgent)
+    property color border: root.composed("lock.border", "lock.border-alpha", root.foreground, 1.0)
+    property color borderActive: root.composed("lock.border-active", "lock.border-alpha", root.accent, 1.0)
+    property color borderError: root.composed("lock.border-error", "lock.border-alpha", root.urgent, 1.0)
+    property color selection: root.composed("lock.selection", "lock.selection-alpha", root.accent, 0.45)
+  }
+  // The image picker has no card surface; `scrim` is the full-screen dim
+  // wash, and per-slice dim overlays / text outlines use the foundational
+  // `background` color directly.
+  readonly property QtObject imagePicker: QtObject {
+    property color scrim: root.composed("image-picker.scrim", "image-picker.scrim-alpha", root.background, 0.5)
+    property color text: root.pick("image-picker.text", root.foreground)
+    property color selectedBorder: root.composed("image-picker.selected-border", "image-picker.selected-border-alpha", root.accent, 1.0)
+    property color unselectedBorder: root.composed("image-picker.unselected-border", "image-picker.unselected-border-alpha", root.foreground, 0.28)
+  }
+
+  function loadColors(raw) {
+    var lines = String(raw || "").split("\n")
+    var foundAccent = false
+    var foundMuted = false
+    var color4Value = ""
+    var color8Value = ""
+    for (var i = 0; i < lines.length; i++) {
+      var match = lines[i].match(/^\s*([A-Za-z0-9_-]+)\s*=\s*["']?(#[0-9A-Fa-f]{6})/)
+      if (!match) continue
+      if (match[1] === "foreground") foreground = match[2]
+      else if (match[1] === "background") background = match[2]
+      // Prefer the explicit `accent` key; only fall back to color4 when the
+      // theme doesn't define a separate accent. color4 appears later in the
+      // file so the old single-property approach clobbered accent with it.
+      else if (match[1] === "accent") { accent = match[2]; foundAccent = true }
+      else if (match[1] === "muted") { muted = match[2]; foundMuted = true }
+      else if (match[1] === "color4") color4Value = match[2]
+      else if (match[1] === "color8") color8Value = match[2]
+      else if (match[1] === "red" || match[1] === "color1") urgent = match[2]
+    }
+    if (!foundAccent && color4Value.length > 0) accent = color4Value
+    if (!foundMuted) muted = color8Value.length > 0 ? color8Value : foreground
+  }
+
+  // Single TOML walker for shell.toml. Both Color (surface roles) and Style
+  // (typography, spacing, bar, control states) consume the resulting dict.
+  // Accepts quoted strings, bare numeric values, bare width lists, and bare
+  // role names; tolerates inline comments. Numbers are kept as strings here —
+  // readers coerce when they pull a value.
+  function loadShell(raw) {
+    var parsed = {}
+    var text = String(raw || "")
+    if (text) {
+      var lines = text.split("\n")
+      var section = ""
+      for (var i = 0; i < lines.length; i++) {
+        var line = lines[i].replace(/^\s+|\s+$/g, "")
+        if (!line || line.charAt(0) === "#") continue
+        var sectionMatch = line.match(/^\[([A-Za-z0-9_-]+)\]\s*(#.*)?$/)
+        if (sectionMatch) { section = sectionMatch[1]; continue }
+        var stringKv = line.match(/^([A-Za-z0-9_-]+)\s*=\s*["']([^"']+)["']\s*(#.*)?$/)
+        var numKv = line.match(/^([A-Za-z0-9_-]+)\s*=\s*(-?\d+(?:\.\d+)?)\s*(#.*)?$/)
+        var widthKv = line.match(/^([A-Za-z0-9_-]+)\s*=\s*(-?\d+(?:\.\d+)?(?:\s+-?\d+(?:\.\d+)?){1,3})\s*(#.*)?$/)
+        var bareKv = line.match(/^([A-Za-z0-9_-]+)\s*=\s*([A-Za-z][A-Za-z0-9_-]*)\s*(#.*)?$/)
+        var kv = stringKv || numKv || widthKv || bareKv
+        if (!kv || !section) continue
+        parsed[section + "." + kv[1]] = kv[2]
+      }
+    }
+    shellValues = parsed
+    Style.applyShellValues(parsed)
+  }
+
+  // Startup load only. Runtime theme switches push the payload explicitly
+  // through shell IPC.
+  property FileView colorsFile: FileView {
+    id: colorsFile
+    path: Quickshell.env("HOME") + "/.config/omarchy/current/theme/colors.toml"
+    watchChanges: false
+    printErrors: false
+    onLoaded: root.loadColors(text())
+  }
+  property FileView shellFile: FileView {
+    id: shellFile
+    path: Quickshell.env("HOME") + "/.config/omarchy/current/theme/shell.toml"
+    watchChanges: false
+    printErrors: false
+    onLoaded: root.loadShell(text())
+    onLoadFailed: root.loadShell("")
+  }
+}
diff --git a/shell/Commons/Style.qml b/shell/Commons/Style.qml
new file mode 100644
index 00000000..88aa6a90
--- /dev/null
+++ b/shell/Commons/Style.qml
@@ -0,0 +1,511 @@
+pragma Singleton
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+// Shared structural style tokens for the shell. Color is the palette
+// singleton; Style holds everything else themes can influence — corner
+// rounding, gap to screen edges, state affordances, spacing, typography
+// scale, and bar dimensions.
+//
+// `cornerRadius` mirrors Hyprland's `decoration:rounding`. `gapsOut` is
+// half of Hyprland's `general:gaps_out` — Hyprland's value works well as
+// a window-to-window gap but feels too cavernous when used as the
+// distance from a panel/notification to the screen edge, so the shell
+// halves it. Themes and user Hyprland config own those values; the
+// shell picks them up by re-running `hyprctl getoption` on startup and
+// after theme IPC applies a theme.
+//
+// Typography, spacing, and bar size come from theme/shell.toml.
+// `[font] base-size` is the rem root; every `Style.font.<token>` derives
+// from it via the scale multipliers below unless the theme pins that
+// specific token. `[spacing] scale` multiplies shared margins, gaps,
+// padding, controls, and panel dimensions while preserving each component's
+// proportions; by default it also tracks `base-size`. `[bar]
+// size-horizontal` / `size-vertical` set the cross-axis dimension for
+// top/bottom and left/right bars at the default 12px font size; by default
+// those dimensions scale with `base-size` so larger fonts don't clip.
+QtObject {
+  id: root
+
+  property int cornerRadius: 0
+  property int gapsOut: 5
+
+  // ---------------------------------------------------------- state tokens
+  //
+  // Shared interactive-state tokens for every reusable surface in the kit.
+  // The vocabulary:
+  //   normal       — idle control chrome
+  //   hover-cursor — mouse hover OR panel keyboard cursor (`hasCursor`)
+  //   selected     — persistent chosen/current state
+  //   focus        — actual Qt activeFocus, defaulting to hover-cursor
+  //
+  // Each state has a color token plus fill/border alphas. Color tokens
+  // may be palette roles (`foreground`, `accent`, `urgent`, `background`)
+  // or hex colors. Set a state's border width to 0 to drop that border.
+  property var styleOverrides: ({})
+
+  function styleRawNum(key) {
+    var v = styleOverrides[key]
+    var n = Number(v)
+    return isFinite(n) ? n : null
+  }
+
+  function styleNum(key, fallback) {
+    var n = styleRawNum(key)
+    return n === null ? fallback : n
+  }
+
+  function styleAlpha(key, fallback) {
+    return Util.clampAlpha(styleNum(key, fallback))
+  }
+
+  function styleString(key, fallback) {
+    var v = styleOverrides[key]
+    if (typeof v !== "string") return fallback
+    v = v.replace(/^\s+|\s+$/g, "")
+    return v.length > 0 ? v : fallback
+  }
+
+  readonly property string normalColorToken: styleString("normal-color", "foreground")
+  readonly property string hoverColorToken: styleString("hover-cursor-color", "foreground")
+  readonly property string selectedColorToken: styleString("selected-color", "foreground")
+  readonly property string pressedColorToken: styleString("pressed-color", hoverColorToken)
+  readonly property string focusColorToken: styleString("focus-color", hoverColorToken)
+  readonly property string selectionColorToken: styleString("selection-color", "foreground")
+
+  readonly property int normalBorderWidth: Math.max(0, Math.round(styleNum("normal-border-width", 1)))
+  readonly property int hoverBorderWidth: Math.max(0, Math.round(styleNum("hover-cursor-border-width", normalBorderWidth)))
+  readonly property int selectedBorderWidth: Math.max(0, Math.round(styleNum("selected-border-width", 0)))
+  readonly property int focusBorderWidth: Math.max(0, Math.round(styleNum("focus-border-width", hoverBorderWidth)))
+
+  readonly property real normalFillAlpha:    styleAlpha("normal-fill-alpha", 0.04)
+  readonly property real hoverFillAlpha:     styleAlpha("hover-cursor-fill-alpha", 0.08)
+  readonly property real selectedFillAlpha:  styleAlpha("selected-fill-alpha", 0.18)
+  readonly property real pressedFillAlpha:   styleAlpha("pressed-fill-alpha", 0.22)
+  readonly property real focusFillAlpha:     styleAlpha("focus-fill-alpha", hoverFillAlpha)
+  readonly property real selectionFillAlpha: styleAlpha("selection-fill-alpha", 0.35)
+
+  readonly property real normalBorderAlpha:   styleAlpha("normal-border-alpha", 0.4)
+  readonly property real hoverBorderAlpha:    styleAlpha("hover-cursor-border-alpha", 0.25)
+  readonly property real selectedBorderAlpha: styleAlpha("selected-border-alpha", 1.0)
+  readonly property real focusBorderAlpha:    styleAlpha("focus-border-alpha", hoverBorderAlpha)
+
+  function colorFromHex(value, fallback) {
+    var s = String(value || "").replace(/^\s+|\s+$/g, "")
+    var shortHex = s.match(/^#([0-9A-Fa-f]{3})$/)
+    if (shortHex) {
+      var sh = shortHex[1]
+      return Qt.rgba(
+        parseInt(sh.charAt(0) + sh.charAt(0), 16) / 255,
+        parseInt(sh.charAt(1) + sh.charAt(1), 16) / 255,
+        parseInt(sh.charAt(2) + sh.charAt(2), 16) / 255,
+        1)
+    }
+    var hex = s.match(/^#([0-9A-Fa-f]{6})([0-9A-Fa-f]{2})?$/)
+    if (!hex) return fallback
+    var h = hex[1]
+    return Qt.rgba(
+      parseInt(h.substr(0, 2), 16) / 255,
+      parseInt(h.substr(2, 2), 16) / 255,
+      parseInt(h.substr(4, 2), 16) / 255,
+      hex[2] ? parseInt(hex[2], 16) / 255 : 1)
+  }
+
+  function resolveStateColor(token, foreground, accent, urgent, fallback) {
+    var fb = fallback || foreground || Color.foreground
+    var s = String(token || "").replace(/^\s+|\s+$/g, "")
+    var role = s.toLowerCase()
+    if (role === "foreground" || role === "text") return foreground || Color.foreground
+    if (role === "accent") return accent || Color.accent
+    if (role === "urgent") return urgent || Color.urgent
+    if (role === "background") return Color.background
+    if (role === "transparent") return Qt.rgba(0, 0, 0, 0)
+    return colorFromHex(s, fb)
+  }
+
+  function normalStateColor(foreground, accent, urgent) {
+    return resolveStateColor(normalColorToken, foreground, accent, urgent, foreground || Color.foreground)
+  }
+
+  function hoverStateColor(foreground, accent, urgent) {
+    return resolveStateColor(hoverColorToken, foreground, accent, urgent, foreground || Color.foreground)
+  }
+
+  function selectedStateColor(foreground, accent, urgent) {
+    return resolveStateColor(selectedColorToken, foreground, accent, urgent, foreground || Color.foreground)
+  }
+
+  function pressedStateColor(foreground, accent, urgent) {
+    return resolveStateColor(pressedColorToken, foreground, accent, urgent, hoverStateColor(foreground, accent, urgent))
+  }
+
+  function focusStateColor(foreground, accent, urgent) {
+    var role = String(focusColorToken || "").replace(/^\s+|\s+$/g, "").toLowerCase()
+    if (role === "hover" || role === "hover-cursor" || role === "inherit")
+      return hoverStateColor(foreground, accent, urgent)
+    return resolveStateColor(focusColorToken, foreground, accent, urgent, hoverStateColor(foreground, accent, urgent))
+  }
+
+  function selectionStateColor(foreground, accent, urgent) {
+    return resolveStateColor(selectionColorToken, foreground, accent, urgent, foreground || Color.foreground)
+  }
+
+  function normalFillFor(foreground, accent, urgent) { return Util.alpha(normalStateColor(foreground, accent, urgent), normalFillAlpha) }
+  function hoverFillFor(foreground, accent, urgent) { return Util.alpha(hoverStateColor(foreground, accent, urgent), hoverFillAlpha) }
+  function selectedFillFor(foreground, accent, urgent) { return Util.alpha(selectedStateColor(foreground, accent, urgent), selectedFillAlpha) }
+  function pressedFillFor(foreground, accent, urgent) { return Util.alpha(pressedStateColor(foreground, accent, urgent), pressedFillAlpha) }
+  function focusFillFor(foreground, accent, urgent) { return Util.alpha(focusStateColor(foreground, accent, urgent), focusFillAlpha) }
+  function selectionFillFor(foreground, accent, urgent) { return Util.alpha(selectionStateColor(foreground, accent, urgent), selectionFillAlpha) }
+
+  function normalBorderFor(foreground, accent, urgent) { return Util.alpha(normalStateColor(foreground, accent, urgent), normalBorderAlpha) }
+  function hoverBorderFor(foreground, accent, urgent) { return Util.alpha(hoverStateColor(foreground, accent, urgent), hoverBorderAlpha) }
+  function selectedBorderFor(foreground, accent, urgent) { return Util.alpha(selectedStateColor(foreground, accent, urgent), selectedBorderAlpha) }
+  function focusBorderFor(foreground, accent, urgent) { return Util.alpha(focusStateColor(foreground, accent, urgent), focusBorderAlpha) }
+
+  // Composite helpers for the focus > hover > normal priority chain used by
+  // every form control surface (TextField, NumberField, Dropdown, Toggle,
+  // etc.). Saves callers from re-writing the three-line ternary ladder for
+  // fill / border / border-width on every Rectangle background.
+  function controlFill(focused, hot, foreground, accent) {
+    if (focused) return focusFillFor(foreground, accent)
+    if (hot) return hoverFillFor(foreground, accent)
+    return normalFillFor(foreground, accent)
+  }
+
+  function controlBorder(focused, hot, foreground, accent) {
+    if (focused) return focusBorderFor(foreground, accent)
+    if (hot) return hoverBorderFor(foreground, accent)
+    return normalBorderFor(foreground, accent)
+  }
+
+  function controlBorderWidth(focused, hot) {
+    if (focused) return focusBorderWidth
+    if (hot) return hoverBorderWidth
+    return normalBorderWidth
+  }
+
+  // Convenience colors resolved against the foundational palette.
+  readonly property color normalFill: normalFillFor(Color.foreground, Color.accent, Color.urgent)
+  readonly property color hoverFill: hoverFillFor(Color.foreground, Color.accent, Color.urgent)
+  readonly property color selectedFill: selectedFillFor(Color.foreground, Color.accent, Color.urgent)
+  readonly property color pressedFill: pressedFillFor(Color.foreground, Color.accent, Color.urgent)
+  readonly property color focusFillColor: focusFillFor(Color.foreground, Color.accent, Color.urgent)
+  readonly property color normalBorderColor: normalBorderFor(Color.foreground, Color.accent, Color.urgent)
+  readonly property color hoverBorderColor: hoverBorderFor(Color.foreground, Color.accent, Color.urgent)
+  readonly property color selectedBorderColor: selectedBorderFor(Color.foreground, Color.accent, Color.urgent)
+  readonly property color focusBorderColor: focusBorderFor(Color.foreground, Color.accent, Color.urgent)
+  readonly property color selectedAccentFill: Util.alpha(Color.accent, selectedFillAlpha)
+  readonly property color selectionFill: selectionFillFor(Color.foreground, Color.accent, Color.urgent)
+
+  // ---------------------------------------------------------- spacing
+  //
+  // The spacing scale is the shell equivalent of rem for margins, gaps,
+  // and padding. Components keep their existing proportions by asking for
+  // the old pixel value through `Style.space(px)` (or `spaceReal(px)` for
+  // fractional geometry); themes can make the shell denser or roomier
+  // with `[spacing] scale`, or pin individual tokens.
+  property real spacingScale: 1.0
+  property bool spacingScaleWithFont: true
+  property var spacingOverrides: ({})
+  readonly property real effectiveSpacingScale: spacingScale * (spacingScaleWithFont ? fontScale : 1)
+
+  function spaceReal(px) {
+    var n = Number(px)
+    if (!isFinite(n) || n <= 0) return 0
+    return n * effectiveSpacingScale
+  }
+
+  function space(px) {
+    var n = spaceReal(px)
+    if (n <= 0) return 0
+    return Math.max(1, Math.round(n))
+  }
+
+  function spacingToken(key, fallback) {
+    var v = spacingOverrides[key]
+    var n = Number(v)
+    return (isFinite(n) && n >= 0) ? Math.round(n) : space(fallback)
+  }
+
+  readonly property QtObject spacing: QtObject {
+    readonly property real scale: root.effectiveSpacingScale
+
+    readonly property int hairline: root.space(1)
+    readonly property int xxs: root.spacingToken("xxs", 2)
+    readonly property int xs: root.spacingToken("xs", 3)
+    readonly property int sm: root.spacingToken("sm", 4)
+    readonly property int md: root.spacingToken("md", 6)
+    readonly property int lg: root.spacingToken("lg", 8)
+    readonly property int xl: root.spacingToken("xl", 10)
+    readonly property int xxl: root.spacingToken("xxl", 12)
+    readonly property int xxxl: root.spacingToken("xxxl", 14)
+    readonly property int huge: root.spacingToken("huge", 18)
+
+    readonly property int controlGap: root.spacingToken("control-gap", 8)
+    readonly property int controlPaddingX: root.spacingToken("control-padding-x", 10)
+    readonly property int controlPaddingY: root.spacingToken("control-padding-y", 6)
+    readonly property int inputPaddingY: root.spacingToken("input-padding-y", 7)
+    readonly property int controlHeight: root.spacingToken("control-height", 28)
+    readonly property int popupRowHeight: root.spacingToken("popup-row-height", 28)
+    readonly property int dropdownWidth: root.spacingToken("dropdown-width", 240)
+    readonly property int searchableDropdownWidth: root.spacingToken("searchable-dropdown-width", 260)
+    readonly property int numberFieldWidth: root.spacingToken("number-field-width", 120)
+    readonly property int searchablePopupMinHeight: root.spacingToken("searchable-popup-min-height", 220)
+    readonly property int rowGap: root.spacingToken("row-gap", 8)
+    readonly property int rowPaddingX: root.spacingToken("row-padding-x", 12)
+    readonly property int labelGap: root.spacingToken("label-gap", 4)
+    readonly property int panelGap: root.spacingToken("panel-gap", 14)
+    readonly property int panelPadding: root.spacingToken("panel-padding", 18)
+    readonly property int popupPadding: root.spacingToken("popup-padding", 14)
+  }
+
+  // ---------------------------------------------------------- typography
+  //
+  // `fontFamily` defaults to "monospace" so the bar and every qs.Ui
+  // component follows the fontconfig alias `omarchy-font-set` writes.
+  // Themes can override per-token via [font] in shell.toml, but the
+  // family stays system-wide.
+  property string fontFamily: "monospace"
+
+  // The concrete family `monospace` resolves to right now, e.g.
+  // "JetBrainsMono Nerd Font". Bind `font.family` to `fontFamily` (so the
+  // alias path keeps working when the user runs `omarchy font set`), but
+  // read `resolvedFontFamily` when you want to *display* what's drawing.
+  property string resolvedFontFamily: "monospace"
+
+  // The only sanity floor is 1px. Themes and users can make this as large
+  // as they like; if the shell gets ridiculous, that's their call.
+  property int fontBaseSize: 12
+
+  property var fontOverrides: ({})
+  property var barOverrides: ({})
+  property bool barScaleWithFont: true
+  readonly property real fontScale: Math.max(1 / 12, fontBaseSize / 12)
+
+  function fontPx(mult) {
+    return Math.max(1, Math.round(fontBaseSize * mult))
+  }
+
+  function fontToken(key, fallback) {
+    var v = fontOverrides[key]
+    var n = Number(v)
+    return (isFinite(n) && n > 0) ? Math.round(n) : fallback
+  }
+
+  function barToken(key, fallback) {
+    var v = barOverrides[key]
+    var n = Number(v)
+    var base = (isFinite(n) && n > 0) ? n : fallback
+    if (barScaleWithFont) base *= fontScale
+    return Math.max(1, Math.round(base))
+  }
+
+  function boolToken(value, fallback) {
+    if (value === undefined || value === null) return fallback
+    var s = String(value).replace(/^\s+|\s+$/g, "").toLowerCase()
+    if (s === "true" || s === "1" || s === "yes" || s === "on") return true
+    if (s === "false" || s === "0" || s === "no" || s === "off") return false
+    return fallback
+  }
+
+  // The launcher, menu, polkit, emojis, and clipboard surfaces honor an
+  // OMARCHY_MENU_FONT override for users who want a different family on the
+  // summoned popups than on the bar. Resolved once at startup; an empty env
+  // value falls back to the shared fontconfig alias.
+  readonly property string menuFontFamily: {
+    var override = Quickshell.env("OMARCHY_MENU_FONT")
+    return (override && override.length > 0) ? override : fontFamily
+  }
+
+  readonly property QtObject font: QtObject {
+    readonly property string family: root.fontFamily
+    readonly property string resolvedFamily: root.resolvedFontFamily
+    readonly property string menuFamily: root.menuFontFamily
+    readonly property int baseSize: root.fontBaseSize
+
+    readonly property int caption:      root.fontToken("caption",       root.fontPx(0.833))   // 10
+    readonly property int bodySmall:    root.fontToken("body-small",    root.fontPx(0.917))   // 11
+    readonly property int body:         root.fontToken("body",          root.fontPx(1.0))     // 12
+    readonly property int subtitle:     root.fontToken("subtitle",      root.fontPx(1.083))   // 13
+    readonly property int title:        root.fontToken("title",         root.fontPx(1.167))   // 14
+    readonly property int heading:      root.fontToken("heading",       root.fontPx(1.333))   // 16
+    readonly property int display:      root.fontToken("display",       root.fontPx(2.0))     // 24
+    readonly property int displayLarge: root.fontToken("display-large", root.fontPx(2.333))   // 28
+
+    readonly property int iconSmall:    root.fontToken("icon-small",    bodySmall)
+    readonly property int icon:         root.fontToken("icon",          title)
+    readonly property int iconLarge:    root.fontToken("icon-large",    root.fontPx(1.5))     // 18
+  }
+
+  readonly property QtObject bar: QtObject {
+    readonly property int sizeHorizontal: root.barToken("size-horizontal", 26)
+    readonly property int sizeVertical:   root.barToken("size-vertical",   28)
+  }
+
+  function refresh() {
+    hyprctlProc.running = true
+    gapsOutProc.running = true
+  }
+
+  function scheduleRefresh() {
+    refreshTimer.restart()
+  }
+
+  function applyRoundingJson(raw) {
+    try {
+      var json = JSON.parse(raw || "{}")
+      var n = Number(json.int)
+      if (isFinite(n) && n >= 0) cornerRadius = n
+    } catch (e) {
+      // hyprctl missing / Hyprland not running — leave the previous value.
+    }
+  }
+
+  function applyGapsOutJson(raw) {
+    try {
+      var json = JSON.parse(raw || "{}")
+      var css = String(json.css || "")
+      var parts = css.match(/-?\d+(?:\.\d+)?/g) || []
+      var n = parts.length > 0 ? Number(parts[0]) : Number(json.int)
+      if (isFinite(n) && n >= 0) gapsOut = Math.max(0, Math.round(n / 2))
+    } catch (e) {
+      // hyprctl missing / Hyprland not running — leave the previous value.
+    }
+  }
+
+  // Pull typography, bar dimensions, state tokens, and spacing out of the
+  // shell.toml dict that Color already parsed. Called by Color.loadShell so
+  // a single parse pass feeds both singletons.
+  function applyShellValues(values) {
+    var fontOut = {}
+    var barOut = {}
+    var styleOut = {}
+    var spacingOut = {}
+    var nextBase = 12
+    var nextSpacingScale = 1.0
+    var nextSpacingScaleWithFont = true
+    var nextBarScaleWithFont = true
+    var v = values || {}
+    for (var fullKey in v) {
+      var dot = fullKey.indexOf(".")
+      if (dot < 0) continue
+      var section = fullKey.substr(0, dot)
+      var key = fullKey.substr(dot + 1)
+      var raw = v[fullKey]
+      if (section === "font") {
+        var ival = parseInt(raw, 10)
+        if (!isFinite(ival)) continue
+        if (key === "base-size") nextBase = ival
+        else fontOut[key] = ival
+      } else if (section === "bar") {
+        if (key === "scale-with-font") {
+          nextBarScaleWithFont = boolToken(raw, nextBarScaleWithFont)
+        } else if (key === "size-horizontal" || key === "size-vertical") {
+          var b = parseInt(raw, 10)
+          if (isFinite(b)) barOut[key] = b
+        }
+      } else if (section === "spacing") {
+        if (key === "scale-with-font") {
+          nextSpacingScaleWithFont = boolToken(raw, nextSpacingScaleWithFont)
+        } else {
+          var fval = parseFloat(raw)
+          if (!isFinite(fval)) continue
+          if (key === "scale") nextSpacingScale = fval
+          else spacingOut[key] = fval
+        }
+      } else if (section === "controls" || section === "style") {
+        // Strings are passed through; styleRawNum/styleString coerce on read.
+        // [style] is the legacy name for [controls].
+        styleOut[key] = raw
+      }
+    }
+    // Keep only a 1px sanity floor. Per-token overrides aren't clamped
+    // either — a theme that wants display-large = 64 should be allowed to
+    // ship it.
+    if (!isFinite(nextBase) || nextBase < 1) nextBase = 1
+    if (!isFinite(nextSpacingScale) || nextSpacingScale < 0) nextSpacingScale = 1.0
+    spacingScale = nextSpacingScale
+    spacingScaleWithFont = nextSpacingScaleWithFont
+    fontBaseSize = nextBase
+    fontOverrides = fontOut
+    barOverrides = barOut
+    barScaleWithFont = nextBarScaleWithFont
+    spacingOverrides = spacingOut
+    styleOverrides = styleOut
+  }
+
+  property Process hyprctlProc: Process {
+    id: hyprctlProc
+    command: ["hyprctl", "-j", "getoption", "decoration:rounding"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.applyRoundingJson(text)
+    }
+  }
+
+  property Process gapsOutProc: Process {
+    id: gapsOutProc
+    command: ["hyprctl", "-j", "getoption", "general:gaps_out"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.applyGapsOutJson(text)
+    }
+  }
+
+  // Resolve the fontconfig alias to a concrete family name. `omarchy font
+  // set <name>` rewrites ~/.config/fontconfig/fonts.conf and restarts the
+  // shell, but rerun on file change anyway so manual edits propagate too.
+  function resolveFontFamily() {
+    fcMatchProc.running = true
+  }
+
+  property Process fcMatchProc: Process {
+    id: fcMatchProc
+    command: ["fc-match", "-f", "%{family[0]}", "monospace"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        var name = String(text || "").trim()
+        if (name.length > 0) root.resolvedFontFamily = name
+      }
+    }
+  }
+
+  property FileView fontconfigFile: FileView {
+    path: Quickshell.env("HOME") + "/.config/fontconfig/fonts.conf"
+    watchChanges: true
+    printErrors: false
+    onFileChanged: root.resolveFontFamily()
+    onLoaded: root.resolveFontFamily()
+    onLoadFailed: root.resolveFontFamily()
+  }
+
+  // Re-poll Hyprland a beat after either input file changes. Hyprland's
+  // auto-reload runs asynchronously when its sourced .lua files change,
+  // so racing it with an immediate hyprctl gives the old value. 200ms is
+  // generous enough for Hyprland to settle without being user-visible.
+  property Timer refreshTimer: Timer {
+    id: refreshTimer
+    interval: 200
+    repeat: false
+    onTriggered: root.refresh()
+  }
+
+  // `omarchy toggle window-gaps` creates/removes this flag file. Hyprland
+  // reloads its config when sourced files change, then hyprctl reflects
+  // the new effective value.
+  property FileView windowNoGapsToggle: FileView {
+    path: Quickshell.env("HOME") + "/.local/state/omarchy/toggles/hypr/window-no-gaps.lua"
+    watchChanges: true
+    printErrors: false
+    onFileChanged: refreshTimer.restart()
+    onLoaded: refreshTimer.restart()
+    onLoadFailed: refreshTimer.restart()
+  }
+
+  Component.onCompleted: {
+    refresh()
+    resolveFontFamily()
+  }
+}
diff --git a/shell/Commons/Util.qml b/shell/Commons/Util.qml
new file mode 100644
index 00000000..972154ee
--- /dev/null
+++ b/shell/Commons/Util.qml
@@ -0,0 +1,117 @@
+pragma Singleton
+import QtQuick
+
+// Shared utility helpers used across plugins. Pure functions only — no
+// state. Anything stateful belongs on Color, Style, or a service.
+QtObject {
+  id: root
+
+  function clamp(value, min, max) {
+    var n = Number(value)
+    if (!isFinite(n)) return min
+    return Math.max(min, Math.min(max, n))
+  }
+
+  function clampAlpha(value) {
+    return clamp(value, 0, 1)
+  }
+
+  // Compose a base color with an opacity. Accepts a color object or a hex
+  // string; null/undefined yields transparent black at the requested alpha.
+  function alpha(c, opacity) {
+    var a = clampAlpha(opacity)
+    if (!c) return Qt.rgba(0, 0, 0, a)
+    if (typeof c === "string") c = Qt.color(c)
+    return Qt.rgba(c.r, c.g, c.b, a)
+  }
+
+  // file:// URL with each path segment percent-encoded so spaces and
+  // special chars in user paths don't break Image.source.
+  function fileUrl(path) {
+    if (!path) return ""
+    return "file://" + String(path).split("/").map(encodeURIComponent).join("/")
+  }
+
+  // Single-quote a string for bash. The replace handles embedded single
+  // quotes by closing, escaping, and re-opening the literal.
+  function shellQuote(value) {
+    return "'" + String(value || "").replace(/'/g, "'\\''") + "'"
+  }
+
+  function luaQuote(value) {
+    return "\"" + String(value || "")
+      .replace(/\\/g, "\\\\")
+      .replace(/"/g, "\\\"")
+      .replace(/\n/g, "\\n") + "\""
+  }
+
+  function hyprExecCommand(command) {
+    return ["hyprctl", "dispatch", "hl.dsp.exec_cmd(" + luaQuote(command) + ")"]
+  }
+
+  function isPlainObject(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value)
+  }
+
+  function canonicalWidgetId(id) {
+    return String(id || "")
+  }
+
+  // Best-effort base64 decode. Returns "" on parse failure rather than
+  // surfacing garbage downstream.
+  function decodeBase64(value) {
+    var s = String(value || "")
+    if (!s) return ""
+    try { return Qt.atob(s) } catch (e) { return "" }
+  }
+
+  function cloneJson(value) {
+    return JSON.parse(JSON.stringify(value === undefined ? null : value))
+  }
+
+  // Parse the last line of a custom-module / indicator process output as
+  // waybar-style JSON ({text, class, tooltip, ...}). Falls back to {text: raw}
+  // when the output isn't JSON, and {} for empty output.
+  function parseModuleJson(raw) {
+    var text = String(raw || "").trim()
+    if (!text) return {}
+    var lines = text.split("\n")
+    try {
+      return JSON.parse(lines[lines.length - 1])
+    } catch (e) {
+      return { text: text }
+    }
+  }
+
+  // Layout normalization shared by bar config consumers
+  // so the two never drift. Entries are deep-cloned to decouple from the
+  // input config; consumers can mutate without leaking back to shell.json.
+  function normalizeLayoutEntry(entry) {
+    if (typeof entry === "string") return { id: canonicalWidgetId(entry) }
+    if (isPlainObject(entry) && entry.id) {
+      var copy = cloneJson(entry)
+      copy.id = canonicalWidgetId(copy.id)
+      return copy
+    }
+    return null
+  }
+
+  function normalizeLayoutSection(list) {
+    if (!Array.isArray(list)) return []
+    var out = []
+    for (var i = 0; i < list.length; i++) {
+      var e = normalizeLayoutEntry(list[i])
+      if (e) out.push(e)
+    }
+    return out
+  }
+
+  function normalizeLayout(layout) {
+    var src = isPlainObject(layout) ? layout : {}
+    return {
+      left:   normalizeLayoutSection(src.left),
+      center: normalizeLayoutSection(src.center),
+      right:  normalizeLayoutSection(src.right)
+    }
+  }
+}
diff --git a/shell/Commons/qmldir b/shell/Commons/qmldir
new file mode 100644
index 00000000..4bfd0b78
--- /dev/null
+++ b/shell/Commons/qmldir
@@ -0,0 +1,5 @@
+module qs.Commons
+singleton Border 1.0 Border.qml
+singleton Color 1.0 Color.qml
+singleton Style 1.0 Style.qml
+singleton Util 1.0 Util.qml
diff --git a/shell/README.md b/shell/README.md
new file mode 100644
index 00000000..c5adfdc0
--- /dev/null
+++ b/shell/README.md
@@ -0,0 +1,290 @@
+# Omarchy shell
+
+`omarchy-shell` is a single long-running [Quickshell](https://quickshell.org/)
+instance that hosts the Omarchy desktop. Hyprland autostart launches one shell
+per graphical session; everything else — the bar, background switcher, panels,
+and overlays — runs **inside** the shell as a plugin.
+
+Hosting everything inside one shell means:
+
+- shared services and singletons live once, not once per process
+- summoning a panel is an IPC call into a process that is already running,
+  not a fresh `quickshell -p ...` cold start
+- third-party plugins can be loaded from disk without changing any source
+  code in Omarchy itself
+
+The runtime layout:
+
+```
+shell/
+  shell.qml              entry point (ShellRoot)
+  services/
+    PluginRegistry.qml   discovers, validates plugins, looks up enabled state in shell.json
+    BarWidgetRegistry.qml unified registry for bar widgets (1p + 3p)
+  plugins/
+    bar/                 first-party plugins (see plugins/README.md)
+    launcher/
+    image-picker/
+    menu/
+    notifications/
+    panels/
+      audio/
+      bluetooth/
+      monitor/
+      network/
+      power/
+      weather/
+    model-usage/
+    services/
+      battery/
+      idle/
+    osd/
+    polkit/
+```
+
+The plugin discovery path is documented in [plugins/README.md](plugins/README.md).
+
+## Plugin manifest
+
+Every plugin ships a `manifest.json` describing what it is and how the
+shell should load it. Minimal example:
+
+```json
+{
+  "schemaVersion": 1,
+  "id": "my.org.cool-clock",
+  "name": "Cool clock",
+  "version": "1.0.0",
+  "author": "You",
+  "description": "A clock that does cool things",
+  "kinds": ["bar-widget"],
+  "entryPoints": { "barWidget": "Widget.qml" },
+  "barWidget": {
+    "displayName": "Cool clock",
+    "category": "Time",
+    "allowMultiple": false,
+    "defaults": { "format": "HH:mm" },
+    "schema": [
+      { "key": "format", "type": "string", "label": "Format" }
+    ]
+  }
+}
+```
+
+Supported `kinds`:
+
+| Kind         | What it is                                                   |
+|--------------|--------------------------------------------------------------|
+| `bar-widget` | A component that the active bar can drop into a section      |
+| `panel`      | A persistent or summoned floating window (e.g. OSD)          |
+| `overlay`    | A fullscreen overlay (e.g. background switcher)              |
+| `menu`       | A summoned menu surface                                      |
+| `service`    | A headless singleton, no UI                                  |
+| `bar`        | A full bar option that can replace the built-in `omarchy.bar` |
+
+Only one `bar` plugin is active at a time. Missing or invalid selections fall
+back to the built-in `omarchy.bar`, so users always have a safe path home.
+Panels, overlays, and menus are loaded when summoned. Plugins that need
+to outlive a single summon can set `keepLoaded: true` (e.g. the image
+picker keeps its overlay window mounted between summons). First-party
+services are loaded at startup.
+
+The full schema lives in `services/PluginRegistry.qml`.
+
+## Installing a third-party plugin
+
+Plugins are distributed as **source repos**: a git repo where every top-level
+folder is one plugin with its own `manifest.json`. Trust a repo, then install
+individual plugins from it. Everything lands in `~/.config/omarchy/plugins/<id>/`.
+
+```bash
+omarchy plugin source add https://github.com/owner/omarchy-plugins.git
+omarchy plugin available                 # list what your sources offer
+omarchy plugin add some-widget           # validate, copy, offer to enable
+omarchy plugin update some-widget        # shows a diff of changes first
+omarchy plugin update --all
+omarchy plugin remove some-widget
+```
+
+> ⚠️ **Plugins run as unsandboxed code inside `omarchy-shell`.** Adding a source
+> and installing both warn you and let you review the manifest, the files, and
+> (on update) a diff of the changes before anything is copied or enabled. Only
+> trust sources and plugins whose code you are willing to run.
+
+Each command is **interactive** when run bare in a terminal (gum/fzf pickers,
+confirmation, a diff to review) and fully **non-interactive** when given
+arguments. Pass `--yes` to skip every prompt — this is the path for scripts and
+AI agents:
+
+```bash
+omarchy plugin source add <url> --as acme --yes
+omarchy plugin add acme-weather --from acme --enable --yes
+omarchy plugin update --all --yes
+```
+
+Sources live in `~/.config/omarchy/plugins/sources.json`; their clones are
+cached under `~/.cache/omarchy/plugin-sources/`. The installer never runs
+plugin code, install hooks, or sudo — it only copies files and toggles enabled
+state over shell IPC.
+
+### Installing by hand
+
+You can still drop a plugin in without a source:
+
+1. Put it in `~/.config/omarchy/plugins/<plugin-id>/` with a `manifest.json`
+   plus the QML referenced from its `entryPoints`.
+2. `omarchy plugin rescan`.
+3. `omarchy plugin enable <id>` (bar widgets also need `omarchy plugin bar add <id>`; full bar replacements are selected with `omarchy plugin bar use <id>`).
+
+The lower-level IPC equivalents remain available via `omarchy-shell shell rescanPlugins`,
+`omarchy-shell shell setPluginEnabled <id> true`, and `omarchy-shell shell listPlugins`.
+The `omarchy plugin` command wraps those calls and can also edit the persisted
+bar layout in `shell.json`.
+
+To hack on an existing widget safely, clone it into a user plugin instead of
+editing the built-in source. Third-party ids must be namespaced and may not use
+the reserved `omarchy.*` prefix.
+
+```bash
+omarchy plugin clone omarchy.clock local.clock --replace --with ai --prompt "Customize this clock widget"
+omarchy plugin clone                 # interactive source/name/tool picker
+omarchy plugin edit local.clock --with editor  # edit with `omarchy launch editor`
+omarchy plugin edit local.clock --with ai      # edit with `omarchy launch ai`
+```
+
+First-party plugins under `shell/plugins/`
+are discovered the same way and cannot be disabled, except that the built-in
+bar option can become inactive while a third-party `kind: "bar"` plugin is the
+selected bar.
+
+## IPC contract
+
+The shell exposes a single `shell` IPC target plus whatever extra targets
+individual plugins register (e.g. the bar's `bar` target for refresh
+hooks, the image picker's `image-selector` target). `omarchy-menu` uses the
+shell target to summon the first-party `omarchy.menu` plugin instead of
+running a separate Quickshell instance.
+
+| Method                                   | Returns | Effect                                                |
+|------------------------------------------|---------|-------------------------------------------------------|
+| `ping`                                   | `ok`    | health check                                          |
+| `summon <id> <payloadJson>`              | `ok` / `unknown` | load + open a panel/overlay plugin           |
+| `hide <id>`                              | —       | close a previously-summoned plugin                    |
+| `toggle <id> <payloadJson>`              | —       | summon if closed, hide if open                        |
+| `call <id> <method> <arg>`               | string  | call a method on an already-loaded plugin             |
+| `rescanPlugins`                          | —       | re-walk plugin dirs and hot-reload plugin code        |
+| `reloadConfig`                           | `ok`    | reload `~/.config/omarchy/shell.json`                 |
+| `setPluginEnabled <id> <enabled>`        | `ok` / `unknown` | flip the persisted enabled bit (see note)    |
+| `listPlugins`                            | JSON    | every discovered plugin (id, name, kinds, enabled)    |
+
+Direct invocation:
+
+```
+quickshell ipc -p $OMARCHY_PATH/shell call shell ping
+```
+
+Hyprland autostart launches the shell directly with `quickshell -p
+$OMARCHY_PATH/shell`. Use `omarchy-restart-shell` (`quickshell reload`) to
+reload the long-running shell process.
+
+A convenience wrapper, [`omarchy-shell`](../bin/omarchy-shell), forwards IPC
+calls to the running shell. It does not start the shell.
+
+```
+omarchy-shell shell ping
+omarchy-shell shell openBarConfig
+omarchy-shell shell toggle omarchy.menu '{"menu":"root"}'
+omarchy-shell shell listPlugins
+omarchy-shell shell rescanPlugins
+```
+
+**Note on `setPluginEnabled`:** the `enabled` argument is a string. Only the
+literal `"true"` enables the plugin; every other value (including `"True"`,
+`"1"`, `"yes"`, or omitted) disables it. This keeps the IPC surface
+type-stable across QML's `string`-only IPC arguments.
+
+## Persisted state
+
+There is one user config file. Everything that distinguishes your
+customization from the shipped defaults lives in it.
+
+| Path                              | Owner          | Purpose                                                |
+|-----------------------------------|----------------|--------------------------------------------------------|
+| `~/.config/omarchy/shell.json`    | the shell      | full layout + per-entry settings + enabled plugin list |
+| `~/.config/omarchy/plugins/<id>/` | user           | drop-in third-party plugin source files                |
+
+The `config/omarchy/shell.json` default config describes the
+fresh-install state. When the user has no `shell.json`, the shell uses
+the defaults verbatim. Once the user customizes anything, `shell.json`
+becomes the authoritative file — we do **not** deep-merge defaults back in.
+
+### shell.json shape
+
+```json
+{
+  "version": 1,
+  "idle": {
+    "screensaver": 150,
+    "lock": 300
+  },
+  "bar": {
+    "id": "omarchy.bar",
+    "position": "top",
+    "transparent": false,
+    "centerAnchor": "omarchy.clock",
+    "layout": {
+      "left":   [ { "id": "omarchy.menu" }, { "id": "omarchy.workspaces" } ],
+      "center": [ { "id": "omarchy.clock", "format": "HH:mm" } ],
+      "right": [
+        { "id": "omarchy.audio" }
+      ]
+    }
+  },
+  "plugins": []
+}
+```
+
+### Storage rules
+
+1. **The active bar option is `bar.id`.** Omit it or set it to `omarchy.bar`
+   to use the built-in bar. Set it to another plugin id whose manifest declares
+   `kind: "bar"` to replace the full bar.
+2. **Every plugin instance is one entry.** Either in `bar.layout.<section>`
+   for bar widgets, or in `plugins[]` for panels, overlays, services,
+   menus, and anything else non-bar.
+3. **Settings are inline on the entry.** No `config:` sub-object, no
+   separate per-plugin settings file, no merge layers. The fields on each
+   entry are the values the plugin sees.
+4. **Built-in widget ids are namespaced.** Use ids such as `omarchy.clock`,
+   `omarchy.audio`, and `omarchy.network`. The migration rewrites older ids
+   like `Clock` and `AudioPanel` forward.
+5. **Third-party enabled ⇔ present.** A third-party plugin is enabled iff
+   its id appears somewhere in shell.json. For full bar options, that means
+   `bar.id`; for bar widgets, the bar settings UI adds/removes layout entries;
+   other plugin kinds are enabled with the shell IPC. First-party non-bar
+   plugins are always enabled.
+6. **Multiple instances** are allowed when a manifest sets
+   `allowMultiple: true`. Each instance is independent — e.g. two clock
+   widgets in different timezones are just two `{"id":"omarchy.clock", "timezone": ...}`
+   entries with their own values.
+7. **Idle timings are top-level.** `idle.screensaver` and `idle.lock`
+   are seconds since user idle began, so the default lock fires at 300s
+   even if the 150s screensaver starts first.
+8. **`version: 1` is required** at the top level. The shell will fall back
+   to defaults rather than load an unknown version.
+
+## Implementation history
+
+Built up in phases on this branch:
+
+- Phase 1 — `omarchy-shell phase 1: host the existing bar in a single shell`
+- Phase 2 — `omarchy-shell phase 2: plugin registry and bar widget registry`
+- Phase 3 — `omarchy-shell phase 3: fold bar-settings into the shell as a panel plugin`
+- Phase 4 — `omarchy-shell phase 4: absorb background-switcher as a plugin`
+- Phase 5 — `omarchy-shell phase 5: docs, cleanup, and migration crumbs`
+- Phase 6 — `omarchy-shell phase 6: reviewer cleanup (path traversal, collision, races)`
+- Phase 7 — `omarchy-shell phase 7: replace socket with IpcHandler, rename to image-picker`
+- Phase 8a — `omarchy-shell phase 8a: unified shell.json with inline plugin settings`
+
+Shared services and Pipewire/UPower/Hyprland consolidation are explicitly
+out of scope here and deferred to a follow-up after a review pass.
diff --git a/shell/Ui/BarIndicator.qml b/shell/Ui/BarIndicator.qml
new file mode 100644
index 00000000..8a628f70
--- /dev/null
+++ b/shell/Ui/BarIndicator.qml
@@ -0,0 +1,49 @@
+import QtQuick
+import qs.Commons
+
+WidgetButton {
+  id: root
+
+  property string moduleName: ""
+  property var settings: ({})
+  property string activeText: ""
+  property string inactiveText: activeText
+  property string activeTooltipText: ""
+  property string inactiveTooltipText: activeTooltipText
+  property string indicatorBlock: "single"
+  property var indicatorHost: null
+  property var activeOverride: null
+  readonly property bool effectiveActive: activeOverride === null || activeOverride === undefined ? active : activeOverride === true
+  readonly property bool belongsInBlock: indicatorBlock === "active" ? effectiveActive : (indicatorBlock === "inactive" ? !effectiveActive : true)
+  readonly property bool inactiveRevealed: !effectiveActive && !!indicatorHost && indicatorHost.revealInactiveIndicators
+
+  function extractData(raw) {
+    return Util.parseModuleJson(raw)
+  }
+
+  function syncIndicatorOpacity() {
+    root.opacity = !belongsInBlock ? 0 : (effectiveActive ? 1 : (inactiveRevealed ? 0.45 : 0))
+  }
+
+  Component.onCompleted: syncIndicatorOpacity()
+  onActiveChanged: syncIndicatorOpacity()
+  onEffectiveActiveChanged: syncIndicatorOpacity()
+  onBarChanged: syncIndicatorOpacity()
+  onBelongsInBlockChanged: syncIndicatorOpacity()
+  onInactiveRevealedChanged: syncIndicatorOpacity()
+  onIndicatorBlockChanged: syncIndicatorOpacity()
+
+  visible: belongsInBlock && (text !== "" || keepSpace)
+  text: effectiveActive ? activeText : inactiveText
+  tooltipText: effectiveActive ? activeTooltipText : inactiveTooltipText
+  keepSpace: true
+  dimmed: !effectiveActive
+  concealed: !effectiveActive && !inactiveRevealed
+  interactive: belongsInBlock && (effectiveActive || indicatorBlock === "inactive" || inactiveRevealed)
+  useActiveColor: false
+  maintainIndicatorReveal: indicatorBlock === "inactive"
+  revealHost: indicatorHost
+  fontSize: Style.font.caption
+  horizontalMargin: 5
+  verticalPadding: 5
+}
diff --git a/shell/Ui/BarWidget.qml b/shell/Ui/BarWidget.qml
new file mode 100644
index 00000000..10e9c324
--- /dev/null
+++ b/shell/Ui/BarWidget.qml
@@ -0,0 +1,33 @@
+import QtQuick
+import qs.Commons
+
+// Base item every bar widget extends. Codifies the three properties the
+// bar host injects into each widget slot:
+//   bar         - the host Bar instance (foreground/background/run/etc).
+//   moduleName  - widget's canonical id, used by the host registry to look
+//                 up settings and to disambiguate inline IPC routes.
+//   settings    - per-widget overrides read from shell.json's layout entry.
+//
+// Widgets are free to add their own properties, signals, and child items.
+Item {
+  id: root
+
+  property QtObject bar: null
+  property string moduleName: ""
+  property var settings: ({})
+
+  // Bar geometry, lifted off the host. Widgets read these constantly to pick
+  // between horizontal/vertical layouts; defining them on the base keeps the
+  // `bar ? bar.x : fallback` ternary out of every widget body.
+  readonly property bool vertical: bar ? bar.vertical : false
+  readonly property int barSize: bar ? bar.barSize : Style.bar.sizeHorizontal
+
+  // Read a single value from this widget's inline shell.json entry, with a
+  // fallback for missing/null values. Every widget that takes user-tunable
+  // settings needs this; defining it once on the base keeps the wiring
+  // consistent.
+  function setting(name, fallback) {
+    var value = settings ? settings[name] : undefined
+    return value === undefined || value === null ? fallback : value
+  }
+}
diff --git a/shell/Ui/BorderOverlay.qml b/shell/Ui/BorderOverlay.qml
new file mode 100644
index 00000000..4fd0fb6e
--- /dev/null
+++ b/shell/Ui/BorderOverlay.qml
@@ -0,0 +1,55 @@
+import QtQuick
+import QtQuick.Shapes
+import qs.Commons
+import "../Commons/BorderGeometry.js" as Geometry
+
+// Visual-only border renderer. It draws a filled rounded ring so borders can
+// have gradients and independent top/right/bottom/left widths. Flat uniform
+// borders should stay on Rectangle.border; this component is the fallback for
+// cases Rectangle cannot represent.
+Item {
+  id: root
+
+  property var borderSpec: Border.none()
+  property real radius: 0
+
+  readonly property var _widths: borderSpec && borderSpec.widths ? borderSpec.widths : Geometry.parseWidthSpec(0, 0)
+  readonly property bool hasBorder: Geometry.maxWidth(_widths) > 0
+  readonly property var _gradient: borderSpec && borderSpec.gradient ? borderSpec.gradient : ({ colors: [], angle: 0, enabled: false })
+  readonly property var _colors: _gradient.enabled ? _gradient.colors : [Border.color(borderSpec), Border.color(borderSpec)]
+  readonly property var _endpoints: Geometry.gradientEndpoints(width, height, _gradient.angle || 0)
+  readonly property string _path: Geometry.ringPath(width, height, radius, _widths)
+
+  visible: hasBorder && width > 0 && height > 0
+  anchors.fill: parent
+  z: 100000
+
+  Shape {
+    anchors.fill: parent
+    preferredRendererType: Shape.CurveRenderer
+
+    ShapePath {
+      fillRule: ShapePath.OddEvenFill
+      strokeWidth: 0
+      fillGradient: LinearGradient {
+        x1: root._endpoints.x1
+        y1: root._endpoints.y1
+        x2: root._endpoints.x2
+        y2: root._endpoints.y2
+
+        GradientStop { position: Geometry.stopPosition(root._colors, 0); color: Geometry.stopColor(root._colors, 0) }
+        GradientStop { position: Geometry.stopPosition(root._colors, 1); color: Geometry.stopColor(root._colors, 1) }
+        GradientStop { position: Geometry.stopPosition(root._colors, 2); color: Geometry.stopColor(root._colors, 2) }
+        GradientStop { position: Geometry.stopPosition(root._colors, 3); color: Geometry.stopColor(root._colors, 3) }
+        GradientStop { position: Geometry.stopPosition(root._colors, 4); color: Geometry.stopColor(root._colors, 4) }
+        GradientStop { position: Geometry.stopPosition(root._colors, 5); color: Geometry.stopColor(root._colors, 5) }
+        GradientStop { position: Geometry.stopPosition(root._colors, 6); color: Geometry.stopColor(root._colors, 6) }
+        GradientStop { position: Geometry.stopPosition(root._colors, 7); color: Geometry.stopColor(root._colors, 7) }
+        GradientStop { position: Geometry.stopPosition(root._colors, 8); color: Geometry.stopColor(root._colors, 8) }
+        GradientStop { position: Geometry.stopPosition(root._colors, 9); color: Geometry.stopColor(root._colors, 9) }
+      }
+
+      PathSvg { path: root._path }
+    }
+  }
+}
diff --git a/shell/Ui/BorderSurface.qml b/shell/Ui/BorderSurface.qml
new file mode 100644
index 00000000..50714e52
--- /dev/null
+++ b/shell/Ui/BorderSurface.qml
@@ -0,0 +1,40 @@
+import QtQuick
+import qs.Commons
+
+// Rectangle-compatible surface with Omarchy border specs. Uses native
+// Rectangle.border for cheap flat/uniform borders and BorderOverlay for
+// gradients or per-side widths.
+Rectangle {
+  id: root
+
+  property var borderSpec: Border.none()
+  property real padding: 0
+  property real topPadding: padding
+  property real rightPadding: padding
+  property real bottomPadding: padding
+  property real leftPadding: padding
+
+  readonly property real borderTop: Border.top(borderSpec)
+  readonly property real borderRight: Border.right(borderSpec)
+  readonly property real borderBottom: Border.bottom(borderSpec)
+  readonly property real borderLeft: Border.left(borderSpec)
+  readonly property real contentTopInset: borderTop + topPadding
+  readonly property real contentRightInset: borderRight + rightPadding
+  readonly property real contentBottomInset: borderBottom + bottomPadding
+  readonly property real contentLeftInset: borderLeft + leftPadding
+  readonly property bool usesOverlayBorder: Border.needsOverlay(borderSpec)
+
+  border.color: Border.canUseNative(borderSpec) ? Border.color(borderSpec) : "transparent"
+  border.width: Border.canUseNative(borderSpec) ? Border.uniformWidth(borderSpec) : 0
+
+  Loader {
+    anchors.fill: parent
+    active: root.usesOverlayBorder
+
+    sourceComponent: BorderOverlay {
+      anchors.fill: parent
+      radius: root.radius
+      borderSpec: root.borderSpec
+    }
+  }
+}
diff --git a/shell/Ui/Button.qml b/shell/Ui/Button.qml
new file mode 100644
index 00000000..2c093b4b
--- /dev/null
+++ b/shell/Ui/Button.qml
@@ -0,0 +1,206 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Commons
+
+// The button. One component for every clickable thing in the kit.
+// States compose independently and are applied in priority order:
+//
+//   pressed (mouse down)         pressed fill
+//   activeFocus (Tab focus)      focus fill + focus border token
+//   hasCursor || hover           hover-cursor fill (+ border if `bordered`)
+//   selected                     selected fill + optional selected border
+//   active                       selected fill
+//   idle                         transparent or normal border if `bordered`
+//
+// All fills/borders come from `qs.Commons.Style` tokens, so themes
+// control the look via [controls] in shell.toml.
+//
+// Emits `hovered(bool)` so panels with their own keyboard cursor model
+// can update state on mouse enter/leave.
+BorderSurface {
+  id: root
+
+  property string text: ""
+  property string iconText: ""
+  property string tooltipText: ""
+
+  // State flags (see comment above for paint priority).
+  property bool selected: false
+  property bool active: false
+  property bool hasCursor: false
+  property bool focusable: false
+  property bool bordered: false
+
+  // Colors. Defaults track the theme; per-instance overrides are honored.
+  property color foreground: Color.foreground
+  property color background: "transparent"
+  property color accent: Color.accent
+
+  // Sizing.
+  property string fontFamily: Style.font.family
+  property real fontSize: Style.font.body
+  property real iconSize: Style.font.icon
+  property real iconRotation: 0
+  property bool iconSpinning: false
+  property real horizontalPadding: Style.spacing.controlPaddingX
+  property real verticalPadding: Style.spacing.controlPaddingY
+  property bool leftAlign: false
+
+  leftPadding: horizontalPadding
+  rightPadding: horizontalPadding
+  topPadding: verticalPadding
+  bottomPadding: verticalPadding
+
+  // Tooltip palette. Auto-rendered if tooltipText is set. Defaults pull
+  // from [tooltip] in shell.toml; override per-instance only when a button
+  // intentionally wants a tooltip that diverges from the theme.
+  property color tooltipBackground: Color.tooltip.background
+  property color tooltipForeground: Color.tooltip.text
+  property color tooltipBorder: Color.tooltip.border
+
+  signal clicked()
+  signal rightClicked()
+  signal hovered(bool isHovered)
+
+  activeFocusOnTab: focusable
+  Keys.onReturnPressed: if (focusable) root.clicked()
+  Keys.onEnterPressed: if (focusable) root.clicked()
+  Keys.onSpacePressed: if (focusable) root.clicked()
+
+  // Reserve the largest border any visual state can paint. Otherwise a
+  // borderless idle button grows by a pixel per side on hover/focus and
+  // relayouts neighboring controls.
+  implicitWidth: row.implicitWidth + horizontalPadding * 2 + _reservedBorderLeft + _reservedBorderRight
+  implicitHeight: row.implicitHeight + verticalPadding * 2 + _reservedBorderTop + _reservedBorderBottom
+  radius: Style.cornerRadius
+
+  readonly property bool hot: mouseArea.containsMouse || hasCursor
+  readonly property bool _showFocusRing: focusable && activeFocus
+  readonly property color _selectedColor: Style.selectedStateColor(root.foreground, root.accent)
+  readonly property var _tooltipBorderSpec: Border.localOrSurfaceSpec("tooltip", "border", root.tooltipBorder, Color.tooltip.border, Math.max(1, Style.normalBorderWidth))
+  readonly property var _focusBorderSpec: Border.controlSpec("focus", root.foreground, root.accent)
+  readonly property var _hoverBorderSpec: Border.controlSpec("hover-cursor", root.foreground, root.accent)
+  readonly property var _selectedBorderSpec: Border.controlSpec("selected", root.foreground, root.accent)
+  readonly property var _normalBorderSpec: Border.controlSpec("normal", root.foreground, root.accent)
+  readonly property real _reservedBorderTop: Math.max(
+    focusable ? Border.top(_focusBorderSpec) : 0,
+    Border.top(_hoverBorderSpec),
+    Border.top(_selectedBorderSpec),
+    bordered ? Border.top(_normalBorderSpec) : 0)
+  readonly property real _reservedBorderRight: Math.max(
+    focusable ? Border.right(_focusBorderSpec) : 0,
+    Border.right(_hoverBorderSpec),
+    Border.right(_selectedBorderSpec),
+    bordered ? Border.right(_normalBorderSpec) : 0)
+  readonly property real _reservedBorderBottom: Math.max(
+    focusable ? Border.bottom(_focusBorderSpec) : 0,
+    Border.bottom(_hoverBorderSpec),
+    Border.bottom(_selectedBorderSpec),
+    bordered ? Border.bottom(_normalBorderSpec) : 0)
+  readonly property real _reservedBorderLeft: Math.max(
+    focusable ? Border.left(_focusBorderSpec) : 0,
+    Border.left(_hoverBorderSpec),
+    Border.left(_selectedBorderSpec),
+    bordered ? Border.left(_normalBorderSpec) : 0)
+  readonly property real _reservedContentLeftInset: _reservedBorderLeft + leftPadding
+  readonly property var _borderSpec: _showFocusRing ? _focusBorderSpec
+    : hot                      ? _hoverBorderSpec
+    : selected                 ? (Border.controlHasWidth("selected") ? _selectedBorderSpec : (bordered ? _normalBorderSpec : Border.none()))
+    : bordered                 ? _normalBorderSpec
+    : Border.none()
+
+  color: mouseArea.pressed ? Style.pressedFillFor(root.foreground, root.accent)
+    : _showFocusRing       ? Style.focusFillFor(root.foreground, root.accent)
+    : hot                  ? Style.hoverFillFor(root.foreground, root.accent)
+    : selected             ? Style.selectedFillFor(root.foreground, root.accent)
+    : active               ? Style.selectedFillFor(root.foreground, root.accent)
+    : background
+
+  // Border follows the same state precedence as fill. Buttons stay
+  // borderless at rest unless `bordered` is set, but hover-cursor/focus
+  // always use the shared cursor border so the keyboard target is visible
+  // and consistent with the rest of the kit. Selected borders are off by
+  // default for plain buttons; explicitly bordered buttons keep their
+  // normal border when selected unless selected-border-width opts in to a
+  // dedicated selected border.
+  borderSpec: _borderSpec
+
+  Behavior on color { ColorAnimation { duration: 120 } }
+
+  ToolTip {
+    visible: root.tooltipText !== "" && mouseArea.containsMouse
+    text: root.tooltipText
+    delay: 400
+    padding: 0
+    background: BorderSurface {
+      color: root.tooltipBackground
+      borderSpec: root._tooltipBorderSpec
+      radius: 0
+    }
+    contentItem: Text {
+      text: root.tooltipText
+      color: root.tooltipForeground
+      font.family: root.fontFamily
+      font.pixelSize: Style.font.bodySmall
+      leftPadding: Border.left(root._tooltipBorderSpec) + Style.spacing.controlPaddingX
+      rightPadding: Border.right(root._tooltipBorderSpec) + Style.spacing.controlPaddingX
+      topPadding: Border.top(root._tooltipBorderSpec) + Style.spacing.controlPaddingY
+      bottomPadding: Border.bottom(root._tooltipBorderSpec) + Style.spacing.controlPaddingY
+    }
+  }
+
+  Row {
+    id: row
+    anchors.verticalCenter: parent.verticalCenter
+    anchors.left: root.leftAlign ? parent.left : undefined
+    anchors.leftMargin: root.leftAlign ? root._reservedContentLeftInset : 0
+    anchors.horizontalCenter: root.leftAlign ? undefined : parent.horizontalCenter
+    spacing: Style.spacing.controlGap
+
+    Text {
+      visible: root.iconText !== ""
+      text: root.iconText
+      color: root.selected ? root._selectedColor : root.foreground
+      font.family: root.fontFamily
+      font.pixelSize: root.iconSize
+      rotation: root.iconSpinning ? 0 : root.iconRotation
+      transformOrigin: Item.Center
+      anchors.verticalCenter: parent.verticalCenter
+
+      RotationAnimation on rotation {
+        from: 0
+        to: 360
+        duration: 900
+        loops: Animation.Infinite
+        running: root.iconSpinning
+      }
+    }
+
+    Text {
+      visible: root.text !== ""
+      text: root.text
+      color: root.selected ? root._selectedColor : root.foreground
+      font.family: root.fontFamily
+      font.pixelSize: root.fontSize
+      font.bold: root.selected
+      anchors.verticalCenter: parent.verticalCenter
+    }
+  }
+
+  MouseArea {
+    id: mouseArea
+    anchors.fill: parent
+    hoverEnabled: true
+    cursorShape: Qt.PointingHandCursor
+    acceptedButtons: Qt.LeftButton | Qt.RightButton
+    onClicked: function(mouse) {
+      if (root.focusable) root.forceActiveFocus()
+      if (mouse.button === Qt.RightButton) root.rightClicked()
+      else root.clicked()
+    }
+  }
+
+  HoverHandler {
+    onHoveredChanged: root.hovered(hovered)
+  }
+}
diff --git a/shell/Ui/ButtonGroup.qml b/shell/Ui/ButtonGroup.qml
new file mode 100644
index 00000000..f4870dea
--- /dev/null
+++ b/shell/Ui/ButtonGroup.qml
@@ -0,0 +1,132 @@
+import QtQuick
+import qs.Commons
+
+// Mutually-exclusive row of Buttons — the form-style "pick one of N"
+// pattern (bar position top/right/bottom/left, theme preset chips, etc.).
+// Emits `changed(value)` when the user activates a different option.
+//
+// `options` is either a plain string[] (label == value) or an array of
+// { value, label, icon?, tooltip? } objects. Mixing is fine.
+//
+// Keyboard navigation. The group itself is a single Tab stop, not one
+// stop per chip — so in a form that walks `activeFocusOnTab` items with
+// Tab / j / k, the cursor enters the group as a unit. Once focused,
+// h / l / Left / Right walks between chips and Enter / Space activates
+// the current one. The selected chip is the default landing point so
+// users see their existing choice on arrival.
+//
+// Panel-cursor consumers (the bar widget panels) drive `cursorIndex`
+// directly and listen on `hovered` to sync the mouse — Tab focus and
+// `cursorIndex` are independent; either one paints the chip's hot
+// state, and the bar widget panels never give Tab focus to a
+// ButtonGroup so they only see the cursorIndex path.
+Row {
+  id: root
+
+  property var options: []
+  property string value: ""
+  property color foreground: Color.foreground
+  property color background: Color.background
+  property color accent: Color.accent
+  property string fontFamily: Style.font.family
+  property real fontSize: Style.font.body
+  property bool focusable: true
+
+  // -1 disables the external cursor highlight (the panel-cursor case).
+  // Driven by a containing panel; the group's own Tab-focus h/l
+  // tracking is internal and lives in _focusedIndex.
+  property int cursorIndex: -1
+
+  // Internal: which chip h / l / Left / Right is currently sitting on
+  // when the group itself has Tab focus. Reset to the selected option
+  // each time focus arrives so the user sees their existing choice.
+  property int _focusedIndex: -1
+
+  signal changed(string value)
+  signal hovered(int index, bool isHovered)
+
+  spacing: Style.spacing.md
+
+  activeFocusOnTab: focusable
+
+  function optionValue(o) {
+    return (o && typeof o === "object") ? String(o.value) : String(o)
+  }
+  function optionLabel(o) {
+    return (o && typeof o === "object" && o.label !== undefined) ? String(o.label) : String(o)
+  }
+  function optionIcon(o) {
+    return (o && typeof o === "object" && o.icon) ? String(o.icon) : ""
+  }
+  function optionTooltip(o) {
+    return (o && typeof o === "object" && o.tooltip) ? String(o.tooltip) : ""
+  }
+
+  function selectedOptionIndex() {
+    for (var i = 0; i < options.length; i++)
+      if (optionValue(options[i]) === value) return i
+    return -1
+  }
+
+  function activateFocused() {
+    if (_focusedIndex < 0 || _focusedIndex >= options.length) return
+    var v = optionValue(options[_focusedIndex])
+    root.changed(v)
+  }
+
+  onActiveFocusChanged: {
+    if (activeFocus) {
+      var idx = selectedOptionIndex()
+      _focusedIndex = idx < 0 ? 0 : idx
+    } else {
+      _focusedIndex = -1
+    }
+  }
+
+  Keys.priority: Keys.BeforeItem
+  Keys.onPressed: function(event) {
+    if (event.key === Qt.Key_Left || event.key === Qt.Key_H
+        || event.text === "h") {
+      _focusedIndex = Math.max(0, (_focusedIndex < 0 ? 0 : _focusedIndex) - 1)
+      event.accepted = true
+    } else if (event.key === Qt.Key_Right || event.key === Qt.Key_L
+        || event.text === "l") {
+      var max = options.length - 1
+      var next = (_focusedIndex < 0 ? 0 : _focusedIndex) + 1
+      _focusedIndex = Math.min(max, next)
+      event.accepted = true
+    } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter
+        || event.key === Qt.Key_Space) {
+      activateFocused()
+      event.accepted = true
+    }
+  }
+
+  Repeater {
+    model: root.options
+
+    delegate: Button {
+      required property var modelData
+      required property int index
+      text: root.optionLabel(modelData)
+      iconText: root.optionIcon(modelData)
+      tooltipText: root.optionTooltip(modelData)
+      selected: root.optionValue(modelData) === root.value
+      // Chip lights up when either the external panel cursor lands here
+      // or the group has Tab focus and h/l has walked to this index.
+      hasCursor: root.cursorIndex === index
+        || (root.activeFocus && root._focusedIndex === index)
+      // Every chip carries the standard bordered-button chrome so the
+      // group reads as a row of distinct options. selected / hover-cursor /
+      // focus are all painted by Button from Style's shared state tokens.
+      bordered: true
+      foreground: root.foreground
+      background: root.background
+      accent: root.accent
+      fontFamily: root.fontFamily
+      fontSize: root.fontSize
+      onClicked: root.changed(root.optionValue(modelData))
+      onHovered: function(h) { root.hovered(index, h) }
+    }
+  }
+}
diff --git a/shell/Ui/ConfirmDialog.qml b/shell/Ui/ConfirmDialog.qml
new file mode 100644
index 00000000..45d8da18
--- /dev/null
+++ b/shell/Ui/ConfirmDialog.qml
@@ -0,0 +1,128 @@
+import QtQuick
+import qs.Commons
+
+Item {
+  id: root
+
+  property bool opened: false
+  property string message: ""
+  property string cancelText: "Cancel"
+  property string confirmText: "Confirm"
+  property int selectedIndex: 1
+  property color background: Color.background
+  property color foreground: Color.foreground
+  property color scrim: Util.alpha(Color.background, 0.7)
+  property color selectedBackground: Util.alpha(Color.foreground, 0.08)
+  property color selectedText: Color.accent
+  property string fontFamily: Style.font.family
+  property int cornerRadius: Style.cornerRadius
+
+  signal canceled()
+  signal confirmed()
+
+  function handleKey(event) {
+    if (!root.opened) return false
+
+    if (event.key === Qt.Key_Escape) {
+      root.canceled()
+      return true
+    } else if (event.key === Qt.Key_Left || event.key === Qt.Key_Right || event.key === Qt.Key_Tab || event.key === Qt.Key_Backtab) {
+      root.selectedIndex = root.selectedIndex === 0 ? 1 : 0
+      return true
+    } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+      if (root.selectedIndex === 0) root.canceled()
+      else root.confirmed()
+      return true
+    }
+
+    return false
+  }
+
+  visible: opened
+
+  Rectangle {
+    anchors.fill: parent
+    color: root.scrim
+
+    MouseArea { anchors.fill: parent; onClicked: root.canceled() }
+
+    BorderSurface {
+      id: card
+      width: Math.min(parent.width - Style.space(96), Style.space(370))
+      height: Style.space(132)
+      anchors.centerIn: parent
+      color: root.background
+      borderSpec: Border.flat(root.selectedText, Style.normalBorderWidth)
+      padding: Style.space(18)
+      radius: root.cornerRadius
+
+      MouseArea { anchors.fill: parent; onClicked: {} }
+
+      Item {
+        anchors.fill: parent
+        anchors.topMargin: card.contentTopInset
+        anchors.rightMargin: card.contentRightInset
+        anchors.bottomMargin: card.contentBottomInset
+        anchors.leftMargin: card.contentLeftInset
+
+        Text {
+          anchors.left: parent.left
+          anchors.right: parent.right
+          anchors.top: parent.top
+          text: root.message
+          color: root.foreground
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.title
+          wrapMode: Text.WordWrap
+        }
+
+        Row {
+          anchors.right: parent.right
+          anchors.bottom: parent.bottom
+          spacing: Style.space(10)
+
+          Repeater {
+            model: [root.cancelText, root.confirmText]
+
+            BorderSurface {
+              required property int index
+              required property string modelData
+
+              readonly property bool selected: root.selectedIndex === index
+              readonly property bool destructive: index === 1
+
+              width: Style.space(88)
+              height: Style.space(34)
+              color: selected
+                ? (destructive ? Util.alpha(Color.urgent, 0.22) : root.selectedBackground)
+                : "transparent"
+              borderSpec: Border.flat(destructive
+                ? (selected ? Color.urgent : Util.alpha(Color.urgent, 0.56))
+                : (selected ? root.selectedText : Util.alpha(root.foreground, 0.38)), Style.normalBorderWidth)
+              radius: 0
+
+              Text {
+                anchors.centerIn: parent
+                text: modelData
+                color: destructive ? (selected ? Color.urgent : root.foreground) : (selected ? root.selectedText : root.foreground)
+                font.family: root.fontFamily
+                font.pixelSize: Style.font.caption
+              }
+
+              MouseArea {
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onEntered: root.selectedIndex = index
+                onClicked: {
+                  if (index === 0) root.canceled()
+                  else root.confirmed()
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/Ui/CursorSurface.qml b/shell/Ui/CursorSurface.qml
new file mode 100644
index 00000000..58e46d06
--- /dev/null
+++ b/shell/Ui/CursorSurface.qml
@@ -0,0 +1,41 @@
+import QtQuick
+import qs.Commons
+
+// Shared visual chrome for keyboard-and-mouse-navigable items inside a panel.
+// Contract: items must NOT read `containsMouse` for color/border. Mouse
+// hover updates the panel's cursor state at the root; visuals derive from
+// `hasCursor` / `current`. That's what guarantees a single highlight on
+// screen at any time across both keyboard and mouse interaction.
+//
+// Cursor paint is always the shared hover-cursor fill plus optional
+// hover-cursor border. `outline` remains as a compatibility flag for
+// callers that used to request border-only rows, but slider rows still
+// receive the same hover-cursor background as every other row.
+BorderSurface {
+  id: root
+
+  property bool hasCursor: false
+  property bool current: false
+  property bool outline: false
+  property bool bordered: false
+
+  property color foreground: Color.foreground
+  property color accent: Color.accent
+  property color fill: Style.hoverFillFor(foreground, accent)
+  property color currentFill: Style.selectedFillFor(foreground, accent)
+
+  radius: Style.cornerRadius
+
+  color: hasCursor ? fill : (current ? currentFill : "transparent")
+  borderSpec: root.hasCursor
+    ? Border.controlSpec("hover-cursor", root.foreground, root.accent)
+    : (root.current
+      ? Border.controlSpec("selected", root.foreground, root.accent)
+      : (root.bordered
+        ? Border.controlSpec("normal", root.foreground, root.accent)
+        : Border.none()))
+
+  Behavior on color {
+    ColorAnimation { duration: 60 }
+  }
+}
diff --git a/shell/Ui/Dropdown.qml b/shell/Ui/Dropdown.qml
new file mode 100644
index 00000000..214a7fe4
--- /dev/null
+++ b/shell/Ui/Dropdown.qml
@@ -0,0 +1,241 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Commons
+
+// Themed single-select dropdown. Trigger row paints with the kit's focus
+// chrome; the popup anchors below and uses Color.popups.background +
+// Color.popups.border so it reads as a panel surface rather than the
+// platform-native ComboBox look.
+//
+// `options` accepts either a plain string[] or an array of
+// { value, label } objects (label is what we render; value is what we
+// emit). Mixing is fine — each row is interpreted independently.
+//
+// Keyboard: Tab to focus the trigger, Enter/Space opens, Esc closes,
+// j/k or Up/Down walks options inside the open popup, Enter selects.
+// A sibling SearchableDropdown reuses the same visuals but adds an
+// embedded filter input — keep the two separate so each stays simple.
+Item {
+  id: root
+
+  property string label: ""
+  property string value: ""
+  property var options: []
+
+  property color foreground: Color.popups.text
+  property color background: Color.popups.background
+  property color popupBorder: Color.popups.border
+  property color accent: Color.accent
+  readonly property var popupBorderSpec: Border.localOrSurfaceSpec("popups", "border", popupBorder, Color.popups.border, Style.normalBorderWidth)
+  property string fontFamily: Style.font.family
+  property int rowHeight: Style.spacing.controlHeight
+  property int popupRowHeight: Style.spacing.popupRowHeight
+  property bool showLabel: true
+
+  // Panel-cursor flag. When true, the trigger renders the shared
+  // hover-cursor state. Active Qt focus defaults to the same visuals.
+  // Emits `hovered(bool)` on pointer enter/leave so the panel can keep
+  // its cursor state in sync with the mouse.
+  property bool hasCursor: false
+
+  // popupOpen + open()/close()/toggle() let a parent panel know when the
+  // dropdown owns keys (its embedded ListView is active) and suspend its
+  // own keyCatcher so j/k inside the popup don't double-drive the panel
+  // cursor.
+  readonly property bool popupOpen: popup.opened
+  function open() { popup.open() }
+  function close() { popup.close() }
+  function toggle() { popup.opened ? popup.close() : popup.open() }
+
+  signal changed(string value)
+  signal hovered(bool isHovered)
+
+  function optionValue(o) {
+    return (o && typeof o === "object") ? String(o.value) : String(o)
+  }
+  function optionLabel(o) {
+    return (o && typeof o === "object") ? String(o.label) : String(o)
+  }
+  function currentLabel() {
+    for (var i = 0; i < options.length; i++) {
+      if (optionValue(options[i]) === value) return optionLabel(options[i])
+    }
+    return value
+  }
+
+  implicitWidth: Style.spacing.dropdownWidth
+  implicitHeight: showLabel && label !== "" ? rowHeight + Style.spacing.huge : rowHeight
+
+  Column {
+    anchors.fill: parent
+    spacing: Style.spacing.labelGap
+
+    Text {
+      visible: root.showLabel && root.label !== ""
+      text: root.label
+      color: Qt.darker(root.foreground, 1.4)
+      font.family: root.fontFamily
+      font.pixelSize: Style.font.caption
+      font.bold: true
+    }
+
+    BorderSurface {
+      id: trigger
+      width: parent.width
+      height: root.rowHeight
+      radius: Style.cornerRadius
+
+      readonly property bool _focused: trigger.activeFocus
+      readonly property bool _hot: triggerHover.hovered || root.hasCursor
+      readonly property var _borderSpec: Border.controlSpec(trigger._focused ? "focus" : (trigger._hot ? "hover-cursor" : "normal"), root.foreground, root.accent)
+
+      color: Style.controlFill(trigger._focused, trigger._hot, root.foreground, root.accent)
+      borderSpec: _borderSpec
+
+      activeFocusOnTab: true
+
+      HoverHandler {
+        id: triggerHover
+        onHoveredChanged: root.hovered(hovered)
+      }
+
+      Keys.onPressed: function(event) {
+        if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter
+            || event.key === Qt.Key_Space || event.key === Qt.Key_Down) {
+          popup.opened ? popup.close() : popup.open()
+          event.accepted = true
+        } else if (event.key === Qt.Key_Escape && popup.opened) {
+          popup.close(); event.accepted = true
+        }
+      }
+
+      Text {
+        anchors.left: parent.left
+        anchors.right: chevron.left
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.leftMargin: trigger.borderLeft + Style.spacing.controlPaddingX
+        anchors.rightMargin: trigger.borderRight + Style.spacing.md
+        text: root.currentLabel()
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        elide: Text.ElideRight
+      }
+
+      Text {
+        id: chevron
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.rightMargin: trigger.borderRight + Style.spacing.controlGap
+        text: "󰅀"
+        color: Qt.darker(root.foreground, 1.2)
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+      }
+
+      MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        onClicked: {
+          trigger.forceActiveFocus()
+          popup.opened ? popup.close() : popup.open()
+        }
+      }
+
+      Popup {
+        id: popup
+        x: 0
+        y: trigger.height + Style.spacing.xxs
+        width: trigger.width
+        implicitHeight: Math.min(root.options.length * root.popupRowHeight + Math.max(0, root.options.length - 1) * Style.spacing.labelGap + Style.spacing.xxs,
+                                 root.popupRowHeight * 8 + 7 * Style.spacing.labelGap + Style.spacing.xxs)
+        padding: Style.spacing.hairline
+        leftPadding: Border.left(root.popupBorderSpec) + Style.spacing.hairline
+        rightPadding: Border.right(root.popupBorderSpec) + Style.spacing.hairline
+        topPadding: Border.top(root.popupBorderSpec) + Style.spacing.hairline
+        bottomPadding: Border.bottom(root.popupBorderSpec) + Style.spacing.hairline
+        focus: true
+
+        background: BorderSurface {
+          color: root.background
+          borderSpec: root.popupBorderSpec
+          radius: Style.cornerRadius
+        }
+
+        onOpened: {
+          optionList.currentIndex = Math.max(0, optionList.indexOfValue(root.value))
+          optionList.forceActiveFocus()
+        }
+
+        contentItem: ListView {
+          id: optionList
+          spacing: Style.spacing.labelGap
+
+          Keys.priority: Keys.BeforeItem
+          Keys.onPressed: function(event) {
+            if (event.key === Qt.Key_Escape) { popup.close(); event.accepted = true }
+            else if (event.key === Qt.Key_Down || event.text === "j") {
+              optionList.currentIndex = Math.min(root.options.length - 1, optionList.currentIndex + 1)
+              event.accepted = true
+            } else if (event.key === Qt.Key_Up || event.text === "k") {
+              optionList.currentIndex = Math.max(0, optionList.currentIndex - 1)
+              event.accepted = true
+            } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+              optionList.selectCurrent(); event.accepted = true
+            }
+          }
+          implicitHeight: contentHeight
+          clip: true
+          boundsBehavior: Flickable.StopAtBounds
+          model: root.options
+          currentIndex: -1
+
+          function indexOfValue(v) {
+            for (var i = 0; i < root.options.length; i++)
+              if (root.optionValue(root.options[i]) === v) return i
+            return -1
+          }
+
+          function selectCurrent() {
+            if (currentIndex < 0 || currentIndex >= root.options.length) return
+            var v = root.optionValue(root.options[currentIndex])
+            root.value = v
+            root.changed(v)
+            popup.close()
+          }
+
+          delegate: Rectangle {
+            required property var modelData
+            required property int index
+            width: optionList.width
+            height: root.popupRowHeight
+            color: index === optionList.currentIndex
+              ? Style.hoverFillFor(root.foreground, root.accent)
+              : "transparent"
+
+            Text {
+              anchors.left: parent.left
+              anchors.right: parent.right
+              anchors.verticalCenter: parent.verticalCenter
+              anchors.leftMargin: Style.spacing.controlPaddingX
+              anchors.rightMargin: Style.spacing.controlPaddingX
+              text: root.optionLabel(modelData)
+              color: index === optionList.currentIndex ? Style.hoverStateColor(root.foreground, root.accent) : root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.body
+              elide: Text.ElideRight
+            }
+
+            MouseArea {
+              anchors.fill: parent
+              hoverEnabled: true
+              cursorShape: Qt.PointingHandCursor
+              onPositionChanged: optionList.currentIndex = parent.index
+              onClicked: optionList.selectCurrent()
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/Ui/KeyboardPanel.qml b/shell/Ui/KeyboardPanel.qml
new file mode 100644
index 00000000..b861b8a2
--- /dev/null
+++ b/shell/Ui/KeyboardPanel.qml
@@ -0,0 +1,329 @@
+import QtQuick
+import Quickshell
+import Quickshell.Wayland
+import qs.Commons
+
+// Layer-shell popup attached to a bar widget icon, designed for
+// click-driven AND keyboard-driven panels (e.g. SUPER+CTRL+W summon).
+//
+// Built on PanelWindow with WlrKeyboardFocus.Exclusive rather than
+// PopupWindow (xdg-popup). Layer-shell surfaces declared Exclusive get
+// keyboard focus from Hyprland *at map time*, which is the protocol-level
+// equivalent of focus-on-launch for xdg-toplevels. xdg-popups don't get
+// that — they only receive keys after a click/hover routes focus through
+// their parent surface — so keyboard-summoned popups fell flat without it.
+//
+// API is a subset of Common.PopupCard: anchorItem, owner, bar, open,
+// padding, margin, contentWidth/Height, centerOnBar, default contentItem.
+// Missing on purpose (for now): triggerMode ("hover"), containsMouse.
+// Hover-mode popups (system-stats) need extra plumbing before migrating.
+//
+// Positioning: full-screen layer-shell with the card placed inside at
+// `cardOrigin`. We use the bar window's height/width for the perpendicular
+// axis (away-from-bar) because mapToItem on the anchor returns
+// bar-content-relative coords with internal layout offsets baked in
+// (e.g. ~13px from the bar's vertical centering of its widget row). The
+// parallel axis (along-the-bar) uses the anchor's content x/y since the
+// bar spans full screen on that axis.
+//
+// Outside-click dismissal: an overlay MouseArea catches clicks, with the
+// QsWindow.mask subtracting the bar strip so clicks on the bar still
+// reach the bar widgets (activePopout coordinator hands off to another
+// popup if the user clicks a different bar icon).
+PanelWindow {
+  id: root
+
+  required property Item anchorItem
+  required property QtObject bar
+  property var owner: null
+  property int margin: Style.gapsOut
+  property int padding: Style.spacing.popupPadding
+  property int contentWidth: Style.space(280)
+  property int contentHeight: Style.space(200)
+  property bool centerOnBar: false
+  property bool open: false
+  property int gap: Style.gapsOut  // distance between bar edge and panel
+  property bool popoutSwitching: false
+  property bool popoutSwitchClosing: false
+
+  // Item that should take keyboard focus once the panel maps. Typically a
+  // PanelKeyCatcher inside the panel content. Layer-shell grants focus to
+  // the surface at map time, but Qt still needs an active-focus target
+  // inside the surface for Keys.onPressed handlers to fire. Schedule the
+  // focus through Qt.callLater so it runs after the surface is fully
+  // mapped and child items have completed layout.
+  property Item focusTarget: null
+
+  default property alias contentItem: contentHolder.children
+
+  readonly property var coordinatorKey: owner || root
+  readonly property var anchorWindow: anchorItem ? anchorItem.QsWindow.window : null
+  readonly property string barPos: bar ? bar.position : "top"
+
+  function close() {
+    if (owner && "close" in owner) owner.close()
+    else root.open = false
+  }
+
+  // --- screen + lifetime ---------------------------------------------------
+
+  screen: anchorWindow ? anchorWindow.screen : null
+  visible: open || card.opacity > 0 || popoutSwitching
+  color: "transparent"
+  exclusionMode: ExclusionMode.Ignore
+
+  WlrLayershell.namespace: "omarchy-keyboard-panel"
+  WlrLayershell.layer: WlrLayer.Overlay
+  // Keyboard focus follows `open` (NOT `visible`). The window remains
+  // mapped during the fade-out so the opacity animation has something to
+  // animate, but keyboard/click ownership must release the moment the
+  // logical close fires — otherwise the user is locked out for 140ms.
+  WlrLayershell.keyboardFocus: open ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
+
+  // Full-screen layer-shell. The visible card is positioned inside via
+  // `cardOrigin`. The `mask` below makes the bar area click-through (so
+  // the user can click another bar icon while the panel is open and the
+  // activePopout coordinator swaps to that popup); everywhere else, the
+  // overlay catches the click and dismisses via the MouseArea below.
+  anchors {
+    top: true
+    bottom: true
+    left: true
+    right: true
+  }
+
+  // Clickable region is the whole screen. Clicks in the bar strip are
+  // forwarded to registered bar buttons so switching between panel icons
+  // works in one click even when the overlay surface is above the bar.
+  readonly property real _barStripSize: {
+    if (!bar) return 0
+    var actual = (root.barPos === "top" || root.barPos === "bottom") ? root.barH : root.barW
+    return Math.max(bar.barSize, actual) + root.gap
+  }
+  mask: Region {
+    width: root.screenW
+    height: root.screenH
+  }
+
+  // Track every layout change between the bar's contentItem and the
+  // anchor item. `transform` updates whenever any item in that chain
+  // moves/resizes, which is what makes the position binding below
+  // actually reactive — mapToItem on its own is a one-shot.
+  TransformWatcher {
+    id: anchorWatcher
+    a: anchorWindow ? anchorWindow.contentItem : null
+    b: anchorItem
+  }
+
+  // Anchor item's position within the bar's content surface. For a
+  // full-width top bar, the content x maps directly to screen x; the y
+  // returned here has the bar's internal padding baked in (e.g. ~13px
+  // from vertical centering of the widget row), which is why `cardOrigin`
+  // below uses `barH` for the perpendicular axis instead of this y.
+  readonly property point anchorScreenPos: {
+    anchorWatcher.transform  // reactive dependency
+    if (!anchorItem || !anchorWindow) return Qt.point(0, 0)
+    return anchorItem.mapToItem(anchorWindow.contentItem, 0, 0)
+  }
+  readonly property real anchorW: anchorItem ? anchorItem.width : 0
+  readonly property real anchorH: anchorItem ? anchorItem.height : 0
+  readonly property real screenW: screen ? screen.width : 0
+  readonly property real screenH: screen ? screen.height : 0
+  readonly property real availableCardWidth: screenW > 0
+    ? Math.max(120, screenW - ((barPos === "left" || barPos === "right") ? barW + gap + margin : margin * 2))
+    : 0
+  readonly property real availableCardHeight: screenH > 0
+    ? Math.max(120, screenH - ((barPos === "top" || barPos === "bottom") ? barH + gap + margin : margin * 2))
+    : 0
+
+  function fittedContentWidth(width, cap) {
+    var desired = Math.max(1, Number(width) || 1)
+    var maxWidth = root.availableCardWidth > 0 ? root.availableCardWidth : desired
+    if (cap !== undefined && Number(cap) > 0) maxWidth = Math.min(maxWidth, Number(cap))
+    return Math.round(Math.min(desired, maxWidth))
+  }
+
+  function fittedContentHeight(implicitHeight, cap) {
+    var desired = Math.max(root.padding * 2, (Number(implicitHeight) || 0) + root.padding * 2)
+    var maxHeight = root.availableCardHeight > 0 ? root.availableCardHeight : desired
+    if (cap !== undefined && Number(cap) > 0) maxHeight = Math.min(maxHeight, Number(cap))
+    return Math.round(Math.min(desired, maxHeight))
+  }
+
+  function cappedContentHeight(height) {
+    var desired = Math.max(root.padding * 2, Number(height) || root.padding * 2)
+    var maxHeight = root.availableCardHeight > 0 ? root.availableCardHeight : desired
+    return Math.round(Math.min(desired, maxHeight))
+  }
+
+  // Desired top-left of the card in screen coordinates. For the
+  // perpendicular axis (away-from-bar) we anchor to the bar window's edge
+  // directly — not the anchor item's y/x — because mapToItem(barContent)
+  // returns coordinates in the bar's content space, which can be offset
+  // from the bar surface's screen-anchored corner by internal layout
+  // (centering wrappers, padding). The bar's surface IS aligned to its
+  // anchored screen edge, so using `barW`/`barH` gives the right edge
+  // regardless of how the bar's internal widgets are positioned. For the
+  // parallel axis (along the bar) the anchor item's reported position is
+  // still consistent with the bar content origin, so it's accurate for
+  // centering the card under the icon.
+  readonly property real barW: anchorWindow ? anchorWindow.width : screenW
+  readonly property real barH: anchorWindow ? anchorWindow.height : 0
+  readonly property point cardOrigin: {
+    if (!anchorItem || !bar) return Qt.point(margin, margin)
+    var x = 0, y = 0
+    if (centerOnBar && (barPos === "top" || barPos === "bottom")) {
+      x = screenW / 2 - contentWidth / 2
+      y = barPos === "bottom" ? screenH - barH - contentHeight - gap : barH + gap
+    } else if (centerOnBar) {
+      x = barPos === "left" ? barW + gap : screenW - barW - contentWidth - gap
+      y = screenH / 2 - contentHeight / 2
+    } else if (barPos === "bottom") {
+      x = anchorScreenPos.x + anchorW / 2 - contentWidth / 2
+      y = screenH - barH - contentHeight - gap
+    } else if (barPos === "left") {
+      x = barW + gap
+      y = anchorScreenPos.y + anchorH / 2 - contentHeight / 2
+    } else if (barPos === "right") {
+      x = screenW - barW - contentWidth - gap
+      y = anchorScreenPos.y + anchorH / 2 - contentHeight / 2
+    } else { // "top" (default)
+      x = anchorScreenPos.x + anchorW / 2 - contentWidth / 2
+      y = barH + gap
+    }
+    x = Math.max(margin, Math.min(x, screenW - contentWidth - margin))
+    y = Math.max(margin, Math.min(y, screenH - contentHeight - margin))
+    return Qt.point(Math.round(x), Math.round(y))
+  }
+
+
+  // --- popout coordination (same-bar single-popout model) -----------------
+
+  // Coordinate on `open`, not `visible`. `visible` lags into the fade-out
+  // animation, which made ownership transfer to a sibling popup race.
+  onOpenChanged: {
+    if (open && focusTarget) Qt.callLater(function() {
+      if (root.open && root.focusTarget) root.focusTarget.forceActiveFocus()
+    })
+    if (!bar) return
+    if (open) {
+      popoutSwitchClosing = false
+      popoutSwitching = bar.activePopout && bar.activePopout !== coordinatorKey
+      bar.requestPopout(coordinatorKey)
+      if (popoutSwitching) popoutSwitchTimer.restart()
+    } else {
+      popoutSwitchClosing = !!(owner && owner.popoutSwitchClosing)
+      popoutSwitching = false
+      if (bar.activePopout === coordinatorKey) bar.releasePopout(coordinatorKey)
+      if (popoutSwitchClosing) closeSwitchTimer.restart()
+    }
+  }
+
+  Timer {
+    id: popoutSwitchTimer
+    interval: 150
+    onTriggered: root.popoutSwitching = false
+  }
+
+  Timer {
+    id: closeSwitchTimer
+    interval: 1
+    onTriggered: root.popoutSwitchClosing = false
+  }
+
+  // --- outside-click dismissal --------------------------------------------
+
+  // Catches clicks anywhere in the clickable region (i.e. everywhere on
+  // screen except the bar strip, which is masked out). The card has its
+  // own MouseArea below so clicks on it don't bubble up here. Disabled
+  // during the fade-out so the dying overlay doesn't swallow clicks that
+  // were meant for the apps behind it.
+  MouseArea {
+    id: dismissArea
+    anchors.fill: parent
+    enabled: root.open
+    hoverEnabled: true
+    property bool hoveringBar: false
+    cursorShape: hoveringBar ? Qt.PointingHandCursor : Qt.ArrowCursor
+
+    function inBarRegion(px, py) {
+      if (root.barPos === "bottom") return py >= root.screenH - root._barStripSize
+      if (root.barPos === "left") return px <= root._barStripSize
+      if (root.barPos === "right") return px >= root.screenW - root._barStripSize
+      return py <= root._barStripSize
+    }
+
+    function barPoint(px, py) {
+      if (root.barPos === "bottom") return Qt.point(px, py - (root.screenH - root.barH))
+      if (root.barPos === "right") return Qt.point(px - (root.screenW - root.barW), py)
+      return Qt.point(px, py)
+    }
+
+    function pressTargetAt(px, py) {
+      if (!root.anchorWindow || !root.anchorWindow.contentItem || !root.bar || !root.bar.clickTargets) return null
+      var p = barPoint(px, py)
+      var targets = root.bar.clickTargets
+      for (var i = targets.length - 1; i >= 0; i--) {
+        var target = targets[i]
+        if (!target || !target.triggerPress || target.visible === false || target.opacity === 0 || !target.mapToItem) continue
+        if (root.bar.targetBelongsToWindow && !root.bar.targetBelongsToWindow(target, root.anchorWindow)) continue
+        var pos = root.anchorWindow.itemPosition(target)
+        if (p.x >= pos.x && p.x <= pos.x + target.width && p.y >= pos.y && p.y <= pos.y + target.height) return target
+      }
+      return null
+    }
+
+    function forwardBarClick(px, py, button) {
+      var target = pressTargetAt(px, py)
+      if (!target) return false
+      target.triggerPress(button)
+      return true
+    }
+
+    onPositionChanged: function(mouse) { hoveringBar = inBarRegion(mouse.x, mouse.y) }
+    onExited: hoveringBar = false
+    onClicked: function(mouse) {
+      if (inBarRegion(mouse.x, mouse.y) && forwardBarClick(mouse.x, mouse.y, mouse.button)) return
+      root.close()
+    }
+  }
+
+  // --- card ----------------------------------------------------------------
+
+  BorderSurface {
+    id: card
+    x: root.cardOrigin.x
+    y: root.cardOrigin.y
+    width: root.contentWidth
+    height: root.contentHeight
+    color: Color.popups.background
+    borderSpec: Border.surfaceSpec("popups", "border", Color.popups.border, Math.max(1, Style.space(2)))
+    padding: root.padding
+    radius: Style.cornerRadius
+    opacity: root.open || root.popoutSwitching ? 1.0 : 0
+
+    Behavior on opacity {
+      enabled: !root.popoutSwitching && !root.popoutSwitchClosing
+      NumberAnimation { duration: 140; easing.type: Easing.OutCubic }
+    }
+
+    // Swallow clicks on the card so they don't bubble to the dismissal
+    // MouseArea behind us.
+    MouseArea { anchors.fill: parent }
+
+    Item {
+      id: contentHolder
+      anchors.fill: parent
+      anchors.topMargin: card.contentTopInset
+      anchors.rightMargin: card.contentRightInset
+      anchors.bottomMargin: card.contentBottomInset
+      anchors.leftMargin: card.contentLeftInset
+      opacity: root.popoutSwitching ? (root.open ? 1.0 : 0) : 1.0
+
+      Behavior on opacity {
+        enabled: root.popoutSwitching
+        NumberAnimation { duration: 140; easing.type: Easing.OutCubic }
+      }
+    }
+  }
+}
diff --git a/shell/Ui/MultiSelect.qml b/shell/Ui/MultiSelect.qml
new file mode 100644
index 00000000..f759b66d
--- /dev/null
+++ b/shell/Ui/MultiSelect.qml
@@ -0,0 +1,617 @@
+import QtQuick
+import QtQuick.Controls as QQC
+import QtQuick.Window
+import Quickshell.Io
+import qs.Commons
+
+// Searchable multi-select dropdown. Trigger shape matches Dropdown /
+// SearchableDropdown; the popup shows a search field, an optional refresh
+// button, and a checkbox list. Click rows to toggle. Use when callers
+// need to pick zero or more items from a (possibly long, possibly
+// dynamic) list.
+//
+// Options are either:
+//   - static `options`: string[] or [{ value, label, description? }]
+//   - dynamic `optionsCommand`: argv array. The command's stdout is
+//     parsed as JSON when it trims to start with `[`, otherwise as
+//     one option per non-empty newline. Re-runs whenever the popup opens
+//     and via the refresh button.
+//
+// `values` is the persisted selection — always an array of strings.
+// Emits `changed(values)` whenever the selection mutates.
+Item {
+  id: root
+
+  property string label: ""
+  property var values: []
+  property var options: []
+  property var optionsCommand: []
+  property string optionsCommandCwd: ""
+  property string placeholderText: "Search..."
+  property string emptyText: "No options"
+  property string noSelectionText: "None selected"
+  property string triggerLabel: ""
+  property bool showLabel: true
+
+  property color foreground: Color.popups.text
+  property color background: Color.popups.background
+  property color popupBorder: Color.popups.border
+  property color accent: Color.accent
+  readonly property var popupBorderSpec: Border.localOrSurfaceSpec("popups", "border", popupBorder, Color.popups.border, Style.normalBorderWidth)
+  property string fontFamily: Style.font.family
+  property int rowHeight: Style.spacing.controlHeight
+  property int popupRowHeight: Style.spacing.popupRowHeight
+  property int popupMinHeight: Style.spacing.searchablePopupMinHeight
+
+  property bool hasCursor: false
+
+  readonly property bool popupOpen: popup.opened
+  function open() { popup.open() }
+  function close() { popup.close() }
+  function toggle() { popup.opened ? popup.close() : popup.open() }
+
+  signal changed(var values)
+  signal hovered(bool isHovered)
+
+  // Loaded options after merging static + dynamic. Always normalized
+  // into the [{ value, label, description }] shape for delegate use.
+  property var resolvedOptions: []
+  property bool loadingOptions: false
+  property string optionsError: ""
+
+  function normalizeOption(o) {
+    if (o && typeof o === "object") {
+      return {
+        value: String(o.value),
+        label: String(o.label !== undefined ? o.label : o.value),
+        description: o.description ? String(o.description) : ""
+      }
+    }
+    var s = String(o)
+    return { value: s, label: s, description: "" }
+  }
+
+  // QML schema arrays sometimes arrive as JSValue lists that fail
+  // `Array.isArray`. arrayFrom accepts anything array-like (`.length`
+  // numeric) and returns a real JS array so the rest of the component can
+  // rely on standard array operations.
+  function arrayFrom(v) {
+    if (!v || typeof v.length !== "number" || typeof v === "string") return []
+    var out = []
+    for (var i = 0; i < v.length; i++) out.push(v[i])
+    return out
+  }
+
+  function normalizeAll(arr) {
+    var out = []
+    var src = arrayFrom(arr)
+    var seen = ({})
+    for (var i = 0; i < src.length; i++) {
+      var n = normalizeOption(src[i])
+      if (!n.value) continue
+      if (seen[n.value]) continue
+      seen[n.value] = true
+      out.push(n)
+    }
+    return out
+  }
+
+  function valueSet() {
+    var set = ({})
+    var arr = arrayFrom(values)
+    for (var i = 0; i < arr.length; i++) set[String(arr[i])] = true
+    return set
+  }
+
+  function isSelected(value) {
+    var set = valueSet()
+    return !!set[String(value)]
+  }
+
+  function toggleValue(value) {
+    var v = String(value)
+    var arr = arrayFrom(values)
+    var idx = arr.indexOf(v)
+    if (idx === -1) arr.push(v)
+    else arr.splice(idx, 1)
+    root.values = arr
+    root.changed(arr)
+  }
+
+  function selectionLabel() {
+    var arr = arrayFrom(values)
+    if (arr.length === 0) return ""
+    var labels = []
+    var byValue = ({})
+    for (var i = 0; i < resolvedOptions.length; i++)
+      byValue[resolvedOptions[i].value] = resolvedOptions[i].label
+    for (var j = 0; j < arr.length; j++)
+      labels.push(byValue[String(arr[j])] || String(arr[j]))
+    if (labels.length <= 3) return labels.join(", ")
+    return arr.length + " selected"
+  }
+
+  property var filtered: resolvedOptions
+  function recomputeFiltered() {
+    var q = searchField.text.toLowerCase()
+    if (!q) { filtered = resolvedOptions; return }
+    var out = []
+    for (var i = 0; i < resolvedOptions.length; i++) {
+      var o = resolvedOptions[i]
+      if (o.label.toLowerCase().indexOf(q) !== -1
+          || o.description.toLowerCase().indexOf(q) !== -1
+          || o.value.toLowerCase().indexOf(q) !== -1) out.push(o)
+    }
+    filtered = out
+  }
+
+  function rebuildFromStatic() {
+    resolvedOptions = normalizeAll(options)
+    recomputeFiltered()
+  }
+
+  // Parse stdout from a dynamic optionsCommand into `{ options, error }`.
+  // Output starting with `[` is parsed strictly as JSON — a malformed array
+  // surfaces as an error rather than silently falling back to newline
+  // parsing, which would render the broken text as a literal option label.
+  // Output not starting with `[` is treated as one value per non-empty line.
+  function parseCommandOutput(text) {
+    var raw = String(text || "").trim()
+    if (raw === "") return { options: [], error: "" }
+    if (raw.charAt(0) === "[") {
+      try {
+        var parsed = JSON.parse(raw)
+        return { options: parsed, error: "" }
+      } catch (e) {
+        return { options: [], error: "Options command emitted invalid JSON" }
+      }
+    }
+    var out = []
+    var lines = raw.split(/\r?\n/)
+    for (var i = 0; i < lines.length; i++) {
+      var line = lines[i].trim()
+      if (line !== "") out.push(line)
+    }
+    return { options: out, error: "" }
+  }
+
+  // Monotonic request id so stale stdout/exit signals from a previous
+  // refresh can't clobber the resolvedOptions of a newer refresh, and
+  // a runaway command can be detected after a timeout.
+  property int refreshSeq: 0
+  readonly property int refreshTimeoutMs: 6000
+
+  function refresh() {
+    var cmd = arrayFrom(optionsCommand)
+    if (cmd.length === 0) {
+      rebuildFromStatic()
+      return
+    }
+    refreshSeq++
+    loadingOptions = true
+    optionsError = ""
+    optionsProcess.command = cmd
+    optionsProcess.workingDirectory = optionsCommandCwd
+    optionsProcess.running = false
+    optionsProcess.running = true
+    refreshTimeoutTimer.restart()
+  }
+
+  Timer {
+    id: refreshTimeoutTimer
+    interval: root.refreshTimeoutMs
+    repeat: false
+    onTriggered: {
+      if (!root.loadingOptions) return
+      optionsProcess.running = false
+      root.loadingOptions = false
+      root.optionsError = "Options command timed out"
+    }
+  }
+
+  onOptionsChanged: if (arrayFrom(optionsCommand).length === 0) rebuildFromStatic()
+  onOptionsCommandChanged: refresh()
+  Component.onCompleted: refresh()
+
+  Process {
+    id: optionsProcess
+    running: false
+    command: []
+
+    property int seq: 0
+
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        if (optionsProcess.seq !== root.refreshSeq) return
+        var result = root.parseCommandOutput(text)
+        if (result.error) {
+          root.optionsError = result.error
+          root.resolvedOptions = root.normalizeAll(root.options)
+        } else {
+          var combined = root.arrayFrom(root.options)
+          for (var j = 0; j < result.options.length; j++) combined.push(result.options[j])
+          root.resolvedOptions = root.normalizeAll(combined)
+        }
+        root.recomputeFiltered()
+        root.loadingOptions = false
+        refreshTimeoutTimer.stop()
+      }
+    }
+
+    onRunningChanged: if (running) seq = root.refreshSeq
+
+    onExited: function(exitCode, exitStatus) {
+      if (seq !== root.refreshSeq) return
+      refreshTimeoutTimer.stop()
+      if (exitCode !== 0) {
+        root.loadingOptions = false
+        root.optionsError = "Options command exited " + exitCode
+      }
+    }
+  }
+
+  implicitWidth: Style.spacing.searchableDropdownWidth
+  implicitHeight: showLabel && label !== "" ? rowHeight + Style.spacing.huge : rowHeight
+
+  Column {
+    anchors.fill: parent
+    spacing: Style.spacing.labelGap
+
+    Text {
+      visible: root.showLabel && root.label !== ""
+      text: root.label
+      color: Qt.darker(root.foreground, 1.4)
+      font.family: root.fontFamily
+      font.pixelSize: Style.font.caption
+      font.bold: true
+    }
+
+    BorderSurface {
+      id: trigger
+      width: parent.width
+      height: root.rowHeight
+      radius: Style.cornerRadius
+
+      readonly property bool _focused: trigger.activeFocus
+      readonly property bool _hot: triggerHover.hovered || root.hasCursor
+      readonly property var _borderSpec: Border.controlSpec(trigger._focused ? "focus" : (trigger._hot ? "hover-cursor" : "normal"), root.foreground, root.accent)
+
+      color: Style.controlFill(trigger._focused, trigger._hot, root.foreground, root.accent)
+      borderSpec: _borderSpec
+
+      activeFocusOnTab: true
+
+      HoverHandler {
+        id: triggerHover
+        onHoveredChanged: root.hovered(hovered)
+      }
+
+      Keys.onPressed: function(event) {
+        if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter
+            || event.key === Qt.Key_Space || event.key === Qt.Key_Down) {
+          popup.opened ? popup.close() : popup.open()
+          event.accepted = true
+        } else if (event.key === Qt.Key_Escape && popup.opened) {
+          popup.close(); event.accepted = true
+        }
+      }
+
+      Text {
+        anchors.left: parent.left
+        anchors.right: chevron.left
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.leftMargin: trigger.borderLeft + Style.spacing.controlPaddingX
+        anchors.rightMargin: trigger.borderRight + Style.spacing.md
+        text: root.selectionLabel() || root.triggerLabel || root.noSelectionText
+        color: root.selectionLabel() ? root.foreground : Qt.darker(root.foreground, 1.5)
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        elide: Text.ElideRight
+      }
+
+      Text {
+        id: chevron
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.rightMargin: trigger.borderRight + Style.spacing.controlGap
+        text: "󰅀"
+        color: Qt.darker(root.foreground, 1.2)
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+      }
+
+      MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        onClicked: {
+          trigger.forceActiveFocus()
+          popup.opened ? popup.close() : popup.open()
+        }
+      }
+
+      QQC.Popup {
+        id: popup
+        // Reparent to the window's content item so the popup is free of any
+        // clipping ancestor. Position
+        // and available height are recomputed on open and any time the
+        // trigger's geometry changes, since a binding on mapToItem alone
+        // won't reliably re-evaluate when ancestors scroll or resize.
+        parent: trigger.Window.window ? trigger.Window.window.contentItem : trigger
+        property real _anchorX: 0
+        property real _anchorY: 0
+        property real _availableBelow: 0
+        readonly property real _windowHeight: parent ? parent.height : 0
+        readonly property real _idealContent: resultList.contentHeight + Style.space(50)
+        readonly property real _maxRowsHeight: root.popupRowHeight * 6 + 5 * Style.spacing.labelGap + Style.space(50)
+
+        function reposition() {
+          if (!parent) return
+          var p = trigger.mapToItem(parent, 0, trigger.height + Style.spacing.xxs)
+          _anchorX = p.x
+          _anchorY = p.y
+          _availableBelow = Math.max(0, _windowHeight - _anchorY - Style.space(12))
+        }
+
+        x: _anchorX
+        y: _anchorY
+        width: trigger.width
+        // Clamp to whatever fits below the trigger; don't force popupMinHeight
+        // when there isn't room, otherwise the popup overflows the window.
+        implicitHeight: Math.min(_availableBelow, _idealContent, _maxRowsHeight)
+        padding: Style.spacing.hairline
+        leftPadding: Border.left(root.popupBorderSpec) + Style.spacing.hairline
+        rightPadding: Border.right(root.popupBorderSpec) + Style.spacing.hairline
+        topPadding: Border.top(root.popupBorderSpec) + Style.spacing.hairline
+        bottomPadding: Border.bottom(root.popupBorderSpec) + Style.spacing.hairline
+        focus: true
+
+        Connections {
+          target: trigger
+          function onXChanged() { popup.reposition() }
+          function onYChanged() { popup.reposition() }
+          function onWidthChanged() { popup.reposition() }
+          function onHeightChanged() { popup.reposition() }
+        }
+
+        background: BorderSurface {
+          color: root.background
+          borderSpec: root.popupBorderSpec
+          radius: Style.cornerRadius
+        }
+
+        onOpened: {
+          reposition()
+          searchField.text = ""
+          root.refresh()
+          root.recomputeFiltered()
+          Qt.callLater(function() { searchField.forceActiveFocus() })
+        }
+        onClosed: searchField.text = ""
+
+        contentItem: Column {
+          spacing: 0
+
+          Item {
+            id: searchHeader
+            width: parent.width
+            height: root.popupRowHeight + Style.spacing.controlPaddingX
+
+            Row {
+              anchors.fill: parent
+              anchors.margins: Style.spacing.md
+              spacing: Style.spacing.rowGap
+
+              TextField {
+                id: searchField
+                width: parent.width - refreshButton.width - parent.spacing
+                height: parent.height
+                placeholderText: root.placeholderText
+                foreground: root.foreground
+                accent: root.accent
+                font.family: root.fontFamily
+                font.pixelSize: Style.font.body
+
+                onTextChanged: {
+                  root.recomputeFiltered()
+                  if (resultList.count > 0) resultList.currentIndex = 0
+                }
+
+                Keys.onPressed: function(event) {
+                  if (event.key === Qt.Key_Escape) {
+                    popup.close(); event.accepted = true
+                  } else if (event.key === Qt.Key_Down) {
+                    if (resultList.count > 0) {
+                      resultList.currentIndex = 0
+                      resultList.forceActiveFocus()
+                    }
+                    event.accepted = true
+                  } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+                    if (resultList.count > 0) {
+                      resultList.currentIndex = 0
+                      resultList.toggleCurrent()
+                    }
+                    event.accepted = true
+                  }
+                }
+              }
+
+              BorderSurface {
+                id: refreshButton
+                visible: root.arrayFrom(root.optionsCommand).length > 0
+                enabled: !root.loadingOptions
+                width: parent.height
+                height: parent.height
+                radius: Style.cornerRadius
+                color: refreshHover.hovered
+                  ? Style.hoverFillFor(root.foreground, root.accent)
+                  : Style.normalFillFor(root.foreground, root.accent)
+                borderSpec: refreshHover.hovered
+                  ? Border.controlSpec("hover-cursor", root.foreground, root.accent)
+                  : Border.controlSpec("normal", root.foreground, root.accent)
+
+                Text {
+                  anchors.centerIn: parent
+                  text: root.loadingOptions ? "󰦖" : "󰑐"
+                  color: root.foreground
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.body
+
+                  RotationAnimator on rotation {
+                    running: root.loadingOptions
+                    from: 0; to: 360
+                    duration: 800
+                    loops: Animation.Infinite
+                  }
+                }
+
+                HoverHandler { id: refreshHover }
+                MouseArea {
+                  anchors.fill: parent
+                  cursorShape: Qt.PointingHandCursor
+                  onClicked: root.refresh()
+                }
+              }
+            }
+          }
+
+          Rectangle {
+            width: parent.width
+            height: 1
+            color: Util.alpha(root.foreground, 0.10)
+          }
+
+          Item {
+            width: parent.width
+            height: popup.height - searchHeader.height - Style.spacing.xxs - 1
+
+            Text {
+              anchors.centerIn: parent
+              visible: resultList.count === 0
+              text: root.loadingOptions ? "Loading…" : (root.optionsError !== "" ? root.optionsError : root.emptyText)
+              color: Qt.darker(root.foreground, 1.6)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.body
+            }
+
+            ListView {
+              id: resultList
+              anchors.fill: parent
+              spacing: Style.spacing.labelGap
+              clip: true
+              boundsBehavior: Flickable.StopAtBounds
+              model: root.filtered
+              currentIndex: -1
+              keyNavigationEnabled: false
+
+              function toggleCurrent() {
+                if (currentIndex < 0 || currentIndex >= root.filtered.length) return
+                root.toggleValue(root.filtered[currentIndex].value)
+              }
+
+              Keys.priority: Keys.BeforeItem
+              Keys.onPressed: function(event) {
+                if (event.key === Qt.Key_Escape) {
+                  popup.close(); event.accepted = true
+                } else if (event.key === Qt.Key_Down || event.text === "j") {
+                  if (resultList.currentIndex >= resultList.count - 1) {
+                    event.accepted = true; return
+                  }
+                  resultList.currentIndex = resultList.currentIndex + 1
+                  event.accepted = true
+                } else if (event.key === Qt.Key_Up || event.text === "k") {
+                  if (resultList.currentIndex <= 0) {
+                    searchField.forceActiveFocus()
+                    event.accepted = true; return
+                  }
+                  resultList.currentIndex = resultList.currentIndex - 1
+                  event.accepted = true
+                } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter
+                           || event.key === Qt.Key_Space) {
+                  resultList.toggleCurrent(); event.accepted = true
+                }
+              }
+
+              delegate: Rectangle {
+                required property var modelData
+                required property int index
+
+                readonly property bool selected: root.isSelected(modelData.value)
+
+                width: resultList.width
+                height: Math.max(root.popupRowHeight, rowContent.implicitHeight + Style.spacing.rowPaddingX)
+                color: index === resultList.currentIndex
+                  ? Style.hoverFillFor(root.foreground, root.accent)
+                  : "transparent"
+
+                Row {
+                  id: rowContent
+                  anchors.left: parent.left
+                  anchors.right: parent.right
+                  anchors.verticalCenter: parent.verticalCenter
+                  anchors.leftMargin: Style.spacing.controlPaddingX
+                  anchors.rightMargin: Style.spacing.controlPaddingX
+                  spacing: Style.spacing.rowGap
+
+                  BorderSurface {
+                    id: checkbox
+                    width: Style.space(16)
+                    height: Style.space(16)
+                    radius: Math.max(2, Style.cornerRadius / 2)
+                    anchors.verticalCenter: parent.verticalCenter
+                    color: selected ? Style.selectedFillFor(root.foreground, root.accent) : "transparent"
+                    borderSpec: selected
+                      ? Border.controlSpec("selected", root.foreground, root.accent)
+                      : Border.controlSpec("normal", root.foreground, root.accent)
+
+                    Text {
+                      anchors.centerIn: parent
+                      visible: selected
+                      text: "✓"
+                      color: Style.selectedStateColor(root.foreground, root.accent)
+                      font.family: root.fontFamily
+                      font.pixelSize: Math.round(checkbox.height * 0.85)
+                      font.bold: true
+                    }
+                  }
+
+                  Column {
+                    width: parent.width - checkbox.width - parent.spacing
+                    anchors.verticalCenter: parent.verticalCenter
+                    spacing: Style.spacing.xxs
+
+                    Text {
+                      text: modelData.label
+                      color: index === resultList.currentIndex ? Style.hoverStateColor(root.foreground, root.accent) : root.foreground
+                      font.family: root.fontFamily
+                      font.pixelSize: Style.font.body
+                      elide: Text.ElideRight
+                      width: parent.width
+                    }
+                    Text {
+                      visible: text !== ""
+                      text: modelData.description
+                      color: Qt.darker(root.foreground, 1.5)
+                      font.family: root.fontFamily
+                      font.pixelSize: Style.font.caption
+                      elide: Text.ElideRight
+                      width: parent.width
+                    }
+                  }
+                }
+
+                MouseArea {
+                  anchors.fill: parent
+                  hoverEnabled: true
+                  cursorShape: Qt.PointingHandCursor
+                  onPositionChanged: resultList.currentIndex = parent.index
+                  onClicked: root.toggleValue(modelData.value)
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/Ui/NumberField.qml b/shell/Ui/NumberField.qml
new file mode 100644
index 00000000..24b70f5b
--- /dev/null
+++ b/shell/Ui/NumberField.qml
@@ -0,0 +1,84 @@
+import QtQuick
+import QtQuick.Controls as QQC
+import qs.Commons
+
+Column {
+  id: root
+
+  property string label: ""
+  property int value: 0
+  property int from: 0
+  property int to: 100
+  property int stepSize: 1
+  property color foreground: Color.foreground
+  property color accent: Color.accent
+  property string fontFamily: Style.font.family
+  property real fontSize: Style.font.body
+  property real fieldWidth: Style.spacing.numberFieldWidth
+  property bool hasCursor: false
+  property bool _hovered: false
+  property alias field: spin
+
+  signal modified(int value)
+  signal hovered(bool on)
+
+  spacing: Style.spacing.md
+
+  Text {
+    visible: root.label !== ""
+    text: root.label
+    color: Qt.darker(root.foreground, 1.4)
+    font.family: root.fontFamily
+    font.pixelSize: Style.font.bodySmall
+  }
+
+  QQC.SpinBox {
+    id: spin
+    width: root.fieldWidth
+    implicitHeight: Math.max(Style.spacing.controlHeight, root.fontSize + Style.spacing.controlPaddingY * 2)
+    from: root.from
+    to: root.to
+    stepSize: root.stepSize
+    value: root.value
+    editable: true
+    font.family: root.fontFamily
+    font.pixelSize: root.fontSize
+
+    readonly property bool _focused: spin.activeFocus
+    readonly property bool _hot: root._hovered || root.hasCursor
+    readonly property var _borderSpec: Border.controlSpec(_focused ? "focus" : (_hot ? "hover-cursor" : "normal"), root.foreground, root.accent)
+
+    leftPadding: Border.left(_borderSpec) + Style.spacing.controlPaddingX
+    rightPadding: Border.right(_borderSpec) + Style.spacing.controlPaddingX
+    topPadding: Border.top(_borderSpec)
+    bottomPadding: Border.bottom(_borderSpec)
+
+    onValueModified: root.modified(value)
+
+    background: BorderSurface {
+      color: Style.controlFill(spin._focused, spin._hot, root.foreground, root.accent)
+      borderSpec: spin._borderSpec
+      radius: Style.cornerRadius
+
+      HoverHandler {
+        onHoveredChanged: {
+          root._hovered = hovered
+          root.hovered(hovered)
+        }
+      }
+    }
+
+    contentItem: TextInput {
+      text: spin.displayText
+      font: spin.font
+      color: root.foreground
+      selectionColor: Style.selectionFillFor(root.foreground, root.accent)
+      selectedTextColor: root.foreground
+      horizontalAlignment: Qt.AlignHCenter
+      verticalAlignment: Qt.AlignVCenter
+      readOnly: !spin.editable
+      validator: spin.validator
+      inputMethodHints: Qt.ImhFormattedNumbersOnly
+    }
+  }
+}
diff --git a/shell/Ui/Panel.qml b/shell/Ui/Panel.qml
new file mode 100644
index 00000000..7b7dfdf8
--- /dev/null
+++ b/shell/Ui/Panel.qml
@@ -0,0 +1,61 @@
+import QtQuick
+import Quickshell.Io
+import qs.Commons
+
+// Base item for plugin popup widgets. Many first-party plugins expose a bar
+// button plus a popup from one QML entry point; this base owns the shared
+// IPC-backed open/close lifecycle while implementations own button behavior,
+// keyboard navigation, and content.
+Item {
+  id: root
+
+  property QtObject bar: null
+  property string moduleName: ""
+  property var settings: ({})
+  property string ipcTarget: ""
+  property bool manageIpc: true
+  property alias controller: panelController
+  property bool popoutSwitching: false
+  property bool popoutSwitchClosing: false
+
+  readonly property bool opened: panelController.open
+  readonly property color barForeground: bar ? bar.barForeground : Color.foreground
+
+  function open() { panelController.show() }
+  function close() { panelController.hide() }
+  function closeForPopoutSwitch() {
+    popoutSwitchClosing = true
+    close()
+    Qt.callLater(function() { popoutSwitchClosing = false })
+  }
+  function toggle() { opened ? close() : open() }
+  function switchPanel(direction) {
+    if (bar && typeof bar.switchPanelFrom === "function") return bar.switchPanelFrom(root, direction)
+    return false
+  }
+
+  // Read a single value from this panel's inline shell.json entry, with a
+  // fallback for missing/null values. Matches BarWidget.setting().
+  function setting(name, fallback) {
+    var value = settings ? settings[name] : undefined
+    return value === undefined || value === null ? fallback : value
+  }
+
+  PanelController {
+    id: panelController
+  }
+
+  property IpcHandler _ipc: manageIpc ? ipcComponent.createObject(root) : null
+
+  property Component ipcComponent: Component {
+    IpcHandler {
+      target: root.ipcTarget
+      function open(): void { root.open() }
+      function close(): void { root.close() }
+      function show(): void { root.open() }
+      function hide(): void { root.close() }
+      function toggle(): void { root.toggle() }
+    }
+  }
+
+}
diff --git a/shell/Ui/PanelActionButton.qml b/shell/Ui/PanelActionButton.qml
new file mode 100644
index 00000000..8a1b10bc
--- /dev/null
+++ b/shell/Ui/PanelActionButton.qml
@@ -0,0 +1,99 @@
+import QtQuick
+import qs.Commons
+
+// Small (22×22 by default) icon button used at the right edge of panel rows
+// for inline actions — forget network, confirm passphrase, unpair device,
+// etc. Two visual modes are supported via `hoverColor`:
+//   - default: hoverColor === foreground → subtle foreground-tint hover
+//   - urgent:  hoverColor === bar.urgent → red-tint hover for destructive
+//              actions like forget/unpair
+//
+// `enabled` gates clicks and dims the icon. The component owns its own
+// hover state visuals; mouse hover does NOT update any panel cursor state
+// here because action buttons are not cursor targets — the row they live
+// in is.
+//
+// Set `focusable: true` to make the button keyboard-tabbable with the
+// shared hover-cursor/focus tokens. Use this
+// in form contexts where Tab walks a list
+// of controls; leave it false for the right-edge actions on panel rows
+// where the row's CursorSurface owns the keyboard cursor.
+//
+// Set `hasCursor: true` to have the button render the same hover state as
+// mouse hover — so a panel's keyboard cursor lands on it identically.
+// Use this when a PanelActionButton is itself the cursor target (rather
+// than living inside a CursorSurface row). Emits `hovered(bool)` on
+// pointer enter/leave so the panel can update its cursor state to match.
+BorderSurface {
+  id: root
+
+  property string iconText: ""
+  property string tooltipText: ""
+  property color foreground: Color.foreground
+  property color hoverColor: foreground
+  property string fontFamily: Style.font.family
+  property real fontSize: Style.font.icon
+  property real size: Math.max(Style.space(22), fontSize + Style.spacing.sm * 2)
+
+  property bool focusable: false
+  property bool hasCursor: false
+  property bool bordered: false
+
+  signal clicked()
+  signal hovered(bool isHovered)
+
+  activeFocusOnTab: focusable
+  Keys.onReturnPressed: if (focusable) root.clicked()
+  Keys.onEnterPressed: if (focusable) root.clicked()
+  Keys.onSpacePressed: if (focusable) root.clicked()
+
+  implicitWidth: size
+  implicitHeight: size
+  radius: Style.cornerRadius
+
+  readonly property bool _showFocusRing: focusable && activeFocus
+  readonly property bool _hot: (mouse.containsMouse || root.hasCursor) && root.enabled
+  readonly property var _borderSpec: _showFocusRing
+    ? Border.controlSpec("focus", hoverColor, hoverColor)
+    : (_hot && bordered
+      ? Border.controlSpec("hover-cursor", hoverColor, hoverColor)
+      : (bordered ? Border.controlSpec("normal", foreground, Color.accent) : Border.none()))
+
+  color: _showFocusRing
+    ? Style.focusFillFor(hoverColor, hoverColor)
+    : (_hot
+      ? Style.hoverFillFor(hoverColor, hoverColor)
+      : "transparent")
+  borderSpec: _borderSpec
+
+  Behavior on color { ColorAnimation { duration: 60 } }
+
+  Text {
+    anchors.centerIn: parent
+    text: root.iconText
+    color: root.enabled
+      ? (root._hot ? root.hoverColor : root.foreground)
+      : Qt.darker(root.foreground, 2.0)
+    font.family: root.fontFamily
+    font.pixelSize: root.fontSize
+  }
+
+  MouseArea {
+    id: mouse
+    anchors.fill: parent
+    hoverEnabled: true
+    cursorShape: root.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
+    enabled: root.enabled
+    onContainsMouseChanged: root.hovered(containsMouse)
+    onClicked: {
+      if (root.focusable) root.forceActiveFocus()
+      root.clicked()
+    }
+  }
+
+  PanelToolTip {
+    visible: root.tooltipText !== "" && mouse.containsMouse
+    text: root.tooltipText
+    fontFamily: root.fontFamily
+  }
+}
diff --git a/shell/Ui/PanelController.qml b/shell/Ui/PanelController.qml
new file mode 100644
index 00000000..c386640b
--- /dev/null
+++ b/shell/Ui/PanelController.qml
@@ -0,0 +1,16 @@
+import QtQuick
+// Stores the open state for a shell panel. Panel owns the public lifecycle
+// methods and IPC wiring; this object only keeps state separate from the
+// panel implementation's own properties.
+//
+// Usage:
+//   PanelController { id: panelController }
+QtObject {
+  id: root
+
+  property bool open: false
+
+  function toggle() { open = !open }
+  function show() { if (!open) open = true }
+  function hide() { open = false }
+}
diff --git a/shell/Ui/PanelHero.qml b/shell/Ui/PanelHero.qml
new file mode 100644
index 00000000..8ef8c617
--- /dev/null
+++ b/shell/Ui/PanelHero.qml
@@ -0,0 +1,94 @@
+import QtQuick
+import qs.Commons
+
+Item {
+  id: root
+
+  property Component iconComponent: null
+  property string title: ""
+  property string meta: ""
+  property string detail: ""
+  property color foreground: Color.foreground
+  property string fontFamily: Style.font.family
+  property real iconSize: Style.font.display
+  property real iconOpacity: 1.0
+  property alias metaOpacity: metaText.opacity
+
+  readonly property color dim: Qt.darker(foreground, 1.4)
+
+  width: parent ? parent.width : implicitWidth
+  implicitHeight: Math.max(iconLoader.implicitHeight, heroLabels.implicitHeight)
+
+  Loader {
+    id: iconLoader
+    sourceComponent: root.iconComponent
+    anchors.left: parent.left
+    anchors.verticalCenter: parent.verticalCenter
+    opacity: root.iconOpacity
+  }
+
+  Column {
+    id: heroLabels
+    anchors.left: iconLoader.right
+    anchors.leftMargin: Style.space(14)
+    anchors.right: parent.right
+    anchors.verticalCenter: parent.verticalCenter
+    spacing: Style.space(2)
+
+    Row {
+      id: titleRow
+      visible: root.title !== "" || detailPill.visible
+      width: parent.width
+
+      Text {
+        visible: root.title !== ""
+        text: root.title
+        width: Math.min(implicitWidth, Math.max(0, parent.width - (detailPill.visible ? detailPill.implicitWidth + Style.space(8) : 0)))
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.title
+        font.bold: true
+        elide: Text.ElideRight
+      }
+
+      Item {
+        width: Math.max(0, parent.width - parent.children[0].width - detailPill.implicitWidth)
+        height: 1
+      }
+
+      BorderSurface {
+        id: detailPill
+        visible: root.detail !== ""
+        implicitWidth: detailText.implicitWidth + Style.space(10)
+        implicitHeight: detailText.implicitHeight + Style.space(4)
+        anchors.verticalCenter: parent.verticalCenter
+        color: "transparent"
+        borderSpec: Border.controlSpec("normal", root.foreground, Color.accent)
+        radius: Style.cornerRadius
+
+        Text {
+          id: detailText
+          anchors.centerIn: parent
+          text: root.detail
+          color: root.dim
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.body
+          font.bold: true
+        }
+      }
+    }
+
+    Text {
+      id: metaText
+      width: parent.width
+      text: root.meta.toUpperCase()
+      visible: text !== ""
+      color: root.dim
+      font.family: root.fontFamily
+      font.pixelSize: Style.font.caption
+      font.bold: true
+      font.letterSpacing: 1.2
+      elide: Text.ElideRight
+    }
+  }
+}
diff --git a/shell/Ui/PanelKeyCatcher.qml b/shell/Ui/PanelKeyCatcher.qml
new file mode 100644
index 00000000..27e5bebc
--- /dev/null
+++ b/shell/Ui/PanelKeyCatcher.qml
@@ -0,0 +1,80 @@
+import QtQuick
+
+// Drop-in key dispatcher for keyboard-driven panels. Wraps panel content
+// and emits semantic signals so each panel keeps its own state machine
+// (focusSection, selectedIndex, action rules) while the boilerplate
+// key handling lives here.
+//
+// Usage:
+//   Common.KeyboardPanel {
+//     ...
+//     PanelKeyCatcher {
+//       anchors.fill: parent
+//       onMoveRequested: function(dx, dy) { root.moveCursor(dx, dy) }
+//       onActivateRequested: root.activateCursor()
+//       onCloseRequested: root.close()
+//       onDeleteRequested: root.deleteSelected()
+//       onTextKey: function(t) { if (t === "r") root.refresh() }
+//
+//       Column { ... panel content ... }
+//     }
+//   }
+//
+// Keys.priority: Keys.BeforeItem means this handler gets keys first,
+// even when a descendant has activeFocus. That's what lets Up/Down
+// arrows drive the cursor instead of being consumed by an inner
+// Flickable's built-in scroll handling. When a panel has an inline
+// editor (wifi passphrase, gallery TextField demo) the panel must
+// set `blocked: editor.activeFocus` so this handler short-circuits
+// and the editor receives keys normally.
+//
+// blocked: when true, ALL keys are forwarded to descendants without
+// triggering signals.
+Item {
+  id: root
+
+  property bool blocked: false
+
+  signal moveRequested(int dx, int dy)
+  signal activateRequested()
+  signal closeRequested()
+  signal deleteRequested()
+  signal tabRequested(int direction)
+  signal textKey(string text)
+
+  focus: true
+  Keys.priority: Keys.BeforeItem
+  Keys.onPressed: function(event) {
+    if (blocked) return
+
+    if (event.key === Qt.Key_Escape) {
+      closeRequested(); event.accepted = true; return
+    }
+    if (event.key === Qt.Key_Tab || event.key === Qt.Key_Backtab) {
+      tabRequested((event.modifiers & Qt.ShiftModifier) || event.key === Qt.Key_Backtab ? -1 : 1)
+      event.accepted = true
+      return
+    }
+    if (event.key === Qt.Key_Down || event.text === "j") {
+      moveRequested(0, 1); event.accepted = true; return
+    }
+    if (event.key === Qt.Key_Up || event.text === "k") {
+      moveRequested(0, -1); event.accepted = true; return
+    }
+    if (event.key === Qt.Key_Right || event.text === "l") {
+      moveRequested(1, 0); event.accepted = true; return
+    }
+    if (event.key === Qt.Key_Left || event.text === "h") {
+      moveRequested(-1, 0); event.accepted = true; return
+    }
+    if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter || event.key === Qt.Key_Space) {
+      activateRequested(); event.accepted = true; return
+    }
+    if (event.text === "x" || event.text === "X") {
+      deleteRequested(); event.accepted = true; return
+    }
+    if (event.text && event.text.length === 1) {
+      textKey(event.text)
+    }
+  }
+}
diff --git a/shell/Ui/PanelSectionHeader.qml b/shell/Ui/PanelSectionHeader.qml
new file mode 100644
index 00000000..249842b7
--- /dev/null
+++ b/shell/Ui/PanelSectionHeader.qml
@@ -0,0 +1,18 @@
+import QtQuick
+import qs.Commons
+
+// Small-caps-style label that introduces a panel section ("DNS provider",
+// "Wi-Fi networks", "Output device", "Paired devices"). Sits between a
+// PanelSeparator and the content rows.
+Text {
+  id: root
+
+  property color foreground: Color.foreground
+  property string fontFamily: Style.font.family
+  property real fontSize: Style.font.caption
+
+  color: Qt.darker(foreground, 1.4)
+  font.family: fontFamily
+  font.pixelSize: fontSize
+  font.bold: true
+}
diff --git a/shell/Ui/PanelSeparator.qml b/shell/Ui/PanelSeparator.qml
new file mode 100644
index 00000000..27a81ec3
--- /dev/null
+++ b/shell/Ui/PanelSeparator.qml
@@ -0,0 +1,18 @@
+import QtQuick
+import qs.Commons
+
+// 1px horizontal divider for panel sections. The alpha-on-foreground tint
+// keeps the rule legible against the panel background without competing
+// with text or borders.
+Rectangle {
+  id: root
+
+  property color foreground: Color.foreground
+  property real strength: 0.12
+
+  width: parent ? parent.width : implicitWidth
+  implicitWidth: 100
+  implicitHeight: 1
+  height: 1
+  color: Qt.rgba(foreground.r, foreground.g, foreground.b, strength)
+}
diff --git a/shell/Ui/PanelSlider.qml b/shell/Ui/PanelSlider.qml
new file mode 100644
index 00000000..f8359bb5
--- /dev/null
+++ b/shell/Ui/PanelSlider.qml
@@ -0,0 +1,119 @@
+import QtQuick
+import qs.Commons
+
+Item {
+  id: root
+
+  property QtObject bar: null
+  property real value: 0
+  property real minimum: 0
+  property real maximum: 1
+  property real step: 0.05
+  property bool integer: false
+  property color trackColor: bar ? Style.selectedFillFor(bar.foreground, Color.accent) : "#333"
+  property color fillColor: bar ? bar.foreground : Color.foreground
+  property color knobColor: bar ? bar.foreground : Color.foreground
+  property bool dragging: false
+  property real trackHeight: Math.max(4, Math.round(Style.spacing.controlHeight * 0.11))
+  property real knobSize: Math.max(14, Math.round(Style.spacing.controlHeight * 0.38))
+  property real liveValue: value
+
+  onValueChanged: if (!dragging) liveValue = value
+
+  signal moved(real value)
+  signal released(real value)
+
+  implicitWidth: Style.space(200)
+  implicitHeight: Math.max(Style.space(22), knobSize + Style.spacing.md)
+
+  readonly property real range: Math.max(0.0001, maximum - minimum)
+  readonly property real progress: Math.max(0, Math.min(1, (liveValue - minimum) / range))
+  readonly property bool _hot: mouseArea.containsMouse || root.dragging
+
+  Rectangle {
+    id: track
+    anchors.verticalCenter: parent.verticalCenter
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: root.trackHeight
+    radius: height / 2
+    color: root.trackColor
+  }
+
+  Rectangle {
+    id: fill
+    anchors.verticalCenter: track.verticalCenter
+    anchors.left: track.left
+    height: track.height
+    radius: track.radius
+    color: root.fillColor
+    width: track.width * root.progress
+
+    Behavior on width {
+      enabled: !root.dragging
+      NumberAnimation { duration: 140; easing.type: Easing.OutCubic }
+    }
+  }
+
+  BorderSurface {
+    id: knob
+    width: root.knobSize
+    height: root.knobSize
+    radius: root.knobSize / 2
+    color: root.knobColor
+    borderSpec: Border.flat(root.bar ? root.bar.background : "#101315", Math.max(1, Style.space(2)))
+    anchors.verticalCenter: track.verticalCenter
+    x: Math.max(0, Math.min(track.width - width, track.width * root.progress - width / 2))
+    scale: root._hot ? 1.15 : 1.0
+
+    Behavior on x {
+      enabled: !root.dragging
+      NumberAnimation { duration: 140; easing.type: Easing.OutCubic }
+    }
+
+    Behavior on scale {
+      NumberAnimation { duration: 110; easing.type: Easing.OutCubic }
+    }
+  }
+
+  MouseArea {
+    id: mouseArea
+    anchors.fill: parent
+    hoverEnabled: true
+    cursorShape: Qt.PointingHandCursor
+    acceptedButtons: Qt.LeftButton
+
+    function valueFromX(x) {
+      var clamped = Math.max(0, Math.min(track.width, x))
+      var raw = root.minimum + (clamped / track.width) * root.range
+      if (root.integer) raw = Math.round(raw)
+      return Math.max(root.minimum, Math.min(root.maximum, raw))
+    }
+
+    onPressed: function(mouse) {
+      root.dragging = true
+      var next = valueFromX(mouse.x)
+      root.liveValue = next
+      root.moved(next)
+    }
+    onPositionChanged: function(mouse) {
+      if (!root.dragging) return
+      var next = valueFromX(mouse.x)
+      root.liveValue = next
+      root.moved(next)
+    }
+    onReleased: function(mouse) {
+      root.dragging = false
+      root.released(root.liveValue)
+      root.liveValue = root.value
+    }
+    onWheel: function(wheel) {
+      var delta = wheel.angleDelta.y > 0 ? root.step : -root.step
+      var next = Math.max(root.minimum, Math.min(root.maximum, root.liveValue + delta))
+      if (root.integer) next = Math.round(next)
+      root.liveValue = next
+      root.moved(next)
+      root.released(next)
+    }
+  }
+}
diff --git a/shell/Ui/PanelToolTip.qml b/shell/Ui/PanelToolTip.qml
new file mode 100644
index 00000000..139b6cf0
--- /dev/null
+++ b/shell/Ui/PanelToolTip.qml
@@ -0,0 +1,48 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Commons
+
+// Styled wrapper around Qt Quick Controls ToolTip. Drop-in: declare inside
+// the hovered item and bind `visible` to the hover state, e.g.
+//   PanelToolTip {
+//     visible: mouse.containsMouse
+//     text: "Forget network"
+//   }
+//
+// Defaults pull from [tooltip] in shell.toml via Color.tooltip.*. Override
+// the panel* properties per-instance only when you need a tooltip that
+// intentionally diverges from the theme.
+//
+// Property names are prefixed `panel*` to avoid clashing with ToolTip's
+// built-in `background`/`font` properties.
+ToolTip {
+  id: root
+
+  property color panelForeground: Color.tooltip.text
+  property color panelBackground: Color.tooltip.background
+  property color panelBorder: Color.tooltip.border
+  property string fontFamily: Style.font.family
+  property real fontSize: Style.font.bodySmall
+
+  readonly property var panelBorderSpec: Border.localOrSurfaceSpec("tooltip", "border", panelBorder, Color.tooltip.border, Style.normalBorderWidth)
+
+  delay: 400
+  padding: 0
+
+  background: BorderSurface {
+    color: root.panelBackground
+    borderSpec: root.panelBorderSpec
+    radius: Style.cornerRadius
+  }
+
+  contentItem: Text {
+    text: root.text
+    color: root.panelForeground
+    font.family: root.fontFamily
+    font.pixelSize: root.fontSize
+    leftPadding: Border.left(root.panelBorderSpec) + Style.spacing.controlPaddingX
+    rightPadding: Border.right(root.panelBorderSpec) + Style.spacing.controlPaddingX
+    topPadding: Border.top(root.panelBorderSpec) + Style.spacing.controlPaddingY
+    bottomPadding: Border.bottom(root.panelBorderSpec) + Style.spacing.controlPaddingY
+  }
+}
diff --git a/shell/Ui/PopupCard.qml b/shell/Ui/PopupCard.qml
new file mode 100644
index 00000000..ef72fe16
--- /dev/null
+++ b/shell/Ui/PopupCard.qml
@@ -0,0 +1,175 @@
+import QtQuick
+import Quickshell
+import Quickshell.Hyprland
+import qs.Commons
+
+PopupWindow {
+  id: root
+
+  required property Item anchorItem
+  required property QtObject bar
+  property var owner: null
+  property int margin: Style.gapsOut
+  property int padding: Style.spacing.popupPadding
+  property int contentWidth: Style.space(280)
+  property int contentHeight: Style.space(200)
+  property color borderColor: Color.popups.border
+  property var borderSpec: Border.localOrSurfaceSpec("popups", "border", borderColor, Color.popups.border, Math.max(1, Style.space(2)))
+  property bool open: false
+  property bool centerOnBar: false
+  // "click" — uses HyprlandFocusGrab so clicking outside dismisses the popup.
+  // "hover" — passive overlay; the owning widget controls open via hover.
+  property string triggerMode: "click"
+
+  readonly property var coordinatorKey: owner || root
+  readonly property var anchorWindow: anchorItem ? anchorItem.QsWindow.window : null
+  readonly property var popupScreen: anchorWindow ? anchorWindow.screen : null
+  readonly property bool containsMouse: cardHover.hovered
+  readonly property real screenW: popupScreen ? popupScreen.width : 0
+  readonly property real screenH: popupScreen ? popupScreen.height : 0
+  readonly property real barW: anchorWindow ? anchorWindow.width : 0
+  readonly property real barH: anchorWindow ? anchorWindow.height : 0
+  readonly property real availableCardWidth: screenW > 0
+    ? Math.max(120, screenW - ((bar && (bar.position === "left" || bar.position === "right")) ? barW : 0) - root.margin * 2)
+    : 0
+  readonly property real availableCardHeight: screenH > 0
+    ? Math.max(120, screenH - ((bar && (bar.position === "top" || bar.position === "bottom")) ? barH : 0) - root.margin * 2)
+    : 0
+
+  function fittedContentWidth(width, cap) {
+    var desired = Math.max(1, Number(width) || 1)
+    var maxWidth = root.availableCardWidth > 0 ? root.availableCardWidth : desired
+    if (cap !== undefined && Number(cap) > 0) maxWidth = Math.min(maxWidth, Number(cap))
+    return Math.round(Math.min(desired, maxWidth))
+  }
+
+  function fittedContentHeight(implicitHeight, cap) {
+    var desired = Math.max(root.padding * 2, (Number(implicitHeight) || 0) + root.padding * 2)
+    var maxHeight = root.availableCardHeight > 0 ? root.availableCardHeight : desired
+    if (cap !== undefined && Number(cap) > 0) maxHeight = Math.min(maxHeight, Number(cap))
+    return Math.round(Math.min(desired, maxHeight))
+  }
+
+  function cappedContentHeight(height) {
+    var desired = Math.max(root.padding * 2, Number(height) || root.padding * 2)
+    var maxHeight = root.availableCardHeight > 0 ? root.availableCardHeight : desired
+    return Math.round(Math.min(desired, maxHeight))
+  }
+
+  function close() {
+    if (owner && "close" in owner) owner.close()
+    else root.open = false
+  }
+
+  default property alias contentItem: contentHolder.children
+
+  visible: open || card.opacity > 0
+  color: "transparent"
+  implicitWidth: contentWidth
+  implicitHeight: contentHeight
+
+  onOpenChanged: {
+    if (!bar) return
+    if (open) bar.requestPopout(coordinatorKey)
+    else if (bar.activePopout === coordinatorKey) bar.releasePopout(coordinatorKey)
+  }
+
+  // Outside-click dismissal via Hyprland's focus grab. While `active`, input
+  // is routed only to the listed windows; clicking anywhere else clears the
+  // grab and we close the popup. Skipped for hover-mode popups so the cursor
+  // can move freely between the trigger and the popup.
+  HyprlandFocusGrab {
+    active: root.open && root.triggerMode === "click"
+    windows: root.anchorWindow ? [root, root.anchorWindow] : [root]
+    onCleared: root.close()
+  }
+
+  anchor {
+    id: popupAnchor
+    window: anchorItem ? anchorItem.QsWindow.window : null
+    adjustment: PopupAdjustment.Slide
+    edges: Edges.Top | Edges.Left
+    gravity: Edges.Bottom | Edges.Right
+    rect.width: 1
+    rect.height: 1
+
+    onAnchoring: {
+      if (!root.anchorItem || !root.bar) return
+
+      var target = root.anchorItem
+      var popupWidth = root.implicitWidth
+      var popupHeight = root.implicitHeight
+      var localX = target.width / 2 - popupWidth / 2
+      var localY = target.height + root.margin
+
+      if (root.bar.position === "bottom") {
+        localY = -popupHeight - root.margin
+      } else if (root.bar.position === "left") {
+        localX = target.width + root.margin
+        localY = target.height / 2 - popupHeight / 2
+      } else if (root.bar.position === "right") {
+        localX = -popupWidth - root.margin
+        localY = target.height / 2 - popupHeight / 2
+      }
+
+      var window = target.QsWindow.window
+      if (!window) return
+
+      if (root.centerOnBar) {
+        var cx = 0;
+        var cy = 0;
+        if (root.bar.position === "top" || root.bar.position === "bottom") {
+          cx = window.width / 2 - popupWidth / 2
+          cy = root.bar.position === "bottom" ? -popupHeight - root.margin : window.height + root.margin
+          cx = Math.max(root.margin, Math.min(cx, window.width - popupWidth - root.margin))
+        } else {
+          cx = root.bar.position === "left" ? window.width + root.margin : -popupWidth - root.margin
+          cy = window.height / 2 - popupHeight / 2
+          cy = Math.max(root.margin, Math.min(cy, window.height - popupHeight - root.margin))
+        }
+
+        popupAnchor.rect.x = Math.round(cx)
+        popupAnchor.rect.y = Math.round(cy)
+        return
+      }
+
+      var point = window.contentItem.mapFromItem(target, localX, localY)
+
+      if (root.bar.position === "top" || root.bar.position === "bottom") {
+        point.x = Math.max(root.margin, Math.min(point.x, window.width - popupWidth - root.margin))
+      } else {
+        point.y = Math.max(root.margin, Math.min(point.y, window.height - popupHeight - root.margin))
+      }
+
+      popupAnchor.rect.x = Math.round(point.x)
+      popupAnchor.rect.y = Math.round(point.y)
+    }
+  }
+
+  BorderSurface {
+    id: card
+    anchors.fill: parent
+    color: Color.popups.background
+    borderSpec: root.borderSpec
+    padding: root.padding
+    radius: Style.cornerRadius
+    opacity: root.open ? 1.0 : 0
+
+    Behavior on opacity {
+      NumberAnimation { duration: 140; easing.type: Easing.OutCubic }
+    }
+
+    Item {
+      id: contentHolder
+      anchors.fill: parent
+      anchors.topMargin: card.contentTopInset
+      anchors.rightMargin: card.contentRightInset
+      anchors.bottomMargin: card.contentBottomInset
+      anchors.leftMargin: card.contentLeftInset
+    }
+
+    HoverHandler {
+      id: cardHover
+    }
+  }
+}
diff --git a/shell/Ui/SearchableDropdown.qml b/shell/Ui/SearchableDropdown.qml
new file mode 100644
index 00000000..9cf0aa49
--- /dev/null
+++ b/shell/Ui/SearchableDropdown.qml
@@ -0,0 +1,348 @@
+import QtQuick
+import QtQuick.Controls as QQC
+import qs.Commons
+
+// Searchable single-select dropdown. Same trigger shape as Dropdown, but
+// the popup leads with an embedded TextField that filters the option
+// list in real time. Use for pickers with enough options that scanning
+// is friction.
+//
+// Filtering is case-insensitive substring against each option's label.
+// Options can be string[] or [{ value, label, description? }] — the same
+// shape Dropdown accepts. The filter clears whenever the popup closes.
+//
+// Keyboard: Tab to focus the trigger, Enter/Space opens (search focused
+// immediately). Down arrow from the search jumps to the first match;
+// Up from the first match returns to the search. Enter selects, Esc
+// closes (and clears the filter).
+Item {
+  id: root
+
+  property string label: ""
+  property string value: ""
+  property var options: []
+  property string placeholderText: "Search..."
+  property string emptyText: "No matches"
+  property string triggerLabel: ""
+
+  property color foreground: Color.popups.text
+  property color background: Color.popups.background
+  property color popupBorder: Color.popups.border
+  property color accent: Color.accent
+  readonly property var popupBorderSpec: Border.localOrSurfaceSpec("popups", "border", popupBorder, Color.popups.border, Style.normalBorderWidth)
+  property string fontFamily: Style.font.family
+  property int rowHeight: Style.spacing.controlHeight
+  property int popupRowHeight: Style.spacing.popupRowHeight
+  property int popupMinHeight: Style.spacing.searchablePopupMinHeight
+  property bool showLabel: true
+
+  // Panel-cursor flag. When true, the trigger renders the shared
+  // hover-cursor state. Active Qt focus defaults to the same visuals.
+  // Emits `hovered(bool)` on pointer enter/leave so the panel can keep
+  // its cursor state in sync with the mouse.
+  property bool hasCursor: false
+
+  // popupOpen + open()/close()/toggle() let a parent panel know when the
+  // dropdown owns keys (search field + result list are active) and
+  // suspend its own keyCatcher so typing into the filter doesn't drive
+  // the panel cursor.
+  readonly property bool popupOpen: popup.opened
+  function open() { popup.open() }
+  function close() { popup.close() }
+  function toggle() { popup.opened ? popup.close() : popup.open() }
+
+  signal changed(string value)
+  signal hovered(bool isHovered)
+
+  function optionValue(o) {
+    return (o && typeof o === "object") ? String(o.value) : String(o)
+  }
+  function optionLabel(o) {
+    return (o && typeof o === "object") ? String(o.label) : String(o)
+  }
+  function optionDescription(o) {
+    return (o && typeof o === "object" && o.description) ? String(o.description) : ""
+  }
+  function currentLabel() {
+    for (var i = 0; i < options.length; i++) {
+      if (optionValue(options[i]) === value) return optionLabel(options[i])
+    }
+    return value
+  }
+
+  property var filtered: options
+  function recomputeFiltered() {
+    var q = searchField.text.toLowerCase()
+    if (!q) { filtered = options; return }
+    var out = []
+    for (var i = 0; i < options.length; i++) {
+      var lbl = optionLabel(options[i]).toLowerCase()
+      var desc = optionDescription(options[i]).toLowerCase()
+      if (lbl.indexOf(q) !== -1 || desc.indexOf(q) !== -1) out.push(options[i])
+    }
+    filtered = out
+  }
+
+  onOptionsChanged: recomputeFiltered()
+
+  implicitWidth: Style.spacing.searchableDropdownWidth
+  implicitHeight: showLabel && label !== "" ? rowHeight + Style.spacing.huge : rowHeight
+
+  Column {
+    anchors.fill: parent
+    spacing: Style.spacing.labelGap
+
+    Text {
+      visible: root.showLabel && root.label !== ""
+      text: root.label
+      color: Qt.darker(root.foreground, 1.4)
+      font.family: root.fontFamily
+      font.pixelSize: Style.font.caption
+      font.bold: true
+    }
+
+    BorderSurface {
+      id: trigger
+      width: parent.width
+      height: root.rowHeight
+      radius: Style.cornerRadius
+
+      readonly property bool _focused: trigger.activeFocus
+      readonly property bool _hot: triggerHover.hovered || root.hasCursor
+      readonly property var _borderSpec: Border.controlSpec(trigger._focused ? "focus" : (trigger._hot ? "hover-cursor" : "normal"), root.foreground, root.accent)
+
+      color: Style.controlFill(trigger._focused, trigger._hot, root.foreground, root.accent)
+      borderSpec: _borderSpec
+
+      activeFocusOnTab: true
+
+      HoverHandler {
+        id: triggerHover
+        onHoveredChanged: root.hovered(hovered)
+      }
+
+      Keys.onPressed: function(event) {
+        if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter
+            || event.key === Qt.Key_Space || event.key === Qt.Key_Down) {
+          popup.opened ? popup.close() : popup.open()
+          event.accepted = true
+        } else if (event.key === Qt.Key_Escape && popup.opened) {
+          popup.close(); event.accepted = true
+        }
+      }
+
+      Text {
+        anchors.left: parent.left
+        anchors.right: chevron.left
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.leftMargin: trigger.borderLeft + Style.spacing.controlPaddingX
+        anchors.rightMargin: trigger.borderRight + Style.spacing.md
+        text: root.currentLabel() || root.triggerLabel || root.placeholderText
+        color: (root.currentLabel() || root.triggerLabel) ? root.foreground : Qt.darker(root.foreground, 1.5)
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        elide: Text.ElideRight
+      }
+
+      Text {
+        id: chevron
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.rightMargin: trigger.borderRight + Style.spacing.controlGap
+        text: "󰅀"
+        color: Qt.darker(root.foreground, 1.2)
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+      }
+
+      MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        onClicked: {
+          trigger.forceActiveFocus()
+          popup.opened ? popup.close() : popup.open()
+        }
+      }
+
+      QQC.Popup {
+        id: popup
+        x: 0
+        y: trigger.height + Style.spacing.xxs
+        width: trigger.width
+        implicitHeight: Math.max(root.popupMinHeight,
+                                 Math.min(resultList.contentHeight + Style.space(50),
+                                          root.popupRowHeight * 6 + 5 * Style.spacing.labelGap + Style.space(50)))
+        padding: Style.spacing.hairline
+        leftPadding: Border.left(root.popupBorderSpec) + Style.spacing.hairline
+        rightPadding: Border.right(root.popupBorderSpec) + Style.spacing.hairline
+        topPadding: Border.top(root.popupBorderSpec) + Style.spacing.hairline
+        bottomPadding: Border.bottom(root.popupBorderSpec) + Style.spacing.hairline
+        focus: true
+
+        background: BorderSurface {
+          color: root.background
+          borderSpec: root.popupBorderSpec
+          radius: Style.cornerRadius
+        }
+
+        onOpened: {
+          searchField.text = ""
+          root.recomputeFiltered()
+          Qt.callLater(function() { searchField.forceActiveFocus() })
+        }
+        onClosed: searchField.text = ""
+
+        contentItem: Column {
+          spacing: 0
+
+          Item {
+            id: searchHeader
+            width: parent.width
+            height: root.popupRowHeight + Style.spacing.controlPaddingX
+
+            TextField {
+              id: searchField
+              anchors.fill: parent
+              anchors.margins: Style.spacing.md
+              placeholderText: root.placeholderText
+              foreground: root.foreground
+              accent: root.accent
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.body
+
+              onTextChanged: {
+                root.recomputeFiltered()
+                if (resultList.count > 0) resultList.currentIndex = 0
+              }
+
+              Keys.onPressed: function(event) {
+                if (event.key === Qt.Key_Escape) {
+                  popup.close(); event.accepted = true
+                } else if (event.key === Qt.Key_Down) {
+                  if (resultList.count > 0) {
+                    resultList.currentIndex = 0
+                    resultList.forceActiveFocus()
+                  }
+                  event.accepted = true
+                } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+                  if (resultList.count > 0) {
+                    resultList.currentIndex = 0
+                    resultList.selectCurrent()
+                  }
+                  event.accepted = true
+                }
+              }
+            }
+          }
+
+          Rectangle {
+            width: parent.width
+            height: 1
+            color: Util.alpha(root.foreground, 0.10)
+          }
+
+          Item {
+            width: parent.width
+            height: popup.height - searchHeader.height - Style.spacing.xxs - 1
+
+            Text {
+              anchors.centerIn: parent
+              visible: resultList.count === 0
+              text: root.emptyText
+              color: Qt.darker(root.foreground, 1.6)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.body
+            }
+
+            ListView {
+              id: resultList
+              anchors.fill: parent
+              spacing: Style.spacing.labelGap
+              clip: true
+              boundsBehavior: Flickable.StopAtBounds
+              model: root.filtered
+              currentIndex: -1
+              keyNavigationEnabled: false
+
+              function selectCurrent() {
+                if (currentIndex < 0 || currentIndex >= root.filtered.length) return
+                var v = root.optionValue(root.filtered[currentIndex])
+                root.value = v
+                root.changed(v)
+                popup.close()
+              }
+
+              Keys.priority: Keys.BeforeItem
+              Keys.onPressed: function(event) {
+                if (event.key === Qt.Key_Escape) {
+                  popup.close(); event.accepted = true
+                } else if (event.key === Qt.Key_Down || event.text === "j") {
+                  if (resultList.currentIndex >= resultList.count - 1) {
+                    event.accepted = true; return
+                  }
+                  resultList.currentIndex = resultList.currentIndex + 1
+                  event.accepted = true
+                } else if (event.key === Qt.Key_Up || event.text === "k") {
+                  if (resultList.currentIndex <= 0) {
+                    searchField.forceActiveFocus()
+                    event.accepted = true; return
+                  }
+                  resultList.currentIndex = resultList.currentIndex - 1
+                  event.accepted = true
+                } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+                  resultList.selectCurrent(); event.accepted = true
+                }
+              }
+
+              delegate: Rectangle {
+                required property var modelData
+                required property int index
+                width: resultList.width
+                height: Math.max(root.popupRowHeight, rowContent.implicitHeight + Style.spacing.rowPaddingX)
+                color: index === resultList.currentIndex
+                  ? Style.hoverFillFor(root.foreground, root.accent)
+                  : "transparent"
+
+                Column {
+                  id: rowContent
+                  anchors.left: parent.left
+                  anchors.right: parent.right
+                  anchors.verticalCenter: parent.verticalCenter
+                  anchors.leftMargin: Style.spacing.controlPaddingX
+                  anchors.rightMargin: Style.spacing.controlPaddingX
+                  spacing: Style.spacing.xxs
+
+                  Text {
+                    text: root.optionLabel(modelData)
+                    color: index === resultList.currentIndex ? Style.hoverStateColor(root.foreground, root.accent) : root.foreground
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.body
+                    elide: Text.ElideRight
+                    width: parent.width
+                  }
+                  Text {
+                    visible: text !== ""
+                    text: root.optionDescription(modelData)
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.caption
+                    elide: Text.ElideRight
+                    width: parent.width
+                  }
+                }
+
+                MouseArea {
+                  anchors.fill: parent
+                  hoverEnabled: true
+                  cursorShape: Qt.PointingHandCursor
+                  onPositionChanged: resultList.currentIndex = parent.index
+                  onClicked: resultList.selectCurrent()
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/Ui/TextField.qml b/shell/Ui/TextField.qml
new file mode 100644
index 00000000..8d4183f6
--- /dev/null
+++ b/shell/Ui/TextField.qml
@@ -0,0 +1,57 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Commons
+
+// Single-line text input with the kit's focus + selection styling. Inherits
+// from Qt Quick Controls TextField so the underlying type's API (text,
+// placeholderText, accepted, editingFinished, validator, ...) is available
+// to callers without re-exposing each property.
+//
+// Defaults bind to qs.Commons.Color so a caller with no theme overrides
+// just works; foreground / accent / selectionTint can be overridden per
+// instance. activeFocus and mouse hover / panel cursor use the same
+// hover-cursor defaults, so text inputs match Button, Toggle, and Dropdown.
+//
+// Sizing is driven by font.pixelSize + verticalPadding. The default 30px
+// implicitHeight fits dialog forms; inline callers (wifi's row-embedded
+// passphrase prompt) drop verticalPadding to match a 22-26px row.
+TextField {
+  id: root
+
+  property color foreground: Color.foreground
+  property color accent: Color.accent
+  property color selectionTint: Style.selectionFillFor(foreground, accent)
+  property bool password: false
+  property real horizontalPadding: Style.spacing.controlPaddingX
+  property real verticalPadding: Style.spacing.inputPaddingY
+
+  // Panel-cursor flag. When true (and the field isn't already focused),
+  // the background paints the shared hover/cursor state.
+  // For mouse-enter/leave the consumer reads QQC TextField's inherited
+  // `hovered` property (via onHoveredChanged) — we don't add a sibling
+  // signal because the inherited property would shadow it.
+  property bool hasCursor: false
+
+  readonly property bool _focused: activeFocus
+  readonly property bool _hot: hovered || hasCursor
+  readonly property var _borderSpec: Border.controlSpec(_focused ? "focus" : (_hot ? "hover-cursor" : "normal"), root.foreground, root.accent)
+
+  echoMode: password ? TextInput.Password : TextInput.Normal
+  font.family: Style.font.family
+  font.pixelSize: Style.font.body
+  color: foreground
+  selectionColor: selectionTint
+  selectedTextColor: foreground
+  placeholderTextColor: Qt.darker(foreground, 1.6)
+
+  leftPadding: horizontalPadding + Border.left(_borderSpec)
+  rightPadding: horizontalPadding + Border.right(_borderSpec)
+  topPadding: verticalPadding + Border.top(_borderSpec)
+  bottomPadding: verticalPadding + Border.bottom(_borderSpec)
+
+  background: BorderSurface {
+    color: Style.controlFill(root._focused, root._hot, root.foreground, root.accent)
+    borderSpec: root._borderSpec
+    radius: Style.cornerRadius
+  }
+}
diff --git a/shell/Ui/Toggle.qml b/shell/Ui/Toggle.qml
new file mode 100644
index 00000000..0933508f
--- /dev/null
+++ b/shell/Ui/Toggle.qml
@@ -0,0 +1,137 @@
+import QtQuick
+import qs.Commons
+
+// Labeled toggle row: title + optional description on the left, a switch
+// on the right. Clicking anywhere on the row emits `clicked()`; consumers
+// flip `checked` in response (the component is stateless about the actual
+// value so it composes cleanly with model-driven UI).
+//
+// Cursor and focus styling match the rest of the kit: hasCursor / mouse
+// hover and activeFocus share the hover-cursor defaults.
+//
+// `rounded` auto-detects from Style.cornerRadius so the switch follows
+// the theme: pill shape when Hyprland corners are rounded, square on sharp.
+// Callers can override per-instance.
+BorderSurface {
+  id: root
+
+  property string label: ""
+  property string description: ""
+  property bool checked: false
+
+  // Panel-cursor flag. Same role as Button.hasCursor:
+  // panels with their own keyboard cursor bind this to drive the highlight
+  // separately from activeFocus. Visuals use the same hover-cursor tokens.
+  property bool hasCursor: false
+
+  // Switch shape follows the theme by default: pill on round, square on sharp.
+  // Override per-instance if a caller wants the opposite.
+  property bool rounded: Style.cornerRadius > 0
+
+  property color foreground: Color.foreground
+  property color accent: Color.accent
+  property string fontFamily: Style.font.family
+  property real titleSize: Style.font.subtitle
+  property real descriptionSize: Style.font.caption
+
+  signal clicked()
+  signal hovered(bool isHovered)
+
+  activeFocusOnTab: true
+  Keys.onReturnPressed: root.clicked()
+  Keys.onEnterPressed: root.clicked()
+  Keys.onSpacePressed: root.clicked()
+
+  readonly property int trackHeight: Math.max(22, Math.round(Style.spacing.controlHeight * 0.55))
+  readonly property int trackWidth: Math.max(42, Math.round(trackHeight * 1.9))
+  readonly property int knobSize: Math.max(16, Math.round(trackHeight * 0.72))
+  readonly property int knobInset: Math.max(2, Math.round((trackHeight - knobSize) / 2))
+
+  implicitHeight: Math.max(54, content.implicitHeight + Style.spacing.huge)
+  implicitWidth: Style.space(240)
+  radius: Style.cornerRadius
+
+  readonly property bool _hot: hasCursor || mouse.containsMouse
+  readonly property var _borderSpec: Border.controlSpec(activeFocus ? "focus" : (_hot ? "hover-cursor" : "normal"), foreground, accent)
+
+  color: Style.controlFill(activeFocus, _hot, foreground, accent)
+  borderSpec: _borderSpec
+
+  Behavior on color { ColorAnimation { duration: 100 } }
+
+  Row {
+    id: content
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.verticalCenter: parent.verticalCenter
+    anchors.leftMargin: root.borderLeft + Style.spacing.rowPaddingX
+    anchors.rightMargin: root.borderRight + Style.spacing.rowPaddingX
+    spacing: Style.spacing.rowPaddingX
+
+    Column {
+      width: parent.width - track.width - parent.spacing
+      spacing: Style.spacing.xs
+      anchors.verticalCenter: parent.verticalCenter
+
+      Text {
+        text: root.label
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: root.titleSize
+        font.bold: true
+        elide: Text.ElideRight
+        width: parent.width
+      }
+
+      Text {
+        visible: root.description !== ""
+        text: root.description
+        color: Qt.darker(root.foreground, 1.5)
+        font.family: root.fontFamily
+        font.pixelSize: root.descriptionSize
+        wrapMode: Text.WordWrap
+        width: parent.width
+      }
+    }
+
+    BorderSurface {
+      id: track
+      width: root.trackWidth
+      height: root.trackHeight
+      radius: root.rounded ? height / 2 : 0
+      color: root.checked
+        ? Style.selectedFillFor(root.foreground, root.accent)
+        : Style.normalFillFor(root.foreground, root.accent)
+      borderSpec: root.checked
+        ? Border.controlSpec("selected", root.foreground, root.accent)
+        : Border.controlSpec("normal", root.foreground, root.accent)
+      anchors.verticalCenter: parent.verticalCenter
+
+      Behavior on color { ColorAnimation { duration: 120 } }
+
+      Rectangle {
+        width: root.knobSize
+        height: root.knobSize
+        radius: root.rounded ? height / 2 : 0
+        x: root.checked ? track.width - width - root.knobInset : root.knobInset
+        y: root.knobInset
+        color: root.checked ? Style.selectedStateColor(root.foreground, root.accent) : Qt.darker(root.foreground, 1.25)
+
+        Behavior on x { NumberAnimation { duration: 120; easing.type: Easing.OutCubic } }
+        Behavior on color { ColorAnimation { duration: 120 } }
+      }
+    }
+  }
+
+  MouseArea {
+    id: mouse
+    anchors.fill: parent
+    hoverEnabled: true
+    cursorShape: Qt.PointingHandCursor
+    onClicked: root.clicked()
+  }
+
+  HoverHandler {
+    onHoveredChanged: root.hovered(hovered)
+  }
+}
diff --git a/shell/Ui/WidgetButton.qml b/shell/Ui/WidgetButton.qml
new file mode 100644
index 00000000..951cb4af
--- /dev/null
+++ b/shell/Ui/WidgetButton.qml
@@ -0,0 +1,115 @@
+import QtQuick
+import qs.Commons
+
+Item {
+  id: root
+
+  property var bar: null
+  property string text: ""
+  property string fontFamily: bar ? bar.fontFamily : Style.font.family
+  property real fontSize: Style.font.body
+  property color foreground: bar ? bar.barForeground : Color.foreground
+  property color activeColor: bar ? bar.urgent : Color.urgent
+  property bool active: false
+  property real horizontalMargin: 8.5
+  property real rightExtraMargin: 0
+  property real verticalPadding: 6
+  property real fixedWidth: -1
+  property real fixedHeight: -1
+  property real textRotation: 0
+  property bool keepSpace: false
+  property bool dimmed: false
+  property bool concealed: false
+  property bool interactive: true
+  property bool pressable: true
+  property bool useActiveColor: true
+  property bool maintainIndicatorReveal: false
+  property var revealHost: bar
+  property string tooltipText: ""
+  property var registeredBar: null
+
+  signal pressed(int button)
+  signal wheelMoved(int delta)
+
+  function triggerPress(button) {
+    if (root.bar) root.bar.hideTooltip(root)
+    root.pressed(button)
+  }
+
+  function hideOwnTooltip() {
+    if (root.bar) root.bar.hideTooltip(root)
+  }
+
+  function syncClickRegistration() {
+    if (registeredBar && registeredBar.unregisterClickTarget) registeredBar.unregisterClickTarget(root)
+    registeredBar = root.bar
+    if (registeredBar && registeredBar.registerClickTarget) registeredBar.registerClickTarget(root)
+  }
+
+  onBarChanged: syncClickRegistration()
+  onVisibleChanged: if (!visible) hideOwnTooltip()
+  onInteractiveChanged: if (!interactive) hideOwnTooltip()
+  onConcealedChanged: if (concealed) hideOwnTooltip()
+  Component.onCompleted: syncClickRegistration()
+  Component.onDestruction: if (registeredBar && registeredBar.unregisterClickTarget) registeredBar.unregisterClickTarget(root)
+
+  readonly property bool vertical: bar ? bar.vertical : false
+  readonly property int barSize: bar ? bar.barSize : Style.bar.sizeHorizontal
+  readonly property real scaledHorizontalMargin: Style.spaceReal(horizontalMargin)
+  readonly property real scaledRightExtraMargin: Style.spaceReal(rightExtraMargin)
+  readonly property real scaledVerticalPadding: Style.spaceReal(verticalPadding)
+  readonly property bool tooltipHovered: visible && interactive && !concealed && mouseArea.containsMouse
+
+  visible: text !== "" || keepSpace
+  opacity: text === "" || concealed ? 0 : (dimmed ? 0.45 : 1)
+  implicitWidth: fixedWidth > 0 ? fixedWidth : (vertical ? barSize : Math.max(12, label.implicitWidth + scaledHorizontalMargin * 2 + scaledRightExtraMargin))
+  implicitHeight: fixedHeight > 0 ? fixedHeight : (vertical ? Math.max(12, label.implicitHeight + scaledVerticalPadding * 2) : barSize)
+
+  Behavior on opacity {
+    NumberAnimation { duration: 140; easing.type: Easing.OutCubic }
+  }
+
+  Text {
+    id: label
+    anchors.centerIn: parent
+    anchors.horizontalCenterOffset: root.vertical ? 0 : -root.scaledRightExtraMargin / 2
+    text: root.text
+    color: root.active && root.useActiveColor ? root.activeColor : root.foreground
+    font.family: root.fontFamily
+    font.pixelSize: root.fontSize
+    renderType: Text.NativeRendering
+    rotation: root.textRotation
+    horizontalAlignment: Text.AlignHCenter
+    verticalAlignment: Text.AlignVCenter
+
+    Behavior on color {
+      enabled: !root.bar || root.bar.foregroundAnimationEnabled
+      ColorAnimation { duration: 160 }
+    }
+  }
+
+  MouseArea {
+    id: mouseArea
+    anchors.fill: parent
+    acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
+    enabled: root.interactive
+    hoverEnabled: true
+    cursorShape: root.pressable ? Qt.PointingHandCursor : Qt.ArrowCursor
+    onEntered: {
+      if (root.bar) {
+        root.bar.showTooltip(root, root.tooltipText)
+      }
+      if (root.maintainIndicatorReveal && root.revealHost && root.revealHost.setIndicatorItemHovered)
+        root.revealHost.setIndicatorItemHovered(true)
+    }
+    onExited: {
+      if (root.bar) {
+        root.bar.hideTooltip(root)
+      }
+      if (root.maintainIndicatorReveal && root.revealHost && root.revealHost.setIndicatorItemHovered)
+        root.revealHost.setIndicatorItemHovered(false)
+    }
+    onClicked: function(mouse) { if (root.pressable) root.triggerPress(mouse.button) }
+    onWheel: function(wheel) { root.wheelMoved(wheel.angleDelta.y) }
+  }
+}
diff --git a/shell/Ui/qmldir b/shell/Ui/qmldir
new file mode 100644
index 00000000..2e25f4e5
--- /dev/null
+++ b/shell/Ui/qmldir
@@ -0,0 +1,28 @@
+module qs.Ui
+
+BarIndicator 1.0 BarIndicator.qml
+BarWidget 1.0 BarWidget.qml
+BorderOverlay 1.0 BorderOverlay.qml
+BorderSurface 1.0 BorderSurface.qml
+Button 1.0 Button.qml
+ButtonGroup 1.0 ButtonGroup.qml
+ConfirmDialog 1.0 ConfirmDialog.qml
+CursorSurface 1.0 CursorSurface.qml
+Dropdown 1.0 Dropdown.qml
+KeyboardPanel 1.0 KeyboardPanel.qml
+MultiSelect 1.0 MultiSelect.qml
+NumberField 1.0 NumberField.qml
+Panel 1.0 Panel.qml
+PanelActionButton 1.0 PanelActionButton.qml
+PanelController 1.0 PanelController.qml
+PanelKeyCatcher 1.0 PanelKeyCatcher.qml
+PanelHero 1.0 PanelHero.qml
+PanelSectionHeader 1.0 PanelSectionHeader.qml
+PanelSeparator 1.0 PanelSeparator.qml
+PanelSlider 1.0 PanelSlider.qml
+PanelToolTip 1.0 PanelToolTip.qml
+PopupCard 1.0 PopupCard.qml
+SearchableDropdown 1.0 SearchableDropdown.qml
+TextField 1.0 TextField.qml
+Toggle 1.0 Toggle.qml
+WidgetButton 1.0 WidgetButton.qml
diff --git a/shell/plugins/README.md b/shell/plugins/README.md
new file mode 100644
index 00000000..c452b037
--- /dev/null
+++ b/shell/plugins/README.md
@@ -0,0 +1,123 @@
+# First-party plugins
+
+These plugins ship with Omarchy and are discovered by the shell at startup.
+They use the same `manifest.json` contract as third-party plugins; the
+only difference is that the shell flags them with `__isFirstParty: true`.
+First-party non-bar plugins are always enabled; `omarchy.bar` is the default
+bar option and becomes inactive only while a third-party `kind: "bar"` plugin is
+selected. Services and keep-loaded panels are mounted at startup; other panels,
+overlays, and menus are loaded on demand.
+
+User-installed plugins live alongside these conceptually but on disk under
+`~/.config/omarchy/plugins/<plugin-id>/` rather than in this directory.
+
+| Plugin        | id                        | kinds                   | entry point                           |
+|---------------|---------------------------|-------------------------|---------------------------------------|
+| Bar           | `omarchy.bar`             | `bar`                   | `bar/Bar.qml`                         |
+| Launcher      | `omarchy.launcher`        | `overlay`               | `launcher/Launcher.qml`               |
+| Image picker  | `omarchy.image-picker`    | `overlay`               | `image-picker/ImagePicker.qml`        |
+| Emojis        | `omarchy.emojis`          | `overlay`               | `emojis/Emojis.qml`                   |
+| Clipboard mgr | `omarchy.clipboard`       | `overlay`               | `clipboard/Clipboard.qml`             |
+| Reminders     | `omarchy.reminders`       | `overlay`               | `reminders/ReminderFlow.qml`          |
+| Omarchy menu  | `omarchy.menu`            | `menu`, `bar-widget`    | `menu/Menu.qml`, `menu/BarWidget.qml` |
+| Notifications | `omarchy.notifications`   | `service`, `bar-widget` | `notifications/Service.qml`, `notifications/BarWidget.qml` |
+| Audio         | `omarchy.audio`           | `bar-widget`            | `panels/audio/Panel.qml`              |
+| Bluetooth     | `omarchy.bluetooth`       | `bar-widget`            | `panels/bluetooth/Panel.qml`          |
+| Monitor       | `omarchy.monitor`         | `bar-widget`            | `panels/monitor/Panel.qml`            |
+| Network       | `omarchy.network`         | `bar-widget`            | `panels/network/Panel.qml`            |
+| Power         | `omarchy.power`           | `bar-widget`            | `panels/power/Panel.qml`              |
+| Tailscale     | `omarchy.tailscale`       | `bar-widget`            | `panels/tailscale/Panel.qml`          |
+| Model usage   | `omarchy.model-usage`     | `bar-widget`            | `model-usage/Widget.qml`              |
+| Weather       | `omarchy.weather`         | `bar-widget`            | `panels/weather/BarWidget.qml`        |
+| Media         | `omarchy.media`           | `service`, `bar-widget` | `services/media/Service.qml`, `services/media/BarWidget.qml` |
+| Battery       | `omarchy.battery`         | `service`               | `services/battery/Service.qml`        |
+| Idle          | `omarchy.idle`            | `service`               | `services/idle/Service.qml`           |
+| Lock screen   | `omarchy.lock`            | `service`               | `lock/Service.qml`                    |
+| OSD           | `omarchy.osd`             | `panel`                 | `osd/Osd.qml`                         |
+| Polkit agent  | `omarchy.polkit`          | `service`               | `polkit/PolkitAgent.qml`              |
+
+First-party bar-only widgets also carry manifests next to their QML files,
+e.g. `bar/widgets/Clock.manifest.json`. Rich popup widgets live in their
+own plugin directories, each with its own `manifest.json`.
+
+## Bar
+
+The built-in status bar and default full-bar option. Layout lives in the
+top-level `bar:` subtree of `~/.config/omarchy/shell.json` (with the shell
+providing [`config/omarchy/shell.json`](../../config/omarchy/shell.json) when
+the user has no file). See [`bar/README.md`](bar/README.md) for the widget catalogue
+and customization schema.
+
+## Launcher
+
+Quickshell-powered launcher. It uses Quickshell's native
+`DesktopEntries` model for discovery/activation and renders inside the
+long-running shell with the legacy launcher card dimensions, colors, row
+spacing, icon sizing, and keyboard behavior. Summoned directly over shell IPC
+by the `SUPER + SPACE` binding and the Omarchy menu Apps row.
+
+## Image picker
+
+Fullscreen image-grid selector overlay. Used by `omarchy-menu-images`
+(wallpaper picker) and `omarchy-theme-switcher` (theme picker) and any
+other caller that wants to present a directory of images with previews.
+
+Two ways to drive it:
+
+- Shell-level summon: `omarchy-shell shell summon omarchy.image-picker '<jsonPayload>'`.
+  The payload can carry `imageDirs`, `imageRows`, `selectedImage`,
+  `selectionFile`, `doneFile`, `showLabels`, `filterable`. Best for
+  in-shell callers that already speak JSON.
+- Direct IPC target: `omarchy-shell image-selector open <imageDirs> <imageRowsB64> <selectedImage> <selectionFile> <doneFile> <showLabels> <filterable>`.
+  Positional args; `imageRowsB64` is base64-encoded so embedded newlines /
+  tabs survive the bash argv handoff. This is what `omarchy-menu-images`
+  uses. Colors come from the central shell theme singleton; there is no
+  per-call override surface.
+
+The selection round-trip remains file-based: callers create a
+`selection_file` and `done_file` (both `mktemp`), pass the paths, and
+poll `done_file` for existence. The plugin writes the chosen path into
+`selection_file` and touches `done_file` when it's done. `cancel` IPC
+clears it without writing a selection.
+
+The plugin has `keepLoaded: true` so the layer-shell window survives
+between summons within a single shell session.
+
+## Lock screen
+
+Session-lock surface using Quickshell's native `WlSessionLock` and two
+separate PAM services: `omarchy-lock-password` for password auth and,
+only when fingerprints are enrolled, `omarchy-lock-fingerprint` for
+fingerprint auth. It mirrors the previous lock screen field dimensions,
+colors, blurred wallpaper, placeholder, and Hyprland-driven corners.
+
+## Polkit agent
+
+Theme-aware authentication dialog for privileged actions. It uses
+Quickshell's native `Quickshell.Services.Polkit.PolkitAgent` backend and
+runs inside the long-lived `omarchy-shell` process, replacing the old
+`polkit-gnome-authentication-agent-1` autostart.
+
+## Omarchy menu
+
+Quickshell-powered Omarchy command menu.
+The menu UI lives in `menu/Menu.qml` as a first-party `menu` plugin and is
+summoned through the shell (`omarchy-shell shell summon omarchy.menu ...`),
+so it shares the long-running `omarchy-shell` process instead of starting a
+second Quickshell instance.
+
+The menu definition lives outside the shell host code:
+
+- defaults: `default/omarchy/omarchy-menu.jsonc`
+- user extensions: `~/.config/omarchy/extensions/omarchy-menu.jsonc`
+
+The shell parses both JSONC files at startup (with `watchChanges: true`
+so edits take effect without a restart), evaluates `when:` / `checked:`
+bash expressions in a single batched subprocess, and executes the
+selected `action:` string directly via `Quickshell.execDetached`. The
+long-running shell process keeps the parsed menu in memory, so the
+keybind → IPC → visible path costs ~30ms cold.
+
+## Coming soon
+
+- `omarchy.theme-switcher` — folds theme switching into the shell.
diff --git a/shell/plugins/background/Background.qml b/shell/plugins/background/Background.qml
new file mode 100644
index 00000000..e5d51831
--- /dev/null
+++ b/shell/plugins/background/Background.qml
@@ -0,0 +1,312 @@
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import QtQuick
+import QtQuick.Effects
+import QtQuick.Shapes
+import qs.Commons
+
+Item {
+  id: root
+
+  readonly property string home: Quickshell.env("HOME")
+  readonly property string currentBackgroundLink: home + "/.config/omarchy/current/background"
+
+  property string currentBackground: ""
+  property string displayedBackground: ""
+  property string incomingBackground: ""
+  property string oldBackground: ""
+  property bool finishingTransition: false
+  property int backgroundVersion: 0
+  property int revealStartedVersion: -1
+  property int pendingThemeVersion: -1
+  property string pendingColorsRaw: ""
+  property string pendingShellRaw: ""
+  property real revealProgress: 1
+
+  function imageUrl(path) {
+    return Util.fileUrl(path)
+  }
+
+  function refreshBackground() {
+    if (!readlinkProc.running) readlinkProc.running = true
+  }
+
+  function setBackground(path, instant) {
+    transitionBackground("", path, path, instant, false)
+  }
+
+  function transitionBackground(fromPath, path, finalPath, instant, force) {
+    path = String(path || "").trim()
+    finalPath = String(finalPath || path).trim()
+    fromPath = String(fromPath || "").trim()
+    if (!path || (!force && finalPath === currentBackground)) return
+    currentBackground = finalPath
+    backgroundVersion += 1
+    revealStartedVersion = -1
+
+    revealAnimation.stop()
+    finishingTransition = false
+
+    if (instant || !displayedBackground) {
+      oldBackground = ""
+      incomingBackground = ""
+      displayedBackground = path
+      revealProgress = 1
+      return
+    }
+
+    oldBackground = fromPath || displayedBackground
+    incomingBackground = path
+    revealProgress = 0
+  }
+
+  function setPendingTheme(colorsB64, shellB64) {
+    pendingColorsRaw = Util.decodeBase64(colorsB64)
+    pendingShellRaw = Util.decodeBase64(shellB64)
+    pendingThemeVersion = backgroundVersion
+  }
+
+  function applyPendingTheme() {
+    if (pendingThemeVersion !== backgroundVersion) return
+    Color.loadColors(pendingColorsRaw)
+    // Color.loadShell also refreshes Style so the type scale flips with the
+    // background reveal instead of waiting for a separate reload path.
+    Color.loadShell(pendingShellRaw)
+    Style.scheduleRefresh()
+    pendingThemeVersion = -1
+    pendingColorsRaw = ""
+    pendingShellRaw = ""
+  }
+
+  function transitionBackgroundWithTheme(fromPath, path, finalPath, colorsB64, shellB64) {
+    transitionBackground(fromPath, path, finalPath, false, true)
+    setPendingTheme(colorsB64, shellB64)
+    if (!incomingBackground || revealProgress >= 1) applyPendingTheme()
+  }
+
+  function startReveal(panel) {
+    if (!incomingBackground) return
+    panel.maskReady = true
+    if (revealStartedVersion === backgroundVersion) return
+    revealStartedVersion = backgroundVersion
+    applyPendingTheme()
+    revealAnimation.restart()
+  }
+
+  function openSelector() {
+    if (!bgSwitchProc.running) bgSwitchProc.running = true
+  }
+
+  function openThemeSwitcher() {
+    if (!themeSwitchProc.running) themeSwitchProc.running = true
+  }
+
+  Process {
+    id: bgSwitchProc
+    command: ["bash", "-lc", "background=$(omarchy-theme-bg-switcher); [[ -n $background ]] && omarchy-theme-bg-set \"$background\""]
+    onExited: root.refreshBackground()
+  }
+
+  Process {
+    id: themeSwitchProc
+    command: ["bash", "-lc", "theme=$(omarchy-theme-switcher); [[ -n $theme ]] && omarchy-theme-set \"$theme\" >/dev/null 2>&1 &"]
+    onExited: root.refreshBackground()
+  }
+
+  Process {
+    id: readlinkProc
+    command: ["readlink", "-f", root.currentBackgroundLink]
+    stdout: StdioCollector {
+      onStreamFinished: root.setBackground(String(text || "").trim(), false)
+    }
+  }
+
+  IpcHandler {
+    target: "background"
+
+    function refresh(): void {
+      root.refreshBackground()
+    }
+
+    function set(path: string): void {
+      root.setBackground(path, false)
+    }
+
+    function setInstant(path: string): void {
+      root.setBackground(path, true)
+    }
+
+    function transition(fromPath: string, path: string): void {
+      root.transitionBackground(fromPath, path, path, false, false)
+    }
+
+    function themeTransition(fromPath: string, path: string, finalPath: string, colorsB64: string, shellB64: string): void {
+      root.transitionBackgroundWithTheme(fromPath, path, finalPath, colorsB64, shellB64)
+    }
+  }
+
+  Timer {
+    interval: 100
+    running: true
+    repeat: true
+    onTriggered: root.refreshBackground()
+  }
+
+  NumberAnimation {
+    id: revealAnimation
+    target: root
+    property: "revealProgress"
+    from: 0
+    to: 1
+    duration: 420
+    easing.type: Easing.InOutCubic
+    onFinished: {
+      if (root.incomingBackground) {
+        root.displayedBackground = root.currentBackground || root.incomingBackground
+        root.finishingTransition = true
+      }
+      root.revealProgress = 1
+    }
+  }
+
+  Component.onCompleted: refreshBackground()
+
+  Variants {
+    model: Quickshell.screens
+
+    PanelWindow {
+      id: panel
+      required property var modelData
+
+      screen: modelData
+      visible: true
+      anchors { top: true; bottom: true; left: true; right: true }
+      color: "transparent"
+      // Keep render updates enabled. The background layer has been observed to
+      // lose its committed buffer while parked with updatesEnabled=false,
+      // leaving a black desktop until omarchy-shell is restarted. The wallpaper
+      // itself is static, so this favors correctness over a small render-loop
+      // optimization.
+      updatesEnabled: true
+
+      property bool maskReady: false
+
+      function maybeStartReveal() {
+        if (!root.incomingBackground || root.revealProgress !== 0 || maskReady) return
+        if (incomingFrame.status !== Image.Ready) return
+        Qt.callLater(function() {
+          if (!root.incomingBackground || root.revealProgress !== 0 || maskReady) return
+          if (incomingFrame.status !== Image.Ready) return
+          root.startReveal(panel)
+        })
+      }
+
+      WlrLayershell.namespace: "omarchy-background"
+      WlrLayershell.layer: WlrLayer.Background
+      WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
+      exclusionMode: ExclusionMode.Ignore
+
+      Image {
+        id: base
+        anchors.fill: parent
+        source: root.imageUrl(root.displayedBackground)
+        fillMode: Image.PreserveAspectCrop
+        asynchronous: true
+        cache: true
+        onStatusChanged: {
+          if (status === Image.Ready && root.finishingTransition) {
+            root.incomingBackground = ""
+            root.oldBackground = ""
+            root.finishingTransition = false
+          }
+        }
+      }
+
+      Image {
+        id: oldFrame
+        anchors.fill: parent
+        source: root.imageUrl(root.oldBackground)
+        fillMode: Image.PreserveAspectCrop
+        asynchronous: true
+        cache: false
+        smooth: true
+        mipmap: true
+        visible: root.oldBackground !== "" && root.revealProgress < 1
+        onStatusChanged: panel.maybeStartReveal()
+      }
+
+      Item {
+        id: incomingLayer
+        anchors.fill: parent
+        visible: root.incomingBackground !== "" && incomingFrame.status === Image.Ready && (root.revealProgress >= 1 || panel.maskReady)
+        layer.enabled: root.incomingBackground !== "" && root.revealProgress < 1
+        layer.smooth: true
+        layer.effect: MultiEffect {
+          maskEnabled: true
+          maskSource: revealMask
+          maskThresholdMin: 0.5
+          maskSpreadAtMin: 0.02
+        }
+
+        Image {
+          id: incomingFrame
+          anchors.fill: parent
+          source: root.imageUrl(root.incomingBackground)
+          fillMode: Image.PreserveAspectCrop
+          asynchronous: true
+          cache: false
+          smooth: true
+          mipmap: true
+          onStatusChanged: panel.maybeStartReveal()
+        }
+      }
+
+      Item {
+        id: revealMask
+        anchors.fill: parent
+        visible: false
+        layer.enabled: true
+
+        readonly property real slant: -0.18
+        readonly property real centerTop: width / 2 - slant * height / 2
+        readonly property real centerBottom: width / 2 + slant * height / 2
+        readonly property real reach: width / 2 + Math.abs(slant) * height / 2 + 4
+        readonly property real spread: reach * root.revealProgress
+
+        Shape {
+          anchors.fill: parent
+          antialiasing: true
+          preferredRendererType: Shape.CurveRenderer
+          ShapePath {
+            fillColor: "white"
+            strokeColor: "transparent"
+            startX: revealMask.centerTop - revealMask.spread; startY: 0
+            PathLine { x: revealMask.centerTop + revealMask.spread; y: 0 }
+            PathLine { x: revealMask.centerBottom + revealMask.spread; y: revealMask.height }
+            PathLine { x: revealMask.centerBottom - revealMask.spread; y: revealMask.height }
+            PathLine { x: revealMask.centerTop - revealMask.spread; y: 0 }
+          }
+        }
+      }
+
+      Connections {
+        target: root
+        function onIncomingBackgroundChanged() {
+          panel.maskReady = false
+          panel.maybeStartReveal()
+        }
+      }
+
+      MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.LeftButton | Qt.RightButton
+        onDoubleClicked: function(mouse) {
+          if (mouse.button === Qt.RightButton) root.openThemeSwitcher()
+          else root.openSelector()
+          mouse.accepted = true
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/background/manifest.json b/shell/plugins/background/manifest.json
new file mode 100644
index 00000000..aa00a22c
--- /dev/null
+++ b/shell/plugins/background/manifest.json
@@ -0,0 +1,14 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.background",
+  "name": "Background",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Desktop background renderer with click handling and transitions",
+  "kinds": [
+    "service"
+  ],
+  "entryPoints": {
+    "service": "Background.qml"
+  }
+}
diff --git a/shell/plugins/bar/Bar.qml b/shell/plugins/bar/Bar.qml
new file mode 100644
index 00000000..2d0dbee1
--- /dev/null
+++ b/shell/plugins/bar/Bar.qml
@@ -0,0 +1,1571 @@
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import QtQuick
+import QtQuick.Layouts
+import qs.Commons
+import qs.Ui
+import "BarModel.js" as BarModel
+
+Item {
+  id: root
+
+  // The omarchy-shell host injects omarchyPath from OMARCHY_PATH.
+  required property string omarchyPath
+  // Injected by the host shell so bar slots can resolve enabled widgets.
+  required property var barWidgetRegistry
+  // Injected by the host shell every time shell.json is reloaded. Holds the
+  // `bar:` subtree: position, centerAnchor, layout. The host owns file IO;
+  // the bar just renders whatever it's handed. The bar font follows the
+  // OS-level fontconfig monospace binding — it is not stored in shell.json.
+  required property var barConfig
+  // Injected by the host shell. Used for shell-wide actions such as opening
+  // settings and persisting inline widget state.
+  property var shell: null
+  // Manifest for the active bar option. Present for custom bars and useful for
+  // diagnostics; the built-in bar does not otherwise need it.
+  property var manifest: null
+  // Mirrors the on-disk `bar-off` flag so the user can hide the bar without
+  // killing the entire shell. Wired to BarPanel.visible below; updated by the
+  // FileView watcher further down.
+  property bool barHidden: false
+  property string home: Quickshell.env("HOME")
+  property string omarchyConfigDir: home + "/.config/omarchy"
+  property var fallbackBarConfig: ({
+    position: "top",
+    transparent: false,
+    centerAnchor: "omarchy.clock",
+    layout: { left: [], center: [], right: [] }
+  })
+  property var layoutConfig: fallbackBarConfig.layout
+  property string centerAnchor: ""
+  property bool requestedTransparent: false
+  property bool useTransparentForeground: false
+  property bool transparent: false
+  property bool centerSectionHovered: false
+  property bool centerSectionRevealHeld: false
+  property bool centerHoverRevealSuppressed: false
+  property int barConfigSerial: 0
+  property string position: "top"
+  // Resolves through fontconfig at paint time (Style.font.family defaults
+  // to "monospace"), so changing the system font (via `omarchy-font-set`)
+  // updates the bar without a reload.
+  property string fontFamily: Style.font.family
+  // Bound to the central Color singleton so the bar tracks shell.toml's
+  // [bar] section. Property names kept for the rest of this file's bindings.
+  property color themeForeground: Color.bar.text
+  property color themeContrastForeground: Color.background
+  property color transparentForeground: Color.bar.text
+  property color foreground: themeForeground
+  property color barForeground: useTransparentForeground ? transparentForeground : themeForeground
+  property bool foregroundAnimationEnabled: true
+  property color background: Color.bar.background
+  property color urgent: Color.bar.active
+
+  Behavior on barForeground { enabled: root.foregroundAnimationEnabled; ColorAnimation { duration: 420; easing.type: Easing.InOutCubic } }
+  Behavior on background { ColorAnimation { duration: 420; easing.type: Easing.InOutCubic } }
+  Behavior on urgent { ColorAnimation { duration: 420; easing.type: Easing.InOutCubic } }
+  property var tooltipTarget: null
+  property var pendingTooltipTarget: null
+  property string tooltipText: ""
+  property string pendingTooltipText: ""
+  property bool tooltipShown: false
+  property int tooltipRequest: 0
+  property var activePopout: null
+  property var barDragSource: null
+  property var barDragTarget: null
+  property bool barDragAfter: false
+  property var barDragWindow: null
+  property var barDragScreen: null
+  property url barDragImageUrl: ""
+  property real barDragSceneX: 0
+  property real barDragSceneY: 0
+  property real barDragScreenX: 0
+  property real barDragScreenY: 0
+  property real barDragOffsetX: 0
+  property real barDragOffsetY: 0
+  property var configControls: []
+  property var clickTargets: []
+  property var debugModuleSlots: []
+
+  function registerClickTarget(target) {
+    if (!target || clickTargets.indexOf(target) !== -1) return
+    var next = clickTargets.slice()
+    next.push(target)
+    clickTargets = next
+  }
+
+  function unregisterClickTarget(target) {
+    var next = clickTargets.filter(function(item) { return item !== target })
+    clickTargets = next
+  }
+
+  function registerDebugModuleSlot(slot) {
+    if (!slot || debugModuleSlots.indexOf(slot) !== -1) return
+    var next = debugModuleSlots.slice()
+    next.push(slot)
+    debugModuleSlots = next
+  }
+
+  function unregisterDebugModuleSlot(slot) {
+    var next = debugModuleSlots.filter(function(item) { return item !== slot })
+    debugModuleSlots = next
+  }
+
+  function registerConfigControl(control) {
+    if (!control || configControls.indexOf(control) !== -1) return
+    var next = configControls.slice()
+    next.push(control)
+    configControls = next
+  }
+
+  function unregisterConfigControl(control) {
+    var next = configControls.filter(function(item) { return item !== control })
+    configControls = next
+  }
+
+  function debugBarGeometry() {
+    var out = []
+    for (var i = 0; i < debugModuleSlots.length; i++) {
+      var slot = debugModuleSlots[i]
+      if (!slot || !slot.activeItem) continue
+      var point = { x: slot.x, y: slot.y }
+      try {
+        point = slot.mapToItem(null, 0, 0)
+      } catch (e) {
+      }
+      out.push({
+        id: slot.moduleName,
+        section: slot.region,
+        x: Math.round(point.x),
+        y: Math.round(point.y),
+        width: Math.round(slot.width),
+        height: Math.round(slot.height),
+        visible: slot.visible === true && slot.width > 0 && slot.height > 0,
+        itemVisible: slot.activeItem.visible === true,
+        itemWidth: Math.round(slot.activeItem.implicitWidth || 0),
+        itemHeight: Math.round(slot.activeItem.implicitHeight || 0)
+      })
+    }
+    return out
+  }
+
+  function targetWindow(target) {
+    return target && target.QsWindow ? target.QsWindow.window : null
+  }
+
+  function targetBelongsToWindow(target, window) {
+    return !!target && !!window && targetWindow(target) === window
+  }
+
+  function slotWindow(slot) {
+    if (!slot) return null
+    return targetWindow(slot.activeItem) || targetWindow(slot)
+  }
+
+  function sameWindow(left, right) {
+    if (!left || !right) return false
+    if (left === right) return true
+    return !!left.screen && !!right.screen && !!left.screen.name && !!right.screen.name && left.screen.name === right.screen.name
+  }
+
+  function targetTooltipHovered(target) {
+    return !!target && target.visible !== false && target.opacity !== 0 && target.tooltipHovered === true
+  }
+
+  function clearTooltip() {
+    tooltipTimer.stop()
+    pendingTooltipTarget = null
+    pendingTooltipText = ""
+    tooltipTarget = null
+    tooltipText = ""
+    tooltipShown = false
+  }
+
+  function clearBarDrag() {
+    barDragSource = null
+    barDragWindow = null
+    barDragScreen = null
+    barDragImageUrl = ""
+    barDragTarget = null
+    barDragAfter = false
+    barDragSceneX = 0
+    barDragSceneY = 0
+    barDragScreenX = 0
+    barDragScreenY = 0
+    barDragOffsetX = 0
+    barDragOffsetY = 0
+  }
+
+  function barDragScreenPoint(scenePoint) {
+    var x = scenePoint ? scenePoint.x : 0
+    var y = scenePoint ? scenePoint.y : 0
+    var window = barDragWindow
+    if (!window || !window.screen) return { x: x, y: y }
+
+    if (root.position === "bottom")
+      y += Math.max(0, window.screen.height - window.height)
+    else if (root.position === "right")
+      x += Math.max(0, window.screen.width - window.width)
+
+    return { x: x, y: y }
+  }
+
+  function captureBarDragGhost(slot) {
+    var item = slot && slot.activeItem ? slot.activeItem : null
+    barDragImageUrl = ""
+    if (!item || typeof item.grabToImage !== "function") return
+
+    var grabWidth = Math.max(1, Math.ceil(item.width || item.implicitWidth || slot.width || 1))
+    var grabHeight = Math.max(1, Math.ceil(item.height || item.implicitHeight || slot.height || 1))
+    item.grabToImage(function(result) {
+      if (root.barDragSource !== slot || !result || !result.url) return
+      root.barDragImageUrl = result.url
+    }, Qt.size(grabWidth, grabHeight))
+  }
+
+  function requestPopout(owner) {
+    if (activePopout === owner) return
+    if (activePopout) {
+      if ("closeForPopoutSwitch" in activePopout) activePopout.closeForPopoutSwitch()
+      else if ("close" in activePopout) activePopout.close()
+    }
+    activePopout = owner
+  }
+
+  function releasePopout(owner) {
+    if (activePopout === owner) activePopout = null
+  }
+
+  readonly property bool vertical: position === "left" || position === "right"
+  readonly property int barSize: vertical ? Style.bar.sizeVertical : Style.bar.sizeHorizontal
+
+  function normalizePosition(value) {
+    return BarModel.normalizePosition(value)
+  }
+
+  // Apply tray-pinning on top of the shared layout normalization so the
+  // bar host and scriptable config helpers can't drift on entry shape.
+  function normalizeLayout(layout) {
+    var normalized = Util.normalizeLayout(Util.isPlainObject(layout) ? layout : fallbackBarConfig.layout)
+    return {
+      left:   pinTrayToInner(normalized.left,   "left"),
+      center: pinTrayToInner(normalized.center, "center"),
+      right:  pinTrayToInner(normalized.right,  "right")
+    }
+  }
+
+  // The tray drawer reveals inward (away from the bar edge). Place it at the
+  // section's inner edge: start of the right section, end of the left/center
+  // sections. The drawer's reserved space then sits next to the bar center,
+  // not stranded mid-section.
+  function pinTrayToInner(entries, section) {
+    return BarModel.pinTrayToInner(entries, section)
+  }
+
+  function applyBarConfig() {
+    var config = Util.isPlainObject(barConfig) ? barConfig : fallbackBarConfig
+
+    position = normalizePosition(config.position)
+    setRequestedTransparency(config.transparent === true)
+    centerAnchor = Util.canonicalWidgetId(config.centerAnchor || "")
+    layoutConfig = normalizeLayout(config.layout)
+    barConfigSerial++
+  }
+
+  onBarConfigChanged: applyBarConfig()
+
+  function layoutEntries(region) {
+    var serial = barConfigSerial
+    var entries = layoutConfig ? layoutConfig[region] : null
+    return Array.isArray(entries) ? entries : []
+  }
+
+  function panelNavigationSlots(region) {
+    var entries = layoutEntries(region)
+    var slots = []
+    for (var i = 0; i < entries.length; i++) {
+      var id = entryId(entries[i])
+      for (var j = 0; j < debugModuleSlots.length; j++) {
+        var slot = debugModuleSlots[j]
+        if (!slot || slot.region !== region || slot.moduleName !== id) continue
+        var item = slot.activeItem
+        if (!item || item.visible !== true || slot.visible !== true || slot.width <= 0 || slot.height <= 0) continue
+        if (typeof item.open !== "function" || typeof item.close !== "function" || item.opened === undefined) continue
+        slots.push(slot)
+        break
+      }
+    }
+    return slots
+  }
+
+  function switchPanelFrom(owner, direction) {
+    if (!owner) return false
+
+    var currentSlot = null
+    for (var i = 0; i < debugModuleSlots.length; i++) {
+      var slot = debugModuleSlots[i]
+      if (slot && slot.activeItem === owner) {
+        currentSlot = slot
+        break
+      }
+    }
+    if (!currentSlot) return false
+
+    var slots = panelNavigationSlots(currentSlot.region)
+    if (slots.length < 2) return false
+
+    var currentIndex = -1
+    for (var j = 0; j < slots.length; j++) {
+      if (slots[j] === currentSlot) {
+        currentIndex = j
+        break
+      }
+    }
+    if (currentIndex < 0) return false
+
+    var step = direction < 0 ? -1 : 1
+    var nextSlot = slots[(currentIndex + step + slots.length) % slots.length]
+    if (!nextSlot || !nextSlot.activeItem || nextSlot.activeItem === owner) return false
+
+    nextSlot.activeItem.open()
+    return true
+  }
+
+  function entrySettings(entry) {
+    return BarModel.entrySettings(entry)
+  }
+
+  function entryId(entry) {
+    return BarModel.entryId(entry)
+  }
+
+  function moduleString(entry, key, fallback) {
+    return BarModel.moduleString(entry, key, fallback)
+  }
+
+  function entryIndex(entries, name) {
+    return BarModel.entryIndex(entries, name)
+  }
+
+  function entriesBefore(entries, name) {
+    return BarModel.entriesBefore(entries, name)
+  }
+
+  function entriesAfter(entries, name) {
+    return BarModel.entriesAfter(entries, name)
+  }
+
+  function canonicalWidgetId(name) {
+    return Util.canonicalWidgetId(name)
+  }
+
+  function expandPath(path) {
+    return BarModel.expandPath(path, home)
+  }
+
+  function customModuleSafeName(name) {
+    return BarModel.customModuleSafeName(name)
+  }
+
+  function customModuleType(entry) {
+    return BarModel.customModuleType(entry)
+  }
+
+  function customModuleSource(entry) {
+    var source = BarModel.customModulePath(entry, home, omarchyConfigDir)
+    return source ? Util.fileUrl(source) : ""
+  }
+
+  Component.onCompleted: applyBarConfig()
+
+  function setCenterSectionHovered(hovered) {
+    centerSectionHovered = hovered
+    if (hovered) {
+      centerSectionRevealTimer.stop()
+      centerSectionRevealHeld = true
+    } else {
+      centerSectionRevealTimer.restart()
+    }
+  }
+
+  Timer {
+    id: centerSectionRevealTimer
+    interval: 120
+    onTriggered: root.centerSectionRevealHeld = root.centerSectionHovered
+  }
+
+  function run(command) {
+    if (!command) return
+
+    launcher.command = Util.hyprExecCommand(command)
+    launcher.startDetached()
+  }
+
+  function openConfigPanel() {
+    for (var i = 0; i < configControls.length; i++) {
+      var control = configControls[i]
+      if (!control || control.visible !== true || typeof control.openPanel !== "function") continue
+      control.openPanel()
+      return true
+    }
+    return false
+  }
+
+  function toggleTransparency() {
+    var nextTransparent = !(root.requestedTransparent === true)
+    if (root.shell && typeof root.shell.mutateShellConfig === "function") {
+      root.shell.mutateShellConfig(function(config) {
+        if (!Util.isPlainObject(config.bar)) config.bar = {}
+        config.bar.transparent = nextTransparent
+      })
+    } else {
+      root.setRequestedTransparency(nextTransparent)
+    }
+  }
+
+  function rawLayoutSection(config, region) {
+    if (!Util.isPlainObject(config.bar)) config.bar = {}
+    if (!Util.isPlainObject(config.bar.layout)) config.bar.layout = {}
+    if (!Array.isArray(config.bar.layout[region])) config.bar.layout[region] = []
+
+    return config.bar.layout[region]
+  }
+
+  function rawEntryIndex(entries, name) {
+    for (var i = 0; i < entries.length; i++) {
+      if (root.entryId(entries[i]) === name) return i
+    }
+
+    return -1
+  }
+
+  function moveModuleInConfig(config, fromRegion, fromName, toRegion, beforeName) {
+    var fromEntries = rawLayoutSection(config, fromRegion)
+    var toEntries = rawLayoutSection(config, toRegion)
+    var fromIndex = rawEntryIndex(fromEntries, fromName)
+    if (fromIndex < 0) return false
+
+    var toIndex = beforeName ? rawEntryIndex(toEntries, beforeName) : toEntries.length
+    if (toIndex < 0) toIndex = toEntries.length
+
+    if (fromRegion === toRegion && fromIndex === toIndex) return false
+
+    var movedEntry = fromEntries[fromIndex]
+    fromEntries.splice(fromIndex, 1)
+
+    if (fromRegion === toRegion && fromIndex < toIndex) toIndex -= 1
+    if (toIndex < 0) toIndex = 0
+    if (toIndex > toEntries.length) toIndex = toEntries.length
+    if (fromRegion === toRegion && fromIndex === toIndex) {
+      fromEntries.splice(fromIndex, 0, movedEntry)
+      return false
+    }
+
+    toEntries.splice(toIndex, 0, movedEntry)
+    return true
+  }
+
+  function dropBarModule(source, toRegion, beforeName) {
+    if (!source || !source.region || !source.moduleName || !toRegion) return false
+    if (source.region === toRegion && source.moduleName === beforeName) return false
+    if (!root.shell || typeof root.shell.mutateShellConfig !== "function") return false
+
+    var changed = false
+    root.shell.mutateShellConfig(function(config) {
+      changed = moveModuleInConfig(config, source.region, source.moduleName, toRegion, beforeName)
+    })
+    return changed
+  }
+
+  function moduleDropAtScene(scenePoint, sourceSlot) {
+    var sourceWindow = root.slotWindow(sourceSlot) || root.barDragWindow
+    for (var i = 0; i < debugModuleSlots.length; i++) {
+      var slot = debugModuleSlots[i]
+      if (!slot || slot === sourceSlot || !slot.visible || slot.width <= 0 || slot.height <= 0) continue
+      if (sourceWindow && !root.sameWindow(root.slotWindow(slot), sourceWindow)) continue
+
+      var slotPoint = { x: slot.x, y: slot.y }
+      try {
+        slotPoint = slot.mapToItem(null, 0, 0)
+      } catch (e) {
+      }
+
+      if (scenePoint.x >= slotPoint.x && scenePoint.x <= slotPoint.x + slot.width &&
+          scenePoint.y >= slotPoint.y && scenePoint.y <= slotPoint.y + slot.height) {
+        return {
+          slot: slot,
+          after: root.vertical ? scenePoint.y > slotPoint.y + slot.height / 2 : scenePoint.x > slotPoint.x + slot.width / 2
+        }
+      }
+    }
+
+    return null
+  }
+
+  function visibleModuleSlot(region, name, sourceSlot) {
+    var sourceWindow = root.slotWindow(sourceSlot) || root.barDragWindow
+    for (var i = 0; i < debugModuleSlots.length; i++) {
+      var slot = debugModuleSlots[i]
+      if (!slot || slot === sourceSlot || slot.region !== region || slot.moduleName !== name ||
+          !slot.visible || slot.width <= 0 || slot.height <= 0) continue
+      if (sourceWindow && !root.sameWindow(root.slotWindow(slot), sourceWindow)) continue
+      return slot
+    }
+
+    return null
+  }
+
+  function nextVisibleModuleName(region, afterName, sourceSlot) {
+    var entries = layoutEntries(region)
+    var found = false
+    for (var i = 0; i < entries.length; i++) {
+      var name = entryId(entries[i])
+      if (!found) {
+        found = name === afterName
+        continue
+      }
+
+      if (visibleModuleSlot(region, name, sourceSlot)) return name
+    }
+
+    return ""
+  }
+
+  function dropBarModuleAtTarget(sourceSlot, targetSlot, afterTarget) {
+    if (!sourceSlot || !targetSlot) return false
+
+    var beforeName = afterTarget ? nextVisibleModuleName(targetSlot.region, targetSlot.moduleName, sourceSlot) : targetSlot.moduleName
+    return dropBarModule(sourceSlot, targetSlot.region, beforeName)
+  }
+
+  function moduleTargetClickable(target) {
+    return target
+      && target.visible !== false
+      && target.opacity !== 0
+      && target.interactive !== false
+      && target.pressable !== false
+      && target.concealed !== true
+      && typeof target.triggerPress === "function"
+  }
+
+  function moduleClickTargetAt(slot, localX, localY) {
+    for (var i = clickTargets.length - 1; i >= 0; i--) {
+      var target = clickTargets[i]
+      if (!moduleTargetClickable(target)) continue
+
+      var targetPoint = { x: localX, y: localY }
+      try {
+        targetPoint = slot.mapToItem(target, localX, localY)
+      } catch (e) {
+        continue
+      }
+
+      if (targetPoint.x >= 0 && targetPoint.x <= target.width &&
+          targetPoint.y >= 0 && targetPoint.y <= target.height) {
+        return target
+      }
+    }
+
+    if (moduleTargetClickable(slot.activeItem)) return slot.activeItem
+    return null
+  }
+
+  function pressModuleClickTarget(slot, button, localX, localY) {
+    var target = moduleClickTargetAt(slot, localX, localY)
+    if (!target) return false
+
+    target.triggerPress(button)
+    return true
+  }
+
+  function colorHex(colorValue) {
+    var c = colorValue
+    if (typeof c === "string") c = Qt.color(c)
+    function hexChannel(value) {
+      var s = Math.round(Util.clamp(value, 0, 1) * 255).toString(16)
+      return s.length < 2 ? "0" + s : s
+    }
+    return "#" + hexChannel(c.r) + hexChannel(c.g) + hexChannel(c.b)
+  }
+
+  function setRequestedTransparency(value) {
+    var nextTransparent = value === true
+    requestedTransparent = nextTransparent
+    if (!nextTransparent) {
+      foregroundAnimationEnabled = false
+      useTransparentForeground = false
+      transparent = false
+      transparentForeground = themeForeground
+      restoreForegroundAnimation()
+      return
+    }
+    scheduleTransparentForegroundRefresh()
+  }
+
+  function restoreForegroundAnimation() {
+    Qt.callLater(function() {
+      Qt.callLater(function() { root.foregroundAnimationEnabled = true })
+    })
+  }
+
+  function scheduleTransparentForegroundRefresh() {
+    if (!requestedTransparent) {
+      transparentForeground = themeForeground
+      return
+    }
+    transparentForegroundTimer.restart()
+  }
+
+  function refreshTransparentForeground() {
+    if (!requestedTransparent || transparentForegroundProc.running) return
+
+    transparentForegroundProc.command = [
+      "omarchy-shell-bar-text-color",
+      root.position,
+      String(root.barSize),
+      colorHex(root.themeForeground),
+      colorHex(root.themeContrastForeground)
+    ]
+    transparentForegroundProc.running = true
+  }
+
+  onRequestedTransparentChanged: scheduleTransparentForegroundRefresh()
+  onPositionChanged: scheduleTransparentForegroundRefresh()
+  onThemeForegroundChanged: scheduleTransparentForegroundRefresh()
+  onThemeContrastForegroundChanged: scheduleTransparentForegroundRefresh()
+
+  Timer {
+    id: transparentForegroundTimer
+    interval: 120
+    repeat: false
+    onTriggered: root.refreshTransparentForeground()
+  }
+
+  Process {
+    id: transparentForegroundProc
+    stdout: SplitParser {
+      onRead: function(line) {
+        var value = String(line || "").trim()
+        if (!/^#[0-9A-Fa-f]{6}$/.test(value)) return
+
+        root.foregroundAnimationEnabled = false
+        root.transparentForeground = value
+        if (root.requestedTransparent) {
+          root.useTransparentForeground = true
+          root.transparent = true
+        }
+        root.restoreForegroundAnimation()
+      }
+    }
+  }
+
+  FileView {
+    path: root.home + "/.config/omarchy/current"
+    watchChanges: true
+    printErrors: false
+    onFileChanged: root.scheduleTransparentForegroundRefresh()
+  }
+
+  function runProcess(process) {
+    if (!process.running)
+      process.running = true
+  }
+
+  function showTooltip(target, text) {
+    clearTooltip()
+
+    if (!targetTooltipHovered(target) || !text) {
+      tooltipRequest += 1
+      return
+    }
+
+    var request = tooltipRequest + 1
+    tooltipRequest = request
+    pendingTooltipTarget = target
+    pendingTooltipText = text
+
+    Qt.callLater(function() {
+      if (request !== tooltipRequest) return
+      if (!targetTooltipHovered(pendingTooltipTarget)) {
+        clearTooltip()
+        return
+      }
+      tooltipTarget = pendingTooltipTarget
+      tooltipText = pendingTooltipText
+      pendingTooltipTarget = null
+      pendingTooltipText = ""
+      tooltipTimer.restart()
+    })
+  }
+
+  function hideTooltip(target) {
+    if (tooltipTarget !== target && pendingTooltipTarget !== target) return
+
+    tooltipRequest += 1
+    clearTooltip()
+  }
+
+  Process { id: launcher }
+
+  Timer {
+    id: tooltipTimer
+    interval: 400
+    onTriggered: {
+      if (root.targetTooltipHovered(root.tooltipTarget)) root.tooltipShown = true
+      else root.clearTooltip()
+    }
+  }
+
+  Timer {
+    interval: 100
+    running: root.tooltipShown
+    repeat: true
+    onTriggered: if (!root.targetTooltipHovered(root.tooltipTarget)) root.hideTooltip(root.tooltipTarget)
+  }
+
+  // Presence of the `bar-off` flag = bar hidden. Watching the parent toggles
+  // directory because FileView can't observe a file that doesn't exist yet,
+  // and the flag is created/removed by `omarchy-toggle-bar`.
+  Process {
+    id: barHiddenProbe
+    running: true
+    command: ["bash", "-lc", "[[ -f $HOME/.local/state/omarchy/toggles/bar-off ]] && echo yes || echo no"]
+    stdout: SplitParser { onRead: function(line) { root.barHidden = String(line).trim() === "yes" } }
+  }
+  FileView {
+    path: root.home + "/.local/state/omarchy/toggles"
+    watchChanges: true
+    printErrors: false
+    onFileChanged: barHiddenProbe.running = true
+  }
+
+  Variants {
+    model: Quickshell.screens
+
+    delegate: Component {
+      BarPanel {
+        required property var modelData
+
+        screen: modelData
+      }
+    }
+  }
+
+  Variants {
+    model: Quickshell.screens
+
+    delegate: Component {
+      DragGhostPanel {
+        required property var modelData
+
+        screen: modelData
+        ghostScreen: modelData
+      }
+    }
+  }
+
+  component BarPanel: PanelWindow {
+    id: barWindow
+
+    visible: !root.barHidden
+
+    anchors {
+      top: root.position === "top" || root.vertical
+      bottom: root.position === "bottom" || root.vertical
+      left: root.position === "left" || !root.vertical
+      right: root.position === "right" || !root.vertical
+    }
+
+    implicitWidth: root.vertical ? root.barSize : 0
+    implicitHeight: root.vertical ? 0 : root.barSize
+    color: root.transparent ? "transparent" : root.background
+    WlrLayershell.namespace: "omarchy-bar"
+    WlrLayershell.layer: WlrLayer.Top
+
+    Loader {
+      anchors.fill: parent
+      sourceComponent: root.vertical ? verticalBar : horizontalBar
+    }
+
+    PopupWindow {
+      id: tooltipWindow
+
+      visible: root.tooltipShown && root.tooltipTarget !== null && root.tooltipText !== "" && root.targetBelongsToWindow(root.tooltipTarget, barWindow)
+      color: "transparent"
+      implicitWidth: Math.ceil(tooltipBubble.implicitWidth)
+      implicitHeight: Math.ceil(tooltipBubble.implicitHeight)
+
+      anchor {
+        id: tooltipAnchor
+        window: barWindow
+        adjustment: PopupAdjustment.Slide
+        edges: Edges.Top | Edges.Left
+        gravity: Edges.Bottom | Edges.Right
+        rect.width: 1
+        rect.height: 1
+
+        onAnchoring: {
+          var target = root.tooltipTarget
+          if (!root.targetBelongsToWindow(target, barWindow)) return
+
+          var popupWidth = tooltipWindow.implicitWidth
+          var popupHeight = tooltipWindow.implicitHeight
+          var localX = target.width / 2 - popupWidth / 2
+          var localY = target.height + 6
+
+          if (root.position === "bottom") {
+            localY = -popupHeight - 6
+          } else if (root.position === "left") {
+            localX = target.width + 6
+            localY = target.height / 2 - popupHeight / 2
+          } else if (root.position === "right") {
+            localX = -popupWidth - 6
+            localY = target.height / 2 - popupHeight / 2
+          }
+
+          var point = barWindow.contentItem.mapFromItem(target, localX, localY)
+          tooltipAnchor.rect.x = Math.round(point.x)
+          tooltipAnchor.rect.y = Math.round(point.y)
+        }
+      }
+
+      BorderSurface {
+        id: tooltipBubble
+        implicitWidth: tooltipLabel.implicitWidth + 20
+        implicitHeight: tooltipLabel.implicitHeight + 14
+        color: Color.tooltip.background
+        borderSpec: Border.surfaceSpec("tooltip", "border", Color.tooltip.border, 1)
+        radius: Style.cornerRadius
+
+        Text {
+          id: tooltipLabel
+          anchors.centerIn: parent
+          text: root.tooltipText
+          color: Color.tooltip.text
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.body
+          horizontalAlignment: Text.AlignHCenter
+          verticalAlignment: Text.AlignVCenter
+        }
+      }
+    }
+
+    Component {
+      id: horizontalBar
+
+      Item {
+        anchors.fill: parent
+
+        CenterModules { anchors.fill: parent }
+
+        LeftModules {
+          anchors.left: parent.left
+          anchors.leftMargin: Style.space(8)
+          anchors.verticalCenter: parent.verticalCenter
+        }
+
+        RightModules {
+          anchors.right: parent.right
+          anchors.rightMargin: Style.space(8)
+          anchors.verticalCenter: parent.verticalCenter
+        }
+      }
+    }
+
+    Component {
+      id: verticalBar
+
+      Item {
+        anchors.fill: parent
+
+        CenterModules { anchors.fill: parent }
+
+        LeftModules {
+          anchors.top: parent.top
+          anchors.topMargin: Style.space(8)
+          anchors.horizontalCenter: parent.horizontalCenter
+        }
+
+        RightModules {
+          anchors.bottom: parent.bottom
+          anchors.bottomMargin: Style.space(8)
+          anchors.horizontalCenter: parent.horizontalCenter
+        }
+      }
+    }
+  }
+
+  Component { id: emptyModuleComponent; Item { implicitWidth: 0; implicitHeight: 0; visible: false } }
+
+  component DragGhostPanel: PanelWindow {
+    id: ghostWindow
+
+    required property var ghostScreen
+    readonly property bool screenMatches: root.barDragScreen === ghostScreen ||
+      (root.barDragScreen && ghostScreen && root.barDragScreen.name && ghostScreen.name && root.barDragScreen.name === ghostScreen.name)
+    readonly property bool active: root.barDragSource && root.barDragScreen && screenMatches
+    readonly property var sourceItem: root.barDragSource ? root.barDragSource.activeItem : null
+    readonly property int ghostPadding: Style.space(1)
+    readonly property int ghostWidth: sourceItem ? Math.max(1, Math.ceil(sourceItem.width)) : 1
+    readonly property int ghostHeight: sourceItem ? Math.max(1, Math.ceil(sourceItem.height)) : 1
+
+    visible: active && sourceItem !== null
+    color: "transparent"
+    exclusionMode: ExclusionMode.Ignore
+    WlrLayershell.namespace: "omarchy-bar-drag-ghost"
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
+
+    anchors {
+      top: true
+      bottom: true
+      left: true
+      right: true
+    }
+
+    // Visual-only drag feedback. Keep the input region empty so the ghost can
+    // sit under the cursor without stealing the MouseArea's active pointer grab.
+    mask: Region {}
+
+    Item {
+      visible: ghostWindow.visible
+      x: Math.round(root.barDragScreenX - root.barDragOffsetX - ghostWindow.ghostPadding)
+      y: Math.round(root.barDragScreenY - root.barDragOffsetY - ghostWindow.ghostPadding)
+      width: ghostWindow.ghostWidth + ghostWindow.ghostPadding * 2
+      height: ghostWindow.ghostHeight + ghostWindow.ghostPadding * 2
+
+      BorderSurface {
+        anchors.fill: parent
+        color: root.transparent ? "transparent" : root.background
+        borderSpec: Border.flat(root.barForeground, 1)
+        radius: Math.min(Style.cornerRadius, height / 2)
+        opacity: root.transparent ? 0.45 : 0.94
+      }
+
+      Image {
+        anchors.fill: parent
+        anchors.margins: ghostWindow.ghostPadding
+        source: root.barDragImageUrl
+        fillMode: Image.Stretch
+        smooth: true
+        opacity: 0.84
+      }
+    }
+  }
+
+  function findCenterAnchorEntry() {
+    var entries = root.layoutEntries("center")
+    var idx = root.entryIndex(entries, root.centerAnchor)
+    return idx === -1 ? null : entries[idx]
+  }
+
+  component LeftModules: ModuleList {
+    entries: root.layoutEntries("left")
+    region: "left"
+  }
+
+  component RightModules: ModuleList {
+    entries: root.layoutEntries("right")
+    region: "right"
+  }
+
+  component CenterModules: Item {
+    id: centerRoot
+
+    property var entries: root.layoutEntries("center")
+    readonly property bool hasAnchor: root.entryIndex(entries, root.centerAnchor) !== -1
+    readonly property var anchorEntry: root.findCenterAnchorEntry()
+
+    Loader {
+      anchors.fill: parent
+      sourceComponent: root.vertical ? verticalCenterModules : horizontalCenterModules
+    }
+
+    Component {
+      id: horizontalCenterModules
+
+      Item {
+        anchors.fill: parent
+
+        CenterGestureArea { anchors.fill: parent }
+
+        HoverHandler {
+          onHoveredChanged: root.setCenterSectionHovered(hovered)
+        }
+
+        ModuleList {
+          visible: !centerRoot.hasAnchor
+          entries: centerRoot.entries
+          region: "center"
+          anchors.centerIn: parent
+        }
+
+        ModuleList {
+          visible: centerRoot.hasAnchor
+          entries: root.entriesBefore(centerRoot.entries, root.centerAnchor)
+          region: "center"
+          anchors.right: centerConfigControl.visible ? centerConfigControl.left : centerAnchorModule.left
+          anchors.verticalCenter: centerAnchorModule.verticalCenter
+        }
+
+        ModuleSlot {
+          id: centerAnchorModule
+          visible: centerRoot.hasAnchor
+          entry: centerRoot.anchorEntry
+          region: "center"
+          anchors.centerIn: parent
+        }
+
+        BarConfigControl {
+          id: centerConfigControl
+
+          visible: centerRoot.hasAnchor && centerAnchorModule.moduleName === "omarchy.clock"
+          clockHovered: centerAnchorModule.hovered
+          centerHovered: root.centerSectionRevealHeld && !root.centerHoverRevealSuppressed
+          anchors.right: centerAnchorModule.left
+          anchors.verticalCenter: centerAnchorModule.verticalCenter
+        }
+
+        ModuleList {
+          visible: centerRoot.hasAnchor
+          entries: root.entriesAfter(centerRoot.entries, root.centerAnchor)
+          region: "center"
+          anchors.left: centerAnchorModule.right
+          anchors.verticalCenter: centerAnchorModule.verticalCenter
+        }
+      }
+    }
+
+    Component {
+      id: verticalCenterModules
+
+      Item {
+        anchors.fill: parent
+
+        CenterGestureArea { anchors.fill: parent }
+
+        HoverHandler {
+          onHoveredChanged: root.setCenterSectionHovered(hovered)
+        }
+
+        ModuleList {
+          visible: !centerRoot.hasAnchor
+          entries: centerRoot.entries
+          region: "center"
+          anchors.centerIn: parent
+        }
+
+        ModuleList {
+          visible: centerRoot.hasAnchor
+          entries: root.entriesBefore(centerRoot.entries, root.centerAnchor)
+          region: "center"
+          anchors.bottom: centerConfigControl.visible ? centerConfigControl.top : centerAnchorModule.top
+          anchors.horizontalCenter: centerAnchorModule.horizontalCenter
+        }
+
+        ModuleSlot {
+          id: centerAnchorModule
+          visible: centerRoot.hasAnchor
+          entry: centerRoot.anchorEntry
+          region: "center"
+          anchors.centerIn: parent
+        }
+
+        BarConfigControl {
+          id: centerConfigControl
+
+          visible: centerRoot.hasAnchor && centerAnchorModule.moduleName === "omarchy.clock"
+          clockHovered: centerAnchorModule.hovered
+          centerHovered: root.centerSectionRevealHeld && !root.centerHoverRevealSuppressed
+          anchors.bottom: centerAnchorModule.top
+          anchors.horizontalCenter: centerAnchorModule.horizontalCenter
+        }
+
+        ModuleList {
+          visible: centerRoot.hasAnchor
+          entries: root.entriesAfter(centerRoot.entries, root.centerAnchor)
+          region: "center"
+          anchors.top: centerAnchorModule.bottom
+          anchors.horizontalCenter: centerAnchorModule.horizontalCenter
+        }
+      }
+    }
+  }
+
+  component CenterGestureArea: MouseArea {
+    acceptedButtons: Qt.LeftButton
+
+    onDoubleClicked: function(mouse) {
+      if (mouse.button === Qt.LeftButton) {
+        root.toggleTransparency()
+        mouse.accepted = true
+      }
+    }
+  }
+
+  component BarConfigControl: Item {
+    id: configControl
+
+    property bool clockHovered: false
+    property bool centerHovered: false
+    property bool openWhenReady: false
+
+    readonly property var panelItem: configPanelLoader.item
+    readonly property bool panelOpen: panelItem ? panelItem.opened === true : false
+    readonly property bool revealed: visible && (clockHovered || centerHovered || controlHover.hovered || panelOpen)
+
+    implicitWidth: button.implicitWidth
+    implicitHeight: button.implicitHeight
+    width: implicitWidth
+    height: implicitHeight
+    z: 500
+
+    HoverHandler { id: controlHover }
+
+    Component.onCompleted: root.registerConfigControl(configControl)
+    Component.onDestruction: root.unregisterConfigControl(configControl)
+
+    function configurePanel(panel) {
+      if (!panel) return
+      panel.bar = root
+      panel.anchorItem = button
+    }
+
+    function openPanel() {
+      if (!panelItem) {
+        openWhenReady = true
+        return
+      }
+      panelItem.open()
+    }
+
+    function togglePanel() {
+      if (!panelItem) {
+        openPanel()
+        return
+      }
+      panelItem.toggle()
+    }
+
+    WidgetButton {
+      id: button
+
+      anchors.fill: parent
+      bar: root
+      text: ""
+      keepSpace: true
+      concealed: !configControl.revealed
+      dimmed: configControl.revealed && !controlHover.hovered && !configControl.panelOpen
+      interactive: configControl.revealed
+      horizontalMargin: 6.5
+      verticalPadding: 6
+      tooltipText: "Bar config"
+      onPressed: function(b) {
+        if (b === Qt.LeftButton) configControl.togglePanel()
+      }
+    }
+
+    Loader {
+      id: configPanelLoader
+
+      active: true
+      source: Qt.resolvedUrl("BarConfigPanel.qml")
+      onLoaded: {
+        configControl.configurePanel(item)
+        if (configControl.openWhenReady) {
+          configControl.openWhenReady = false
+          item.open()
+        }
+      }
+    }
+  }
+
+  component ModuleList: Loader {
+    id: moduleListRoot
+
+    property var entries: []
+    property string region: ""
+
+    visible: entries.length > 0
+    sourceComponent: root.vertical ? verticalModuleList : horizontalModuleList
+    width: item ? item.implicitWidth : 0
+    height: item ? item.implicitHeight : 0
+
+    Component {
+      id: horizontalModuleList
+
+      Row {
+        spacing: 0
+
+        Repeater {
+          model: moduleListRoot.entries
+
+          ModuleSlot {
+            required property var modelData
+            entry: modelData
+            region: moduleListRoot.region
+          }
+        }
+      }
+    }
+
+    Component {
+      id: verticalModuleList
+
+      Column {
+        spacing: 0
+
+        Repeater {
+          model: moduleListRoot.entries
+
+          ModuleSlot {
+            required property var modelData
+            entry: modelData
+            region: moduleListRoot.region
+          }
+        }
+      }
+    }
+  }
+
+  component ModuleSlot: Item {
+    id: slot
+
+    required property var entry
+    property string region: ""
+    readonly property string moduleName: root.entryId(entry)
+    readonly property var moduleSettings: root.entrySettings(entry)
+    readonly property string customType: root.customModuleType(entry)
+    // Re-evaluate when the registry mutates (Component reference changes,
+    // plugin enabled/disabled, etc.). Reading the `widgets` property creates
+    // the binding dependency — the wrapped function call alone wouldn't.
+    readonly property var registryComponent: {
+      var w = root.barWidgetRegistry.widgets
+      if (customType) return null
+      var registryName = root.canonicalWidgetId(moduleName)
+      return w[registryName] ? w[registryName].component : null
+    }
+    readonly property bool qmlCustom: customType === "qml"
+    readonly property bool commandCustom: customType === "command"
+    readonly property bool registered: registryComponent !== null
+    readonly property var activeItem: {
+      if (registered) return registryLoader.item
+      if (qmlCustom) return qmlLoader.item
+      return componentLoader.item
+    }
+    readonly property bool hovered: moduleHover.hovered
+    readonly property bool dragSource: root.barDragSource === slot
+    readonly property bool panelOpen: root.activePopout === slot.activeItem
+    readonly property real openIndicatorInlineOffset: {
+      var item = slot.activeItem
+      if (!item || !("openIndicatorInlineOffset" in item)) return 0
+      var offset = Number(item.openIndicatorInlineOffset)
+      return isFinite(offset) ? offset : 0
+    }
+
+    implicitWidth: activeItem && activeItem.visible ? (root.vertical ? root.barSize : activeItem.implicitWidth) : 0
+    implicitHeight: activeItem && activeItem.visible ? activeItem.implicitHeight : 0
+    width: implicitWidth
+    height: implicitHeight
+    z: modulePointer.dragging ? 100 : 0
+
+    Component.onCompleted: root.registerDebugModuleSlot(slot)
+    Component.onDestruction: {
+      if (root.barDragSource === slot) root.clearBarDrag()
+      root.unregisterDebugModuleSlot(slot)
+    }
+
+    HoverHandler { id: moduleHover }
+
+    BorderSurface {
+      visible: slot.dragSource
+      anchors.fill: parent
+      anchors.margins: Style.space(1)
+      color: root.transparent ? "transparent" : root.background
+      borderSpec: Border.flat(root.barForeground, 1)
+      radius: Math.min(Style.cornerRadius, height / 2)
+      opacity: root.transparent ? 0.22 : 0.32
+    }
+
+    Loader {
+      id: componentLoader
+      active: !slot.qmlCustom && !slot.registered
+      sourceComponent: slot.commandCustom ? customCommandModuleComponent : emptyModuleComponent
+      anchors.fill: parent
+      opacity: slot.dragSource ? 0.22 : 1.0
+      onLoaded: {
+        slot.injectProps()
+        Qt.callLater(slot.injectProps)
+      }
+    }
+
+    Loader {
+      id: registryLoader
+      active: slot.registered
+      sourceComponent: slot.registered ? slot.registryComponent : null
+      anchors.fill: parent
+      opacity: slot.dragSource ? 0.22 : 1.0
+      onLoaded: {
+        slot.injectProps()
+        Qt.callLater(slot.injectProps)
+      }
+    }
+
+    Loader {
+      id: qmlLoader
+      active: slot.qmlCustom
+      source: slot.qmlCustom ? root.customModuleSource(slot.entry) : ""
+      anchors.fill: parent
+      opacity: slot.dragSource ? 0.22 : 1.0
+      onLoaded: {
+        slot.injectProps()
+        Qt.callLater(slot.injectProps)
+      }
+    }
+
+    Rectangle {
+      id: openPanelIndicator
+
+      readonly property int inset: Style.space(2)
+
+      visible: opacity > 0
+      opacity: slot.panelOpen && !slot.dragSource ? 0.9 : 0
+      color: Color.accent
+      radius: Math.min(width, height) / 2
+      width: root.vertical ? Style.space(2) : Math.max(Style.space(10), Math.round(parent.width * 0.55))
+      height: root.vertical ? Math.max(Style.space(10), Math.round(parent.height * 0.55)) : Style.space(2)
+      x: root.vertical
+        ? (root.position === "left" ? parent.width - width - inset : inset)
+        : (slot.openIndicatorInlineOffset === 0 ? Math.round((parent.width - width) / 2) : (parent.width - width) / 2 + slot.openIndicatorInlineOffset)
+      y: root.vertical
+        ? (slot.openIndicatorInlineOffset === 0 ? Math.round((parent.height - height) / 2) : (parent.height - height) / 2 + slot.openIndicatorInlineOffset)
+        : (root.position === "top" ? parent.height - height - inset : inset)
+      z: 50
+
+      Behavior on opacity {
+        NumberAnimation { duration: 120; easing.type: Easing.OutCubic }
+      }
+    }
+
+    Rectangle {
+      visible: !root.vertical && root.barDragTarget === slot && !root.barDragAfter
+      anchors {
+        left: parent.left
+        top: parent.top
+        bottom: parent.bottom
+      }
+      width: 2
+      color: root.barForeground
+      opacity: 0.9
+    }
+
+    Rectangle {
+      visible: !root.vertical && root.barDragTarget === slot && root.barDragAfter
+      anchors {
+        right: parent.right
+        top: parent.top
+        bottom: parent.bottom
+      }
+      width: 2
+      color: root.barForeground
+      opacity: 0.9
+    }
+
+    Rectangle {
+      visible: root.vertical && root.barDragTarget === slot && !root.barDragAfter
+      anchors {
+        left: parent.left
+        right: parent.right
+        top: parent.top
+      }
+      height: 2
+      color: root.barForeground
+      opacity: 0.9
+    }
+
+    Rectangle {
+      visible: root.vertical && root.barDragTarget === slot && root.barDragAfter
+      anchors {
+        left: parent.left
+        right: parent.right
+        bottom: parent.bottom
+      }
+      height: 2
+      color: root.barForeground
+      opacity: 0.9
+    }
+
+    MouseArea {
+      id: modulePointer
+
+      property bool dragging: false
+      property bool suppressClick: false
+      property real pressedX: 0
+      property real pressedY: 0
+      readonly property bool canReorder: root.shell && typeof root.shell.mutateShellConfig === "function"
+      readonly property real dragThreshold: Style.space(4)
+
+      anchors.fill: parent
+      acceptedButtons: Qt.LeftButton
+      enabled: slot.visible && slot.width > 0 && slot.height > 0
+      propagateComposedEvents: true
+      cursorShape: root.moduleClickTargetAt(slot, mouseX, mouseY) ? Qt.PointingHandCursor : Qt.ArrowCursor
+      // Do not assign drag.target here: ModuleSlot is owned by Row/Column
+      // positioners, and mutating slot.x/slot.y can leave stale offsets that
+      // make neighboring modules overlap after a small aborted drag.
+
+      onPressed: function(mouse) {
+        dragging = false
+        suppressClick = false
+        pressedX = mouse.x
+        pressedY = mouse.y
+        root.clearBarDrag()
+      }
+
+      onPositionChanged: function(mouse) {
+        if (!canReorder || !(mouse.buttons & Qt.LeftButton)) return
+
+        var distance = Math.abs(mouse.x - pressedX) + Math.abs(mouse.y - pressedY)
+        if (distance >= dragThreshold) {
+          if (!dragging) {
+            root.barDragWindow = root.targetWindow(slot.activeItem) || root.targetWindow(slot)
+            root.barDragScreen = root.barDragWindow ? root.barDragWindow.screen : null
+            root.barDragOffsetX = pressedX
+            root.barDragOffsetY = pressedY
+            root.captureBarDragGhost(slot)
+            root.barDragSource = slot
+          }
+          dragging = true
+          root.hideTooltip(slot.activeItem)
+        }
+
+        if (dragging) {
+          var scenePoint = slot.mapToItem(null, mouse.x, mouse.y)
+          var screenPoint = root.barDragScreenPoint(scenePoint)
+          root.barDragSceneX = scenePoint.x
+          root.barDragSceneY = scenePoint.y
+          root.barDragScreenX = screenPoint.x
+          root.barDragScreenY = screenPoint.y
+
+          var drop = root.moduleDropAtScene(scenePoint, slot)
+          root.barDragTarget = drop ? drop.slot : null
+          root.barDragAfter = drop ? drop.after : false
+        }
+      }
+
+      onReleased: function(mouse) {
+        var wasDragging = dragging
+        var targetSlot = root.barDragTarget
+        var afterTarget = root.barDragAfter
+
+        if (wasDragging) suppressClick = true
+
+        dragging = false
+        root.clearBarDrag()
+
+        if (wasDragging && targetSlot) {
+          root.dropBarModuleAtTarget(slot, targetSlot, afterTarget)
+          mouse.accepted = true
+        } else if (!wasDragging) {
+          mouse.accepted = false
+        }
+      }
+
+      onCanceled: {
+        dragging = false
+        suppressClick = false
+        root.clearBarDrag()
+      }
+
+      onClicked: function(mouse) {
+        if (suppressClick) {
+          suppressClick = false
+          mouse.accepted = true
+          return
+        }
+
+        if (!root.pressModuleClickTarget(slot, mouse.button, mouse.x, mouse.y)) mouse.accepted = false
+      }
+    }
+
+    onActiveItemChanged: Qt.callLater(injectProps)
+    onModuleSettingsChanged: injectProps()
+
+    function injectProps() {
+      var target = activeItem
+      if (!target) return
+      if ("bar" in target) target.bar = root
+      if ("moduleName" in target) target.moduleName = moduleName
+      if ("settings" in target) target.settings = moduleSettings
+    }
+
+    Component {
+      id: customCommandModuleComponent
+      CustomCommandModule { entry: slot.entry }
+    }
+  }
+
+  component CustomCommandModule: WidgetButton {
+    id: customRoot
+
+    required property var entry
+    readonly property string moduleName: root.entryId(entry)
+    readonly property var settings: root.entrySettings(entry)
+    property string outputText: ""
+    property string outputTooltip: ""
+    property bool outputActive: false
+
+    function setting(name, fallback) {
+      var value = settings ? settings[name] : undefined
+      return value === undefined || value === null ? fallback : value
+    }
+
+    function update(raw) {
+      var data = Util.parseModuleJson(raw)
+      var klass = data.class || data.alt || ""
+
+      outputText = data.text || String(raw || "").trim()
+      outputTooltip = data.tooltip || String(setting("tooltip", ""))
+      outputActive = klass === "active" || (Array.isArray(klass) && klass.indexOf("active") !== -1)
+    }
+
+    bar: root
+    text: outputText || String(setting("text", ""))
+    tooltipText: outputTooltip || String(setting("tooltip", ""))
+    active: outputActive
+    keepSpace: setting("keepSpace", false) === true
+    horizontalMargin: Number(setting("horizontalMargin", 7.5))
+    verticalPadding: Number(setting("verticalPadding", 6))
+    fontSize: Number(setting("fontSize", 12))
+
+    onPressed: function(button) {
+      var command = ""
+      if (button === Qt.RightButton)
+        command = String(setting("onRightClick", ""))
+      else if (button === Qt.MiddleButton)
+        command = String(setting("onMiddleClick", ""))
+      else
+        command = String(setting("onClick", ""))
+
+      if (command) root.run(command)
+    }
+
+    Process {
+      id: customProc
+      command: ["bash", "-lc", String(customRoot.setting("exec", ""))]
+      stdout: StdioCollector {
+        waitForEnd: true
+        onStreamFinished: customRoot.update(text)
+      }
+    }
+
+    Timer {
+      interval: Math.max(1, Number(customRoot.setting("interval", 5))) * 1000
+      running: String(customRoot.setting("exec", "")) !== ""
+      repeat: true
+      triggeredOnStart: true
+      onTriggered: root.runProcess(customProc)
+    }
+  }
+}
diff --git a/shell/plugins/bar/BarConfigPanel.qml b/shell/plugins/bar/BarConfigPanel.qml
new file mode 100644
index 00000000..4e52ec16
--- /dev/null
+++ b/shell/plugins/bar/BarConfigPanel.qml
@@ -0,0 +1,246 @@
+import QtQuick
+import qs.Commons
+import qs.Ui
+
+Panel {
+  id: root
+
+  moduleName: "omarchy.bar-config"
+  manageIpc: false
+
+  property Item anchorItem: null
+  property string focusSection: "transparency"
+  property int positionIndex: 0
+  property bool cursorActive: false
+  property int phraseIndex: 0
+
+  readonly property string currentPosition: bar ? bar.position : "top"
+  readonly property bool transparent: bar ? bar.requestedTransparent === true : false
+  readonly property color foreground: bar ? bar.foreground : Color.foreground
+  readonly property string fontFamily: bar ? bar.fontFamily : Style.font.family
+  readonly property var heroPhrases: [
+    "Picking Sides",
+    "Choose Transparency",
+    "Edge Decisions",
+    "Bar Exam",
+    "Top Shelf Thinking",
+    "Side Quest Settings"
+  ]
+  readonly property string heroPhraseText: heroPhrases[phraseIndex % heroPhrases.length]
+  readonly property var positionOptions: [
+    { value: "top", label: "Top" },
+    { value: "bottom", label: "Bottom" },
+    { value: "left", label: "Left" },
+    { value: "right", label: "Right" }
+  ]
+
+  function normalizePosition(value) {
+    var next = String(value || "")
+    return /^(top|bottom|left|right)$/.test(next) ? next : "top"
+  }
+
+  function positionLabel(value) {
+    var next = normalizePosition(value)
+    return next.charAt(0).toUpperCase() + next.slice(1)
+  }
+
+  function currentPositionIndex() {
+    var current = normalizePosition(currentPosition)
+    for (var i = 0; i < positionOptions.length; i++)
+      if (positionOptions[i].value === current) return i
+    return 0
+  }
+
+  function mutateBarConfig(mutator) {
+    if (!bar || !bar.shell || typeof bar.shell.mutateShellConfig !== "function") return false
+    bar.shell.mutateShellConfig(function(config) {
+      if (!Util.isPlainObject(config.bar)) config.bar = {}
+      mutator(config.bar)
+    })
+    return true
+  }
+
+  function setTransparency(value) {
+    var next = value === true
+    if (mutateBarConfig(function(barConfig) { barConfig.transparent = next })) return
+    if (bar && typeof bar.setRequestedTransparency === "function") bar.setRequestedTransparency(next)
+  }
+
+  function setPosition(value) {
+    var next = normalizePosition(value)
+    if (mutateBarConfig(function(barConfig) { barConfig.position = next })) return
+    if (bar) bar.position = next
+  }
+
+  function moveCursor(dx, dy) {
+    if (!cursorActive) {
+      cursorActive = true
+      return
+    }
+
+    if (dy !== 0) {
+      focusSection = focusSection === "transparency" ? "position" : "transparency"
+      if (focusSection === "position") positionIndex = currentPositionIndex()
+      return
+    }
+
+    if (dx !== 0 && focusSection === "position") {
+      var count = positionOptions.length
+      positionIndex = (positionIndex + (dx > 0 ? 1 : -1) + count) % count
+    }
+  }
+
+  function activateCursor() {
+    if (focusSection === "transparency") {
+      setTransparency(!transparent)
+      return
+    }
+
+    var option = positionOptions[positionIndex]
+    if (option) setPosition(option.value)
+  }
+
+  onOpenedChanged: {
+    if (!opened) return
+    focusSection = "transparency"
+    positionIndex = currentPositionIndex()
+    cursorActive = false
+  }
+
+  onCurrentPositionChanged: if (!cursorActive || focusSection === "position") positionIndex = currentPositionIndex()
+
+  Timer {
+    id: phraseTimer
+    interval: 2200
+    running: root.opened
+    repeat: true
+    onTriggered: phraseSwap.restart()
+  }
+
+  SequentialAnimation {
+    id: phraseSwap
+    PropertyAnimation {
+      target: hero; property: "metaOpacity"
+      to: 0.0; duration: 180; easing.type: Easing.OutQuad
+    }
+    ScriptAction {
+      script: root.phraseIndex = (root.phraseIndex + 1) % root.heroPhrases.length
+    }
+    PropertyAnimation {
+      target: hero; property: "metaOpacity"
+      to: 1.0; duration: 260; easing.type: Easing.InQuad
+    }
+  }
+
+  Component {
+    id: heroIconComponent
+
+    Text {
+      text: ""
+      color: root.foreground
+      font.family: root.fontFamily
+      font.pixelSize: Style.font.display
+    }
+  }
+
+  KeyboardPanel {
+    id: panel
+
+    anchorItem: root.anchorItem
+    owner: root
+    bar: root.bar
+    open: root.opened && root.anchorItem !== null
+    focusTarget: keyCatcher
+    contentWidth: panel.fittedContentWidth(Style.space(380))
+    contentHeight: panel.fittedContentHeight(contentColumn.implicitHeight)
+
+    PanelKeyCatcher {
+      id: keyCatcher
+
+      anchors.fill: parent
+      onMoveRequested: function(dx, dy) { root.moveCursor(dx, dy) }
+      onActivateRequested: root.activateCursor()
+      onCloseRequested: root.close()
+
+      Column {
+        id: contentColumn
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        spacing: Style.space(14)
+
+        PanelHero {
+          id: hero
+
+          width: parent.width
+          iconComponent: heroIconComponent
+          title: "Bar"
+          meta: root.heroPhraseText
+          foreground: root.foreground
+          fontFamily: root.fontFamily
+        }
+
+        Column {
+          width: parent.width
+          spacing: Style.space(8)
+
+          PanelSectionHeader {
+            text: "APPEARANCE"
+            foreground: root.foreground
+            fontFamily: root.fontFamily
+          }
+
+          Toggle {
+            width: parent.width
+            label: "Transparency"
+            description: root.transparent ? "Wallpaper visible" : "Solid background"
+            checked: root.transparent
+            hasCursor: root.cursorActive && root.focusSection === "transparency"
+            foreground: root.foreground
+            accent: Color.accent
+            fontFamily: root.fontFamily
+            onClicked: root.setTransparency(!root.transparent)
+            onHovered: function(h) {
+              if (!h) return
+              root.cursorActive = true
+              root.focusSection = "transparency"
+            }
+          }
+        }
+
+        Column {
+          width: parent.width
+          spacing: Style.space(8)
+
+          PanelSectionHeader {
+            text: "POSITION"
+            foreground: root.foreground
+            fontFamily: root.fontFamily
+          }
+
+          ButtonGroup {
+            id: positionGroup
+
+            width: parent.width
+            options: root.positionOptions
+            value: root.currentPosition
+            foreground: root.foreground
+            background: "transparent"
+            accent: Color.accent
+            fontFamily: root.fontFamily
+            focusable: false
+            cursorIndex: root.cursorActive && root.focusSection === "position" ? root.positionIndex : -1
+            onChanged: function(value) { root.setPosition(value) }
+            onHovered: function(index, hovered) {
+              if (!hovered) return
+              root.cursorActive = true
+              root.focusSection = "position"
+              root.positionIndex = index
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/bar/BarModel.js b/shell/plugins/bar/BarModel.js
new file mode 100644
index 00000000..e94d8a4f
--- /dev/null
+++ b/shell/plugins/bar/BarModel.js
@@ -0,0 +1,114 @@
+function isPlainObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value)
+}
+
+function normalizePosition(value) {
+  var next = String(value || "").trim()
+  return /^(top|bottom|left|right)$/.test(next) ? next : "top"
+}
+
+function entrySettings(entry) {
+  if (!isPlainObject(entry)) return {}
+  var copy = {}
+  for (var key in entry) {
+    if (key === "id") continue
+    copy[key] = entry[key]
+  }
+  return copy
+}
+
+function entryId(entry) {
+  if (typeof entry === "string") return entry
+  if (isPlainObject(entry)) {
+    var id = entry["id"]
+    if (id !== undefined && id !== null && String(id) !== "") return String(id)
+  }
+  return ""
+}
+
+function pinTrayToInner(entries, section) {
+  var trayEntry = null
+  var result = []
+  var values = Array.isArray(entries) ? entries : []
+  for (var i = 0; i < values.length; i++) {
+    if (entryId(values[i]) === "omarchy.tray") trayEntry = values[i]
+    else result.push(values[i])
+  }
+  if (trayEntry) {
+    if (section === "right") result.unshift(trayEntry)
+    else result.push(trayEntry)
+  }
+  return result
+}
+
+function moduleString(entry, key, fallback) {
+  var settings = entrySettings(entry)
+  var value = settings[key]
+  return value === undefined || value === null ? fallback : String(value)
+}
+
+function entryIndex(entries, name) {
+  if (!Array.isArray(entries)) return -1
+  for (var i = 0; i < entries.length; i++) {
+    if (entryId(entries[i]) === name) return i
+  }
+  return -1
+}
+
+function entriesBefore(entries, name) {
+  var index = entryIndex(entries, name)
+  return index <= 0 ? [] : entries.slice(0, index)
+}
+
+function entriesAfter(entries, name) {
+  var index = entryIndex(entries, name)
+  return index === -1 ? [] : entries.slice(index + 1)
+}
+
+function expandPath(value, home) {
+  var path = String(value || "")
+  if (path === "") return ""
+  if (path.indexOf("~/") === 0) return home + path.substring(1)
+  if (path.indexOf("$HOME/") === 0) return home + path.substring(5)
+  return path
+}
+
+function customModuleSafeName(name) {
+  var value = String(name || "")
+  return value !== "" && value.indexOf("..") === -1 && value[0] !== "/"
+}
+
+function customModuleType(entry) {
+  var settings = entrySettings(entry)
+  var type = String(settings.type || "")
+  if (type) return type
+  if (settings.exec) return "command"
+  if (settings.source) return "qml"
+  return ""
+}
+
+function customModulePath(entry, home, configDir) {
+  var settings = entrySettings(entry)
+  var name = entryId(entry)
+  var source = settings.source ? expandPath(settings.source, home) : ""
+  if (!source && customModuleSafeName(name))
+    source = String(configDir || "") + "/bar/modules/" + String(name) + ".qml"
+  return source
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    normalizePosition: normalizePosition,
+    entrySettings: entrySettings,
+    entryId: entryId,
+    pinTrayToInner: pinTrayToInner,
+    moduleString: moduleString,
+    entryIndex: entryIndex,
+    entriesBefore: entriesBefore,
+    entriesAfter: entriesAfter,
+    expandPath: expandPath,
+    customModuleSafeName: customModuleSafeName,
+    customModuleType: customModuleType,
+    customModulePath: customModulePath
+  }
+}
diff --git a/shell/plugins/bar/README.md b/shell/plugins/bar/README.md
new file mode 100644
index 00000000..437a289a
--- /dev/null
+++ b/shell/plugins/bar/README.md
@@ -0,0 +1,185 @@
+# Omarchy bar
+
+This is the Quickshell implementation of the Omarchy status bar. It is
+shipped as a first-party plugin of [`omarchy-shell`](../../README.md), the
+long-running shell host. The bar is mounted at startup and lives inside
+the shell for its whole session.
+
+- `manifest.json` declares the plugin (`id: omarchy.bar`, `kind: bar`) and points at `Bar.qml` as the entry point.
+- `Bar.qml` is Omarchy-owned bar engine code, loaded by the omarchy-shell host. Users should not edit it directly.
+- `widgets/` holds simple first-party bar widgets with sibling manifests.
+- Feature plugins such as `../panels/audio/`, `../panels/network/`, `../panels/power/`, and `../model-usage/` provide richer popup bar plugins.
+- The bar receives its config from the host shell as a `barConfig` property; the host loads it from `~/.config/omarchy/shell.json` (or `config/omarchy/shell.json` when the user has no file).
+- `omarchy-style-bar-position` updates only the user shell.json file.
+
+## Customizing
+
+The bar config lives under the `bar:` key of [`~/.config/omarchy/shell.json`](../../README.md#shelljson-shape). Out of the box the shell uses [`config/omarchy/shell.json`](../../../config/omarchy/shell.json). Once you customize anything via the inline bar config panel, `omarchy plugin bar ...`, or by editing shell.json directly, your file is canonical — there is no deep-merge.
+
+Open quick position and transparency controls with `omarchy launch bar settings` / `omarchy plugin bar settings` (or run `omarchy-launch-bar-settings`). You can also hover the centered clock module to reveal the inline bar config button. For scriptable widget changes, use `omarchy plugin bar list`, `omarchy plugin bar add`, `omarchy plugin bar move`, `omarchy plugin bar remove`, and `omarchy plugin bar set`. Double-left-click empty center-bar space to toggle bar transparency.
+
+Example `shell.json` (bar subtree only shown):
+
+```json
+{
+  "version": 1,
+  "bar": {
+    "position": "top",
+    "transparent": false,
+    "centerAnchor": "omarchy.clock",
+    "layout": {
+      "left": [
+        { "id": "omarchy.menu" },
+        { "id": "omarchy.spacer", "size": 12 },
+        { "id": "omarchy.workspaces" }
+      ],
+      "center": [
+        { "id": "omarchy.media" },
+        { "id": "omarchy.clock", "format": "HH:mm" }
+      ],
+      "right": [
+        { "id": "omarchy.audio" },
+        { "id": "omarchy.power" }
+      ]
+    }
+  }
+}
+```
+
+`centerAnchor` pins one center module to the exact horizontal/vertical center and flanks others around it. Set to an empty string to disable anchoring (the center list is centered as a group).
+
+## Module catalogue
+
+### First-party interactive widgets
+
+| Name | What it does | Interactions |
+|---|---|---|
+| `omarchy.menu` | Omarchy menu launcher | left = menu · right = terminal |
+| `omarchy.workspaces` | Hyprland workspace switcher | left = focus workspace |
+| `omarchy.clock` | Date/time label | left = alternate format · right = timezone selector |
+| `omarchy.media` | MPRIS now-playing — scrolling track + artist, cover-art popup | left = play/pause · middle = next · scroll = prev/next · right = popup |
+| `omarchy.indicators` | Manual state indicators | left = indicator action |
+| `omarchy.notifications` | Bell with badge + popup with recent notifications, DND toggle | left = popup · right = toggle DND |
+| `omarchy.system-update` | Available update indicator | left = update |
+| `omarchy.system-stats` | Inline CPU + memory sparklines, popup with detail | left = popup · right = terminal |
+| `omarchy.tray` | System tray | hover = reveal drawer · right on chevron = manage |
+| `omarchy.weather` | Weather icon + popup with forecast | left = popup · right = full notification |
+| `omarchy.microphone` | Mic icon + scroll volume | left = mute toggle · middle = audio panel · scroll = source volume |
+
+| `omarchy.audio` | Volume icon + popup with master slider, output-device picker, per-app mixer | left = popup · right = mute · middle = popup · scroll = volume |
+| `omarchy.network` | Wi-Fi/Ethernet icon + popup with Wi-Fi scan, signal, connect, DNS provider selection | left = popup · right = nmtui |
+| `omarchy.tailscale` | Tailscale status, connection switcher, machine browser, and copy actions | left = popup · right = toggle · middle = refresh |
+| `omarchy.model-usage` | Claude Code and Codex usage, limits, synced usage aggregation, and settings | left = popup · right = settings · middle = refresh |
+| `omarchy.power` | Battery/AC icon + popup with battery stats, power profiles, and system info | left = popup |
+| `omarchy.bluetooth` | Bluetooth icon + popup with device list, connect/disconnect, battery | left = popup · right = toggle radio · middle = bluetoothctl TUI |
+| `omarchy.monitor` | Brightness and laptop display controls | left = popup |
+
+The `omarchy.indicators` widget loads individual bar indicators from `indicators/`. Omit `items` (or set it to an empty array) to show all indicators in the default order, or set `items` to a subset such as `["Dnd", "Reminder", "NightLight"]`. Set `alwaysShow` to `true` to keep inactive indicators visible instead of revealing them only on hover. Multiple `omarchy.indicators` instances are allowed, so different sections can show different subsets.
+
+## Orientation
+
+All widgets work in `top`, `bottom`, `left`, and `right` positions. Popups anchor on the side opposite the bar edge, sliding into the workspace. Vertical bars use 28px width; widgets that show text fall back to compact icon-only forms (e.g. `media` hides its scrolling label).
+
+## Custom user modules
+
+The schema accepts arbitrary module ids that you provide. Set `type` to `command` for shell-driven output or `qml` for a custom QML widget. Both still go under `bar.layout.<section>` in `shell.json`.
+
+Command module:
+
+```json
+{
+  "version": 1,
+  "bar": {
+    "layout": {
+      "right": [
+        { "id": "omarchy.tray" },
+        { "id": "vpn", "type": "command", "exec": "~/.config/omarchy/bar/scripts/vpn-status", "interval": 5, "tooltip": "VPN", "onClick": "nm-connection-editor" },
+        { "id": "omarchy.audio" }
+      ]
+    }
+  }
+}
+```
+
+The command may print plain text or Waybar-style JSON, for example:
+
+```json
+{"text":"󰌆","tooltip":"Work VPN","class":"active"}
+```
+
+QML module:
+
+```json
+{
+  "version": 1,
+  "bar": {
+    "layout": {
+      "right": [
+        { "id": "gpu", "type": "qml" },
+        { "id": "omarchy.audio" }
+      ]
+    }
+  }
+}
+```
+
+Then create `~/.config/omarchy/bar/modules/gpu.qml`. If you want to store it elsewhere, add a `source` path.
+
+Custom QML modules should be an `Item` with `implicitWidth` and `implicitHeight`. They may optionally define these properties, which the bar fills after loading:
+
+```qml
+import QtQuick
+
+Item {
+  property var bar
+  property string moduleName
+  property var settings
+
+  implicitWidth: 28
+  implicitHeight: bar ? bar.barSize : 26
+
+  Text {
+    anchors.centerIn: parent
+    text: "GPU"
+    color: bar ? bar.foreground : "white"
+    font.family: bar ? bar.fontFamily : "monospace"
+    font.pixelSize: 12
+  }
+
+  MouseArea {
+    anchors.fill: parent
+    onClicked: if (bar) bar.run("omarchy-launch-or-focus-tui btop")
+  }
+}
+```
+
+## Bar properties available to widgets
+
+Widgets receive `bar` (the shell root), `moduleName` (string), and `settings` (object) injected at load time. The bar exposes:
+
+- `bar.foreground`, `bar.background`, `bar.urgent` — theme colors (live-updated)
+- `bar.fontFamily` — current monospace family
+- `bar.position` — `"top" | "bottom" | "left" | "right"`
+- `bar.vertical` — boolean shortcut
+- `bar.barSize` — 26 horizontal / 28 vertical
+- `bar.run(command)` — fire-and-forget bash exec
+- `bar.shellQuote(value)` — safe shell-quote a string
+- `bar.showTooltip(target, text)` / `bar.hideTooltip(target)` — shared tooltip popup
+- `bar.requestPopout(owner)` / `bar.releasePopout(owner)` — one-popup-at-a-time coordinator
+
+First-party bar widgets are manifest-backed just like third-party widgets.
+Simple widgets carry sibling manifests such as `widgets/Clock.manifest.json`;
+richer popup plugins live in feature directories such as `../panels/audio/`,
+`../panels/network/`, and `../model-usage/`; and feature plugins such as `omarchy.menu`, `omarchy.media`, and
+`omarchy.notifications` declare their bar-widget entry points in their own
+`manifest.json`. Bar layout ids are namespaced, e.g. `omarchy.audio`,
+`omarchy.network`, and `omarchy.clock`. Older UpperCamelCase ids such as
+`AudioPanel` and `Clock` are migrated forward; new configs should use the
+namespaced ids.
+
+Third-party widgets ship as separate plugins under
+`~/.config/omarchy/plugins/<plugin-id>/` with their own `manifest.json`
+declaring `kinds: ["bar-widget"]` and a `barWidget` entry point. See
+[../../README.md](../../README.md) for the manifest schema. Enable,
+rescan, and place third-party plugins with `omarchy plugin enable`,
+`omarchy plugin rescan`, and `omarchy plugin bar add`.
diff --git a/shell/plugins/bar/indicators/Dictation.qml b/shell/plugins/bar/indicators/Dictation.qml
new file mode 100644
index 00000000..77d12058
--- /dev/null
+++ b/shell/plugins/bar/indicators/Dictation.qml
@@ -0,0 +1,38 @@
+import QtQuick
+import Quickshell.Io
+import qs.Ui
+
+BarIndicator {
+  id: root
+
+  property string state: "idle"
+  property string icon: ""
+
+  active: state === "recording"
+  activeText: icon
+  inactiveText: "󰍬"
+  activeTooltipText: state
+  inactiveTooltipText: "Dictate"
+
+  function update(raw) {
+    var data = extractData(raw)
+
+    state = String(data.alt || data.class || "idle")
+    if (state === "recording") icon = "󰍬"
+    else if (state === "transcribing") icon = "󰔟"
+    else icon = ""
+  }
+
+  Process {
+    command: ["bash", "-lc", "omarchy-voxtype-status"]
+    running: true
+    stdout: SplitParser {
+      onRead: function(data) { root.update(data) }
+    }
+  }
+
+  onPressed: function() {
+    if (!root.bar) return
+    root.bar.run("omarchy-voxtype-config")
+  }
+}
diff --git a/shell/plugins/bar/indicators/Dnd.qml b/shell/plugins/bar/indicators/Dnd.qml
new file mode 100644
index 00000000..89b0319b
--- /dev/null
+++ b/shell/plugins/bar/indicators/Dnd.qml
@@ -0,0 +1,24 @@
+import QtQuick
+import qs.Commons
+import qs.Ui
+
+BarIndicator {
+  id: root
+
+  readonly property var notificationService: bar && bar.shell && typeof bar.shell.firstPartyServiceFor === "function"
+    ? bar.shell.firstPartyServiceFor("omarchy.notifications")
+    : null
+  readonly property bool dnd: notificationService ? notificationService.doNotDisturb : false
+
+  active: dnd
+  activeText: "󰂛"
+  inactiveText: "󰂛"
+  activeTooltipText: "Allow Notifications"
+  inactiveTooltipText: "Silence Notifications"
+
+  onPressed: function() {
+    if (root.notificationService) {
+      root.notificationService.setDoNotDisturb(!root.notificationService.doNotDisturb)
+    }
+  }
+}
diff --git a/shell/plugins/bar/indicators/NightLight.qml b/shell/plugins/bar/indicators/NightLight.qml
new file mode 100644
index 00000000..9fadf12d
--- /dev/null
+++ b/shell/plugins/bar/indicators/NightLight.qml
@@ -0,0 +1,65 @@
+import QtQuick
+import Quickshell.Io
+import qs.Ui
+
+BarIndicator {
+  id: root
+
+  property bool nightlight: false
+
+  active: nightlight
+  activeText: "󰔎"
+  inactiveText: "󰔎"
+  activeTooltipText: "Day Light"
+  inactiveTooltipText: "Night Light"
+
+  function refresh() {
+    if (!statusProc.running) statusProc.running = true
+  }
+
+  function update(raw) {
+    var data = extractData(raw)
+    nightlight = data && data.enabled === true
+  }
+
+  function toggle() {
+    nightlight = !nightlight
+    if (root.bar) root.bar.run("omarchy-toggle-nightlight")
+    refreshTimer.restart()
+  }
+
+  Component.onCompleted: refresh()
+
+  Connections {
+    target: root.indicatorHost
+    ignoreUnknownSignals: true
+    function onRefreshRequested() { root.refresh() }
+  }
+
+  Process {
+    id: statusProc
+    command: ["omarchy-toggle-nightlight", "--status"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.update(text)
+    }
+    onExited: function(exitCode) {
+      if (exitCode !== 0) root.nightlight = false
+    }
+  }
+
+  Timer {
+    id: refreshTimer
+    interval: 1500
+    onTriggered: root.refresh()
+  }
+
+  Timer {
+    interval: 5000
+    running: true
+    repeat: true
+    onTriggered: root.refresh()
+  }
+
+  onPressed: function() { root.toggle() }
+}
diff --git a/shell/plugins/bar/indicators/Reminder.qml b/shell/plugins/bar/indicators/Reminder.qml
new file mode 100644
index 00000000..3441edbe
--- /dev/null
+++ b/shell/plugins/bar/indicators/Reminder.qml
@@ -0,0 +1,59 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Ui
+
+BarIndicator {
+  id: root
+
+  property int reminderCount: 0
+  property string tooltip: ""
+
+  active: reminderCount > 0
+  activeText: "󰢌"
+  inactiveText: "󰢌"
+  activeTooltipText: tooltip
+  inactiveTooltipText: tooltip
+
+  function refresh() {
+    if (!jsonProc.running) jsonProc.running = true
+  }
+
+  function openReminderFlow() {
+    Quickshell.execDetached(["omarchy-reminder", "-i"])
+  }
+
+  function update(raw) {
+    var data = extractData(raw)
+    reminderCount = Number(data.count || 0)
+    tooltip = String(data.tooltip || "")
+  }
+
+  Component.onCompleted: refresh()
+
+  Connections {
+    target: root.indicatorHost
+    ignoreUnknownSignals: true
+    function onRefreshRequested() { root.refresh() }
+  }
+
+  Process {
+    id: jsonProc
+    command: ["omarchy-reminder", "show", "--json"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.update(text)
+    }
+    onExited: function(exitCode) {
+      if (exitCode !== 0) {
+        root.reminderCount = 0
+        root.tooltip = ""
+      }
+    }
+  }
+
+  onPressed: function() {
+    if (root.reminderCount > 0) Quickshell.execDetached(["omarchy-reminder", "show"])
+    else root.openReminderFlow()
+  }
+}
diff --git a/shell/plugins/bar/indicators/ScreenRecording.qml b/shell/plugins/bar/indicators/ScreenRecording.qml
new file mode 100644
index 00000000..271e1c39
--- /dev/null
+++ b/shell/plugins/bar/indicators/ScreenRecording.qml
@@ -0,0 +1,43 @@
+import QtQuick
+import Quickshell.Io
+import qs.Ui
+
+BarIndicator {
+  id: root
+
+  property bool recording: false
+
+  active: recording
+  activeText: "󰻂"
+  inactiveText: "󰻂"
+  activeTooltipText: "Stop recording"
+  inactiveTooltipText: "Screen Recording"
+
+  function refresh() {
+    if (!root.bar || statusProc.running) return
+    statusProc.command = ["pgrep", "--quiet", "-f", "^gpu-screen-recorder"]
+    statusProc.running = true
+  }
+
+  onBarChanged: refresh()
+  Component.onCompleted: refresh()
+
+  Connections {
+    target: root.indicatorHost
+    ignoreUnknownSignals: true
+    function onRefreshRequested() { root.refresh() }
+  }
+
+  Process {
+    id: statusProc
+    onExited: function(exitCode) {
+      root.recording = exitCode === 0
+    }
+  }
+
+  onPressed: function() {
+    if (root.bar) {
+      root.bar.run(root.recording ? "omarchy-capture-screenrecording --stop-recording" : "omarchy-menu toggle trigger.capture.screenrecord")
+    }
+  }
+}
diff --git a/shell/plugins/bar/indicators/StayAwake.qml b/shell/plugins/bar/indicators/StayAwake.qml
new file mode 100644
index 00000000..c6ecb37f
--- /dev/null
+++ b/shell/plugins/bar/indicators/StayAwake.qml
@@ -0,0 +1,59 @@
+import QtQuick
+import Quickshell.Io
+import qs.Ui
+
+BarIndicator {
+  id: root
+
+  activeText: "󰅶"
+  inactiveText: "󰅶"
+  activeTooltipText: "Allow Idle Lock & Screensaver"
+  inactiveTooltipText: "Stay Awake"
+
+  function refresh() {
+    if (!statusProc.running) statusProc.running = true
+  }
+
+  function toggle() {
+    if (root.bar) root.bar.run("omarchy-toggle-idle")
+    refreshTimer.restart()
+  }
+
+  Component.onCompleted: refresh()
+
+  Connections {
+    target: root.indicatorHost
+    ignoreUnknownSignals: true
+    function onRefreshRequested() { root.refresh() }
+  }
+
+  Process {
+    id: statusProc
+    command: ["omarchy-toggle-idle", "--status"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        var data = root.extractData(text)
+        root.active = data && data.enabled === true
+      }
+    }
+    onExited: function(exitCode) {
+      if (exitCode !== 0) root.active = false
+    }
+  }
+
+  Timer {
+    id: refreshTimer
+    interval: 1500
+    onTriggered: root.refresh()
+  }
+
+  Timer {
+    interval: 5000
+    running: true
+    repeat: true
+    onTriggered: root.refresh()
+  }
+
+  onPressed: function() { root.toggle() }
+}
diff --git a/shell/plugins/bar/manifest.json b/shell/plugins/bar/manifest.json
new file mode 100644
index 00000000..d929c0a1
--- /dev/null
+++ b/shell/plugins/bar/manifest.json
@@ -0,0 +1,14 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.bar",
+  "name": "Bar",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Status bar with widgets",
+  "kinds": [
+    "bar"
+  ],
+  "entryPoints": {
+    "bar": "Bar.qml"
+  }
+}
diff --git a/shell/plugins/bar/widgets/ActiveWindow.manifest.json b/shell/plugins/bar/widgets/ActiveWindow.manifest.json
new file mode 100644
index 00000000..112b0a22
--- /dev/null
+++ b/shell/plugins/bar/widgets/ActiveWindow.manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.active-window",
+  "name": "Active window",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Title of the focused window",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "ActiveWindow.qml"
+  },
+  "barWidget": {
+    "displayName": "Active window",
+    "description": "Title of the focused window",
+    "category": "Compositor",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/bar/widgets/ActiveWindow.qml b/shell/plugins/bar/widgets/ActiveWindow.qml
new file mode 100644
index 00000000..97ccce8d
--- /dev/null
+++ b/shell/plugins/bar/widgets/ActiveWindow.qml
@@ -0,0 +1,63 @@
+import QtQuick
+import Quickshell
+import Quickshell.Wayland
+import qs.Commons
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.active-window"
+
+
+  readonly property var toplevel: ToplevelManager.activeToplevel
+  readonly property string title: toplevel ? (toplevel.title || toplevel.appId || "") : ""
+  readonly property int maxLabelWidth: Number(setting("maxWidth", 280))
+
+  visible: title !== "" && !vertical
+  implicitWidth: visible ? Math.min(maxLabelWidth, labelText.implicitWidth) + Style.spacing.controlPaddingX * 2 : 0
+  implicitHeight: barSize
+
+  Behavior on implicitWidth {
+    NumberAnimation { duration: 180; easing.type: Easing.OutCubic }
+  }
+
+  Item {
+    anchors.fill: parent
+    anchors.leftMargin: Style.space(8)
+    anchors.rightMargin: Style.space(8)
+    clip: true
+
+    Text {
+      id: labelText
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.left: parent.left
+      width: parent.width
+      text: root.title
+      color: root.bar ? root.bar.barForeground : Color.foreground
+      font.family: root.bar ? root.bar.fontFamily : Style.font.family
+      font.pixelSize: Style.font.body
+      elide: Text.ElideRight
+      opacity: 0.85
+    }
+  }
+
+  MouseArea {
+    anchors.fill: parent
+    hoverEnabled: true
+    acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+    cursorShape: Qt.PointingHandCursor
+
+    onClicked: function(mouse) {
+      if (!root.toplevel) return
+      if (mouse.button === Qt.MiddleButton) {
+        root.toplevel.close()
+      } else if (mouse.button === Qt.RightButton) {
+        root.toplevel.close()
+      } else {
+        root.toplevel.activate()
+      }
+    }
+    onEntered: if (root.bar) root.bar.showTooltip(root, root.title)
+    onExited: if (root.bar) root.bar.hideTooltip(root)
+  }
+}
diff --git a/shell/plugins/bar/widgets/Clock.manifest.json b/shell/plugins/bar/widgets/Clock.manifest.json
new file mode 100644
index 00000000..119dbb96
--- /dev/null
+++ b/shell/plugins/bar/widgets/Clock.manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.clock",
+  "name": "Clock",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Day/time label; click to toggle alternate format",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Clock.qml"
+  },
+  "barWidget": {
+    "displayName": "Clock",
+    "description": "Day/time label; click to toggle alternate format",
+    "category": "Time",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/bar/widgets/Clock.qml b/shell/plugins/bar/widgets/Clock.qml
new file mode 100644
index 00000000..fba368c0
--- /dev/null
+++ b/shell/plugins/bar/widgets/Clock.qml
@@ -0,0 +1,66 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.clock"
+
+  property bool alt: false
+  property date displayDate: clock.date
+
+  readonly property string activeFormat: alt
+    ? setting("formatAlt", "d MMMM 'W'ww yyyy")
+    : (bar && bar.vertical ? setting("verticalFormat", "HH\n—\nmm") : setting("format", "dddd HH:mm"))
+
+  function refresh() {
+    displayDate = new Date()
+  }
+
+  function isoWeek(date) {
+    var d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()))
+    var day = d.getUTCDay() || 7
+    d.setUTCDate(d.getUTCDate() + 4 - day)
+    var yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1))
+    return Math.ceil(((d - yearStart) / 86400000 + 1) / 7)
+  }
+
+  function isoWeekLiteral(date) {
+    var week = isoWeek(date)
+    return (week < 10 ? "0" : "") + week
+  }
+
+  function formatted(date) {
+    return Qt.formatDateTime(date, activeFormat.replace(/ww/g, isoWeekLiteral(date)))
+  }
+
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  SystemClock {
+    id: clock
+    precision: SystemClock.Minutes
+    onDateChanged: root.displayDate = date
+  }
+
+  IpcHandler {
+    target: "omarchy.clock"
+    function refresh(): void { root.refresh() }
+  }
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: root.formatted(root.displayDate)
+    horizontalMargin: 8.75
+    verticalPadding: 8.75
+    onPressed: function(button) {
+      if (!root.bar) return
+      if (button === Qt.RightButton) root.bar.run("omarchy-menu-timezone")
+      else root.alt = !root.alt
+    }
+  }
+}
diff --git a/shell/plugins/bar/widgets/Indicators.manifest.json b/shell/plugins/bar/widgets/Indicators.manifest.json
new file mode 100644
index 00000000..858e758d
--- /dev/null
+++ b/shell/plugins/bar/widgets/Indicators.manifest.json
@@ -0,0 +1,70 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.indicators",
+  "name": "Indicators",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Manual state indicators",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Indicators.qml"
+  },
+  "barWidget": {
+    "displayName": "Indicators",
+    "description": "Manual state indicators",
+    "category": "Status",
+    "allowMultiple": true,
+    "schema": [
+      {
+        "key": "items",
+        "type": "multiselect",
+        "label": "Indicators",
+        "description": "Choose which indicators this widget instance should show. Leave empty to show all indicators.",
+        "noSelectionText": "All indicators",
+        "placeholderText": "Search indicators...",
+        "emptyText": "No indicators",
+        "options": [
+          {
+            "value": "Dnd",
+            "label": "Do not disturb",
+            "description": "Notification silencing"
+          },
+          {
+            "value": "Reminder",
+            "label": "Reminder",
+            "description": "Queued reminder status"
+          },
+          {
+            "value": "NightLight",
+            "label": "Night light",
+            "description": "Blue-light filter"
+          },
+          {
+            "value": "StayAwake",
+            "label": "Stay awake",
+            "description": "Idle lock and screensaver override"
+          },
+          {
+            "value": "ScreenRecording",
+            "label": "Screen recording",
+            "description": "GPU screen recorder status"
+          },
+          {
+            "value": "Dictation",
+            "label": "Dictation",
+            "description": "Voice typing status"
+          }
+        ]
+      },
+      {
+        "key": "alwaysShow",
+        "type": "boolean",
+        "label": "Always Show",
+        "description": "Show inactive indicators without waiting for hover.",
+        "defaultValue": false
+      }
+    ]
+  }
+}
diff --git a/shell/plugins/bar/widgets/Indicators.qml b/shell/plugins/bar/widgets/Indicators.qml
new file mode 100644
index 00000000..dde04ee9
--- /dev/null
+++ b/shell/plugins/bar/widgets/Indicators.qml
@@ -0,0 +1,467 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.indicators"
+
+  readonly property int indicatorSlotExtent: Style.space(22)
+  readonly property var defaultIndicatorEntries: [ "Dnd", "Reminder", "NightLight", "StayAwake", "ScreenRecording", "Dictation" ]
+  readonly property int inactiveSlotExtent: indicatorEntries.length * indicatorSlotExtent
+  readonly property var indicatorEntries: indicatorEntriesFromSettings(settings)
+  property var activeIndicatorIds: []
+  property var indicatorActiveStates: ({})
+  property bool indicatorAreaHovered: false
+  property bool indicatorItemHovered: false
+  readonly property bool alwaysShowIndicators: setting("alwaysShow", false) === true
+  readonly property bool revealInactiveIndicators: alwaysShowIndicators || indicatorAreaHovered || indicatorItemHovered || (bar && bar.centerSectionRevealHeld === true && bar.centerHoverRevealSuppressed !== true)
+
+  signal refreshRequested()
+
+  ListModel { id: activeIndicatorModel }
+
+  function entryId(entry) {
+    if (typeof entry === "string") return entry
+    if (Util.isPlainObject(entry)) {
+      var id = entry["id"]
+      if (id !== undefined && id !== null && String(id) !== "") return String(id)
+    }
+    return ""
+  }
+
+  function entrySettings(entry) {
+    if (!Util.isPlainObject(entry)) return {}
+    var copy = {}
+    for (var key in entry) {
+      if (key === "id") continue
+      copy[key] = entry[key]
+    }
+    return copy
+  }
+
+  function indicatorEntriesFromSettings(settings) {
+    var source = defaultIndicatorEntries
+    if (settings.items && typeof settings.items.length === "number" && settings.items.length > 0) source = settings.items
+    else if (settings.indicators && typeof settings.indicators.length === "number" && settings.indicators.length > 0) source = settings.indicators
+
+    var result = []
+    for (var i = 0; i < source.length; i++) {
+      var item = source[i]
+      if (typeof item !== "string" && item !== null && typeof item === "object") {
+        try {
+          item = JSON.parse(JSON.stringify(item))
+        } catch (error) {
+        }
+      }
+      var id = entryId(item)
+      if (id !== "") result.push(item)
+    }
+    return result
+  }
+
+  function setIndicatorAreaHovered(hovered) {
+    indicatorAreaHovered = hovered
+    if (hovered) indicatorHideTimer.stop()
+    else indicatorHideTimer.restart()
+  }
+
+  function setIndicatorItemHovered(hovered) {
+    if (hovered) {
+      indicatorItemHovered = true
+      indicatorHideTimer.stop()
+    } else {
+      indicatorHideTimer.restart()
+    }
+  }
+
+  function hasIndicatorId(id) {
+    for (var i = 0; i < indicatorEntries.length; i++) {
+      if (entryId(indicatorEntries[i]) === id) return true
+    }
+    return false
+  }
+
+  function entryForId(id) {
+    for (var i = 0; i < indicatorEntries.length; i++) {
+      var entry = indicatorEntries[i]
+      if (entryId(entry) === id) return entry
+    }
+
+    return { id: id }
+  }
+
+  function activeModelIndex(id) {
+    for (var i = 0; i < activeIndicatorModel.count; i++) {
+      if (activeIndicatorModel.get(i).activeId === id) return i
+    }
+    return -1
+  }
+
+  function copyActiveStates() {
+    var states = {}
+    for (var id in indicatorActiveStates) {
+      if (indicatorActiveStates[id] === true) states[id] = true
+    }
+    return states
+  }
+
+  function orderedActiveIds(states, preferredOrder) {
+    var ids = []
+
+    for (var i = 0; i < preferredOrder.length; i++) {
+      var id = preferredOrder[i]
+      if (ids.indexOf(id) === -1 && hasIndicatorId(id) && states[id] === true) ids.push(id)
+    }
+
+    return ids
+  }
+
+  function syncActiveIndicatorModel() {
+    for (var i = activeIndicatorModel.count - 1; i >= 0; i--) {
+      if (activeIndicatorIds.indexOf(activeIndicatorModel.get(i).activeId) === -1)
+        activeIndicatorModel.remove(i)
+    }
+
+    for (var j = 0; j < activeIndicatorIds.length; j++) {
+      var id = activeIndicatorIds[j]
+      var index = activeModelIndex(id)
+      if (index === -1) activeIndicatorModel.insert(j, { activeId: id })
+      else if (index !== j) activeIndicatorModel.move(index, j, 1)
+    }
+  }
+
+  function setIndicatorActive(entry, active) {
+    var id = entryId(entry)
+    if (id === "") return
+
+    var states = copyActiveStates()
+    if (active) states[id] = true
+    else delete states[id]
+
+    indicatorActiveStates = states
+
+    var ids = orderedActiveIds(states, activeIndicatorIds)
+    if (active && ids.indexOf(id) === -1 && hasIndicatorId(id)) ids.push(id)
+    activeIndicatorIds = ids
+    syncActiveIndicatorModel()
+  }
+
+  function syncActiveIndicatorOrder() {
+    activeIndicatorIds = orderedActiveIds(indicatorActiveStates, activeIndicatorIds)
+    syncActiveIndicatorModel()
+  }
+
+  onIndicatorEntriesChanged: syncActiveIndicatorOrder()
+
+  implicitWidth: root.vertical ? verticalIndicators.implicitWidth : horizontalIndicators.implicitWidth
+  implicitHeight: root.vertical ? verticalIndicators.implicitHeight : horizontalIndicators.implicitHeight
+
+  IpcHandler {
+    target: "omarchy.indicators"
+
+    function refresh(): void {
+      root.refreshRequested()
+    }
+  }
+
+  Timer {
+    id: indicatorHideTimer
+    interval: 120
+    onTriggered: {
+      if (!root.indicatorAreaHovered)
+        root.indicatorItemHovered = false
+    }
+  }
+
+  Timer {
+    interval: 2000
+    running: true
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: root.refreshRequested()
+  }
+
+  Row {
+    id: horizontalIndicators
+
+    visible: !root.vertical
+    spacing: 0
+
+    HoverHandler {
+      onHoveredChanged: root.setIndicatorAreaHovered(hovered)
+    }
+
+    ActiveIndicatorBlock {
+      indicatorsModule: root
+      indicatorModel: activeIndicatorModel
+      horizontal: true
+      reportActiveState: !root.vertical
+    }
+
+    Item {
+      id: inactiveHorizontalArea
+
+      implicitWidth: Math.max(inactiveHorizontalBlock.implicitWidth, root.inactiveSlotExtent)
+      implicitHeight: Math.max(inactiveHorizontalBlock.implicitHeight, root.barSize)
+      width: implicitWidth
+      height: implicitHeight
+
+      IndicatorBlock {
+        id: inactiveHorizontalBlock
+        anchors.fill: parent
+        indicatorsModule: root
+        indicatorEntries: root.indicatorEntries
+        indicatorBlock: "inactive"
+        horizontal: true
+        reportActiveState: !root.vertical
+      }
+
+      HoverHandler {
+        onHoveredChanged: root.setIndicatorAreaHovered(hovered)
+      }
+    }
+  }
+
+  Column {
+    id: verticalIndicators
+
+    visible: root.vertical
+    spacing: 0
+
+    HoverHandler {
+      onHoveredChanged: root.setIndicatorAreaHovered(hovered)
+    }
+
+    ActiveIndicatorBlock {
+      indicatorsModule: root
+      indicatorModel: activeIndicatorModel
+      horizontal: false
+      reportActiveState: root.vertical
+    }
+
+    Item {
+      id: inactiveVerticalArea
+
+      implicitWidth: Math.max(inactiveVerticalBlock.implicitWidth, root.barSize)
+      implicitHeight: Math.max(inactiveVerticalBlock.implicitHeight, root.inactiveSlotExtent)
+      width: implicitWidth
+      height: implicitHeight
+
+      IndicatorBlock {
+        id: inactiveVerticalBlock
+        anchors.fill: parent
+        indicatorsModule: root
+        indicatorEntries: root.indicatorEntries
+        indicatorBlock: "inactive"
+        horizontal: false
+        reportActiveState: root.vertical
+      }
+
+      HoverHandler {
+        onHoveredChanged: root.setIndicatorAreaHovered(hovered)
+      }
+    }
+  }
+
+  HoverHandler {
+    onHoveredChanged: root.setIndicatorAreaHovered(hovered)
+  }
+
+  component ActiveIndicatorBlock: Item {
+    id: activeIndicatorBlockRoot
+
+    property var indicatorModel: null
+    property var indicatorsModule: null
+    property bool horizontal: true
+    property bool reportActiveState: false
+
+    implicitWidth: blockLoader.item ? blockLoader.item.childrenRect.width : 0
+    implicitHeight: blockLoader.item ? blockLoader.item.childrenRect.height : 0
+    width: implicitWidth
+    height: implicitHeight
+
+    Loader {
+      id: blockLoader
+
+      anchors.fill: parent
+      sourceComponent: activeIndicatorBlockRoot.horizontal ? horizontalActiveIndicatorBlock : verticalActiveIndicatorBlock
+    }
+
+    Component {
+      id: horizontalActiveIndicatorBlock
+
+      Row {
+        spacing: 0
+
+        Repeater {
+          model: activeIndicatorBlockRoot.indicatorModel
+
+          IndicatorLoader {
+            required property string activeId
+            indicatorsModule: activeIndicatorBlockRoot.indicatorsModule
+            entry: activeIndicatorBlockRoot.indicatorsModule.entryForId(activeId)
+            indicatorBlock: "active"
+            reportActiveState: activeIndicatorBlockRoot.reportActiveState
+          }
+        }
+      }
+    }
+
+    Component {
+      id: verticalActiveIndicatorBlock
+
+      Column {
+        spacing: 0
+
+        Repeater {
+          model: activeIndicatorBlockRoot.indicatorModel
+
+          IndicatorLoader {
+            required property string activeId
+            indicatorsModule: activeIndicatorBlockRoot.indicatorsModule
+            entry: activeIndicatorBlockRoot.indicatorsModule.entryForId(activeId)
+            indicatorBlock: "active"
+            reportActiveState: activeIndicatorBlockRoot.reportActiveState
+          }
+        }
+      }
+    }
+  }
+
+  component IndicatorBlock: Item {
+    id: indicatorBlockRoot
+
+    property var indicatorEntries: []
+    property var indicatorsModule: null
+    property string indicatorBlock: "active"
+    property bool horizontal: true
+    property bool reportActiveState: false
+
+    implicitWidth: blockLoader.item ? blockLoader.item.childrenRect.width : 0
+    implicitHeight: blockLoader.item ? blockLoader.item.childrenRect.height : 0
+    width: implicitWidth
+    height: implicitHeight
+
+    Loader {
+      id: blockLoader
+
+      anchors.fill: parent
+      sourceComponent: indicatorBlockRoot.horizontal ? horizontalIndicatorBlock : verticalIndicatorBlock
+    }
+
+    Component {
+      id: horizontalIndicatorBlock
+
+      Row {
+        spacing: 0
+
+        Repeater {
+          model: indicatorBlockRoot.indicatorEntries
+
+          IndicatorLoader {
+            required property var modelData
+            indicatorsModule: indicatorBlockRoot.indicatorsModule
+            entry: modelData
+            indicatorBlock: indicatorBlockRoot.indicatorBlock
+            reportActiveState: indicatorBlockRoot.reportActiveState
+          }
+        }
+      }
+    }
+
+    Component {
+      id: verticalIndicatorBlock
+
+      Column {
+        spacing: 0
+
+        Repeater {
+          model: indicatorBlockRoot.indicatorEntries
+
+          IndicatorLoader {
+            required property var modelData
+            indicatorsModule: indicatorBlockRoot.indicatorsModule
+            entry: modelData
+            indicatorBlock: indicatorBlockRoot.indicatorBlock
+            reportActiveState: indicatorBlockRoot.reportActiveState
+          }
+        }
+      }
+    }
+  }
+
+  component IndicatorLoader: Item {
+    id: indicatorSlot
+
+    required property var entry
+    property var indicatorsModule: null
+    required property string indicatorBlock
+    property bool reportActiveState: false
+    property bool activeStateObserved: false
+    readonly property string indicatorId: root.entryId(entry)
+    readonly property var indicatorSettings: root.entrySettings(entry)
+    readonly property var barRef: root.bar
+
+    implicitWidth: indicatorSource.item && indicatorSource.item.visible ? indicatorSource.item.implicitWidth : 0
+    implicitHeight: indicatorSource.item && indicatorSource.item.visible ? indicatorSource.item.implicitHeight : 0
+    width: implicitWidth
+    height: implicitHeight
+    onEntryChanged: {
+      activeStateObserved = false
+      injectProps()
+      syncActiveState()
+    }
+    onIndicatorBlockChanged: injectProps()
+    onIndicatorSettingsChanged: injectProps()
+    onIndicatorsModuleChanged: {
+      injectProps()
+      syncActiveState()
+    }
+    onReportActiveStateChanged: syncActiveState()
+    onBarRefChanged: injectProps()
+
+    Loader {
+      id: indicatorSource
+
+      anchors.fill: parent
+      source: indicatorSlot.indicatorId ? Qt.resolvedUrl("../indicators/" + indicatorSlot.indicatorId + ".qml") : ""
+      onLoaded: {
+        indicatorSlot.injectProps()
+        indicatorSlot.syncActiveState()
+      }
+      onStatusChanged: if (status === Loader.Error) console.warn("Indicator loader error", indicatorSlot.indicatorId, source)
+    }
+
+    Connections {
+      target: indicatorSource.item
+      ignoreUnknownSignals: true
+      function onActiveChanged() { indicatorSlot.syncActiveState() }
+    }
+
+    function injectProps() {
+      var target = indicatorSource.item
+      if (!target) return
+      if ("bar" in target) target.bar = root.bar
+      if ("moduleName" in target) target.moduleName = indicatorId
+      if ("settings" in target) target.settings = indicatorSettings
+      if ("indicatorBlock" in target) target.indicatorBlock = indicatorBlock
+      if ("indicatorHost" in target) target.indicatorHost = root
+      if ("activeOverride" in target) target.activeOverride = indicatorBlock === "active" ? true : null
+    }
+
+    function syncActiveState() {
+      if (!reportActiveState || !indicatorsModule || !indicatorsModule.setIndicatorActive) return
+
+      var active = !!indicatorSource.item && indicatorSource.item.active === true
+      if (indicatorBlock === "active") {
+        if (active) activeStateObserved = true
+        else if (!activeStateObserved) return
+      }
+
+      indicatorsModule.setIndicatorActive(entry, active)
+    }
+  }
+}
diff --git a/shell/plugins/bar/widgets/KeyboardLayout.manifest.json b/shell/plugins/bar/widgets/KeyboardLayout.manifest.json
new file mode 100644
index 00000000..35c12691
--- /dev/null
+++ b/shell/plugins/bar/widgets/KeyboardLayout.manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.keyboard-layout",
+  "name": "Keyboard layout",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Current xkb layout, click cycles",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "KeyboardLayout.qml"
+  },
+  "barWidget": {
+    "displayName": "Keyboard layout",
+    "description": "Current xkb layout, click cycles",
+    "category": "Compositor",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/bar/widgets/KeyboardLayout.qml b/shell/plugins/bar/widgets/KeyboardLayout.qml
new file mode 100644
index 00000000..ec9eb0bf
--- /dev/null
+++ b/shell/plugins/bar/widgets/KeyboardLayout.qml
@@ -0,0 +1,78 @@
+import QtQuick
+import Quickshell
+import Quickshell.Hyprland
+import Quickshell.Io
+import qs.Ui
+import qs.Commons
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.keyboard-layout"
+
+
+  property string layoutLabel: ""
+  property string layoutFull: ""
+
+  function refresh() {
+    if (!queryProc.running) queryProc.running = true
+  }
+
+  function cycleLayout() {
+    Hyprland.dispatch("switchxkblayout current next")
+    refreshTimer.restart()
+  }
+
+  Component.onCompleted: refresh()
+
+  Connections {
+    target: Hyprland
+    function onRawEvent(event) {
+      if (!event || !event.name) return
+      if (String(event.name).indexOf("activelayout") !== -1) root.refresh()
+    }
+  }
+
+  Process {
+    id: queryProc
+    command: ["bash", "-lc", "hyprctl -j devices 2>/dev/null | sed -n '/keyboards/,$p' | head -200"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        var match = String(text || "").match(/"active_keymap":\s*"([^"]+)"/)
+        if (!match) return
+        var full = match[1]
+        root.layoutFull = full
+        var token = full.split(/\s+/)[0]
+        root.layoutLabel = token.substring(0, 3).toUpperCase()
+      }
+    }
+  }
+
+  Timer {
+    id: refreshTimer
+    interval: 600
+    onTriggered: root.refresh()
+  }
+
+  Timer {
+    interval: 10000
+    running: true
+    repeat: true
+    onTriggered: root.refresh()
+  }
+
+  visible: layoutLabel !== ""
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: root.layoutLabel
+    fontSize: Style.font.caption
+    horizontalMargin: 6
+    tooltipText: root.layoutFull
+    onPressed: function() { root.cycleLayout() }
+  }
+}
diff --git a/shell/plugins/bar/widgets/LockKeys.manifest.json b/shell/plugins/bar/widgets/LockKeys.manifest.json
new file mode 100644
index 00000000..6db4f0fb
--- /dev/null
+++ b/shell/plugins/bar/widgets/LockKeys.manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.lock-keys",
+  "name": "Lock keys",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Caps / Num / Scroll lock indicators",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "LockKeys.qml"
+  },
+  "barWidget": {
+    "displayName": "Lock keys",
+    "description": "Caps / Num / Scroll lock indicators",
+    "category": "System",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/bar/widgets/LockKeys.qml b/shell/plugins/bar/widgets/LockKeys.qml
new file mode 100644
index 00000000..0c5f2bc9
--- /dev/null
+++ b/shell/plugins/bar/widgets/LockKeys.qml
@@ -0,0 +1,94 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.lock-keys"
+
+
+  property bool capsOn: false
+  property bool numOn: false
+  property bool scrollOn: false
+  property bool hideWhenOff: true
+
+  Component.onCompleted: {
+    hideWhenOff = setting("hideWhenOff", true) === true
+    refresh()
+  }
+
+  function refresh() {
+    if (!stateProc.running) stateProc.running = true
+  }
+
+  property bool ledsAvailable: true
+
+  Process {
+    id: stateProc
+    command: ["bash", "-lc", "read_led() { for path in /sys/class/leds/input*::$1; do if [[ -r $path/brightness ]]; then cat $path/brightness; return; fi; done; echo missing; }; read_led capslock; read_led numlock; read_led scrolllock"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        var lines = String(text || "").split("\n")
+        var caps = String(lines[0] || "").trim()
+        var num = String(lines[1] || "").trim()
+        var scroll = String(lines[2] || "").trim()
+        root.capsOn = caps !== "missing" && parseInt(caps, 10) > 0
+        root.numOn = num !== "missing" && parseInt(num, 10) > 0
+        root.scrollOn = scroll !== "missing" && parseInt(scroll, 10) > 0
+        root.ledsAvailable = caps !== "missing" || num !== "missing" || scroll !== "missing"
+      }
+    }
+  }
+
+  Timer {
+    interval: 2000
+    running: root.ledsAvailable
+    repeat: true
+    onTriggered: root.refresh()
+  }
+
+  readonly property bool anyOn: capsOn || numOn || scrollOn
+  visible: ledsAvailable && (hideWhenOff ? anyOn : true)
+
+  implicitWidth: vertical ? barSize : (lay.item ? lay.item.implicitWidth + Style.spacing.controlGap : 0)
+  implicitHeight: vertical ? (lay.item ? lay.item.implicitHeight + Style.spacing.controlGap : 0) : barSize
+
+  Loader {
+    id: lay
+    anchors.centerIn: parent
+    sourceComponent: root.vertical ? colLayout : rowLayout
+  }
+
+  Component {
+    id: rowLayout
+    Row {
+      spacing: Style.space(4)
+      LockGlyph { glyph: "A"; active: root.capsOn; visible: !root.hideWhenOff || root.capsOn }
+      LockGlyph { glyph: "1"; active: root.numOn; visible: !root.hideWhenOff || root.numOn }
+      LockGlyph { glyph: "S"; active: root.scrollOn; visible: !root.hideWhenOff || root.scrollOn }
+    }
+  }
+
+  Component {
+    id: colLayout
+    Column {
+      spacing: Style.space(2)
+      LockGlyph { glyph: "A"; active: root.capsOn; visible: !root.hideWhenOff || root.capsOn }
+      LockGlyph { glyph: "1"; active: root.numOn; visible: !root.hideWhenOff || root.numOn }
+      LockGlyph { glyph: "S"; active: root.scrollOn; visible: !root.hideWhenOff || root.scrollOn }
+    }
+  }
+
+  component LockGlyph: Text {
+    property string glyph: ""
+    property bool active: false
+
+    text: glyph
+    color: active ? (root.bar ? root.bar.barForeground : Color.foreground) : Qt.rgba(0.7, 0.7, 0.7, 0.3)
+    font.family: root.bar ? root.bar.fontFamily : Style.font.family
+    font.pixelSize: Style.font.bodySmall
+  }
+}
diff --git a/shell/plugins/bar/widgets/Microphone.manifest.json b/shell/plugins/bar/widgets/Microphone.manifest.json
new file mode 100644
index 00000000..7cc837c5
--- /dev/null
+++ b/shell/plugins/bar/widgets/Microphone.manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.microphone",
+  "name": "Microphone",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Mic input state and mute toggle",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Microphone.qml"
+  },
+  "barWidget": {
+    "displayName": "Microphone",
+    "description": "Mic input state and mute toggle",
+    "category": "Audio",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/bar/widgets/Microphone.qml b/shell/plugins/bar/widgets/Microphone.qml
new file mode 100644
index 00000000..e8052964
--- /dev/null
+++ b/shell/plugins/bar/widgets/Microphone.qml
@@ -0,0 +1,54 @@
+import QtQuick
+import Quickshell
+import Quickshell.Services.Pipewire
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.microphone"
+
+
+  readonly property var source: Pipewire.defaultAudioSource
+  readonly property bool muted: source && source.audio ? source.audio.muted : true
+  readonly property real volume: source && source.audio ? source.audio.volume : 0
+  readonly property var nodes: Pipewire.nodes ? Pipewire.nodes.values : []
+
+  readonly property var activeStreams: {
+    var list = []
+    for (var i = 0; i < nodes.length; i++) {
+      var node = nodes[i]
+      if (node && node.isStream && node.isSink === false && !node.audio?.muted) list.push(node)
+    }
+    return list
+  }
+
+  readonly property bool inUse: activeStreams.length > 0 && !muted
+
+  visible: source !== null
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  function toggleMute() {
+    if (source && source.audio) source.audio.muted = !source.audio.muted
+  }
+
+  PwObjectTracker { objects: root.source ? [root.source] : [] }
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: root.muted ? "󰍭" : "󰍬"
+    active: root.inUse
+    tooltipText: root.muted ? "Microphone muted" : (root.inUse ? "Microphone in use" : "Microphone live")
+    onPressed: function(b) {
+      if (b === Qt.MiddleButton) root.bar.run("omarchy-shell omarchy.audio toggle")
+      else root.toggleMute()
+    }
+    onWheelMoved: function(delta) {
+      if (!root.source || !root.source.audio) return
+      var step = 0.05
+      root.source.audio.volume = Math.max(0, Math.min(1, root.volume + (delta > 0 ? step : -step)))
+    }
+  }
+}
diff --git a/shell/plugins/bar/widgets/Spacer.manifest.json b/shell/plugins/bar/widgets/Spacer.manifest.json
new file mode 100644
index 00000000..a258f147
--- /dev/null
+++ b/shell/plugins/bar/widgets/Spacer.manifest.json
@@ -0,0 +1,21 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.spacer",
+  "name": "Spacer",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Configurable blank space",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Spacer.qml"
+  },
+  "barWidget": {
+    "displayName": "Spacer",
+    "description": "Configurable blank space",
+    "category": "Layout",
+    "allowMultiple": true,
+    "settingsForm": "spacerSettings"
+  }
+}
diff --git a/shell/plugins/bar/widgets/Spacer.qml b/shell/plugins/bar/widgets/Spacer.qml
new file mode 100644
index 00000000..542d7d73
--- /dev/null
+++ b/shell/plugins/bar/widgets/Spacer.qml
@@ -0,0 +1,13 @@
+import QtQuick
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.spacer"
+
+  readonly property int span: settings && settings.size !== undefined ? Number(settings.size) : 12
+
+  implicitWidth: vertical ? barSize : span
+  implicitHeight: vertical ? span : barSize
+  visible: span > 0
+}
diff --git a/shell/plugins/bar/widgets/SystemStats.manifest.json b/shell/plugins/bar/widgets/SystemStats.manifest.json
new file mode 100644
index 00000000..df619e7d
--- /dev/null
+++ b/shell/plugins/bar/widgets/SystemStats.manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.system-stats",
+  "name": "System stats",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "CPU icon \u2014 hover for graphs, click to open btop",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "SystemStats.qml"
+  },
+  "barWidget": {
+    "displayName": "System stats",
+    "description": "CPU icon \u2014 hover for graphs, click to open btop",
+    "category": "System",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/bar/widgets/SystemStats.qml b/shell/plugins/bar/widgets/SystemStats.qml
new file mode 100644
index 00000000..0d10d1ad
--- /dev/null
+++ b/shell/plugins/bar/widgets/SystemStats.qml
@@ -0,0 +1,263 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Ui
+import qs.Commons
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.system-stats"
+
+
+  property real cpuPercent: 0
+  property real memPercent: 0
+  property var cpuHistory: []
+  property var memHistory: []
+  property real loadAvg: 0
+
+  property var prevCpu: ({ idle: 0, total: 0 })
+
+  property bool popupOpen: false
+
+  function close() { popupOpen = false }
+
+  readonly property int historyLimit: 30
+
+  function refresh() {
+    if (!statsProc.running) statsProc.running = true
+  }
+
+  function pushHistory(arr, value) {
+    var next = arr.slice()
+    next.push(value)
+    if (next.length > historyLimit) next.shift()
+    return next
+  }
+
+  function updateCpuTotals(idle, total) {
+    var idleDiff = idle - prevCpu.idle
+    var totalDiff = total - prevCpu.total
+
+    if (prevCpu.total > 0 && totalDiff > 0) {
+      var usage = (1 - idleDiff / totalDiff) * 100
+      cpuPercent = Math.max(0, Math.min(100, usage))
+      cpuHistory = pushHistory(cpuHistory, cpuPercent)
+    }
+
+    prevCpu = { idle: idle, total: total }
+  }
+
+  function updateLoad(raw) {
+    var n = parseFloat(String(raw || "").trim().split(/\s+/)[0])
+    if (!isNaN(n)) loadAvg = n
+  }
+
+  function updateStats(raw) {
+    var lines = String(raw || "").split("\n")
+    for (var i = 0; i < lines.length; i++) {
+      var parts = lines[i].trim().split("\t")
+      if (parts.length < 2) continue
+      if (parts[0] === "cpu") updateCpuTotals(parseInt(parts[1], 10) || 0, parseInt(parts[2], 10) || 0)
+      else if (parts[0] === "memory") updateMemPercent(parts[1])
+      else if (parts[0] === "load") updateLoad(parts[1])
+    }
+  }
+
+  function updateMemPercent(raw) {
+    var n = parseFloat(String(raw || "").trim())
+    if (!isNaN(n)) {
+      memPercent = Math.max(0, Math.min(100, n))
+      memHistory = pushHistory(memHistory, memPercent)
+    }
+  }
+
+  Component.onCompleted: refresh()
+
+  Process {
+    id: statsProc
+    command: [root.bar ? root.bar.omarchyPath + "/bin/omarchy-system-stats" : "omarchy-system-stats", "--bar-widget"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.updateStats(text)
+    }
+  }
+
+  Timer {
+    interval: 2000
+    running: true
+    repeat: true
+    onTriggered: root.refresh()
+  }
+
+  readonly property color statColor: bar ? bar.barForeground : Color.foreground
+
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  // Hover state across the trigger button and the popup.
+  property bool buttonHovered: false
+  property bool popupHovered: popup.containsMouse
+
+  function showPopup() {
+    hideTimer.stop()
+    popupOpen = true
+  }
+
+  function scheduleHide() {
+    hideTimer.restart()
+  }
+
+  Timer {
+    id: hideTimer
+    interval: 220
+    onTriggered: {
+      if (!root.buttonHovered && !root.popupHovered) root.popupOpen = false
+    }
+  }
+
+  onButtonHoveredChanged: buttonHovered ? showPopup() : scheduleHide()
+  onPopupHoveredChanged: popupHovered ? hideTimer.stop() : scheduleHide()
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: "󰍛"
+    horizontalMargin: 7.5
+    tooltipText: ""
+
+    onPressed: function(b) {
+      if (b === Qt.LeftButton) {
+        root.popupOpen = false
+        root.bar.run("omarchy-launch-or-focus-tui btop")
+      }
+    }
+  }
+
+  HoverHandler {
+    id: hoverHandler
+    target: button
+    onHoveredChanged: root.buttonHovered = hovered
+  }
+
+  PopupCard {
+    id: popup
+    anchorItem: button
+    owner: root
+    bar: root.bar
+    open: root.popupOpen
+    triggerMode: "hover"
+    contentWidth: popup.fittedContentWidth(Style.space(320))
+    contentHeight: popup.fittedContentHeight(detailColumn.implicitHeight)
+
+    Column {
+      id: detailColumn
+      anchors.fill: parent
+      spacing: Style.space(10)
+
+      Text {
+        text: "System"
+        color: root.bar.foreground
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.body
+        font.bold: true
+      }
+
+      DetailStat {
+        title: "CPU"
+        value: Math.round(root.cpuPercent) + "%"
+        history: root.cpuHistory
+        barFg: root.bar.foreground
+        fontFamily: root.bar.fontFamily
+        width: parent.width
+      }
+
+      DetailStat {
+        title: "Memory"
+        value: Math.round(root.memPercent) + "%"
+        history: root.memHistory
+        barFg: root.bar.foreground
+        fontFamily: root.bar.fontFamily
+        width: parent.width
+      }
+
+      Row {
+        width: parent.width
+        spacing: Style.space(6)
+        Text {
+          text: "Load"
+          color: Qt.darker(root.bar.foreground, 1.5)
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.bodySmall
+        }
+        Text {
+          text: root.loadAvg.toFixed(2)
+          color: root.bar.foreground
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.bodySmall
+        }
+      }
+    }
+  }
+
+  component DetailStat: Column {
+    id: detail
+
+    property string title: ""
+    property string value: ""
+    property var history: []
+    property color barFg: Color.foreground
+    property string fontFamily: Style.font.family
+
+    spacing: Style.space(4)
+
+    Row {
+      width: parent.width
+      Text {
+        text: detail.title
+        color: Qt.darker(detail.barFg, 1.4)
+        font.family: detail.fontFamily
+        font.pixelSize: Style.font.bodySmall
+      }
+      Item { width: detail.width - parent.children[0].implicitWidth - parent.children[2].implicitWidth; height: 1 }
+      Text {
+        text: detail.value
+        color: detail.barFg
+        font.family: detail.fontFamily
+        font.pixelSize: Style.font.bodySmall
+      }
+    }
+
+    Canvas {
+      id: detailCanvas
+      width: parent.width
+      height: Style.space(40)
+      property var history: detail.history
+      onHistoryChanged: requestPaint()
+
+      onPaint: {
+        var ctx = getContext("2d")
+        ctx.clearRect(0, 0, width, height)
+        if (!detail.history || detail.history.length === 0) return
+
+        ctx.strokeStyle = detail.barFg
+        ctx.fillStyle = Qt.rgba(detail.barFg.r, detail.barFg.g, detail.barFg.b, 0.25)
+        ctx.lineWidth = 1.5
+
+        ctx.beginPath()
+        var step = width / Math.max(1, detail.history.length - 1)
+        for (var i = 0; i < detail.history.length; i++) {
+          var x = i * step
+          var y = height - (detail.history[i] / 100) * (height - 2) - 1
+          if (i === 0) ctx.moveTo(x, y)
+          else ctx.lineTo(x, y)
+        }
+        ctx.stroke()
+        ctx.lineTo(width, height)
+        ctx.lineTo(0, height)
+        ctx.closePath()
+        ctx.fill()
+      }
+    }
+  }
+}
diff --git a/shell/plugins/bar/widgets/SystemUpdate.manifest.json b/shell/plugins/bar/widgets/SystemUpdate.manifest.json
new file mode 100644
index 00000000..c5164d52
--- /dev/null
+++ b/shell/plugins/bar/widgets/SystemUpdate.manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.system-update",
+  "name": "System update",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Indicates available system updates",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "SystemUpdate.qml"
+  },
+  "barWidget": {
+    "displayName": "System update",
+    "description": "Indicates available system updates",
+    "category": "System",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/bar/widgets/SystemUpdate.qml b/shell/plugins/bar/widgets/SystemUpdate.qml
new file mode 100644
index 00000000..e540bd71
--- /dev/null
+++ b/shell/plugins/bar/widgets/SystemUpdate.qml
@@ -0,0 +1,421 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.system-update"
+
+  property bool updateAvailable: false
+  property int updateCount: 0
+  property string updateOutput: ""
+  property var updateLines: []
+  property var omarchyUpdateLines: []
+  property var otherUpdateLines: []
+  property bool popupOpen: false
+  property bool buttonHovered: false
+  property bool popupHovered: popup.containsMouse
+
+  readonly property string stateHome: Quickshell.env("XDG_STATE_HOME") || (Quickshell.env("HOME") + "/.local/state")
+  readonly property string availableStatePath: stateHome + "/omarchy/updates/available"
+  readonly property color foreground: root.bar ? root.bar.foreground : Color.foreground
+  readonly property color urgent: root.bar ? root.bar.urgent : Color.urgent
+  readonly property color dim: Qt.darker(foreground, 1.55)
+  readonly property string fontFamily: root.bar ? root.bar.fontFamily : Style.font.family
+  readonly property string changelogUrl: "https://github.com/basecamp/omarchy/releases/latest"
+
+  function close() { popupOpen = false }
+
+  function refresh() {
+    updateOutput = ""
+    if (!updateProc.running) updateProc.running = true
+  }
+
+  function clear() {
+    updateOutput = ""
+    updateLines = []
+    omarchyUpdateLines = []
+    otherUpdateLines = []
+    updateCount = 0
+    updateAvailable = false
+    popupOpen = false
+  }
+
+  function runUpdate() {
+    if (root.bar) root.bar.run("omarchy-launch-floating-terminal-with-presentation omarchy-update")
+  }
+
+  function openChangelog() {
+    Qt.openUrlExternally(root.changelogUrl)
+  }
+
+  function packageName(line) {
+    return String(line || "").trim().split(/\s+/)[0] || ""
+  }
+
+  function versionMatch(line) {
+    return String(line || "").trim().match(/^\S+\s+(.+?)\s+->\s+(.+)$/)
+  }
+
+  function versionFrom(line) {
+    var match = versionMatch(line)
+    return match ? match[1] : ""
+  }
+
+  function versionTo(line) {
+    var match = versionMatch(line)
+    return match ? match[2] : ""
+  }
+
+  function isOmarchyPackage(line) {
+    var pkg = packageName(line)
+    return pkg === "omarchy" || pkg.indexOf("omarchy-") === 0
+  }
+
+  function countLabel(count) {
+    return count === 1 ? "1 update" : count + " updates"
+  }
+
+  function pendingPackageLabel(count) {
+    return count === 1 ? "1 package pending update" : count + " packages pending update"
+  }
+
+  function parseUpdateText(text) {
+    var lines = String(text || "").split(/\r?\n/).filter(function(line) {
+      return line.trim().length > 0
+    })
+    var omarchyLines = []
+    var otherLines = []
+
+    for (var i = 0; i < lines.length; i++) {
+      if (isOmarchyPackage(lines[i])) omarchyLines.push(lines[i])
+      else otherLines.push(lines[i])
+    }
+
+    omarchyUpdateLines = omarchyLines
+    otherUpdateLines = otherLines
+    updateLines = omarchyLines.concat(otherLines)
+    updateCount = updateLines.length
+    updateAvailable = updateCount > 0
+    if (!updateAvailable) popupOpen = false
+  }
+
+  function applyUpdateOutput(exitCode) {
+    var output = String(updateStdout.text || updateOutput || "")
+    parseUpdateText(exitCode === 0 ? output : "")
+  }
+
+  function showPopup() {
+    hideTimer.stop()
+    if (updateAvailable) popupOpen = true
+  }
+
+  function scheduleHide() {
+    hideTimer.restart()
+  }
+
+  onButtonHoveredChanged: buttonHovered ? showPopup() : scheduleHide()
+  onPopupHoveredChanged: popupHovered ? hideTimer.stop() : scheduleHide()
+  onUpdateAvailableChanged: if (!updateAvailable) popupOpen = false
+
+  visible: updateAvailable
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  IpcHandler {
+    target: "omarchy.system-update"
+
+    function refresh(): void {
+      root.refresh()
+    }
+
+    function clear(): void {
+      root.clear()
+    }
+  }
+
+  Process {
+    id: updateProc
+    command: ["bash", "-lc", "omarchy-update-available"]
+    stdout: StdioCollector { id: updateStdout; waitForEnd: true; onStreamFinished: root.updateOutput = text }
+    onExited: function(exitCode) {
+      root.applyUpdateOutput(exitCode)
+    }
+  }
+
+  FileView {
+    id: availableState
+    path: root.availableStatePath
+    watchChanges: true
+    printErrors: false
+    onLoaded: root.parseUpdateText(text())
+    onLoadFailed: root.clear()
+    onFileChanged: reload()
+  }
+
+  Timer {
+    interval: 21600000
+    running: true
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: root.refresh()
+  }
+
+  Timer {
+    id: hideTimer
+    interval: 220
+    onTriggered: {
+      if (!root.buttonHovered && !root.popupHovered) root.popupOpen = false
+    }
+  }
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: root.updateAvailable ? "\uf021" : ""
+    fontSize: Style.font.caption
+    tooltipText: ""
+    onPressed: root.runUpdate()
+  }
+
+  HoverHandler {
+    id: hoverHandler
+    target: button
+    onHoveredChanged: root.buttonHovered = hovered
+  }
+
+  PopupCard {
+    id: popup
+    anchorItem: button
+    owner: root
+    bar: root.bar
+    open: root.popupOpen && root.updateAvailable
+    triggerMode: "hover"
+    contentWidth: popup.fittedContentWidth(Style.space(420))
+    contentHeight: popup.fittedContentHeight(panelColumn.implicitHeight + Style.space(4), Style.space(640))
+
+    Flickable {
+      id: updateFlick
+      anchors.fill: parent
+      contentWidth: width
+      contentHeight: panelColumn.implicitHeight
+      clip: true
+      boundsBehavior: Flickable.StopAtBounds
+      flickableDirection: Flickable.VerticalFlick
+      ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
+
+      Column {
+        id: panelColumn
+        width: updateFlick.width
+        spacing: Style.space(12)
+
+        PanelHero {
+          width: parent.width
+          title: "System update"
+          meta: countLabel(root.updateCount) + " available"
+          foreground: root.foreground
+          fontFamily: root.fontFamily
+          iconComponent: Component {
+            Text {
+              text: "\uf021"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.display
+            }
+          }
+        }
+
+        Button {
+          width: parent.width
+          text: "Run omarchy update"
+          iconText: "\uf021"
+          foreground: root.foreground
+          accent: root.urgent
+          fontFamily: root.fontFamily
+          fontSize: Style.font.bodySmall
+          iconSize: Style.font.body
+          bordered: true
+          onClicked: root.runUpdate()
+        }
+
+        PanelSeparator {
+          visible: root.updateLines.length > 0
+          foreground: root.foreground
+        }
+
+        UpdateSection {
+          title: "Omarchy"
+          lines: root.omarchyUpdateLines
+          important: true
+          showChangelog: true
+          width: parent.width
+        }
+
+        PanelSeparator {
+          visible: root.omarchyUpdateLines.length > 0 && root.otherUpdateLines.length > 0
+          foreground: root.foreground
+        }
+
+        OtherPackagesSummary {
+          count: root.otherUpdateLines.length
+          width: parent.width
+        }
+      }
+    }
+  }
+
+  component UpdateSection: Column {
+    id: section
+
+    property string title: ""
+    property var lines: []
+    property bool important: false
+    property bool showChangelog: false
+
+    visible: lines.length > 0
+    spacing: Style.space(8)
+
+    PanelSectionHeader {
+      width: section.width
+      text: section.title.toUpperCase()
+      foreground: root.foreground
+      fontFamily: root.fontFamily
+    }
+
+    Column {
+      width: section.width
+      spacing: Style.space(6)
+
+      Repeater {
+        model: section.lines
+
+        delegate: UpdateRow {
+          width: parent.width
+          line: modelData
+          important: section.important
+        }
+      }
+    }
+
+    Button {
+      visible: section.showChangelog
+      width: section.width
+      text: "View latest release notes"
+      iconText: "\uf08e"
+      foreground: root.foreground
+      accent: root.urgent
+      fontFamily: root.fontFamily
+      fontSize: Style.font.bodySmall
+      iconSize: Style.font.body
+      bordered: true
+      onClicked: root.openChangelog()
+    }
+  }
+
+  component OtherPackagesSummary: Column {
+    id: summary
+
+    property int count: 0
+
+    visible: count > 0
+    spacing: Style.space(8)
+
+    PanelSectionHeader {
+      width: summary.width
+      text: "OTHER PACKAGES"
+      foreground: root.foreground
+      fontFamily: root.fontFamily
+    }
+
+    Text {
+      width: summary.width
+      text: root.pendingPackageLabel(summary.count)
+      color: root.foreground
+      font.family: root.fontFamily
+      font.pixelSize: Style.font.body
+      font.bold: true
+      elide: Text.ElideRight
+    }
+  }
+
+  component UpdateRow: CursorSurface {
+    id: row
+
+    property string line: ""
+    property bool important: false
+    readonly property string packageTitle: root.packageName(line)
+    readonly property string fromVersion: root.versionFrom(line)
+    readonly property string toVersion: root.versionTo(line)
+    readonly property bool hasVersions: fromVersion !== "" && toVersion !== ""
+
+    foreground: root.foreground
+    accent: root.urgent
+    implicitHeight: Math.max(Style.spacing.popupRowHeight, rowContent.implicitHeight + Style.spacing.rowPaddingX)
+
+    ColumnLayout {
+      id: rowContent
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.spacing.rowPaddingX
+      anchors.rightMargin: Style.spacing.rowPaddingX
+      spacing: Style.space(1)
+
+      Text {
+        Layout.fillWidth: true
+        text: row.packageTitle
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        font.bold: true
+        elide: Text.ElideRight
+      }
+
+      Row {
+        visible: row.hasVersions
+        Layout.fillWidth: true
+        spacing: Style.space(7)
+
+        Text {
+          text: row.fromVersion
+          color: root.dim
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.caption
+          elide: Text.ElideRight
+        }
+
+        Text {
+          text: "\u2192"
+          color: row.important ? root.urgent : root.dim
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.bodySmall
+          font.bold: true
+        }
+
+        Text {
+          text: row.toVersion
+          color: row.important ? root.urgent : root.foreground
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.caption
+          font.bold: true
+          elide: Text.ElideRight
+        }
+      }
+
+      Text {
+        visible: !row.hasVersions
+        Layout.fillWidth: true
+        text: row.line
+        color: root.dim
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.caption
+        wrapMode: Text.WrapAnywhere
+      }
+    }
+  }
+}
diff --git a/shell/plugins/bar/widgets/Tray.manifest.json b/shell/plugins/bar/widgets/Tray.manifest.json
new file mode 100644
index 00000000..050757e2
--- /dev/null
+++ b/shell/plugins/bar/widgets/Tray.manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.tray",
+  "name": "System tray",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Status notifier items",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Tray.qml"
+  },
+  "barWidget": {
+    "displayName": "System tray",
+    "description": "Status notifier items",
+    "category": "Status",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/bar/widgets/Tray.qml b/shell/plugins/bar/widgets/Tray.qml
new file mode 100644
index 00000000..adcc0d1d
--- /dev/null
+++ b/shell/plugins/bar/widgets/Tray.qml
@@ -0,0 +1,615 @@
+import Quickshell
+import QtQuick
+import Quickshell.Services.SystemTray
+import Quickshell.Widgets
+import qs.Commons
+import qs.Ui
+import "TrayModel.js" as TrayModel
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.tray"
+
+  property bool expanded: false
+  property bool managePopupOpen: false
+  property bool trayMenuOpen: false
+  property var activeTrayItem: null
+  property var activeTrayAnchor: null
+  readonly property color foreground: bar ? bar.foreground : Color.foreground
+  readonly property string fontFamily: bar ? bar.fontFamily : Style.font.family
+  readonly property var pinnedIds: Array.isArray(settings.pinned) ? settings.pinned : []
+  readonly property var hiddenIds: Array.isArray(settings.hidden) ? settings.hidden : []
+  readonly property var pinnedItems: bucket("pinned")
+  readonly property var drawerItems: bucket("drawer")
+  readonly property var allItems: bucket("all")
+  readonly property int drawerCount: drawerItems.length
+  readonly property int trayItemExtent: Style.space(16)
+  readonly property int trayItemGap: Style.space(9)
+  readonly property int trayJoinGap: Style.space(4)
+  readonly property int drawerExtent: drawerCount > 0 ? drawerCount * trayItemExtent + (drawerCount - 1) * trayItemGap : 0
+  // Match Waybar's group/tray-expander drawer transition-duration.
+  readonly property int animationDuration: 600
+  property real revealProgress: expanded ? 1 : 0
+  readonly property real revealExtent: drawerExtent * revealProgress
+
+  function close() {
+    managePopupOpen = false
+    trayMenuOpen = false
+  }
+
+  function openTrayMenu(item, anchorItem, mouse) {
+    if (!item || !item.menu) {
+      var point = anchorItem.QsWindow.contentItem.mapFromItem(anchorItem, mouse.x, mouse.y)
+      item.display(anchorItem.QsWindow.window, point.x, point.y)
+      return
+    }
+
+    activeTrayItem = item
+    activeTrayAnchor = anchorItem
+    trayMenuOpen = true
+  }
+
+  function trayIconSource(icon) {
+    var value = String(icon || "")
+    var marker = "?path="
+    var markerIndex = value.indexOf(marker)
+    if (markerIndex === -1) return value
+
+    var name = value.substring(0, markerIndex).split("/").pop()
+    var iconPath = value.substring(markerIndex + marker.length).split("&")[0]
+    return Util.fileUrl(iconPath + "/hicolor/16x16/status/" + name + ".png")
+  }
+
+  function trayTooltip(item) {
+    return item.tooltipTitle || item.title || item.id || ""
+  }
+
+  function classifyItem(item) {
+    var iid = String(item.id || "")
+    if (hiddenIds.indexOf(iid) !== -1) return "hidden"
+    if (pinnedIds.indexOf(iid) !== -1) return "pinned"
+    return "drawer"
+  }
+
+  function ownedByDedicatedWidget(item) {
+    var layout = root.bar && root.bar.layoutConfig ? root.bar.layoutConfig : null
+    return TrayModel.ownedByDedicatedWidget(item, layout)
+  }
+
+  function bucket(category) {
+    var values = SystemTray.items.values
+    var result = []
+    for (var i = 0; i < values.length; i++) {
+      var item = values[i]
+      if (item.status === Status.Passive) continue
+      if (ownedByDedicatedWidget(item)) continue
+      if (category === "all") {
+        result.push(item)
+        continue
+      }
+      if (classifyItem(item) === category) result.push(item)
+    }
+    return result
+  }
+
+  function persistTrayState(pinned, hidden) {
+    if (!root.bar || !root.bar.shell || typeof root.bar.shell.updateEntryInline !== "function") return
+    var id = root.moduleName || "omarchy.tray"
+    root.bar.shell.updateEntryInline(id, { id: id, pinned: pinned, hidden: hidden })
+  }
+
+  function togglePin(iid) {
+    var p = pinnedIds.slice(), h = hiddenIds.slice()
+    var idx = p.indexOf(iid)
+    if (idx !== -1) p.splice(idx, 1)
+    else {
+      p.push(iid)
+      var hi = h.indexOf(iid)
+      if (hi !== -1) h.splice(hi, 1)
+    }
+    persistTrayState(p, h)
+  }
+
+  function toggleHide(iid) {
+    var p = pinnedIds.slice(), h = hiddenIds.slice()
+    var idx = h.indexOf(iid)
+    if (idx !== -1) h.splice(idx, 1)
+    else {
+      h.push(iid)
+      var pi = p.indexOf(iid)
+      if (pi !== -1) p.splice(pi, 1)
+    }
+    persistTrayState(p, h)
+  }
+
+  visible: pinnedItems.length > 0 || drawerCount > 0
+  clip: false
+  implicitWidth: root.vertical ? root.barSize : trayContent.implicitWidth
+  implicitHeight: root.vertical ? trayContent.implicitHeight : root.barSize
+
+  Behavior on revealProgress {
+    NumberAnimation { duration: root.animationDuration; easing.type: Easing.OutCubic }
+  }
+
+  Loader {
+    id: trayContent
+    anchors.fill: parent
+    sourceComponent: root.vertical ? verticalTray : horizontalTray
+  }
+
+  Component {
+    id: horizontalTray
+
+    Item {
+      id: horizontalTrayRoot
+
+      readonly property int pinnedWidth: pinnedRow.implicitWidth
+      readonly property int drawerBlockWidth: root.allItems.length > 0 ? expandIcon.implicitWidth + root.drawerExtent : 0
+
+      implicitWidth: pinnedWidth + drawerBlockWidth
+      implicitHeight: root.barSize
+
+      // Mask out the empty area the collapsed drawer reserves for its slide-in,
+      // so hovering it doesn't trigger expand and clicks pass through.
+      containmentMask: QtObject {
+        function contains(point: point): bool {
+          if (point.y < 0 || point.y > horizontalTrayRoot.height) return false
+          // Drawer reveals leftward; chevron sits at the right end when collapsed
+          // and slides left as it opens. The visible region starts at the chevron.
+          var chevronX = root.drawerExtent - root.revealExtent
+          if (point.x >= chevronX && point.x <= horizontalTrayRoot.drawerBlockWidth) return true
+          // Pinned items, placed to the right of the drawer block.
+          var pinnedStart = horizontalTrayRoot.drawerBlockWidth
+          return point.x >= pinnedStart && point.x <= horizontalTrayRoot.implicitWidth
+        }
+      }
+
+      Item {
+        id: drawerArea
+        x: 0
+        width: horizontalTrayRoot.drawerBlockWidth
+        height: root.barSize
+        visible: root.allItems.length > 0
+
+        HoverHandler {
+          onHoveredChanged: root.expanded = hovered
+        }
+
+        WidgetButton {
+          id: expandIcon
+          bar: root.bar
+          width: implicitWidth
+          height: implicitHeight
+          x: root.drawerExtent - root.revealExtent
+          text: "\uf053"
+          horizontalMargin: 9
+          verticalPadding: 6
+          onPressed: function(button) {
+            if (button === Qt.RightButton) root.managePopupOpen = !root.managePopupOpen
+          }
+        }
+
+        Item {
+          id: trayClip
+          x: expandIcon.width
+          anchors.verticalCenter: parent.verticalCenter
+          width: root.drawerExtent
+          height: root.barSize
+          clip: true
+
+          Row {
+            id: trayIcons
+            x: root.drawerExtent - root.revealExtent
+            anchors.verticalCenter: parent.verticalCenter
+            spacing: root.trayItemGap
+            layer.enabled: true
+
+            Repeater {
+              model: root.drawerItems
+              TrayItem {}
+            }
+          }
+        }
+      }
+
+      Row {
+        id: pinnedRow
+        x: drawerArea.x + horizontalTrayRoot.drawerBlockWidth
+        anchors.verticalCenter: parent.verticalCenter
+        spacing: root.trayItemGap
+        leftPadding: root.pinnedItems.length > 0 && root.allItems.length > 0 ? root.trayJoinGap : 0
+        Repeater {
+          model: root.pinnedItems
+          TrayItem {}
+        }
+      }
+    }
+  }
+
+  Component {
+    id: verticalTray
+
+    Item {
+      id: verticalTrayRoot
+
+      readonly property int pinnedHeight: pinnedCol.implicitHeight
+      readonly property int drawerBlockHeight: root.allItems.length > 0 ? expandIcon.implicitHeight + root.drawerExtent : 0
+
+      implicitWidth: root.barSize
+      implicitHeight: pinnedHeight + drawerBlockHeight
+
+      containmentMask: QtObject {
+        function contains(point: point): bool {
+          if (point.x < 0 || point.x > verticalTrayRoot.width) return false
+          var chevronY = root.drawerExtent - root.revealExtent
+          if (point.y >= chevronY && point.y <= verticalTrayRoot.drawerBlockHeight) return true
+          var pinnedStart = verticalTrayRoot.drawerBlockHeight
+          return point.y >= pinnedStart && point.y <= verticalTrayRoot.implicitHeight
+        }
+      }
+
+      Item {
+        id: drawerArea
+        y: 0
+        width: root.barSize
+        height: verticalTrayRoot.drawerBlockHeight
+        visible: root.allItems.length > 0
+
+        HoverHandler {
+          onHoveredChanged: root.expanded = hovered
+        }
+
+        WidgetButton {
+          id: expandIcon
+          bar: root.bar
+          width: implicitWidth
+          height: implicitHeight
+          y: root.drawerExtent - root.revealExtent
+          text: "\uf053"
+          textRotation: 90
+          horizontalMargin: 9
+          verticalPadding: 6
+          onPressed: function(button) {
+            if (button === Qt.RightButton) root.managePopupOpen = !root.managePopupOpen
+          }
+        }
+
+        Item {
+          id: trayClip
+          y: expandIcon.height
+          anchors.horizontalCenter: parent.horizontalCenter
+          width: root.barSize
+          height: root.drawerExtent
+          clip: true
+
+          Column {
+            id: trayIcons
+            y: root.drawerExtent - root.revealExtent
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: root.trayItemGap
+            layer.enabled: true
+
+            Repeater {
+              model: root.drawerItems
+              TrayItem {}
+            }
+          }
+        }
+      }
+
+      Column {
+        id: pinnedCol
+        y: drawerArea.y + verticalTrayRoot.drawerBlockHeight
+        anchors.horizontalCenter: parent.horizontalCenter
+        spacing: root.trayItemGap
+        topPadding: root.pinnedItems.length > 0 && root.allItems.length > 0 ? root.trayJoinGap : 0
+        Repeater {
+          model: root.pinnedItems
+          TrayItem {}
+        }
+      }
+    }
+  }
+
+  PopupCard {
+    id: managePopup
+    anchorItem: root
+    owner: root
+    bar: root.bar
+    open: root.managePopupOpen
+    contentWidth: managePopup.fittedContentWidth(Style.space(300))
+    contentHeight: managePopup.fittedContentHeight(manageColumn.implicitHeight)
+
+    Column {
+      id: manageColumn
+      anchors.fill: parent
+      spacing: Style.space(8)
+
+      Text {
+        text: "Tray icons"
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        font.bold: true
+      }
+
+      Text {
+        text: "Pinned icons stay visible. Hidden icons never show."
+        color: Qt.darker(root.foreground, 1.4)
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.caption
+        wrapMode: Text.WordWrap
+        width: parent.width
+      }
+
+      Text {
+        visible: root.allItems.length === 0
+        text: "No tray items reporting."
+        color: Qt.darker(root.foreground, 1.5)
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.bodySmall
+        font.italic: true
+      }
+
+      Repeater {
+        model: root.allItems
+        delegate: Item {
+          id: rowRoot
+          required property var modelData
+          required property int index
+          width: manageColumn.width
+          implicitHeight: 28
+
+          readonly property string itemId: String(modelData.id || "")
+          readonly property string displayName: {
+            var t = String(modelData.title || "").trim()
+            if (t) return t
+            var tt = String(modelData.tooltipTitle || "").trim()
+            if (tt) return tt
+            var id = String(modelData.id || "")
+            var slash = id.lastIndexOf("/")
+            return slash !== -1 ? id.substring(slash + 1) : (id || "Unknown")
+          }
+          readonly property bool isPinned: root.pinnedIds.indexOf(itemId) !== -1
+          readonly property bool isHidden: root.hiddenIds.indexOf(itemId) !== -1
+
+          IconImage {
+            id: rowIcon
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: parent.left
+            implicitSize: 16
+            width: 16
+            height: 16
+            source: root.trayIconSource(rowRoot.modelData.icon)
+          }
+
+          Text {
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: rowIcon.right
+            anchors.leftMargin: Style.space(10)
+            anchors.right: rowHideBtn.left
+            anchors.rightMargin: Style.space(8)
+            text: rowRoot.displayName
+            color: root.foreground
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.bodySmall
+            elide: Text.ElideRight
+          }
+
+          Button {
+            id: rowPinBtn
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right: parent.right
+            iconText: "\uf08d"
+            text: rowRoot.isPinned ? "Unpin" : "Pin"
+            foreground: root.foreground
+            horizontalPadding: 8
+            verticalPadding: 3
+            iconSize: Style.font.bodySmall
+            fontSize: Style.font.bodySmall
+            onClicked: root.togglePin(rowRoot.itemId)
+          }
+
+          Button {
+            id: rowHideBtn
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right: rowPinBtn.left
+            anchors.rightMargin: Style.space(6)
+            iconText: "\uf06e"
+            text: rowRoot.isHidden ? "Show" : "Hide"
+            foreground: root.foreground
+            horizontalPadding: 8
+            verticalPadding: 3
+            iconSize: Style.font.bodySmall
+            fontSize: Style.font.bodySmall
+            onClicked: root.toggleHide(rowRoot.itemId)
+          }
+        }
+      }
+    }
+  }
+
+  QsMenuOpener {
+    id: trayMenuOpener
+    menu: root.activeTrayItem ? root.activeTrayItem.menu : null
+  }
+
+  PopupCard {
+    id: trayMenuPopup
+    anchorItem: root.activeTrayAnchor || root
+    owner: root
+    bar: root.bar
+    open: root.trayMenuOpen
+    padding: Style.space(8)
+    borderColor: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.45)
+    contentWidth: trayMenuPopup.fittedContentWidth(Style.space(232))
+    contentHeight: trayMenuPopup.fittedContentHeight(trayMenuColumn.implicitHeight, Style.space(420))
+
+    Column {
+      id: trayMenuColumn
+      anchors.fill: parent
+      spacing: 0
+
+      Repeater {
+        model: trayMenuOpener.children
+
+        delegate: Item {
+          id: menuRow
+          required property var modelData
+          required property int index
+
+          readonly property string rowText: String(modelData.text || "")
+          readonly property string activeTitle: root.activeTrayItem ? String(root.activeTrayItem.title || root.activeTrayItem.id || "") : ""
+          readonly property bool rootTitleEntry: index === 0 && modelData.hasChildren && rowText.toLowerCase() === activeTitle.toLowerCase()
+          readonly property bool leadingSeparator: modelData.isSeparator && index <= 1
+          readonly property bool hiddenRow: rootTitleEntry || leadingSeparator
+
+          visible: !hiddenRow
+          width: trayMenuColumn.width
+          implicitHeight: hiddenRow ? 0 : (modelData.isSeparator ? Style.space(11) : Style.space(30))
+          opacity: modelData.enabled ? 1.0 : 0.45
+
+          Rectangle {
+            visible: menuRow.modelData.isSeparator
+            anchors.left: parent.left
+            anchors.leftMargin: Style.space(10)
+            anchors.right: parent.right
+            anchors.rightMargin: Style.space(10)
+            anchors.verticalCenter: parent.verticalCenter
+            height: 1
+            color: Color.popups.border
+            opacity: 0.45
+          }
+
+          Rectangle {
+            visible: !menuRow.modelData.isSeparator
+            anchors.fill: parent
+            radius: Math.max(2, Style.cornerRadius)
+            color: rowMouse.containsMouse && menuRow.modelData.enabled ? Style.hoverFillFor(root.foreground, root.foreground) : "transparent"
+          }
+
+          Text {
+            visible: !menuRow.modelData.isSeparator && menuRow.modelData.buttonType !== QsMenuButtonType.None
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: parent.left
+            width: Style.space(22)
+            horizontalAlignment: Text.AlignHCenter
+            text: menuRow.modelData.checkState === Qt.Checked ? "\uf00c" : ""
+            color: root.foreground
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.bodySmall
+          }
+
+          IconImage {
+            id: menuIcon
+            visible: !menuRow.modelData.isSeparator && String(menuRow.modelData.icon || "") !== ""
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: parent.left
+            anchors.leftMargin: Style.space(24)
+            implicitSize: Style.space(16)
+            width: Style.space(16)
+            height: Style.space(16)
+            source: menuRow.modelData.icon
+          }
+
+          Text {
+            visible: !menuRow.modelData.isSeparator
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: parent.left
+            anchors.leftMargin: menuIcon.visible ? Style.space(46) : Style.space(28)
+            anchors.right: submenuGlyph.left
+            anchors.rightMargin: Style.space(8)
+            text: menuRow.rowText
+            color: root.foreground
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.bodySmall
+            elide: Text.ElideRight
+          }
+
+          Text {
+            id: submenuGlyph
+            visible: !menuRow.modelData.isSeparator && menuRow.modelData.hasChildren
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right: parent.right
+            anchors.rightMargin: Style.space(10)
+            text: "\u203a"
+            color: root.foreground
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.bodySmall
+          }
+
+          MouseArea {
+            id: rowMouse
+            anchors.fill: parent
+            hoverEnabled: true
+            enabled: !menuRow.modelData.isSeparator && menuRow.modelData.enabled
+            cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
+            onClicked: {
+              if (menuRow.modelData.hasChildren) {
+                var point = menuRow.QsWindow.contentItem.mapFromItem(menuRow, menuRow.width, menuRow.height / 2)
+                menuRow.modelData.display(menuRow.QsWindow.window, point.x, point.y)
+              } else {
+                menuRow.modelData.triggered()
+                root.close()
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  component TrayItem: Item {
+    id: trayItemRoot
+
+    required property var modelData
+
+    visible: modelData.status !== Status.Passive
+    implicitWidth: visible ? root.trayItemExtent : 0
+    implicitHeight: visible ? root.trayItemExtent : 0
+
+    function displayMenu(mouse) {
+      root.openTrayMenu(trayItemRoot.modelData, trayItemRoot, mouse)
+    }
+
+    IconImage {
+      anchors.centerIn: parent
+      implicitSize: Style.space(12)
+      width: Style.space(12)
+      height: Style.space(12)
+      source: root.trayIconSource(trayItemRoot.modelData.icon)
+    }
+
+    MouseArea {
+      id: mouseArea
+      anchors.fill: parent
+      acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
+      hoverEnabled: true
+      cursorShape: Qt.PointingHandCursor
+      onEntered: if (root.bar) root.bar.showTooltip(trayItemRoot, root.trayTooltip(modelData))
+      onExited: if (root.bar) root.bar.hideTooltip(trayItemRoot)
+      onPressed: function(mouse) {
+        if (mouse.button === Qt.RightButton) {
+          trayItemRoot.displayMenu(mouse)
+          mouse.accepted = true
+        }
+      }
+      onClicked: function(mouse) {
+        if (mouse.button === Qt.RightButton) {
+          mouse.accepted = true
+        } else if (mouse.button === Qt.MiddleButton) {
+          trayItemRoot.modelData.secondaryActivate()
+        } else if (trayItemRoot.modelData.onlyMenu) {
+          trayItemRoot.displayMenu(mouse)
+        } else {
+          trayItemRoot.modelData.activate()
+        }
+      }
+      onWheel: function(wheel) {
+        trayItemRoot.modelData.scroll(wheel.angleDelta.y, false)
+      }
+    }
+
+    readonly property bool tooltipHovered: visible && opacity > 0 && mouseArea.containsMouse
+  }
+}
diff --git a/shell/plugins/bar/widgets/TrayModel.js b/shell/plugins/bar/widgets/TrayModel.js
new file mode 100644
index 00000000..a9da13c4
--- /dev/null
+++ b/shell/plugins/bar/widgets/TrayModel.js
@@ -0,0 +1,44 @@
+function text(value) {
+  return String(value || "").toLowerCase()
+}
+
+function isDropboxTrayItem(item) {
+  if (!item) return false
+  return text(item.id).indexOf("dropbox") !== -1
+    || text(item.title).indexOf("dropbox") !== -1
+    || text(item.tooltipTitle).indexOf("dropbox") !== -1
+}
+
+function entryId(entry) {
+  if (typeof entry === "string") return entry
+  if (entry && typeof entry === "object") {
+    var id = entry.id
+    if (id !== undefined && id !== null && String(id) !== "") return String(id)
+  }
+  return ""
+}
+
+function layoutHasWidget(layout, id) {
+  var sections = ["left", "center", "right"]
+  for (var s = 0; s < sections.length; s++) {
+    var entries = layout && layout[sections[s]]
+    if (!Array.isArray(entries)) continue
+    for (var i = 0; i < entries.length; i++) {
+      if (entryId(entries[i]) === id) return true
+    }
+  }
+  return false
+}
+
+function ownedByDedicatedWidget(item, layout) {
+  return layoutHasWidget(layout, "omarchy.dropbox") && isDropboxTrayItem(item)
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    isDropboxTrayItem: isDropboxTrayItem,
+    entryId: entryId,
+    layoutHasWidget: layoutHasWidget,
+    ownedByDedicatedWidget: ownedByDedicatedWidget
+  }
+}
diff --git a/shell/plugins/bar/widgets/Workspaces.manifest.json b/shell/plugins/bar/widgets/Workspaces.manifest.json
new file mode 100644
index 00000000..e51f7a0a
--- /dev/null
+++ b/shell/plugins/bar/widgets/Workspaces.manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.workspaces",
+  "name": "Workspaces",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Workspace number indicators",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Workspaces.qml"
+  },
+  "barWidget": {
+    "displayName": "Workspaces",
+    "description": "Workspace number indicators",
+    "category": "Compositor",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/bar/widgets/Workspaces.qml b/shell/plugins/bar/widgets/Workspaces.qml
new file mode 100644
index 00000000..ec0482a5
--- /dev/null
+++ b/shell/plugins/bar/widgets/Workspaces.qml
@@ -0,0 +1,72 @@
+import QtQuick
+import QtQuick.Layouts
+import Quickshell.Hyprland
+import qs.Commons
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.workspaces"
+
+  function workspaceById(id) {
+    var values = Hyprland.workspaces.values
+    for (var i = 0; i < values.length; i++) {
+      if (values[i].id === id) return values[i]
+    }
+
+    return null
+  }
+
+  function workspaceIds() {
+    var ids = [1, 2, 3, 4, 5]
+    var values = Hyprland.workspaces.values
+
+    for (var i = 0; i < values.length; i++) {
+      var id = values[i].id
+      if (id > 0 && id <= 10 && ids.indexOf(id) === -1) ids.push(id)
+    }
+
+    ids.sort(function(left, right) { return left - right })
+    return ids
+  }
+
+  function focusWorkspace(id) {
+    if (!root.bar) return
+    root.bar.run("hyprctl dispatch " + Util.shellQuote("hl.dsp.focus({ workspace = \"" + id + "\" })"))
+  }
+
+  readonly property real trailingGap: root.vertical ? 0 : Style.spaceReal(1.5)
+
+  implicitWidth: grid.implicitWidth + trailingGap
+  implicitHeight: grid.implicitHeight
+
+  GridLayout {
+    id: grid
+    anchors.fill: parent
+    anchors.rightMargin: root.trailingGap
+    columns: root.vertical ? 1 : root.workspaceIds().length
+    columnSpacing: root.vertical ? 0 : Style.space(1)
+    rowSpacing: root.vertical ? Style.space(2) : 0
+
+    Repeater {
+      model: root.workspaceIds()
+
+      WidgetButton {
+        required property int modelData
+
+        readonly property var workspace: root.workspaceById(modelData)
+        readonly property bool occupied: workspace !== null && workspace.toplevels.values.length > 0
+        readonly property bool focused: Hyprland.focusedWorkspace !== null && Hyprland.focusedWorkspace.id === modelData
+
+        bar: root.bar
+        text: focused ? "\uDB85\uDCFB" : (modelData === 10 ? "0" : String(modelData))
+        opacity: occupied || focused ? 1 : 0.5
+        horizontalMargin: 6
+        verticalPadding: 6
+        fixedWidth: root.vertical ? root.barSize : Style.space(20)
+        fixedHeight: root.barSize
+        onPressed: function() { root.focusWorkspace(modelData) }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/clipboard/Clipboard.qml b/shell/plugins/clipboard/Clipboard.qml
new file mode 100644
index 00000000..e3c9e3f2
--- /dev/null
+++ b/shell/plugins/clipboard/Clipboard.qml
@@ -0,0 +1,548 @@
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import QtQuick
+import qs.Commons
+import qs.Ui
+import "ClipboardHistory.js" as ClipboardHistory
+
+Item {
+  id: root
+
+  property string omarchyPath: Quickshell.env("OMARCHY_PATH")
+  property bool opened: false
+  property string filterText: ""
+  property int selectedIndex: 0
+  property bool cursorActive: false
+  property bool clearConfirmOpen: false
+  property var history: []
+
+  property string historyPath: Quickshell.env("HOME") + "/.local/state/omarchy/clipboard-history.json"
+  property string captureScript: root.omarchyPath + "/shell/plugins/clipboard/capture.sh"
+  property string watchCommand: "script=$1\ntrap 'kill $(jobs -p) 2>/dev/null' EXIT\nOMARCHY_CLIPBOARD_WATCH_MIME=text wl-paste --type text --watch \"$script\" 2>/dev/null &\nOMARCHY_CLIPBOARD_WATCH_MIME=image/png wl-paste --type image/png --watch \"$script\" 2>/dev/null &\nwait"
+  // Shares the [menu] surface tokens — themes that style the menu also
+  // style the clipboard. Selected-row colors composed in the
+  // singleton so consumers drop them straight into Rectangle bindings.
+  property color background: Color.menu.background
+  property color foreground: Color.menu.text
+  property color border: Color.menu.border
+  property var borderSpec: Border.surfaceSpec("menu", "border", border, Math.max(1, Style.space(2)))
+  property color scrim: Color.menu.scrim
+  property color selectedBackground: Color.menu.selectedBackground
+  property color selectedText: Color.menu.selectedText
+  readonly property int cornerRadius: Style.cornerRadius
+  property string fontFamily: Style.font.menuFamily
+  property int contentMargin: Style.spacing.panelPadding
+  property int headerHeight: Math.max(Style.space(34), Style.font.title + Style.spacing.controlPaddingY * 2)
+  property int contentSpacing: Style.spacing.md
+  property int cardWidth: Math.min(Style.space(875), panel.width - Style.gapsOut * 2)
+  property int cardHeight: Math.min(Style.space(600), panel.height - Style.gapsOut * 2)
+  property int rowHeight: Math.max(Style.space(50), Style.font.body + Style.font.caption + Style.spacing.rowPaddingX * 2)
+  property int historyLimit: 300
+
+  function open(payloadJson) {
+    root.opened = true
+    root.filterText = ""
+    root.selectedIndex = 0
+    root.cursorActive = true
+    root.rebuildDisplay()
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+
+  function close() {
+    root.cancelClearHistory()
+    root.opened = false
+  }
+
+  function toggle() {
+    if (root.opened) root.close()
+    else root.open("{}")
+  }
+
+  function normalizeEntry(value) {
+    return ClipboardHistory.normalizeEntry(value)
+  }
+
+  function entryKey(entry) {
+    return ClipboardHistory.entryKey(entry)
+  }
+
+  function loadHistory(raw) {
+    root.history = ClipboardHistory.parseHistory(raw)
+    if (root.opened) root.rebuildDisplay()
+  }
+
+  function saveHistory() {
+    historyFile.setText(JSON.stringify(root.history.slice(0, root.historyLimit), null, 2) + "\n")
+  }
+
+  function addClipboardEntry(entry) {
+    var normalized = ClipboardHistory.normalizeEntry(entry)
+    if (!normalized) return
+
+    root.history = ClipboardHistory.addEntry(root.history, normalized, root.historyLimit)
+    root.saveHistory()
+    if (root.opened) root.rebuildDisplay()
+  }
+
+  function addClipboardJson(line) {
+    root.addClipboardEntry(ClipboardHistory.parseEntryJson(line))
+  }
+
+  function requestClearHistory() {
+    if (root.history.length === 0) return
+    clearConfirm.selectedIndex = 1
+    root.clearConfirmOpen = true
+  }
+
+  function cancelClearHistory() {
+    root.clearConfirmOpen = false
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+
+  function confirmClearHistory() {
+    root.history = ClipboardHistory.clearHistory()
+    root.saveHistory()
+    root.selectedIndex = 0
+    root.cursorActive = false
+    root.clearConfirmOpen = false
+    root.rebuildDisplay()
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+
+  function removeDisplayIndex(index) {
+    if (index < 0 || index >= displayModel.count) return
+
+    var row = displayModel.get(index)
+    root.history = ClipboardHistory.removeEntryAt(root.history, row.historyIndex)
+    root.saveHistory()
+
+    if (displayModel.count <= 1) {
+      root.selectedIndex = 0
+      root.cursorActive = false
+    } else if (root.selectedIndex >= displayModel.count - 1) {
+      root.selectedIndex = displayModel.count - 2
+    }
+
+    root.rebuildDisplay()
+  }
+
+  function rebuildDisplay() {
+    var rows = ClipboardHistory.displayRows(root.history, root.filterText, 50)
+
+    displayModel.clear()
+    for (var i = 0; i < rows.length; i++) {
+      var row = rows[i]
+      displayModel.append({
+        entryType: row.entryType,
+        fullText: row.fullText,
+        previewText: row.previewText,
+        previewImage: row.previewImage ? Util.fileUrl(row.previewImage) : "",
+        path: row.path,
+        mime: row.mime,
+        historyIndex: row.index
+      })
+    }
+
+    if (displayModel.count === 0) selectedIndex = 0
+    else if (selectedIndex >= displayModel.count) selectedIndex = displayModel.count - 1
+    else if (selectedIndex < 0) selectedIndex = 0
+
+    Qt.callLater(function() {
+      if (displayModel.count > 0) resultList.positionViewAtIndex(root.selectedIndex, ListView.Contain)
+    })
+  }
+
+  function select(delta) {
+    if (displayModel.count === 0) return
+    if (!cursorActive) {
+      cursorActive = true
+      selectedIndex = delta < 0 ? displayModel.count - 1 : 0
+    } else {
+      selectedIndex = (selectedIndex + delta + displayModel.count) % displayModel.count
+    }
+    resultList.positionViewAtIndex(selectedIndex, ListView.Contain)
+  }
+
+  function setFilter(nextFilter) {
+    root.filterText = nextFilter
+    root.selectedIndex = 0
+    root.cursorActive = true
+    root.rebuildDisplay()
+  }
+
+  function activateIndex(index) {
+    if (index < 0 || index >= displayModel.count) return
+    var row = displayModel.get(index)
+    root.applySelected(row)
+  }
+
+  function copyIndex(index) {
+    if (index < 0 || index >= displayModel.count) return
+    var row = displayModel.get(index)
+    root.copySelected(row)
+  }
+
+  function openIndex(index) {
+    if (index < 0 || index >= displayModel.count) return
+    var row = displayModel.get(index)
+    root.openSelected(row)
+  }
+
+  function applySelected(row) {
+    if (!row) return
+    root.opened = false
+    if (row.entryType === "image") {
+      Quickshell.execDetached([root.omarchyPath + "/bin/omarchy-clipboard-paste-file", row.mime, row.path])
+    } else if (row.fullText) {
+      Quickshell.execDetached([root.omarchyPath + "/bin/omarchy-clipboard-paste-text", "--shift-insert", "--history-index", String(row.historyIndex)])
+    }
+  }
+
+  function copySelected(row) {
+    if (!row) return
+    root.opened = false
+    if (row.entryType === "image") {
+      Quickshell.execDetached([root.omarchyPath + "/bin/omarchy-clipboard-paste-file", "--copy-only", row.mime, row.path])
+    } else if (row.fullText) {
+      Quickshell.execDetached([root.omarchyPath + "/bin/omarchy-clipboard-paste-text", "--copy-only", "--history-index", String(row.historyIndex)])
+    }
+  }
+
+  function openSelected(row) {
+    if (!row) return
+    root.opened = false
+    Quickshell.execDetached([root.omarchyPath + "/bin/omarchy-clipboard-open", "--history-index", String(row.historyIndex)])
+  }
+
+  Component.onCompleted: initProc.running = true
+
+  ListModel { id: displayModel }
+
+  FileView {
+    id: historyFile
+    path: root.historyPath
+    watchChanges: true
+    atomicWrites: true
+    printErrors: false
+    onLoaded: root.loadHistory(text())
+    onLoadFailed: root.loadHistory("[]")
+    onFileChanged: reload()
+  }
+
+  Process {
+    id: initProc
+    command: ["bash", "-c", "mkdir -p ~/.local/state/omarchy\nscript=$1\nfor pid in $(pgrep -x wl-paste || true); do\n  cmdline=$(tr '\\0' ' ' <\"/proc/$pid/cmdline\" 2>/dev/null || true)\n  if [[ $cmdline == *\"wl-paste --type text --watch $script \"* || $cmdline == *\"wl-paste --type \"*\" --watch $script \"* || $cmdline == *\"/shell/plugins/clipboard/capture.sh\"* ]]; then\n    kill \"$pid\" 2>/dev/null || true\n  fi\ndone", "clipboard-init", root.captureScript]
+    onExited: {
+      currentProc.command = [root.captureScript]
+      currentProc.running = true
+      watchProc.command = ["bash", "-c", root.watchCommand, "clipboard-watch", root.captureScript]
+      watchProc.running = true
+    }
+  }
+
+  Process {
+    id: currentProc
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.addClipboardJson(text)
+    }
+  }
+
+  Process {
+    id: watchProc
+    stdout: SplitParser {
+      onRead: function(data) { root.addClipboardJson(data) }
+    }
+  }
+
+  PanelWindow {
+    id: panel
+    visible: root.opened
+    anchors { top: true; bottom: true; left: true; right: true }
+    color: "transparent"
+    WlrLayershell.namespace: "omarchy-clipboard"
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+    exclusionMode: ExclusionMode.Ignore
+
+    Rectangle {
+      anchors.fill: parent
+      color: root.scrim
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      onClicked: root.close()
+    }
+
+    BorderSurface {
+      id: card
+      width: root.cardWidth
+      height: root.cardHeight
+      radius: root.cornerRadius
+      anchors.centerIn: parent
+      color: root.background
+      borderSpec: root.borderSpec
+      padding: root.contentMargin
+
+      MouseArea { anchors.fill: parent; onClicked: {} }
+
+      Item {
+        id: keyCatcher
+        anchors.fill: parent
+        z: root.clearConfirmOpen ? 20 : 0
+        focus: true
+
+        Keys.priority: Keys.BeforeItem
+        Keys.onPressed: function(event) {
+          if (root.clearConfirmOpen) {
+            if (clearConfirm.handleKey(event)) event.accepted = true
+            return
+          }
+
+          if (event.key === Qt.Key_Escape) {
+            if (root.filterText) root.setFilter("")
+            else root.close()
+            event.accepted = true
+          } else if (event.key === Qt.Key_Backspace) {
+            if (root.filterText.length > 0) root.setFilter(root.filterText.slice(0, -1))
+            event.accepted = true
+          } else if (event.key === Qt.Key_Delete) {
+            if (event.modifiers & Qt.ShiftModifier) root.requestClearHistory()
+            else root.removeDisplayIndex(root.selectedIndex)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Up) {
+            root.select(-1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Down) {
+            root.select(1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_PageUp) {
+            root.select(-6)
+            event.accepted = true
+          } else if (event.key === Qt.Key_PageDown) {
+            root.select(6)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+            if (root.cursorActive && (event.modifiers & Qt.AltModifier)) root.openIndex(root.selectedIndex)
+            else if (root.cursorActive && (event.modifiers & Qt.ShiftModifier)) root.copyIndex(root.selectedIndex)
+            else if (root.cursorActive) root.activateIndex(root.selectedIndex)
+            else if (displayModel.count > 0) root.cursorActive = true
+            event.accepted = true
+          } else if (event.text && event.text.length === 1 && event.text.charCodeAt(0) >= 32 && event.text.charCodeAt(0) !== 127) {
+            root.setFilter(root.filterText + event.text)
+            event.accepted = true
+          }
+        }
+
+        ConfirmDialog {
+          id: clearConfirm
+
+          anchors.fill: parent
+          opened: root.clearConfirmOpen
+          z: 10
+          message: "Delete entire clipboard history?"
+          confirmText: "Delete"
+          background: root.background
+          foreground: root.foreground
+          scrim: root.scrim
+          selectedBackground: root.selectedBackground
+          selectedText: root.selectedText
+          fontFamily: root.fontFamily
+          cornerRadius: root.cornerRadius
+          onCanceled: root.cancelClearHistory()
+          onConfirmed: root.confirmClearHistory()
+        }
+      }
+
+      Column {
+        anchors.fill: parent
+        anchors.topMargin: card.contentTopInset
+        anchors.rightMargin: card.contentRightInset
+        anchors.bottomMargin: card.contentBottomInset
+        anchors.leftMargin: card.contentLeftInset
+        spacing: root.contentSpacing
+
+        Rectangle {
+          width: parent.width
+          height: root.headerHeight
+          radius: root.cornerRadius
+          color: "transparent"
+
+          Text {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
+            text: root.filterText || "Search clipboard…"
+            color: root.foreground
+            opacity: root.filterText ? 1 : 0.58
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.heading
+            elide: Text.ElideRight
+          }
+        }
+
+        Item {
+          width: parent.width
+          height: parent.height - root.headerHeight - root.contentSpacing
+
+          Row {
+            anchors.fill: parent
+            spacing: 0
+
+            Item {
+              width: parent.width / 2
+              height: parent.height
+              clip: true
+
+              ListView {
+                id: resultList
+                anchors.fill: parent
+                anchors.rightMargin: root.contentMargin
+                model: displayModel
+                clip: true
+                spacing: Style.space(4)
+                boundsBehavior: Flickable.StopAtBounds
+
+                delegate: Rectangle {
+                  required property int index
+                  required property string entryType
+                  required property string previewText
+                  required property string fullText
+                  required property string previewImage
+
+                  readonly property bool hasCursor: root.cursorActive && index === root.selectedIndex
+
+                  width: ListView.view.width
+                  height: root.rowHeight
+                  radius: root.cornerRadius
+                  color: hasCursor ? root.selectedBackground : "transparent"
+
+                  Row {
+                    anchors.fill: parent
+                    anchors.leftMargin: Style.space(12)
+                    anchors.rightMargin: Style.space(12)
+                    anchors.topMargin: Style.space(8)
+                    anchors.bottomMargin: Style.space(8)
+                    spacing: Style.space(10)
+
+                    Image {
+                      visible: parent.parent.previewImage.length > 0
+                      width: visible ? parent.height : 0
+                      height: parent.height
+                      source: parent.parent.previewImage
+                      fillMode: Image.PreserveAspectFit
+                      asynchronous: true
+                      smooth: true
+                    }
+
+                    Text {
+                      width: parent.width - (parent.parent.previewImage.length > 0 ? parent.height + parent.spacing : 0)
+                      height: parent.height
+                      text: parent.parent.previewText
+                      color: parent.parent.hasCursor ? root.selectedText : root.foreground
+                      font.family: root.fontFamily
+                      font.pixelSize: Style.font.title
+                      opacity: parent.parent.entryType === "image" || parent.parent.entryType === "file" ? 0.72 : 1.0
+                      elide: Text.ElideRight
+                      wrapMode: Text.NoWrap
+                      verticalAlignment: Text.AlignVCenter
+                    }
+                  }
+
+                  MouseArea {
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onContainsMouseChanged: if (containsMouse) {
+                      root.cursorActive = true
+                      root.selectedIndex = index
+                    }
+                    onClicked: {
+                      root.cursorActive = true
+                      root.selectedIndex = index
+                      root.activateIndex(index)
+                    }
+                  }
+                }
+              }
+            }
+
+            Item {
+              width: parent.width / 2
+              height: parent.height
+              clip: true
+
+              property var activeRow: displayModel.count > 0 && root.selectedIndex >= 0 && root.selectedIndex < displayModel.count ? displayModel.get(root.selectedIndex) : null
+
+              Rectangle {
+                anchors.left: parent.left
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
+                width: Style.normalBorderWidth
+                color: Util.alpha(root.border, 0.28)
+              }
+
+              Text {
+                visible: parent.activeRow && !parent.activeRow.previewImage
+                anchors.fill: parent
+                anchors.leftMargin: root.contentMargin
+                anchors.rightMargin: 0
+                anchors.topMargin: 0
+                anchors.bottomMargin: 0
+                text: parent.activeRow ? parent.activeRow.fullText : ""
+                color: root.foreground
+                font.family: root.fontFamily
+                font.pixelSize: Style.font.title
+                wrapMode: Text.WrapAnywhere
+                elide: Text.ElideRight
+                verticalAlignment: Text.AlignTop
+              }
+
+              Image {
+                visible: parent.activeRow && parent.activeRow.previewImage
+                anchors.fill: parent
+                anchors.leftMargin: root.contentMargin
+                anchors.rightMargin: 0
+                anchors.topMargin: 0
+                anchors.bottomMargin: 0
+                source: parent.activeRow ? parent.activeRow.previewImage : ""
+                fillMode: Image.PreserveAspectFit
+                verticalAlignment: Image.AlignTop
+                asynchronous: true
+                smooth: true
+              }
+            }
+          }
+
+          Column {
+            anchors.centerIn: parent
+            spacing: Style.space(8)
+            visible: displayModel.count === 0
+
+            Text {
+              text: "󰅌"
+              color: root.selectedText
+              opacity: 0.8
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.displayLarge
+              horizontalAlignment: Text.AlignHCenter
+              width: parent.width
+            }
+
+            Text {
+              text: root.history.length === 0 ? "Clipboard is empty" : "No matches for “" + root.filterText + "”"
+              color: root.foreground
+              opacity: 0.7
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.title
+              horizontalAlignment: Text.AlignHCenter
+              width: parent.width
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/clipboard/ClipboardHistory.js b/shell/plugins/clipboard/ClipboardHistory.js
new file mode 100644
index 00000000..54433f0c
--- /dev/null
+++ b/shell/plugins/clipboard/ClipboardHistory.js
@@ -0,0 +1,211 @@
+function normalizeEntry(value) {
+  if (typeof value === "string")
+    return value.trim().length > 0 ? { type: "text", text: value } : null
+
+  if (!value || typeof value !== "object") return null
+
+  var type = String(value.type || value.kind || "")
+  if (type === "text") {
+    var text = String(value.text || "")
+    return text.trim().length > 0 ? { type: "text", text: text } : null
+  }
+
+  if (type === "image") {
+    var path = String(value.path || "")
+    if (!path) return null
+    var entry = {
+      type: "image",
+      path: path,
+      mime: String(value.mime || "image/png")
+    }
+    if (value.capturedAt !== undefined && value.capturedAt !== null)
+      entry.capturedAt = String(value.capturedAt)
+    return entry
+  }
+
+  return null
+}
+
+function entryKey(entry) {
+  if (!entry) return ""
+  if (entry.type === "image") return "image:" + String(entry.path || "")
+  return "text:" + String(entry.text || "")
+}
+
+function parseHistory(raw) {
+  try {
+    var parsed = JSON.parse(String(raw || "[]"))
+    var next = []
+    if (!Array.isArray(parsed)) return next
+
+    for (var i = 0; i < parsed.length; i++) {
+      var entry = normalizeEntry(parsed[i])
+      if (entry) next.push(entry)
+    }
+    return next
+  } catch (e) {
+    return []
+  }
+}
+
+function addEntry(history, entry, limit) {
+  var normalized = normalizeEntry(entry)
+  var max = limit === undefined || limit === null ? 100 : Number(limit)
+  if (isNaN(max)) max = 100
+  max = Math.max(0, max)
+  if (!normalized) return Array.isArray(history) ? history.slice(0, max) : []
+  if (max === 0) return []
+
+  var key = entryKey(normalized)
+  var next = [normalized]
+  var values = Array.isArray(history) ? history : []
+
+  for (var i = 0; i < values.length && next.length < max; i++) {
+    var existing = normalizeEntry(values[i])
+    if (!existing || entryKey(existing) === key) continue
+    next.push(existing)
+  }
+
+  return next
+}
+
+function removeEntryAt(history, index) {
+  var values = Array.isArray(history) ? history : []
+  var target = Number(index)
+  if (isNaN(target) || target < 0 || target >= values.length) return values.slice()
+
+  var next = values.slice()
+  next.splice(target, 1)
+  return next
+}
+
+function clearHistory() {
+  return []
+}
+
+function parseEntryJson(line) {
+  var raw = String(line || "").trim()
+  if (!raw) return null
+  try { return normalizeEntry(JSON.parse(raw)) } catch (e) { return null }
+}
+
+function searchableText(entry) {
+  if (!entry) return ""
+  if (entry.type === "image") return "image screenshot " + String(entry.mime || "") + " " + String(entry.capturedAt || "")
+  return String(entry.text || "") + " " + fileEntryText(entry)
+}
+
+function decodeFileUri(uri) {
+  var value = String(uri || "").trim()
+  if (value.indexOf("file://") !== 0) return ""
+
+  var path = value.substring(7)
+  if (path.indexOf("localhost/") === 0) path = path.substring(9)
+  if (path.charAt(0) !== "/") return ""
+
+  try { return decodeURIComponent(path) } catch (e) { return path }
+}
+
+function filePaths(entry) {
+  if (!entry || entry.type !== "text") return []
+
+  var lines = String(entry.text || "").split(/\r?\n/)
+  var paths = []
+  for (var i = 0; i < lines.length; i++) {
+    var path = decodeFileUri(lines[i])
+    if (path) paths.push(path)
+  }
+  return paths
+}
+
+function fileName(path) {
+  var parts = String(path || "").split("/")
+  return parts.length > 0 ? parts[parts.length - 1] : String(path || "")
+}
+
+function isImagePath(path) {
+  return /\.(png|jpe?g|webp|gif|bmp|tiff?)$/i.test(String(path || ""))
+}
+
+function fileEntryText(entry) {
+  var paths = filePaths(entry)
+  if (paths.length === 0) return ""
+  if (paths.length === 1) return fileName(paths[0])
+  return paths.length + " files"
+}
+
+function imagePreviewText(entry) {
+  var timestamp = String(entry && entry.capturedAt || "")
+  if (!timestamp) return "Image"
+
+  var label = String(entry && entry.mime || "") === "image/png" ? "Screenshot" : "Image"
+  return label + " from " + timestamp
+}
+
+function previewText(entry) {
+  if (!entry) return ""
+  if (entry.type === "image") return imagePreviewText(entry)
+  var fileText = fileEntryText(entry)
+  if (fileText) return fileText
+  return String(entry.text || "").replace(/\s+/g, " ")
+}
+
+function fullText(entry) {
+  if (!entry) return ""
+  var paths = filePaths(entry)
+  if (paths.length > 0) return paths.join("\n")
+  return String(entry.text || "")
+}
+
+function displayRows(history, query, limit) {
+  var values = Array.isArray(history) ? history : []
+  var needle = String(query || "").trim().toLowerCase()
+  var max = limit === undefined || limit === null ? 50 : Number(limit)
+  if (isNaN(max)) max = 50
+  max = Math.max(0, max)
+  if (max === 0) return []
+
+  var rows = []
+
+  for (var i = 0; i < values.length; i++) {
+    var entry = normalizeEntry(values[i])
+    if (!entry) continue
+    if (needle && searchableText(entry).toLowerCase().indexOf(needle) < 0) continue
+
+    var paths = filePaths(entry)
+    var isFile = paths.length > 0
+    var isImage = entry.type === "image"
+    var previewPath = isImage ? String(entry.path || "") : (isFile && paths.length === 1 && isImagePath(paths[0]) ? paths[0] : "")
+    rows.push({
+      entryType: isFile ? "file" : entry.type,
+      fullText: isImage ? "" : fullText(entry),
+      previewText: previewText(entry),
+      previewImage: previewPath,
+      path: isImage ? String(entry.path || "") : (isFile && paths.length === 1 ? paths[0] : ""),
+      mime: isImage ? String(entry.mime || "image/png") : "text/plain",
+      index: i
+    })
+    if (rows.length >= max) break
+  }
+
+  return rows
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    normalizeEntry: normalizeEntry,
+    entryKey: entryKey,
+    parseHistory: parseHistory,
+    addEntry: addEntry,
+    removeEntryAt: removeEntryAt,
+    clearHistory: clearHistory,
+    parseEntryJson: parseEntryJson,
+    searchableText: searchableText,
+    previewText: previewText,
+    imagePreviewText: imagePreviewText,
+    filePaths: filePaths,
+    fileEntryText: fileEntryText,
+    fullText: fullText,
+    displayRows: displayRows
+  }
+}
diff --git a/shell/plugins/clipboard/capture.sh b/shell/plugins/clipboard/capture.sh
new file mode 100755
index 00000000..105d616f
--- /dev/null
+++ b/shell/plugins/clipboard/capture.sh
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+set -o pipefail
+
+STATE_DIR="${XDG_STATE_HOME:-$HOME/.local/state}/omarchy"
+IMAGE_DIR="$STATE_DIR/clipboard-images"
+mkdir -p "$IMAGE_DIR"
+
+types=$(wl-paste --list-types 2>/dev/null || true)
+
+if [[ ${CLIPBOARD_STATE:-} == "sensitive" ]] || grep -qx 'x-kde-passwordManagerHint' <<<"$types"; then
+  exit 0
+fi
+
+emit_image() {
+  local mime="$1"
+  local ext="$2"
+  local tmp=""
+  local hash=""
+  local file=""
+
+  tmp=$(mktemp --tmpdir="$IMAGE_DIR" clipboard.XXXXXX) || return 0
+  if ! timeout 2s wl-paste --type "$mime" > "$tmp" 2>/dev/null || [[ ! -s $tmp ]]; then
+    rm -f "$tmp"
+    return 0
+  fi
+
+  hash=$(sha256sum "$tmp" | awk '{print $1}')
+  file="$IMAGE_DIR/$hash.$ext"
+  if [[ -e $file ]]; then
+    rm -f "$tmp"
+  else
+    mv "$tmp" "$file"
+  fi
+
+  jq -cn --arg mime "$mime" --arg path "$file" --arg captured_at "$(date +'%A %H:%M')" \
+    '{type:"image", mime:$mime, path:$path, capturedAt:$captured_at}'
+}
+
+emit_image_stream() {
+  local mime="$1"
+  local ext="$2"
+  local tmp=""
+  local hash=""
+  local file=""
+
+  tmp=$(mktemp --tmpdir="$IMAGE_DIR" clipboard.XXXXXX) || return 0
+  cat >"$tmp"
+  if [[ ! -s $tmp ]]; then
+    rm -f "$tmp"
+    return 0
+  fi
+
+  hash=$(sha256sum "$tmp" | awk '{print $1}')
+  file="$IMAGE_DIR/$hash.$ext"
+  if [[ -e $file ]]; then
+    rm -f "$tmp"
+  else
+    mv "$tmp" "$file"
+  fi
+
+  jq -cn --arg mime "$mime" --arg path "$file" --arg captured_at "$(date +'%A %H:%M')" \
+    '{type:"image", mime:$mime, path:$path, capturedAt:$captured_at}'
+}
+
+emit_text_stream() {
+  jq -cRs 'select(length > 0) | {type:"text", text:.}'
+}
+
+case "${OMARCHY_CLIPBOARD_WATCH_MIME:-}" in
+text) emit_text_stream; exit 0 ;;
+image/png) emit_image_stream 'image/png' 'png'; exit 0 ;;
+image/jpeg) emit_image_stream 'image/jpeg' 'jpg'; exit 0 ;;
+image/webp) emit_image_stream 'image/webp' 'webp'; exit 0 ;;
+image/gif) emit_image_stream 'image/gif' 'gif'; exit 0 ;;
+image/bmp) emit_image_stream 'image/bmp' 'bmp'; exit 0 ;;
+image/tiff) emit_image_stream 'image/tiff' 'tiff'; exit 0 ;;
+esac
+
+if grep -qx 'image/png' <<<"$types"; then
+  emit_image 'image/png' 'png'
+elif grep -qx 'image/jpeg' <<<"$types"; then
+  emit_image 'image/jpeg' 'jpg'
+elif grep -qx 'image/webp' <<<"$types"; then
+  emit_image 'image/webp' 'webp'
+elif grep -qx 'image/gif' <<<"$types"; then
+  emit_image 'image/gif' 'gif'
+elif grep -qx 'image/bmp' <<<"$types"; then
+  emit_image 'image/bmp' 'bmp'
+elif grep -qx 'image/tiff' <<<"$types"; then
+  emit_image 'image/tiff' 'tiff'
+elif grep -q '^text/' <<<"$types" || grep -qx 'UTF8_STRING' <<<"$types" || grep -qx 'STRING' <<<"$types"; then
+  wl-paste --type text --no-newline 2>/dev/null | jq -cRs 'select(length > 0) | {type:"text", text:.}'
+fi
diff --git a/shell/plugins/clipboard/manifest.json b/shell/plugins/clipboard/manifest.json
new file mode 100644
index 00000000..ba366b8f
--- /dev/null
+++ b/shell/plugins/clipboard/manifest.json
@@ -0,0 +1,15 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.clipboard",
+  "name": "Clipboard",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "A clipboard manager to view and paste history",
+  "kinds": [
+    "overlay"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "overlay": "Clipboard.qml"
+  }
+}
diff --git a/shell/plugins/dev-gallery/GalleryPanel.qml b/shell/plugins/dev-gallery/GalleryPanel.qml
new file mode 100644
index 00000000..aec74b36
--- /dev/null
+++ b/shell/plugins/dev-gallery/GalleryPanel.qml
@@ -0,0 +1,1770 @@
+import QtQuick
+import QtQuick.Controls
+import Quickshell
+import qs.Ui
+import qs.Commons
+
+// Visual reference + live playground for omarchy-shell's common UI
+// components. Summon with `omarchy dev ui-preview`, or directly via:
+//   omarchy-shell shell summon omarchy.dev-gallery "{}"
+//
+// Every section here renders the REAL component (not a copy) so the
+// gallery doubles as a smoke test. When you add a new common component,
+// add a section here. Maintenance discipline: this file should ONLY use
+// imported common components, never inline reimplementations of them.
+Item {
+  id: root
+
+  // ---- plugin lifecycle ---------------------------------------------------
+  property bool closingFromHost: false
+
+  function open(payloadJson) {
+    closingFromHost = false
+    window.visible = true
+
+    // Optional { section: "button" } in the payload lets `omarchy dev
+    // ui-preview <section>` open the gallery with the cursor already on
+    // a specific component, so iterating on one widget doesn't require
+    // scrolling from the top each time. Unknown section names are
+    // ignored — the gallery opens at its default position.
+    var requested = ""
+    if (payloadJson) {
+      try {
+        var parsed = JSON.parse(String(payloadJson))
+        if (parsed && typeof parsed.section === "string") requested = parsed.section
+      } catch (e) { /* ignore */ }
+    }
+
+    // Defer the section assignment + focus so the FloatingWindow's
+    // content tree is mounted. The hasCursor bindings on each demo
+    // target then scroll themselves into view via onHasCursorChanged.
+    Qt.callLater(function() {
+      if (requested && visibleSections.indexOf(requested) !== -1) {
+        focusSection = requested
+        selectedIndex = sectionFirstIndex(requested)
+      }
+      if (keyCatcher) keyCatcher.forceActiveFocus()
+    })
+  }
+
+  // Host-initiated close (`shell hide`). Visibility flips without
+  // notifying the host back — it already knows.
+  function close() {
+    closingFromHost = true
+    window.visible = false
+    closingFromHost = false
+  }
+
+  // User-initiated close (Esc, window close button). Tell the shell so its
+  // openPanelIds map stays consistent and `toggle` works on the next call.
+  function requestClose() {
+    if (shell && typeof shell.hide === "function") shell.hide("omarchy.dev-gallery")
+    else window.visible = false
+  }
+
+  // ---- host injections ----------------------------------------------------
+  property var shell: null
+
+  // ---- theme --------------------------------------------------------------
+  readonly property color foreground: Color.foreground
+  readonly property color background: Color.background
+  readonly property color accent: Color.accent
+  readonly property color urgent: Color.urgent
+  readonly property string fontFamily: "monospace"
+
+  // Fake `bar` for components that take a whole bar object (e.g. Slider).
+  readonly property var fakeBar: QtObject {
+    readonly property color foreground: root.foreground
+    readonly property color background: root.background
+    readonly property color urgent: root.urgent
+    readonly property string fontFamily: root.fontFamily
+    readonly property string position: "top"
+    readonly property bool vertical: false
+    readonly property int barSize: 26
+  }
+
+  // ---- cursor model -------------------------------------------------------
+  //
+  // The gallery itself uses the same recipe wifi / audio / bluetooth /
+  // monitor panels use: focusSection + selectedIndex drive a single
+  // highlight that crosses kit primitives uniformly, with j/k walking
+  // targets (jumping section boundaries automatically), h/l acting
+  // locally (horizontal rows / slider adjustment), Enter activating, and
+  // Esc closing. Mouse hover updates the same (focusSection,
+  // selectedIndex) so keyboard and pointer never diverge.
+  //
+  // Plugin authors: copy this section verbatim as a template. Replace
+  // the section IDs with whatever your panel needs. The shape
+  // (visibleSections, sectionCount, sectionIsHorizontal,
+  // sectionAdjustsValue, moveCursor, moveCursorH, activateCursor,
+  // ensureCursorVisible, clampCursor) is the canonical pattern.
+  property string focusSection: "cursor-surface"
+  property int selectedIndex: 0
+
+  // Demo state mutated by interaction.
+  property string choiceDemoValue: "top"
+  property bool toggleDemoOn: true
+  property bool toggleSquareOn: false
+  property string dropdownDemoValue: "Clock"
+  property string searchableDemoValue: ""
+  property int numberDemoValue: 15
+
+  readonly property var visibleSections: [
+    "cursor-surface", "button", "button-group", "panel-action-button",
+    "panel-tool-tip", "slider", "text-field", "number-field",
+    "toggle", "dropdown", "searchable-dropdown", "composed"
+  ]
+
+  function sectionCount(section) {
+    switch (section) {
+      case "cursor-surface":      return 3
+      case "button":              return 5
+      case "button-group":        return 4
+      case "panel-action-button": return 4
+      case "panel-tool-tip":      return 1
+      case "slider":              return 1
+      case "text-field":          return 2
+      case "number-field":        return 1
+      case "toggle":              return 2
+      case "dropdown":            return 1
+      case "searchable-dropdown": return 1
+      case "composed":            return 2
+    }
+    return 0
+  }
+
+  // True for sections whose primitives lay out horizontally (a row of
+  // buttons) — j/k jumps to the next/prev section, h/l walks within the row.
+  function sectionIsHorizontal(section) {
+    return section === "button"
+      || section === "button-group"
+      || section === "panel-action-button"
+  }
+
+  // True for sections where h/l should adjust a value rather than walk.
+  function sectionAdjustsValue(section) {
+    return section === "slider"
+  }
+
+  // Where to land when entering a section from above / below.
+  function sectionFirstIndex(section) { return 0 }
+  function sectionLastIndex(section) { return Math.max(0, sectionCount(section) - 1) }
+
+  function moveCursor(delta) {
+    var sections = visibleSections
+    var sIdx = sections.indexOf(focusSection)
+    if (sIdx < 0) {
+      focusSection = sections[0]
+      selectedIndex = sectionFirstIndex(focusSection)
+      return
+    }
+    if (sectionIsHorizontal(focusSection) || sectionAdjustsValue(focusSection)
+        || sectionCount(focusSection) <= 1) {
+      // Single-row / horizontal / value-adjust sections: j/k crosses to
+      // the next section.
+      if (delta > 0 && sIdx < sections.length - 1) {
+        focusSection = sections[sIdx + 1]
+        selectedIndex = sectionFirstIndex(focusSection)
+      } else if (delta < 0 && sIdx > 0) {
+        focusSection = sections[sIdx - 1]
+        selectedIndex = sectionLastIndex(focusSection)
+      }
+      return
+    }
+    // Vertical multi-row section: walk within, then cross at boundaries.
+    var next = selectedIndex + delta
+    if (next < 0) {
+      if (sIdx > 0) {
+        focusSection = sections[sIdx - 1]
+        selectedIndex = sectionLastIndex(focusSection)
+      }
+    } else if (next >= sectionCount(focusSection)) {
+      if (sIdx < sections.length - 1) {
+        focusSection = sections[sIdx + 1]
+        selectedIndex = sectionFirstIndex(focusSection)
+      }
+    } else {
+      selectedIndex = next
+    }
+  }
+
+  function moveCursorH(delta) {
+    if (sectionAdjustsValue(focusSection)) {
+      // h/l on the slider section nudges the demo volume by 5%.
+      sliderRow.demoVolume = Math.max(0, Math.min(1, sliderRow.demoVolume + delta * 0.05))
+      return
+    }
+    if (!sectionIsHorizontal(focusSection)) return
+    var next = selectedIndex + delta
+    var max = sectionCount(focusSection) - 1
+    if (next < 0) next = 0
+    if (next > max) next = max
+    selectedIndex = next
+  }
+
+  function activateCursor() {
+    if (focusSection === "button-group") {
+      var opts = ["top", "right", "bottom", "left"]
+      if (selectedIndex >= 0 && selectedIndex < opts.length)
+        root.choiceDemoValue = opts[selectedIndex]
+      return
+    }
+    if (focusSection === "toggle") {
+      if (selectedIndex === 0) root.toggleDemoOn = !root.toggleDemoOn
+      else root.toggleSquareOn = !root.toggleSquareOn
+      return
+    }
+    if (focusSection === "dropdown") {
+      demoDropdown.toggle()
+      return
+    }
+    if (focusSection === "searchable-dropdown") {
+      demoSearchableDropdown.toggle()
+      return
+    }
+    if (focusSection === "text-field") {
+      if (selectedIndex === 0) demoTextField.forceActiveFocus()
+      else demoPasswordField.forceActiveFocus()
+      return
+    }
+    if (focusSection === "number-field") {
+      numberDemo.field.forceActiveFocus()
+      return
+    }
+    // pill / panel-action-button / cursor-surface / composed: nothing to
+    // mutate in a demo, but real consumers would call their clicked().
+  }
+
+  function clampCursor() {
+    var sections = visibleSections
+    if (sections.indexOf(focusSection) < 0) {
+      focusSection = sections[0]
+      selectedIndex = sectionFirstIndex(focusSection)
+      return
+    }
+    if (selectedIndex < 0) selectedIndex = 0
+    var max = sectionLastIndex(focusSection)
+    if (selectedIndex > max) selectedIndex = max
+  }
+
+  // Scroll the gallery so the given Item is fully visible inside
+  // scrollArea's viewport, with a 20px breathing margin. Wired into the
+  // hasCursor change handler of every cursor target below.
+  function ensureCursorVisible(item) {
+    if (!item || !scrollArea) return
+    var flick = scrollArea.contentItem
+    if (!flick || flick.contentY === undefined) return
+    var pt = item.mapToItem(flick.contentItem || flick, 0, 0)
+    var top = pt.y
+    var bottom = top + (item.height || 0)
+    var viewTop = flick.contentY
+    var viewBottom = viewTop + flick.height
+    var margin = 12
+    if (top < viewTop + margin) flick.contentY = Math.max(0, top - margin)
+    else if (bottom > viewBottom - margin)
+      flick.contentY = bottom + margin - flick.height
+  }
+
+  FloatingWindow {
+    id: window
+    title: "Omarchy shell – dev gallery"
+    color: root.background
+    implicitWidth: 720
+    implicitHeight: 760
+    minimumSize: Qt.size(560, 520)
+
+    onVisibleChanged: {
+      if (!visible && !root.closingFromHost && root.shell && typeof root.shell.hide === "function")
+        root.shell.hide("omarchy.dev-gallery")
+    }
+
+    FocusScope {
+      id: focusScope
+      anchors.fill: parent
+      focus: true
+
+      function scrollBy(dy) {
+        var sb = scrollArea.ScrollBar.vertical
+        if (!sb || scrollArea.contentHeight <= scrollArea.height) return
+        var newPos = sb.position + dy / scrollArea.contentHeight
+        sb.position = Math.max(0, Math.min(1 - sb.size, newPos))
+      }
+
+      // Page/Home/End handled here so they bubble up past keyCatcher
+      // (which only consumes Esc / Enter / j-k-h-l / x / text keys).
+      Keys.priority: Keys.AfterItem
+      Keys.onPressed: function(event) {
+        if (event.key === Qt.Key_PageDown) {
+          focusScope.scrollBy(300); event.accepted = true
+        } else if (event.key === Qt.Key_PageUp) {
+          focusScope.scrollBy(-300); event.accepted = true
+        } else if (event.key === Qt.Key_Home) {
+          scrollArea.ScrollBar.vertical.position = 0
+          event.accepted = true
+        } else if (event.key === Qt.Key_End) {
+          var sb = scrollArea.ScrollBar.vertical
+          if (sb) sb.position = Math.max(0, 1 - sb.size)
+          event.accepted = true
+        }
+      }
+
+      // Panel-style key dispatch — the gallery demonstrates the standard,
+      // so it USES the standard. j/k walks cursor targets across sections,
+      // h/l acts locally (rows + slider adjust), Enter activates the
+      // current target, Esc closes. The catcher suspends itself while a
+      // dropdown popup or text field owns keyboard input, so typing into
+      // the embedded controls doesn't double-drive the panel cursor.
+      PanelKeyCatcher {
+        id: keyCatcher
+        anchors.fill: parent
+        blocked: demoDropdown.popupOpen
+          || demoSearchableDropdown.popupOpen
+          || demoTextField.activeFocus
+          || demoPasswordField.activeFocus
+        onMoveRequested: function(dx, dy) {
+          if (dy !== 0) root.moveCursor(dy)
+          else if (dx !== 0) root.moveCursorH(dx)
+        }
+        onActivateRequested: root.activateCursor()
+        onCloseRequested: root.requestClose()
+
+        ScrollView {
+          id: scrollArea
+          anchors.fill: parent
+          anchors.margins: Style.space(18)
+          clip: true
+          ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+
+        Column {
+          width: scrollArea.availableWidth
+          spacing: Style.space(22)
+
+          // ---- Header ------------------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(4)
+
+            Text {
+              text: "Omarchy shell · dev gallery"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.iconLarge
+              font.bold: true
+            }
+            Text {
+              text: "Live previews of every type exported from qs.Ui. Use this as the visual reference when porting panels or building plugins. j/k or arrows to walk; h/l within rows; Enter to activate; Esc to close."
+              color: Qt.darker(root.foreground, 1.4)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.bodySmall
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+          }
+
+          PanelSeparator { foreground: root.foreground }
+
+          // ---- Kit conventions ---------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "Conventions"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: conventionsCol.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Column {
+                id: conventionsCol
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                anchors.rightMargin: Style.space(14)
+                spacing: Style.space(8)
+
+                Text {
+                  width: parent.width
+                  wrapMode: Text.WordWrap
+                  color: Qt.darker(root.foreground, 1.4)
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.bodySmall
+                  text: "Theme. qs.Commons.Style exposes cornerRadius plus shared normal / hover-cursor / selected / focus state tokens (state colors, fill alphas, border widths, and border alphas), spacing tokens, typography, and bar dimensions. Focus defaults to hover-cursor; selected borders are off by default. Border widths are the theme-level on/off switch for state borders. qs.Commons.Color exposes foreground / background / accent / urgent plus per-surface roles. Components default-bind to these so a caller with no overrides matches the active theme."
+                }
+                Text {
+                  width: parent.width
+                  wrapMode: Text.WordWrap
+                  color: Qt.darker(root.foreground, 1.4)
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.bodySmall
+                  text: "Single cursor. Most reusable panel primitives expose hasCursor: bool and emit hovered(bool); composed rows (including sliders) wrap their content in CursorSurface. The panel root owns cursorActive + focusSection + selectedIndex; each element binds hasCursor: root.cursorActive && root.focusSection === 'X' && root.selectedIndex === N, and onHovered flips cursorActive on while updating the same state. No initial highlight, then one highlight on screen once the keyboard or mouse enters. See plugins/panels/audio/Panel.qml for the canonical recipe."
+                }
+                Text {
+                  width: parent.width
+                  wrapMode: Text.WordWrap
+                  color: Qt.darker(root.foreground, 1.4)
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.bodySmall
+                  text: "Popups + editors. Dropdown / SearchableDropdown expose popupOpen plus open() / close() / toggle(); inline TextField uses activeFocus. While any of those own the keys, set PanelKeyCatcher.blocked so the panel's cursor model freezes and the active widget handles input."
+                }
+                Text {
+                  width: parent.width
+                  wrapMode: Text.WordWrap
+                  color: Qt.darker(root.foreground, 1.4)
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.bodySmall
+                  text: "Adding a component. Drop the QML in Ui/, add a line to Ui/qmldir, then add a section here using the real type (not a copy). The gallery doubles as a smoke test — if a component starts misbehaving this is the fastest place to see it."
+                }
+              }
+            }
+          }
+
+          PanelSeparator { foreground: root.foreground }
+
+          // ---- Typography --------------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "Typography"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Style.font.* is the shell-wide type scale. Themes ship a single "
+                + "[font] base-size in shell.toml; every token derives from it via a "
+                + "fixed multiplier, so changing base-size rescales the whole shell "
+                + "proportionally. There is no upper clamp. Themes can also pin "
+                + "individual tokens (caption, heading, display, etc.) for stylistic "
+                + "emphasis. The family follows the fontconfig monospace alias \u2014 "
+                + "set it with `omarchy font set <name>`."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.bodySmall
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: typeCol.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Column {
+                id: typeCol
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                anchors.rightMargin: Style.space(14)
+                spacing: Style.space(10)
+
+                Text {
+                  text: "Scale"
+                  color: Qt.darker(root.foreground, 1.4)
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.caption
+                  font.bold: true
+                }
+
+                // Every Style.font.* token rendered at its actual size. The
+                // model is data, not a Component graph, so this list stays
+                // in lockstep with the singleton without manual upkeep.
+                Repeater {
+                  model: [
+                    { key: "caption",      size: Style.font.caption,      sample: "Section header text" },
+                    { key: "bodySmall",    size: Style.font.bodySmall,    sample: "Secondary / tooltip text" },
+                    { key: "body",         size: Style.font.body,         sample: "Default label and control text" },
+                    { key: "subtitle",     size: Style.font.subtitle,     sample: "Row title text" },
+                    { key: "title",        size: Style.font.title,        sample: "Card title text" },
+                    { key: "heading",      size: Style.font.heading,      sample: "Panel heading" },
+                    { key: "display",      size: Style.font.display,      sample: "Display text" },
+                    { key: "displayLarge", size: Style.font.displayLarge, sample: "Display large" },
+                    { key: "iconSmall",    size: Style.font.iconSmall,    sample: "\uf004 \uf005 \uf02d" },
+                    { key: "icon",         size: Style.font.icon,         sample: "\uf004 \uf005 \uf02d" },
+                    { key: "iconLarge",    size: Style.font.iconLarge,    sample: "\uf004 \uf005 \uf02d" }
+                  ]
+                  delegate: Item {
+                    required property var modelData
+                    width: typeCol.width
+                    implicitHeight: Math.max(metaCol.implicitHeight, sampleText.implicitHeight)
+
+                    Column {
+                      id: metaCol
+                      anchors.left: parent.left
+                      anchors.verticalCenter: parent.verticalCenter
+                      width: Style.space(140)
+                      spacing: Style.space(1)
+                      Text {
+                        text: "Style.font." + modelData.key
+                        color: root.foreground
+                        font.family: root.fontFamily
+                        font.pixelSize: Style.font.bodySmall
+                      }
+                      Text {
+                        text: modelData.size + " px"
+                        color: Qt.darker(root.foreground, 1.5)
+                        font.family: root.fontFamily
+                        font.pixelSize: Style.font.caption
+                      }
+                    }
+
+                    Text {
+                      id: sampleText
+                      anchors.left: metaCol.right
+                      anchors.right: parent.right
+                      anchors.verticalCenter: parent.verticalCenter
+                      anchors.leftMargin: Style.space(16)
+                      text: modelData.sample
+                      color: root.foreground
+                      font.family: root.fontFamily
+                      font.pixelSize: modelData.size
+                      elide: Text.ElideRight
+                    }
+                  }
+                }
+
+                Rectangle {
+                  width: parent.width
+                  height: 1
+                  color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10)
+                }
+
+                Text {
+                  text: "Theme tokens"
+                  color: Qt.darker(root.foreground, 1.4)
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.caption
+                  font.bold: true
+                }
+
+                Grid {
+                  columns: 2
+                  columnSpacing: Style.space(16)
+                  rowSpacing: Style.space(4)
+                  width: parent.width
+
+                  Text {
+                    text: "Style.font.family"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+                  Text {
+                    text: Style.font.family
+                    color: root.foreground
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+
+                  Text {
+                    text: "Style.font.resolvedFamily"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+                  Text {
+                    text: Style.font.resolvedFamily
+                    color: root.foreground
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+
+                  Text {
+                    text: "Style.font.baseSize"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+                  Text {
+                    text: Style.font.baseSize + " px"
+                    color: root.foreground
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+
+                  Text {
+                    text: "Style.bar.sizeHorizontal"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+                  Text {
+                    text: Style.bar.sizeHorizontal + " px"
+                    color: root.foreground
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+
+                  Text {
+                    text: "Style.bar.sizeVertical"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+                  Text {
+                    text: Style.bar.sizeVertical + " px"
+                    color: root.foreground
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+
+                  Text {
+                    text: "Style.spacing.scale"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+                  Text {
+                    text: Style.spacing.scale.toFixed(2)
+                    color: root.foreground
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+
+                  Text {
+                    text: "Style.spacing.panelPadding"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+                  Text {
+                    text: Style.spacing.panelPadding + " px"
+                    color: root.foreground
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.bodySmall
+                  }
+                }
+              }
+            }
+          }
+
+          PanelSeparator { foreground: root.foreground }
+
+          // ---- PanelSectionHeader ------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "PanelSectionHeader"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Small-caps-style intro label for a section."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: shCol.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Column {
+                id: shCol
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                anchors.rightMargin: Style.space(14)
+                spacing: Style.space(6)
+
+                PanelSectionHeader {
+                  text: "DNS provider"
+                  foreground: root.foreground
+                  fontFamily: root.fontFamily
+                }
+                PanelSectionHeader {
+                  text: "Wi-Fi networks"
+                  foreground: root.foreground
+                  fontFamily: root.fontFamily
+                }
+                PanelSectionHeader {
+                  text: "Playing"
+                  foreground: root.foreground
+                  fontFamily: root.fontFamily
+                  fontSize: Style.font.bodySmall
+                }
+              }
+            }
+          }
+
+          // ---- PanelSeparator ----------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "PanelSeparator"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "1px horizontal rule. Default 0.12 alpha on foreground; tweak via strength."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: sepCol.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Column {
+                id: sepCol
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                anchors.rightMargin: Style.space(14)
+                spacing: Style.space(12)
+
+                PanelSeparator { foreground: root.foreground }
+                PanelSeparator { foreground: root.foreground; strength: 0.25 }
+                PanelSeparator { foreground: root.foreground; strength: 0.45 }
+              }
+            }
+          }
+
+          // ---- CursorSurface -----------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "CursorSurface"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Single highlight chrome for keyboard+mouse navigable items. Press h/l (anywhere in this window) to move the demo cursor. The middle item is also marked `current` to show how the two states layer."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: csCol.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Column {
+                id: csCol
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                anchors.rightMargin: Style.space(14)
+                spacing: Style.space(6)
+
+                Repeater {
+                  model: [
+                    { "label": "Idle row" },
+                    { "label": "Currently-active row (e.g. connected wifi, default sink)" },
+                    { "label": "Forget / scan / disabled-ish row" }
+                  ]
+
+                  CursorSurface {
+                    required property var modelData
+                    required property int index
+                    width: parent.width
+                    implicitHeight: csLabel.implicitHeight + Style.spacing.controlGap * 2
+                    hasCursor: root.focusSection === "cursor-surface" && root.selectedIndex === index
+                    current: index === 1
+                    foreground: root.foreground
+                    fill: Style.hoverFillFor(root.foreground, root.accent)
+                    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+
+                    Text {
+                      id: csLabel
+                      anchors.left: parent.left
+                      anchors.right: parent.right
+                      anchors.verticalCenter: parent.verticalCenter
+                      anchors.leftMargin: Style.space(10)
+                      anchors.rightMargin: Style.space(10)
+                      text: modelData.label
+                      color: root.foreground
+                      font.family: root.fontFamily
+                      font.pixelSize: Style.font.body
+                      elide: Text.ElideRight
+                    }
+
+                    MouseArea {
+                      anchors.fill: parent
+                      hoverEnabled: true
+                      cursorShape: Qt.PointingHandCursor
+                      onContainsMouseChanged: if (containsMouse) {
+                        root.focusSection = "cursor-surface"
+                        root.selectedIndex = parent.index
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+
+          // ---- Button ------------------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "Button"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "The kit's only button. State flags compose from shared tokens: hasCursor / hover paints the hover-cursor fill; active/selected add the selected fill; selected borders are off by default; bordered opts into normal/hover-cursor borders; focusable uses the same defaults as hover-cursor. Click below or press h/l to walk the demo cursor."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: buttonRow.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Row {
+                id: buttonRow
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                spacing: Style.space(16)
+
+                // Each demo Button is paired with a caption labeling the
+                // state(s) it exercises so the section reads as one Button
+                // showing its flag combinations side by side.
+
+                Column {
+                  spacing: Style.space(6)
+                  Button {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: "DHCP"
+                    tooltipText: "Use DNS from DHCP"
+                    hasCursor: root.focusSection === "button" && root.selectedIndex === 0
+                    onHovered: function(h) {
+                      if (h) { root.focusSection = "button"; root.selectedIndex = 0 }
+                    }
+                    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                  }
+                  Text {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: "idle"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.caption
+                  }
+                }
+
+                Column {
+                  spacing: Style.space(6)
+                  Button {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: "Cloudflare"
+                    tooltipText: "Set DNS to Cloudflare"
+                    active: true
+                    hasCursor: root.focusSection === "button" && root.selectedIndex === 1
+                    onHovered: function(h) {
+                      if (h) { root.focusSection = "button"; root.selectedIndex = 1 }
+                    }
+                    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                  }
+                  Text {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: "active"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.caption
+                  }
+                }
+
+                Column {
+                  spacing: Style.space(6)
+                  Button {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    iconText: "󰑐"
+                    tooltipText: "Refresh"
+                    horizontalPadding: Style.spacing.controlGap
+                    verticalPadding: Style.spacing.labelGap
+                    hasCursor: root.focusSection === "button" && root.selectedIndex === 2
+                    onHovered: function(h) {
+                      if (h) { root.focusSection = "button"; root.selectedIndex = 2 }
+                    }
+                    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                  }
+                  Text {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: "icon only"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.caption
+                  }
+                }
+
+                Column {
+                  spacing: Style.space(6)
+                  Button {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    iconText: "󰂯"
+                    text: "On"
+                    tooltipText: "Turn Bluetooth off"
+                    active: true
+                    hasCursor: root.focusSection === "button" && root.selectedIndex === 3
+                    onHovered: function(h) {
+                      if (h) { root.focusSection = "button"; root.selectedIndex = 3 }
+                    }
+                    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                  }
+                  Text {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: "icon + active"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.caption
+                  }
+                }
+
+                Column {
+                  spacing: Style.space(6)
+                  Button {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: "Apply"
+                    focusable: true
+                    bordered: true
+                    hasCursor: root.focusSection === "button" && root.selectedIndex === 4
+                    onHovered: function(h) {
+                      if (h) { root.focusSection = "button"; root.selectedIndex = 4 }
+                    }
+                    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                  }
+                  Text {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    text: "bordered + focusable"
+                    color: Qt.darker(root.foreground, 1.5)
+                    font.family: root.fontFamily
+                    font.pixelSize: Style.font.caption
+                  }
+                }
+              }
+            }
+          }
+
+          // ---- ButtonGroup -------------------------------------------------
+          Column {
+            id: buttonGroupSection
+            width: parent.width
+            spacing: Style.space(8)
+            readonly property bool focused: root.focusSection === "button-group"
+            onFocusedChanged: if (focused) root.ensureCursorVisible(this)
+
+            Text {
+              text: "ButtonGroup"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Mutually-exclusive row of Buttons. Each chip uses Button's bordered chrome; selected and cursor states come from the same shared Style tokens as every other control. Click to pick or press h/l + Enter."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: choiceRow.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              ButtonGroup {
+                id: choiceRow
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                options: ["top", "right", "bottom", "left"]
+                value: root.choiceDemoValue
+                cursorIndex: root.focusSection === "button-group" ? root.selectedIndex : -1
+                onChanged: function(v) {
+                  root.focusSection = "button-group"
+                  root.choiceDemoValue = v
+                }
+                onHovered: function(index, isHovered) {
+                  if (isHovered) {
+                    root.focusSection = "button-group"
+                    root.selectedIndex = index
+                  }
+                }
+              }
+            }
+          }
+
+          // ---- PanelActionButton -------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "PanelActionButton"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "22×22 right-edge action button. Two flavors via hoverColor: default (foreground tint, e.g. confirm) and urgent (red tint, e.g. forget/unpair). Hover and click states are intrinsic; the row that owns it stays responsible for the cursor highlight."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: pabCol.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Row {
+                id: pabCol
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                spacing: Style.space(18)
+
+                PanelActionButton {
+                  iconText: "󰄬"
+                  tooltipText: "Confirm (default flavor)"
+                  foreground: root.foreground
+                  fontFamily: root.fontFamily
+                  hasCursor: root.focusSection === "panel-action-button" && root.selectedIndex === 0
+                  onHovered: function(h) {
+                    if (h) { root.focusSection = "panel-action-button"; root.selectedIndex = 0 }
+                  }
+                  onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                }
+
+                PanelActionButton {
+                  iconText: "󰅙"
+                  tooltipText: "Forget network (urgent flavor)"
+                  foreground: root.foreground
+                  hoverColor: root.urgent
+                  fontFamily: root.fontFamily
+                  hasCursor: root.focusSection === "panel-action-button" && root.selectedIndex === 1
+                  onHovered: function(h) {
+                    if (h) { root.focusSection = "panel-action-button"; root.selectedIndex = 1 }
+                  }
+                  onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                }
+
+                PanelActionButton {
+                  iconText: "󰄬"
+                  tooltipText: "Disabled — type a passphrase first"
+                  foreground: root.foreground
+                  fontFamily: root.fontFamily
+                  enabled: false
+                  hasCursor: root.focusSection === "panel-action-button" && root.selectedIndex === 2
+                  onHovered: function(h) {
+                    if (h) { root.focusSection = "panel-action-button"; root.selectedIndex = 2 }
+                  }
+                  onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                }
+
+                PanelActionButton {
+                  iconText: "󰒓"
+                  tooltipText: "Focusable (settings form button)"
+                  foreground: root.foreground
+                  fontFamily: root.fontFamily
+                  fontSize: Style.font.subtitle
+                  size: Style.space(26)
+                  focusable: true
+                  hasCursor: root.focusSection === "panel-action-button" && root.selectedIndex === 3
+                  onHovered: function(h) {
+                    if (h) { root.focusSection = "panel-action-button"; root.selectedIndex = 3 }
+                  }
+                  onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                }
+              }
+            }
+          }
+
+          // ---- PanelToolTip ------------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "PanelToolTip"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Hover the swatch below to see the styled tooltip. Use this whenever a custom button or row needs a hover hint."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              id: tipSwatch
+              width: Style.space(140)
+              height: Style.space(36)
+              readonly property bool focused: root.focusSection === "panel-tool-tip"
+              color: tipMouse.containsMouse || focused
+                ? Style.hoverFillFor(root.foreground, root.accent)
+                : Style.normalFillFor(root.foreground, root.accent)
+              borderSpec: focused
+                ? Border.controlSpec("hover-cursor", root.foreground, root.accent)
+                : Border.controlSpec("normal", root.foreground, root.accent)
+              radius: Style.cornerRadius
+              onFocusedChanged: if (focused) root.ensureCursorVisible(this)
+
+              Text {
+                anchors.centerIn: parent
+                text: "hover me"
+                color: root.foreground
+                font.family: root.fontFamily
+                font.pixelSize: Style.font.body
+              }
+
+              MouseArea {
+                id: tipMouse
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onContainsMouseChanged: if (containsMouse) {
+                  root.focusSection = "panel-tool-tip"
+                  root.selectedIndex = 0
+                }
+              }
+
+              PanelToolTip {
+                visible: tipMouse.containsMouse || tipSwatch.focused
+                text: "Styled tooltip — drop into any panel"
+                panelForeground: root.foreground
+                fontFamily: root.fontFamily
+              }
+            }
+          }
+
+
+          // ---- Slider ------------------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "Slider"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Volume / progress slider. Drag, click anywhere on the track, or scroll the wheel."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            CursorSurface {
+              id: sliderWrapper
+              width: parent.width
+              implicitHeight: sliderRow.implicitHeight + Style.spacing.rowPaddingX * 2
+              outline: true
+              foreground: root.foreground
+              hasCursor: root.focusSection === "slider"
+              onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+
+              HoverHandler {
+                onHoveredChanged: if (hovered) {
+                  root.focusSection = "slider"
+                  root.selectedIndex = 0
+                }
+              }
+
+              Row {
+                id: sliderRow
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                anchors.rightMargin: Style.space(14)
+                spacing: Style.space(10)
+                property real demoVolume: 0.45
+
+                Text {
+                  text: "󰕾"
+                  color: root.foreground
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.heading
+                  width: 22
+                  horizontalAlignment: Text.AlignHCenter
+                  anchors.verticalCenter: parent.verticalCenter
+                }
+
+                PanelSlider {
+                  id: demoSlider
+                  bar: root.fakeBar
+                  width: parent.width - 70
+                  anchors.verticalCenter: parent.verticalCenter
+                  value: sliderRow.demoVolume
+                  onMoved: function(v) { sliderRow.demoVolume = v }
+                }
+
+                Text {
+                  text: Math.round((demoSlider.dragging ? demoSlider.liveValue : sliderRow.demoVolume) * 100) + "%"
+                  color: root.foreground
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.body
+                  width: 38
+                  horizontalAlignment: Text.AlignRight
+                  anchors.verticalCenter: parent.verticalCenter
+                }
+              }
+            }
+          }
+
+          // ---- TextField -----------------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "TextField"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Single-line input. Inherits Qt Quick Controls TextField, swaps in the kit's focus chrome and selection styling. Toggle `password: true` for masked entry."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: tfCol.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Column {
+                id: tfCol
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                anchors.rightMargin: Style.space(14)
+                spacing: Style.space(10)
+
+                TextField {
+                  id: demoTextField
+                  width: parent.width
+                  placeholderText: "Type something (Enter to start editing, Esc to leave)"
+                  foreground: root.foreground
+                  accent: root.accent
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.body
+                  hasCursor: !activeFocus && root.focusSection === "text-field" && root.selectedIndex === 0
+                  onHoveredChanged: if (hovered) {
+                    root.focusSection = "text-field"; root.selectedIndex = 0
+                  }
+                  onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                  Keys.onPressed: function(event) {
+                    if (event.key === Qt.Key_Escape) {
+                      focus = false
+                      event.accepted = true
+                    }
+                  }
+                }
+
+                TextField {
+                  id: demoPasswordField
+                  width: parent.width
+                  password: true
+                  placeholderText: "Password"
+                  foreground: root.foreground
+                  accent: root.accent
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.body
+                  hasCursor: !activeFocus && root.focusSection === "text-field" && root.selectedIndex === 1
+                  onHoveredChanged: if (hovered) {
+                    root.focusSection = "text-field"; root.selectedIndex = 1
+                  }
+                  onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                  Keys.onPressed: function(event) {
+                    if (event.key === Qt.Key_Escape) {
+                      focus = false
+                      event.accepted = true
+                    }
+                  }
+                }
+              }
+            }
+          }
+
+          // ---- NumberField ---------------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "NumberField"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Labeled spin box for integer settings. Up/down arrows step the value; the field accepts typed input. Pair with `from`/`to`/`stepSize` to constrain range."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: numberDemo.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.12), 1)
+              radius: Style.cornerRadius
+
+              NumberField {
+                id: numberDemo
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(12)
+                label: "Auto-refresh interval (minutes)"
+                from: 1
+                to: 1440
+                value: root.numberDemoValue
+                foreground: root.foreground
+                accent: root.accent
+                fontFamily: root.fontFamily
+                hasCursor: root.focusSection === "number-field" && root.selectedIndex === 0
+                onModified: function(v) { root.numberDemoValue = v }
+                onHovered: function(on) {
+                  if (on) { root.focusSection = "number-field"; root.selectedIndex = 0 }
+                }
+                onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+              }
+            }
+          }
+
+          // ---- Toggle --------------------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "Toggle"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Title + description + switch. Click anywhere on the row to flip; caller updates `checked` in response. Uses the same normal / hover-cursor / focus tokens as Button and the checked switch track uses selected tokens."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            Toggle {
+              width: parent.width
+              label: "Transparent bar"
+              description: "Hide the bar background so the wallpaper shows through."
+              foreground: root.foreground
+              accent: root.accent
+              fontFamily: root.fontFamily
+              checked: root.toggleDemoOn
+              hasCursor: root.focusSection === "toggle" && root.selectedIndex === 0
+              onHovered: function(h) {
+                if (h) { root.focusSection = "toggle"; root.selectedIndex = 0 }
+              }
+              onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+              onClicked: {
+                root.focusSection = "toggle"; root.selectedIndex = 0
+                root.toggleDemoOn = !root.toggleDemoOn
+              }
+            }
+
+            Toggle {
+              width: parent.width
+              label: "Square switch (forced)"
+              description: "`rounded: false` overrides the theme auto-detect so the switch reads square even when corners are round. Set `rounded: Style.cornerRadius > 0` (the default) to follow the theme."
+              foreground: root.foreground
+              accent: root.accent
+              fontFamily: root.fontFamily
+              rounded: false
+              checked: root.toggleSquareOn
+              hasCursor: root.focusSection === "toggle" && root.selectedIndex === 1
+              onHovered: function(h) {
+                if (h) { root.focusSection = "toggle"; root.selectedIndex = 1 }
+              }
+              onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+              onClicked: {
+                root.focusSection = "toggle"; root.selectedIndex = 1
+                root.toggleSquareOn = !root.toggleSquareOn
+              }
+            }
+          }
+
+          // ---- Dropdown -----------------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "Dropdown"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Themed single-select with a panel-styled popup. Tab to focus the trigger, Enter/Space opens, j/k or arrows walk options, Enter selects. Options can be plain strings or { value, label } objects."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: ddCol.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Column {
+                id: ddCol
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                anchors.rightMargin: Style.space(14)
+                spacing: Style.space(6)
+
+                Dropdown {
+                  id: demoDropdown
+                  width: Style.spacing.dropdownWidth
+                  label: "Center anchor"
+                  fontFamily: root.fontFamily
+                  options: ["omarchy.clock", "omarchy.weather", "omarchy.power"]
+                  value: root.dropdownDemoValue
+                  hasCursor: root.focusSection === "dropdown" && root.selectedIndex === 0
+                  onHovered: function(h) {
+                    if (h) { root.focusSection = "dropdown"; root.selectedIndex = 0 }
+                  }
+                  onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                  onChanged: function(v) { root.dropdownDemoValue = v }
+                }
+              }
+            }
+          }
+
+          // ---- SearchableDropdown -------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "SearchableDropdown"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "Dropdown with an embedded filter input. Type to narrow the list, Down to jump from the search to the first match, Enter to select. Use this for long option lists where plain scrolling is friction."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: sddCol.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Column {
+                id: sddCol
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                anchors.rightMargin: Style.space(14)
+                spacing: Style.space(6)
+
+                SearchableDropdown {
+                  id: demoSearchableDropdown
+                  width: Style.spacing.searchableDropdownWidth
+                  label: "Add widget"
+                  fontFamily: root.fontFamily
+                  placeholderText: "Search widgets..."
+                  hasCursor: root.focusSection === "searchable-dropdown" && root.selectedIndex === 0
+                  onHovered: function(h) {
+                    if (h) { root.focusSection = "searchable-dropdown"; root.selectedIndex = 0 }
+                  }
+                  onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+                  options: [
+                    { value: "Clock", label: "Clock", description: "Time + date display" },
+                    { value: "Weather", label: "Weather", description: "Local conditions and forecast" },
+                    { value: "omarchy.power", label: "Power", description: "Charge level + power profile" },
+                    { value: "audio", label: "Audio", description: "Output sink + volume" },
+                    { value: "network", label: "Network", description: "Wi-Fi + ethernet status" },
+                    { value: "bluetooth", label: "Bluetooth", description: "Paired and nearby devices" },
+                    { value: "monitor", label: "Monitor", description: "Brightness + scale" },
+                    { value: "Media", label: "Media", description: "Now-playing + transport" },
+                    { value: "Workspaces", label: "Workspaces", description: "Hyprland workspace pills" },
+                    { value: "system-tray", label: "System tray", description: "StatusNotifierItem icons" },
+                    { value: "omarchy-menu", label: "Omarchy menu", description: "Launcher / system menu" },
+                    { value: "power-profiles", label: "Power profiles", description: "Performance / balanced / saver" },
+                    { value: "hardware", label: "Hardware", description: "CPU, GPU, mem utilization" },
+                    { value: "notifications", label: "Notifications", description: "Recent notification history" }
+                  ]
+                  value: root.searchableDemoValue
+                  onChanged: function(v) { root.searchableDemoValue = v }
+                }
+              }
+            }
+          }
+
+          // ---- Composed example -------------------------------------------
+          Column {
+            width: parent.width
+            spacing: Style.space(8)
+
+            Text {
+              text: "Composed example"
+              color: root.foreground
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.subtitle
+              font.bold: true
+            }
+            Text {
+              text: "A miniature wifi-style row built from CursorSurface + PanelActionButton + PanelToolTip. This is what new panel rows should look like — no inline Rectangle/Text/MouseArea reimplementation."
+              color: Qt.darker(root.foreground, 1.5)
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.caption
+              width: parent.width
+              wrapMode: Text.WordWrap
+            }
+
+            BorderSurface {
+              width: parent.width
+              implicitHeight: composedCol.implicitHeight + Style.spacing.rowPaddingX * 2
+              color: Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.04)
+              radius: Style.cornerRadius
+              borderSpec: Border.flat(Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.10), 1)
+
+              Column {
+                id: composedCol
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Style.space(14)
+                anchors.rightMargin: Style.space(14)
+                spacing: Style.space(6)
+
+                PanelSectionHeader {
+                  text: "Wi-Fi networks"
+                  foreground: root.foreground
+                  fontFamily: root.fontFamily
+                }
+
+                CursorSurface {
+                  width: parent.width
+                  implicitHeight: composedRow.implicitHeight + Style.spacing.md * 2
+                  current: true
+                  foreground: root.foreground
+                  fill: Style.hoverFillFor(root.foreground, root.accent)
+                  hasCursor: root.focusSection === "composed" && root.selectedIndex === 0
+                  onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+
+                  HoverHandler {
+                    onHoveredChanged: if (hovered) {
+                      root.focusSection = "composed"; root.selectedIndex = 0
+                    }
+                  }
+
+                  Item {
+                    id: composedRow
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.leftMargin: Style.space(10)
+                    anchors.rightMargin: Style.space(10)
+                    implicitHeight: 36
+
+                    Text {
+                      id: composedIcon
+                      anchors.left: parent.left
+                      anchors.verticalCenter: parent.verticalCenter
+                      text: "󰖩"
+                      color: root.foreground
+                      font.family: root.fontFamily
+                      font.pixelSize: Style.font.title
+                    }
+
+                    PanelActionButton {
+                      id: composedForget
+                      anchors.right: parent.right
+                      anchors.verticalCenter: parent.verticalCenter
+                      iconText: "󰅙"
+                      tooltipText: "Forget network"
+                      foreground: root.foreground
+                      hoverColor: root.urgent
+                      fontFamily: root.fontFamily
+                    }
+
+                    Column {
+                      spacing: Style.space(1)
+                      anchors.left: composedIcon.right
+                      anchors.leftMargin: Style.space(10)
+                      anchors.right: composedForget.left
+                      anchors.rightMargin: Style.space(8)
+                      anchors.verticalCenter: parent.verticalCenter
+
+                      Text {
+                        text: "HughesWiFi"
+                        color: root.foreground
+                        font.family: root.fontFamily
+                        font.pixelSize: Style.font.body
+                        elide: Text.ElideRight
+                        width: parent.width
+                      }
+                      Text {
+                        text: "Connected"
+                        color: root.foreground
+                        font.family: root.fontFamily
+                        font.pixelSize: Style.font.caption
+                        elide: Text.ElideRight
+                        width: parent.width
+                      }
+                    }
+                  }
+                }
+
+                PanelSeparator { foreground: root.foreground }
+
+                CursorSurface {
+                  width: parent.width
+                  implicitHeight: idleRow.implicitHeight + Style.spacing.md * 2
+                  foreground: root.foreground
+                  fill: Style.hoverFillFor(root.foreground, root.accent)
+                  hasCursor: root.focusSection === "composed" && root.selectedIndex === 1
+                  onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(this)
+
+                  HoverHandler {
+                    onHoveredChanged: if (hovered) {
+                      root.focusSection = "composed"; root.selectedIndex = 1
+                    }
+                  }
+
+                  Item {
+                    id: idleRow
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.leftMargin: Style.space(10)
+                    anchors.rightMargin: Style.space(10)
+                    implicitHeight: 36
+
+                    Text {
+                      anchors.left: parent.left
+                      anchors.verticalCenter: parent.verticalCenter
+                      text: "󰖩"
+                      color: Qt.darker(root.foreground, 1.4)
+                      font.family: root.fontFamily
+                      font.pixelSize: Style.font.title
+                    }
+
+                    Text {
+                      anchors.left: parent.left
+                      anchors.leftMargin: Style.space(24)
+                      anchors.verticalCenter: parent.verticalCenter
+                      text: "HughesATT"
+                      color: root.foreground
+                      font.family: root.fontFamily
+                      font.pixelSize: Style.font.body
+                    }
+                  }
+                }
+              }
+            }
+          }
+
+          Item { width: 1; height: Style.spacing.rowPaddingX }
+        }
+      }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/dev-gallery/manifest.json b/shell/plugins/dev-gallery/manifest.json
new file mode 100644
index 00000000..5491a9be
--- /dev/null
+++ b/shell/plugins/dev-gallery/manifest.json
@@ -0,0 +1,14 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.dev-gallery",
+  "name": "Dev gallery",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Visual reference for omarchy-shell common UI components. Summon with: omarchy-shell shell summon omarchy.dev-gallery '{}' (or run: omarchy dev ui-preview).",
+  "kinds": [
+    "panel"
+  ],
+  "entryPoints": {
+    "panel": "GalleryPanel.qml"
+  }
+}
diff --git a/shell/plugins/emojis/EmojiSearch.js b/shell/plugins/emojis/EmojiSearch.js
new file mode 100644
index 00000000..b36fa58c
--- /dev/null
+++ b/shell/plugins/emojis/EmojiSearch.js
@@ -0,0 +1,46 @@
+function parseEmojis(raw) {
+  try {
+    var data = JSON.parse(String(raw || ""))
+    return Array.isArray(data) ? data : []
+  } catch (e) {
+    return []
+  }
+}
+
+function normalizedQuery(query) {
+  return String(query || "").trim().toLowerCase()
+}
+
+function keywordText(item) {
+  return String((item && item.k) || "").toLowerCase()
+}
+
+function filterEmojis(emojis, query, limit) {
+  var values = Array.isArray(emojis) ? emojis : []
+  var needle = normalizedQuery(query)
+  var max = limit === undefined || limit === null ? 1000 : Number(limit)
+  if (isNaN(max)) max = 1000
+  max = Math.max(0, max)
+  if (max === 0) return []
+
+  var out = []
+
+  for (var i = 0; i < values.length; i++) {
+    var item = values[i]
+    if (!item || !item.e) continue
+    if (!needle || keywordText(item).indexOf(needle) >= 0) {
+      out.push(item)
+      if (out.length >= max) break
+    }
+  }
+
+  return out
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    parseEmojis: parseEmojis,
+    normalizedQuery: normalizedQuery,
+    filterEmojis: filterEmojis
+  }
+}
diff --git a/shell/plugins/emojis/Emojis.qml b/shell/plugins/emojis/Emojis.qml
new file mode 100644
index 00000000..b2b7bf4b
--- /dev/null
+++ b/shell/plugins/emojis/Emojis.qml
@@ -0,0 +1,342 @@
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import QtQuick
+import qs.Commons
+import qs.Ui
+import "EmojiSearch.js" as EmojiSearch
+
+Item {
+  id: root
+
+  property string omarchyPath: Quickshell.env("OMARCHY_PATH")
+  property var shell: null
+  property var manifest: null
+
+  property bool opened: false
+  property string filterText: ""
+  property int selectedIndex: 0
+  property bool cursorActive: false
+  property var emojis: []
+  property var filteredEmojis: []
+
+  // Shares the [menu] surface tokens — themes that style the menu also
+  // style emojis. Selected-cell colors composed in the
+  // singleton so consumers drop them straight into Rectangle bindings.
+  property color background: Color.menu.background
+  property color foreground: Color.menu.text
+  property color border: Color.menu.border
+  property var borderSpec: Border.surfaceSpec("menu", "border", border, Math.max(1, Style.space(2)))
+  property color scrim: Color.menu.scrim
+  property color selectedBackground: Color.menu.selectedBackground
+  property color selectedText: Color.menu.selectedText
+  readonly property int cornerRadius: Style.cornerRadius
+  property string fontFamily: Style.font.menuFamily
+  property int contentMargin: Style.spacing.panelPadding
+  property int headerHeight: Math.max(Style.space(34), Style.font.title + Style.spacing.controlPaddingY * 2)
+  property int contentSpacing: Style.spacing.md
+  property int cardWidth: Math.min(Style.space(400), panel.width - Style.gapsOut * 2)
+  property int cardHeight: Math.min(Style.space(500), panel.height - Style.gapsOut * 2)
+
+  property int cellWidth: Math.max(Style.space(44), Style.font.display + Style.spacing.md)
+  property int cellHeight: Math.max(Style.space(44), Style.font.display + Style.spacing.md)
+  property int columns: Math.floor((cardWidth - contentMargin * 2) / cellWidth)
+
+  function open(payloadJson) {
+    root.opened = true
+    root.filterText = ""
+    root.selectedIndex = 0
+    root.cursorActive = true
+    root.rebuildDisplay()
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+
+  function close() {
+    root.opened = false
+  }
+
+  function dismiss() {
+    root.opened = false
+    if (root.shell && typeof root.shell.hide === "function")
+      root.shell.hide((root.manifest && root.manifest.id) || "omarchy.emojis")
+  }
+
+  function toggle() {
+    if (root.opened) root.dismiss()
+    else root.open("{}")
+  }
+
+  function loadEmojis(raw) {
+    root.emojis = EmojiSearch.parseEmojis(raw)
+    if (root.opened) root.rebuildDisplay()
+  }
+
+  function rebuildDisplay() {
+    var out = EmojiSearch.filterEmojis(root.emojis, root.filterText, 1000)
+    root.filteredEmojis = out
+
+    displayModel.clear()
+    for (var j = 0; j < out.length; j++) {
+      displayModel.append({ emoji: out[j].e, index: j })
+    }
+
+    if (displayModel.count === 0) selectedIndex = 0
+    else if (selectedIndex >= displayModel.count) selectedIndex = displayModel.count - 1
+    else if (selectedIndex < 0) selectedIndex = 0
+    cursorActive = displayModel.count > 0
+
+    Qt.callLater(function() {
+      if (displayModel.count > 0) resultGrid.positionViewAtIndex(root.selectedIndex, GridView.Contain)
+    })
+  }
+
+  function select(delta) {
+    if (displayModel.count === 0) return
+    if (!cursorActive) {
+      cursorActive = true
+      selectedIndex = delta < 0 ? displayModel.count - 1 : 0
+    } else {
+      selectedIndex = (selectedIndex + delta + displayModel.count) % displayModel.count
+    }
+    resultGrid.positionViewAtIndex(selectedIndex, GridView.Contain)
+  }
+
+  function selectRow(delta) {
+    if (displayModel.count === 0) return
+    if (!cursorActive) {
+      cursorActive = true
+      selectedIndex = delta < 0 ? displayModel.count - 1 : 0
+      resultGrid.positionViewAtIndex(selectedIndex, GridView.Contain)
+      return
+    }
+    var newIndex = selectedIndex + delta * columns
+    if (newIndex < 0) newIndex = 0
+    if (newIndex >= displayModel.count) newIndex = displayModel.count - 1
+    selectedIndex = newIndex
+    resultGrid.positionViewAtIndex(selectedIndex, GridView.Contain)
+  }
+
+  function selectPage(delta) {
+    if (displayModel.count === 0) return
+    if (!cursorActive) {
+      cursorActive = true
+      selectedIndex = delta < 0 ? displayModel.count - 1 : 0
+      resultGrid.positionViewAtIndex(selectedIndex, GridView.Contain)
+      return
+    }
+    var visibleRows = Math.max(1, Math.floor(resultGrid.height / cellHeight))
+    var newIndex = selectedIndex + delta * columns * visibleRows
+    if (newIndex < 0) newIndex = 0
+    if (newIndex >= displayModel.count) newIndex = displayModel.count - 1
+    selectedIndex = newIndex
+    resultGrid.positionViewAtIndex(selectedIndex, GridView.Contain)
+  }
+
+  function setFilter(nextFilter) {
+    root.filterText = nextFilter
+    root.selectedIndex = 0
+    root.cursorActive = true
+    root.rebuildDisplay()
+  }
+
+  function activateIndex(index) {
+    if (index < 0 || index >= displayModel.count) return
+    var row = displayModel.get(index)
+    root.applySelected(row.emoji)
+  }
+
+  function applySelected(emoji) {
+    if (!emoji) return
+    root.dismiss()
+    Quickshell.execDetached([root.omarchyPath + "/bin/omarchy-menu-emoji-insert", emoji])
+  }
+
+  ListModel { id: displayModel }
+
+  FileView {
+    path: root.omarchyPath + "/shell/plugins/emojis/emojis.json"
+    onLoaded: root.loadEmojis(text())
+  }
+  PanelWindow {
+    id: panel
+    visible: root.opened
+    anchors { top: true; bottom: true; left: true; right: true }
+    color: "transparent"
+    WlrLayershell.namespace: "omarchy-emojis"
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+    exclusionMode: ExclusionMode.Ignore
+
+    Rectangle {
+      anchors.fill: parent
+      color: root.scrim
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      onClicked: root.dismiss()
+    }
+
+    BorderSurface {
+      id: card
+      width: root.cardWidth
+      height: root.cardHeight
+      radius: root.cornerRadius
+      anchors.centerIn: parent
+      color: root.background
+      borderSpec: root.borderSpec
+      padding: root.contentMargin
+
+      MouseArea { anchors.fill: parent; onClicked: {} }
+
+      Item {
+        id: keyCatcher
+        anchors.fill: parent
+        focus: true
+
+        Keys.priority: Keys.BeforeItem
+        Keys.onPressed: function(event) {
+          if (event.key === Qt.Key_Escape) {
+            if (root.filterText) root.setFilter("")
+            else root.dismiss()
+            event.accepted = true
+          } else if (event.key === Qt.Key_Backspace) {
+            if (root.filterText.length > 0) root.setFilter(root.filterText.slice(0, -1))
+            event.accepted = true
+          } else if (event.key === Qt.Key_Left) {
+            root.select(-1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Right) {
+            root.select(1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Up) {
+            root.selectRow(-1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Down) {
+            root.selectRow(1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_PageUp) {
+            root.selectPage(-1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_PageDown) {
+            root.selectPage(1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+            if (root.cursorActive) root.activateIndex(root.selectedIndex)
+            else if (displayModel.count > 0) root.cursorActive = true
+            event.accepted = true
+          } else if (event.text && event.text.length === 1 && event.text.charCodeAt(0) >= 32 && event.text.charCodeAt(0) !== 127) {
+            root.setFilter(root.filterText + event.text)
+            event.accepted = true
+          }
+        }
+      }
+
+      Column {
+        anchors.fill: parent
+        anchors.topMargin: card.contentTopInset
+        anchors.rightMargin: card.contentRightInset
+        anchors.bottomMargin: card.contentBottomInset
+        anchors.leftMargin: card.contentLeftInset
+        spacing: root.contentSpacing
+
+        Rectangle {
+          width: parent.width
+          height: root.headerHeight
+          radius: root.cornerRadius
+          color: "transparent"
+
+          Text {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
+            text: root.filterText || "Search emojis…"
+            color: root.foreground
+            opacity: root.filterText ? 1 : 0.58
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.heading
+            elide: Text.ElideRight
+          }
+        }
+
+        Item {
+          width: parent.width
+          height: parent.height - root.headerHeight - root.contentSpacing
+
+          GridView {
+            id: resultGrid
+            anchors.fill: parent
+            model: displayModel
+            clip: true
+            cellWidth: root.cellWidth
+            cellHeight: root.cellHeight
+            boundsBehavior: Flickable.StopAtBounds
+
+            delegate: Rectangle {
+              required property int index
+              required property string emoji
+
+              readonly property bool hasCursor: root.cursorActive && index === root.selectedIndex
+
+              width: root.cellWidth
+              height: root.cellHeight
+              radius: root.cornerRadius
+              color: hasCursor ? root.selectedBackground : "transparent"
+
+              Text {
+                text: parent.emoji
+                font.family: root.fontFamily
+                font.pixelSize: Style.font.display
+                anchors.centerIn: parent
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+              }
+
+              MouseArea {
+                id: mouseArea
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onContainsMouseChanged: if (containsMouse) {
+                  root.cursorActive = true
+                  root.selectedIndex = index
+                }
+                onClicked: {
+                  root.cursorActive = true
+                  root.selectedIndex = index
+                  root.activateIndex(index)
+                }
+              }
+            }
+          }
+
+          Column {
+            anchors.centerIn: parent
+            spacing: Style.space(8)
+            visible: displayModel.count === 0
+
+            Text {
+              text: "󰈉"
+              color: root.selectedText
+              opacity: 0.8
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.displayLarge
+              horizontalAlignment: Text.AlignHCenter
+              width: parent.width
+            }
+
+            Text {
+              text: "No matches for “" + root.filterText + "”"
+              color: root.foreground
+              opacity: 0.7
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.title
+              horizontalAlignment: Text.AlignHCenter
+              width: parent.width
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/emojis/emojis.json b/shell/plugins/emojis/emojis.json
new file mode 100644
index 00000000..27c7a252
--- /dev/null
+++ b/shell/plugins/emojis/emojis.json
@@ -0,0 +1 @@
+[{"e":"\ud83d\ude00","k":"grinning face smile grinning happy"},{"e":"\ud83d\ude03","k":"smiley grinning face with big eyes joy haha happy"},{"e":"\ud83d\ude04","k":"grinning face with smiling eyes pleased laugh smile joy happy"},{"e":"\ud83d\ude01","k":"beaming face with smiling eyes grin"},{"e":"\ud83d\ude06","k":"laughing satisfied haha grinning squinting face happy"},{"e":"\ud83d\ude05","k":"hot grinning face with sweat sweat_smile"},{"e":"\ud83e\udd23","k":"rofl laughing rolling on the floor laughing lol"},{"e":"\ud83d\ude02","k":"face with tears of joy joy tears"},{"e":"\ud83d\ude42","k":"slightly_smiling_face slightly smiling face"},{"e":"\ud83d\ude43","k":"upside-down face upside_down_face"},{"e":"\ud83e\udee0","k":"melting_face melting face dread sarcasm"},{"e":"\ud83d\ude09","k":"wink flirt winking face"},{"e":"\ud83d\ude0a","k":"proud smiling face with smiling eyes blush"},{"e":"\ud83d\ude07","k":"innocent smiling face with halo angel"},{"e":"\ud83e\udd70","k":"smiling_face_with_three_hearts smiling face with hearts love"},{"e":"\ud83d\ude0d","k":"smiling face with heart-eyes heart_eyes crush love"},{"e":"\ud83e\udd29","k":"star_struck eyes star-struck"},{"e":"\ud83d\ude18","k":"kissing_heart flirt face blowing a kiss"},{"e":"\ud83d\ude17","k":"kissing face kissing"},{"e":"\u263a\ufe0f","k":"pleased smiling face blush relaxed"},{"e":"\ud83d\ude1a","k":"kissing_closed_eyes kissing face with closed eyes"},{"e":"\ud83d\ude19","k":"kissing face with smiling eyes kissing_smiling_eyes"},{"e":"\ud83e\udd72","k":"smiling_face_with_tear smiling face with tear"},{"e":"\ud83d\ude0b","k":"lick yum tongue face savoring food"},{"e":"\ud83d\ude1b","k":"face with tongue stuck_out_tongue"},{"e":"\ud83d\ude1c","k":"silly stuck_out_tongue_winking_eye winking face with tongue prank"},{"e":"\ud83e\udd2a","k":"goofy wacky zany_face zany face"},{"e":"\ud83d\ude1d","k":"stuck_out_tongue_closed_eyes squinting face with tongue prank"},{"e":"\ud83e\udd11","k":"rich money-mouth face money_mouth_face"},{"e":"\ud83e\udd17","k":"hugs smiling face with open hands"},{"e":"\ud83e\udd2d","k":"quiet whoops face with hand over mouth hand_over_mouth"},{"e":"\ud83e\udee2","k":"face with open eyes and hand over mouth gasp face_with_open_eyes_and_hand_over_mouth shock"},{"e":"\ud83e\udee3","k":"face with peeking eye face_with_peeking_eye"},{"e":"\ud83e\udd2b","k":"shushing face silence shushing_face quiet"},{"e":"\ud83e\udd14","k":"thinking face thinking"},{"e":"\ud83e\udee1","k":"saluting face respect saluting_face"},{"e":"\ud83e\udd10","k":"hush silence zipper-mouth face zipper_mouth_face"},{"e":"\ud83e\udd28","k":"face with raised eyebrow suspicious raised_eyebrow"},{"e":"\ud83d\ude10","k":"neutral face neutral_face meh"},{"e":"\ud83d\ude11","k":"expressionless expressionless face"},{"e":"\ud83d\ude36","k":"silence face without mouth no_mouth mute"},{"e":"\ud83e\udee5","k":"dotted_line_face invisible dotted line face"},{"e":"\ud83d\ude36\u200d\ud83c\udf2b\ufe0f","k":"face in clouds face_in_clouds"},{"e":"\ud83d\ude0f","k":"smug smirk smirking face"},{"e":"\ud83d\ude12","k":"unamused unamused face meh"},{"e":"\ud83d\ude44","k":"roll_eyes face with rolling eyes"},{"e":"\ud83d\ude2c","k":"grimacing grimacing face"},{"e":"\ud83d\ude2e\u200d\ud83d\udca8","k":"face_exhaling face exhaling"},{"e":"\ud83e\udd25","k":"liar lying_face lying face"},{"e":"\ud83e\udee8","k":"shaking face shaking_face shock"},{"e":"\ud83d\ude0c","k":"whew relieved relieved face"},{"e":"\ud83d\ude14","k":"pensive face pensive"},{"e":"\ud83d\ude2a","k":"tired sleepy face sleepy"},{"e":"\ud83e\udd24","k":"drooling_face drooling face"},{"e":"\ud83d\ude34","k":"zzz sleeping sleeping face"},{"e":"\ud83d\ude37","k":"ill mask sick face with medical mask"},{"e":"\ud83e\udd12","k":"face with thermometer face_with_thermometer sick"},{"e":"\ud83e\udd15","k":"face with head-bandage hurt face_with_head_bandage"},{"e":"\ud83e\udd22","k":"barf nauseated_face disgusted sick nauseated face"},{"e":"\ud83e\udd2e","k":"sick vomiting_face barf face vomiting"},{"e":"\ud83e\udd27","k":"sick achoo sneezing face sneezing_face"},{"e":"\ud83e\udd75","k":"heat sweating hot_face hot face"},{"e":"\ud83e\udd76","k":"ice cold_face cold face freezing"},{"e":"\ud83e\udd74","k":"woozy face groggy woozy_face"},{"e":"\ud83d\ude35","k":"dizzy_face face with crossed-out eyes"},{"e":"\ud83d\ude35\u200d\ud83d\udcab","k":"face with spiral eyes face_with_spiral_eyes"},{"e":"\ud83e\udd2f","k":"mind exploding head exploding_head blown"},{"e":"\ud83e\udd20","k":"cowboy_hat_face cowboy hat face"},{"e":"\ud83e\udd73","k":"celebration partying face birthday partying_face"},{"e":"\ud83e\udd78","k":"disguised_face disguised face"},{"e":"\ud83d\ude0e","k":"cool sunglasses smiling face with sunglasses"},{"e":"\ud83e\udd13","k":"nerd_face nerd face geek glasses"},{"e":"\ud83e\uddd0","k":"face with monocle monocle_face"},{"e":"\ud83d\ude15","k":"confused face confused"},{"e":"\ud83e\udee4","k":"face with diagonal mouth face_with_diagonal_mouth confused"},{"e":"\ud83d\ude1f","k":"worried worried face nervous"},{"e":"\ud83d\ude41","k":"slightly_frowning_face slightly frowning face"},{"e":"\u2639\ufe0f","k":"frowning_face frowning face"},{"e":"\ud83d\ude2e","k":"surprise face with open mouth impressed wow open_mouth"},{"e":"\ud83d\ude2f","k":"speechless silence hushed hushed face"},{"e":"\ud83d\ude32","k":"amazed gasp astonished face astonished"},{"e":"\ud83d\ude33","k":"flushed face flushed"},{"e":"\ud83e\udd7a","k":"pleading_face puppy eyes pleading face"},{"e":"\ud83e\udd79","k":"gratitude face_holding_back_tears face holding back tears tears"},{"e":"\ud83d\ude26","k":"frowning frowning face with open mouth"},{"e":"\ud83d\ude27","k":"anguished face stunned anguished"},{"e":"\ud83d\ude28","k":"scared shocked fearful face oops fearful"},{"e":"\ud83d\ude30","k":"anxious face with sweat nervous cold_sweat"},{"e":"\ud83d\ude25","k":"disappointed_relieved nervous sweat sad but relieved face phew"},{"e":"\ud83d\ude22","k":"sad tear crying face cry"},{"e":"\ud83d\ude2d","k":"loudly crying face sob cry bawling sad"},{"e":"\ud83d\ude31","k":"scream shocked horror face screaming in fear"},{"e":"\ud83d\ude16","k":"confounded face confounded"},{"e":"\ud83d\ude23","k":"persevere persevering face struggling"},{"e":"\ud83d\ude1e","k":"disappointed face disappointed sad"},{"e":"\ud83d\ude13","k":"downcast face with sweat sweat"},{"e":"\ud83d\ude29","k":"tired weary weary face"},{"e":"\ud83d\ude2b","k":"whine tired face tired_face upset"},{"e":"\ud83e\udd71","k":"yawning_face yawning face"},{"e":"\ud83d\ude24","k":"triumph smug face with steam from nose"},{"e":"\ud83d\ude21","k":"pout enraged face angry rage"},{"e":"\ud83d\ude20","k":"angry angry face annoyed mad"},{"e":"\ud83e\udd2c","k":"face with symbols on mouth foul cursing_face"},{"e":"\ud83d\ude08","k":"smiling_imp evil smiling face with horns devil horns"},{"e":"\ud83d\udc7f","k":"angry face with horns evil imp devil horns angry"},{"e":"\ud83d\udc80","k":"dead skull poison danger"},{"e":"\u2620\ufe0f","k":"danger skull and crossbones skull_and_crossbones pirate"},{"e":"\ud83d\udca9","k":"hankey crap pile of poo poop shit"},{"e":"\ud83e\udd21","k":"clown_face clown face"},{"e":"\ud83d\udc79","k":"ogre japanese_ogre monster"},{"e":"\ud83d\udc7a","k":"japanese_goblin goblin"},{"e":"\ud83d\udc7b","k":"ghost halloween"},{"e":"\ud83d\udc7d","k":"alien ufo"},{"e":"\ud83d\udc7e","k":"space_invader game retro alien monster"},{"e":"\ud83e\udd16","k":"robot"},{"e":"\ud83d\ude3a","k":"grinning cat smiley_cat"},{"e":"\ud83d\ude38","k":"smile_cat grinning cat with smiling eyes"},{"e":"\ud83d\ude39","k":"cat with tears of joy joy_cat"},{"e":"\ud83d\ude3b","k":"smiling cat with heart-eyes heart_eyes_cat"},{"e":"\ud83d\ude3c","k":"cat with wry smile smirk_cat"},{"e":"\ud83d\ude3d","k":"kissing cat kissing_cat"},{"e":"\ud83d\ude40","k":"scream_cat horror weary cat"},{"e":"\ud83d\ude3f","k":"tear crying_cat_face crying cat sad"},{"e":"\ud83d\ude3e","k":"pouting_cat pouting cat"},{"e":"\ud83d\ude48","k":"see-no-evil monkey ignore blind see_no_evil monkey"},{"e":"\ud83d\ude49","k":"deaf monkey hear_no_evil hear-no-evil monkey"},{"e":"\ud83d\ude4a","k":"mute speak_no_evil hush monkey speak-no-evil monkey"},{"e":"\ud83d\udc8c","k":"envelope love_letter love letter email"},{"e":"\ud83d\udc98","k":"love cupid heart heart with arrow"},{"e":"\ud83d\udc9d","k":"chocolates heart with ribbon gift_heart"},{"e":"\ud83d\udc96","k":"sparkling_heart sparkling heart"},{"e":"\ud83d\udc97","k":"heartpulse growing heart"},{"e":"\ud83d\udc93","k":"beating heart heartbeat"},{"e":"\ud83d\udc9e","k":"revolving hearts revolving_hearts"},{"e":"\ud83d\udc95","k":"two hearts two_hearts"},{"e":"\ud83d\udc9f","k":"heart decoration heart_decoration"},{"e":"\u2763\ufe0f","k":"heart exclamation heavy_heart_exclamation"},{"e":"\ud83d\udc94","k":"broken_heart broken heart"},{"e":"\u2764\ufe0f\u200d\ud83d\udd25","k":"heart_on_fire heart on fire"},{"e":"\u2764\ufe0f\u200d\ud83e\ude79","k":"mending_heart mending heart"},{"e":"\u2764\ufe0f","k":"red heart heart love"},{"e":"\ud83e\ude77","k":"pink_heart pink heart"},{"e":"\ud83e\udde1","k":"orange_heart orange heart"},{"e":"\ud83d\udc9b","k":"yellow_heart yellow heart"},{"e":"\ud83d\udc9a","k":"green heart green_heart"},{"e":"\ud83d\udc99","k":"blue_heart blue heart"},{"e":"\ud83e\ude75","k":"light blue heart light_blue_heart"},{"e":"\ud83d\udc9c","k":"purple heart purple_heart"},{"e":"\ud83e\udd0e","k":"brown heart brown_heart"},{"e":"\ud83d\udda4","k":"black_heart black heart"},{"e":"\ud83e\ude76","k":"grey_heart grey heart"},{"e":"\ud83e\udd0d","k":"white_heart white heart"},{"e":"\ud83d\udc8b","k":"lipstick kiss mark kiss"},{"e":"\ud83d\udcaf","k":"score perfect hundred points 100"},{"e":"\ud83d\udca2","k":"angry anger anger symbol"},{"e":"\ud83d\udca5","k":"boom collision explode"},{"e":"\ud83d\udcab","k":"dizzy star"},{"e":"\ud83d\udca6","k":"water sweat_drops workout sweat droplets"},{"e":"\ud83d\udca8","k":"blow dashing away fast dash wind"},{"e":"\ud83d\udd73\ufe0f","k":"hole"},{"e":"\ud83d\udcac","k":"speech balloon speech_balloon comment"},{"e":"\ud83d\udc41\ufe0f\u200d\ud83d\udde8\ufe0f","k":"eye_speech_bubble eye in speech bubble"},{"e":"\ud83d\udde8\ufe0f","k":"left speech bubble left_speech_bubble"},{"e":"\ud83d\uddef\ufe0f","k":"right anger bubble right_anger_bubble"},{"e":"\ud83d\udcad","k":"thought balloon thinking thought_balloon"},{"e":"\ud83d\udca4","k":"zzz sleeping"},{"e":"\ud83d\udc4b","k":"goodbye wave waving hand"},{"e":"\ud83e\udd1a","k":"raised back of hand raised_back_of_hand"},{"e":"\ud83d\udd90\ufe0f","k":"hand with fingers splayed raised_hand_with_fingers_splayed"},{"e":"\u270b","k":"raised_hand stop highfive hand raised hand"},{"e":"\ud83d\udd96","k":"vulcan_salute prosper vulcan salute spock"},{"e":"\ud83e\udef1","k":"rightwards hand rightwards_hand"},{"e":"\ud83e\udef2","k":"leftwards hand leftwards_hand"},{"e":"\ud83e\udef3","k":"palm down hand palm_down_hand"},{"e":"\ud83e\udef4","k":"palm up hand palm_up_hand"},{"e":"\ud83e\udef7","k":"leftwards pushing hand leftwards_pushing_hand"},{"e":"\ud83e\udef8","k":"rightwards_pushing_hand rightwards pushing hand"},{"e":"\ud83d\udc4c","k":"ok hand ok_hand"},{"e":"\ud83e\udd0c","k":"pinched fingers pinched_fingers"},{"e":"\ud83e\udd0f","k":"pinching_hand pinching hand"},{"e":"\u270c\ufe0f","k":"v victory hand victory peace"},{"e":"\ud83e\udd1e","k":"crossed fingers luck crossed_fingers hopeful"},{"e":"\ud83e\udef0","k":"hand with index finger and thumb crossed hand_with_index_finger_and_thumb_crossed"},{"e":"\ud83e\udd1f","k":"love_you_gesture love-you gesture"},{"e":"\ud83e\udd18","k":"metal sign of the horns"},{"e":"\ud83e\udd19","k":"call_me_hand call me hand"},{"e":"\ud83d\udc48","k":"backhand index pointing left point_left"},{"e":"\ud83d\udc49","k":"backhand index pointing right point_right"},{"e":"\ud83d\udc46","k":"point_up_2 backhand index pointing up"},{"e":"\ud83d\udd95","k":"middle finger middle_finger fu"},{"e":"\ud83d\udc47","k":"backhand index pointing down point_down"},{"e":"\u261d\ufe0f","k":"index pointing up point_up"},{"e":"\ud83e\udef5","k":"index pointing at the viewer index_pointing_at_the_viewer"},{"e":"\ud83d\udc4d","k":"approve thumbs up ok +1 thumbsup"},{"e":"\ud83d\udc4e","k":"disapprove bury -1 thumbs down thumbsdown"},{"e":"\u270a","k":"fist_raised raised fist power fist"},{"e":"\ud83d\udc4a","k":"fist_oncoming oncoming fist facepunch punch attack"},{"e":"\ud83e\udd1b","k":"left-facing fist fist_left"},{"e":"\ud83e\udd1c","k":"right-facing fist fist_right"},{"e":"\ud83d\udc4f","k":"applause clap praise clapping hands"},{"e":"\ud83d\ude4c","k":"raised_hands hooray raising hands"},{"e":"\ud83e\udef6","k":"heart hands heart_hands love"},{"e":"\ud83d\udc50","k":"open hands open_hands"},{"e":"\ud83e\udd32","k":"palms up together palms_up_together"},{"e":"\ud83e\udd1d","k":"handshake deal"},{"e":"\ud83d\ude4f","k":"hope pray wish please folded hands"},{"e":"\u270d\ufe0f","k":"writing_hand writing hand"},{"e":"\ud83d\udc85","k":"nail_care beauty manicure nail polish"},{"e":"\ud83e\udd33","k":"selfie"},{"e":"\ud83d\udcaa","k":"flexed biceps workout flex bicep strong muscle"},{"e":"\ud83e\uddbe","k":"mechanical_arm mechanical arm"},{"e":"\ud83e\uddbf","k":"mechanical leg mechanical_leg"},{"e":"\ud83e\uddb5","k":"leg"},{"e":"\ud83e\uddb6","k":"foot"},{"e":"\ud83d\udc42","k":"sound hear listen ear"},{"e":"\ud83e\uddbb","k":"ear with hearing aid ear_with_hearing_aid"},{"e":"\ud83d\udc43","k":"nose smell"},{"e":"\ud83e\udde0","k":"brain"},{"e":"\ud83e\udec0","k":"anatomical_heart anatomical heart"},{"e":"\ud83e\udec1","k":"lungs"},{"e":"\ud83e\uddb7","k":"tooth"},{"e":"\ud83e\uddb4","k":"bone"},{"e":"\ud83d\udc40","k":"look see eyes watch"},{"e":"\ud83d\udc41\ufe0f","k":"eye"},{"e":"\ud83d\udc45","k":"taste tongue"},{"e":"\ud83d\udc44","k":"lips mouth kiss"},{"e":"\ud83e\udee6","k":"biting lip biting_lip"},{"e":"\ud83d\udc76","k":"child baby newborn"},{"e":"\ud83e\uddd2","k":"child"},{"e":"\ud83d\udc66","k":"boy child"},{"e":"\ud83d\udc67","k":"child girl"},{"e":"\ud83e\uddd1","k":"person adult"},{"e":"\ud83d\udc71","k":"person: blond hair blond_haired_person"},{"e":"\ud83d\udc68","k":"mustache father dad man"},{"e":"\ud83e\uddd4","k":"bearded_person person: beard"},{"e":"\ud83e\uddd4\u200d\u2642\ufe0f","k":"man: beard man_beard"},{"e":"\ud83e\uddd4\u200d\u2640\ufe0f","k":"woman_beard woman: beard"},{"e":"\ud83d\udc68\u200d\ud83e\uddb0","k":"red_haired_man man: red hair"},{"e":"\ud83d\udc68\u200d\ud83e\uddb1","k":"man: curly hair curly_haired_man"},{"e":"\ud83d\udc68\u200d\ud83e\uddb3","k":"white_haired_man man: white hair"},{"e":"\ud83d\udc68\u200d\ud83e\uddb2","k":"bald_man man: bald"},{"e":"\ud83d\udc69","k":"woman girls"},{"e":"\ud83d\udc69\u200d\ud83e\uddb0","k":"red_haired_woman woman: red hair"},{"e":"\ud83e\uddd1\u200d\ud83e\uddb0","k":"person_red_hair person: red hair"},{"e":"\ud83d\udc69\u200d\ud83e\uddb1","k":"woman: curly hair curly_haired_woman"},{"e":"\ud83e\uddd1\u200d\ud83e\uddb1","k":"person_curly_hair person: curly hair"},{"e":"\ud83d\udc69\u200d\ud83e\uddb3","k":"woman: white hair white_haired_woman"},{"e":"\ud83e\uddd1\u200d\ud83e\uddb3","k":"person: white hair person_white_hair"},{"e":"\ud83d\udc69\u200d\ud83e\uddb2","k":"woman: bald bald_woman"},{"e":"\ud83e\uddd1\u200d\ud83e\uddb2","k":"person_bald person: bald"},{"e":"\ud83d\udc71\u200d\u2640\ufe0f","k":"blond_haired_woman blonde_woman woman: blond hair"},{"e":"\ud83d\udc71\u200d\u2642\ufe0f","k":"blond_haired_man man: blond hair"},{"e":"\ud83e\uddd3","k":"older person older_adult"},{"e":"\ud83d\udc74","k":"old man older_man"},{"e":"\ud83d\udc75","k":"older_woman old woman"},{"e":"\ud83d\ude4d","k":"person frowning frowning_person"},{"e":"\ud83d\ude4d\u200d\u2642\ufe0f","k":"frowning_man man frowning"},{"e":"\ud83d\ude4d\u200d\u2640\ufe0f","k":"frowning_woman woman frowning"},{"e":"\ud83d\ude4e","k":"person pouting pouting_face"},{"e":"\ud83d\ude4e\u200d\u2642\ufe0f","k":"pouting_man man pouting"},{"e":"\ud83d\ude4e\u200d\u2640\ufe0f","k":"woman pouting pouting_woman"},{"e":"\ud83d\ude45","k":"denied no_good stop halt person gesturing no"},{"e":"\ud83d\ude45\u200d\u2642\ufe0f","k":"denied man gesturing no stop halt no_good_man ng_man"},{"e":"\ud83d\ude45\u200d\u2640\ufe0f","k":"denied stop no_good_woman halt woman gesturing no ng_woman"},{"e":"\ud83d\ude46","k":"person gesturing ok ok_person"},{"e":"\ud83d\ude46\u200d\u2642\ufe0f","k":"man gesturing ok ok_man"},{"e":"\ud83d\ude46\u200d\u2640\ufe0f","k":"ok_woman woman gesturing ok"},{"e":"\ud83d\udc81","k":"information_desk_person tipping_hand_person person tipping hand"},{"e":"\ud83d\udc81\u200d\u2642\ufe0f","k":"man tipping hand sassy_man tipping_hand_man information"},{"e":"\ud83d\udc81\u200d\u2640\ufe0f","k":"woman tipping hand sassy_woman tipping_hand_woman information"},{"e":"\ud83d\ude4b","k":"person raising hand raising_hand"},{"e":"\ud83d\ude4b\u200d\u2642\ufe0f","k":"raising_hand_man man raising hand"},{"e":"\ud83d\ude4b\u200d\u2640\ufe0f","k":"woman raising hand raising_hand_woman"},{"e":"\ud83e\uddcf","k":"deaf person deaf_person"},{"e":"\ud83e\uddcf\u200d\u2642\ufe0f","k":"deaf_man deaf man"},{"e":"\ud83e\uddcf\u200d\u2640\ufe0f","k":"deaf woman deaf_woman"},{"e":"\ud83d\ude47","k":"thanks respect bow person bowing"},{"e":"\ud83d\ude47\u200d\u2642\ufe0f","k":"thanks man bowing bowing_man respect"},{"e":"\ud83d\ude47\u200d\u2640\ufe0f","k":"bowing_woman woman bowing respect thanks"},{"e":"\ud83e\udd26","k":"person facepalming facepalm"},{"e":"\ud83e\udd26\u200d\u2642\ufe0f","k":"man_facepalming man facepalming"},{"e":"\ud83e\udd26\u200d\u2640\ufe0f","k":"woman facepalming woman_facepalming"},{"e":"\ud83e\udd37","k":"person shrugging shrug"},{"e":"\ud83e\udd37\u200d\u2642\ufe0f","k":"man_shrugging man shrugging"},{"e":"\ud83e\udd37\u200d\u2640\ufe0f","k":"woman_shrugging woman shrugging"},{"e":"\ud83e\uddd1\u200d\u2695\ufe0f","k":"health worker health_worker"},{"e":"\ud83d\udc68\u200d\u2695\ufe0f","k":"man health worker doctor man_health_worker nurse"},{"e":"\ud83d\udc69\u200d\u2695\ufe0f","k":"doctor woman_health_worker woman health worker nurse"},{"e":"\ud83e\uddd1\u200d\ud83c\udf93","k":"student"},{"e":"\ud83d\udc68\u200d\ud83c\udf93","k":"man_student man student graduation"},{"e":"\ud83d\udc69\u200d\ud83c\udf93","k":"woman student woman_student graduation"},{"e":"\ud83e\uddd1\u200d\ud83c\udfeb","k":"teacher"},{"e":"\ud83d\udc68\u200d\ud83c\udfeb","k":"man_teacher professor man teacher school"},{"e":"\ud83d\udc69\u200d\ud83c\udfeb","k":"woman_teacher professor school woman teacher"},{"e":"\ud83e\uddd1\u200d\u2696\ufe0f","k":"judge"},{"e":"\ud83d\udc68\u200d\u2696\ufe0f","k":"justice man_judge man judge"},{"e":"\ud83d\udc69\u200d\u2696\ufe0f","k":"woman judge justice woman_judge"},{"e":"\ud83e\uddd1\u200d\ud83c\udf3e","k":"farmer"},{"e":"\ud83d\udc68\u200d\ud83c\udf3e","k":"man farmer man_farmer"},{"e":"\ud83d\udc69\u200d\ud83c\udf3e","k":"woman_farmer woman farmer"},{"e":"\ud83e\uddd1\u200d\ud83c\udf73","k":"cook"},{"e":"\ud83d\udc68\u200d\ud83c\udf73","k":"man cook chef man_cook"},{"e":"\ud83d\udc69\u200d\ud83c\udf73","k":"woman_cook woman cook chef"},{"e":"\ud83e\uddd1\u200d\ud83d\udd27","k":"mechanic"},{"e":"\ud83d\udc68\u200d\ud83d\udd27","k":"man_mechanic man mechanic"},{"e":"\ud83d\udc69\u200d\ud83d\udd27","k":"woman mechanic woman_mechanic"},{"e":"\ud83e\uddd1\u200d\ud83c\udfed","k":"factory worker factory_worker"},{"e":"\ud83d\udc68\u200d\ud83c\udfed","k":"man factory worker man_factory_worker"},{"e":"\ud83d\udc69\u200d\ud83c\udfed","k":"woman_factory_worker woman factory worker"},{"e":"\ud83e\uddd1\u200d\ud83d\udcbc","k":"office_worker office worker"},{"e":"\ud83d\udc68\u200d\ud83d\udcbc","k":"business man_office_worker man office worker"},{"e":"\ud83d\udc69\u200d\ud83d\udcbc","k":"woman_office_worker business woman office worker"},{"e":"\ud83e\uddd1\u200d\ud83d\udd2c","k":"scientist"},{"e":"\ud83d\udc68\u200d\ud83d\udd2c","k":"man scientist man_scientist research"},{"e":"\ud83d\udc69\u200d\ud83d\udd2c","k":"research woman_scientist woman scientist"},{"e":"\ud83e\uddd1\u200d\ud83d\udcbb","k":"technologist"},{"e":"\ud83d\udc68\u200d\ud83d\udcbb","k":"man_technologist coder man technologist"},{"e":"\ud83d\udc69\u200d\ud83d\udcbb","k":"coder woman technologist woman_technologist"},{"e":"\ud83e\uddd1\u200d\ud83c\udfa4","k":"singer"},{"e":"\ud83d\udc68\u200d\ud83c\udfa4","k":"man singer rockstar man_singer"},{"e":"\ud83d\udc69\u200d\ud83c\udfa4","k":"woman_singer rockstar woman singer"},{"e":"\ud83e\uddd1\u200d\ud83c\udfa8","k":"artist"},{"e":"\ud83d\udc68\u200d\ud83c\udfa8","k":"man artist man_artist painter"},{"e":"\ud83d\udc69\u200d\ud83c\udfa8","k":"painter woman_artist woman artist"},{"e":"\ud83e\uddd1\u200d\u2708\ufe0f","k":"pilot"},{"e":"\ud83d\udc68\u200d\u2708\ufe0f","k":"man pilot man_pilot"},{"e":"\ud83d\udc69\u200d\u2708\ufe0f","k":"woman pilot woman_pilot"},{"e":"\ud83e\uddd1\u200d\ud83d\ude80","k":"astronaut"},{"e":"\ud83d\udc68\u200d\ud83d\ude80","k":"man_astronaut space man astronaut"},{"e":"\ud83d\udc69\u200d\ud83d\ude80","k":"woman astronaut woman_astronaut space"},{"e":"\ud83e\uddd1\u200d\ud83d\ude92","k":"firefighter"},{"e":"\ud83d\udc68\u200d\ud83d\ude92","k":"man_firefighter man firefighter"},{"e":"\ud83d\udc69\u200d\ud83d\ude92","k":"woman_firefighter woman firefighter"},{"e":"\ud83d\udc6e","k":"police officer cop police_officer law"},{"e":"\ud83d\udc6e\u200d\u2642\ufe0f","k":"cop policeman man police officer law"},{"e":"\ud83d\udc6e\u200d\u2640\ufe0f","k":"policewoman woman police officer cop law"},{"e":"\ud83d\udd75\ufe0f","k":"sleuth detective"},{"e":"\ud83d\udd75\ufe0f\u200d\u2642\ufe0f","k":"male_detective man detective sleuth"},{"e":"\ud83d\udd75\ufe0f\u200d\u2640\ufe0f","k":"woman detective female_detective sleuth"},{"e":"\ud83d\udc82","k":"guard"},{"e":"\ud83d\udc82\u200d\u2642\ufe0f","k":"man guard guardsman"},{"e":"\ud83d\udc82\u200d\u2640\ufe0f","k":"guardswoman woman guard"},{"e":"\ud83e\udd77","k":"ninja"},{"e":"\ud83d\udc77","k":"construction_worker helmet construction worker"},{"e":"\ud83d\udc77\u200d\u2642\ufe0f","k":"helmet construction_worker_man man construction worker"},{"e":"\ud83d\udc77\u200d\u2640\ufe0f","k":"helmet woman construction worker construction_worker_woman"},{"e":"\ud83e\udec5","k":"person with crown person_with_crown"},{"e":"\ud83e\udd34","k":"prince crown royal"},{"e":"\ud83d\udc78","k":"crown princess royal"},{"e":"\ud83d\udc73","k":"person wearing turban person_with_turban"},{"e":"\ud83d\udc73\u200d\u2642\ufe0f","k":"man_with_turban man wearing turban"},{"e":"\ud83d\udc73\u200d\u2640\ufe0f","k":"woman wearing turban woman_with_turban"},{"e":"\ud83d\udc72","k":"person with skullcap man_with_gua_pi_mao"},{"e":"\ud83e\uddd5","k":"hijab woman_with_headscarf woman with headscarf"},{"e":"\ud83e\udd35","k":"person_in_tuxedo person in tuxedo groom wedding marriage"},{"e":"\ud83e\udd35\u200d\u2642\ufe0f","k":"man in tuxedo man_in_tuxedo"},{"e":"\ud83e\udd35\u200d\u2640\ufe0f","k":"woman_in_tuxedo woman in tuxedo"},{"e":"\ud83d\udc70","k":"wedding person with veil marriage person_with_veil"},{"e":"\ud83d\udc70\u200d\u2642\ufe0f","k":"man with veil man_with_veil"},{"e":"\ud83d\udc70\u200d\u2640\ufe0f","k":"woman_with_veil woman with veil bride_with_veil"},{"e":"\ud83e\udd30","k":"pregnant woman pregnant_woman"},{"e":"\ud83e\udec3","k":"pregnant_man pregnant man"},{"e":"\ud83e\udec4","k":"pregnant_person pregnant person"},{"e":"\ud83e\udd31","k":"breast_feeding nursing breast-feeding"},{"e":"\ud83d\udc69\u200d\ud83c\udf7c","k":"woman_feeding_baby woman feeding baby"},{"e":"\ud83d\udc68\u200d\ud83c\udf7c","k":"man feeding baby man_feeding_baby"},{"e":"\ud83e\uddd1\u200d\ud83c\udf7c","k":"person feeding baby person_feeding_baby"},{"e":"\ud83d\udc7c","k":"baby angel angel"},{"e":"\ud83c\udf85","k":"santa santa claus christmas"},{"e":"\ud83e\udd36","k":"mrs_claus santa mrs. claus"},{"e":"\ud83e\uddd1\u200d\ud83c\udf84","k":"mx_claus mx claus"},{"e":"\ud83e\uddb8","k":"superhero"},{"e":"\ud83e\uddb8\u200d\u2642\ufe0f","k":"superhero_man man superhero"},{"e":"\ud83e\uddb8\u200d\u2640\ufe0f","k":"woman superhero superhero_woman"},{"e":"\ud83e\uddb9","k":"supervillain"},{"e":"\ud83e\uddb9\u200d\u2642\ufe0f","k":"supervillain_man man supervillain"},{"e":"\ud83e\uddb9\u200d\u2640\ufe0f","k":"woman supervillain supervillain_woman"},{"e":"\ud83e\uddd9","k":"mage wizard"},{"e":"\ud83e\uddd9\u200d\u2642\ufe0f","k":"wizard man mage mage_man"},{"e":"\ud83e\uddd9\u200d\u2640\ufe0f","k":"mage_woman woman mage wizard"},{"e":"\ud83e\uddda","k":"fairy"},{"e":"\ud83e\uddda\u200d\u2642\ufe0f","k":"fairy_man man fairy"},{"e":"\ud83e\uddda\u200d\u2640\ufe0f","k":"fairy_woman woman fairy"},{"e":"\ud83e\udddb","k":"vampire"},{"e":"\ud83e\udddb\u200d\u2642\ufe0f","k":"vampire_man man vampire"},{"e":"\ud83e\udddb\u200d\u2640\ufe0f","k":"vampire_woman woman vampire"},{"e":"\ud83e\udddc","k":"merperson"},{"e":"\ud83e\udddc\u200d\u2642\ufe0f","k":"merman"},{"e":"\ud83e\udddc\u200d\u2640\ufe0f","k":"mermaid"},{"e":"\ud83e\udddd","k":"elf"},{"e":"\ud83e\udddd\u200d\u2642\ufe0f","k":"elf_man man elf"},{"e":"\ud83e\udddd\u200d\u2640\ufe0f","k":"elf_woman woman elf"},{"e":"\ud83e\uddde","k":"genie"},{"e":"\ud83e\uddde\u200d\u2642\ufe0f","k":"man genie genie_man"},{"e":"\ud83e\uddde\u200d\u2640\ufe0f","k":"genie_woman woman genie"},{"e":"\ud83e\udddf","k":"zombie"},{"e":"\ud83e\udddf\u200d\u2642\ufe0f","k":"man zombie zombie_man"},{"e":"\ud83e\udddf\u200d\u2640\ufe0f","k":"zombie_woman woman zombie"},{"e":"\ud83e\uddcc","k":"troll"},{"e":"\ud83d\udc86","k":"person getting massage spa massage"},{"e":"\ud83d\udc86\u200d\u2642\ufe0f","k":"massage_man man getting massage spa"},{"e":"\ud83d\udc86\u200d\u2640\ufe0f","k":"woman getting massage spa massage_woman"},{"e":"\ud83d\udc87","k":"person getting haircut haircut beauty"},{"e":"\ud83d\udc87\u200d\u2642\ufe0f","k":"man getting haircut haircut_man"},{"e":"\ud83d\udc87\u200d\u2640\ufe0f","k":"haircut_woman woman getting haircut"},{"e":"\ud83d\udeb6","k":"walking person walking"},{"e":"\ud83d\udeb6\u200d\u2642\ufe0f","k":"walking_man man walking"},{"e":"\ud83d\udeb6\u200d\u2640\ufe0f","k":"walking_woman woman walking"},{"e":"\ud83e\uddcd","k":"person standing standing_person"},{"e":"\ud83e\uddcd\u200d\u2642\ufe0f","k":"man standing standing_man"},{"e":"\ud83e\uddcd\u200d\u2640\ufe0f","k":"woman standing standing_woman"},{"e":"\ud83e\uddce","k":"kneeling_person person kneeling"},{"e":"\ud83e\uddce\u200d\u2642\ufe0f","k":"man kneeling kneeling_man"},{"e":"\ud83e\uddce\u200d\u2640\ufe0f","k":"woman kneeling kneeling_woman"},{"e":"\ud83e\uddd1\u200d\ud83e\uddaf","k":"person with white cane person_with_probing_cane"},{"e":"\ud83d\udc68\u200d\ud83e\uddaf","k":"man_with_probing_cane man with white cane"},{"e":"\ud83d\udc69\u200d\ud83e\uddaf","k":"woman with white cane woman_with_probing_cane"},{"e":"\ud83e\uddd1\u200d\ud83e\uddbc","k":"person in motorized wheelchair person_in_motorized_wheelchair"},{"e":"\ud83d\udc68\u200d\ud83e\uddbc","k":"man_in_motorized_wheelchair man in motorized wheelchair"},{"e":"\ud83d\udc69\u200d\ud83e\uddbc","k":"woman in motorized wheelchair woman_in_motorized_wheelchair"},{"e":"\ud83e\uddd1\u200d\ud83e\uddbd","k":"person_in_manual_wheelchair person in manual wheelchair"},{"e":"\ud83d\udc68\u200d\ud83e\uddbd","k":"man_in_manual_wheelchair man in manual wheelchair"},{"e":"\ud83d\udc69\u200d\ud83e\uddbd","k":"woman_in_manual_wheelchair woman in manual wheelchair"},{"e":"\ud83c\udfc3","k":"workout person running exercise marathon running runner"},{"e":"\ud83c\udfc3\u200d\u2642\ufe0f","k":"workout exercise marathon running_man man running"},{"e":"\ud83c\udfc3\u200d\u2640\ufe0f","k":"woman running workout running_woman exercise marathon"},{"e":"\ud83d\udc83","k":"woman dancing dress dancer woman_dancing"},{"e":"\ud83d\udd7a","k":"dancer man_dancing man dancing"},{"e":"\ud83d\udd74\ufe0f","k":"person in suit levitating business_suit_levitating"},{"e":"\ud83d\udc6f","k":"people with bunny ears dancers bunny"},{"e":"\ud83d\udc6f\u200d\u2642\ufe0f","k":"dancing_men men with bunny ears bunny"},{"e":"\ud83d\udc6f\u200d\u2640\ufe0f","k":"bunny dancing_women women with bunny ears"},{"e":"\ud83e\uddd6","k":"person in steamy room sauna_person steamy"},{"e":"\ud83e\uddd6\u200d\u2642\ufe0f","k":"sauna_man man in steamy room steamy"},{"e":"\ud83e\uddd6\u200d\u2640\ufe0f","k":"woman in steamy room sauna_woman steamy"},{"e":"\ud83e\uddd7","k":"bouldering person climbing climbing"},{"e":"\ud83e\uddd7\u200d\u2642\ufe0f","k":"bouldering man climbing climbing_man"},{"e":"\ud83e\uddd7\u200d\u2640\ufe0f","k":"bouldering woman climbing climbing_woman"},{"e":"\ud83e\udd3a","k":"person fencing person_fencing"},{"e":"\ud83c\udfc7","k":"horse racing horse_racing"},{"e":"\u26f7\ufe0f","k":"skier"},{"e":"\ud83c\udfc2","k":"snowboarder"},{"e":"\ud83c\udfcc\ufe0f","k":"person golfing golfing"},{"e":"\ud83c\udfcc\ufe0f\u200d\u2642\ufe0f","k":"golfing_man man golfing"},{"e":"\ud83c\udfcc\ufe0f\u200d\u2640\ufe0f","k":"golfing_woman woman golfing"},{"e":"\ud83c\udfc4","k":"person surfing surfer"},{"e":"\ud83c\udfc4\u200d\u2642\ufe0f","k":"surfing_man man surfing"},{"e":"\ud83c\udfc4\u200d\u2640\ufe0f","k":"surfing_woman woman surfing"},{"e":"\ud83d\udea3","k":"person rowing boat rowboat"},{"e":"\ud83d\udea3\u200d\u2642\ufe0f","k":"man rowing boat rowing_man"},{"e":"\ud83d\udea3\u200d\u2640\ufe0f","k":"woman rowing boat rowing_woman"},{"e":"\ud83c\udfca","k":"person swimming swimmer"},{"e":"\ud83c\udfca\u200d\u2642\ufe0f","k":"swimming_man man swimming"},{"e":"\ud83c\udfca\u200d\u2640\ufe0f","k":"woman swimming swimming_woman"},{"e":"\u26f9\ufe0f","k":"bouncing_ball_person basketball person bouncing ball"},{"e":"\u26f9\ufe0f\u200d\u2642\ufe0f","k":"basketball_man man bouncing ball bouncing_ball_man"},{"e":"\u26f9\ufe0f\u200d\u2640\ufe0f","k":"basketball_woman woman bouncing ball bouncing_ball_woman"},{"e":"\ud83c\udfcb\ufe0f","k":"weight_lifting workout gym person lifting weights"},{"e":"\ud83c\udfcb\ufe0f\u200d\u2642\ufe0f","k":"weight_lifting_man workout gym man lifting weights"},{"e":"\ud83c\udfcb\ufe0f\u200d\u2640\ufe0f","k":"woman lifting weights workout gym weight_lifting_woman"},{"e":"\ud83d\udeb4","k":"bicyclist person biking"},{"e":"\ud83d\udeb4\u200d\u2642\ufe0f","k":"man biking biking_man"},{"e":"\ud83d\udeb4\u200d\u2640\ufe0f","k":"woman biking biking_woman"},{"e":"\ud83d\udeb5","k":"mountain_bicyclist person mountain biking"},{"e":"\ud83d\udeb5\u200d\u2642\ufe0f","k":"mountain_biking_man man mountain biking"},{"e":"\ud83d\udeb5\u200d\u2640\ufe0f","k":"mountain_biking_woman woman mountain biking"},{"e":"\ud83e\udd38","k":"person cartwheeling cartwheeling"},{"e":"\ud83e\udd38\u200d\u2642\ufe0f","k":"man_cartwheeling man cartwheeling"},{"e":"\ud83e\udd38\u200d\u2640\ufe0f","k":"woman_cartwheeling woman cartwheeling"},{"e":"\ud83e\udd3c","k":"wrestling people wrestling"},{"e":"\ud83e\udd3c\u200d\u2642\ufe0f","k":"men_wrestling men wrestling"},{"e":"\ud83e\udd3c\u200d\u2640\ufe0f","k":"women wrestling women_wrestling"},{"e":"\ud83e\udd3d","k":"water_polo person playing water polo"},{"e":"\ud83e\udd3d\u200d\u2642\ufe0f","k":"man playing water polo man_playing_water_polo"},{"e":"\ud83e\udd3d\u200d\u2640\ufe0f","k":"woman playing water polo woman_playing_water_polo"},{"e":"\ud83e\udd3e","k":"person playing handball handball_person"},{"e":"\ud83e\udd3e\u200d\u2642\ufe0f","k":"man playing handball man_playing_handball"},{"e":"\ud83e\udd3e\u200d\u2640\ufe0f","k":"woman_playing_handball woman playing handball"},{"e":"\ud83e\udd39","k":"juggling_person person juggling"},{"e":"\ud83e\udd39\u200d\u2642\ufe0f","k":"man_juggling man juggling"},{"e":"\ud83e\udd39\u200d\u2640\ufe0f","k":"woman_juggling woman juggling"},{"e":"\ud83e\uddd8","k":"person in lotus position lotus_position meditation"},{"e":"\ud83e\uddd8\u200d\u2642\ufe0f","k":"lotus_position_man man in lotus position meditation"},{"e":"\ud83e\uddd8\u200d\u2640\ufe0f","k":"woman in lotus position lotus_position_woman meditation"},{"e":"\ud83d\udec0","k":"person taking bath bath shower"},{"e":"\ud83d\udecc","k":"sleeping_bed person in bed"},{"e":"\ud83e\uddd1\u200d\ud83e\udd1d\u200d\ud83e\uddd1","k":"people holding hands date people_holding_hands couple"},{"e":"\ud83d\udc6d","k":"couple date women holding hands two_women_holding_hands"},{"e":"\ud83d\udc6b","k":"couple woman and man holding hands date"},{"e":"\ud83d\udc6c","k":"two_men_holding_hands date men holding hands couple"},{"e":"\ud83d\udc8f","k":"kiss couplekiss"},{"e":"\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68","k":"kiss: woman, man couplekiss_man_woman"},{"e":"\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68","k":"kiss: man, man couplekiss_man_man"},{"e":"\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69","k":"kiss: woman, woman couplekiss_woman_woman"},{"e":"\ud83d\udc91","k":"couple with heart couple_with_heart"},{"e":"\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d\udc68","k":"couple with heart: woman, man couple_with_heart_woman_man"},{"e":"\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc68","k":"couple_with_heart_man_man couple with heart: man, man"},{"e":"\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d\udc69","k":"couple_with_heart_woman_woman couple with heart: woman, woman"},{"e":"\ud83d\udc6a","k":"home child parents family"},{"e":"\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66","k":"family_man_woman_boy family: man, woman, boy"},{"e":"\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67","k":"family_man_woman_girl family: man, woman, girl"},{"e":"\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d\udc66","k":"family: man, woman, girl, boy family_man_woman_girl_boy"},{"e":"\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66","k":"family: man, woman, boy, boy family_man_woman_boy_boy"},{"e":"\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d\udc67","k":"family: man, woman, girl, girl family_man_woman_girl_girl"},{"e":"\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66","k":"family_man_man_boy family: man, man, boy"},{"e":"\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc67","k":"family_man_man_girl family: man, man, girl"},{"e":"\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d\udc66","k":"family_man_man_girl_boy family: man, man, girl, boy"},{"e":"\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66","k":"family: man, man, boy, boy family_man_man_boy_boy"},{"e":"\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d\udc67","k":"family: man, man, girl, girl family_man_man_girl_girl"},{"e":"\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc66","k":"family: woman, woman, boy family_woman_woman_boy"},{"e":"\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc67","k":"family: woman, woman, girl family_woman_woman_girl"},{"e":"\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d\udc66","k":"family: woman, woman, girl, boy family_woman_woman_girl_boy"},{"e":"\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66","k":"family: woman, woman, boy, boy family_woman_woman_boy_boy"},{"e":"\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d\udc67","k":"family: woman, woman, girl, girl family_woman_woman_girl_girl"},{"e":"\ud83d\udc68\u200d\ud83d\udc66","k":"family: man, boy family_man_boy"},{"e":"\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66","k":"family_man_boy_boy family: man, boy, boy"},{"e":"\ud83d\udc68\u200d\ud83d\udc67","k":"family: man, girl family_man_girl"},{"e":"\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d\udc66","k":"family: man, girl, boy family_man_girl_boy"},{"e":"\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d\udc67","k":"family: man, girl, girl family_man_girl_girl"},{"e":"\ud83d\udc69\u200d\ud83d\udc66","k":"family: woman, boy family_woman_boy"},{"e":"\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66","k":"family: woman, boy, boy family_woman_boy_boy"},{"e":"\ud83d\udc69\u200d\ud83d\udc67","k":"family_woman_girl family: woman, girl"},{"e":"\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d\udc66","k":"family: woman, girl, boy family_woman_girl_boy"},{"e":"\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d\udc67","k":"family_woman_girl_girl family: woman, girl, girl"},{"e":"\ud83d\udde3\ufe0f","k":"speaking_head speaking head"},{"e":"\ud83d\udc64","k":"bust_in_silhouette user bust in silhouette"},{"e":"\ud83d\udc65","k":"team busts_in_silhouette group users busts in silhouette"},{"e":"\ud83e\udec2","k":"people_hugging people hugging"},{"e":"\ud83d\udc63","k":"footprints tracks feet"},{"e":"\ud83d\udc35","k":"monkey_face monkey face"},{"e":"\ud83d\udc12","k":"monkey"},{"e":"\ud83e\udd8d","k":"gorilla"},{"e":"\ud83e\udda7","k":"orangutan"},{"e":"\ud83d\udc36","k":"dog face pet dog"},{"e":"\ud83d\udc15","k":"dog2 dog"},{"e":"\ud83e\uddae","k":"guide_dog guide dog"},{"e":"\ud83d\udc15\u200d\ud83e\uddba","k":"service_dog service dog"},{"e":"\ud83d\udc29","k":"poodle dog"},{"e":"\ud83d\udc3a","k":"wolf"},{"e":"\ud83e\udd8a","k":"fox fox_face"},{"e":"\ud83e\udd9d","k":"raccoon"},{"e":"\ud83d\udc31","k":"cat pet cat face"},{"e":"\ud83d\udc08","k":"cat cat2"},{"e":"\ud83d\udc08\u200d\u2b1b","k":"black cat black_cat"},{"e":"\ud83e\udd81","k":"lion"},{"e":"\ud83d\udc2f","k":"tiger tiger face"},{"e":"\ud83d\udc05","k":"tiger tiger2"},{"e":"\ud83d\udc06","k":"leopard"},{"e":"\ud83d\udc34","k":"horse horse face"},{"e":"\ud83e\udece","k":"canada moose"},{"e":"\ud83e\udecf","k":"donkey mule"},{"e":"\ud83d\udc0e","k":"horse speed racehorse"},{"e":"\ud83e\udd84","k":"unicorn"},{"e":"\ud83e\udd93","k":"zebra"},{"e":"\ud83e\udd8c","k":"deer"},{"e":"\ud83e\uddac","k":"bison"},{"e":"\ud83d\udc2e","k":"cow face cow"},{"e":"\ud83d\udc02","k":"ox"},{"e":"\ud83d\udc03","k":"water buffalo water_buffalo"},{"e":"\ud83d\udc04","k":"cow2 cow"},{"e":"\ud83d\udc37","k":"pig face pig"},{"e":"\ud83d\udc16","k":"pig2 pig"},{"e":"\ud83d\udc17","k":"boar"},{"e":"\ud83d\udc3d","k":"pig nose pig_nose"},{"e":"\ud83d\udc0f","k":"ram"},{"e":"\ud83d\udc11","k":"sheep ewe"},{"e":"\ud83d\udc10","k":"goat"},{"e":"\ud83d\udc2a","k":"camel desert dromedary_camel"},{"e":"\ud83d\udc2b","k":"camel two-hump camel"},{"e":"\ud83e\udd99","k":"llama"},{"e":"\ud83e\udd92","k":"giraffe"},{"e":"\ud83d\udc18","k":"elephant"},{"e":"\ud83e\udda3","k":"mammoth"},{"e":"\ud83e\udd8f","k":"rhinoceros"},{"e":"\ud83e\udd9b","k":"hippopotamus"},{"e":"\ud83d\udc2d","k":"mouse face mouse"},{"e":"\ud83d\udc01","k":"mouse mouse2"},{"e":"\ud83d\udc00","k":"rat"},{"e":"\ud83d\udc39","k":"pet hamster"},{"e":"\ud83d\udc30","k":"rabbit rabbit face bunny"},{"e":"\ud83d\udc07","k":"rabbit rabbit2"},{"e":"\ud83d\udc3f\ufe0f","k":"chipmunk"},{"e":"\ud83e\uddab","k":"beaver"},{"e":"\ud83e\udd94","k":"hedgehog"},{"e":"\ud83e\udd87","k":"bat"},{"e":"\ud83d\udc3b","k":"bear"},{"e":"\ud83d\udc3b\u200d\u2744\ufe0f","k":"polar bear polar_bear"},{"e":"\ud83d\udc28","k":"koala"},{"e":"\ud83d\udc3c","k":"panda_face panda"},{"e":"\ud83e\udda5","k":"sloth"},{"e":"\ud83e\udda6","k":"otter"},{"e":"\ud83e\udda8","k":"skunk"},{"e":"\ud83e\udd98","k":"kangaroo"},{"e":"\ud83e\udda1","k":"badger"},{"e":"\ud83d\udc3e","k":"paw_prints paw prints feet"},{"e":"\ud83e\udd83","k":"turkey thanksgiving"},{"e":"\ud83d\udc14","k":"chicken"},{"e":"\ud83d\udc13","k":"rooster"},{"e":"\ud83d\udc23","k":"hatching chick hatching_chick"},{"e":"\ud83d\udc24","k":"baby chick baby_chick"},{"e":"\ud83d\udc25","k":"hatched_chick front-facing baby chick"},{"e":"\ud83d\udc26","k":"bird"},{"e":"\ud83d\udc27","k":"penguin"},{"e":"\ud83d\udd4a\ufe0f","k":"dove peace"},{"e":"\ud83e\udd85","k":"eagle"},{"e":"\ud83e\udd86","k":"duck"},{"e":"\ud83e\udda2","k":"swan"},{"e":"\ud83e\udd89","k":"owl"},{"e":"\ud83e\udda4","k":"dodo"},{"e":"\ud83e\udeb6","k":"feather"},{"e":"\ud83e\udda9","k":"flamingo"},{"e":"\ud83e\udd9a","k":"peacock"},{"e":"\ud83e\udd9c","k":"parrot"},{"e":"\ud83e\udebd","k":"wing fly"},{"e":"\ud83d\udc26\u200d\u2b1b","k":"black bird black_bird"},{"e":"\ud83e\udebf","k":"honk goose"},{"e":"\ud83d\udc38","k":"frog"},{"e":"\ud83d\udc0a","k":"crocodile"},{"e":"\ud83d\udc22","k":"slow turtle"},{"e":"\ud83e\udd8e","k":"lizard"},{"e":"\ud83d\udc0d","k":"snake"},{"e":"\ud83d\udc32","k":"dragon_face dragon face"},{"e":"\ud83d\udc09","k":"dragon"},{"e":"\ud83e\udd95","k":"dinosaur sauropod"},{"e":"\ud83e\udd96","k":"t-rex dinosaur"},{"e":"\ud83d\udc33","k":"sea spouting whale whale"},{"e":"\ud83d\udc0b","k":"whale2 whale"},{"e":"\ud83d\udc2c","k":"dolphin flipper"},{"e":"\ud83e\uddad","k":"seal"},{"e":"\ud83d\udc1f","k":"fish"},{"e":"\ud83d\udc20","k":"tropical_fish tropical fish"},{"e":"\ud83d\udc21","k":"blowfish"},{"e":"\ud83e\udd88","k":"shark"},{"e":"\ud83d\udc19","k":"octopus"},{"e":"\ud83d\udc1a","k":"sea spiral shell shell beach"},{"e":"\ud83e\udeb8","k":"coral"},{"e":"\ud83e\udebc","k":"jellyfish"},{"e":"\ud83d\udc0c","k":"snail slow"},{"e":"\ud83e\udd8b","k":"butterfly"},{"e":"\ud83d\udc1b","k":"bug"},{"e":"\ud83d\udc1c","k":"ant"},{"e":"\ud83d\udc1d","k":"bee honeybee"},{"e":"\ud83e\udeb2","k":"beetle"},{"e":"\ud83d\udc1e","k":"bug lady beetle lady_beetle"},{"e":"\ud83e\udd97","k":"cricket"},{"e":"\ud83e\udeb3","k":"cockroach"},{"e":"\ud83d\udd77\ufe0f","k":"spider"},{"e":"\ud83d\udd78\ufe0f","k":"spider_web spider web"},{"e":"\ud83e\udd82","k":"scorpion"},{"e":"\ud83e\udd9f","k":"mosquito"},{"e":"\ud83e\udeb0","k":"fly"},{"e":"\ud83e\udeb1","k":"worm"},{"e":"\ud83e\udda0","k":"microbe germ"},{"e":"\ud83d\udc90","k":"flowers bouquet"},{"e":"\ud83c\udf38","k":"cherry blossom spring cherry_blossom flower"},{"e":"\ud83d\udcae","k":"white_flower white flower"},{"e":"\ud83e\udeb7","k":"lotus"},{"e":"\ud83c\udff5\ufe0f","k":"rosette"},{"e":"\ud83c\udf39","k":"flower rose"},{"e":"\ud83e\udd40","k":"wilted flower wilted_flower"},{"e":"\ud83c\udf3a","k":"hibiscus"},{"e":"\ud83c\udf3b","k":"sunflower"},{"e":"\ud83c\udf3c","k":"blossom"},{"e":"\ud83c\udf37","k":"tulip flower"},{"e":"\ud83e\udebb","k":"hyacinth"},{"e":"\ud83c\udf31","k":"seedling plant"},{"e":"\ud83e\udeb4","k":"potted_plant potted plant"},{"e":"\ud83c\udf32","k":"evergreen tree evergreen_tree wood"},{"e":"\ud83c\udf33","k":"wood deciduous_tree deciduous tree"},{"e":"\ud83c\udf34","k":"palm tree palm_tree"},{"e":"\ud83c\udf35","k":"cactus"},{"e":"\ud83c\udf3e","k":"ear_of_rice sheaf of rice"},{"e":"\ud83c\udf3f","k":"herb"},{"e":"\u2618\ufe0f","k":"shamrock"},{"e":"\ud83c\udf40","k":"luck four_leaf_clover four leaf clover"},{"e":"\ud83c\udf41","k":"canada maple_leaf maple leaf"},{"e":"\ud83c\udf42","k":"autumn fallen leaf fallen_leaf"},{"e":"\ud83c\udf43","k":"leaf leaf fluttering in wind leaves"},{"e":"\ud83e\udeb9","k":"empty_nest empty nest"},{"e":"\ud83e\udeba","k":"nest_with_eggs nest with eggs"},{"e":"\ud83c\udf44","k":"mushroom fungus"},{"e":"\ud83c\udf47","k":"grapes"},{"e":"\ud83c\udf48","k":"melon"},{"e":"\ud83c\udf49","k":"watermelon"},{"e":"\ud83c\udf4a","k":"tangerine mandarin orange"},{"e":"\ud83c\udf4b","k":"lemon"},{"e":"\ud83c\udf4c","k":"fruit banana"},{"e":"\ud83c\udf4d","k":"pineapple"},{"e":"\ud83e\udd6d","k":"mango"},{"e":"\ud83c\udf4e","k":"apple red apple"},{"e":"\ud83c\udf4f","k":"green apple green_apple fruit"},{"e":"\ud83c\udf50","k":"pear"},{"e":"\ud83c\udf51","k":"peach"},{"e":"\ud83c\udf52","k":"cherries fruit"},{"e":"\ud83c\udf53","k":"strawberry fruit"},{"e":"\ud83e\uded0","k":"blueberries"},{"e":"\ud83e\udd5d","k":"kiwi_fruit kiwi fruit"},{"e":"\ud83c\udf45","k":"tomato"},{"e":"\ud83e\uded2","k":"olive"},{"e":"\ud83e\udd65","k":"coconut"},{"e":"\ud83e\udd51","k":"avocado"},{"e":"\ud83c\udf46","k":"eggplant aubergine"},{"e":"\ud83e\udd54","k":"potato"},{"e":"\ud83e\udd55","k":"carrot"},{"e":"\ud83c\udf3d","k":"corn ear of corn"},{"e":"\ud83c\udf36\ufe0f","k":"hot_pepper spicy hot pepper"},{"e":"\ud83e\uded1","k":"bell pepper bell_pepper"},{"e":"\ud83e\udd52","k":"cucumber"},{"e":"\ud83e\udd6c","k":"leafy_green leafy green"},{"e":"\ud83e\udd66","k":"broccoli"},{"e":"\ud83e\uddc4","k":"garlic"},{"e":"\ud83e\uddc5","k":"onion"},{"e":"\ud83e\udd5c","k":"peanuts"},{"e":"\ud83e\uded8","k":"beans"},{"e":"\ud83c\udf30","k":"chestnut"},{"e":"\ud83e\udeda","k":"ginger_root ginger root"},{"e":"\ud83e\udedb","k":"pea_pod pea pod"},{"e":"\ud83c\udf5e","k":"toast bread"},{"e":"\ud83e\udd50","k":"croissant"},{"e":"\ud83e\udd56","k":"baguette bread baguette_bread"},{"e":"\ud83e\uded3","k":"flatbread"},{"e":"\ud83e\udd68","k":"pretzel"},{"e":"\ud83e\udd6f","k":"bagel"},{"e":"\ud83e\udd5e","k":"pancakes"},{"e":"\ud83e\uddc7","k":"waffle"},{"e":"\ud83e\uddc0","k":"cheese wedge cheese"},{"e":"\ud83c\udf56","k":"meat_on_bone meat on bone"},{"e":"\ud83c\udf57","k":"poultry_leg poultry leg chicken meat"},{"e":"\ud83e\udd69","k":"cut of meat cut_of_meat"},{"e":"\ud83e\udd53","k":"bacon"},{"e":"\ud83c\udf54","k":"burger hamburger"},{"e":"\ud83c\udf5f","k":"french fries fries"},{"e":"\ud83c\udf55","k":"pizza"},{"e":"\ud83c\udf2d","k":"hotdog hot dog"},{"e":"\ud83e\udd6a","k":"sandwich"},{"e":"\ud83c\udf2e","k":"taco"},{"e":"\ud83c\udf2f","k":"burrito"},{"e":"\ud83e\uded4","k":"tamale"},{"e":"\ud83e\udd59","k":"stuffed_flatbread stuffed flatbread"},{"e":"\ud83e\uddc6","k":"falafel"},{"e":"\ud83e\udd5a","k":"egg"},{"e":"\ud83c\udf73","k":"fried_egg cooking breakfast"},{"e":"\ud83e\udd58","k":"shallow pan of food paella curry shallow_pan_of_food"},{"e":"\ud83c\udf72","k":"stew pot of food"},{"e":"\ud83e\uded5","k":"fondue"},{"e":"\ud83e\udd63","k":"bowl_with_spoon bowl with spoon"},{"e":"\ud83e\udd57","k":"green salad green_salad"},{"e":"\ud83c\udf7f","k":"popcorn"},{"e":"\ud83e\uddc8","k":"butter"},{"e":"\ud83e\uddc2","k":"salt"},{"e":"\ud83e\udd6b","k":"canned food canned_food"},{"e":"\ud83c\udf71","k":"bento box bento"},{"e":"\ud83c\udf58","k":"rice_cracker rice cracker"},{"e":"\ud83c\udf59","k":"rice_ball rice ball"},{"e":"\ud83c\udf5a","k":"rice cooked rice"},{"e":"\ud83c\udf5b","k":"curry rice curry"},{"e":"\ud83c\udf5c","k":"ramen steaming bowl noodle"},{"e":"\ud83c\udf5d","k":"pasta spaghetti"},{"e":"\ud83c\udf60","k":"roasted sweet potato sweet_potato"},{"e":"\ud83c\udf62","k":"oden"},{"e":"\ud83c\udf63","k":"sushi"},{"e":"\ud83c\udf64","k":"fried shrimp tempura fried_shrimp"},{"e":"\ud83c\udf65","k":"fish_cake fish cake with swirl"},{"e":"\ud83e\udd6e","k":"moon_cake moon cake"},{"e":"\ud83c\udf61","k":"dango"},{"e":"\ud83e\udd5f","k":"dumpling"},{"e":"\ud83e\udd60","k":"fortune cookie fortune_cookie"},{"e":"\ud83e\udd61","k":"takeout_box takeout box"},{"e":"\ud83e\udd80","k":"crab"},{"e":"\ud83e\udd9e","k":"lobster"},{"e":"\ud83e\udd90","k":"shrimp"},{"e":"\ud83e\udd91","k":"squid"},{"e":"\ud83e\uddaa","k":"oyster"},{"e":"\ud83c\udf66","k":"icecream soft ice cream"},{"e":"\ud83c\udf67","k":"shaved_ice shaved ice"},{"e":"\ud83c\udf68","k":"ice_cream ice cream"},{"e":"\ud83c\udf69","k":"doughnut"},{"e":"\ud83c\udf6a","k":"cookie"},{"e":"\ud83c\udf82","k":"party birthday cake birthday"},{"e":"\ud83c\udf70","k":"cake dessert shortcake"},{"e":"\ud83e\uddc1","k":"cupcake"},{"e":"\ud83e\udd67","k":"pie"},{"e":"\ud83c\udf6b","k":"chocolate_bar chocolate bar"},{"e":"\ud83c\udf6c","k":"sweet candy"},{"e":"\ud83c\udf6d","k":"lollipop"},{"e":"\ud83c\udf6e","k":"custard"},{"e":"\ud83c\udf6f","k":"honey_pot honey pot"},{"e":"\ud83c\udf7c","k":"baby bottle baby_bottle milk"},{"e":"\ud83e\udd5b","k":"glass of milk milk_glass"},{"e":"\u2615","k":"cafe coffee espresso hot beverage"},{"e":"\ud83e\uded6","k":"teapot"},{"e":"\ud83c\udf75","k":"tea breakfast teacup without handle green"},{"e":"\ud83c\udf76","k":"sake"},{"e":"\ud83c\udf7e","k":"champagne bubbly bottle with popping cork bottle celebration"},{"e":"\ud83c\udf77","k":"wine glass wine_glass"},{"e":"\ud83c\udf78","k":"cocktail glass cocktail drink"},{"e":"\ud83c\udf79","k":"tropical_drink summer vacation tropical drink"},{"e":"\ud83c\udf7a","k":"beer beer mug drink"},{"e":"\ud83c\udf7b","k":"clinking beer mugs beers drinks"},{"e":"\ud83e\udd42","k":"clinking_glasses clinking glasses toast cheers"},{"e":"\ud83e\udd43","k":"tumbler_glass tumbler glass whisky"},{"e":"\ud83e\uded7","k":"pouring_liquid pouring liquid"},{"e":"\ud83e\udd64","k":"cup_with_straw cup with straw"},{"e":"\ud83e\uddcb","k":"bubble tea bubble_tea"},{"e":"\ud83e\uddc3","k":"beverage box beverage_box"},{"e":"\ud83e\uddc9","k":"mate"},{"e":"\ud83e\uddca","k":"ice ice_cube"},{"e":"\ud83e\udd62","k":"chopsticks"},{"e":"\ud83c\udf7d\ufe0f","k":"dining fork and knife with plate dinner plate_with_cutlery"},{"e":"\ud83c\udf74","k":"fork and knife fork_and_knife cutlery"},{"e":"\ud83e\udd44","k":"spoon"},{"e":"\ud83d\udd2a","k":"chop hocho kitchen knife knife cut"},{"e":"\ud83e\uded9","k":"jar"},{"e":"\ud83c\udffa","k":"amphora"},{"e":"\ud83c\udf0d","k":"earth_africa international globe globe showing europe-africa world"},{"e":"\ud83c\udf0e","k":"international earth_americas globe showing americas globe world"},{"e":"\ud83c\udf0f","k":"international globe earth_asia globe showing asia-australia world"},{"e":"\ud83c\udf10","k":"globe_with_meridians international global globe with meridians world"},{"e":"\ud83d\uddfa\ufe0f","k":"travel world_map world map"},{"e":"\ud83d\uddfe","k":"japan map of japan"},{"e":"\ud83e\udded","k":"compass"},{"e":"\ud83c\udfd4\ufe0f","k":"snow-capped mountain mountain_snow"},{"e":"\u26f0\ufe0f","k":"mountain"},{"e":"\ud83c\udf0b","k":"volcano"},{"e":"\ud83d\uddfb","k":"mount fuji mount_fuji"},{"e":"\ud83c\udfd5\ufe0f","k":"camping"},{"e":"\ud83c\udfd6\ufe0f","k":"beach_umbrella beach with umbrella"},{"e":"\ud83c\udfdc\ufe0f","k":"desert"},{"e":"\ud83c\udfdd\ufe0f","k":"desert island desert_island"},{"e":"\ud83c\udfde\ufe0f","k":"national park national_park"},{"e":"\ud83c\udfdf\ufe0f","k":"stadium"},{"e":"\ud83c\udfdb\ufe0f","k":"classical building classical_building"},{"e":"\ud83c\udfd7\ufe0f","k":"building construction building_construction"},{"e":"\ud83e\uddf1","k":"bricks brick"},{"e":"\ud83e\udea8","k":"rock"},{"e":"\ud83e\udeb5","k":"wood"},{"e":"\ud83d\uded6","k":"hut"},{"e":"\ud83c\udfd8\ufe0f","k":"houses"},{"e":"\ud83c\udfda\ufe0f","k":"derelict house derelict_house"},{"e":"\ud83c\udfe0","k":"house"},{"e":"\ud83c\udfe1","k":"house with garden house_with_garden"},{"e":"\ud83c\udfe2","k":"office building office"},{"e":"\ud83c\udfe3","k":"post_office japanese post office"},{"e":"\ud83c\udfe4","k":"post office european_post_office"},{"e":"\ud83c\udfe5","k":"hospital"},{"e":"\ud83c\udfe6","k":"bank"},{"e":"\ud83c\udfe8","k":"hotel"},{"e":"\ud83c\udfe9","k":"love hotel love_hotel"},{"e":"\ud83c\udfea","k":"convenience_store convenience store"},{"e":"\ud83c\udfeb","k":"school"},{"e":"\ud83c\udfec","k":"department store department_store"},{"e":"\ud83c\udfed","k":"factory"},{"e":"\ud83c\udfef","k":"japanese_castle japanese castle"},{"e":"\ud83c\udff0","k":"castle european_castle"},{"e":"\ud83d\udc92","k":"wedding marriage"},{"e":"\ud83d\uddfc","k":"tokyo tower tokyo_tower"},{"e":"\ud83d\uddfd","k":"statue of liberty statue_of_liberty"},{"e":"\u26ea","k":"church"},{"e":"\ud83d\udd4c","k":"mosque"},{"e":"\ud83d\uded5","k":"hindu_temple hindu temple"},{"e":"\ud83d\udd4d","k":"synagogue"},{"e":"\u26e9\ufe0f","k":"shinto_shrine shinto shrine"},{"e":"\ud83d\udd4b","k":"kaaba"},{"e":"\u26f2","k":"fountain"},{"e":"\u26fa","k":"tent camping"},{"e":"\ud83c\udf01","k":"foggy karl"},{"e":"\ud83c\udf03","k":"night with stars night_with_stars"},{"e":"\ud83c\udfd9\ufe0f","k":"skyline cityscape"},{"e":"\ud83c\udf04","k":"sunrise_over_mountains sunrise over mountains"},{"e":"\ud83c\udf05","k":"sunrise"},{"e":"\ud83c\udf06","k":"cityscape at dusk city_sunset"},{"e":"\ud83c\udf07","k":"city_sunrise sunset"},{"e":"\ud83c\udf09","k":"bridge_at_night bridge at night"},{"e":"\u2668\ufe0f","k":"hot springs hotsprings"},{"e":"\ud83c\udfa0","k":"carousel horse carousel_horse"},{"e":"\ud83d\udedd","k":"playground_slide playground slide"},{"e":"\ud83c\udfa1","k":"ferris_wheel ferris wheel"},{"e":"\ud83c\udfa2","k":"roller_coaster roller coaster"},{"e":"\ud83d\udc88","k":"barber barber pole"},{"e":"\ud83c\udfaa","k":"circus tent circus_tent"},{"e":"\ud83d\ude82","k":"train locomotive steam_locomotive"},{"e":"\ud83d\ude83","k":"railway car railway_car"},{"e":"\ud83d\ude84","k":"train high-speed train bullettrain_side"},{"e":"\ud83d\ude85","k":"bullet train train bullettrain_front"},{"e":"\ud83d\ude86","k":"train train2"},{"e":"\ud83d\ude87","k":"metro"},{"e":"\ud83d\ude88","k":"light rail light_rail"},{"e":"\ud83d\ude89","k":"station"},{"e":"\ud83d\ude8a","k":"tram"},{"e":"\ud83d\ude9d","k":"monorail"},{"e":"\ud83d\ude9e","k":"mountain railway mountain_railway"},{"e":"\ud83d\ude8b","k":"train tram car"},{"e":"\ud83d\ude8c","k":"bus"},{"e":"\ud83d\ude8d","k":"oncoming bus oncoming_bus"},{"e":"\ud83d\ude8e","k":"trolleybus"},{"e":"\ud83d\ude90","k":"minibus"},{"e":"\ud83d\ude91","k":"ambulance"},{"e":"\ud83d\ude92","k":"fire_engine fire engine"},{"e":"\ud83d\ude93","k":"police car police_car"},{"e":"\ud83d\ude94","k":"oncoming_police_car oncoming police car"},{"e":"\ud83d\ude95","k":"taxi"},{"e":"\ud83d\ude96","k":"oncoming_taxi oncoming taxi"},{"e":"\ud83d\ude97","k":"automobile red_car car"},{"e":"\ud83d\ude98","k":"oncoming_automobile oncoming automobile"},{"e":"\ud83d\ude99","k":"sport utility vehicle blue_car"},{"e":"\ud83d\udefb","k":"pickup truck pickup_truck"},{"e":"\ud83d\ude9a","k":"truck delivery truck"},{"e":"\ud83d\ude9b","k":"articulated lorry articulated_lorry"},{"e":"\ud83d\ude9c","k":"tractor"},{"e":"\ud83c\udfce\ufe0f","k":"racing car racing_car"},{"e":"\ud83c\udfcd\ufe0f","k":"motorcycle"},{"e":"\ud83d\udef5","k":"motor_scooter motor scooter"},{"e":"\ud83e\uddbd","k":"manual_wheelchair manual wheelchair"},{"e":"\ud83e\uddbc","k":"motorized_wheelchair motorized wheelchair"},{"e":"\ud83d\udefa","k":"auto_rickshaw auto rickshaw"},{"e":"\ud83d\udeb2","k":"bike bicycle"},{"e":"\ud83d\udef4","k":"kick_scooter kick scooter"},{"e":"\ud83d\udef9","k":"skateboard"},{"e":"\ud83d\udefc","k":"roller_skate roller skate"},{"e":"\ud83d\ude8f","k":"busstop bus stop"},{"e":"\ud83d\udee3\ufe0f","k":"motorway"},{"e":"\ud83d\udee4\ufe0f","k":"railway track railway_track"},{"e":"\ud83d\udee2\ufe0f","k":"oil_drum oil drum"},{"e":"\u26fd","k":"fuel pump fuelpump"},{"e":"\ud83d\udede","k":"wheel"},{"e":"\ud83d\udea8","k":"emergency 911 police car light rotating_light"},{"e":"\ud83d\udea5","k":"traffic_light horizontal traffic light"},{"e":"\ud83d\udea6","k":"semaphore vertical_traffic_light vertical traffic light"},{"e":"\ud83d\uded1","k":"stop sign stop_sign"},{"e":"\ud83d\udea7","k":"wip construction"},{"e":"\u2693","k":"ship anchor"},{"e":"\ud83d\udedf","k":"life preserver ring_buoy ring buoy"},{"e":"\u26f5","k":"sailboat boat"},{"e":"\ud83d\udef6","k":"canoe"},{"e":"\ud83d\udea4","k":"ship speedboat"},{"e":"\ud83d\udef3\ufe0f","k":"passenger ship cruise passenger_ship"},{"e":"\u26f4\ufe0f","k":"ferry"},{"e":"\ud83d\udee5\ufe0f","k":"motor boat motor_boat"},{"e":"\ud83d\udea2","k":"ship"},{"e":"\u2708\ufe0f","k":"airplane flight"},{"e":"\ud83d\udee9\ufe0f","k":"flight small_airplane small airplane"},{"e":"\ud83d\udeeb","k":"flight_departure airplane departure"},{"e":"\ud83d\udeec","k":"airplane arrival flight_arrival"},{"e":"\ud83e\ude82","k":"parachute"},{"e":"\ud83d\udcba","k":"seat"},{"e":"\ud83d\ude81","k":"helicopter"},{"e":"\ud83d\ude9f","k":"suspension_railway suspension railway"},{"e":"\ud83d\udea0","k":"mountain_cableway mountain cableway"},{"e":"\ud83d\udea1","k":"aerial_tramway aerial tramway"},{"e":"\ud83d\udef0\ufe0f","k":"artificial_satellite space orbit satellite"},{"e":"\ud83d\ude80","k":"ship rocket launch"},{"e":"\ud83d\udef8","k":"flying_saucer flying saucer ufo"},{"e":"\ud83d\udece\ufe0f","k":"bellhop bell bellhop_bell"},{"e":"\ud83e\uddf3","k":"luggage"},{"e":"\u231b","k":"hourglass done time hourglass"},{"e":"\u23f3","k":"time hourglass not done hourglass_flowing_sand"},{"e":"\u231a","k":"watch time"},{"e":"\u23f0","k":"morning alarm_clock alarm clock"},{"e":"\u23f1\ufe0f","k":"stopwatch"},{"e":"\u23f2\ufe0f","k":"timer clock timer_clock"},{"e":"\ud83d\udd70\ufe0f","k":"mantelpiece_clock mantelpiece clock"},{"e":"\ud83d\udd5b","k":"twelve o\u2019clock clock12"},{"e":"\ud83d\udd67","k":"clock1230 twelve-thirty"},{"e":"\ud83d\udd50","k":"clock1 one o\u2019clock"},{"e":"\ud83d\udd5c","k":"one-thirty clock130"},{"e":"\ud83d\udd51","k":"clock2 two o\u2019clock"},{"e":"\ud83d\udd5d","k":"two-thirty clock230"},{"e":"\ud83d\udd52","k":"three o\u2019clock clock3"},{"e":"\ud83d\udd5e","k":"three-thirty clock330"},{"e":"\ud83d\udd53","k":"four o\u2019clock clock4"},{"e":"\ud83d\udd5f","k":"clock430 four-thirty"},{"e":"\ud83d\udd54","k":"five o\u2019clock clock5"},{"e":"\ud83d\udd60","k":"clock530 five-thirty"},{"e":"\ud83d\udd55","k":"clock6 six o\u2019clock"},{"e":"\ud83d\udd61","k":"six-thirty clock630"},{"e":"\ud83d\udd56","k":"seven o\u2019clock clock7"},{"e":"\ud83d\udd62","k":"seven-thirty clock730"},{"e":"\ud83d\udd57","k":"eight o\u2019clock clock8"},{"e":"\ud83d\udd63","k":"clock830 eight-thirty"},{"e":"\ud83d\udd58","k":"nine o\u2019clock clock9"},{"e":"\ud83d\udd64","k":"clock930 nine-thirty"},{"e":"\ud83d\udd59","k":"clock10 ten o\u2019clock"},{"e":"\ud83d\udd65","k":"clock1030 ten-thirty"},{"e":"\ud83d\udd5a","k":"clock11 eleven o\u2019clock"},{"e":"\ud83d\udd66","k":"clock1130 eleven-thirty"},{"e":"\ud83c\udf11","k":"new moon new_moon"},{"e":"\ud83c\udf12","k":"waxing crescent moon waxing_crescent_moon"},{"e":"\ud83c\udf13","k":"first_quarter_moon first quarter moon"},{"e":"\ud83c\udf14","k":"moon waxing_gibbous_moon waxing gibbous moon"},{"e":"\ud83c\udf15","k":"full moon full_moon"},{"e":"\ud83c\udf16","k":"waning gibbous moon waning_gibbous_moon"},{"e":"\ud83c\udf17","k":"last quarter moon last_quarter_moon"},{"e":"\ud83c\udf18","k":"waning crescent moon waning_crescent_moon"},{"e":"\ud83c\udf19","k":"crescent_moon crescent moon night"},{"e":"\ud83c\udf1a","k":"new_moon_with_face new moon face"},{"e":"\ud83c\udf1b","k":"first quarter moon face first_quarter_moon_with_face"},{"e":"\ud83c\udf1c","k":"last quarter moon face last_quarter_moon_with_face"},{"e":"\ud83c\udf21\ufe0f","k":"thermometer"},{"e":"\u2600\ufe0f","k":"sunny weather sun"},{"e":"\ud83c\udf1d","k":"full_moon_with_face full moon face"},{"e":"\ud83c\udf1e","k":"sun with face summer sun_with_face"},{"e":"\ud83e\ude90","k":"ringed_planet ringed planet"},{"e":"\u2b50","k":"star"},{"e":"\ud83c\udf1f","k":"glowing star star2"},{"e":"\ud83c\udf20","k":"shooting star stars"},{"e":"\ud83c\udf0c","k":"milky way milky_way"},{"e":"\u2601\ufe0f","k":"cloud"},{"e":"\u26c5","k":"cloud partly_sunny weather sun behind cloud"},{"e":"\u26c8\ufe0f","k":"cloud_with_lightning_and_rain cloud with lightning and rain"},{"e":"\ud83c\udf24\ufe0f","k":"sun_behind_small_cloud sun behind small cloud"},{"e":"\ud83c\udf25\ufe0f","k":"sun_behind_large_cloud sun behind large cloud"},{"e":"\ud83c\udf26\ufe0f","k":"sun_behind_rain_cloud sun behind rain cloud"},{"e":"\ud83c\udf27\ufe0f","k":"cloud_with_rain cloud with rain"},{"e":"\ud83c\udf28\ufe0f","k":"cloud with snow cloud_with_snow"},{"e":"\ud83c\udf29\ufe0f","k":"cloud with lightning cloud_with_lightning"},{"e":"\ud83c\udf2a\ufe0f","k":"tornado"},{"e":"\ud83c\udf2b\ufe0f","k":"fog"},{"e":"\ud83c\udf2c\ufe0f","k":"wind_face wind face"},{"e":"\ud83c\udf00","k":"cyclone swirl"},{"e":"\ud83c\udf08","k":"rainbow"},{"e":"\ud83c\udf02","k":"closed umbrella weather closed_umbrella rain"},{"e":"\u2602\ufe0f","k":"open_umbrella umbrella"},{"e":"\u2614","k":"umbrella with rain drops umbrella rain weather"},{"e":"\u26f1\ufe0f","k":"beach_umbrella umbrella on ground parasol_on_ground"},{"e":"\u26a1","k":"thunder high voltage zap lightning"},{"e":"\u2744\ufe0f","k":"weather snowflake winter cold"},{"e":"\u2603\ufe0f","k":"snowman_with_snow snowman winter christmas"},{"e":"\u26c4","k":"snowman winter snowman without snow"},{"e":"\u2604\ufe0f","k":"comet"},{"e":"\ud83d\udd25","k":"fire burn"},{"e":"\ud83d\udca7","k":"water droplet"},{"e":"\ud83c\udf0a","k":"sea ocean water wave"},{"e":"\ud83c\udf83","k":"jack_o_lantern jack-o-lantern halloween"},{"e":"\ud83c\udf84","k":"christmas_tree christmas tree"},{"e":"\ud83c\udf86","k":"celebration festival fireworks"},{"e":"\ud83c\udf87","k":"sparkler"},{"e":"\ud83e\udde8","k":"firecracker"},{"e":"\u2728","k":"shiny sparkles"},{"e":"\ud83c\udf88","k":"balloon birthday party"},{"e":"\ud83c\udf89","k":"tada party popper party hooray"},{"e":"\ud83c\udf8a","k":"confetti ball confetti_ball"},{"e":"\ud83c\udf8b","k":"tanabata_tree tanabata tree"},{"e":"\ud83c\udf8d","k":"pine decoration bamboo"},{"e":"\ud83c\udf8e","k":"dolls japanese dolls"},{"e":"\ud83c\udf8f","k":"carp streamer flags"},{"e":"\ud83c\udf90","k":"wind_chime wind chime"},{"e":"\ud83c\udf91","k":"moon viewing ceremony rice_scene"},{"e":"\ud83e\udde7","k":"red envelope red_envelope"},{"e":"\ud83c\udf80","k":"ribbon"},{"e":"\ud83c\udf81","k":"present christmas gift birthday wrapped gift"},{"e":"\ud83c\udf97\ufe0f","k":"reminder ribbon reminder_ribbon"},{"e":"\ud83c\udf9f\ufe0f","k":"tickets admission tickets"},{"e":"\ud83c\udfab","k":"ticket"},{"e":"\ud83c\udf96\ufe0f","k":"medal_military military medal"},{"e":"\ud83c\udfc6","k":"winner contest award trophy"},{"e":"\ud83c\udfc5","k":"winner gold sports medal medal_sports"},{"e":"\ud83e\udd47","k":"1st_place_medal gold 1st place medal"},{"e":"\ud83e\udd48","k":"silver 2nd place medal 2nd_place_medal"},{"e":"\ud83e\udd49","k":"3rd_place_medal bronze 3rd place medal"},{"e":"\u26bd","k":"sports soccer soccer ball"},{"e":"\u26be","k":"sports baseball"},{"e":"\ud83e\udd4e","k":"softball"},{"e":"\ud83c\udfc0","k":"sports basketball"},{"e":"\ud83c\udfd0","k":"volleyball"},{"e":"\ud83c\udfc8","k":"american football sports football"},{"e":"\ud83c\udfc9","k":"rugby_football rugby football"},{"e":"\ud83c\udfbe","k":"sports tennis"},{"e":"\ud83e\udd4f","k":"flying disc flying_disc"},{"e":"\ud83c\udfb3","k":"bowling"},{"e":"\ud83c\udfcf","k":"cricket_game cricket game"},{"e":"\ud83c\udfd1","k":"field_hockey field hockey"},{"e":"\ud83c\udfd2","k":"ice_hockey ice hockey"},{"e":"\ud83e\udd4d","k":"lacrosse"},{"e":"\ud83c\udfd3","k":"ping_pong ping pong"},{"e":"\ud83c\udff8","k":"badminton"},{"e":"\ud83e\udd4a","k":"boxing_glove boxing glove"},{"e":"\ud83e\udd4b","k":"martial arts uniform martial_arts_uniform"},{"e":"\ud83e\udd45","k":"goal net goal_net"},{"e":"\u26f3","k":"flag in hole golf"},{"e":"\u26f8\ufe0f","k":"ice skate skating ice_skate"},{"e":"\ud83c\udfa3","k":"fishing_pole_and_fish fishing pole"},{"e":"\ud83e\udd3f","k":"diving_mask diving mask"},{"e":"\ud83c\udfbd","k":"running_shirt_with_sash marathon running shirt"},{"e":"\ud83c\udfbf","k":"skis ski"},{"e":"\ud83d\udef7","k":"sled"},{"e":"\ud83e\udd4c","k":"curling stone curling_stone"},{"e":"\ud83c\udfaf","k":"target dart bullseye"},{"e":"\ud83e\ude80","k":"yo_yo yo-yo"},{"e":"\ud83e\ude81","k":"kite"},{"e":"\ud83d\udd2b","k":"shoot water pistol gun weapon"},{"e":"\ud83c\udfb1","k":"pool 8 ball pool 8ball billiards"},{"e":"\ud83d\udd2e","k":"crystal_ball crystal ball fortune"},{"e":"\ud83e\ude84","k":"magic wand magic_wand"},{"e":"\ud83c\udfae","k":"controller video game play console video_game"},{"e":"\ud83d\udd79\ufe0f","k":"joystick"},{"e":"\ud83c\udfb0","k":"slot machine slot_machine"},{"e":"\ud83c\udfb2","k":"game die game_die gambling dice"},{"e":"\ud83e\udde9","k":"puzzle piece jigsaw"},{"e":"\ud83e\uddf8","k":"teddy_bear teddy bear"},{"e":"\ud83e\ude85","k":"pinata pi\u00f1ata"},{"e":"\ud83e\udea9","k":"mirror ball mirror_ball party disco"},{"e":"\ud83e\ude86","k":"nesting dolls nesting_dolls"},{"e":"\u2660\ufe0f","k":"spade suit spades"},{"e":"\u2665\ufe0f","k":"hearts heart suit"},{"e":"\u2666\ufe0f","k":"diamonds diamond suit"},{"e":"\u2663\ufe0f","k":"clubs club suit"},{"e":"\u265f\ufe0f","k":"chess pawn chess_pawn"},{"e":"\ud83c\udccf","k":"black_joker joker"},{"e":"\ud83c\udc04","k":"mahjong red dragon mahjong"},{"e":"\ud83c\udfb4","k":"flower_playing_cards flower playing cards"},{"e":"\ud83c\udfad","k":"theater drama performing arts performing_arts"},{"e":"\ud83d\uddbc\ufe0f","k":"framed picture framed_picture"},{"e":"\ud83c\udfa8","k":"artist palette art design paint"},{"e":"\ud83e\uddf5","k":"thread"},{"e":"\ud83e\udea1","k":"sewing needle sewing_needle"},{"e":"\ud83e\uddf6","k":"yarn"},{"e":"\ud83e\udea2","k":"knot"},{"e":"\ud83d\udc53","k":"glasses eyeglasses"},{"e":"\ud83d\udd76\ufe0f","k":"dark_sunglasses sunglasses"},{"e":"\ud83e\udd7d","k":"goggles"},{"e":"\ud83e\udd7c","k":"lab_coat lab coat"},{"e":"\ud83e\uddba","k":"safety_vest safety vest"},{"e":"\ud83d\udc54","k":"necktie formal shirt"},{"e":"\ud83d\udc55","k":"tshirt shirt t-shirt"},{"e":"\ud83d\udc56","k":"jeans pants"},{"e":"\ud83e\udde3","k":"scarf"},{"e":"\ud83e\udde4","k":"gloves"},{"e":"\ud83e\udde5","k":"coat"},{"e":"\ud83e\udde6","k":"socks"},{"e":"\ud83d\udc57","k":"dress"},{"e":"\ud83d\udc58","k":"kimono"},{"e":"\ud83e\udd7b","k":"sari"},{"e":"\ud83e\ude71","k":"one-piece swimsuit one_piece_swimsuit"},{"e":"\ud83e\ude72","k":"briefs swim_brief"},{"e":"\ud83e\ude73","k":"shorts"},{"e":"\ud83d\udc59","k":"bikini beach"},{"e":"\ud83d\udc5a","k":"womans_clothes woman\u2019s clothes"},{"e":"\ud83e\udead","k":"sensu folding hand fan folding_hand_fan"},{"e":"\ud83d\udc5b","k":"purse"},{"e":"\ud83d\udc5c","k":"handbag bag"},{"e":"\ud83d\udc5d","k":"clutch bag pouch bag"},{"e":"\ud83d\udecd\ufe0f","k":"bags shopping shopping bags"},{"e":"\ud83c\udf92","k":"backpack school_satchel"},{"e":"\ud83e\ude74","k":"thong sandal thong_sandal"},{"e":"\ud83d\udc5e","k":"shoe man\u2019s shoe mans_shoe"},{"e":"\ud83d\udc5f","k":"athletic_shoe sneaker running running shoe sport"},{"e":"\ud83e\udd7e","k":"hiking_boot hiking boot"},{"e":"\ud83e\udd7f","k":"flat_shoe flat shoe"},{"e":"\ud83d\udc60","k":"shoe high-heeled shoe high_heel"},{"e":"\ud83d\udc61","k":"woman\u2019s sandal sandal shoe"},{"e":"\ud83e\ude70","k":"ballet_shoes ballet shoes"},{"e":"\ud83d\udc62","k":"woman\u2019s boot boot"},{"e":"\ud83e\udeae","k":"hair pick hair_pick"},{"e":"\ud83d\udc51","k":"queen crown king royal"},{"e":"\ud83d\udc52","k":"womans_hat woman\u2019s hat"},{"e":"\ud83c\udfa9","k":"hat tophat classy top hat"},{"e":"\ud83c\udf93","k":"mortar_board education graduation cap university college graduation"},{"e":"\ud83e\udde2","k":"billed cap billed_cap"},{"e":"\ud83e\ude96","k":"military_helmet military helmet"},{"e":"\u26d1\ufe0f","k":"rescue worker\u2019s helmet rescue_worker_helmet"},{"e":"\ud83d\udcff","k":"prayer beads prayer_beads"},{"e":"\ud83d\udc84","k":"lipstick makeup"},{"e":"\ud83d\udc8d","k":"ring wedding engaged marriage"},{"e":"\ud83d\udc8e","k":"diamond gem gem stone"},{"e":"\ud83d\udd07","k":"volume mute muted speaker sound"},{"e":"\ud83d\udd08","k":"speaker low volume speaker"},{"e":"\ud83d\udd09","k":"volume sound speaker medium volume"},{"e":"\ud83d\udd0a","k":"speaker high volume loud_sound volume"},{"e":"\ud83d\udce2","k":"loudspeaker announcement"},{"e":"\ud83d\udce3","k":"megaphone mega"},{"e":"\ud83d\udcef","k":"postal_horn postal horn"},{"e":"\ud83d\udd14","k":"bell sound notification"},{"e":"\ud83d\udd15","k":"no_bell bell with slash off volume"},{"e":"\ud83c\udfbc","k":"musical_score musical score"},{"e":"\ud83c\udfb5","k":"musical note musical_note"},{"e":"\ud83c\udfb6","k":"musical notes music notes"},{"e":"\ud83c\udf99\ufe0f","k":"podcast studio microphone studio_microphone"},{"e":"\ud83c\udf9a\ufe0f","k":"level slider level_slider"},{"e":"\ud83c\udf9b\ufe0f","k":"control knobs control_knobs"},{"e":"\ud83c\udfa4","k":"sing microphone"},{"e":"\ud83c\udfa7","k":"headphone music headphones earphones"},{"e":"\ud83d\udcfb","k":"podcast radio"},{"e":"\ud83c\udfb7","k":"saxophone"},{"e":"\ud83e\ude97","k":"accordion"},{"e":"\ud83c\udfb8","k":"guitar rock"},{"e":"\ud83c\udfb9","k":"musical keyboard musical_keyboard piano"},{"e":"\ud83c\udfba","k":"trumpet"},{"e":"\ud83c\udfbb","k":"violin"},{"e":"\ud83e\ude95","k":"banjo"},{"e":"\ud83e\udd41","k":"drum"},{"e":"\ud83e\ude98","k":"long drum long_drum"},{"e":"\ud83e\ude87","k":"shaker maracas"},{"e":"\ud83e\ude88","k":"recorder flute"},{"e":"\ud83d\udcf1","k":"smartphone mobile mobile phone iphone"},{"e":"\ud83d\udcf2","k":"mobile phone with arrow call calling incoming"},{"e":"\u260e\ufe0f","k":"telephone phone"},{"e":"\ud83d\udcde","k":"call telephone_receiver phone telephone receiver"},{"e":"\ud83d\udcdf","k":"pager"},{"e":"\ud83d\udce0","k":"fax fax machine"},{"e":"\ud83d\udd0b","k":"power battery"},{"e":"\ud83e\udeab","k":"low_battery low battery"},{"e":"\ud83d\udd0c","k":"electric_plug electric plug"},{"e":"\ud83d\udcbb","k":"desktop laptop screen computer"},{"e":"\ud83d\udda5\ufe0f","k":"desktop_computer desktop computer"},{"e":"\ud83d\udda8\ufe0f","k":"printer"},{"e":"\u2328\ufe0f","k":"keyboard"},{"e":"\ud83d\uddb1\ufe0f","k":"computer mouse computer_mouse"},{"e":"\ud83d\uddb2\ufe0f","k":"trackball"},{"e":"\ud83d\udcbd","k":"computer disk minidisc"},{"e":"\ud83d\udcbe","k":"floppy disk floppy_disk save"},{"e":"\ud83d\udcbf","k":"optical disk cd"},{"e":"\ud83d\udcc0","k":"dvd"},{"e":"\ud83e\uddee","k":"abacus"},{"e":"\ud83c\udfa5","k":"movie camera movie_camera video film"},{"e":"\ud83c\udf9e\ufe0f","k":"film_strip film frames"},{"e":"\ud83d\udcfd\ufe0f","k":"film projector film_projector"},{"e":"\ud83c\udfac","k":"clapper clapper board film"},{"e":"\ud83d\udcfa","k":"television tv"},{"e":"\ud83d\udcf7","k":"photo camera"},{"e":"\ud83d\udcf8","k":"photo camera_flash camera with flash"},{"e":"\ud83d\udcf9","k":"video_camera video camera"},{"e":"\ud83d\udcfc","k":"vhs videocassette"},{"e":"\ud83d\udd0d","k":"search magnifying glass tilted left zoom mag"},{"e":"\ud83d\udd0e","k":"mag_right magnifying glass tilted right"},{"e":"\ud83d\udd6f\ufe0f","k":"candle"},{"e":"\ud83d\udca1","k":"idea light bulb light bulb"},{"e":"\ud83d\udd26","k":"flashlight"},{"e":"\ud83c\udfee","k":"lantern red paper lantern izakaya_lantern"},{"e":"\ud83e\ude94","k":"diya_lamp diya lamp"},{"e":"\ud83d\udcd4","k":"notebook_with_decorative_cover notebook with decorative cover"},{"e":"\ud83d\udcd5","k":"closed book closed_book"},{"e":"\ud83d\udcd6","k":"open book open_book book"},{"e":"\ud83d\udcd7","k":"green book green_book"},{"e":"\ud83d\udcd8","k":"blue_book blue book"},{"e":"\ud83d\udcd9","k":"orange_book orange book"},{"e":"\ud83d\udcda","k":"books library"},{"e":"\ud83d\udcd3","k":"notebook"},{"e":"\ud83d\udcd2","k":"ledger"},{"e":"\ud83d\udcc3","k":"page_with_curl page with curl"},{"e":"\ud83d\udcdc","k":"scroll document"},{"e":"\ud83d\udcc4","k":"page_facing_up document page facing up"},{"e":"\ud83d\udcf0","k":"newspaper press"},{"e":"\ud83d\uddde\ufe0f","k":"press rolled-up newspaper newspaper_roll"},{"e":"\ud83d\udcd1","k":"bookmark_tabs bookmark tabs"},{"e":"\ud83d\udd16","k":"bookmark"},{"e":"\ud83c\udff7\ufe0f","k":"label tag"},{"e":"\ud83d\udcb0","k":"moneybag cream money bag dollar"},{"e":"\ud83e\ude99","k":"coin"},{"e":"\ud83d\udcb4","k":"yen yen banknote"},{"e":"\ud83d\udcb5","k":"money dollar dollar banknote"},{"e":"\ud83d\udcb6","k":"euro banknote euro"},{"e":"\ud83d\udcb7","k":"pound pound banknote"},{"e":"\ud83d\udcb8","k":"money with wings money_with_wings dollar"},{"e":"\ud83d\udcb3","k":"credit card subscription credit_card"},{"e":"\ud83e\uddfe","k":"receipt"},{"e":"\ud83d\udcb9","k":"chart chart increasing with yen"},{"e":"\u2709\ufe0f","k":"envelope email letter"},{"e":"\ud83d\udce7","k":"e-mail email"},{"e":"\ud83d\udce8","k":"incoming_envelope incoming envelope"},{"e":"\ud83d\udce9","k":"envelope_with_arrow envelope with arrow"},{"e":"\ud83d\udce4","k":"outbox_tray outbox tray"},{"e":"\ud83d\udce5","k":"inbox tray inbox_tray"},{"e":"\ud83d\udce6","k":"package shipping"},{"e":"\ud83d\udceb","k":"mailbox closed mailbox with raised flag"},{"e":"\ud83d\udcea","k":"mailbox_closed closed mailbox with lowered flag"},{"e":"\ud83d\udcec","k":"mailbox_with_mail open mailbox with raised flag"},{"e":"\ud83d\udced","k":"open mailbox with lowered flag mailbox_with_no_mail"},{"e":"\ud83d\udcee","k":"postbox"},{"e":"\ud83d\uddf3\ufe0f","k":"ballot box with ballot ballot_box"},{"e":"\u270f\ufe0f","k":"pencil pencil2"},{"e":"\u2712\ufe0f","k":"black_nib black nib"},{"e":"\ud83d\udd8b\ufe0f","k":"fountain pen fountain_pen"},{"e":"\ud83d\udd8a\ufe0f","k":"pen"},{"e":"\ud83d\udd8c\ufe0f","k":"paintbrush"},{"e":"\ud83d\udd8d\ufe0f","k":"crayon"},{"e":"\ud83d\udcdd","k":"pencil memo note document"},{"e":"\ud83d\udcbc","k":"business briefcase"},{"e":"\ud83d\udcc1","k":"file_folder file folder directory"},{"e":"\ud83d\udcc2","k":"open_file_folder open file folder"},{"e":"\ud83d\uddc2\ufe0f","k":"card_index_dividers card index dividers"},{"e":"\ud83d\udcc5","k":"schedule date calendar"},{"e":"\ud83d\udcc6","k":"schedule tear-off calendar calendar"},{"e":"\ud83d\uddd2\ufe0f","k":"spiral notepad spiral_notepad"},{"e":"\ud83d\uddd3\ufe0f","k":"spiral calendar spiral_calendar"},{"e":"\ud83d\udcc7","k":"card_index card index"},{"e":"\ud83d\udcc8","k":"graph chart increasing metrics chart_with_upwards_trend"},{"e":"\ud83d\udcc9","k":"graph metrics chart decreasing chart_with_downwards_trend"},{"e":"\ud83d\udcca","k":"metrics stats bar_chart bar chart"},{"e":"\ud83d\udccb","k":"clipboard"},{"e":"\ud83d\udccc","k":"pushpin location"},{"e":"\ud83d\udccd","k":"round pushpin round_pushpin location"},{"e":"\ud83d\udcce","k":"paperclip"},{"e":"\ud83d\udd87\ufe0f","k":"linked paperclips paperclips"},{"e":"\ud83d\udccf","k":"straight_ruler straight ruler"},{"e":"\ud83d\udcd0","k":"triangular_ruler triangular ruler"},{"e":"\u2702\ufe0f","k":"scissors cut"},{"e":"\ud83d\uddc3\ufe0f","k":"card file box card_file_box"},{"e":"\ud83d\uddc4\ufe0f","k":"file cabinet file_cabinet"},{"e":"\ud83d\uddd1\ufe0f","k":"trash wastebasket"},{"e":"\ud83d\udd12","k":"security lock private locked"},{"e":"\ud83d\udd13","k":"security unlocked unlock"},{"e":"\ud83d\udd0f","k":"locked with pen lock_with_ink_pen"},{"e":"\ud83d\udd10","k":"closed_lock_with_key locked with key security"},{"e":"\ud83d\udd11","k":"lock password key"},{"e":"\ud83d\udddd\ufe0f","k":"old_key old key"},{"e":"\ud83d\udd28","k":"hammer tool"},{"e":"\ud83e\ude93","k":"axe"},{"e":"\u26cf\ufe0f","k":"pick"},{"e":"\u2692\ufe0f","k":"hammer and pick hammer_and_pick"},{"e":"\ud83d\udee0\ufe0f","k":"hammer and wrench hammer_and_wrench"},{"e":"\ud83d\udde1\ufe0f","k":"dagger"},{"e":"\u2694\ufe0f","k":"crossed_swords crossed swords"},{"e":"\ud83d\udca3","k":"boom bomb"},{"e":"\ud83e\ude83","k":"boomerang"},{"e":"\ud83c\udff9","k":"bow and arrow archery bow_and_arrow"},{"e":"\ud83d\udee1\ufe0f","k":"shield"},{"e":"\ud83e\ude9a","k":"carpentry_saw carpentry saw"},{"e":"\ud83d\udd27","k":"wrench tool"},{"e":"\ud83e\ude9b","k":"screwdriver"},{"e":"\ud83d\udd29","k":"nut and bolt nut_and_bolt"},{"e":"\u2699\ufe0f","k":"gear"},{"e":"\ud83d\udddc\ufe0f","k":"clamp"},{"e":"\u2696\ufe0f","k":"balance_scale balance scale"},{"e":"\ud83e\uddaf","k":"probing_cane white cane"},{"e":"\ud83d\udd17","k":"link"},{"e":"\u26d3\ufe0f","k":"chains"},{"e":"\ud83e\ude9d","k":"hook"},{"e":"\ud83e\uddf0","k":"toolbox"},{"e":"\ud83e\uddf2","k":"magnet"},{"e":"\ud83e\ude9c","k":"ladder"},{"e":"\u2697\ufe0f","k":"alembic"},{"e":"\ud83e\uddea","k":"test tube test_tube"},{"e":"\ud83e\uddeb","k":"petri_dish petri dish"},{"e":"\ud83e\uddec","k":"dna"},{"e":"\ud83d\udd2c","k":"science investigate microscope laboratory"},{"e":"\ud83d\udd2d","k":"telescope"},{"e":"\ud83d\udce1","k":"signal satellite satellite antenna"},{"e":"\ud83d\udc89","k":"health syringe hospital needle"},{"e":"\ud83e\ude78","k":"drop of blood drop_of_blood"},{"e":"\ud83d\udc8a","k":"health pill medicine"},{"e":"\ud83e\ude79","k":"adhesive bandage adhesive_bandage"},{"e":"\ud83e\ude7c","k":"crutch"},{"e":"\ud83e\ude7a","k":"stethoscope"},{"e":"\ud83e\ude7b","k":"x_ray x-ray"},{"e":"\ud83d\udeaa","k":"door"},{"e":"\ud83d\uded7","k":"elevator"},{"e":"\ud83e\ude9e","k":"mirror"},{"e":"\ud83e\ude9f","k":"window"},{"e":"\ud83d\udecf\ufe0f","k":"bed"},{"e":"\ud83d\udecb\ufe0f","k":"couch_and_lamp couch and lamp"},{"e":"\ud83e\ude91","k":"chair"},{"e":"\ud83d\udebd","k":"toilet wc"},{"e":"\ud83e\udea0","k":"plunger"},{"e":"\ud83d\udebf","k":"bath shower"},{"e":"\ud83d\udec1","k":"bathtub"},{"e":"\ud83e\udea4","k":"mouse_trap mouse trap"},{"e":"\ud83e\ude92","k":"razor"},{"e":"\ud83e\uddf4","k":"lotion_bottle lotion bottle"},{"e":"\ud83e\uddf7","k":"safety_pin safety pin"},{"e":"\ud83e\uddf9","k":"broom"},{"e":"\ud83e\uddfa","k":"basket"},{"e":"\ud83e\uddfb","k":"toilet roll of paper roll_of_paper"},{"e":"\ud83e\udea3","k":"bucket"},{"e":"\ud83e\uddfc","k":"soap"},{"e":"\ud83e\udee7","k":"bubbles"},{"e":"\ud83e\udea5","k":"toothbrush"},{"e":"\ud83e\uddfd","k":"sponge"},{"e":"\ud83e\uddef","k":"fire extinguisher fire_extinguisher"},{"e":"\ud83d\uded2","k":"shopping cart shopping_cart"},{"e":"\ud83d\udeac","k":"smoking cigarette"},{"e":"\u26b0\ufe0f","k":"coffin funeral"},{"e":"\ud83e\udea6","k":"headstone"},{"e":"\u26b1\ufe0f","k":"funeral_urn funeral urn"},{"e":"\ud83e\uddff","k":"nazar amulet nazar_amulet"},{"e":"\ud83e\udeac","k":"hamsa"},{"e":"\ud83d\uddff","k":"moai moyai stone"},{"e":"\ud83e\udea7","k":"placard"},{"e":"\ud83e\udeaa","k":"identification_card identification card"},{"e":"\ud83c\udfe7","k":"atm atm sign"},{"e":"\ud83d\udeae","k":"put_litter_in_its_place litter in bin sign"},{"e":"\ud83d\udeb0","k":"potable_water potable water"},{"e":"\u267f","k":"wheelchair symbol wheelchair accessibility"},{"e":"\ud83d\udeb9","k":"men\u2019s room mens"},{"e":"\ud83d\udeba","k":"womens women\u2019s room"},{"e":"\ud83d\udebb","k":"restroom toilet"},{"e":"\ud83d\udebc","k":"baby symbol baby_symbol"},{"e":"\ud83d\udebe","k":"wc water closet toilet restroom"},{"e":"\ud83d\udec2","k":"passport control passport_control"},{"e":"\ud83d\udec3","k":"customs"},{"e":"\ud83d\udec4","k":"baggage_claim baggage claim airport"},{"e":"\ud83d\udec5","k":"left luggage left_luggage"},{"e":"\u26a0\ufe0f","k":"wip warning"},{"e":"\ud83d\udeb8","k":"children_crossing children crossing"},{"e":"\u26d4","k":"no_entry limit no entry"},{"e":"\ud83d\udeab","k":"block no_entry_sign prohibited forbidden"},{"e":"\ud83d\udeb3","k":"no bicycles no_bicycles"},{"e":"\ud83d\udead","k":"no_smoking no smoking"},{"e":"\ud83d\udeaf","k":"do_not_litter no littering"},{"e":"\ud83d\udeb1","k":"non-potable water non-potable_water"},{"e":"\ud83d\udeb7","k":"no pedestrians no_pedestrians"},{"e":"\ud83d\udcf5","k":"no mobile phones no_mobile_phones"},{"e":"\ud83d\udd1e","k":"underage no one under eighteen"},{"e":"\u2622\ufe0f","k":"radioactive"},{"e":"\u2623\ufe0f","k":"biohazard"},{"e":"\u2b06\ufe0f","k":"up arrow arrow_up"},{"e":"\u2197\ufe0f","k":"arrow_upper_right up-right arrow"},{"e":"\u27a1\ufe0f","k":"arrow_right right arrow"},{"e":"\u2198\ufe0f","k":"down-right arrow arrow_lower_right"},{"e":"\u2b07\ufe0f","k":"down arrow arrow_down"},{"e":"\u2199\ufe0f","k":"down-left arrow arrow_lower_left"},{"e":"\u2b05\ufe0f","k":"left arrow arrow_left"},{"e":"\u2196\ufe0f","k":"up-left arrow arrow_upper_left"},{"e":"\u2195\ufe0f","k":"arrow_up_down up-down arrow"},{"e":"\u2194\ufe0f","k":"left_right_arrow left-right arrow"},{"e":"\u21a9\ufe0f","k":"leftwards_arrow_with_hook return right arrow curving left"},{"e":"\u21aa\ufe0f","k":"arrow_right_hook left arrow curving right"},{"e":"\u2934\ufe0f","k":"right arrow curving up arrow_heading_up"},{"e":"\u2935\ufe0f","k":"arrow_heading_down right arrow curving down"},{"e":"\ud83d\udd03","k":"clockwise vertical arrows arrows_clockwise"},{"e":"\ud83d\udd04","k":"arrows_counterclockwise sync counterclockwise arrows button"},{"e":"\ud83d\udd19","k":"back arrow back"},{"e":"\ud83d\udd1a","k":"end end arrow"},{"e":"\ud83d\udd1b","k":"on! arrow on"},{"e":"\ud83d\udd1c","k":"soon arrow soon"},{"e":"\ud83d\udd1d","k":"top arrow top"},{"e":"\ud83d\uded0","k":"place_of_worship place of worship"},{"e":"\u269b\ufe0f","k":"atom_symbol atom symbol"},{"e":"\ud83d\udd49\ufe0f","k":"om"},{"e":"\u2721\ufe0f","k":"star of david star_of_david"},{"e":"\u2638\ufe0f","k":"wheel_of_dharma wheel of dharma"},{"e":"\u262f\ufe0f","k":"yin yang yin_yang"},{"e":"\u271d\ufe0f","k":"latin cross latin_cross"},{"e":"\u2626\ufe0f","k":"orthodox_cross orthodox cross"},{"e":"\u262a\ufe0f","k":"star_and_crescent star and crescent"},{"e":"\u262e\ufe0f","k":"peace symbol peace_symbol"},{"e":"\ud83d\udd4e","k":"menorah"},{"e":"\ud83d\udd2f","k":"six_pointed_star dotted six-pointed star"},{"e":"\ud83e\udeaf","k":"khanda"},{"e":"\u2648","k":"aries"},{"e":"\u2649","k":"taurus"},{"e":"\u264a","k":"gemini"},{"e":"\u264b","k":"cancer"},{"e":"\u264c","k":"leo"},{"e":"\u264d","k":"virgo"},{"e":"\u264e","k":"libra"},{"e":"\u264f","k":"scorpio scorpius"},{"e":"\u2650","k":"sagittarius"},{"e":"\u2651","k":"capricorn"},{"e":"\u2652","k":"aquarius"},{"e":"\u2653","k":"pisces"},{"e":"\u26ce","k":"ophiuchus"},{"e":"\ud83d\udd00","k":"shuffle tracks button twisted_rightwards_arrows shuffle"},{"e":"\ud83d\udd01","k":"loop repeat button repeat"},{"e":"\ud83d\udd02","k":"repeat_one repeat single button"},{"e":"\u25b6\ufe0f","k":"play button arrow_forward"},{"e":"\u23e9","k":"fast_forward fast-forward button"},{"e":"\u23ed\ufe0f","k":"next_track_button next track button"},{"e":"\u23ef\ufe0f","k":"play_or_pause_button play or pause button"},{"e":"\u25c0\ufe0f","k":"reverse button arrow_backward"},{"e":"\u23ea","k":"rewind fast reverse button"},{"e":"\u23ee\ufe0f","k":"last track button previous_track_button"},{"e":"\ud83d\udd3c","k":"upwards button arrow_up_small"},{"e":"\u23eb","k":"arrow_double_up fast up button"},{"e":"\ud83d\udd3d","k":"arrow_down_small downwards button"},{"e":"\u23ec","k":"arrow_double_down fast down button"},{"e":"\u23f8\ufe0f","k":"pause button pause_button"},{"e":"\u23f9\ufe0f","k":"stop_button stop button"},{"e":"\u23fa\ufe0f","k":"record button record_button"},{"e":"\u23cf\ufe0f","k":"eject button eject_button"},{"e":"\ud83c\udfa6","k":"cinema movie film"},{"e":"\ud83d\udd05","k":"low_brightness dim button"},{"e":"\ud83d\udd06","k":"bright button high_brightness"},{"e":"\ud83d\udcf6","k":"wifi signal_strength antenna bars"},{"e":"\ud83d\udedc","k":"wifi wireless"},{"e":"\ud83d\udcf3","k":"vibration_mode vibration mode"},{"e":"\ud83d\udcf4","k":"off mobile phone off mobile_phone_off mute"},{"e":"\u2640\ufe0f","k":"female sign female_sign"},{"e":"\u2642\ufe0f","k":"male sign male_sign"},{"e":"\u26a7\ufe0f","k":"transgender symbol transgender_symbol"},{"e":"\u2716\ufe0f","k":"heavy_multiplication_x multiply"},{"e":"\u2795","k":"heavy_plus_sign plus"},{"e":"\u2796","k":"minus heavy_minus_sign"},{"e":"\u2797","k":"divide heavy_division_sign"},{"e":"\ud83d\udff0","k":"heavy_equals_sign heavy equals sign"},{"e":"\u267e\ufe0f","k":"infinity"},{"e":"\u203c\ufe0f","k":"double exclamation mark bangbang"},{"e":"\u2049\ufe0f","k":"exclamation question mark interrobang"},{"e":"\u2753","k":"question red question mark confused"},{"e":"\u2754","k":"grey_question white question mark"},{"e":"\u2755","k":"grey_exclamation white exclamation mark"},{"e":"\u2757","k":"exclamation heavy_exclamation_mark red exclamation mark bang"},{"e":"\u3030\ufe0f","k":"wavy dash wavy_dash"},{"e":"\ud83d\udcb1","k":"currency exchange currency_exchange"},{"e":"\ud83d\udcb2","k":"heavy_dollar_sign heavy dollar sign"},{"e":"\u2695\ufe0f","k":"medical symbol medical_symbol"},{"e":"\u267b\ufe0f","k":"recycle environment recycling symbol green"},{"e":"\u269c\ufe0f","k":"fleur-de-lis fleur_de_lis"},{"e":"\ud83d\udd31","k":"trident trident emblem"},{"e":"\ud83d\udcdb","k":"name badge name_badge"},{"e":"\ud83d\udd30","k":"japanese symbol for beginner beginner"},{"e":"\u2b55","k":"hollow red circle o"},{"e":"\u2705","k":"white_check_mark check mark button"},{"e":"\u2611\ufe0f","k":"ballot_box_with_check check box with check"},{"e":"\u2714\ufe0f","k":"check mark heavy_check_mark"},{"e":"\u274c","k":"x cross mark"},{"e":"\u274e","k":"negative_squared_cross_mark cross mark button"},{"e":"\u27b0","k":"curly loop curly_loop"},{"e":"\u27bf","k":"loop double curly loop"},{"e":"\u303d\ufe0f","k":"part alternation mark part_alternation_mark"},{"e":"\u2733\ufe0f","k":"eight_spoked_asterisk eight-spoked asterisk"},{"e":"\u2734\ufe0f","k":"eight_pointed_black_star eight-pointed star"},{"e":"\u2747\ufe0f","k":"sparkle"},{"e":"\u00a9\ufe0f","k":"copyright"},{"e":"\u00ae\ufe0f","k":"registered"},{"e":"\u2122\ufe0f","k":"trade mark tm trademark"},{"e":"#\ufe0f\u20e3","k":"number keycap: # hash"},{"e":"*\ufe0f\u20e3","k":"asterisk keycap: *"},{"e":"0\ufe0f\u20e3","k":"keycap: 0 zero"},{"e":"1\ufe0f\u20e3","k":"keycap: 1 one"},{"e":"2\ufe0f\u20e3","k":"keycap: 2 two"},{"e":"3\ufe0f\u20e3","k":"three keycap: 3"},{"e":"4\ufe0f\u20e3","k":"four keycap: 4"},{"e":"5\ufe0f\u20e3","k":"keycap: 5 five"},{"e":"6\ufe0f\u20e3","k":"six keycap: 6"},{"e":"7\ufe0f\u20e3","k":"keycap: 7 seven"},{"e":"8\ufe0f\u20e3","k":"eight keycap: 8"},{"e":"9\ufe0f\u20e3","k":"nine keycap: 9"},{"e":"\ud83d\udd1f","k":"keycap: 10 keycap_ten"},{"e":"\ud83d\udd20","k":"capital_abcd letters input latin uppercase"},{"e":"\ud83d\udd21","k":"input latin lowercase abcd"},{"e":"\ud83d\udd22","k":"numbers 1234 input numbers"},{"e":"\ud83d\udd23","k":"symbols input symbols"},{"e":"\ud83d\udd24","k":"alphabet input latin letters abc"},{"e":"\ud83c\udd70\ufe0f","k":"a button (blood type) a"},{"e":"\ud83c\udd8e","k":"ab ab button (blood type)"},{"e":"\ud83c\udd71\ufe0f","k":"b b button (blood type)"},{"e":"\ud83c\udd91","k":"cl cl button"},{"e":"\ud83c\udd92","k":"cool cool button"},{"e":"\ud83c\udd93","k":"free button free"},{"e":"\u2139\ufe0f","k":"information_source information"},{"e":"\ud83c\udd94","k":"id id button"},{"e":"\u24c2\ufe0f","k":"m circled m"},{"e":"\ud83c\udd95","k":"new fresh new button"},{"e":"\ud83c\udd96","k":"ng ng button"},{"e":"\ud83c\udd7e\ufe0f","k":"o button (blood type) o2"},{"e":"\ud83c\udd97","k":"ok yes ok button"},{"e":"\ud83c\udd7f\ufe0f","k":"p button parking"},{"e":"\ud83c\udd98","k":"emergency sos button help sos"},{"e":"\ud83c\udd99","k":"up up! button"},{"e":"\ud83c\udd9a","k":"vs vs button"},{"e":"\ud83c\ude01","k":"japanese \u201chere\u201d button koko"},{"e":"\ud83c\ude02\ufe0f","k":"japanese \u201cservice charge\u201d button sa"},{"e":"\ud83c\ude37\ufe0f","k":"japanese \u201cmonthly amount\u201d button u6708"},{"e":"\ud83c\ude36","k":"u6709 japanese \u201cnot free of charge\u201d button"},{"e":"\ud83c\ude2f","k":"japanese \u201creserved\u201d button u6307"},{"e":"\ud83c\ude50","k":"ideograph_advantage japanese \u201cbargain\u201d button"},{"e":"\ud83c\ude39","k":"u5272 japanese \u201cdiscount\u201d button"},{"e":"\ud83c\ude1a","k":"u7121 japanese \u201cfree of charge\u201d button"},{"e":"\ud83c\ude32","k":"japanese \u201cprohibited\u201d button u7981"},{"e":"\ud83c\ude51","k":"accept japanese \u201cacceptable\u201d button"},{"e":"\ud83c\ude38","k":"u7533 japanese \u201capplication\u201d button"},{"e":"\ud83c\ude34","k":"japanese \u201cpassing grade\u201d button u5408"},{"e":"\ud83c\ude33","k":"u7a7a japanese \u201cvacancy\u201d button"},{"e":"\u3297\ufe0f","k":"japanese \u201ccongratulations\u201d button congratulations"},{"e":"\u3299\ufe0f","k":"secret japanese \u201csecret\u201d button"},{"e":"\ud83c\ude3a","k":"u55b6 japanese \u201copen for business\u201d button"},{"e":"\ud83c\ude35","k":"u6e80 japanese \u201cno vacancy\u201d button"},{"e":"\ud83d\udd34","k":"red_circle red circle"},{"e":"\ud83d\udfe0","k":"orange circle orange_circle"},{"e":"\ud83d\udfe1","k":"yellow circle yellow_circle"},{"e":"\ud83d\udfe2","k":"green circle green_circle"},{"e":"\ud83d\udd35","k":"blue circle large_blue_circle"},{"e":"\ud83d\udfe3","k":"purple_circle purple circle"},{"e":"\ud83d\udfe4","k":"brown circle brown_circle"},{"e":"\u26ab","k":"black circle black_circle"},{"e":"\u26aa","k":"white_circle white circle"},{"e":"\ud83d\udfe5","k":"red square red_square"},{"e":"\ud83d\udfe7","k":"orange_square orange square"},{"e":"\ud83d\udfe8","k":"yellow_square yellow square"},{"e":"\ud83d\udfe9","k":"green_square green square"},{"e":"\ud83d\udfe6","k":"blue_square blue square"},{"e":"\ud83d\udfea","k":"purple square purple_square"},{"e":"\ud83d\udfeb","k":"brown square brown_square"},{"e":"\u2b1b","k":"black_large_square black large square"},{"e":"\u2b1c","k":"white large square white_large_square"},{"e":"\u25fc\ufe0f","k":"black medium square black_medium_square"},{"e":"\u25fb\ufe0f","k":"white medium square white_medium_square"},{"e":"\u25fe","k":"black_medium_small_square black medium-small square"},{"e":"\u25fd","k":"white_medium_small_square white medium-small square"},{"e":"\u25aa\ufe0f","k":"black small square black_small_square"},{"e":"\u25ab\ufe0f","k":"white_small_square white small square"},{"e":"\ud83d\udd36","k":"large_orange_diamond large orange diamond"},{"e":"\ud83d\udd37","k":"large blue diamond large_blue_diamond"},{"e":"\ud83d\udd38","k":"small orange diamond small_orange_diamond"},{"e":"\ud83d\udd39","k":"small blue diamond small_blue_diamond"},{"e":"\ud83d\udd3a","k":"red triangle pointed up small_red_triangle"},{"e":"\ud83d\udd3b","k":"small_red_triangle_down red triangle pointed down"},{"e":"\ud83d\udca0","k":"diamond_shape_with_a_dot_inside diamond with a dot"},{"e":"\ud83d\udd18","k":"radio button radio_button"},{"e":"\ud83d\udd33","k":"white_square_button white square button"},{"e":"\ud83d\udd32","k":"black square button black_square_button"},{"e":"\ud83c\udfc1","k":"checkered_flag milestone chequered flag finish"},{"e":"\ud83d\udea9","k":"triangular_flag_on_post triangular flag"},{"e":"\ud83c\udf8c","k":"crossed_flags crossed flags"},{"e":"\ud83c\udff4","k":"black_flag black flag"},{"e":"\ud83c\udff3\ufe0f","k":"white_flag white flag"},{"e":"\ud83c\udff3\ufe0f\u200d\ud83c\udf08","k":"rainbow flag rainbow_flag pride"},{"e":"\ud83c\udff3\ufe0f\u200d\u26a7\ufe0f","k":"transgender_flag transgender flag"},{"e":"\ud83c\udff4\u200d\u2620\ufe0f","k":"pirate flag pirate_flag"},{"e":"\ud83c\udde6\ud83c\udde8","k":"flag: ascension island ascension_island"},{"e":"\ud83c\udde6\ud83c\udde9","k":"flag: andorra andorra"},{"e":"\ud83c\udde6\ud83c\uddea","k":"flag: united arab emirates united_arab_emirates"},{"e":"\ud83c\udde6\ud83c\uddeb","k":"flag: afghanistan afghanistan"},{"e":"\ud83c\udde6\ud83c\uddec","k":"antigua_barbuda flag: antigua & barbuda"},{"e":"\ud83c\udde6\ud83c\uddee","k":"flag: anguilla anguilla"},{"e":"\ud83c\udde6\ud83c\uddf1","k":"flag: albania albania"},{"e":"\ud83c\udde6\ud83c\uddf2","k":"armenia flag: armenia"},{"e":"\ud83c\udde6\ud83c\uddf4","k":"flag: angola angola"},{"e":"\ud83c\udde6\ud83c\uddf6","k":"flag: antarctica antarctica"},{"e":"\ud83c\udde6\ud83c\uddf7","k":"argentina flag: argentina"},{"e":"\ud83c\udde6\ud83c\uddf8","k":"flag: american samoa american_samoa"},{"e":"\ud83c\udde6\ud83c\uddf9","k":"austria flag: austria"},{"e":"\ud83c\udde6\ud83c\uddfa","k":"australia flag: australia"},{"e":"\ud83c\udde6\ud83c\uddfc","k":"aruba flag: aruba"},{"e":"\ud83c\udde6\ud83c\uddfd","k":"flag: \u00e5land islands aland_islands"},{"e":"\ud83c\udde6\ud83c\uddff","k":"flag: azerbaijan azerbaijan"},{"e":"\ud83c\udde7\ud83c\udde6","k":"bosnia_herzegovina flag: bosnia & herzegovina"},{"e":"\ud83c\udde7\ud83c\udde7","k":"barbados flag: barbados"},{"e":"\ud83c\udde7\ud83c\udde9","k":"bangladesh flag: bangladesh"},{"e":"\ud83c\udde7\ud83c\uddea","k":"belgium flag: belgium"},{"e":"\ud83c\udde7\ud83c\uddeb","k":"burkina_faso flag: burkina faso"},{"e":"\ud83c\udde7\ud83c\uddec","k":"bulgaria flag: bulgaria"},{"e":"\ud83c\udde7\ud83c\udded","k":"bahrain flag: bahrain"},{"e":"\ud83c\udde7\ud83c\uddee","k":"burundi flag: burundi"},{"e":"\ud83c\udde7\ud83c\uddef","k":"flag: benin benin"},{"e":"\ud83c\udde7\ud83c\uddf1","k":"st_barthelemy flag: st. barth\u00e9lemy"},{"e":"\ud83c\udde7\ud83c\uddf2","k":"bermuda flag: bermuda"},{"e":"\ud83c\udde7\ud83c\uddf3","k":"flag: brunei brunei"},{"e":"\ud83c\udde7\ud83c\uddf4","k":"bolivia flag: bolivia"},{"e":"\ud83c\udde7\ud83c\uddf6","k":"flag: caribbean netherlands caribbean_netherlands"},{"e":"\ud83c\udde7\ud83c\uddf7","k":"brazil flag: brazil"},{"e":"\ud83c\udde7\ud83c\uddf8","k":"flag: bahamas bahamas"},{"e":"\ud83c\udde7\ud83c\uddf9","k":"flag: bhutan bhutan"},{"e":"\ud83c\udde7\ud83c\uddfb","k":"bouvet_island flag: bouvet island"},{"e":"\ud83c\udde7\ud83c\uddfc","k":"flag: botswana botswana"},{"e":"\ud83c\udde7\ud83c\uddfe","k":"belarus flag: belarus"},{"e":"\ud83c\udde7\ud83c\uddff","k":"flag: belize belize"},{"e":"\ud83c\udde8\ud83c\udde6","k":"flag: canada canada"},{"e":"\ud83c\udde8\ud83c\udde8","k":"keeling flag: cocos (keeling) islands cocos_islands"},{"e":"\ud83c\udde8\ud83c\udde9","k":"flag: congo - kinshasa congo_kinshasa"},{"e":"\ud83c\udde8\ud83c\uddeb","k":"central_african_republic flag: central african republic"},{"e":"\ud83c\udde8\ud83c\uddec","k":"congo_brazzaville flag: congo - brazzaville"},{"e":"\ud83c\udde8\ud83c\udded","k":"switzerland flag: switzerland"},{"e":"\ud83c\udde8\ud83c\uddee","k":"ivory flag: c\u00f4te d\u2019ivoire cote_divoire"},{"e":"\ud83c\udde8\ud83c\uddf0","k":"cook_islands flag: cook islands"},{"e":"\ud83c\udde8\ud83c\uddf1","k":"flag: chile chile"},{"e":"\ud83c\udde8\ud83c\uddf2","k":"flag: cameroon cameroon"},{"e":"\ud83c\udde8\ud83c\uddf3","k":"china cn flag: china"},{"e":"\ud83c\udde8\ud83c\uddf4","k":"flag: colombia colombia"},{"e":"\ud83c\udde8\ud83c\uddf5","k":"clipperton_island flag: clipperton island"},{"e":"\ud83c\udde8\ud83c\uddf7","k":"costa_rica flag: costa rica"},{"e":"\ud83c\udde8\ud83c\uddfa","k":"cuba flag: cuba"},{"e":"\ud83c\udde8\ud83c\uddfb","k":"flag: cape verde cape_verde"},{"e":"\ud83c\udde8\ud83c\uddfc","k":"curacao flag: cura\u00e7ao"},{"e":"\ud83c\udde8\ud83c\uddfd","k":"christmas_island flag: christmas island"},{"e":"\ud83c\udde8\ud83c\uddfe","k":"cyprus flag: cyprus"},{"e":"\ud83c\udde8\ud83c\uddff","k":"flag: czechia czech_republic"},{"e":"\ud83c\udde9\ud83c\uddea","k":"germany flag: germany flag de"},{"e":"\ud83c\udde9\ud83c\uddec","k":"diego_garcia flag: diego garcia"},{"e":"\ud83c\udde9\ud83c\uddef","k":"djibouti flag: djibouti"},{"e":"\ud83c\udde9\ud83c\uddf0","k":"denmark flag: denmark"},{"e":"\ud83c\udde9\ud83c\uddf2","k":"flag: dominica dominica"},{"e":"\ud83c\udde9\ud83c\uddf4","k":"flag: dominican republic dominican_republic"},{"e":"\ud83c\udde9\ud83c\uddff","k":"algeria flag: algeria"},{"e":"\ud83c\uddea\ud83c\udde6","k":"flag: ceuta & melilla ceuta_melilla"},{"e":"\ud83c\uddea\ud83c\udde8","k":"ecuador flag: ecuador"},{"e":"\ud83c\uddea\ud83c\uddea","k":"flag: estonia estonia"},{"e":"\ud83c\uddea\ud83c\uddec","k":"flag: egypt egypt"},{"e":"\ud83c\uddea\ud83c\udded","k":"flag: western sahara western_sahara"},{"e":"\ud83c\uddea\ud83c\uddf7","k":"eritrea flag: eritrea"},{"e":"\ud83c\uddea\ud83c\uddf8","k":"spain es flag: spain"},{"e":"\ud83c\uddea\ud83c\uddf9","k":"ethiopia flag: ethiopia"},{"e":"\ud83c\uddea\ud83c\uddfa","k":"flag: european union eu european_union"},{"e":"\ud83c\uddeb\ud83c\uddee","k":"finland flag: finland"},{"e":"\ud83c\uddeb\ud83c\uddef","k":"fiji flag: fiji"},{"e":"\ud83c\uddeb\ud83c\uddf0","k":"flag: falkland islands falkland_islands"},{"e":"\ud83c\uddeb\ud83c\uddf2","k":"flag: micronesia micronesia"},{"e":"\ud83c\uddeb\ud83c\uddf4","k":"flag: faroe islands faroe_islands"},{"e":"\ud83c\uddeb\ud83c\uddf7","k":"french fr france flag: france"},{"e":"\ud83c\uddec\ud83c\udde6","k":"flag: gabon gabon"},{"e":"\ud83c\uddec\ud83c\udde7","k":"british flag uk gb flag: united kingdom"},{"e":"\ud83c\uddec\ud83c\udde9","k":"grenada flag: grenada"},{"e":"\ud83c\uddec\ud83c\uddea","k":"flag: georgia georgia"},{"e":"\ud83c\uddec\ud83c\uddeb","k":"flag: french guiana french_guiana"},{"e":"\ud83c\uddec\ud83c\uddec","k":"flag: guernsey guernsey"},{"e":"\ud83c\uddec\ud83c\udded","k":"ghana flag: ghana"},{"e":"\ud83c\uddec\ud83c\uddee","k":"flag: gibraltar gibraltar"},{"e":"\ud83c\uddec\ud83c\uddf1","k":"greenland flag: greenland"},{"e":"\ud83c\uddec\ud83c\uddf2","k":"gambia flag: gambia"},{"e":"\ud83c\uddec\ud83c\uddf3","k":"guinea flag: guinea"},{"e":"\ud83c\uddec\ud83c\uddf5","k":"flag: guadeloupe guadeloupe"},{"e":"\ud83c\uddec\ud83c\uddf6","k":"flag: equatorial guinea equatorial_guinea"},{"e":"\ud83c\uddec\ud83c\uddf7","k":"flag: greece greece"},{"e":"\ud83c\uddec\ud83c\uddf8","k":"flag: south georgia & south sandwich islands south_georgia_south_sandwich_islands"},{"e":"\ud83c\uddec\ud83c\uddf9","k":"flag: guatemala guatemala"},{"e":"\ud83c\uddec\ud83c\uddfa","k":"guam flag: guam"},{"e":"\ud83c\uddec\ud83c\uddfc","k":"guinea_bissau flag: guinea-bissau"},{"e":"\ud83c\uddec\ud83c\uddfe","k":"flag: guyana guyana"},{"e":"\ud83c\udded\ud83c\uddf0","k":"hong_kong flag: hong kong sar china"},{"e":"\ud83c\udded\ud83c\uddf2","k":"heard_mcdonald_islands flag: heard & mcdonald islands"},{"e":"\ud83c\udded\ud83c\uddf3","k":"flag: honduras honduras"},{"e":"\ud83c\udded\ud83c\uddf7","k":"croatia flag: croatia"},{"e":"\ud83c\udded\ud83c\uddf9","k":"flag: haiti haiti"},{"e":"\ud83c\udded\ud83c\uddfa","k":"flag: hungary hungary"},{"e":"\ud83c\uddee\ud83c\udde8","k":"canary_islands flag: canary islands"},{"e":"\ud83c\uddee\ud83c\udde9","k":"indonesia flag: indonesia"},{"e":"\ud83c\uddee\ud83c\uddea","k":"ireland flag: ireland"},{"e":"\ud83c\uddee\ud83c\uddf1","k":"israel flag: israel"},{"e":"\ud83c\uddee\ud83c\uddf2","k":"isle_of_man flag: isle of man"},{"e":"\ud83c\uddee\ud83c\uddf3","k":"india flag: india"},{"e":"\ud83c\uddee\ud83c\uddf4","k":"flag: british indian ocean territory british_indian_ocean_territory"},{"e":"\ud83c\uddee\ud83c\uddf6","k":"iraq flag: iraq"},{"e":"\ud83c\uddee\ud83c\uddf7","k":"flag: iran iran"},{"e":"\ud83c\uddee\ud83c\uddf8","k":"flag: iceland iceland"},{"e":"\ud83c\uddee\ud83c\uddf9","k":"it italy flag: italy"},{"e":"\ud83c\uddef\ud83c\uddea","k":"jersey flag: jersey"},{"e":"\ud83c\uddef\ud83c\uddf2","k":"flag: jamaica jamaica"},{"e":"\ud83c\uddef\ud83c\uddf4","k":"jordan flag: jordan"},{"e":"\ud83c\uddef\ud83c\uddf5","k":"flag: japan japan jp"},{"e":"\ud83c\uddf0\ud83c\uddea","k":"kenya flag: kenya"},{"e":"\ud83c\uddf0\ud83c\uddec","k":"flag: kyrgyzstan kyrgyzstan"},{"e":"\ud83c\uddf0\ud83c\udded","k":"cambodia flag: cambodia"},{"e":"\ud83c\uddf0\ud83c\uddee","k":"kiribati flag: kiribati"},{"e":"\ud83c\uddf0\ud83c\uddf2","k":"comoros flag: comoros"},{"e":"\ud83c\uddf0\ud83c\uddf3","k":"flag: st. kitts & nevis st_kitts_nevis"},{"e":"\ud83c\uddf0\ud83c\uddf5","k":"north_korea flag: north korea"},{"e":"\ud83c\uddf0\ud83c\uddf7","k":"kr korea flag: south korea"},{"e":"\ud83c\uddf0\ud83c\uddfc","k":"kuwait flag: kuwait"},{"e":"\ud83c\uddf0\ud83c\uddfe","k":"flag: cayman islands cayman_islands"},{"e":"\ud83c\uddf0\ud83c\uddff","k":"kazakhstan flag: kazakhstan"},{"e":"\ud83c\uddf1\ud83c\udde6","k":"laos flag: laos"},{"e":"\ud83c\uddf1\ud83c\udde7","k":"lebanon flag: lebanon"},{"e":"\ud83c\uddf1\ud83c\udde8","k":"flag: st. lucia st_lucia"},{"e":"\ud83c\uddf1\ud83c\uddee","k":"flag: liechtenstein liechtenstein"},{"e":"\ud83c\uddf1\ud83c\uddf0","k":"flag: sri lanka sri_lanka"},{"e":"\ud83c\uddf1\ud83c\uddf7","k":"flag: liberia liberia"},{"e":"\ud83c\uddf1\ud83c\uddf8","k":"lesotho flag: lesotho"},{"e":"\ud83c\uddf1\ud83c\uddf9","k":"lithuania flag: lithuania"},{"e":"\ud83c\uddf1\ud83c\uddfa","k":"luxembourg flag: luxembourg"},{"e":"\ud83c\uddf1\ud83c\uddfb","k":"flag: latvia latvia"},{"e":"\ud83c\uddf1\ud83c\uddfe","k":"libya flag: libya"},{"e":"\ud83c\uddf2\ud83c\udde6","k":"morocco flag: morocco"},{"e":"\ud83c\uddf2\ud83c\udde8","k":"flag: monaco monaco"},{"e":"\ud83c\uddf2\ud83c\udde9","k":"moldova flag: moldova"},{"e":"\ud83c\uddf2\ud83c\uddea","k":"montenegro flag: montenegro"},{"e":"\ud83c\uddf2\ud83c\uddeb","k":"flag: st. martin st_martin"},{"e":"\ud83c\uddf2\ud83c\uddec","k":"madagascar flag: madagascar"},{"e":"\ud83c\uddf2\ud83c\udded","k":"flag: marshall islands marshall_islands"},{"e":"\ud83c\uddf2\ud83c\uddf0","k":"flag: north macedonia macedonia"},{"e":"\ud83c\uddf2\ud83c\uddf1","k":"flag: mali mali"},{"e":"\ud83c\uddf2\ud83c\uddf2","k":"flag: myanmar (burma) burma myanmar"},{"e":"\ud83c\uddf2\ud83c\uddf3","k":"mongolia flag: mongolia"},{"e":"\ud83c\uddf2\ud83c\uddf4","k":"flag: macao sar china macau"},{"e":"\ud83c\uddf2\ud83c\uddf5","k":"flag: northern mariana islands northern_mariana_islands"},{"e":"\ud83c\uddf2\ud83c\uddf6","k":"martinique flag: martinique"},{"e":"\ud83c\uddf2\ud83c\uddf7","k":"mauritania flag: mauritania"},{"e":"\ud83c\uddf2\ud83c\uddf8","k":"flag: montserrat montserrat"},{"e":"\ud83c\uddf2\ud83c\uddf9","k":"malta flag: malta"},{"e":"\ud83c\uddf2\ud83c\uddfa","k":"flag: mauritius mauritius"},{"e":"\ud83c\uddf2\ud83c\uddfb","k":"flag: maldives maldives"},{"e":"\ud83c\uddf2\ud83c\uddfc","k":"malawi flag: malawi"},{"e":"\ud83c\uddf2\ud83c\uddfd","k":"mexico flag: mexico"},{"e":"\ud83c\uddf2\ud83c\uddfe","k":"malaysia flag: malaysia"},{"e":"\ud83c\uddf2\ud83c\uddff","k":"mozambique flag: mozambique"},{"e":"\ud83c\uddf3\ud83c\udde6","k":"flag: namibia namibia"},{"e":"\ud83c\uddf3\ud83c\udde8","k":"flag: new caledonia new_caledonia"},{"e":"\ud83c\uddf3\ud83c\uddea","k":"flag: niger niger"},{"e":"\ud83c\uddf3\ud83c\uddeb","k":"flag: norfolk island norfolk_island"},{"e":"\ud83c\uddf3\ud83c\uddec","k":"flag: nigeria nigeria"},{"e":"\ud83c\uddf3\ud83c\uddee","k":"nicaragua flag: nicaragua"},{"e":"\ud83c\uddf3\ud83c\uddf1","k":"flag: netherlands netherlands"},{"e":"\ud83c\uddf3\ud83c\uddf4","k":"norway flag: norway"},{"e":"\ud83c\uddf3\ud83c\uddf5","k":"nepal flag: nepal"},{"e":"\ud83c\uddf3\ud83c\uddf7","k":"nauru flag: nauru"},{"e":"\ud83c\uddf3\ud83c\uddfa","k":"flag: niue niue"},{"e":"\ud83c\uddf3\ud83c\uddff","k":"new_zealand flag: new zealand"},{"e":"\ud83c\uddf4\ud83c\uddf2","k":"flag: oman oman"},{"e":"\ud83c\uddf5\ud83c\udde6","k":"panama flag: panama"},{"e":"\ud83c\uddf5\ud83c\uddea","k":"flag: peru peru"},{"e":"\ud83c\uddf5\ud83c\uddeb","k":"flag: french polynesia french_polynesia"},{"e":"\ud83c\uddf5\ud83c\uddec","k":"papua_new_guinea flag: papua new guinea"},{"e":"\ud83c\uddf5\ud83c\udded","k":"flag: philippines philippines"},{"e":"\ud83c\uddf5\ud83c\uddf0","k":"flag: pakistan pakistan"},{"e":"\ud83c\uddf5\ud83c\uddf1","k":"flag: poland poland"},{"e":"\ud83c\uddf5\ud83c\uddf2","k":"st_pierre_miquelon flag: st. pierre & miquelon"},{"e":"\ud83c\uddf5\ud83c\uddf3","k":"flag: pitcairn islands pitcairn_islands"},{"e":"\ud83c\uddf5\ud83c\uddf7","k":"flag: puerto rico puerto_rico"},{"e":"\ud83c\uddf5\ud83c\uddf8","k":"flag: palestinian territories palestinian_territories"},{"e":"\ud83c\uddf5\ud83c\uddf9","k":"flag: portugal portugal"},{"e":"\ud83c\uddf5\ud83c\uddfc","k":"palau flag: palau"},{"e":"\ud83c\uddf5\ud83c\uddfe","k":"paraguay flag: paraguay"},{"e":"\ud83c\uddf6\ud83c\udde6","k":"qatar flag: qatar"},{"e":"\ud83c\uddf7\ud83c\uddea","k":"reunion flag: r\u00e9union"},{"e":"\ud83c\uddf7\ud83c\uddf4","k":"flag: romania romania"},{"e":"\ud83c\uddf7\ud83c\uddf8","k":"flag: serbia serbia"},{"e":"\ud83c\uddf7\ud83c\uddfa","k":"russia flag: russia ru"},{"e":"\ud83c\uddf7\ud83c\uddfc","k":"rwanda flag: rwanda"},{"e":"\ud83c\uddf8\ud83c\udde6","k":"flag: saudi arabia saudi_arabia"},{"e":"\ud83c\uddf8\ud83c\udde7","k":"flag: solomon islands solomon_islands"},{"e":"\ud83c\uddf8\ud83c\udde8","k":"seychelles flag: seychelles"},{"e":"\ud83c\uddf8\ud83c\udde9","k":"flag: sudan sudan"},{"e":"\ud83c\uddf8\ud83c\uddea","k":"flag: sweden sweden"},{"e":"\ud83c\uddf8\ud83c\uddec","k":"singapore flag: singapore"},{"e":"\ud83c\uddf8\ud83c\udded","k":"st_helena flag: st. helena"},{"e":"\ud83c\uddf8\ud83c\uddee","k":"slovenia flag: slovenia"},{"e":"\ud83c\uddf8\ud83c\uddef","k":"svalbard_jan_mayen flag: svalbard & jan mayen"},{"e":"\ud83c\uddf8\ud83c\uddf0","k":"slovakia flag: slovakia"},{"e":"\ud83c\uddf8\ud83c\uddf1","k":"sierra_leone flag: sierra leone"},{"e":"\ud83c\uddf8\ud83c\uddf2","k":"san_marino flag: san marino"},{"e":"\ud83c\uddf8\ud83c\uddf3","k":"senegal flag: senegal"},{"e":"\ud83c\uddf8\ud83c\uddf4","k":"flag: somalia somalia"},{"e":"\ud83c\uddf8\ud83c\uddf7","k":"suriname flag: suriname"},{"e":"\ud83c\uddf8\ud83c\uddf8","k":"south_sudan flag: south sudan"},{"e":"\ud83c\uddf8\ud83c\uddf9","k":"flag: s\u00e3o tom\u00e9 & pr\u00edncipe sao_tome_principe"},{"e":"\ud83c\uddf8\ud83c\uddfb","k":"el_salvador flag: el salvador"},{"e":"\ud83c\uddf8\ud83c\uddfd","k":"flag: sint maarten sint_maarten"},{"e":"\ud83c\uddf8\ud83c\uddfe","k":"flag: syria syria"},{"e":"\ud83c\uddf8\ud83c\uddff","k":"flag: eswatini swaziland"},{"e":"\ud83c\uddf9\ud83c\udde6","k":"tristan_da_cunha flag: tristan da cunha"},{"e":"\ud83c\uddf9\ud83c\udde8","k":"turks_caicos_islands flag: turks & caicos islands"},{"e":"\ud83c\uddf9\ud83c\udde9","k":"chad flag: chad"},{"e":"\ud83c\uddf9\ud83c\uddeb","k":"flag: french southern territories french_southern_territories"},{"e":"\ud83c\uddf9\ud83c\uddec","k":"togo flag: togo"},{"e":"\ud83c\uddf9\ud83c\udded","k":"flag: thailand thailand"},{"e":"\ud83c\uddf9\ud83c\uddef","k":"flag: tajikistan tajikistan"},{"e":"\ud83c\uddf9\ud83c\uddf0","k":"flag: tokelau tokelau"},{"e":"\ud83c\uddf9\ud83c\uddf1","k":"flag: timor-leste timor_leste"},{"e":"\ud83c\uddf9\ud83c\uddf2","k":"flag: turkmenistan turkmenistan"},{"e":"\ud83c\uddf9\ud83c\uddf3","k":"tunisia flag: tunisia"},{"e":"\ud83c\uddf9\ud83c\uddf4","k":"flag: tonga tonga"},{"e":"\ud83c\uddf9\ud83c\uddf7","k":"turkey tr flag: turkey"},{"e":"\ud83c\uddf9\ud83c\uddf9","k":"trinidad_tobago flag: trinidad & tobago"},{"e":"\ud83c\uddf9\ud83c\uddfb","k":"flag: tuvalu tuvalu"},{"e":"\ud83c\uddf9\ud83c\uddfc","k":"taiwan flag: taiwan"},{"e":"\ud83c\uddf9\ud83c\uddff","k":"tanzania flag: tanzania"},{"e":"\ud83c\uddfa\ud83c\udde6","k":"ukraine flag: ukraine"},{"e":"\ud83c\uddfa\ud83c\uddec","k":"uganda flag: uganda"},{"e":"\ud83c\uddfa\ud83c\uddf2","k":"us_outlying_islands flag: u.s. outlying islands"},{"e":"\ud83c\uddfa\ud83c\uddf3","k":"united_nations flag: united nations"},{"e":"\ud83c\uddfa\ud83c\uddf8","k":"flag us united america flag: united states"},{"e":"\ud83c\uddfa\ud83c\uddfe","k":"flag: uruguay uruguay"},{"e":"\ud83c\uddfa\ud83c\uddff","k":"flag: uzbekistan uzbekistan"},{"e":"\ud83c\uddfb\ud83c\udde6","k":"flag: vatican city vatican_city"},{"e":"\ud83c\uddfb\ud83c\udde8","k":"flag: st. vincent & grenadines st_vincent_grenadines"},{"e":"\ud83c\uddfb\ud83c\uddea","k":"venezuela flag: venezuela"},{"e":"\ud83c\uddfb\ud83c\uddec","k":"flag: british virgin islands british_virgin_islands"},{"e":"\ud83c\uddfb\ud83c\uddee","k":"us_virgin_islands flag: u.s. virgin islands"},{"e":"\ud83c\uddfb\ud83c\uddf3","k":"vietnam flag: vietnam"},{"e":"\ud83c\uddfb\ud83c\uddfa","k":"flag: vanuatu vanuatu"},{"e":"\ud83c\uddfc\ud83c\uddeb","k":"wallis_futuna flag: wallis & futuna"},{"e":"\ud83c\uddfc\ud83c\uddf8","k":"samoa flag: samoa"},{"e":"\ud83c\uddfd\ud83c\uddf0","k":"flag: kosovo kosovo"},{"e":"\ud83c\uddfe\ud83c\uddea","k":"flag: yemen yemen"},{"e":"\ud83c\uddfe\ud83c\uddf9","k":"mayotte flag: mayotte"},{"e":"\ud83c\uddff\ud83c\udde6","k":"flag: south africa south_africa"},{"e":"\ud83c\uddff\ud83c\uddf2","k":"flag: zambia zambia"},{"e":"\ud83c\uddff\ud83c\uddfc","k":"flag: zimbabwe zimbabwe"},{"e":"\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc65\udb40\udc6e\udb40\udc67\udb40\udc7f","k":"flag: england england"},{"e":"\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc73\udb40\udc63\udb40\udc74\udb40\udc7f","k":"scotland flag: scotland"},{"e":"\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc77\udb40\udc6c\udb40\udc73\udb40\udc7f","k":"flag: wales wales"}]
\ No newline at end of file
diff --git a/shell/plugins/emojis/manifest.json b/shell/plugins/emojis/manifest.json
new file mode 100644
index 00000000..f04b47f2
--- /dev/null
+++ b/shell/plugins/emojis/manifest.json
@@ -0,0 +1,15 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.emojis",
+  "name": "Emojis",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Search, copy, and type emojis",
+  "kinds": [
+    "overlay"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "overlay": "Emojis.qml"
+  }
+}
diff --git a/shell/plugins/image-picker/ImagePicker.qml b/shell/plugins/image-picker/ImagePicker.qml
new file mode 100644
index 00000000..1d8d6a4c
--- /dev/null
+++ b/shell/plugins/image-picker/ImagePicker.qml
@@ -0,0 +1,619 @@
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import QtQuick
+import QtQuick.Effects
+import QtQuick.Shapes
+import qs.Commons
+import "ImagePickerModel.js" as ImagePickerModel
+
+Item {
+  id: root
+
+  // Injected by omarchy-shell; defaults to the session OMARCHY_PATH.
+  property string omarchyPath: Quickshell.env("OMARCHY_PATH")
+  property string imageDirs: Quickshell.env("OMARCHY_IMAGE_SELECTOR_DIRS") || Quickshell.env("OMARCHY_IMAGE_SELECTOR_DIR") || Quickshell.env("OMARCHY_STOCK_BACKGROUNDS_DIR") || (Quickshell.env("HOME") + "/.config/omarchy/current/theme/backgrounds")
+  property string imageRows: ""
+  property string loadedImageRows: ""
+  property string selectionFile: Quickshell.env("OMARCHY_IMAGE_SELECTOR_SELECTION_FILE") || Quickshell.env("OMARCHY_BACKGROUND_SELECTION_FILE")
+  property string selectedImage: Quickshell.env("OMARCHY_IMAGE_SELECTOR_SELECTED")
+  property int selectedIndex: 0
+  property bool imagesLoaded: false
+  property bool opened: false
+  property bool showLabels: false
+  property bool filterable: false
+  property bool layoutSettled: false
+  property bool requestActive: false
+  property int requestSerial: 0
+  property int applySerial: 0
+  property string doneFile: ""
+  property string filterText: ""
+  property var doneFilesToRelease: []
+  // Bound to the central [image-picker] section in shell.toml via Color.qml.
+  // `dimColor` tints unselected slices and text outlines on top of the scrim;
+  // it intentionally tracks the foundational background, not a surface role.
+  property color dimColor: Color.background
+  property color foreground: Color.imagePicker.text
+  property color scrim: Color.imagePicker.scrim
+  property color selectedBorder: Color.imagePicker.selectedBorder
+  property color unselectedBorder: Color.imagePicker.unselectedBorder
+  property int expandedWidth: 768
+  property int expandedHeight: 475
+  property int sliceWidth: 108
+  property int sliceHeight: 432
+  property int sliceSpacing: -30
+  property int skewOffset: 28
+  property int bottomChromeHeight: showLabels ? (filterable ? 104 : 74) : (filterable ? 60 : 30)
+
+  onOpenedChanged: if (!opened) layoutSettled = false
+
+  function scriptPath(name) {
+    return omarchyPath + "/shell/plugins/image-picker/" + name
+  }
+
+  function focusPicker() {
+    if (root.opened && root.imagesLoaded && root.layoutSettled)
+      carousel.forceActiveFocus()
+  }
+
+  function revealWhenSettled(serial) {
+    Qt.callLater(function() {
+      if (serial === root.requestSerial && root.opened && root.imagesLoaded && root.imageArray.length > 0) {
+        root.layoutSettled = true
+        root.focusPicker()
+      }
+    })
+  }
+
+  function currentPath() {
+    if (imageArray.length === 0 || !itemMatches(selectedIndex)) return ""
+    return imageArray[selectedIndex].filePath
+  }
+
+  function nameForPath(path) {
+    return ImagePickerModel.nameForPath(path)
+  }
+
+  function labelForPath(path) {
+    return ImagePickerModel.labelForPath(path)
+  }
+
+  function currentLabel() {
+    var path = currentPath()
+    if (!path) return filterText ? "No matches" : ""
+
+    return labelForPath(path)
+  }
+
+  function itemMatches(index) {
+    return ImagePickerModel.itemMatches(imageArray, index, filterText)
+  }
+
+  function firstMatchingIndex() {
+    return ImagePickerModel.firstMatchingIndex(imageArray, filterText)
+  }
+
+  function filteredPosition(index) {
+    return ImagePickerModel.filteredPosition(imageArray, index, filterText)
+  }
+
+  function selectedFilteredPosition() {
+    return ImagePickerModel.selectedFilteredPosition(imageArray, selectedIndex, filterText)
+  }
+
+  function select(index, immediate) {
+    if (imageArray.length === 0) return
+    if (index < 0) index = 0
+    else if (index >= imageArray.length) index = imageArray.length - 1
+    if (!itemMatches(index)) return
+    if (index === selectedIndex && immediate !== true) return
+
+    selectedIndex = index
+  }
+
+  function selectAdjacent(direction) {
+    var count = imageArray.length
+    if (count === 0) return
+
+    var index = selectedIndex
+    for (var i = 0; i < count; i++) {
+      index = (index + direction + count) % count
+      if (itemMatches(index)) {
+        select(index)
+        return
+      }
+    }
+  }
+
+  function updateFilter(nextFilterText) {
+    filterText = nextFilterText
+
+    if (!itemMatches(selectedIndex)) {
+      var first = ImagePickerModel.nextSelectedIndexForFilter(imageArray, selectedIndex, filterText)
+      if (first >= 0) selectedIndex = first
+    }
+  }
+
+  function releaseNextDoneFile() {
+    if (releaseProc.running || doneFilesToRelease.length === 0) return
+
+    var path = doneFilesToRelease.shift()
+    releaseProc.command = ["bash", "-lc", ": > " + Util.shellQuote(path)]
+    releaseProc.running = true
+  }
+
+  function finishDoneFile(path) {
+    if (!path) return
+    doneFilesToRelease.push(path)
+    releaseNextDoneFile()
+  }
+
+  function applySelected() {
+    var path = currentPath()
+    if (!path || !selectionFile) {
+      cancel()
+      return
+    }
+
+    var activeSelectionFile = selectionFile
+    var activeDoneFile = doneFile
+    applySerial = requestSerial
+    requestActive = false
+    selectionFile = ""
+    doneFile = ""
+
+    applyProc.command = ["bash", "-lc", "printf '%s\\n' " + Util.shellQuote(path) + " > " + Util.shellQuote(activeSelectionFile) + "; : > " + Util.shellQuote(activeDoneFile)]
+    applyProc.running = true
+  }
+
+  function cancel() {
+    if (requestActive)
+      finishDoneFile(doneFile)
+
+    requestActive = false
+    selectionFile = ""
+    doneFile = ""
+    root.opened = false
+  }
+
+  function closeSelector(nextDoneFile) {
+    requestSerial += 1
+
+    if (requestActive)
+      finishDoneFile(doneFile)
+
+    if (nextDoneFile && nextDoneFile !== doneFile)
+      finishDoneFile(nextDoneFile)
+
+    requestActive = false
+    selectionFile = ""
+    doneFile = ""
+    filterText = ""
+    root.opened = false
+  }
+
+  function loadRows(rows, reveal) {
+    var newImages = ImagePickerModel.loadRows(rows)
+
+    root.loadedImageRows = rows
+    root.selectedIndex = root.indexForSelectedImage(newImages)
+    root.imageArray = newImages
+    root.imagesLoaded = true
+
+    if (reveal !== false) {
+      root.opened = true
+      root.revealWhenSettled(root.requestSerial)
+    }
+  }
+
+  function openSelector(nextImageDirs, nextImageRows, nextSelectedImage, nextSelectionFile, nextDoneFile, nextShowLabels, nextFilterable) {
+    if (requestActive && doneFile && doneFile !== nextDoneFile)
+      finishDoneFile(doneFile)
+
+    requestSerial += 1
+
+    imageDirs = nextImageDirs
+    imageRows = nextImageRows
+    selectedImage = nextSelectedImage
+    selectionFile = nextSelectionFile
+    doneFile = nextDoneFile
+    requestActive = !!doneFile
+    showLabels = nextShowLabels === true || nextShowLabels === "true"
+    filterable = nextFilterable === true || nextFilterable === "true"
+    filterText = ""
+    layoutSettled = false
+
+    if (imageRows && imageRows === loadedImageRows && imageArray.length > 0) {
+      root.select(root.selectedImageIndex(), true)
+      imagesLoaded = true
+      opened = true
+      root.revealWhenSettled(requestSerial)
+      return
+    }
+
+    if (imageRows) {
+      var rowsToLoad = imageRows
+      var rowsSerial = requestSerial
+      imageArray = []
+      selectedIndex = 0
+      imagesLoaded = true
+      opened = true
+      Qt.callLater(function() {
+        if (rowsSerial === root.requestSerial)
+          root.loadRows(rowsToLoad, true)
+      })
+      return
+    }
+
+    imageArray = []
+    selectedIndex = 0
+    imagesLoaded = false
+    opened = false
+    startImageScan(requestSerial, imageDirs)
+  }
+
+  property var imageArray: []
+
+  function startImageScan(serial, dirs) {
+    if (loadImagesProc.running) {
+      loadImagesProc.queuedSerial = serial
+      loadImagesProc.queuedDirs = dirs
+      return
+    }
+
+    loadImagesProc.activeSerial = serial
+    loadImagesProc.queuedSerial = 0
+    loadImagesProc.queuedDirs = ""
+    loadImagesProc.command = [root.scriptPath("list.sh"), dirs]
+    loadImagesProc.running = true
+  }
+
+  function indexForSelectedImage(images) {
+    return ImagePickerModel.indexForSelectedImage(images, selectedImage)
+  }
+
+  function selectedImageIndex() {
+    return indexForSelectedImage(imageArray)
+  }
+
+  Process {
+    id: loadImagesProc
+    property int activeSerial: 0
+    property int queuedSerial: 0
+    property string queuedDirs: ""
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        if (loadImagesProc.activeSerial === root.requestSerial)
+          root.loadRows(String(text || ""), true)
+      }
+    }
+    onExited: {
+      var serial = queuedSerial
+      var dirs = queuedDirs
+      activeSerial = 0
+      queuedSerial = 0
+      queuedDirs = ""
+      if (serial > 0 && serial === root.requestSerial)
+        root.startImageScan(serial, dirs)
+    }
+  }
+
+  // Lifecycle hooks invoked by omarchy-shell summon/hide. shell.summon(id,
+  // payloadJson) hands the JSON to open() here; shell.hide(id) calls close().
+  // External CLI callers can either go through `shell summon omarchy.image-
+  // picker` (JSON payload), or hit the dedicated `image-selector` IpcHandler
+  // below for the lower-level positional call that omarchy-menu-images uses.
+  function open(payload) {
+    var args = {}
+    if (payload) {
+      try { args = JSON.parse(payload) || {} } catch (e) { args = {} }
+    }
+    var dirs = String(args.imageDirs || imageDirs)
+    var rows = String(args.imageRows || "")
+    var sel = String(args.selectedImage || selectedImage)
+    var selFile = String(args.selectionFile || "")
+    var doneF = String(args.doneFile || "")
+    var labels = args.showLabels === true || args.showLabels === "true"
+    var filter = args.filterable === true || args.filterable === "true"
+    openSelector(dirs, rows, sel, selFile, doneF, labels, filter)
+  }
+
+  function close() {
+    cancel()
+  }
+
+  function preloadRows(nextImageRows, nextSelectedImage, nextShowLabels, nextFilterable) {
+    // Theme/background set hooks can warm selector rows after a picker was
+    // dismissed. Ignore those preloads while a user-visible request is open;
+    // otherwise the preload resets layoutSettled without revealing again,
+    // leaving only the fullscreen scrim.
+    if (opened || requestActive) return
+
+    requestSerial += 1
+    imageRows = nextImageRows
+    selectedImage = nextSelectedImage
+    showLabels = nextShowLabels === true || nextShowLabels === "true"
+    filterable = nextFilterable === true || nextFilterable === "true"
+    filterText = ""
+    layoutSettled = false
+
+    if (imageRows && imageRows === loadedImageRows && imageArray.length > 0) {
+      selectedIndex = selectedImageIndex()
+      imagesLoaded = true
+    } else if (imageRows) {
+      loadRows(imageRows, false)
+    }
+  }
+
+  // IPC surface. All arguments are strings (Quickshell IPC marshalling).
+  // imageRows can contain newlines/tabs, so the CLI caller base64-encodes
+  // it; everything else passes through verbatim. The two boolean-like
+  // fields use the literal strings "true" or "false".
+  IpcHandler {
+    target: "image-selector"
+
+    function open(imageDirs: string,
+                  imageRowsB64: string,
+                  selectedImage: string,
+                  selectionFile: string,
+                  doneFile: string,
+                  showLabels: string,
+                  filterable: string): string {
+      var rows = Util.decodeBase64(imageRowsB64)
+      root.openSelector(imageDirs, rows, selectedImage, selectionFile, doneFile,
+                        showLabels, filterable)
+      return "ok"
+    }
+
+    function preload(imageRowsB64: string,
+                     selectedImage: string,
+                     showLabels: string,
+                     filterable: string): string {
+      var rows = Util.decodeBase64(imageRowsB64)
+      root.preloadRows(rows, selectedImage, showLabels, filterable)
+      return "ok"
+    }
+
+    function cancel(doneFile: string): void {
+      root.closeSelector(doneFile || "")
+    }
+
+    function ping(): string {
+      return "ok"
+    }
+  }
+
+  Process {
+    id: applyProc
+    onExited: {
+      if (root.applySerial === root.requestSerial)
+        root.opened = false
+    }
+  }
+
+  Process {
+    id: releaseProc
+    onExited: root.releaseNextDoneFile()
+  }
+
+  PanelWindow {
+    id: panel
+
+    visible: root.opened
+    anchors { top: true; bottom: true; left: true; right: true }
+    color: "transparent"
+    WlrLayershell.namespace: "omarchy-image-selector"
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.keyboardFocus: root.opened && root.imagesLoaded ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
+    exclusionMode: ExclusionMode.Ignore
+
+    Rectangle {
+      anchors.fill: parent
+      visible: root.opened && root.imagesLoaded
+      color: root.scrim
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      enabled: root.opened && root.imagesLoaded
+      onClicked: root.cancel()
+    }
+
+    Item {
+      id: card
+      visible: root.opened && root.imagesLoaded && root.layoutSettled && root.imageArray.length > 0
+      width: Math.min(parent.width - 80, root.expandedWidth + 13 * (root.sliceWidth + root.sliceSpacing) + 40)
+      height: root.expandedHeight + Style.space(30) + root.bottomChromeHeight
+      anchors.centerIn: parent
+
+        MouseArea { anchors.fill: parent; onClicked: {} }
+
+        Item {
+          id: carousel
+          anchors.top: parent.top
+          anchors.topMargin: Style.space(30)
+          anchors.bottom: parent.bottom
+          anchors.bottomMargin: root.bottomChromeHeight
+          anchors.horizontalCenter: parent.horizontalCenter
+          width: root.expandedWidth + 13 * (root.sliceWidth + root.sliceSpacing)
+          clip: false
+          focus: true
+
+          readonly property real itemStep: root.sliceWidth + root.sliceSpacing
+          readonly property real previewX: (width - root.expandedWidth) / 2
+
+          Keys.priority: Keys.BeforeItem
+          Keys.onPressed: function(event) {
+            if (event.key === Qt.Key_Escape) {
+              if (root.filterText) {
+                root.updateFilter("")
+              } else {
+                root.cancel()
+              }
+              event.accepted = true
+            } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+              root.applySelected()
+              event.accepted = true
+            } else if (event.key === Qt.Key_Backspace && root.filterable) {
+              if (root.filterText.length > 0)
+                root.updateFilter(root.filterText.slice(0, -1))
+              event.accepted = true
+            } else if (event.key === Qt.Key_Left || (event.key === Qt.Key_Tab && event.modifiers & Qt.ShiftModifier) || event.key === Qt.Key_Backtab) {
+              root.selectAdjacent(-1)
+              event.accepted = true
+            } else if (event.key === Qt.Key_Right || event.key === Qt.Key_Tab) {
+              root.selectAdjacent(1)
+              event.accepted = true
+            } else if (root.filterable && event.text && event.text.length === 1 && event.text.charCodeAt(0) >= 32 && event.text.charCodeAt(0) !== 127 && (event.modifiers === Qt.NoModifier || event.modifiers === Qt.ShiftModifier)) {
+              root.updateFilter(root.filterText + event.text)
+              event.accepted = true
+            }
+          }
+
+          Component.onCompleted: forceActiveFocus()
+
+          Repeater {
+            model: root.imageArray.length
+
+            delegate: Item {
+              id: item
+              required property int index
+
+              readonly property var imageData: root.imageArray[index]
+              readonly property string filePath: imageData ? imageData.filePath : ""
+              readonly property string fileName: imageData ? imageData.fileName : ""
+              readonly property string thumbnailPath: imageData ? imageData.thumbnailPath : ""
+
+              readonly property bool matched: root.itemMatches(index)
+              readonly property int relativeIndex: root.filteredPosition(index) - root.selectedFilteredPosition()
+              readonly property bool selected: matched && index === root.selectedIndex
+              readonly property bool nearby: matched && Math.abs(relativeIndex) <= 16
+              property bool sourceActivated: nearby
+              onNearbyChanged: if (nearby) sourceActivated = true
+
+              visible: nearby
+              x: selected ? carousel.previewX : (relativeIndex < 0 ? carousel.previewX + relativeIndex * carousel.itemStep : carousel.previewX + root.expandedWidth + root.sliceSpacing + (relativeIndex - 1) * carousel.itemStep)
+              width: selected ? root.expandedWidth : root.sliceWidth
+              height: selected ? root.expandedHeight : root.sliceHeight
+              y: selected ? 0 : (root.expandedHeight - root.sliceHeight) / 2
+              z: selected ? 100 : 50 - Math.min(Math.abs(relativeIndex), 40)
+
+              readonly property real skAbs: Math.abs(root.skewOffset)
+              readonly property real topLeft: root.skewOffset >= 0 ? skAbs : 0
+              readonly property real topRight: root.skewOffset >= 0 ? width : width - skAbs
+              readonly property real bottomRight: root.skewOffset >= 0 ? width - skAbs : width
+              readonly property real bottomLeft: root.skewOffset >= 0 ? 0 : skAbs
+
+              Item {
+                id: maskShape
+                anchors.fill: parent
+                visible: false
+                layer.enabled: true
+
+                Shape {
+                  anchors.fill: parent
+                  antialiasing: true
+                  preferredRendererType: Shape.CurveRenderer
+                  ShapePath {
+                    fillColor: "white"
+                    strokeColor: "transparent"
+                    startX: item.topLeft; startY: 0
+                    PathLine { x: item.topRight; y: 0 }
+                    PathLine { x: item.bottomRight; y: item.height }
+                    PathLine { x: item.bottomLeft; y: item.height }
+                    PathLine { x: item.topLeft; y: 0 }
+                  }
+                }
+              }
+
+              Item {
+                anchors.fill: parent
+                layer.enabled: true
+                layer.smooth: true
+                layer.effect: MultiEffect {
+                  maskEnabled: true
+                  maskSource: maskShape
+                  maskThresholdMin: 0.3
+                  maskSpreadAtMin: 0.3
+                }
+
+                Image {
+                  id: image
+                  anchors.fill: parent
+                  // Load only the initial/visited nearby images, but keep the
+                  // source once activated so Qt does not tear textures down as
+                  // selection moves through the carousel.
+                  source: item.sourceActivated && item.thumbnailPath ? Util.fileUrl(item.thumbnailPath) : ""
+                  fillMode: Image.PreserveAspectCrop
+                  asynchronous: true
+                  cache: true
+                  smooth: true
+                }
+
+                Rectangle {
+                  anchors.fill: parent
+                  color: Util.alpha(root.dimColor, item.selected ? 0 : 0.42)
+                }
+              }
+
+              Shape {
+                anchors.fill: parent
+                antialiasing: true
+                preferredRendererType: Shape.CurveRenderer
+                ShapePath {
+                  fillColor: "transparent"
+                  strokeColor: item.selected ? root.selectedBorder : root.unselectedBorder
+                  strokeWidth: item.selected ? 3 : 1
+                  startX: item.topLeft; startY: 0
+                  PathLine { x: item.topRight; y: 0 }
+                  PathLine { x: item.bottomRight; y: item.height }
+                  PathLine { x: item.bottomLeft; y: item.height }
+                  PathLine { x: item.topLeft; y: 0 }
+                }
+              }
+
+              MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                onClicked: item.selected ? root.applySelected() : root.select(index)
+              }
+            }
+          }
+        }
+
+        Text {
+          id: selectedLabel
+          visible: root.showLabels
+          anchors.top: carousel.bottom
+          anchors.topMargin: Style.space(16)
+          anchors.horizontalCenter: carousel.horizontalCenter
+          width: root.expandedWidth
+          text: root.currentLabel()
+          color: root.foreground
+          style: Text.Outline
+          styleColor: Util.alpha(root.dimColor, 0.7)
+          font.pixelSize: Style.font.display
+          font.weight: Font.DemiBold
+          horizontalAlignment: Text.AlignHCenter
+          elide: Text.ElideRight
+        }
+
+        Text {
+          visible: root.filterable && root.filterText
+          anchors.top: selectedLabel.bottom
+          anchors.topMargin: Style.space(8)
+          anchors.horizontalCenter: carousel.horizontalCenter
+          width: root.expandedWidth
+          text: root.filterText
+          color: root.foreground
+          opacity: 0.85
+          style: Text.Outline
+          styleColor: Util.alpha(root.dimColor, 0.7)
+          font.pixelSize: Style.font.title
+          horizontalAlignment: Text.AlignHCenter
+          elide: Text.ElideRight
+        }
+    }
+  }
+}
diff --git a/shell/plugins/image-picker/ImagePickerModel.js b/shell/plugins/image-picker/ImagePickerModel.js
new file mode 100644
index 00000000..f34fdcab
--- /dev/null
+++ b/shell/plugins/image-picker/ImagePickerModel.js
@@ -0,0 +1,97 @@
+function nameForPath(path) {
+  return String(path || "").split("/").pop().replace(/\.[^/.]+$/, "")
+}
+
+function labelForPath(path) {
+  return nameForPath(path).replace(/[-_]+/g, " ").replace(/\b\w/g, function(match) { return match.toUpperCase() })
+}
+
+function loadRows(rows) {
+  var images = []
+  var seen = {}
+  var paths = String(rows || "").split("\n")
+
+  for (var i = 0; i < paths.length; i++) {
+    var row = paths[i]
+    if (!row) continue
+
+    var columns = row.split("\t")
+    var path = columns[0]
+    if (!path) continue
+
+    var fileName = path.split("/").pop()
+    if (seen[fileName]) continue
+    seen[fileName] = true
+
+    images.push({
+      filePath: path,
+      fileName: fileName,
+      thumbnailPath: columns[1] || path
+    })
+  }
+
+  return images
+}
+
+function itemMatches(images, index, filterText) {
+  if (!Array.isArray(images) || index < 0 || index >= images.length) return false
+  var needle = String(filterText || "").toLowerCase()
+  if (!needle) return true
+
+  var path = String(images[index].filePath || "")
+  return nameForPath(path).toLowerCase().indexOf(needle) !== -1
+      || labelForPath(path).toLowerCase().indexOf(needle) !== -1
+}
+
+function firstMatchingIndex(images, filterText) {
+  var values = Array.isArray(images) ? images : []
+  for (var i = 0; i < values.length; i++) {
+    if (itemMatches(values, i, filterText)) return i
+  }
+
+  return -1
+}
+
+function filteredPosition(images, index, filterText) {
+  if (!filterText) return index
+
+  var position = 0
+  for (var i = 0; i < index; i++) {
+    if (itemMatches(images, i, filterText)) position++
+  }
+
+  return position
+}
+
+function selectedFilteredPosition(images, selectedIndex, filterText) {
+  if (!filterText) return selectedIndex
+  return itemMatches(images, selectedIndex, filterText) ? filteredPosition(images, selectedIndex, filterText) : 0
+}
+
+function indexForSelectedImage(images, selectedImage) {
+  var values = Array.isArray(images) ? images : []
+  for (var i = 0; i < values.length; i++) {
+    if (values[i].filePath === selectedImage) return i
+  }
+
+  return 0
+}
+
+function nextSelectedIndexForFilter(images, selectedIndex, filterText) {
+  if (itemMatches(images, selectedIndex, filterText)) return selectedIndex
+  return firstMatchingIndex(images, filterText)
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    nameForPath: nameForPath,
+    labelForPath: labelForPath,
+    loadRows: loadRows,
+    itemMatches: itemMatches,
+    firstMatchingIndex: firstMatchingIndex,
+    filteredPosition: filteredPosition,
+    selectedFilteredPosition: selectedFilteredPosition,
+    indexForSelectedImage: indexForSelectedImage,
+    nextSelectedIndexForFilter: nextSelectedIndexForFilter
+  }
+}
diff --git a/shell/plugins/image-picker/list.sh b/shell/plugins/image-picker/list.sh
new file mode 100755
index 00000000..a30e4743
--- /dev/null
+++ b/shell/plugins/image-picker/list.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+image_dirs=${1:-}
+cache_dir=${XDG_CACHE_HOME:-$HOME/.cache}/omarchy/image-selector
+index_file="$cache_dir/index.tsv"
+
+mkdir -p "$cache_dir"
+
+thumbnail_for() {
+  local image="$1"
+  local signature hash thumbnail legacy_hash
+
+  signature=$(stat -Lc '%s:%Y' "$image") || return
+  hash=$(awk -F '\t' -v path="$image" -v sig="$signature" '$1 == path && $2 == sig { print $3; exit }' "$index_file" 2>/dev/null)
+
+  if [[ -z $hash ]]; then
+    hash=$(printf '%s\t%s' "$image" "$signature" | md5sum | cut -d ' ' -f 1)
+  fi
+
+  thumbnail="$cache_dir/$hash.jpg"
+
+  if [[ ! -f $thumbnail ]]; then
+    # Older on-demand picker code keyed fallback thumbnails by file content.
+    # Keep finding those if a user still has them cached.
+    legacy_hash=$(md5sum "$image" 2>/dev/null | cut -d ' ' -f 1)
+    [[ -n $legacy_hash && -f $cache_dir/$legacy_hash.jpg ]] && thumbnail="$cache_dir/$legacy_hash.jpg"
+  fi
+
+  if [[ -f $thumbnail ]]; then
+    printf '%s' "$thumbnail"
+  else
+    printf '%s' "$image"
+  fi
+}
+
+while IFS= read -r dir; do
+  [[ -n $dir && -d $dir ]] || continue
+  find -L "$dir" -maxdepth 1 -type f \
+    \( -iname '*.jpg' -o -iname '*.jpeg' -o -iname '*.png' -o -iname '*.gif' -o -iname '*.bmp' -o -iname '*.webp' \) \
+    -print0 2>/dev/null
+done <<<"$image_dirs" | sort -z | while IFS= read -r -d '' image; do
+  thumbnail=$(thumbnail_for "$image")
+  [[ -n $thumbnail ]] || continue
+  printf '%s\t%s\n' "$image" "$thumbnail"
+done
diff --git a/shell/plugins/image-picker/manifest.json b/shell/plugins/image-picker/manifest.json
new file mode 100644
index 00000000..debd1877
--- /dev/null
+++ b/shell/plugins/image-picker/manifest.json
@@ -0,0 +1,15 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.image-picker",
+  "name": "Image picker",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Image-grid selector overlay used for wallpapers, themes, and any other directory of images",
+  "kinds": [
+    "overlay"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "overlay": "ImagePicker.qml"
+  }
+}
diff --git a/shell/plugins/launcher/Launcher.qml b/shell/plugins/launcher/Launcher.qml
new file mode 100644
index 00000000..401648b5
--- /dev/null
+++ b/shell/plugins/launcher/Launcher.qml
@@ -0,0 +1,575 @@
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import Quickshell.Widgets
+import QtQuick
+import qs.Commons
+import qs.Ui
+import "LauncherSearch.js" as LauncherSearch
+
+Item {
+  id: root
+
+  property string omarchyPath: Quickshell.env("OMARCHY_PATH")
+  property var shell: null
+  property var manifest: null
+
+  property bool opened: false
+  property string placeholder: "\uf002 Search..."
+  property string filterText: ""
+  property int selectedIndex: 0
+  property bool cursorActive: true
+  property bool hoverArmed: false
+  property var filteredEntries: []
+  property int launchSerial: 0
+  property int launchToplevelCount: 0
+  property var launchActiveToplevel: null
+  property bool launchOsdOpen: false
+  property string launchOsdMessage: ""
+  property var configuredHiddenEntryIds: ({})
+  property var desktopHiddenEntryIds: ({})
+  property bool deleteConfirmOpen: false
+  property var deleteEntry: null
+
+  // Bound to the central [launcher] section in shell.toml via Color.qml.
+  // Each color already includes its alpha companion (composed in the
+  // singleton), so consumers can drop them straight into a Rectangle.
+  property color background: Color.launcher.background
+  property color foreground: Color.launcher.text
+  property color border: Color.launcher.border
+  property var borderSpec: Border.surfaceSpec("launcher", "border", border, 2)
+  property color scrim: Color.launcher.scrim
+  property color selectedBackground: Color.launcher.selectedBackground
+  property color selectedText: Color.launcher.selectedText
+  property color selectedBorder: Color.launcher.selectedBorder
+  property var selectedBorderSpec: Border.surfaceSpec("launcher", "selected-border", selectedBorder, 0)
+  readonly property real rowReservedBorderLeft: Border.left(selectedBorderSpec)
+  readonly property real rowReservedBorderRight: Border.right(selectedBorderSpec)
+  property string fontFamily: Style.font.menuFamily
+
+  property int cardWidth: 644
+  property int cardHeight: 400
+  property int contentMargin: 20
+  property int contentSpacing: 10
+  property int searchHeight: 44
+  property int rowHeight: 50
+  property int iconSlotWidth: 44
+  property int iconSize: 24
+  readonly property int listHeight: cardHeight - contentMargin * 2 - searchHeight - contentSpacing
+
+  function open(payloadJson) {
+    var payload = ({})
+    try { payload = JSON.parse(payloadJson || "{}") } catch (e) { payload = ({}) }
+
+    root.placeholder = payload.placeholder || "\uf002 Search..."
+    root.cardWidth = Math.max(300, Number(payload.width || 644))
+    var requestedListHeight = Number(payload.listHeight || payload.maxHeight || 0)
+    root.cardHeight = requestedListHeight > 0
+      ? root.contentMargin * 2 + root.searchHeight + root.contentSpacing + requestedListHeight
+      : 400
+
+    root.opened = true
+    root.filterText = payload.query || ""
+    root.selectedIndex = 0
+    root.cursorActive = true
+    root.hoverArmed = false
+    root.rebuildDisplay()
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+
+  function close() {
+    root.opened = false
+  }
+
+  function dismiss() {
+    root.deleteConfirmOpen = false
+    root.opened = false
+    if (root.shell && typeof root.shell.hide === "function")
+      root.shell.hide((root.manifest && root.manifest.id) || "omarchy.launcher")
+  }
+
+  function iconSource(icon) {
+    var value = String(icon || "")
+    if (value.length === 0) return Quickshell.iconPath("application-x-executable", true)
+    if (value.indexOf("file://") === 0 || value.indexOf("image://") === 0) return value
+    if (value.charAt(0) === "/") return Util.fileUrl(value)
+    return Quickshell.iconPath(value, true)
+  }
+
+  function entryName(entry) {
+    return LauncherSearch.entryName(entry)
+  }
+
+  function entrySubtext(entry) {
+    return LauncherSearch.entrySubtext(entry)
+  }
+
+  function entrySortKey(entry) {
+    return LauncherSearch.entrySortKey(entry)
+  }
+
+  function toplevelCount() {
+    try { return ToplevelManager.toplevels.values.length } catch (e) { return 0 }
+  }
+
+  function entrySearchText(entry) {
+    return LauncherSearch.entrySearchText(entry)
+  }
+
+  function isHiddenEntry(entry) {
+    var id = String((entry && entry.id) || "")
+    return root.configuredHiddenEntryIds[id] === true || root.desktopHiddenEntryIds[id] === true
+  }
+
+  function normalizeDesktopId(id) {
+    var value = String(id || "").trim()
+    if (value.slice(-8) === ".desktop") value = value.slice(0, -8)
+    return value
+  }
+
+  function loadConfiguredHides(rawText) {
+    var next = ({})
+    var lines = String(rawText || "").split(/\n/)
+    for (var i = 0; i < lines.length; i++) {
+      var id = root.normalizeDesktopId(lines[i])
+      if (id.length > 0) next[id] = true
+    }
+    root.configuredHiddenEntryIds = next
+    if (root.opened) root.rebuildDisplay()
+  }
+
+  function loadDesktopHiddenEntries(rawText) {
+    var next = ({})
+    var lines = String(rawText || "").split(/\n/)
+    for (var i = 0; i < lines.length; i++) {
+      var id = root.normalizeDesktopId(lines[i])
+      if (id.length > 0) next[id] = true
+    }
+    root.desktopHiddenEntryIds = next
+    if (root.opened) root.rebuildDisplay()
+  }
+
+  function hiddenEntryScanCommand() {
+    var desktop = [Quickshell.env("XDG_CURRENT_DESKTOP"), Quickshell.env("XDG_SESSION_DESKTOP"), Quickshell.env("DESKTOP_SESSION")].filter(function(v) { return String(v || "").length > 0 }).join(":")
+    var script = root.omarchyPath + "/shell/plugins/launcher/hidden-entries.sh"
+    return Util.shellQuote(script) + " " + Util.shellQuote(desktop)
+  }
+
+  function fuzzyScore(entry, query) {
+    return LauncherSearch.fuzzyScore(entry, query)
+  }
+
+  function sortedEntries(query) {
+    var values = DesktopEntries.applications.values || []
+    return LauncherSearch.sortedEntries(values, query, function(entry) { return root.isHiddenEntry(entry) })
+  }
+
+  function rebuildDisplay() {
+    displayModel.clear()
+    var rows = root.sortedEntries(root.filterText)
+    var entries = []
+    var count = Math.min(rows.length, 256)
+    for (var i = 0; i < count; i++) {
+      var entry = rows[i].entry
+      entries.push(entry)
+      displayModel.append({
+        name: root.entryName(entry),
+        subtext: root.entrySubtext(entry),
+        icon: String(entry.icon || "")
+      })
+    }
+    root.filteredEntries = entries
+
+    if (displayModel.count === 0) root.selectedIndex = 0
+    else if (root.selectedIndex >= displayModel.count) root.selectedIndex = displayModel.count - 1
+    else if (root.selectedIndex < 0) root.selectedIndex = 0
+
+    Qt.callLater(function() {
+      if (displayModel.count > 0) resultList.positionViewAtIndex(root.selectedIndex, ListView.Contain)
+    })
+  }
+
+  function setFilter(nextFilter) {
+    root.filterText = nextFilter
+    root.selectedIndex = 0
+    root.cursorActive = true
+    root.rebuildDisplay()
+  }
+
+  function select(delta) {
+    if (displayModel.count === 0) return
+    root.cursorActive = true
+    root.selectedIndex = (root.selectedIndex + delta + displayModel.count) % displayModel.count
+    resultList.positionViewAtIndex(root.selectedIndex, ListView.Contain)
+  }
+
+  function activateIndex(index) {
+    if (root.deleteConfirmOpen) return
+    if (index < 0 || index >= root.filteredEntries.length) return
+    var entry = root.filteredEntries[index]
+    if (!entry) return
+    root.beginLaunchFeedback(entry)
+    root.dismiss()
+    entry.execute()
+  }
+
+  function requestDeleteIndex(index) {
+    if (index < 0 || index >= root.filteredEntries.length) return
+    var entry = root.filteredEntries[index]
+    if (!entry) return
+    root.deleteEntry = entry
+    deleteConfirm.selectedIndex = 1
+    root.deleteConfirmOpen = true
+  }
+
+  function cancelDelete() {
+    root.deleteConfirmOpen = false
+    root.deleteEntry = null
+    deleteConfirm.selectedIndex = 1
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+
+  function confirmDelete() {
+    var entry = root.deleteEntry
+    if (!entry) return
+
+    var desktopId = String(entry.id || "")
+    var name = root.entryName(entry)
+    root.cancelDelete()
+    root.dismiss()
+    Quickshell.execDetached([root.omarchyPath + "/bin/omarchy-remove-launcher-entry", desktopId, name])
+  }
+
+  function beginLaunchFeedback(entry) {
+    root.launchSerial++
+    root.launchToplevelCount = root.toplevelCount()
+    root.launchActiveToplevel = ToplevelManager.activeToplevel
+    root.launchOsdOpen = false
+    root.launchOsdMessage = "Launching " + root.entryName(entry) + "…"
+    launchDelay.restart()
+    launchTimeout.restart()
+  }
+
+  function closeLaunchFeedback(serial) {
+    if (serial !== root.launchSerial) return
+    launchDelay.stop()
+    launchTimeout.stop()
+    if (root.launchOsdOpen) {
+      Quickshell.execDetached(["omarchy-shell", "osd", "close"])
+      root.launchOsdOpen = false
+    }
+  }
+
+  function maybeFinishLaunchFeedback() {
+    if (!launchDelay.running && !launchTimeout.running && !root.launchOsdOpen) return
+    if (root.toplevelCount() <= root.launchToplevelCount && ToplevelManager.activeToplevel === root.launchActiveToplevel) return
+    root.closeLaunchFeedback(root.launchSerial)
+  }
+
+  ListModel { id: displayModel }
+
+  Process {
+    id: hiddenEntryScan
+    command: ["bash", "-lc", root.hiddenEntryScanCommand()]
+    stdout: SplitParser { onRead: function(line) { hiddenEntryOutput.text += line + "\n" } }
+    onStarted: hiddenEntryOutput.text = ""
+    onExited: root.loadDesktopHiddenEntries(hiddenEntryOutput.text)
+  }
+
+  QtObject {
+    id: hiddenEntryOutput
+    property string text: ""
+  }
+
+  FileView {
+    id: launcherHidesFile
+    path: root.omarchyPath + "/default/omarchy/launcher.hides"
+    watchChanges: true
+    printErrors: false
+    onLoaded: root.loadConfiguredHides(text())
+    onFileChanged: root.loadConfiguredHides(text())
+    onLoadFailed: root.loadConfiguredHides("")
+  }
+
+  Connections {
+    target: ToplevelManager.toplevels
+    function onValuesChanged() { root.maybeFinishLaunchFeedback() }
+  }
+
+  Connections {
+    target: ToplevelManager
+    function onActiveToplevelChanged() { root.maybeFinishLaunchFeedback() }
+  }
+
+  Timer {
+    id: launchDelay
+    interval: 2000
+    onTriggered: {
+      if (root.toplevelCount() > root.launchToplevelCount || ToplevelManager.activeToplevel !== root.launchActiveToplevel) return
+      root.launchOsdOpen = true
+      Quickshell.execDetached(["omarchy-shell", "osd", "show", JSON.stringify({ icon: "󱓞", message: root.launchOsdMessage, duration: 0 })])
+    }
+  }
+
+  Timer {
+    id: launchTimeout
+    interval: 15000
+    onTriggered: root.closeLaunchFeedback(root.launchSerial)
+  }
+
+  Connections {
+    target: DesktopEntries.applications
+    function onValuesChanged() {
+      hiddenEntryScan.running = true
+      if (root.opened) root.rebuildDisplay()
+    }
+  }
+
+  Component.onCompleted: hiddenEntryScan.running = true
+
+  PanelWindow {
+    id: panel
+    visible: root.opened
+    anchors { top: true; bottom: true; left: true; right: true }
+    color: "transparent"
+    WlrLayershell.namespace: "omarchy-launcher"
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+    exclusionMode: ExclusionMode.Ignore
+
+    Rectangle {
+      anchors.fill: parent
+      color: root.scrim
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      onClicked: root.dismiss()
+    }
+
+    BorderSurface {
+      id: card
+      width: Math.min(root.cardWidth, panel.width - Style.gapsOut * 2)
+      height: Math.min(root.cardHeight, panel.height - Style.gapsOut * 2)
+      radius: Style.cornerRadius
+      anchors.centerIn: parent
+      color: root.background
+      borderSpec: root.borderSpec
+      padding: root.contentMargin
+      clip: true
+
+      MouseArea { anchors.fill: parent; onClicked: {} }
+
+      Item {
+        id: keyCatcher
+        anchors.fill: parent
+        z: root.deleteConfirmOpen ? 20 : 0
+        focus: true
+
+        Keys.priority: Keys.BeforeItem
+        Keys.onPressed: function(event) {
+          if (root.deleteConfirmOpen) {
+            if (deleteConfirm.handleKey(event)) event.accepted = true
+            return
+          }
+
+          if (event.key === Qt.Key_Escape) {
+            if (root.filterText.length > 0) root.setFilter("")
+            else root.dismiss()
+            event.accepted = true
+          } else if (event.key === Qt.Key_Backspace) {
+            if (root.filterText.length > 0) root.setFilter(root.filterText.slice(0, -1))
+            event.accepted = true
+          } else if (event.key === Qt.Key_Up) {
+            root.select(-1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Down) {
+            root.select(1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_PageUp) {
+            root.select(-6)
+            event.accepted = true
+          } else if (event.key === Qt.Key_PageDown) {
+            root.select(6)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Home) {
+            if (displayModel.count > 0) {
+              root.cursorActive = true
+              root.selectedIndex = 0
+              resultList.positionViewAtIndex(root.selectedIndex, ListView.Contain)
+            }
+            event.accepted = true
+          } else if (event.key === Qt.Key_End) {
+            if (displayModel.count > 0) {
+              root.cursorActive = true
+              root.selectedIndex = displayModel.count - 1
+              resultList.positionViewAtIndex(root.selectedIndex, ListView.Contain)
+            }
+            event.accepted = true
+          } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+            root.activateIndex(root.selectedIndex)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Delete) {
+            root.requestDeleteIndex(root.selectedIndex)
+            event.accepted = true
+          } else if (event.text && event.text.length === 1 && event.text.charCodeAt(0) >= 32 && event.text.charCodeAt(0) !== 127 && (event.modifiers === Qt.NoModifier || event.modifiers === Qt.ShiftModifier)) {
+            root.setFilter(root.filterText + event.text)
+            event.accepted = true
+          }
+        }
+
+        ConfirmDialog {
+          id: deleteConfirm
+
+          anchors.fill: parent
+          opened: root.deleteConfirmOpen
+          z: 10
+          message: "Do you want to uninstall " + root.entryName(root.deleteEntry) + "?"
+          confirmText: "Uninstall"
+          background: root.background
+          foreground: root.foreground
+          scrim: root.scrim
+          selectedBackground: root.selectedBackground
+          selectedText: root.selectedText
+          fontFamily: root.fontFamily
+          cornerRadius: Style.cornerRadius
+          onCanceled: root.cancelDelete()
+          onConfirmed: root.confirmDelete()
+        }
+      }
+
+      Column {
+        anchors.fill: parent
+        anchors.topMargin: card.contentTopInset
+        anchors.rightMargin: card.contentRightInset
+        anchors.bottomMargin: card.contentBottomInset
+        anchors.leftMargin: card.contentLeftInset
+        spacing: root.contentSpacing
+
+        Rectangle {
+          width: parent.width
+          height: root.searchHeight
+          radius: 0
+          color: root.background
+
+          Text {
+            anchors.left: parent.left
+            anchors.leftMargin: 10
+            anchors.right: parent.right
+            anchors.rightMargin: 10
+            anchors.verticalCenter: parent.verticalCenter
+            text: root.filterText || root.placeholder
+            color: root.foreground
+            opacity: root.filterText ? 1 : 0.5
+            font.family: root.fontFamily
+            font.pixelSize: 18
+            elide: Text.ElideRight
+          }
+        }
+
+        Item {
+          width: parent.width
+          height: parent.height - root.searchHeight - root.contentSpacing
+
+          ListView {
+            id: resultList
+            anchors.fill: parent
+            model: displayModel
+            clip: true
+            spacing: 0
+            boundsBehavior: Flickable.StopAtBounds
+
+            delegate: BorderSurface {
+              id: row
+              required property int index
+              required property string name
+              required property string subtext
+              required property string icon
+
+              readonly property bool hasCursor: root.cursorActive && row.index === root.selectedIndex
+
+              width: ListView.view.width
+              height: root.rowHeight
+              radius: 0
+              color: row.hasCursor ? root.selectedBackground : "transparent"
+              borderSpec: row.hasCursor ? root.selectedBorderSpec : Border.none()
+
+              Item {
+                id: iconSlot
+                anchors.left: parent.left
+                anchors.leftMargin: root.rowReservedBorderLeft + 14
+                anchors.verticalCenter: parent.verticalCenter
+                width: root.iconSlotWidth
+                height: parent.height
+
+                IconImage {
+                  id: appIcon
+                  anchors.centerIn: parent
+                  implicitSize: root.iconSize
+                  width: root.iconSize
+                  height: root.iconSize
+                  source: root.iconSource(row.icon)
+                  asynchronous: true
+                  mipmap: true
+                }
+
+                Text {
+                  anchors.centerIn: parent
+                  visible: appIcon.status === Image.Error
+                  text: "?"
+                  color: row.hasCursor ? root.selectedText : root.foreground
+                  font.family: root.fontFamily
+                  font.pixelSize: 18
+                }
+              }
+
+              Text {
+                anchors.left: iconSlot.right
+                anchors.leftMargin: 14
+                anchors.right: parent.right
+                anchors.rightMargin: root.rowReservedBorderRight + 14
+                anchors.verticalCenter: parent.verticalCenter
+                text: row.name
+                color: row.hasCursor ? root.selectedText : root.foreground
+                font.family: root.fontFamily
+                font.pixelSize: 18
+                elide: Text.ElideRight
+              }
+
+              MouseArea {
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onPositionChanged: function(mouse) {
+                  root.hoverArmed = true
+                  root.cursorActive = true
+                  root.selectedIndex = row.index
+                }
+                onContainsMouseChanged: if (containsMouse && root.hoverArmed) {
+                  root.cursorActive = true
+                  root.selectedIndex = row.index
+                }
+                onClicked: {
+                  root.cursorActive = true
+                  root.selectedIndex = row.index
+                  root.activateIndex(row.index)
+                }
+              }
+            }
+          }
+
+          Text {
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.leftMargin: 14
+            visible: displayModel.count === 0
+            text: "No Results"
+            color: root.foreground
+            font.family: root.fontFamily
+            font.pixelSize: 18
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/launcher/LauncherSearch.js b/shell/plugins/launcher/LauncherSearch.js
new file mode 100644
index 00000000..f9e53cde
--- /dev/null
+++ b/shell/plugins/launcher/LauncherSearch.js
@@ -0,0 +1,134 @@
+function entryName(entry) {
+  return String((entry && entry.name) || (entry && entry.id) || "")
+}
+
+function entrySubtext(entry) {
+  return String((entry && entry.genericName) || "")
+}
+
+function entrySortKey(entry) {
+  return entryName(entry).toLowerCase()
+}
+
+function keywordText(entry) {
+  try {
+    if (entry && entry.keywords && typeof entry.keywords.join === "function") return entry.keywords.join(" ")
+  } catch (e) {
+  }
+  return ""
+}
+
+function entrySearchText(entry) {
+  if (!entry) return ""
+  return [entry.name, entry.genericName, entry.comment, keywordText(entry), entry.id].join(" ").toLowerCase()
+}
+
+function wordText(value) {
+  return String(value || "")
+    .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
+    .replace(/[._:/\\-]+/g, " ")
+    .toLowerCase()
+}
+
+function words(value) {
+  var values = wordText(value).split(/[^a-z0-9]+/)
+  var result = []
+  for (var i = 0; i < values.length; i++) {
+    if (values[i]) result.push(values[i])
+  }
+  return result
+}
+
+function entryAcronym(entry) {
+  var values = words([entry && entry.name, entry && entry.genericName, keywordText(entry), entry && entry.id].join(" "))
+  var result = ""
+  for (var i = 0; i < values.length; i++) result += values[i].charAt(0)
+  return result
+}
+
+function termMatches(entry, term) {
+  if (!term) return true
+
+  var name = entryName(entry).toLowerCase()
+  var id = String((entry && entry.id) || "").toLowerCase()
+  var haystack = entrySearchText(entry)
+
+  if (name.indexOf(term) >= 0) return true
+  if (id.indexOf(term) >= 0) return true
+  if (haystack.indexOf(term) >= 0) return true
+
+  return term.length <= 5 && entryAcronym(entry).indexOf(term) >= 0
+}
+
+function allTermsMatch(entry, query) {
+  var terms = String(query || "").toLowerCase().trim().split(/\s+/)
+  for (var i = 0; i < terms.length; i++) {
+    if (terms[i] && !termMatches(entry, terms[i])) return false
+  }
+  return true
+}
+
+function fuzzyScore(entry, query) {
+  var q = String(query || "").trim().toLowerCase()
+  if (!q) return 0
+  if (!allTermsMatch(entry, q)) return -1
+
+  var name = entryName(entry).toLowerCase()
+  var id = String((entry && entry.id) || "").toLowerCase()
+  var haystack = entrySearchText(entry)
+  var directName = name.indexOf(q)
+  var directId = id.indexOf(q)
+  if (directName === 0) return 10000 - name.length
+  if (directId === 0) return 9500 - id.length
+  if (directName > 0) return 8000 - directName * 10 - name.length
+  if (directId > 0) return 7600 - directId * 10 - id.length
+
+  var hayIndex = haystack.indexOf(q)
+  if (hayIndex >= 0) return 6000 - hayIndex
+
+  var acronym = entryAcronym(entry)
+  var acronymIndex = acronym.indexOf(q)
+  if (acronymIndex === 0) return 5000 - acronym.length
+  if (acronymIndex > 0) return 4600 - acronymIndex * 10 - acronym.length
+
+  return 4000 - name.length
+}
+
+function sortedEntries(values, query, hiddenCallback) {
+  var q = String(query || "").trim()
+  var rows = []
+
+  for (var i = 0; i < values.length; i++) {
+    var entry = values[i]
+    if (!entry || entry.noDisplay) continue
+    if (hiddenCallback && hiddenCallback(entry)) continue
+    var name = entryName(entry)
+    if (!name) continue
+    var score = fuzzyScore(entry, q)
+    if (score < 0) continue
+    rows.push({ entry: entry, score: score, key: entrySortKey(entry), name: name.toLowerCase() })
+  }
+
+  rows.sort(function(a, b) {
+    if (q && a.score !== b.score) return b.score - a.score
+    if (a.key < b.key) return -1
+    if (a.key > b.key) return 1
+    if (a.name < b.name) return -1
+    if (a.name > b.name) return 1
+    return 0
+  })
+
+  return rows
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    entryName: entryName,
+    entrySubtext: entrySubtext,
+    entrySortKey: entrySortKey,
+    entrySearchText: entrySearchText,
+    entryAcronym: entryAcronym,
+    fuzzyScore: fuzzyScore,
+    sortedEntries: sortedEntries
+  }
+}
diff --git a/shell/plugins/launcher/hidden-entries.sh b/shell/plugins/launcher/hidden-entries.sh
new file mode 100755
index 00000000..041fd8cc
--- /dev/null
+++ b/shell/plugins/launcher/hidden-entries.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+desktop_names=${1:-}
+
+declare -A seen_ids
+
+desktop_matches() {
+  local list=$1
+  local desktop_name
+  local entry
+
+  IFS=":" read -ra desktop_parts <<< "$desktop_names"
+  IFS=";" read -ra entries <<< "$list"
+
+  for desktop_name in "${desktop_parts[@]}"; do
+    [[ -z $desktop_name ]] && continue
+
+    for entry in "${entries[@]}"; do
+      [[ -z $entry ]] && continue
+      [[ $entry == "$desktop_name" ]] && return 0
+    done
+  done
+
+  return 1
+}
+
+desktop_id_for_file() {
+  local dir=$1
+  local file=$2
+  local rel=${file#"$dir"/}
+
+  rel=${rel%.desktop}
+  printf '%s\n' "${rel//\//-}"
+}
+
+is_hidden_desktop_file() {
+  local file=$1
+  local in_desktop_entry=0
+  local hidden=false
+  local only_show_in=
+  local not_show_in=
+  local line key value
+
+  while IFS= read -r line || [[ -n $line ]]; do
+    line=${line%$'\r'}
+
+    if [[ $line =~ ^\[(.*)\]$ ]]; then
+      [[ ${BASH_REMATCH[1]} == "Desktop Entry" ]] && in_desktop_entry=1 || in_desktop_entry=0
+      continue
+    fi
+
+    (( in_desktop_entry )) || continue
+    [[ $line == *=* ]] || continue
+
+    key=${line%%=*}
+    value=${line#*=}
+
+    case $key in
+      Hidden|NoDisplay)
+        [[ $value == "true" ]] && hidden=true
+        ;;
+      OnlyShowIn)
+        only_show_in=$value
+        ;;
+      NotShowIn)
+        not_show_in=$value
+        ;;
+    esac
+  done < "$file"
+
+  [[ $hidden == "true" ]] && return 0
+  [[ -n $only_show_in ]] && ! desktop_matches "$only_show_in" && return 0
+  [[ -n $not_show_in ]] && desktop_matches "$not_show_in" && return 0
+
+  return 1
+}
+
+scan_dir() {
+  local dir=$1
+  local file id
+
+  [[ -d $dir ]] || return
+
+  while IFS= read -r -d '' file; do
+    id=$(desktop_id_for_file "$dir" "$file")
+    [[ -n ${seen_ids[$id]+set} ]] && continue
+    seen_ids[$id]=1
+
+    if is_hidden_desktop_file "$file"; then
+      printf '%s\n' "$id"
+    fi
+  done < <(find "$dir" -type f -name '*.desktop' -print0 2>/dev/null | sort -z)
+}
+
+scan_dir "$HOME/.local/share/applications"
+
+IFS=":" read -ra data_dirs <<< "${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
+for data_dir in "${data_dirs[@]}"; do
+  scan_dir "$data_dir/applications"
+done
+
+scan_dir "$HOME/.nix-profile/share/applications"
diff --git a/shell/plugins/launcher/manifest.json b/shell/plugins/launcher/manifest.json
new file mode 100644
index 00000000..a036bc57
--- /dev/null
+++ b/shell/plugins/launcher/manifest.json
@@ -0,0 +1,15 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.launcher",
+  "name": "Launcher",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "A Quickshell-powered launcher",
+  "kinds": [
+    "overlay"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "overlay": "Launcher.qml"
+  }
+}
diff --git a/shell/plugins/lock/LockView.qml b/shell/plugins/lock/LockView.qml
new file mode 100644
index 00000000..8853039b
--- /dev/null
+++ b/shell/plugins/lock/LockView.qml
@@ -0,0 +1,180 @@
+import QtQuick
+import QtQuick.Effects
+import qs.Commons
+import qs.Ui
+
+Item {
+  id: root
+
+  property string backgroundPath: ""
+  property int backgroundVersion: 0
+  property bool fingerprintConfigured: false
+  property bool authenticatingPassword: false
+  property string failureMessage: ""
+  property int failedAttempts: 0
+  property bool inputEnabled: true
+  property bool loadBackground: true
+  property string passwordText: ""
+  property bool syncingPasswordText: false
+
+  readonly property string placeholderText: "Enter Password"
+  readonly property int fieldWidth: 381
+  readonly property int fieldHeight: 67
+  readonly property int outlineThickness: 3
+  readonly property int fieldFontSize: Math.round(Style.font.heading * 1.125)
+  readonly property int passwordDotFontSize: Math.round(Style.font.heading * 1.33)
+  readonly property int passwordDotLetterSpacing: Math.round(Style.font.heading * 0.19)
+  readonly property bool showPasswordCursor: inputEnabled && !authenticatingPassword && failureMessage.length === 0
+  readonly property bool errorState: failureMessage.length > 0
+  readonly property var inputBorderSpec: errorState
+    ? Border.surfaceSpec("lock", "border-error", Color.lock.borderError, root.outlineThickness, "border-alpha")
+    : Border.surfaceSpec("lock", "border-active", Color.lock.borderActive, root.outlineThickness, "border-alpha")
+
+  signal submitPassword(string password)
+  signal passwordTextEdited(string password)
+  signal clearFailureRequested()
+  signal wakeRequested()
+
+  // Cache-busts the lock background by appending `?v=`. Adding a query
+  // string keeps Image's loader happy while forcing it to reload when the
+  // user picks a new background mid-session.
+  function fileUrl(path) {
+    if (!path) return ""
+    var encoded = String(path).split("/").map(encodeURIComponent).join("/")
+    return "file://" + encoded + "?v=" + backgroundVersion
+  }
+
+  function forcePasswordFocus() {
+    passwordInput.forceActiveFocus()
+  }
+
+  function clearPassword() {
+    passwordTextEdited("")
+  }
+
+  function syncPasswordText() {
+    if (passwordInput.text === passwordText) return
+    syncingPasswordText = true
+    passwordInput.text = passwordText
+    syncingPasswordText = false
+  }
+
+  onPasswordTextChanged: syncPasswordText()
+  onInputEnabledChanged: {
+    if (inputEnabled) Qt.callLater(forcePasswordFocus)
+  }
+  Component.onCompleted: {
+    syncPasswordText()
+    if (inputEnabled) Qt.callLater(forcePasswordFocus)
+  }
+
+  Rectangle {
+    anchors.fill: parent
+    color: Color.background
+
+    Image {
+      id: wallpaper
+      anchors.fill: parent
+      source: root.loadBackground ? root.fileUrl(root.backgroundPath) : ""
+      fillMode: Image.PreserveAspectCrop
+      asynchronous: true
+      cache: false
+      sourceSize.width: width
+      sourceSize.height: height
+    }
+
+    MultiEffect {
+      anchors.fill: wallpaper
+      source: wallpaper
+      autoPaddingEnabled: false
+      blurEnabled: root.loadBackground && wallpaper.status === Image.Ready
+      blur: 1.0
+      blurMax: 128
+      blurMultiplier: 1.25
+      contrast: -0.08
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      hoverEnabled: true
+      onClicked: { root.wakeRequested(); root.forcePasswordFocus() }
+      onPositionChanged: root.wakeRequested()
+    }
+
+    BorderSurface {
+      id: inputField
+      width: root.fieldWidth
+      height: root.fieldHeight
+      anchors.centerIn: parent
+      color: Color.lock.background
+      borderSpec: root.inputBorderSpec
+      radius: Style.cornerRadius
+      clip: true
+
+      TextInput {
+        id: passwordInput
+        anchors.fill: parent
+        anchors.topMargin: inputField.borderTop
+        anchors.rightMargin: inputField.borderRight + 18
+        anchors.bottomMargin: inputField.borderBottom
+        anchors.leftMargin: inputField.borderLeft + 18
+        verticalAlignment: TextInput.AlignVCenter
+        horizontalAlignment: TextInput.AlignHCenter
+        activeFocusOnPress: true
+        clip: true
+        enabled: root.inputEnabled && !root.authenticatingPassword
+        readOnly: root.authenticatingPassword
+        echoMode: TextInput.Password
+        passwordCharacter: "\u25CF"
+        passwordMaskDelay: 0
+        color: Color.lock.text
+        selectionColor: Color.lock.selection
+        selectedTextColor: Color.lock.text
+        font.family: Style.font.family
+        font.pixelSize: text.length > 0 ? root.passwordDotFontSize : root.fieldFontSize
+        font.letterSpacing: text.length > 0 ? root.passwordDotLetterSpacing : 0
+        cursorVisible: activeFocus && root.showPasswordCursor && text.length > 0
+        cursorDelegate: Rectangle {
+          width: 2
+          color: Color.lock.text
+          visible: passwordInput.cursorVisible
+        }
+
+        onTextChanged: {
+          if (!root.syncingPasswordText) root.passwordTextEdited(text)
+          if (text.length > 0) {
+            root.wakeRequested()
+          }
+          if (text.length > 0 && root.failureMessage.length > 0) root.clearFailureRequested()
+        }
+
+        onAccepted: {
+          var submitted = root.passwordText
+          root.passwordTextEdited("")
+          if (submitted.length > 0) root.submitPassword(submitted)
+        }
+
+        Keys.onPressed: function(event) {
+          root.wakeRequested()
+          if (event.key === Qt.Key_Escape || (event.modifiers & Qt.ControlModifier && event.key === Qt.Key_U)) {
+            root.passwordTextEdited("")
+            event.accepted = true
+          }
+        }
+      }
+
+      Text {
+        anchors.fill: passwordInput
+        text: root.authenticatingPassword ? "Checking…" : (root.failureMessage.length > 0 ? root.failureMessage : root.placeholderText)
+        visible: passwordInput.text.length === 0
+        color: root.authenticatingPassword ? Color.lock.text : (root.failureMessage.length > 0 ? Color.lock.textError : Color.lock.placeholder)
+        font.family: Style.font.family
+        font.pixelSize: root.fieldFontSize
+        font.italic: !root.authenticatingPassword && root.failureMessage.length > 0
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        elide: Text.ElideRight
+      }
+    }
+  }
+}
diff --git a/shell/plugins/lock/Service.qml b/shell/plugins/lock/Service.qml
new file mode 100644
index 00000000..4b8d8fcf
--- /dev/null
+++ b/shell/plugins/lock/Service.qml
@@ -0,0 +1,377 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import Quickshell.Services.Pam
+import Quickshell.Wayland
+import qs.Commons
+
+Item {
+  id: root
+
+  property var shell: null
+  property string omarchyPath: ""
+
+  readonly property string home: Quickshell.env("HOME")
+  readonly property string userName: Quickshell.env("USER") || Quickshell.env("LOGNAME")
+  readonly property string currentBackgroundLink: home + "/.config/omarchy/current/background"
+
+  property bool lockRequested: false
+  property bool authenticatingPassword: false
+  property bool fingerprintAuthenticating: false
+  property bool passwordPamConfigured: false
+  property bool fingerprintConfigured: false
+  property bool previewVisible: false
+  property string enteredPassword: ""
+  property string pendingPassword: ""
+  property string failureMessage: ""
+  property int failedAttempts: 0
+  property string backgroundPath: ""
+  property int backgroundVersion: 0
+  property string lastEvent: "init"
+  property string lastEventAt: ""
+
+  readonly property bool locked: lockRequested || sessionLock.locked || sessionLock.secure
+  readonly property bool authenticating: authenticatingPassword || fingerprintAuthenticating
+
+  function refreshBackground() {
+    if (!readlinkProc.running) readlinkProc.running = true
+  }
+
+  function refreshFingerprintStatus() {
+    if (!fingerprintCheckProc.running) fingerprintCheckProc.running = true
+  }
+
+  function logEvent(event) {
+    lastEvent = event
+    lastEventAt = new Date().toISOString()
+    console.log("omarchy lock " + lastEventAt + " " + event)
+  }
+
+  function resetAuthenticationState() {
+    enteredPassword = ""
+    pendingPassword = ""
+    failureMessage = ""
+    failedAttempts = 0
+    authenticatingPassword = false
+    fingerprintAuthenticating = false
+    fingerprintRetryTimer.stop()
+    if (passwordPam.active) passwordPam.abort()
+    if (fingerprintPam.active) fingerprintPam.abort()
+  }
+
+  function beginLock() {
+    if (!passwordPamConfigured) {
+      logEvent("lock-denied: missing-pam")
+      return false
+    }
+
+    resetAuthenticationState()
+    lockRequested = true
+    sessionLock.locked = true
+    idleBlankTimer.restart()
+    logEvent("lock-requested")
+
+    Qt.callLater(function() {
+      root.refreshBackground()
+      root.refreshFingerprintStatus()
+    })
+
+    return true
+  }
+
+  function finishUnlock() {
+    if (!root.locked && !lockRequested) return
+
+    lockRequested = false
+    resetAuthenticationState()
+    idleBlankTimer.stop()
+    sessionLock.locked = false
+    logEvent("unlocked")
+    runWake()
+  }
+
+  function runWake() {
+    if (!wakeProcess.running) wakeProcess.running = true
+    if (lockRequested) idleBlankTimer.restart()
+  }
+
+  function runBlank() {
+    if (!blankProcess.running) blankProcess.running = true
+  }
+
+  function submitPassword(value) {
+    var password = String(value || "")
+    if (!lockRequested || authenticatingPassword || password.length === 0) return
+
+    runWake()
+    pendingPassword = password
+    failureMessage = ""
+    authenticatingPassword = true
+
+    if (!passwordPam.start()) {
+      handlePasswordFailure()
+      return
+    }
+
+    Qt.callLater(respondToPasswordPrompt)
+  }
+
+  function respondToPasswordPrompt() {
+    if (!authenticatingPassword || !passwordPam.active || !passwordPam.responseRequired) return
+    passwordPam.respond(pendingPassword)
+  }
+
+  function handlePasswordFailure() {
+    if (!lockRequested) return
+
+    authenticatingPassword = false
+    enteredPassword = ""
+    pendingPassword = ""
+    failedAttempts += 1
+    failureMessage = "Authentication failed (" + failedAttempts + ")"
+    runWake()
+  }
+
+  function startFingerprint() {
+    if (!lockRequested || !sessionLock.secure || !fingerprintConfigured) return
+    if (fingerprintPam.active || fingerprintAuthenticating) return
+
+    fingerprintAuthenticating = true
+    if (!fingerprintPam.start()) {
+      fingerprintAuthenticating = false
+    }
+  }
+
+  function handleFingerprintFinished(result) {
+    fingerprintAuthenticating = false
+
+    if (!lockRequested) return
+    if (result === PamResult.Success) {
+      finishUnlock()
+    } else if (fingerprintConfigured) {
+      fingerprintRetryTimer.restart()
+    }
+  }
+
+  WlSessionLock {
+    id: sessionLock
+
+    locked: false
+
+    onSecureStateChanged: {
+      root.logEvent("secure=" + secure)
+      if (secure) root.startFingerprint()
+    }
+
+    onLockStateChanged: {
+      root.logEvent("session-locked=" + locked)
+
+      if (!locked && root.lockRequested) {
+        root.lockRequested = false
+        root.resetAuthenticationState()
+        root.runWake()
+      }
+    }
+
+    WlSessionLockSurface {
+      id: lockSurface
+      color: Color.background
+
+      LockView {
+        id: lockView
+        anchors.fill: parent
+        backgroundPath: root.backgroundPath
+        backgroundVersion: root.backgroundVersion
+        fingerprintConfigured: root.fingerprintConfigured
+        authenticatingPassword: root.authenticatingPassword
+        failureMessage: root.failureMessage
+        failedAttempts: root.failedAttempts
+        inputEnabled: root.lockRequested
+        loadBackground: root.locked
+        passwordText: root.enteredPassword
+        onPasswordTextEdited: function(password) { root.enteredPassword = password }
+        onSubmitPassword: function(password) { root.submitPassword(password) }
+        onClearFailureRequested: root.failureMessage = ""
+        onWakeRequested: root.runWake()
+      }
+
+    }
+  }
+
+  PanelWindow {
+    id: previewWindow
+    visible: root.previewVisible
+    anchors { top: true; bottom: true; left: true; right: true }
+    color: "transparent"
+    WlrLayershell.namespace: "omarchy-lock-preview"
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+    exclusionMode: ExclusionMode.Ignore
+
+    LockView {
+      anchors.fill: parent
+      backgroundPath: root.backgroundPath
+      backgroundVersion: root.backgroundVersion
+      fingerprintConfigured: root.fingerprintConfigured
+      authenticatingPassword: false
+      failureMessage: ""
+      failedAttempts: 0
+      inputEnabled: false
+      loadBackground: root.previewVisible
+      passwordText: ""
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      acceptedButtons: Qt.LeftButton | Qt.RightButton
+      onClicked: root.previewVisible = false
+    }
+  }
+
+  PamContext {
+    id: passwordPam
+    config: "omarchy-lock-password"
+    user: root.userName
+
+    onResponseRequiredChanged: root.respondToPasswordPrompt()
+    onPamMessage: root.respondToPasswordPrompt()
+
+    onCompleted: function(result) {
+      root.authenticatingPassword = false
+      root.pendingPassword = ""
+
+      if (!root.lockRequested) return
+      if (result === PamResult.Success) root.finishUnlock()
+      else root.handlePasswordFailure()
+    }
+
+    onError: function(error) {
+      root.handlePasswordFailure()
+    }
+  }
+
+  PamContext {
+    id: fingerprintPam
+    config: "omarchy-lock-fingerprint"
+    user: root.userName
+
+    onCompleted: function(result) {
+      root.handleFingerprintFinished(result)
+    }
+
+    onError: function(error) {
+      root.fingerprintAuthenticating = false
+      if (root.lockRequested && root.fingerprintConfigured) fingerprintRetryTimer.restart()
+    }
+  }
+
+  Timer {
+    id: fingerprintRetryTimer
+    interval: 250
+    repeat: false
+    onTriggered: root.startFingerprint()
+  }
+
+  Process {
+    id: readlinkProc
+    command: ["readlink", "-f", root.currentBackgroundLink]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        var next = String(text || "").trim()
+        if (next !== root.backgroundPath) {
+          root.backgroundPath = next
+          root.backgroundVersion += 1
+        }
+      }
+    }
+  }
+
+  Process {
+    id: fingerprintCheckProc
+    command: ["bash", "-lc", "if [[ -f /etc/pam.d/omarchy-lock-fingerprint ]] && command -v fprintd-list >/dev/null 2>&1 && fprintd-list \"$USER\" 2>/dev/null | grep -qi finger; then echo yes; else echo no; fi"]
+    stdout: StdioCollector { id: fingerprintCheckStdout; waitForEnd: true }
+    onExited: {
+      root.fingerprintConfigured = String(fingerprintCheckStdout.text || "").trim() === "yes"
+      if (root.lockRequested && root.fingerprintConfigured) root.startFingerprint()
+      else if (!root.fingerprintConfigured && fingerprintPam.active) fingerprintPam.abort()
+    }
+  }
+
+  Process {
+    id: wakeProcess
+    command: ["bash", "-lc", "omarchy-system-wake"]
+  }
+
+  Process {
+    id: blankProcess
+    command: ["bash", "-lc", "omarchy-brightness-keyboard off; omarchy-brightness-display off"]
+  }
+
+  Timer {
+    id: idleBlankTimer
+    interval: 30000
+    repeat: false
+    onTriggered: if (root.lockRequested && !root.authenticating) root.runBlank()
+  }
+
+  onAuthenticatingChanged: {
+    if (!lockRequested) return
+    if (authenticating) idleBlankTimer.stop()
+    else idleBlankTimer.restart()
+  }
+
+  FileView {
+    path: "/etc/pam.d/omarchy-lock-password"
+    watchChanges: true
+    printErrors: false
+    onLoaded: root.passwordPamConfigured = true
+    onLoadFailed: root.passwordPamConfigured = false
+    onFileChanged: reload()
+  }
+
+  Component.onCompleted: {
+    refreshBackground()
+    refreshFingerprintStatus()
+  }
+
+  IpcHandler {
+    target: "lock"
+
+    function lock(): string {
+      if (!root.passwordPamConfigured) return "missing-pam"
+      if (!root.locked && !root.beginLock()) return "failed"
+      return "ok"
+    }
+
+    function isLocked(): string {
+      return root.locked ? "true" : "false"
+    }
+
+    function status(): string {
+      return JSON.stringify({
+        locked: root.locked,
+        requested: root.lockRequested,
+        sessionLocked: sessionLock.locked,
+        secure: sessionLock.secure,
+        passwordPam: root.passwordPamConfigured,
+        fingerprint: root.fingerprintConfigured,
+        authenticating: root.authenticating,
+        lastEvent: root.lastEvent,
+        lastEventAt: root.lastEventAt
+      })
+    }
+
+    function preview(): string {
+      root.refreshBackground()
+      root.refreshFingerprintStatus()
+      root.previewVisible = true
+      return "ok"
+    }
+
+    function hidePreview(): string {
+      root.previewVisible = false
+      return "ok"
+    }
+  }
+}
diff --git a/shell/plugins/lock/manifest.json b/shell/plugins/lock/manifest.json
new file mode 100644
index 00000000..87acd939
--- /dev/null
+++ b/shell/plugins/lock/manifest.json
@@ -0,0 +1,15 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.lock",
+  "name": "Lock Screen",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Quickshell session lock with separate password and fingerprint PAM flows.",
+  "kinds": [
+    "service"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "service": "Service.qml"
+  }
+}
diff --git a/shell/plugins/menu/BarWidget.qml b/shell/plugins/menu/BarWidget.qml
new file mode 100644
index 00000000..8fa7e1b3
--- /dev/null
+++ b/shell/plugins/menu/BarWidget.qml
@@ -0,0 +1,24 @@
+import QtQuick
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.menu"
+
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: "\ue900"
+    fontFamily: "omarchy"
+    horizontalMargin: 7.5
+    onPressed: function(button) {
+      if (!root.bar) return
+      if (button === Qt.RightButton) root.bar.run("xdg-terminal-exec")
+      else root.bar.run("omarchy-shell shell toggle omarchy.menu '{\"menu\":\"root\"}'")
+    }
+  }
+}
diff --git a/shell/plugins/menu/Menu.qml b/shell/plugins/menu/Menu.qml
new file mode 100644
index 00000000..b77a445c
--- /dev/null
+++ b/shell/plugins/menu/Menu.qml
@@ -0,0 +1,1066 @@
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import QtQuick
+import qs.Commons
+import qs.Ui
+import "MenuModel.js" as MenuModel
+
+Item {
+  id: root
+
+  // Injected by omarchy-shell when this plugin is summoned.
+  property string omarchyPath: Quickshell.env("OMARCHY_PATH")
+
+  // Plugin lifecycle hooks. The host calls open(payloadJson) after
+  // `omarchy-shell shell summon omarchy.menu ...` and close() when hidden.
+  property string pendingInitialMenu: "root"
+
+  function open(payloadJson) {
+    var payload = ({})
+    try { payload = JSON.parse(payloadJson || "{}") } catch (e) { payload = ({}) }
+
+    if (payload.fontFamily) root.fontFamily = payload.fontFamily
+
+    if (payload.mode === "select" || payload.mode === "input") {
+      root.openDmenu(payload)
+    } else {
+      root.openRoute(payload.initialMenu || payload.menu || "root")
+    }
+  }
+
+  function close() {
+    root.cancel()
+  }
+
+  function refresh() {
+    defaultMenuFile.reload()
+    userMenuFile.reload()
+    return "ok"
+  }
+
+  function ping() { return "ok" }
+
+  property string fontFamily: Style.font.menuFamily
+  // JSONC menu definitions. The shell parses both at startup and merges
+  // the user file on top of the defaults, so the keybind → IPC → visible
+  // path doesn't have to shell out to bash + jq on every open.
+  property string defaultMenuPath: omarchyPath + "/default/omarchy/omarchy-menu.jsonc"
+  property string userMenuPath: Quickshell.env("HOME") + "/.config/omarchy/extensions/omarchy-menu.jsonc"
+  property var defaultMenuItems: []
+  property var userMenuItems: []
+  property bool opened: false
+  property string mode: "menu"
+  readonly property bool dmenuActive: mode === "select" || mode === "input"
+  property string dmenuPrompt: ""
+  property var dmenuOptions: []
+  property string selectionFile: ""
+  property string doneFile: ""
+  property int dmenuWidth: 300
+  property int dmenuMaxHeight: 0
+  property bool requestActive: false
+  property bool rowsLoaded: false
+  property string activeMenu: "root"
+  property string filterText: ""
+  property int selectedIndex: 0
+  property bool cursorActive: false
+  property int requestSerial: 0
+  property int applySerial: 0
+  property var items: ({})
+  property var itemOrder: []
+  property var navStack: []
+  property var providersLoaded: ({})
+  property var providerQueue: []
+  property int providerRevision: 0
+  // Bound to the central [menu] section in shell.toml via Color.qml.
+  // Each color already includes its alpha companion (composed in the
+  // singleton), so consumers can drop them straight into a Rectangle.
+  property color background: Color.menu.background
+  property color foreground: Color.menu.text
+  property color border: Color.menu.border
+  property var borderSpec: Border.surfaceSpec("menu", "border", border, Math.max(1, Style.space(2)))
+  property color scrim: Color.menu.scrim
+  property color selectedBackground: Color.menu.selectedBackground
+  property color selectedText: Color.menu.selectedText
+  property color selectedBorder: Color.menu.selectedBorder
+  property var selectedBorderSpec: Border.surfaceSpec("menu", "selected-border", selectedBorder, 0)
+  readonly property real rowReservedBorderLeft: Border.left(selectedBorderSpec)
+  readonly property real rowReservedBorderRight: Border.right(selectedBorderSpec)
+  readonly property int cornerRadius: Style.cornerRadius
+  property int contentMargin: Style.spacing.panelPadding
+  property int headerHeight: Math.max(Style.space(34), Style.font.title + Style.spacing.controlPaddingY * 2)
+  property int contentSpacing: Style.spacing.md
+  property int baseRowHeight: Math.max(Style.space(50), Style.font.body + Style.spacing.rowPaddingX * 2)
+  property int detailRowHeight: Math.max(Style.space(58), Style.font.body + Style.font.caption + Style.spacing.rowPaddingX * 2)
+  property int rowSpacing: Style.spacing.xs
+  property int dividerHeight: Style.space(17)
+  property bool searchDivider: false
+  property int layoutSerial: 0
+  property int cardWidth: Math.min(root.dmenuActive ? Style.space(root.dmenuWidth) : ((root.activeMenu === "trigger.capture.screenrecord" || root.activeMenu === "style.font") ? Style.space(520) : Style.space(300)), panel.width - Style.gapsOut * 2)
+  property int visibleRowsHeight: root.dmenuActive ? dmenuRowListHeight(layoutSerial, displayModel.count, filterText) : rowListHeight(layoutSerial, displayModel.count, filterText, searchDivider)
+  property int cardHeight: root.dmenuActive
+    ? Math.min(contentMargin * 2 + headerHeight + (mode === "input" ? 0 : contentSpacing + visibleRowsHeight), panel.height - Style.gapsOut * 2)
+    : Math.min(Math.max(Style.space(220), contentMargin * 2 + headerHeight + contentSpacing + visibleRowsHeight), panel.height - Style.gapsOut * 2)
+
+  function finishRequest(selection) {
+    if (!root.requestActive || !root.doneFile) {
+      root.opened = false
+      return
+    }
+
+    var activeSelectionFile = root.selectionFile
+    var activeDoneFile = root.doneFile
+    root.requestActive = false
+    root.selectionFile = ""
+    root.doneFile = ""
+
+    if (selection === null || selection === undefined) {
+      resultProc.command = ["bash", "-lc", ": > " + Util.shellQuote(activeDoneFile)]
+    } else {
+      resultProc.command = ["bash", "-lc", "printf '%s\\n' " + Util.shellQuote(selection) + " > " + Util.shellQuote(activeSelectionFile) + "; : > " + Util.shellQuote(activeDoneFile)]
+    }
+    resultProc.running = true
+  }
+
+  function runAction(action) {
+    var command = String(action || "")
+    if (!command) return
+
+    Quickshell.execDetached(Util.hyprExecCommand(command))
+  }
+
+  function rowHeightForDetail(detail) {
+    return root.filterText && detail ? root.detailRowHeight : root.baseRowHeight
+  }
+
+  function rowListHeight(_serial, _count, _filter, _divider) {
+    if (displayModel.count === 0) return root.baseRowHeight
+
+    var count = Math.min(displayModel.count, 10)
+    var total = 0
+    var previousSection = ""
+
+    for (var i = 0; i < count; i++) {
+      var row = displayModel.get(i)
+      if (i > 0) total += root.rowSpacing
+      if (row.section === "drilldown" && previousSection !== "drilldown") total += root.dividerHeight
+      total += root.rowHeightForDetail(row.detail)
+      previousSection = row.section
+    }
+
+    return total
+  }
+
+  function dmenuRowListHeight(_serial, _count, _filter) {
+    if (root.mode === "input") return 0
+    if (displayModel.count === 0) return root.baseRowHeight
+
+    var count = Math.min(displayModel.count, 10)
+    var total = 0
+    for (var i = 0; i < count; i++) {
+      if (i > 0) total += root.rowSpacing
+      total += root.baseRowHeight
+    }
+
+    return root.dmenuMaxHeight > 0 ? Math.min(total, Style.space(root.dmenuMaxHeight)) : total
+  }
+
+  function item(id) {
+    return root.items[id] || null
+  }
+
+  // ------------------------------------------------------------------
+  // JSONC → normalized item array. Mirrors the bash bin's jq pipeline so
+  // the on-disk authoring format stays untouched.
+  // ------------------------------------------------------------------
+
+  function stripJsonc(raw) {
+    return MenuModel.stripJsonc(raw)
+  }
+
+  function normalizeAliases(value) {
+    return MenuModel.normalizeAliases(value)
+  }
+
+  function normalizeKeywords(id, aliases, raw) {
+    return MenuModel.normalizeKeywords(id, aliases, raw)
+  }
+
+  function normalizeItem(id, raw) {
+    return MenuModel.normalizeItem(id, raw)
+  }
+
+  function parseMenuJsonc(raw) {
+    return MenuModel.parseMenuJsonc(raw)
+  }
+
+  // Merge defaults + user extension. Later entries override earlier ones
+  // on a per-key basis (so the user can tweak label/icon/action without
+  // re-declaring the whole row).
+  function rebuildItemsFromSources() {
+    var mergedMenu = MenuModel.mergeMenuSources(root.defaultMenuItems, root.userMenuItems)
+    root.providerRevision += 1
+    root.providersLoaded = ({})
+    root.providerQueue = []
+    root.items = mergedMenu.items
+    root.itemOrder = mergedMenu.itemOrder
+    root.rowsLoaded = true
+    root.evaluateGuards()
+    if (root.opened) {
+      root.rebuildDisplay()
+      if (!root.dmenuActive) {
+        if (root.filterText.trim()) root.loadProvidersForSearch()
+        else root.loadProviderForMenu(root.activeMenu)
+      }
+    }
+  }
+
+  // Each known provider is a tiny bash one-liner that enumerates a list and
+  // emits one tab-delimited row per item: `label\tvalue\tcurrent`. The shell
+  // turns those into menu items children of `menuId`.
+  readonly property var providers: ({
+    "fonts": {
+      script: "current=$(omarchy-font-current 2>/dev/null); omarchy-font-list 2>/dev/null | while read -r f; do [[ -z $f ]] && continue; printf '%s\\t%s\\t%s\\n' \"$f\" \"$f\" \"$current\"; done",
+      icon: "",
+      actionFor: function(value) { return "omarchy-font-set '" + value.replace(/'/g, "'\\''") + "'" },
+      keywordsFor: function(value) { return value + " typeface" }
+    },
+    "power-profiles": {
+      script: "current=$(powerprofilesctl get 2>/dev/null); omarchy-powerprofiles-list 2>/dev/null | while read -r p; do [[ -z $p ]] && continue; printf '%s\\t%s\\t%s\\n' \"$p\" \"$p\" \"$current\"; done",
+      icon: "\udb81\udc0b",
+      actionFor: function(value) { return "powerprofilesctl set '" + value.replace(/'/g, "'\\''") + "'" },
+      keywordsFor: function(value) { return value + " power profile" }
+    }
+  })
+
+  function slugify(value) {
+    return MenuModel.slugify(value)
+  }
+
+  function startProviderForMenu(id) {
+    var entry = root.item(id)
+    if (!entry || !entry.provider || root.providersLoaded[id]) return
+    var spec = root.providers[entry.provider]
+    if (!spec) return
+
+    root.providersLoaded[id] = true
+    providerProc.menuId = id
+    providerProc.providerKey = entry.provider
+    providerProc.revision = root.providerRevision
+    providerProc.collected = ""
+    providerProc.command = ["bash", "-lc", spec.script]
+    providerProc.running = true
+  }
+
+  function mergeProviderRows(rows, menuId, providerKey) {
+    var spec = root.providers[providerKey]
+    if (!spec) return
+    var changed = false
+    var lines = String(rows || "").split("\n")
+    var nextOrder = root.itemOrder.slice()
+    for (var i = 0; i < lines.length; i++) {
+      var line = lines[i].trim()
+      if (!line) continue
+      var parts = line.split("\t")
+      var label = parts[0] || ""
+      var value = parts[1] || parts[0] || ""
+      var current = parts[2] || ""
+      if (!label) continue
+      var id = menuId + "." + root.slugify(value)
+      if (!root.items[id]) nextOrder.push(id)
+      root.items[id] = {
+        id: id,
+        parent: menuId,
+        kind: "action",
+        icon: (value === current) ? "✓" : (spec.icon || ""),
+        label: label,
+        target: "",
+        keywords: spec.keywordsFor(value),
+        description: "",
+        action: spec.actionFor(value),
+        provider: "",
+        aliases: [],
+        when: "",
+        checked: "",
+        order: nextOrder.indexOf(id)
+      }
+      changed = true
+    }
+    root.itemOrder = nextOrder
+    if (changed && root.opened) root.rebuildDisplay()
+  }
+
+  function startNextProvider() {
+    if (providerProc.running) return
+
+    while (root.providerQueue.length > 0) {
+      var id = root.providerQueue.shift()
+      var entry = root.item(id)
+      if (!entry || !entry.provider || root.providersLoaded[id]) continue
+
+      root.startProviderForMenu(id)
+      return
+    }
+  }
+
+  function loadProviderForMenu(id) {
+    var entry = root.item(id)
+    if (!entry || !entry.provider || root.providersLoaded[id]) return
+
+    if (providerProc.running) {
+      if (root.providerQueue.indexOf(id) < 0) root.providerQueue = root.providerQueue.concat([id])
+      return
+    }
+
+    root.startProviderForMenu(id)
+  }
+
+  function loadProvidersForSearch() {
+    var active = root.item(root.activeMenu) ? root.activeMenu : "root"
+
+    for (var i = 0; i < root.itemOrder.length; i++) {
+      var entry = root.item(root.itemOrder[i])
+      if (!entry || !entry.provider || root.providersLoaded[entry.id]) continue
+      if (active !== "root" && entry.id !== active && !root.isDescendantOf(entry.id, active)) continue
+
+      root.loadProviderForMenu(entry.id)
+    }
+  }
+
+  function depthFor(id) {
+    return MenuModel.depthFor(root.items, id)
+  }
+
+  function pathFor(id) {
+    return MenuModel.pathFor(root.items, id)
+  }
+
+  function parentPathFor(id) {
+    return MenuModel.parentPathFor(root.items, id)
+  }
+
+  function isDescendantOf(id, ancestorId) {
+    return MenuModel.isDescendantOf(root.items, id, ancestorId)
+  }
+
+  function childCount(id) {
+    return MenuModel.childCount(root.items, root.itemOrder, id)
+  }
+
+  // Items whose `when:` evaluated to false are hidden everywhere — nav,
+  // drilldown, and search. Items with no `when:` are always visible.
+  function isVisible(entry) {
+    if (!entry) return false
+    if (!entry.when) return true
+    var result = root.whenResults[entry.id]
+    return result === undefined ? true : result
+  }
+
+  // Label with the ✓ marker baked in when `checked:` evaluated truthy.
+  function labelFor(entry) {
+    return MenuModel.labelFor(entry, root.checkedResults)
+  }
+
+  function searchableToken(value) {
+    return MenuModel.searchableToken(value)
+  }
+
+  function leafIdFor(id) {
+    return MenuModel.leafIdFor(id)
+  }
+
+  function nameSearchText(entry) {
+    return MenuModel.nameSearchText(entry)
+  }
+
+  function termInSearchWords(term, text) {
+    return MenuModel.termInSearchWords(term, text)
+  }
+
+  function keywordTextMatches(query, text) {
+    return MenuModel.keywordTextMatches(query, text)
+  }
+
+  function matchesQuery(entry, query) {
+    return MenuModel.matchesQuery(entry, query, root.isVisible(entry))
+  }
+
+  function searchScore(entry, query) {
+    return MenuModel.searchScore(root.items, entry, query)
+  }
+
+  function displayRow(entry, detail, score, section) {
+    return MenuModel.displayRow(root.items, root.itemOrder, root.checkedResults, entry, detail, score, section)
+  }
+
+  function rebuildDmenuDisplay() {
+    displayModel.clear()
+    root.searchDivider = false
+
+    if (root.mode === "input") {
+      layoutSerial += 1
+      return
+    }
+
+    var query = root.filterText.trim().toLowerCase()
+    for (var i = 0; i < root.dmenuOptions.length; i++) {
+      var label = String(root.dmenuOptions[i] || "")
+      if (query && label.toLowerCase().indexOf(query) < 0) continue
+      displayModel.append({
+        itemId: "dmenu." + i,
+        kind: "dmenu",
+        icon: "",
+        label: label,
+        target: "",
+        detail: "",
+        path: "",
+        childCount: 0,
+        action: "",
+        provider: "",
+        score: i,
+        section: ""
+      })
+    }
+
+    layoutSerial += 1
+
+    if (displayModel.count === 0) selectedIndex = 0
+    else if (selectedIndex >= displayModel.count) selectedIndex = displayModel.count - 1
+    else if (selectedIndex < 0) selectedIndex = 0
+
+    Qt.callLater(function() {
+      if (displayModel.count > 0) resultList.positionViewAtIndex(root.selectedIndex, ListView.Contain)
+    })
+  }
+
+  function rebuildDisplay() {
+    if (root.dmenuActive) {
+      root.rebuildDmenuDisplay()
+      return
+    }
+
+    displayModel.clear()
+
+    if (!root.rowsLoaded) return
+
+    var active = root.item(root.activeMenu) ? root.activeMenu : "root"
+    root.activeMenu = active
+    var rows = []
+    var query = root.filterText.trim()
+    root.searchDivider = false
+
+    if (query) {
+      var currentRows = []
+      var drilldownRows = []
+
+      for (var i = 0; i < root.itemOrder.length; i++) {
+        var entry = root.item(root.itemOrder[i])
+        if (!entry || entry.id === "root") continue
+        if (!root.isDescendantOf(entry.id, active)) continue
+        if (!root.matchesQuery(entry, query)) continue
+
+        var detail = root.parentPathFor(entry.id)
+        var row = root.displayRow(entry, detail, root.searchScore(entry, query))
+        if (entry.parent === active) currentRows.push(row)
+        else drilldownRows.push(row)
+      }
+
+      var searchSort = function(a, b) {
+        if (a.score !== b.score) return a.score - b.score
+        return a.path.localeCompare(b.path)
+      }
+
+      currentRows.sort(searchSort)
+      drilldownRows.sort(searchSort)
+      root.searchDivider = currentRows.length > 0 && drilldownRows.length > 0
+      if (root.searchDivider) {
+        for (var d = 0; d < drilldownRows.length; d++) drilldownRows[d].section = "drilldown"
+      }
+      rows = currentRows.concat(drilldownRows)
+    } else {
+      for (var j = 0; j < root.itemOrder.length; j++) {
+        var child = root.item(root.itemOrder[j])
+        if (!child || child.parent !== active) continue
+        if (!root.isVisible(child)) continue
+        rows.push(root.displayRow(child, child.description, child.order))
+      }
+    }
+
+    for (var k = 0; k < rows.length; k++) displayModel.append(rows[k])
+    layoutSerial += 1
+
+    if (displayModel.count === 0) selectedIndex = 0
+    else if (selectedIndex >= displayModel.count) selectedIndex = displayModel.count - 1
+    else if (selectedIndex < 0) selectedIndex = 0
+
+    Qt.callLater(function() {
+      if (displayModel.count > 0) resultList.positionViewAtIndex(root.selectedIndex, ListView.Contain)
+    })
+  }
+
+  function select(delta) {
+    if (displayModel.count === 0) return
+
+    if (!cursorActive) {
+      cursorActive = true
+      selectedIndex = delta < 0 ? displayModel.count - 1 : 0
+    } else {
+      selectedIndex = (selectedIndex + delta + displayModel.count) % displayModel.count
+    }
+    resultList.positionViewAtIndex(selectedIndex, ListView.Contain)
+  }
+
+  function setFilter(nextFilter) {
+    root.filterText = nextFilter
+    root.selectedIndex = 0
+    root.cursorActive = root.mode !== "input"
+    if (!root.dmenuActive && root.filterText.trim()) root.loadProvidersForSearch()
+    root.rebuildDisplay()
+  }
+
+  function setActiveMenu(id, pushHistory) {
+    if (!root.item(id)) id = "root"
+    if (pushHistory && id !== root.activeMenu) root.navStack = root.navStack.concat([root.activeMenu])
+    root.activeMenu = id
+    root.filterText = ""
+    root.selectedIndex = 0
+    root.cursorActive = true
+    root.rebuildDisplay()
+    root.loadProviderForMenu(id)
+  }
+
+  function goBack() {
+    if (root.activeMenu === "root") return false
+
+    if (root.navStack.length > 0) {
+      var previous = root.navStack[root.navStack.length - 1]
+      root.navStack = root.navStack.slice(0, root.navStack.length - 1)
+      root.setActiveMenu(previous, false)
+      return true
+    }
+
+    var active = root.item(root.activeMenu)
+    root.setActiveMenu((active && active.parent) ? active.parent : "root", false)
+    return true
+  }
+
+  function activateIndex(index) {
+    if (root.dmenuActive) {
+      if (root.mode === "input") {
+        root.applyDmenuSelection(root.filterText)
+        return
+      }
+      if (index < 0 || index >= displayModel.count) return
+      root.applyDmenuSelection(displayModel.get(index).label)
+      return
+    }
+
+    if (index < 0 || index >= displayModel.count) return
+
+    var row = displayModel.get(index)
+    if (row.kind === "menu" || row.kind === "link") {
+      root.setActiveMenu(row.target || row.itemId, true)
+    } else {
+      root.applySelected(row.itemId, row.action)
+    }
+  }
+
+  function applyDmenuSelection(value) {
+    applySerial = requestSerial
+    opened = false
+    filterText = ""
+    root.finishRequest(value)
+  }
+
+  function applySelected(id, action) {
+    if (!id) { cancel(); return }
+
+    applySerial = requestSerial
+    opened = false
+    filterText = ""
+    root.runAction(action)
+  }
+
+  function cancel() {
+    if (root.dmenuActive) root.finishRequest(null)
+    opened = false
+    filterText = ""
+  }
+
+  function openExistingMenu(initialMenu) {
+    requestSerial += 1
+    mode = "menu"
+    requestActive = false
+    selectionFile = ""
+    doneFile = ""
+    activeMenu = root.item(initialMenu) ? initialMenu : "root"
+    navStack = []
+    filterText = ""
+    selectedIndex = 0
+    cursorActive = true
+    root.evaluateGuards()
+    opened = true
+    rebuildDisplay()
+    loadProviderForMenu(activeMenu)
+
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+
+  function openDmenu(payload) {
+    requestSerial += 1
+    mode = payload.mode === "input" ? "input" : "select"
+    dmenuPrompt = String(payload.prompt || (mode === "input" ? "Input" : "Select"))
+    dmenuOptions = Array.isArray(payload.options) ? payload.options : []
+    selectionFile = String(payload.selectionFile || "")
+    doneFile = String(payload.doneFile || "")
+    requestActive = !!doneFile
+    dmenuWidth = Math.max(1, Number(payload.width || 300))
+    dmenuMaxHeight = Math.max(0, Number(payload.maxHeight || 0))
+    activeMenu = "root"
+    navStack = []
+    filterText = ""
+    selectedIndex = 0
+    cursorActive = mode !== "input"
+    opened = true
+    rebuildDisplay()
+
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+  ListModel { id: displayModel }
+
+  // ----------------------------------------------------------- route surface
+  //
+  // The menu is opened through the standard plugin lifecycle:
+  // `omarchy-shell shell summon omarchy.menu '{"menu":"system"}'`.
+  // Callers may pass a real id (`system`, `setup.power`) or an alias declared
+  // in JSONC (`power`, `reminder-set`). Unknown strings fall through to the
+  // id-as-route behavior so misspellings still attempt to open the literal id.
+  function resolveRoute(input) {
+    var raw = String(input || "").toLowerCase().replace(/_/g, "-")
+    if (!raw || raw === "go" || raw === "menu") return "root"
+    for (var i = 0; i < root.itemOrder.length; i++) {
+      var entry = root.items[root.itemOrder[i]]
+      if (!entry || !entry.aliases) continue
+      for (var j = 0; j < entry.aliases.length; j++) {
+        var alias = String(entry.aliases[j] || "").toLowerCase().replace(/_/g, "-")
+        if (alias === raw) return entry.id
+      }
+    }
+    return raw
+  }
+
+  function openRoute(initialMenu) {
+    var id = root.resolveRoute(initialMenu)
+    var entry = root.items[id]
+    // If the resolved id is an action (i.e. the user invoked an alias for
+    // a leaf, e.g. `omarchy menu summon screenrecord-stop`), run it directly
+    // instead of opening an action with no children.
+    if (entry && entry.kind === "action" && entry.action) {
+      root.cancel()
+      root.runAction(entry.action)
+      return "ok"
+    }
+    // If it's a link (a redirect to another menu), follow the link.
+    if (entry && entry.kind === "link" && entry.target) id = entry.target
+    root.pendingInitialMenu = id
+    root.openExistingMenu(id)
+    return "ok"
+  }
+
+  Process {
+    id: providerProc
+    property string menuId: ""
+    property string providerKey: ""
+    property string collected: ""
+    property int revision: 0
+    stdout: SplitParser {
+      onRead: function(data) { providerProc.collected += data + "\n" }
+    }
+    onExited: {
+      if (providerProc.revision === root.providerRevision) {
+        root.mergeProviderRows(providerProc.collected, providerProc.menuId, providerProc.providerKey)
+        if (root.filterText.trim()) root.loadProvidersForSearch()
+      }
+      root.startNextProvider()
+    }
+  }
+
+  Process {
+    id: resultProc
+    onExited: {
+      if (root.applySerial === root.requestSerial)
+        root.opened = false
+    }
+  }
+
+  // The JSONC sources are watched so live edits to the default file (or the
+  // user extension at ~/.config/omarchy/extensions/omarchy-menu.jsonc) take
+  // effect without restarting the shell.
+  FileView {
+    id: defaultMenuFile
+    path: root.defaultMenuPath
+    watchChanges: true
+    printErrors: false
+    onLoaded: { root.defaultMenuItems = root.parseMenuJsonc(text()); root.rebuildItemsFromSources() }
+    onFileChanged: reload()
+  }
+
+  FileView {
+    id: userMenuFile
+    path: root.userMenuPath
+    watchChanges: true
+    printErrors: false
+    onLoaded: { root.userMenuItems = root.parseMenuJsonc(text()); root.rebuildItemsFromSources() }
+    onLoadFailed: { root.userMenuItems = []; root.rebuildItemsFromSources() }
+    onFileChanged: reload()
+  }
+
+  // ---------------------------------------------------------------- guards
+  //
+  // `when:` (visibility) and `checked:` (✓ marker) are bash expressions the
+  // shell wasn't allowed to evaluate before the perf rewrite. Now the shell
+  // batches them into one bash subprocess per (re)load so the open path
+  // never has to wait on them.
+
+  property var whenResults: ({})       // id → true|false (allow visibility)
+  property var checkedResults: ({})    // id → true|false (show ✓)
+
+  function evaluateGuards() {
+    var script = ""
+    var ids = Object.keys(root.items)
+    for (var i = 0; i < ids.length; i++) {
+      var entry = root.items[ids[i]]
+      if (!entry) continue
+      if (entry.when) script += "if " + entry.when + " >/dev/null 2>&1; then echo " + ids[i] + ":w:1; else echo " + ids[i] + ":w:0; fi\n"
+      if (entry.checked) script += "if " + entry.checked + " >/dev/null 2>&1; then echo " + ids[i] + ":c:1; else echo " + ids[i] + ":c:0; fi\n"
+    }
+    if (!script) {
+      root.whenResults = ({})
+      root.checkedResults = ({})
+      return
+    }
+    guardProc.collected = ""
+    guardProc.command = ["bash", "-lc", script]
+    guardProc.running = true
+  }
+
+  Process {
+    id: guardProc
+    property string collected: ""
+    stdout: SplitParser {
+      onRead: function(data) { guardProc.collected += data + "\n" }
+    }
+    onExited: {
+      var nextWhen = ({})
+      var nextChecked = ({})
+      var lines = guardProc.collected.split("\n")
+      for (var i = 0; i < lines.length; i++) {
+        var line = lines[i].trim()
+        if (!line) continue
+        var colon = line.lastIndexOf(":")
+        if (colon < 0) continue
+        var value = line.substring(colon + 1) === "1"
+        var rest = line.substring(0, colon)
+        var tagAt = rest.lastIndexOf(":")
+        if (tagAt < 0) continue
+        var id = rest.substring(0, tagAt)
+        var tag = rest.substring(tagAt + 1)
+        if (tag === "w") nextWhen[id] = value
+        else if (tag === "c") nextChecked[id] = value
+      }
+      root.whenResults = nextWhen
+      root.checkedResults = nextChecked
+      if (root.opened) root.rebuildDisplay()
+    }
+  }
+  PanelWindow {
+    id: panel
+    visible: root.opened && root.rowsLoaded
+    anchors { top: true; bottom: true; left: true; right: true }
+    color: "transparent"
+    WlrLayershell.namespace: "omarchy-menu"
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+    exclusionMode: ExclusionMode.Ignore
+
+    Rectangle {
+      anchors.fill: parent
+      color: root.scrim
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      onClicked: root.cancel()
+    }
+
+    BorderSurface {
+      id: card
+      width: root.cardWidth
+      height: root.cardHeight
+      radius: root.cornerRadius
+      anchors.centerIn: parent
+      color: root.background
+      borderSpec: root.borderSpec
+      padding: root.contentMargin
+
+      MouseArea { anchors.fill: parent; onClicked: {} }
+
+      Item {
+        id: keyCatcher
+        anchors.fill: parent
+        focus: true
+
+        Keys.priority: Keys.BeforeItem
+        Keys.onPressed: function(event) {
+          if (event.key === Qt.Key_Escape) {
+            if (root.filterText) root.setFilter("")
+            else root.cancel()
+            event.accepted = true
+          } else if (event.key === Qt.Key_Backspace) {
+            if (root.filterText.length > 0) root.setFilter(root.filterText.slice(0, -1))
+            else root.goBack()
+            event.accepted = true
+          } else if (event.key === Qt.Key_Up) {
+            root.select(-1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Down) {
+            root.select(1)
+            event.accepted = true
+          } else if (event.key === Qt.Key_PageUp) {
+            root.select(-6)
+            event.accepted = true
+          } else if (event.key === Qt.Key_PageDown) {
+            root.select(6)
+            event.accepted = true
+          } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter || event.key === Qt.Key_Right) {
+            if (root.dmenuActive) {
+              if (root.mode === "input") root.applyDmenuSelection(root.filterText)
+              else if (displayModel.count > 0) root.activateIndex(root.cursorActive ? root.selectedIndex : 0)
+            } else if (root.cursorActive) root.activateIndex(root.selectedIndex)
+            else if (displayModel.count > 0) root.cursorActive = true
+            event.accepted = true
+          } else if (event.text && event.text.length === 1 && event.text.charCodeAt(0) >= 32 && event.text.charCodeAt(0) !== 127 && (event.modifiers === Qt.NoModifier || event.modifiers === Qt.ShiftModifier)) {
+            root.setFilter(root.filterText + event.text)
+            event.accepted = true
+          }
+        }
+      }
+
+      Column {
+        anchors.fill: parent
+        anchors.topMargin: card.contentTopInset
+        anchors.rightMargin: card.contentRightInset
+        anchors.bottomMargin: card.contentBottomInset
+        anchors.leftMargin: card.contentLeftInset
+        spacing: root.contentSpacing
+
+        Rectangle {
+          width: parent.width
+          height: root.headerHeight
+          radius: root.cornerRadius
+          color: "transparent"
+
+          Text {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
+            text: root.filterText || (root.dmenuActive ? (root.dmenuPrompt + "…") : ((root.item(root.activeMenu) ? root.item(root.activeMenu).label : "Go") + "…"))
+            color: root.foreground
+            opacity: root.filterText ? 1 : 0.58
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.heading
+            elide: Text.ElideRight
+          }
+
+        }
+
+        Item {
+          width: parent.width
+          height: root.visibleRowsHeight
+
+          ListView {
+            id: resultList
+            anchors.fill: parent
+            model: displayModel
+            clip: true
+            spacing: root.rowSpacing
+            boundsBehavior: Flickable.StopAtBounds
+
+            section.property: "section"
+            section.criteria: ViewSection.FullString
+            section.delegate: Item {
+              required property string section
+
+              width: ListView.view.width
+              height: section === "drilldown" ? root.dividerHeight : 0
+              visible: section === "drilldown"
+
+              Rectangle {
+                anchors.left: parent.left
+                anchors.leftMargin: Style.space(4)
+                anchors.right: parent.right
+                anchors.rightMargin: Style.space(4)
+                anchors.verticalCenter: parent.verticalCenter
+                height: Style.spacing.hairline
+                color: Util.alpha(root.foreground, 0.2)
+              }
+            }
+
+            delegate: BorderSurface {
+              id: row
+              required property int index
+              required property string itemId
+              required property string kind
+              required property string icon
+              required property string label
+              required property string target
+              required property string detail
+              required property string path
+              required property string action
+              required property int childCount
+
+              readonly property bool hasCursor: root.cursorActive && row.index === root.selectedIndex
+              readonly property bool hasIcon: row.icon.length > 0
+
+              width: ListView.view.width
+              height: root.rowHeightForDetail(row.detail)
+              radius: root.cornerRadius
+              color: row.hasCursor ? root.selectedBackground : "transparent"
+              borderSpec: row.hasCursor ? root.selectedBorderSpec : Border.none()
+
+              Rectangle {
+                visible: false
+                width: Style.space(4)
+                height: parent.height - Style.space(18)
+                radius: Math.min(root.cornerRadius, Style.space(4))
+                color: root.selectedBackground
+                anchors.left: parent.left
+                anchors.leftMargin: root.rowReservedBorderLeft + Style.space(8)
+                anchors.verticalCenter: parent.verticalCenter
+              }
+
+              Text {
+                id: iconText
+                visible: row.hasIcon
+                text: row.icon
+                color: row.hasCursor ? root.selectedText : root.foreground
+                font.family: root.fontFamily
+                font.pixelSize: Style.font.iconLarge
+                width: Style.space(36)
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                anchors.left: parent.left
+                anchors.leftMargin: root.rowReservedBorderLeft + Style.space(8)
+                y: contentColumn.y + labelText.y + (labelText.height - height) / 2
+              }
+
+              Column {
+                id: contentColumn
+                anchors.left: row.hasIcon ? iconText.right : parent.left
+                anchors.leftMargin: row.hasIcon ? Style.space(6) : root.rowReservedBorderLeft + Style.space(18)
+                anchors.right: trail.left
+                anchors.rightMargin: Style.space(6)
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: Style.space(3)
+
+                Text {
+                  id: labelText
+                  width: parent.width
+                  text: row.label
+                  color: row.hasCursor ? root.selectedText : root.foreground
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.heading
+                  font.weight: Font.Medium
+                  elide: Text.ElideRight
+                }
+
+                Text {
+                  width: parent.width
+                  text: row.detail
+                  visible: root.filterText && row.detail.length > 0
+                  color: root.foreground
+                  opacity: 0.52
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.bodySmall
+                  elide: Text.ElideRight
+                }
+              }
+
+              Row {
+                id: trail
+                width: Style.space(14)
+                anchors.right: parent.right
+                anchors.rightMargin: root.rowReservedBorderRight + Style.space(8)
+                y: contentColumn.y + labelText.y + (labelText.height - height) / 2
+                spacing: 0
+
+                Text {
+                  visible: false
+                  text: row.childCount
+                  color: root.foreground
+                  opacity: 0.45
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.body
+                  anchors.verticalCenter: parent.verticalCenter
+                }
+
+                Text {
+                  text: row.kind === "menu" || row.kind === "link" ? "›" : ""
+                  color: row.hasCursor ? root.selectedText : root.foreground
+                  opacity: row.kind === "menu" || row.kind === "link" ? 0.36 : 0
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.heading
+                  font.weight: Font.Normal
+                  anchors.verticalCenter: parent.verticalCenter
+                }
+              }
+
+              MouseArea {
+                id: mouseArea
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onPositionChanged: {
+                  root.cursorActive = true
+                  root.selectedIndex = row.index
+                }
+                onClicked: root.activateIndex(row.index)
+              }
+            }
+          }
+
+          Column {
+            anchors.centerIn: parent
+            spacing: Style.space(8)
+            visible: displayModel.count === 0 && root.mode !== "input"
+
+            Text {
+              text: "󰈉"
+              color: root.selectedText
+              opacity: 0.8
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.displayLarge
+              horizontalAlignment: Text.AlignHCenter
+              width: Style.space(320)
+            }
+
+            Text {
+              text: root.filterText ? "No matches for “" + root.filterText + "”" : "Nothing here yet"
+              color: root.foreground
+              opacity: 0.7
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.title
+              horizontalAlignment: Text.AlignHCenter
+              width: Style.space(320)
+            }
+          }
+        }
+
+        Item {
+          width: parent.width
+          height: 0
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/menu/MenuModel.js b/shell/plugins/menu/MenuModel.js
new file mode 100644
index 00000000..2d8cb0bc
--- /dev/null
+++ b/shell/plugins/menu/MenuModel.js
@@ -0,0 +1,293 @@
+function stripJsonc(raw) {
+  return String(raw || "")
+    .replace(/^\s*\/\/[^\n]*(\n|$)/gm, "")
+    .replace(/,(\s*[}\]])/g, "$1")
+}
+
+function normalizeAliases(value) {
+  if (Array.isArray(value)) return value.filter(function(v) { return v })
+  if (typeof value === "string" && value) return [value]
+  return []
+}
+
+function normalizeKeywords(id, aliases, raw) {
+  var parts = String(raw || "").split(/\s+/)
+  var seen = {}
+  var out = []
+  for (var i = 0; i < parts.length; i++) {
+    var p = parts[i]
+    if (!p || seen[p]) continue
+    seen[p] = true
+    out.push(p)
+  }
+  return out.join(" ")
+}
+
+function normalizeItem(id, raw) {
+  var value = raw || {}
+  var aliases = normalizeAliases(value.aliases)
+  var parent = value.parent
+  if (parent === undefined)
+    parent = id.indexOf(".") >= 0 ? id.split(".").slice(0, -1).join(".") : "root"
+  if (id === "root") parent = ""
+
+  var kind = value.action ? "action" : (value.target ? "link" : "menu")
+
+  return {
+    id: id,
+    parent: parent,
+    kind: kind,
+    icon: value.icon || "",
+    label: value.label || id,
+    target: value.target || "",
+    keywords: normalizeKeywords(id, aliases, value.keywords),
+    description: value.description || "",
+    action: value.action || "",
+    provider: value.provider || "",
+    aliases: aliases,
+    when: value.when || "",
+    checked: value.checked || ""
+  }
+}
+
+function parseMenuJsonc(raw) {
+  var stripped = stripJsonc(raw)
+  if (!stripped.trim()) return []
+
+  var parsed
+  try {
+    parsed = JSON.parse(stripped)
+  } catch (e) {
+    return []
+  }
+  if (typeof parsed !== "object" || parsed === null) return []
+
+  var source = (parsed.items && typeof parsed.items === "object" && !Array.isArray(parsed.items))
+    ? parsed.items
+    : parsed
+  var out = []
+  for (var id in source) {
+    var entry = source[id]
+    if (!entry || typeof entry !== "object" || Array.isArray(entry)) continue
+    out.push(normalizeItem(id, entry))
+  }
+  return out
+}
+
+function mergeMenuSources(defaultItems, userItems) {
+  var nextItems = ({})
+  var nextOrder = []
+  var sources = [defaultItems || [], userItems || []]
+
+  for (var s = 0; s < sources.length; s++) {
+    var src = sources[s]
+    for (var i = 0; i < src.length; i++) {
+      var entry = src[i]
+      if (!entry || !entry.id) continue
+      if (!nextItems[entry.id]) nextOrder.push(entry.id)
+      var prior = nextItems[entry.id] || {}
+      var merged = {}
+      for (var k in prior) merged[k] = prior[k]
+      for (var k2 in entry) merged[k2] = entry[k2]
+      merged.id = entry.id
+      nextItems[entry.id] = merged
+    }
+  }
+
+  if (!nextItems.root) {
+    nextItems.root = { id: "root", parent: "", kind: "menu", icon: "", label: "Go", target: "", keywords: "", description: "", aliases: [], when: "", checked: "", action: "", provider: "" }
+    nextOrder.unshift("root")
+  }
+  for (var k3 = 0; k3 < nextOrder.length; k3++) nextItems[nextOrder[k3]].order = k3
+
+  return {
+    items: nextItems,
+    itemOrder: nextOrder
+  }
+}
+
+function item(items, id) {
+  return items && items[id] ? items[id] : null
+}
+
+function slugify(value) {
+  return String(value || "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "item"
+}
+
+function depthFor(items, id) {
+  var depth = 0
+  var current = item(items, id)
+  var guard = 0
+
+  while (current && current.parent && current.parent !== "root" && guard < 32) {
+    depth += 1
+    current = item(items, current.parent)
+    guard += 1
+  }
+
+  return depth
+}
+
+function pathFor(items, id) {
+  var labels = []
+  var current = item(items, id)
+  var guard = 0
+
+  while (current && current.id !== "root" && guard < 32) {
+    labels.unshift(current.label)
+    current = item(items, current.parent)
+    guard += 1
+  }
+
+  return labels.join(" › ")
+}
+
+function parentPathFor(items, id) {
+  var entry = item(items, id)
+  if (!entry || !entry.parent || entry.parent === "root") return ""
+  return pathFor(items, entry.parent)
+}
+
+function isDescendantOf(items, id, ancestorId) {
+  if (ancestorId === "root") return id !== "root"
+
+  var current = item(items, id)
+  var guard = 0
+  while (current && current.parent && guard < 32) {
+    if (current.parent === ancestorId) return true
+    current = item(items, current.parent)
+    guard += 1
+  }
+
+  return false
+}
+
+function childCount(items, itemOrder, id) {
+  var count = 0
+  var order = Array.isArray(itemOrder) ? itemOrder : []
+  for (var i = 0; i < order.length; i++) {
+    var entry = item(items, order[i])
+    if (entry && entry.parent === id) count += 1
+  }
+  return count
+}
+
+function labelFor(entry, checkedResults) {
+  if (!entry) return ""
+  if (entry.checked && checkedResults && checkedResults[entry.id]) return entry.label + " ✓"
+  return entry.label
+}
+
+function searchableToken(value) {
+  return String(value || "").replace(/[._-]+/g, " ")
+}
+
+function leafIdFor(id) {
+  var parts = String(id || "").split(".")
+  return parts.length > 0 ? parts[parts.length - 1] : id
+}
+
+function nameSearchText(entry) {
+  if (!entry) return ""
+  var aliases = []
+  var values = Array.isArray(entry.aliases) ? entry.aliases : []
+  for (var i = 0; i < values.length; i++) aliases.push(searchableToken(values[i]))
+  return [entry.label, searchableToken(leafIdFor(entry.id)), aliases.join(" ")].join(" ").toLowerCase()
+}
+
+function termInSearchWords(term, text) {
+  var words = String(text || "").toLowerCase().split(/\s+/)
+  for (var i = 0; i < words.length; i++) {
+    if (words[i] === term) return true
+  }
+  return false
+}
+
+function keywordTextMatches(query, text) {
+  var terms = String(query || "").toLowerCase().trim().split(/\s+/)
+  for (var i = 0; i < terms.length; i++) {
+    if (terms[i] && !termInSearchWords(terms[i], text)) return false
+  }
+  return true
+}
+
+function matchesQuery(entry, query, visible) {
+  if (!entry || entry.id === "root") return false
+  if (!visible) return false
+
+  var nameText = nameSearchText(entry)
+  var keywordText = (entry.keywords + " " + entry.description).toLowerCase()
+  var terms = String(query || "").toLowerCase().trim().split(/\s+/)
+
+  for (var i = 0; i < terms.length; i++) {
+    if (!terms[i]) continue
+    if (nameText.indexOf(terms[i]) >= 0) continue
+    if (termInSearchWords(terms[i], keywordText)) continue
+    return false
+  }
+
+  return true
+}
+
+function searchScore(items, entry, query) {
+  var needle = String(query || "").toLowerCase().trim()
+  var label = entry.label.toLowerCase()
+  var nameText = nameSearchText(entry)
+  var keywordText = (entry.keywords + " " + entry.description).toLowerCase()
+  var score = 80
+
+  if (label === needle) score = entry.parent === "root" ? 2 : 0
+  else if (label.indexOf(needle) === 0) score = 10
+  else if (label.indexOf(needle) >= 0) score = 30
+  else if (nameText.indexOf(needle) >= 0) score = 40
+  else if (keywordTextMatches(needle, keywordText)) score = 60
+
+  if (entry.kind === "menu" || entry.kind === "link") score -= 2
+
+  return score * 1000 + depthFor(items, entry.id) * 25 + entry.order
+}
+
+function displayRow(items, itemOrder, checkedResults, entry, detail, score, section) {
+  var target = entry.kind === "link" ? entry.target : entry.id
+  return {
+    itemId: entry.id,
+    kind: entry.kind,
+    icon: entry.icon,
+    label: labelFor(entry, checkedResults),
+    target: target,
+    detail: detail || "",
+    path: pathFor(items, entry.id),
+    childCount: (entry.kind === "menu" || entry.kind === "link") ? childCount(items, itemOrder, target) : 0,
+    action: entry.action || "",
+    provider: entry.provider || "",
+    score: score || 0,
+    section: section || ""
+  }
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    stripJsonc: stripJsonc,
+    normalizeAliases: normalizeAliases,
+    normalizeKeywords: normalizeKeywords,
+    normalizeItem: normalizeItem,
+    parseMenuJsonc: parseMenuJsonc,
+    mergeMenuSources: mergeMenuSources,
+    item: item,
+    slugify: slugify,
+    depthFor: depthFor,
+    pathFor: pathFor,
+    parentPathFor: parentPathFor,
+    isDescendantOf: isDescendantOf,
+    childCount: childCount,
+    labelFor: labelFor,
+    searchableToken: searchableToken,
+    leafIdFor: leafIdFor,
+    nameSearchText: nameSearchText,
+    termInSearchWords: termInSearchWords,
+    keywordTextMatches: keywordTextMatches,
+    matchesQuery: matchesQuery,
+    searchScore: searchScore,
+    displayRow: displayRow
+  }
+}
diff --git a/shell/plugins/menu/manifest.json b/shell/plugins/menu/manifest.json
new file mode 100644
index 00000000..4227a227
--- /dev/null
+++ b/shell/plugins/menu/manifest.json
@@ -0,0 +1,23 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.menu",
+  "name": "Omarchy menu",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Quickshell-powered Omarchy command menu",
+  "kinds": [
+    "menu",
+    "bar-widget"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "menu": "Menu.qml",
+    "barWidget": "BarWidget.qml"
+  },
+  "barWidget": {
+    "displayName": "Omarchy menu",
+    "description": "Launches the Omarchy menu",
+    "category": "Compositor",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/model-usage/Main.qml b/shell/plugins/model-usage/Main.qml
new file mode 100644
index 00000000..2374592c
--- /dev/null
+++ b/shell/plugins/model-usage/Main.qml
@@ -0,0 +1,542 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import "providers"
+
+Item {
+  id: root
+  visible: false
+
+  property var settings: ({})
+
+  Claude {
+    id: claudeProvider
+    enabled: root.providerEnabled("claude")
+    providerSettings: root.settings && root.settings.providers && root.settings.providers.claude ? root.settings.providers.claude : ({})
+    onLastRefreshedAtMsChanged: root.scheduleSync()
+    onReadyChanged: root.scheduleSync()
+  }
+
+  Codex {
+    id: codexProvider
+    enabled: root.providerEnabled("codex")
+    providerSettings: root.settings && root.settings.providers && root.settings.providers.codex ? root.settings.providers.codex : ({})
+    onLastRefreshedAtMsChanged: root.scheduleSync()
+    onReadyChanged: root.scheduleSync()
+  }
+
+  property var providers: [claudeProvider, codexProvider]
+  property var enabledProviders: {
+    var rev = syncRevision
+    var running = syncRunning
+    var result = []
+    if (claudeProvider.enabled) result.push(displayProvider(claudeProvider))
+    if (codexProvider.enabled) result.push(displayProvider(codexProvider))
+    return result
+  }
+
+  property int activeIndex: 0
+  property var activeProvider: enabledProviders.length > 0 ? enabledProviders[Math.min(activeIndex, enabledProviders.length - 1)] : null
+  property bool refreshing: claudeProvider.refreshing || codexProvider.refreshing || syncRunning
+  property double aggregateUpdatedAtMs: aggregateData && aggregateData.updatedAtMs ? Number(aggregateData.updatedAtMs) : 0
+  property double lastRefreshedAtMs: Math.max(aggregateUpdatedAtMs, claudeProvider.lastRefreshedAtMs || 0, codexProvider.lastRefreshedAtMs || 0)
+  property string barDisplayMode: setting("barDisplayMode", "active")
+  property int barCycleIntervalSec: Math.max(1, Number(setting("barCycleIntervalSec", 5)))
+  property string barMetric: setting("barMetric", "prompts")
+  property int refreshIntervalSec: Math.max(30, Number(setting("refreshIntervalSec", 900)))
+
+  property var syncModeSetting: setting("syncMode", setting("syncEnabled", false))
+  property bool syncEnabled: parseSyncEnabled(syncModeSetting)
+  property string syncDir: String(setting("syncDir", ""))
+  property string syncFileName: String(setting("syncFileName", ""))
+  property string syncDeviceId: String(setting("syncDeviceId", ""))
+  readonly property string home: Quickshell.env("HOME") || ""
+  property string detectedHostname: ""
+  readonly property string syncEffectiveDir: expandPath(syncDir)
+  readonly property string syncEffectiveFileName: safeSnapshotFileName(syncFileName, syncDeviceId)
+  readonly property string syncEffectiveDeviceId: safeDeviceId(syncDeviceId || syncEffectiveFileName.replace(/\.json$/i, ""))
+  readonly property string syncSnapshotPath: syncConfigured() ? syncEffectiveDir + "/" + syncEffectiveFileName : home + "/.cache/omarchy/model-usage-disabled.json"
+  property var aggregateData: ({})
+  property int syncRevision: 0
+  property bool syncRunning: false
+  property bool syncRequestedWhileRunning: false
+  property string syncStatusText: ""
+  property int syncDeviceCount: syncConfigured() && aggregateData && aggregateData.deviceCount ? Number(aggregateData.deviceCount) : 0
+
+  onSyncEnabledChanged: syncSettingsChanged()
+  onSyncDirChanged: syncSettingsChanged()
+  onSyncFileNameChanged: if (syncConfigured()) scheduleSync()
+  onSyncDeviceIdChanged: if (syncConfigured()) scheduleSync()
+
+  Component.onCompleted: if (syncConfigured()) scheduleSync()
+
+  function setting(name, fallback) {
+    var value = settings ? settings[name] : undefined
+    return value === undefined || value === null ? fallback : value
+  }
+
+  Timer {
+    interval: root.barCycleIntervalSec * 1000
+    running: root.barDisplayMode === "cycle" && root.enabledProviders.length > 1
+    repeat: true
+    onTriggered: root.activeIndex = (root.activeIndex + 1) % root.enabledProviders.length
+  }
+
+  Timer {
+    interval: root.refreshIntervalSec * 1000
+    running: true
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: root.refreshAll()
+  }
+
+  Timer {
+    id: syncDebounce
+    interval: 1000
+    repeat: false
+    onTriggered: root.runSync()
+  }
+
+  Process {
+    id: syncMkdirProcess
+    running: false
+    onRunningChanged: root.updateSyncRunning()
+    onExited: function(exitCode) {
+      if (exitCode !== 0) {
+        if (root.syncConfigured()) root.syncStatusText = "Usage sync mkdir failed"
+        root.finishSyncRun()
+        return
+      }
+      root.writeSyncSnapshot()
+    }
+  }
+
+  Process {
+    id: syncScanProcess
+    running: false
+    onRunningChanged: root.updateSyncRunning()
+    onExited: function(exitCode) {
+      if (exitCode !== 0 && root.syncConfigured()) root.syncStatusText = "Usage sync scan failed"
+      root.finishSyncRun()
+    }
+
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.parseSyncScanOutput(text)
+    }
+
+    stderr: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: if (text.trim() !== "") console.warn("model-usage/sync", text.trim())
+    }
+  }
+
+  FileView {
+    id: syncSnapshotFile
+    path: root.syncSnapshotPath
+    watchChanges: false
+    atomicWrites: true
+    printErrors: false
+  }
+
+  FileView {
+    id: hostnameFile
+    path: "/etc/hostname"
+    watchChanges: false
+    printErrors: false
+    onLoaded: root.detectedHostname = String(text() || "").trim()
+  }
+
+  onEnabledProvidersChanged: {
+    if (enabledProviders.length === 0 || activeIndex >= enabledProviders.length) activeIndex = 0
+  }
+
+  function providerEnabled(id) {
+    if (!settings || !settings.providers || !settings.providers[id]) return id === "claude" || id === "codex"
+    return settings.providers[id].enabled !== false
+  }
+
+  function parseSyncEnabled(value) {
+    if (value === true) return true
+    var text = String(value || "").trim().toLowerCase()
+    return text === "on" || text === "enabled" || text === "true" || text === "yes" || text === "1"
+  }
+
+  function syncConfigured() {
+    return root.syncEnabled === true && String(root.syncDir || "").trim() !== ""
+  }
+
+  function syncSettingsChanged() {
+    if (syncConfigured()) {
+      scheduleSync()
+    } else {
+      syncDebounce.stop()
+      syncRequestedWhileRunning = false
+      aggregateData = ({})
+      syncStatusText = ""
+      syncRevision++
+    }
+  }
+
+  function updateSyncRunning() {
+    root.syncRunning = syncMkdirProcess.running || syncScanProcess.running
+  }
+
+  function scheduleSync() {
+    if (!syncConfigured()) return
+    syncDebounce.restart()
+  }
+
+  function runSync() {
+    if (!syncConfigured()) return
+    if (root.syncRunning) {
+      syncRequestedWhileRunning = true
+      return
+    }
+
+    syncRequestedWhileRunning = false
+    syncStatusText = ""
+    syncMkdirProcess.command = ["mkdir", "-p", root.syncEffectiveDir]
+    syncMkdirProcess.running = true
+  }
+
+  function writeSyncSnapshot() {
+    if (!syncConfigured()) {
+      finishSyncRun()
+      return
+    }
+    syncSnapshotFile.setText(JSON.stringify(localSnapshot(), null, 2) + "\n")
+    Qt.callLater(root.startSyncScan)
+  }
+
+  function startSyncScan() {
+    if (!syncConfigured()) {
+      finishSyncRun()
+      return
+    }
+    var script = "dir=$0; [[ -d \"$dir\" ]] || exit 0; shopt -s nullglob; for f in \"$dir\"/*.json; do [[ -f \"$f\" ]] || continue; printf '===%s===\\n' \"$f\"; cat \"$f\"; printf '\\n=== EOM ===\\n'; done"
+    syncScanProcess.command = ["bash", "-c", script, root.syncEffectiveDir]
+    syncScanProcess.running = true
+  }
+
+  function finishSyncRun() {
+    if (syncRequestedWhileRunning && syncConfigured()) {
+      syncRequestedWhileRunning = false
+      scheduleSync()
+    }
+  }
+
+  function expandPath(path) {
+    var value = String(path || "").trim()
+    if (value === "") return ""
+    if (value === "~") return home
+    if (value.indexOf("~/") === 0) return home + value.substring(1)
+    if (value.indexOf("$HOME/") === 0) return home + value.substring(5)
+    if (value.charAt(0) !== "/") return home + "/" + value
+    return value
+  }
+
+  function safeDeviceId(raw) {
+    var value = String(raw || "").trim()
+    if (value === "") value = Quickshell.env("HOSTNAME") || root.detectedHostname || Quickshell.env("HOST") || Quickshell.env("USER") || "device"
+    value = value.replace(/[^A-Za-z0-9_.-]+/g, "-").replace(/^[._-]+|[._-]+$/g, "")
+    if (value === "") value = "device"
+    return value.length > 80 ? value.substring(0, 80) : value
+  }
+
+  function safeSnapshotFileName(rawFileName, rawDeviceId) {
+    var value = String(rawFileName || "").trim()
+    if (value === "") value = safeDeviceId(rawDeviceId) + ".json"
+    value = value.split("/").pop().replace(/[^A-Za-z0-9_.-]+/g, "-").replace(/^[._-]+|[._-]+$/g, "")
+    if (value === "") value = safeDeviceId(rawDeviceId) + ".json"
+    if (!/\.json$/i.test(value)) value += ".json"
+    return value.length > 100 ? value.substring(0, 95) + ".json" : value
+  }
+
+  function parseSyncScanOutput(output) {
+    var lines = String(output || "").split("\n")
+    var snapshots = []
+    var currentPath = ""
+    var currentJson = []
+
+    function flush() {
+      if (currentPath === "") return
+      var raw = currentJson.join("\n").trim()
+      try {
+        var parsed = JSON.parse(raw)
+        if (parsed && parsed.providers) snapshots.push(parsed)
+      } catch (e) {
+        console.warn("model-usage/sync", "Ignoring bad snapshot", currentPath, e)
+      }
+      currentPath = ""
+      currentJson = []
+    }
+
+    for (var i = 0; i < lines.length; i++) {
+      var line = lines[i]
+      var start = line.match(/^===(.+)===$/)
+      if (start && line !== "=== EOM ===") {
+        flush()
+        currentPath = start[1]
+        currentJson = []
+        continue
+      }
+      if (line === "=== EOM ===") {
+        flush()
+        continue
+      }
+      if (currentPath !== "") currentJson.push(line)
+    }
+    flush()
+
+    aggregateData = aggregateSnapshots(snapshots)
+    syncStatusText = ""
+    syncRevision++
+  }
+
+  function cloneValue(value, fallback) {
+    if (value === undefined || value === null) return fallback
+    try {
+      return JSON.parse(JSON.stringify(value))
+    } catch (e) {
+      return fallback
+    }
+  }
+
+  function numberValue(value) {
+    var n = Number(value || 0)
+    return isFinite(n) ? Math.round(n) : 0
+  }
+
+  function dateString(date) {
+    var y = date.getFullYear()
+    var m = String(date.getMonth() + 1).padStart(2, "0")
+    var d = String(date.getDate()).padStart(2, "0")
+    return y + "-" + m + "-" + d
+  }
+
+  function recentDateStrings() {
+    var result = []
+    for (var offset = 6; offset >= 0; offset--) {
+      var date = new Date()
+      date.setDate(date.getDate() - offset)
+      result.push(dateString(date))
+    }
+    return result
+  }
+
+  function emptyTokenBucket() {
+    return { inputTokens: 0, outputTokens: 0, cacheReadInputTokens: 0, cacheCreationInputTokens: 0 }
+  }
+
+  function addObjectNumbers(target, source) {
+    if (!source) return
+    for (var key in source) target[key] = numberValue(target[key]) + numberValue(source[key])
+  }
+
+  function aggregateSnapshots(snapshots) {
+    var dates = recentDateStrings()
+    var devices = {}
+    var providers = {}
+
+    function providerAcc(id) {
+      if (providers[id]) return providers[id]
+      var recentByDay = {}
+      for (var d = 0; d < dates.length; d++) recentByDay[dates[d]] = 0
+      providers[id] = {
+        providerId: id,
+        providerName: "",
+        ready: false,
+        hasLocalStats: false,
+        todayPrompts: 0,
+        todaySessions: 0,
+        todayTotalTokens: 0,
+        todayTokensByModel: ({}),
+        recentByDay: recentByDay,
+        totalPrompts: 0,
+        totalSessions: 0,
+        modelUsage: ({}),
+        devices: ({})
+      }
+      return providers[id]
+    }
+
+    for (var i = 0; i < snapshots.length; i++) {
+      var snapshot = snapshots[i]
+      var device = safeDeviceId(snapshot.deviceId || "device")
+      devices[device] = true
+      var snapshotProviders = snapshot.providers || {}
+      for (var providerId in snapshotProviders) {
+        var stats = snapshotProviders[providerId] || {}
+        var acc = providerAcc(String(providerId))
+        acc.devices[device] = true
+        if (stats.providerName && acc.providerName === "") acc.providerName = String(stats.providerName)
+        acc.ready = acc.ready || stats.ready === true
+        acc.hasLocalStats = acc.hasLocalStats || stats.hasLocalStats !== false
+        acc.todayPrompts += numberValue(stats.todayPrompts)
+        acc.todaySessions += numberValue(stats.todaySessions)
+        acc.todayTotalTokens += numberValue(stats.todayTotalTokens)
+        acc.totalPrompts += numberValue(stats.totalPrompts)
+        acc.totalSessions += numberValue(stats.totalSessions)
+        addObjectNumbers(acc.todayTokensByModel, stats.todayTokensByModel || {})
+
+        var recent = Array.isArray(stats.recentDays) ? stats.recentDays : []
+        for (var r = 0; r < recent.length; r++) {
+          var day = recent[r] || {}
+          var date = String(day.date || "")
+          if (acc.recentByDay[date] !== undefined) acc.recentByDay[date] += numberValue(day.messageCount)
+        }
+
+        var usage = stats.modelUsage || {}
+        for (var modelId in usage) {
+          var bucket = acc.modelUsage[modelId]
+          if (!bucket) bucket = acc.modelUsage[modelId] = emptyTokenBucket()
+          var source = usage[modelId] || {}
+          bucket.inputTokens += numberValue(source.inputTokens)
+          bucket.outputTokens += numberValue(source.outputTokens)
+          bucket.cacheReadInputTokens += numberValue(source.cacheReadInputTokens)
+          bucket.cacheCreationInputTokens += numberValue(source.cacheCreationInputTokens)
+        }
+      }
+    }
+
+    var outProviders = {}
+    for (var id in providers) {
+      var acc = providers[id]
+      var recentDays = []
+      for (var di = 0; di < dates.length; di++) recentDays.push({ date: dates[di], messageCount: acc.recentByDay[dates[di]] || 0 })
+      var providerDevices = Object.keys(acc.devices).sort()
+      outProviders[id] = {
+        providerId: acc.providerId,
+        providerName: acc.providerName,
+        ready: acc.ready || providerDevices.length > 0,
+        hasLocalStats: acc.hasLocalStats,
+        todayPrompts: acc.todayPrompts,
+        todaySessions: acc.todaySessions,
+        todayTotalTokens: acc.todayTotalTokens,
+        todayTokensByModel: acc.todayTokensByModel,
+        recentDays: recentDays,
+        totalPrompts: acc.totalPrompts,
+        totalSessions: acc.totalSessions,
+        modelUsage: acc.modelUsage,
+        deviceCount: providerDevices.length,
+        devices: providerDevices
+      }
+    }
+
+    return {
+      schemaVersion: 1,
+      updatedAt: new Date().toISOString(),
+      updatedAtMs: Date.now(),
+      deviceCount: Object.keys(devices).length,
+      devices: Object.keys(devices).sort(),
+      providers: outProviders
+    }
+  }
+
+  function providerSnapshot(provider) {
+    return {
+      providerId: provider.providerId,
+      providerName: provider.providerName,
+      ready: provider.ready === true,
+      hasLocalStats: provider.hasLocalStats !== false,
+      todayPrompts: numberValue(provider.todayPrompts),
+      todaySessions: numberValue(provider.todaySessions),
+      todayTotalTokens: numberValue(provider.todayTotalTokens),
+      todayTokensByModel: cloneValue(provider.todayTokensByModel, ({})),
+      recentDays: cloneValue(provider.recentDays, []),
+      totalPrompts: numberValue(provider.totalPrompts),
+      totalSessions: numberValue(provider.totalSessions),
+      modelUsage: cloneValue(provider.modelUsage, ({}))
+    }
+  }
+
+  function localSnapshot() {
+    var providerMap = {}
+    for (var i = 0; i < providers.length; i++) {
+      var provider = providers[i]
+      if (provider.enabled) providerMap[provider.providerId] = providerSnapshot(provider)
+    }
+    return {
+      schemaVersion: 1,
+      deviceId: syncEffectiveDeviceId,
+      updatedAt: new Date().toISOString(),
+      providers: providerMap
+    }
+  }
+
+  function syncedStatsFor(providerId) {
+    var rev = syncRevision
+    if (!syncConfigured() || !aggregateData || !aggregateData.providers) return null
+    return aggregateData.providers[providerId] || null
+  }
+
+  function displayProvider(provider) {
+    var stats = syncedStatsFor(provider.providerId)
+    var synced = !!stats
+    var deviceCount = synced ? Number(stats.deviceCount || aggregateData.deviceCount || 0) : 0
+
+    return {
+      providerId: provider.providerId,
+      providerName: provider.providerName,
+      providerIcon: provider.providerIcon,
+      enabled: provider.enabled,
+      ready: provider.ready || synced,
+      refreshing: provider.refreshing || root.syncRunning,
+      lastRefreshedAtMs: Math.max(provider.lastRefreshedAtMs || 0, root.aggregateUpdatedAtMs || 0),
+      usageStatusText: provider.usageStatusText,
+      authHelpText: provider.authHelpText,
+
+      rateLimitPercent: provider.rateLimitPercent,
+      rateLimitLabel: provider.rateLimitLabel,
+      rateLimitResetAt: provider.rateLimitResetAt,
+      secondaryRateLimitPercent: provider.secondaryRateLimitPercent,
+      secondaryRateLimitLabel: provider.secondaryRateLimitLabel,
+      secondaryRateLimitResetAt: provider.secondaryRateLimitResetAt,
+      tierLabel: provider.tierLabel,
+
+      todayPrompts: synced ? numberValue(stats.todayPrompts) : provider.todayPrompts,
+      todaySessions: synced ? numberValue(stats.todaySessions) : provider.todaySessions,
+      todayTotalTokens: synced ? numberValue(stats.todayTotalTokens) : provider.todayTotalTokens,
+      todayTokensByModel: synced ? (stats.todayTokensByModel || ({})) : provider.todayTokensByModel,
+      recentDays: synced ? (stats.recentDays || []) : provider.recentDays,
+      totalPrompts: synced ? numberValue(stats.totalPrompts) : provider.totalPrompts,
+      totalSessions: synced ? numberValue(stats.totalSessions) : provider.totalSessions,
+      modelUsage: synced ? (stats.modelUsage || ({})) : provider.modelUsage,
+      hasLocalStats: synced ? (stats.hasLocalStats !== false) : provider.hasLocalStats,
+
+      syncEnabled: synced,
+      syncDeviceCount: deviceCount,
+      syncUpdatedAt: aggregateData && aggregateData.updatedAt ? aggregateData.updatedAt : "",
+
+      formatResetTime: function(isoTimestamp) { return provider.formatResetTime(isoTimestamp) }
+    }
+  }
+
+  function refresh() { refreshAll(true) }
+
+  function refreshAll(force) {
+    for (var i = 0; i < providers.length; i++) {
+      var p = providers[i]
+      if (p.enabled && typeof p.refresh === "function") p.refresh(force === true)
+    }
+    scheduleSync()
+  }
+
+  function formatTokenCount(n) {
+    if (n === undefined || n === null) return "0"
+    if (n >= 1e9) return (n / 1e9).toFixed(1) + "B"
+    if (n >= 1e6) return (n / 1e6).toFixed(1) + "M"
+    if (n >= 1e3) return (n / 1e3).toFixed(1) + "K"
+    return String(n)
+  }
+
+  function friendlyModelName(id) {
+    if (!id) return "Unknown"
+    var name = String(id).replace(/^claude-/, "").replace(/-\d{8}$/, "")
+    var parts = name.split("-")
+    if (parts.length >= 3) return parts[0].charAt(0).toUpperCase() + parts[0].slice(1) + " " + parts[1] + "." + parts[2]
+    if (parts.length === 2) return parts[0].charAt(0).toUpperCase() + parts[0].slice(1) + " " + parts[1]
+    return name.charAt(0).toUpperCase() + name.slice(1)
+  }
+}
diff --git a/shell/plugins/model-usage/Widget.qml b/shell/plugins/model-usage/Widget.qml
new file mode 100644
index 00000000..8dbb7366
--- /dev/null
+++ b/shell/plugins/model-usage/Widget.qml
@@ -0,0 +1,1190 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.model-usage"
+
+  property bool popupOpen: false
+  property bool settingsMode: false
+  property var draftSettings: ({})
+  property string settingsStatusText: ""
+  property int selectedTabIndex: 0
+  property bool refreshFlash: false
+
+  readonly property color foreground: bar ? bar.foreground : Color.foreground
+  readonly property color background: Color.popups.background
+  readonly property color border: Color.popups.border
+  readonly property color urgent: bar ? bar.urgent : Color.urgent
+  readonly property color dim: Qt.darker(foreground, 1.45)
+  readonly property color card: Qt.rgba(foreground.r, foreground.g, foreground.b, 0.055)
+  readonly property color cardHover: Qt.rgba(foreground.r, foreground.g, foreground.b, 0.085)
+  readonly property color outline: Qt.rgba(foreground.r, foreground.g, foreground.b, 0.18)
+  readonly property color track: Qt.rgba(foreground.r, foreground.g, foreground.b, 0.24)
+  readonly property string fontFamily: bar ? bar.fontFamily : "JetBrainsMono Nerd Font"
+
+  readonly property var providers: usageMain.enabledProviders
+  readonly property var selectedProvider: providers.length > 0 ? providers[Math.min(selectedTabIndex, providers.length - 1)] : null
+
+  function close() {
+    popupOpen = false
+    settingsMode = false
+  }
+
+  function triggerPress(button) {
+    root.handleChipPress(Math.max(0, Math.min(selectedTabIndex, providers.length - 1)), button, null)
+  }
+
+  function triggerRefresh() {
+    refreshFlash = true
+    refreshFlashTimer.restart()
+    usageMain.refreshAll(true)
+  }
+
+  function clamp(v, lo, hi) { return Math.max(lo, Math.min(hi, v)) }
+  function alpha(c, a) { return Qt.rgba(c.r, c.g, c.b, a) }
+
+  function cloneObject(value, fallback) {
+    if (value === undefined || value === null) return fallback
+    try {
+      return JSON.parse(JSON.stringify(value))
+    } catch (e) {
+      return fallback
+    }
+  }
+
+  function defaultSettings() {
+    return {
+      providers: {
+        claude: {
+          enabled: true,
+          statsPath: "~/.claude/stats-cache.json",
+          credentialsPath: "~/.claude/.credentials.json",
+          projectsPath: "~/.claude/projects"
+        },
+        codex: { enabled: true }
+      },
+      refreshIntervalSec: 900,
+      syncMode: "Off",
+      syncDir: "",
+      syncFileName: "",
+      syncDeviceId: ""
+    }
+  }
+
+  function parseSyncEnabledValue(value) {
+    if (value === true) return true
+    var text = String(value || "").trim().toLowerCase()
+    return text === "on" || text === "enabled" || text === "true" || text === "yes" || text === "1"
+  }
+
+  function normalizedSettings(source) {
+    var defaults = defaultSettings()
+    var next = cloneObject(source, {}) || {}
+    if (!next.providers || typeof next.providers !== "object") next.providers = {}
+
+    var claude = cloneObject(next.providers.claude, {}) || {}
+    var codex = cloneObject(next.providers.codex, {}) || {}
+    if (claude.enabled === undefined || claude.enabled === null) claude.enabled = defaults.providers.claude.enabled
+    if (codex.enabled === undefined || codex.enabled === null) codex.enabled = defaults.providers.codex.enabled
+    if (!claude.statsPath) claude.statsPath = defaults.providers.claude.statsPath
+    if (!claude.credentialsPath) claude.credentialsPath = defaults.providers.claude.credentialsPath
+    if (!claude.projectsPath) claude.projectsPath = defaults.providers.claude.projectsPath
+    next.providers.claude = claude
+    next.providers.codex = codex
+
+    var refresh = Number(next.refreshIntervalSec === undefined || next.refreshIntervalSec === null ? defaults.refreshIntervalSec : next.refreshIntervalSec)
+    next.refreshIntervalSec = Math.round(clamp(isFinite(refresh) ? refresh : defaults.refreshIntervalSec, 30, 3600))
+    next.syncMode = parseSyncEnabledValue(next.syncMode !== undefined ? next.syncMode : next.syncEnabled) ? "On" : "Off"
+    next.syncDir = String(next.syncDir || "")
+    next.syncFileName = String(next.syncFileName || "")
+    next.syncDeviceId = String(next.syncDeviceId || "")
+    return next
+  }
+
+  function draftValue(name, fallback) {
+    var value = draftSettings ? draftSettings[name] : undefined
+    return value === undefined || value === null ? fallback : value
+  }
+
+  function draftProviderValue(providerId, name, fallback) {
+    var provider = draftSettings && draftSettings.providers ? draftSettings.providers[providerId] : null
+    var value = provider ? provider[name] : undefined
+    return value === undefined || value === null ? fallback : value
+  }
+
+  function setDraftValue(name, value) {
+    var next = normalizedSettings(draftSettings)
+    next[name] = value
+    draftSettings = next
+  }
+
+  function setDraftProviderValue(providerId, name, value) {
+    var next = normalizedSettings(draftSettings)
+    if (!next.providers) next.providers = {}
+    if (!next.providers[providerId]) next.providers[providerId] = {}
+    next.providers[providerId][name] = value
+    draftSettings = next
+  }
+
+  function openSettings() {
+    draftSettings = normalizedSettings(settings)
+    settingsStatusText = ""
+    settingsMode = true
+    popupOpen = true
+    Qt.callLater(function() { if (keyCatcher) keyCatcher.forceActiveFocus() })
+  }
+
+  function showUsage() {
+    settingsMode = false
+    settingsStatusText = ""
+    Qt.callLater(function() { if (keyCatcher) keyCatcher.forceActiveFocus() })
+  }
+
+  function canPersistSettings() {
+    return !!(bar && bar.shell && typeof bar.shell.updateEntryInline === "function")
+  }
+
+  function saveSettings() {
+    var next = normalizedSettings(draftSettings)
+    draftSettings = next
+    root.settings = next
+    if (canPersistSettings()) {
+      bar.shell.updateEntryInline(root.moduleName, next)
+      settingsStatusText = "Saved to shell.json"
+    } else {
+      settingsStatusText = "Saved for this session"
+    }
+    usageMain.refreshAll(true)
+  }
+
+  function iconSourceForProvider(provider) {
+    if (!provider) return ""
+    if (provider.providerId === "claude") return Qt.resolvedUrl("assets/claude.svg")
+    if (provider.providerId === "codex") return Qt.resolvedUrl("assets/codex.svg")
+    return ""
+  }
+
+  function usagePercent(provider) {
+    if (!provider) return -1
+    var values = []
+    if (provider.rateLimitPercent >= 0) values.push(provider.rateLimitPercent)
+    if (provider.secondaryRateLimitPercent >= 0) values.push(provider.secondaryRateLimitPercent)
+    if (values.length === 0) return -1
+    return Math.max.apply(Math, values)
+  }
+
+  function formatUsagePercent(provider) {
+    var pct = usagePercent(provider)
+    return pct < 0 ? "—" : Math.round(pct * 100) + "%"
+  }
+
+  function weeklyUsage(provider) {
+    if (!provider) return ({ percent: -1, resetAt: "", label: "" })
+    if (String(provider.rateLimitLabel || "").toLowerCase().indexOf("week") >= 0)
+      return { percent: provider.rateLimitPercent, resetAt: provider.rateLimitResetAt, label: provider.rateLimitLabel }
+    if (String(provider.secondaryRateLimitLabel || "").toLowerCase().indexOf("week") >= 0)
+      return { percent: provider.secondaryRateLimitPercent, resetAt: provider.secondaryRateLimitResetAt, label: provider.secondaryRateLimitLabel }
+    return ({ percent: -1, resetAt: "", label: "" })
+  }
+
+  function paceInfo(provider) {
+    var weekly = weeklyUsage(provider)
+    if (weekly.percent < 0 || !weekly.resetAt) return ({ text: "", detail: "", deficit: false })
+    var reset = new Date(weekly.resetAt).getTime()
+    var now = Date.now()
+    var period = 7 * 24 * 60 * 60 * 1000
+    var remaining = reset - now
+    if (remaining <= 0 || remaining > period) return ({ text: "", detail: "", deficit: false })
+    var elapsed = period - remaining
+    var expected = root.clamp(elapsed / period, 0, 1)
+    var used = root.clamp(weekly.percent, 0, 1)
+    var diff = used - expected
+    var abs = Math.abs(diff)
+    var label = abs <= 0.02 ? "On pace" : (diff > 0 ? Math.round(abs * 100) + "% in deficit" : Math.round(abs * 100) + "% in reserve")
+    var projection = "Lasts until reset"
+    if (used > 0 && elapsed > 0) {
+      var eta = elapsed / used * (1 - used)
+      if (eta < remaining) projection = "Runs out in " + provider.formatResetTime(new Date(now + eta).toISOString())
+    }
+    return ({ text: label, detail: "Expected " + Math.round(expected * 100) + "% used · " + projection, deficit: diff > 0 && abs > 0.02 })
+  }
+
+  function tooltipText() {
+    if (providers.length === 0) return "Model Usage"
+    var lines = ["Model Usage"]
+    for (var i = 0; i < providers.length; i++) {
+      var provider = providers[i]
+      var line = provider.providerName + ": " + formatUsagePercent(provider) + " used"
+      var pace = paceInfo(provider)
+      if (pace.text !== "") line += " · " + pace.text
+      if (provider.syncEnabled && provider.syncDeviceCount > 1) line += " · " + provider.syncDeviceCount + " devices"
+      lines.push(line)
+    }
+    return lines.join("\n")
+  }
+
+  function syncSummary(provider) {
+    if (usageMain.syncStatusText !== "") return usageMain.syncStatusText
+    if (!provider || !provider.syncEnabled) return ""
+    var count = Number(provider.syncDeviceCount || 0)
+    if (count <= 0) return "Synced usage"
+    return "Synced from " + count + " device" + (count === 1 ? "" : "s")
+  }
+
+  function selectTab(index) {
+    if (providers.length === 0) {
+      selectedTabIndex = 0
+      return
+    }
+    selectedTabIndex = ((index % providers.length) + providers.length) % providers.length
+  }
+
+  function handleChipPress(index, button, target) {
+    if (root.bar && target) root.bar.hideTooltip(target)
+    if (button === Qt.RightButton) {
+      root.openSettings()
+      return
+    }
+    if (button === Qt.MiddleButton) {
+      root.triggerRefresh()
+      return
+    }
+
+    var wasOpen = root.popupOpen
+    var wasSelected = root.selectedTabIndex === index && !root.settingsMode
+    root.showUsage()
+    root.selectTab(index)
+    if (wasOpen && wasSelected) root.popupOpen = false
+    else {
+      root.popupOpen = true
+      root.triggerRefresh()
+    }
+  }
+
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  onPopupOpenChanged: {
+    if (popupOpen) {
+      usageMain.refreshAll()
+      Qt.callLater(function() { if (keyCatcher) keyCatcher.forceActiveFocus() })
+    }
+  }
+
+  onProvidersChanged: if (selectedTabIndex >= providers.length) selectTab(0)
+
+  Main {
+    id: usageMain
+    settings: root.settings
+  }
+
+  Timer {
+    id: refreshFlashTimer
+    interval: 900
+    repeat: false
+    onTriggered: root.refreshFlash = false
+  }
+
+  IpcHandler {
+    target: "omarchy.model-usage"
+    function open(): string { root.showUsage(); root.popupOpen = true; return "ok" }
+    function close(): string { root.close(); return "ok" }
+    function toggle(): string {
+      if (root.popupOpen) root.close()
+      else { root.showUsage(); root.popupOpen = true }
+      return "ok"
+    }
+    function refresh(): string { root.triggerRefresh(); return "ok" }
+    function settings(): string { root.openSettings(); return "ok" }
+    function openSettings(): string { root.openSettings(); return "ok" }
+  }
+
+  Item {
+    id: button
+    anchors.fill: parent
+    implicitWidth: barRow.implicitWidth + 10
+    implicitHeight: root.bar ? root.bar.barSize : 26
+
+    Row {
+      id: barRow
+      anchors.centerIn: parent
+      spacing: 8
+
+      Repeater {
+        model: providers
+
+        Item {
+          id: chip
+          required property var modelData
+          required property int index
+          readonly property real pct: root.usagePercent(modelData)
+          readonly property bool tooltipHovered: mouseArea.containsMouse
+
+          width: chipRow.implicitWidth
+          height: root.bar ? root.bar.barSize : 26
+
+          Row {
+            id: chipRow
+            anchors.centerIn: parent
+            spacing: 4
+
+            Image {
+              id: chipIcon
+              source: root.iconSourceForProvider(chip.modelData)
+              width: 13
+              height: 13
+              sourceSize.width: 13
+              sourceSize.height: 13
+              fillMode: Image.PreserveAspectFit
+              anchors.verticalCenter: parent.verticalCenter
+              opacity: chip.pct >= 0.9 ? 0.75 : 1
+            }
+
+            Text {
+              text: root.formatUsagePercent(chip.modelData)
+              color: chip.pct >= 0.9 ? urgent : foreground
+              font.family: fontFamily
+              font.pixelSize: 10
+              font.bold: chip.pct >= 0.9
+              anchors.verticalCenter: parent.verticalCenter
+            }
+          }
+
+          property var registeredBar: null
+
+          function triggerPress(button) {
+            root.handleChipPress(chip.index, button, chip)
+          }
+
+          function syncClickRegistration() {
+            if (registeredBar && registeredBar.unregisterClickTarget) registeredBar.unregisterClickTarget(chip)
+            registeredBar = root.bar
+            if (registeredBar && registeredBar.registerClickTarget) registeredBar.registerClickTarget(chip)
+          }
+
+          Component.onCompleted: syncClickRegistration()
+          Component.onDestruction: if (registeredBar && registeredBar.unregisterClickTarget) registeredBar.unregisterClickTarget(chip)
+
+          Connections {
+            target: root
+            function onBarChanged() { chip.syncClickRegistration() }
+          }
+
+          MouseArea {
+            id: mouseArea
+            anchors.fill: parent
+            acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
+            onEntered: if (root.bar) root.bar.showTooltip(chip, root.tooltipText())
+            onExited: if (root.bar) root.bar.hideTooltip(chip)
+            onClicked: function(mouse) { root.handleChipPress(chip.index, mouse.button, chip) }
+          }
+        }
+      }
+
+      Item {
+        id: emptyChip
+        visible: providers.length === 0
+        width: emptyLabel.implicitWidth
+        height: root.bar ? root.bar.barSize : 26
+        readonly property bool tooltipHovered: emptyMouse.containsMouse
+        property var registeredBar: null
+
+        function triggerPress(button) {
+          root.handleChipPress(0, button, emptyChip)
+        }
+
+        function syncClickRegistration() {
+          if (registeredBar && registeredBar.unregisterClickTarget) registeredBar.unregisterClickTarget(emptyChip)
+          registeredBar = root.bar
+          if (registeredBar && registeredBar.registerClickTarget) registeredBar.registerClickTarget(emptyChip)
+        }
+
+        Component.onCompleted: syncClickRegistration()
+        Component.onDestruction: if (registeredBar && registeredBar.unregisterClickTarget) registeredBar.unregisterClickTarget(emptyChip)
+
+        Connections {
+          target: root
+          function onBarChanged() { emptyChip.syncClickRegistration() }
+        }
+
+        Text {
+          id: emptyLabel
+          anchors.centerIn: parent
+          text: "AI"
+          color: dim
+          font.family: fontFamily
+          font.pixelSize: 10
+          font.bold: true
+        }
+
+        MouseArea {
+          id: emptyMouse
+          anchors.fill: parent
+          acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
+          hoverEnabled: true
+          cursorShape: Qt.PointingHandCursor
+          onEntered: if (root.bar) root.bar.showTooltip(emptyChip, "Model Usage")
+          onExited: if (root.bar) root.bar.hideTooltip(emptyChip)
+          onClicked: function(mouse) { root.handleChipPress(0, mouse.button, emptyChip) }
+        }
+      }
+    }
+  }
+
+  KeyboardPanel {
+    id: panel
+    anchorItem: button
+    owner: root
+    bar: root.bar
+    open: root.popupOpen
+    focusTarget: keyCatcher
+    contentWidth: panel.fittedContentWidth(Style.space(370))
+    contentHeight: panel.fittedContentHeight(contentColumn.implicitHeight, Style.space(560))
+
+    PanelKeyCatcher {
+      id: keyCatcher
+      anchors.fill: parent
+      blocked: root.settingsMode && settingsContent.editorActive
+
+      onMoveRequested: function(dx, dy) {
+        if (root.settingsMode) {
+          if (dy !== 0) flick.contentY = root.clamp(flick.contentY + dy * 56, 0, Math.max(0, flick.contentHeight - flick.height))
+          return
+        }
+        if (dx !== 0) root.selectTab(root.selectedTabIndex + dx)
+        if (dy !== 0) flick.contentY = root.clamp(flick.contentY + dy * 56, 0, Math.max(0, flick.contentHeight - flick.height))
+      }
+      onCloseRequested: root.close()
+      onTextKey: function(t) {
+        if (t === "r" || t === "R") root.triggerRefresh()
+        if (t === "s" || t === "S") root.settingsMode ? root.saveSettings() : root.openSettings()
+      }
+
+      ColumnLayout {
+        anchors.fill: parent
+        spacing: 10
+
+        Header {
+          visible: !root.settingsMode && !!root.selectedProvider
+          provider: root.selectedProvider
+        }
+
+        SettingsHeader { visible: root.settingsMode }
+
+        PanelSeparator {
+          Layout.fillWidth: true
+          foreground: root.foreground
+        }
+
+        Item {
+          visible: !root.settingsMode && providers.length > 1
+          Layout.fillWidth: true
+          Layout.preferredHeight: 30
+
+          Row {
+            anchors.fill: parent
+            spacing: 6
+
+            Repeater {
+              model: providers
+
+              Button {
+                required property var modelData
+                required property int index
+                width: (parent.width - parent.spacing * Math.max(0, providers.length - 1)) / Math.max(1, providers.length)
+                height: parent.height
+                text: modelData.providerName
+                foreground: root.foreground
+                tooltipBackground: root.background
+                tooltipForeground: root.foreground
+                fontFamily: root.fontFamily
+                fontSize: 11
+                horizontalPadding: 8
+                verticalPadding: 5
+                active: index === root.selectedTabIndex
+                hasCursor: index === root.selectedTabIndex
+                onClicked: {
+                  root.selectTab(index)
+                  keyCatcher.forceActiveFocus()
+                }
+              }
+            }
+          }
+        }
+
+        Flickable {
+          id: flick
+          Layout.fillWidth: true
+          Layout.fillHeight: true
+          contentWidth: width
+          contentHeight: contentColumn.implicitHeight
+          clip: true
+          boundsBehavior: Flickable.StopAtBounds
+          flickableDirection: Flickable.VerticalFlick
+          ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
+
+          ColumnLayout {
+            id: contentColumn
+            width: flick.width
+            spacing: 10
+
+            Text {
+              visible: !root.settingsMode && !root.selectedProvider
+              Layout.fillWidth: true
+              Layout.topMargin: 24
+              text: "No providers enabled. Open Settings to enable Claude or Codex."
+              color: dim
+              font.family: fontFamily
+              font.pixelSize: 11
+              horizontalAlignment: Text.AlignHCenter
+            }
+
+            StatusCard { provider: root.settingsMode ? null : root.selectedProvider }
+            RateLimitCard { provider: root.settingsMode ? null : root.selectedProvider }
+            TodayCard { provider: root.settingsMode ? null : root.selectedProvider }
+            WeekCard { provider: root.settingsMode ? null : root.selectedProvider }
+            AllTimeCard { provider: root.settingsMode ? null : root.selectedProvider }
+
+            UsageFooter { visible: !root.settingsMode }
+            SettingsContent {
+              id: settingsContent
+              visible: root.settingsMode
+            }
+          }
+        }
+      }
+    }
+  }
+
+  component SettingsHeader: RowLayout {
+    Layout.fillWidth: true
+    spacing: 8
+
+    Text {
+      text: "Model Usage Settings"
+      color: foreground
+      font.family: fontFamily
+      font.pixelSize: 15
+      font.bold: true
+      Layout.fillWidth: true
+      Layout.alignment: Qt.AlignVCenter
+    }
+
+    Button {
+      text: "Usage"
+      foreground: root.foreground
+      tooltipText: "Back to usage"
+      tooltipBackground: root.background
+      tooltipForeground: root.foreground
+      fontFamily: root.fontFamily
+      fontSize: 10
+      horizontalPadding: 8
+      verticalPadding: 4
+      onClicked: root.showUsage()
+    }
+
+    Button {
+      text: "Save"
+      foreground: root.foreground
+      tooltipText: "Save settings"
+      tooltipBackground: root.background
+      tooltipForeground: root.foreground
+      fontFamily: root.fontFamily
+      fontSize: 10
+      horizontalPadding: 8
+      verticalPadding: 4
+      active: true
+      onClicked: root.saveSettings()
+    }
+  }
+
+  component UsageFooter: RowLayout {
+    Layout.fillWidth: true
+    spacing: 8
+
+    Text {
+      Layout.fillWidth: true
+      text: {
+        var sync = root.syncSummary(root.selectedProvider)
+        return (sync !== "" ? sync + " · " : "") + "←/→ switch · j/k scroll · r refresh · s/settings · esc close"
+      }
+      color: dim
+      font.family: fontFamily
+      font.pixelSize: 10
+      horizontalAlignment: Text.AlignHCenter
+      wrapMode: Text.WordWrap
+    }
+
+  }
+
+  component SettingsContent: ColumnLayout {
+    id: settingsRoot
+    Layout.fillWidth: true
+    spacing: 10
+
+    readonly property bool syncOn: root.draftValue("syncMode", "Off") === "On"
+    readonly property bool claudeOn: root.draftProviderValue("claude", "enabled", true) !== false
+    readonly property bool editorActive: refreshIntervalField.field.activeFocus
+      || claudeStatsField.activeFocus
+      || claudeCredentialsField.activeFocus
+      || claudeProjectsField.activeFocus
+      || syncDirField.activeFocus
+      || syncFileNameField.activeFocus
+      || syncDeviceIdField.activeFocus
+
+    SectionCard {
+      title: "Providers"
+
+      ColumnLayout {
+        width: parent.width
+        spacing: 10
+
+        Toggle {
+          Layout.fillWidth: true
+          label: "Claude Code"
+          description: checked ? "Show Claude Code usage and rate-limit status" : "Hidden from the bar widget"
+          checked: root.draftProviderValue("claude", "enabled", true) !== false
+          foreground: root.foreground
+          accent: Color.accent
+          fontFamily: root.fontFamily
+          onClicked: root.setDraftProviderValue("claude", "enabled", !checked)
+        }
+
+        ColumnLayout {
+          Layout.fillWidth: true
+          spacing: 6
+          enabled: settingsRoot.claudeOn
+          opacity: enabled ? 1.0 : 0.45
+
+          FieldLabel { text: "Claude stats cache" }
+          TextField {
+            id: claudeStatsField
+            Layout.fillWidth: true
+            text: String(root.draftProviderValue("claude", "statsPath", "~/.claude/stats-cache.json"))
+            placeholderText: "~/.claude/stats-cache.json"
+            foreground: root.foreground
+            onTextChanged: if (text !== root.draftProviderValue("claude", "statsPath", "")) root.setDraftProviderValue("claude", "statsPath", text)
+          }
+
+          FieldLabel { text: "Claude credentials" }
+          TextField {
+            id: claudeCredentialsField
+            Layout.fillWidth: true
+            text: String(root.draftProviderValue("claude", "credentialsPath", "~/.claude/.credentials.json"))
+            placeholderText: "~/.claude/.credentials.json"
+            foreground: root.foreground
+            onTextChanged: if (text !== root.draftProviderValue("claude", "credentialsPath", "")) root.setDraftProviderValue("claude", "credentialsPath", text)
+          }
+
+          FieldLabel { text: "Claude projects folder" }
+          TextField {
+            id: claudeProjectsField
+            Layout.fillWidth: true
+            text: String(root.draftProviderValue("claude", "projectsPath", "~/.claude/projects"))
+            placeholderText: "~/.claude/projects"
+            foreground: root.foreground
+            onTextChanged: if (text !== root.draftProviderValue("claude", "projectsPath", "")) root.setDraftProviderValue("claude", "projectsPath", text)
+          }
+        }
+
+        Toggle {
+          Layout.fillWidth: true
+          label: "Codex"
+          description: checked ? "Show Codex usage and limits" : "Hidden from the bar widget"
+          checked: root.draftProviderValue("codex", "enabled", true) !== false
+          foreground: root.foreground
+          accent: Color.accent
+          fontFamily: root.fontFamily
+          onClicked: root.setDraftProviderValue("codex", "enabled", !checked)
+        }
+      }
+    }
+
+    SectionCard {
+      title: "Refresh"
+
+      ColumnLayout {
+        width: parent.width
+        spacing: 8
+
+        NumberField {
+          id: refreshIntervalField
+          label: "Refresh interval (seconds)"
+          value: Number(root.draftValue("refreshIntervalSec", 900))
+          from: 30
+          to: 3600
+          stepSize: 30
+          fieldWidth: parent.width
+          foreground: root.foreground
+          accent: Color.accent
+          fontFamily: root.fontFamily
+          onModified: function(value) { root.setDraftValue("refreshIntervalSec", value) }
+        }
+
+        Text {
+          Layout.fillWidth: true
+          text: "How often the widget refreshes local usage scans and sync snapshots."
+          color: dim
+          font.family: fontFamily
+          font.pixelSize: 10
+          wrapMode: Text.WordWrap
+        }
+      }
+    }
+
+    SectionCard {
+      title: "Synced aggregation"
+
+      ColumnLayout {
+        width: parent.width
+        spacing: 10
+
+        Toggle {
+          Layout.fillWidth: true
+          label: "Aggregate across devices"
+          description: checked ? "Write this machine's snapshot and merge every *.json file in the sync folder" : "Only show this machine's local usage"
+          checked: settingsRoot.syncOn
+          foreground: root.foreground
+          accent: Color.accent
+          fontFamily: root.fontFamily
+          onClicked: root.setDraftValue("syncMode", checked ? "Off" : "On")
+        }
+
+        ColumnLayout {
+          Layout.fillWidth: true
+          spacing: 6
+          enabled: settingsRoot.syncOn
+          opacity: enabled ? 1.0 : 0.45
+
+          FieldLabel { text: "Sync folder" }
+          TextField {
+            id: syncDirField
+            Layout.fillWidth: true
+            text: String(root.draftValue("syncDir", ""))
+            placeholderText: "~/Sync/model-usage"
+            foreground: root.foreground
+            onTextChanged: if (text !== root.draftValue("syncDir", "")) root.setDraftValue("syncDir", text)
+          }
+
+          FieldLabel { text: "Snapshot file name" }
+          TextField {
+            id: syncFileNameField
+            Layout.fillWidth: true
+            text: String(root.draftValue("syncFileName", ""))
+            placeholderText: "Defaults to <hostname>.json"
+            foreground: root.foreground
+            onTextChanged: if (text !== root.draftValue("syncFileName", "")) root.setDraftValue("syncFileName", text)
+          }
+
+          FieldLabel { text: "Device id" }
+          TextField {
+            id: syncDeviceIdField
+            Layout.fillWidth: true
+            text: String(root.draftValue("syncDeviceId", ""))
+            placeholderText: "Optional stable name for this machine"
+            foreground: root.foreground
+            onTextChanged: if (text !== root.draftValue("syncDeviceId", "")) root.setDraftValue("syncDeviceId", text)
+          }
+        }
+      }
+    }
+
+    Text {
+      visible: root.settingsStatusText !== ""
+      Layout.fillWidth: true
+      text: root.settingsStatusText
+      color: dim
+      font.family: fontFamily
+      font.pixelSize: 10
+      horizontalAlignment: Text.AlignHCenter
+    }
+
+    Text {
+      Layout.fillWidth: true
+      text: "s saves · esc closes"
+      color: dim
+      font.family: fontFamily
+      font.pixelSize: 10
+      horizontalAlignment: Text.AlignHCenter
+    }
+  }
+
+  component FieldLabel: Text {
+    color: dim
+    font.family: fontFamily
+    font.pixelSize: 10
+    font.bold: true
+  }
+
+  component Header: RowLayout {
+    property var provider: null
+    visible: !!provider
+    Layout.fillWidth: true
+    spacing: 8
+
+    Image {
+      source: root.iconSourceForProvider(provider)
+      Layout.preferredWidth: 16
+      Layout.preferredHeight: 16
+      sourceSize.width: 16
+      sourceSize.height: 16
+      fillMode: Image.PreserveAspectFit
+      Layout.alignment: Qt.AlignVCenter
+    }
+
+    Text {
+      text: provider ? provider.providerName + " Usage" : ""
+      color: foreground
+      font.family: fontFamily
+      font.pixelSize: 15
+      font.bold: true
+      Layout.fillWidth: true
+      Layout.alignment: Qt.AlignVCenter
+    }
+
+    Button {
+      visible: provider && String(provider.tierLabel || "") !== ""
+      text: provider ? provider.tierLabel : ""
+      foreground: root.foreground
+      tooltipBackground: root.background
+      tooltipForeground: root.foreground
+      fontFamily: root.fontFamily
+      fontSize: 10
+      horizontalPadding: 6
+      verticalPadding: 3
+      active: true
+      enabled: false
+    }
+
+    Button {
+      text: (root.refreshFlash || usageMain.refreshing) ? "Refreshing…" : "Refresh"
+      foreground: root.foreground
+      tooltipText: (root.refreshFlash || usageMain.refreshing) ? "Refreshing usage…" : "Refresh usage"
+      tooltipBackground: root.background
+      tooltipForeground: root.foreground
+      fontFamily: root.fontFamily
+      fontSize: 10
+      horizontalPadding: 8
+      verticalPadding: 4
+      active: root.refreshFlash || usageMain.refreshing
+      onClicked: {
+        root.triggerRefresh()
+        keyCatcher.forceActiveFocus()
+      }
+    }
+  }
+
+  component StatusCard: SectionCard {
+    property var provider: null
+    visible: !!provider && String(provider.usageStatusText || "") !== ""
+    titleColor: urgent
+    title: provider ? provider.usageStatusText : ""
+    subtitle: provider ? provider.authHelpText : ""
+  }
+
+  component RateLimitCard: SectionCard {
+    id: rateLimitCard
+    property var provider: null
+    visible: !!provider && ((provider.rateLimitPercent >= 0) || (provider.secondaryRateLimitPercent >= 0))
+    title: "Rate Limit Usage"
+
+    ColumnLayout {
+      width: parent.width
+      spacing: 10
+      ProgressRow {
+        visible: provider && provider.rateLimitPercent >= 0
+        label: provider ? provider.rateLimitLabel : ""
+        value: provider ? provider.rateLimitPercent : -1
+        resetText: provider && provider.rateLimitResetAt ? "Resets in " + provider.formatResetTime(provider.rateLimitResetAt) : ""
+      }
+      ProgressRow {
+        visible: provider && provider.secondaryRateLimitPercent >= 0
+        label: provider ? provider.secondaryRateLimitLabel : ""
+        value: provider ? provider.secondaryRateLimitPercent : -1
+        resetText: provider && provider.secondaryRateLimitResetAt ? "Resets in " + provider.formatResetTime(provider.secondaryRateLimitResetAt) : ""
+      }
+      PaceRow { provider: rateLimitCard.provider }
+    }
+  }
+
+  component TodayCard: SectionCard {
+    property var provider: null
+    visible: !!provider && provider.ready && provider.hasLocalStats
+    title: "Today"
+
+    ColumnLayout {
+      width: parent.width
+      spacing: 8
+      RowLayout {
+        Layout.fillWidth: true
+        spacing: 20
+        StatBlock { value: provider ? String(provider.todayPrompts || 0) : "0"; label: "prompts" }
+        StatBlock { value: provider ? String(provider.todaySessions || 0) : "0"; label: "sessions" }
+      }
+      Repeater {
+        model: {
+          var toks = provider ? (provider.todayTokensByModel || {}) : {}
+          var out = []
+          for (var k in toks) out.push({ modelId: k, count: toks[k] })
+          return out
+        }
+        delegate: RowLayout {
+          required property var modelData
+          Layout.fillWidth: true
+          Text { text: usageMain.friendlyModelName(modelData.modelId); color: dim; font.family: fontFamily; font.pixelSize: 11 }
+          Item { Layout.fillWidth: true }
+          Text { text: usageMain.formatTokenCount(modelData.count) + " tokens"; color: foreground; font.family: fontFamily; font.pixelSize: 11; font.bold: true }
+        }
+      }
+    }
+  }
+
+  component WeekCard: SectionCard {
+    property var provider: null
+    visible: !!provider && provider.recentDays && provider.recentDays.length > 0
+    title: "Last 7 Days"
+
+    ColumnLayout {
+      width: parent.width
+      spacing: 6
+      Repeater {
+        model: provider ? provider.recentDays : []
+        delegate: RowLayout {
+          required property var modelData
+          Layout.fillWidth: true
+          spacing: 8
+          readonly property real count: modelData ? Number(modelData.messageCount || 0) : 0
+          readonly property real maxCount: {
+            var days = provider ? (provider.recentDays || []) : []
+            var max = 1
+            for (var i = 0; i < days.length; i++) if (Number(days[i].messageCount || 0) > max) max = Number(days[i].messageCount || 0)
+            return max
+          }
+          Text {
+            text: {
+              var d = modelData.date
+              if (!d) return ""
+              var dt = new Date(d + "T00:00:00")
+              var names = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+              return names[dt.getDay()] + " " + String(dt.getMonth() + 1).padStart(2, "0") + "/" + String(dt.getDate()).padStart(2, "0")
+            }
+            color: dim
+            font.family: fontFamily
+            font.pixelSize: 10
+            Layout.preferredWidth: 48
+          }
+          Rectangle {
+            Layout.fillWidth: true
+            Layout.preferredHeight: 10
+            color: track
+            radius: Math.max(1, Style.cornerRadius / 3)
+            Rectangle {
+              anchors.left: parent.left
+              anchors.top: parent.top
+              anchors.bottom: parent.bottom
+              width: parent.width * (count / maxCount)
+              color: root.alpha(foreground, 0.78)
+              radius: Math.max(1, Style.cornerRadius / 3)
+              Behavior on width { NumberAnimation { duration: 160; easing.type: Easing.OutCubic } }
+            }
+          }
+          Text {
+            text: usageMain.formatTokenCount(count)
+            color: foreground
+            font.family: fontFamily
+            font.pixelSize: 10
+            font.bold: true
+            horizontalAlignment: Text.AlignRight
+            Layout.preferredWidth: 48
+          }
+        }
+      }
+    }
+  }
+
+  component AllTimeCard: SectionCard {
+    property var provider: null
+    visible: {
+      var usage = provider ? (provider.modelUsage || {}) : {}
+      return Object.keys(usage).length > 0
+    }
+    title: "All-Time"
+
+    ColumnLayout {
+      width: parent.width
+      spacing: 8
+      RowLayout {
+        Layout.fillWidth: true
+        spacing: 20
+        StatBlock { value: provider ? usageMain.formatTokenCount(provider.totalPrompts || 0) : "0"; label: "messages" }
+        StatBlock { value: provider ? String(provider.totalSessions || 0) : "0"; label: "sessions" }
+      }
+      PanelSeparator { Layout.fillWidth: true; foreground: root.foreground; strength: 0.18 }
+      Repeater {
+        model: {
+          var usage = provider ? (provider.modelUsage || {}) : {}
+          var out = []
+          for (var k in usage) out.push({ modelId: k, data: usage[k] })
+          return out
+        }
+        delegate: ColumnLayout {
+          required property var modelData
+          Layout.fillWidth: true
+          spacing: 4
+          Text { text: usageMain.friendlyModelName(modelData.modelId); color: foreground; font.family: fontFamily; font.pixelSize: 11; font.bold: true }
+          GridLayout {
+            Layout.leftMargin: 10
+            columns: 2
+            columnSpacing: 18
+            rowSpacing: 2
+            DetailPair { name: "Input"; value: usageMain.formatTokenCount(modelData.data.inputTokens || 0) }
+            DetailPair { name: "Output"; value: usageMain.formatTokenCount(modelData.data.outputTokens || 0) }
+            DetailPair { name: "Cache Read"; value: usageMain.formatTokenCount(modelData.data.cacheReadInputTokens || 0) }
+            DetailPair { name: "Cache Write"; value: usageMain.formatTokenCount(modelData.data.cacheCreationInputTokens || 0) }
+          }
+        }
+      }
+    }
+  }
+
+  component SectionCard: BorderSurface {
+    id: section
+    property string title: ""
+    property string subtitle: ""
+    property color titleColor: foreground
+    default property alias content: body.data
+
+    Layout.fillWidth: true
+    color: card
+    borderSpec: Border.flat(Qt.rgba(foreground.r, foreground.g, foreground.b, 0.05), 1)
+    padding: 12
+    radius: Style.cornerRadius
+    implicitHeight: body.implicitHeight + contentTopInset + contentBottomInset
+
+    ColumnLayout {
+      id: body
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.top: parent.top
+      anchors.topMargin: section.contentTopInset
+      anchors.rightMargin: section.contentRightInset
+      anchors.bottomMargin: section.contentBottomInset
+      anchors.leftMargin: section.contentLeftInset
+      spacing: 8
+
+      PanelSectionHeader {
+        visible: section.title !== ""
+        Layout.fillWidth: true
+        text: section.title
+        foreground: section.titleColor
+        fontFamily: root.fontFamily
+        fontSize: 11
+      }
+      Text {
+        visible: section.subtitle !== ""
+        Layout.fillWidth: true
+        text: section.subtitle
+        color: dim
+        font.family: fontFamily
+        font.pixelSize: 10
+        wrapMode: Text.WordWrap
+      }
+    }
+  }
+
+  component PaceRow: ColumnLayout {
+    property var provider: null
+    readonly property var pace: root.paceInfo(provider)
+
+    visible: pace.text !== ""
+    spacing: 2
+    Layout.fillWidth: true
+
+    RowLayout {
+      Layout.fillWidth: true
+      Text {
+        text: "Pace"
+        color: dim
+        font.family: fontFamily
+        font.pixelSize: 10
+      }
+      Item { Layout.fillWidth: true }
+      Text {
+        text: pace.text
+        color: pace.deficit ? urgent : foreground
+        font.family: fontFamily
+        font.pixelSize: 10
+        font.bold: true
+      }
+    }
+
+    Text {
+      Layout.fillWidth: true
+      text: pace.detail
+      color: dim
+      font.family: fontFamily
+      font.pixelSize: 10
+      horizontalAlignment: Text.AlignRight
+    }
+  }
+
+  component ProgressRow: ColumnLayout {
+    property string label: ""
+    property real value: -1
+    property string resetText: ""
+    spacing: 5
+    Layout.fillWidth: true
+
+    RowLayout {
+      Layout.fillWidth: true
+      Text { text: label; color: dim; font.family: fontFamily; font.pixelSize: 11 }
+      Item { Layout.fillWidth: true }
+      Text {
+        text: value < 0 ? "—" : Math.round(value * 100) + "%"
+        color: value >= 0.9 ? urgent : foreground
+        font.family: fontFamily
+        font.pixelSize: 11
+        font.bold: true
+      }
+    }
+    Rectangle {
+      Layout.fillWidth: true
+      Layout.preferredHeight: 8
+      color: track
+      radius: Math.max(1, Style.cornerRadius / 3)
+      Rectangle {
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        width: parent.width * root.clamp(value, 0, 1)
+        color: value >= 0.9 ? root.alpha(urgent, 0.72) : root.alpha(foreground, 0.78)
+        radius: Math.max(1, Style.cornerRadius / 3)
+        Behavior on width { NumberAnimation { duration: 160; easing.type: Easing.OutCubic } }
+      }
+    }
+    Text { visible: resetText !== ""; text: resetText; color: dim; font.family: fontFamily; font.pixelSize: 10 }
+  }
+
+  component StatBlock: ColumnLayout {
+    property string value: "0"
+    property string label: ""
+    spacing: 2
+    Text { text: value; color: foreground; font.family: fontFamily; font.pixelSize: 18; font.bold: true }
+    Text { text: label; color: dim; font.family: fontFamily; font.pixelSize: 10 }
+  }
+
+  component DetailPair: RowLayout {
+    property string name: ""
+    property string value: ""
+    Text { text: name; color: dim; font.family: fontFamily; font.pixelSize: 10; Layout.preferredWidth: 76 }
+    Text { text: value; color: foreground; font.family: fontFamily; font.pixelSize: 10; font.bold: true }
+  }
+}
diff --git a/shell/plugins/model-usage/assets/claude.svg b/shell/plugins/model-usage/assets/claude.svg
new file mode 100644
index 00000000..d3007012
--- /dev/null
+++ b/shell/plugins/model-usage/assets/claude.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="257" preserveAspectRatio="xMidYMid" viewBox="0 0 256 257"><path fill="#D97757" d="m50.228 170.321 50.357-28.257.843-2.463-.843-1.361h-2.462l-8.426-.518-28.775-.778-24.952-1.037-24.175-1.296-6.092-1.297L0 125.796l.583-3.759 5.12-3.434 7.324.648 16.202 1.101 24.304 1.685 17.629 1.037 26.118 2.722h4.148l.583-1.685-1.426-1.037-1.101-1.037-25.147-17.045-27.22-18.017-14.258-10.37-7.713-5.25-3.888-4.925-1.685-10.758 7-7.713 9.397.649 2.398.648 9.527 7.323 20.35 15.75L94.817 91.9l3.889 3.24 1.555-1.102.195-.777-1.75-2.917-14.453-26.118-15.425-26.572-6.87-11.018-1.814-6.61c-.648-2.723-1.102-4.991-1.102-7.778l7.972-10.823L71.42 0 82.05 1.426l4.472 3.888 6.61 15.101 10.694 23.786 16.591 32.34 4.861 9.592 2.592 8.879.973 2.722h1.685v-1.556l1.36-18.211 2.528-22.36 2.463-28.776.843-8.1 4.018-9.722 7.971-5.25 6.222 2.981 5.12 7.324-.713 4.73-3.046 19.768-5.962 30.98-3.889 20.739h2.268l2.593-2.593 10.499-13.934 17.628-22.036 7.778-8.749 9.073-9.657 5.833-4.601h11.018l8.1 12.055-3.628 12.443-11.342 14.388-9.398 12.184-13.48 18.147-8.426 14.518.778 1.166 2.01-.194 30.46-6.481 16.462-2.982 19.637-3.37 8.88 4.148.971 4.213-3.5 8.62-20.998 5.184-24.628 4.926-36.682 8.685-.454.324.519.648 16.526 1.555 7.065.389h17.304l32.21 2.398 8.426 5.574 5.055 6.805-.843 5.184-12.962 6.611-17.498-4.148-40.83-9.721-14-3.5h-1.944v1.167l11.666 11.406 21.387 19.314 26.767 24.887 1.36 6.157-3.434 4.86-3.63-.518-23.526-17.693-9.073-7.972-20.545-17.304h-1.36v1.814l4.73 6.935 25.017 37.59 1.296 11.536-1.814 3.76-6.481 2.268-7.13-1.297-14.647-20.544-15.1-23.138-12.185-20.739-1.49.843-7.194 77.448-3.37 3.953-7.778 2.981-6.48-4.925-3.436-7.972 3.435-15.749 4.148-20.544 3.37-16.333 3.046-20.285 1.815-6.74-.13-.454-1.49.194-15.295 20.999-23.267 31.433-18.406 19.702-4.407 1.75-7.648-3.954.713-7.064 4.277-6.286 25.47-32.405 15.36-20.092 9.917-11.6-.065-1.686h-.583L44.07 198.125l-12.055 1.555-5.185-4.86.648-7.972 2.463-2.593 20.35-13.999-.064.065Z"/></svg>
\ No newline at end of file
diff --git a/shell/plugins/model-usage/assets/codex.svg b/shell/plugins/model-usage/assets/codex.svg
new file mode 100644
index 00000000..1716a131
--- /dev/null
+++ b/shell/plugins/model-usage/assets/codex.svg
@@ -0,0 +1 @@
+<svg fill="#fff" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Codex</title><path clip-rule="evenodd" d="M8.086.457a6.105 6.105 0 013.046-.415c1.333.153 2.521.72 3.564 1.7a.117.117 0 00.107.029c1.408-.346 2.762-.224 4.061.366l.063.03.154.076c1.357.703 2.33 1.77 2.918 3.198.278.679.418 1.388.421 2.126a5.655 5.655 0 01-.18 1.631.167.167 0 00.04.155 5.982 5.982 0 011.578 2.891c.385 1.901-.01 3.615-1.183 5.14l-.182.22a6.063 6.063 0 01-2.934 1.851.162.162 0 00-.108.102c-.255.736-.511 1.364-.987 1.992-1.199 1.582-2.962 2.462-4.948 2.451-1.583-.008-2.986-.587-4.21-1.736a.145.145 0 00-.14-.032c-.518.167-1.04.191-1.604.185a5.924 5.924 0 01-2.595-.622 6.058 6.058 0 01-2.146-1.781c-.203-.269-.404-.522-.551-.821a7.74 7.74 0 01-.495-1.283 6.11 6.11 0 01-.017-3.064.166.166 0 00.008-.074.115.115 0 00-.037-.064 5.958 5.958 0 01-1.38-2.202 5.196 5.196 0 01-.333-1.589 6.915 6.915 0 01.188-2.132c.45-1.484 1.309-2.648 2.577-3.493.282-.188.55-.334.802-.438.286-.12.573-.22.861-.304a.129.129 0 00.087-.087A6.016 6.016 0 015.635 2.31C6.315 1.464 7.132.846 8.086.457zm-.804 7.85a.848.848 0 00-1.473.842l1.694 2.965-1.688 2.848a.849.849 0 001.46.864l1.94-3.272a.849.849 0 00.007-.854l-1.94-3.393zm5.446 6.24a.849.849 0 000 1.695h4.848a.849.849 0 000-1.696h-4.848z"/></svg>
\ No newline at end of file
diff --git a/shell/plugins/model-usage/manifest.json b/shell/plugins/model-usage/manifest.json
new file mode 100644
index 00000000..d59c737b
--- /dev/null
+++ b/shell/plugins/model-usage/manifest.json
@@ -0,0 +1,46 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.model-usage",
+  "name": "Model Usage",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "license": "MIT",
+  "description": "Claude Code and Codex usage stats in a native Omarchy bar popup.",
+  "kinds": ["bar-widget"],
+  "activation": "on-demand",
+  "entryPoints": {
+    "barWidget": "Widget.qml"
+  },
+  "barWidget": {
+    "displayName": "Model Usage",
+    "description": "Shows AI coding assistant usage stats with a tabbed popup panel.",
+    "category": "AI",
+    "aliases": ["model-usage"],
+    "allowMultiple": false,
+    "defaults": {
+      "providers": {
+        "claude": {
+          "enabled": true,
+          "statsPath": "~/.claude/stats-cache.json",
+          "credentialsPath": "~/.claude/.credentials.json",
+          "projectsPath": "~/.claude/projects"
+        },
+        "codex": {
+          "enabled": true
+        }
+      },
+      "refreshIntervalSec": 900,
+      "syncMode": "Off",
+      "syncDir": "",
+      "syncFileName": "",
+      "syncDeviceId": ""
+    },
+    "schema": [
+      { "key": "refreshIntervalSec", "type": "integer", "label": "Refresh interval (seconds)", "min": 30, "max": 3600, "step": 30, "defaultValue": 900 },
+      { "key": "syncMode", "type": "enum", "label": "Synced aggregation", "options": ["Off", "On"], "defaultValue": "Off", "description": "When On, write this machine's local usage snapshot and merge snapshots from other machines." },
+      { "key": "syncDir", "type": "path", "label": "Sync folder", "defaultValue": "", "description": "A folder synced by Syncthing, Dropbox, rsync, etc." },
+      { "key": "syncFileName", "type": "string", "label": "Snapshot file name", "defaultValue": "", "description": "Optional. Defaults to <hostname>.json. Use a different file name on each machine, such as laptop.json or desktop.json." },
+      { "key": "syncDeviceId", "type": "string", "label": "Device id", "defaultValue": "", "description": "Optional stable device name used inside synced aggregate snapshots." }
+    ]
+  }
+}
diff --git a/shell/plugins/model-usage/providers/Claude.qml b/shell/plugins/model-usage/providers/Claude.qml
new file mode 100644
index 00000000..fb5b08eb
--- /dev/null
+++ b/shell/plugins/model-usage/providers/Claude.qml
@@ -0,0 +1,501 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+Item {
+    id: root
+    visible: false
+
+    property string providerId: "claude"
+    property string providerName: "Claude Code"
+    property string providerIcon: "ai"
+    property bool enabled: false
+    property bool ready: false
+    property bool refreshing: false
+    property double lastRefreshedAtMs: 0
+    property string usageStatusText: ""
+
+    property real rateLimitPercent: -1
+    property string rateLimitLabel: "Weekly (7-day)"
+    property string rateLimitResetAt: ""
+    property real secondaryRateLimitPercent: -1
+    property string secondaryRateLimitLabel: "Session (5-hour)"
+    property string secondaryRateLimitResetAt: ""
+
+    property int todayPrompts: 0
+    property int todaySessions: 0
+    property int todayTotalTokens: 0
+    property var todayTokensByModel: ({})
+
+    property var recentDays: []
+    property int totalPrompts: 0
+    property int totalSessions: 0
+    property var modelUsage: ({})
+    property var dailyActivity: []
+
+    property string tierLabel: ""
+    property string authHelpText: "Run `claude auth login` to restore authoritative usage."
+    property bool hasLocalStats: true
+    property bool hasProjectStats: false
+
+    property string oauthAccessToken: ""
+    property double oauthExpiresAtMs: 0
+    property string authMode: "none"
+    property string subscriptionType: ""
+    property string rateLimitTier: ""
+    property bool hasAuthoritativeRateLimit: false
+
+    property double lastProbeAtMs: 0
+    property int probeMinIntervalMs: 15 * 60 * 1000
+    property bool projectScanRerunForce: false
+
+    property var providerSettings: ({})
+
+    function resolvePath(p) {
+        if (p && p.startsWith("~"))
+            return (Quickshell.env("HOME") ?? "/home") + p.substring(1);
+        return p;
+    }
+
+    function pathFromUrl(url) {
+        const value = String(url || "");
+        if (value.indexOf("file://") === 0)
+            return decodeURIComponent(value.substring(7));
+        return value;
+    }
+
+    readonly property string projectScannerScriptPath: pathFromUrl(Qt.resolvedUrl("../scripts/claude_usage_scanner.py"))
+
+    FileView {
+        id: statsFile
+        path: root.resolvePath(root.providerSettings?.statsPath ?? "~/.claude/stats-cache.json")
+        watchChanges: true
+        printErrors: false
+        onFileChanged: reload()
+        onLoaded: root.parseStats(text())
+    }
+
+    FileView {
+        id: historyFile
+        path: root.resolvePath("~/.claude/history.jsonl")
+        watchChanges: true
+        onFileChanged: reload()
+        onLoaded: root.parseHistory(text())
+        onLoadFailed: error => {
+            if (error === FileViewError.FileNotFound)
+                console.error("model-usage/claude", "history.jsonl not found");
+        }
+    }
+
+    FileView {
+        id: credentialsFile
+        path: root.resolvePath(root.providerSettings?.credentialsPath ?? "~/.claude/.credentials.json")
+        watchChanges: true
+        onFileChanged: reload()
+        onLoaded: root.parseCredentials(text())
+        onLoadFailed: error => {
+            if (error === FileViewError.FileNotFound)
+                console.error("model-usage/claude", "credentials.json not found at", credentialsFile.path);
+        }
+    }
+
+    Process {
+        id: projectScanner
+        running: false
+        command: []
+
+        stdout: StdioCollector {
+            waitForEnd: true
+            onStreamFinished: root.applyProjectUsageSummary(text)
+        }
+
+        stderr: StdioCollector {
+            waitForEnd: true
+            onStreamFinished: if (text.trim() !== "") console.warn("model-usage/claude", text.trim())
+        }
+
+        onExited: {
+            root.finishRefresh();
+            if (root.projectScanRerunForce) {
+                root.projectScanRerunForce = false;
+                root.startProjectScanner(true);
+            }
+        }
+    }
+
+    Timer {
+        interval: root.probeMinIntervalMs
+        running: root.enabled && root.oauthAccessToken !== ""
+        repeat: true
+        onTriggered: root.probeRateLimits(false)
+    }
+
+    function localDateString() {
+        const now = new Date();
+        const y = now.getFullYear();
+        const m = String(now.getMonth() + 1).padStart(2, "0");
+        const d = String(now.getDate()).padStart(2, "0");
+        return y + "-" + m + "-" + d;
+    }
+
+    function parseStats(content) {
+        try {
+            const data = JSON.parse(content);
+            const today = localDateString();
+
+            const dailyModelTokens = data.dailyModelTokens ?? [];
+            const todayTokenEntry = dailyModelTokens.find(d => d.date === today);
+            root.todayTokensByModel = todayTokenEntry?.tokensByModel ?? {};
+
+            let tokenSum = 0;
+            const toks = root.todayTokensByModel;
+            for (const k in toks)
+                tokenSum += toks[k];
+            root.todayTotalTokens = tokenSum;
+
+            root.dailyActivity = data.dailyActivity ?? [];
+            root.recentDays = root.dailyActivity.slice(-7);
+            root.modelUsage = data.modelUsage ?? {};
+            root.totalPrompts = data.totalMessages ?? 0;
+            root.totalSessions = data.totalSessions ?? 0;
+            root.ready = true;
+        } catch (e) {
+            console.error("model-usage/claude", "Failed to parse stats-cache.json:", e);
+        }
+    }
+
+    function applyProjectUsageSummary(content) {
+        try {
+            const data = JSON.parse(String(content || "{}"));
+            const prompts = Math.max(0, Number(data.totalPrompts || 0));
+            if (prompts <= 0)
+                return;
+
+            root.hasProjectStats = true;
+            root.todayPrompts = Math.max(0, Number(data.todayPrompts || 0));
+            root.todaySessions = Math.max(0, Number(data.todaySessions || 0));
+            root.todayTotalTokens = Math.max(0, Number(data.todayTotalTokens || 0));
+            root.todayTokensByModel = data.todayTokensByModel || ({});
+            root.recentDays = data.recentDays || [];
+            root.modelUsage = data.modelUsage || ({});
+            root.totalPrompts = prompts;
+            root.totalSessions = Math.max(0, Number(data.totalSessions || 0));
+            root.dailyActivity = data.dailyActivity || root.recentDays;
+            root.ready = true;
+        } catch (e) {
+            console.error("model-usage/claude", "Failed to parse project usage summary:", e);
+        }
+    }
+
+    function parseHistory(content) {
+        if (root.hasProjectStats)
+            return;
+        try {
+            const now = new Date();
+            const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
+            const lines = content.split("\n");
+            let prompts = 0;
+            const sessions = {};
+
+            for (let i = lines.length - 1; i >= 0; i--) {
+                const line = lines[i].trim();
+                if (!line)
+                    continue;
+                try {
+                    const entry = JSON.parse(line);
+                    if ((entry.timestamp ?? 0) < startOfDay)
+                        break;
+                    prompts++;
+                    if (entry.sessionId)
+                        sessions[entry.sessionId] = true;
+                } catch (e) {
+                    continue;
+                }
+            }
+
+            root.todayPrompts = prompts;
+            root.todaySessions = Object.keys(sessions).length;
+        } catch (e) {
+            console.error("model-usage/claude", "Failed to parse history.jsonl:", e);
+        }
+    }
+
+    function parseCredentials(content) {
+        try {
+            const data = JSON.parse(content);
+            const oauth = data.claudeAiOauth ?? {};
+            const fileAccessToken = oauth.accessToken ?? "";
+            const fileExpiresAtMs = root.normalizeExpiresAtMs(oauth.expiresAt);
+            const fileHasOAuth = fileAccessToken !== "";
+
+            const tokenChanged = (root.oauthAccessToken !== fileAccessToken || root.oauthExpiresAtMs !== fileExpiresAtMs);
+            root.oauthAccessToken = fileAccessToken;
+            root.oauthExpiresAtMs = fileExpiresAtMs;
+            if (tokenChanged)
+                root.clearAuthoritativeRateLimits();
+
+            root.authMode = fileHasOAuth ? "oauth" : "none";
+
+            root.subscriptionType = oauth.subscriptionType ?? "";
+            root.rateLimitTier = oauth.rateLimitTier ?? "";
+            root.tierLabel = formatTier();
+
+            if (root.oauthAccessToken && !root.oauthTokenExpired()) {
+                if (root.usageStatusText === "Waiting for auth")
+                    root.clearUsageStatus();
+                root.probeRateLimits(false);
+            } else if (!root.oauthAccessToken) {
+                root.usageStatusText = "Waiting for auth";
+                root.clearAuthoritativeRateLimits();
+            } else {
+                root.clearUsageStatus();
+            }
+        } catch (e) {
+            console.error("model-usage/claude", "Failed to parse credentials.json:", e);
+            root.usageStatusText = "Waiting for auth";
+            root.clearAuthoritativeRateLimits();
+        }
+    }
+
+    function formatTier() {
+        if (!root.rateLimitTier)
+            return root.subscriptionType || "";
+        const match = root.rateLimitTier.match(/max_(\d+x)/i);
+        if (match)
+            return "Max " + match[1];
+        if (root.subscriptionType)
+            return root.subscriptionType.charAt(0).toUpperCase() + root.subscriptionType.slice(1);
+        return "";
+    }
+
+    function normalizeExpiresAtMs(value) {
+        const n = Number(value ?? 0);
+        return (isFinite(n) && n > 0) ? n : 0;
+    }
+
+    function oauthTokenExpired() {
+        if (!root.oauthAccessToken)
+            return true;
+        if (!root.oauthExpiresAtMs || !(root.oauthExpiresAtMs > 0))
+            return false;
+        return root.oauthExpiresAtMs <= Date.now();
+    }
+
+    function clearAuthoritativeRateLimits() {
+        root.hasAuthoritativeRateLimit = false;
+        root.rateLimitPercent = -1;
+        root.rateLimitLabel = "Weekly (7-day)";
+        root.rateLimitResetAt = "";
+        root.secondaryRateLimitPercent = -1;
+        root.secondaryRateLimitLabel = "Session (5-hour)";
+        root.secondaryRateLimitResetAt = "";
+    }
+
+    function clearUsageStatus() {
+        root.usageStatusText = "";
+    }
+
+    function parseNumber(value) {
+        if (value === null || value === undefined)
+            return NaN;
+        return parseFloat(String(value).trim().replace("%", ""));
+    }
+
+    function utilizationPayloadUsesPercentScale(values) {
+        for (let i = 0; i < values.length; i++) {
+            const n = parseNumber(values[i]);
+            if (n >= 1)
+                return true;
+        }
+        return false;
+    }
+
+    function normalizeUtilization(value, percentScale) {
+        const n = parseNumber(value);
+        if (!(n >= 0))
+            return -1;
+
+        // Anthropic's OAuth usage endpoint currently reports percentages
+        // (for example 37.0 or 1.0). Older clients/examples sometimes used
+        // fractions (0.37). Treat a payload containing any value >= 1 as
+        // percent-scaled so 1.0 renders as 1%, not 100%.
+        if (percentScale === true || n > 1)
+            return Math.min(1, n / 100);
+        return Math.min(1, n);
+    }
+
+    function normalizeResetAt(value) {
+        if (value === null || value === undefined)
+            return "";
+        const raw = String(value).trim();
+        if (raw === "")
+            return "";
+        if (/^\d+$/.test(raw)) {
+            let ts = parseInt(raw, 10);
+            if (ts < 1e12)
+                ts = ts * 1000;
+            const d = new Date(ts);
+            if (!isNaN(d.getTime()))
+                return d.toISOString();
+        }
+        const parsed = new Date(raw);
+        if (!isNaN(parsed.getTime()))
+            return parsed.toISOString();
+        return raw;
+    }
+
+    function oauthUsageBucket(payload, key) {
+        const bucket = payload?.[key];
+        if (bucket && typeof bucket === "object")
+            return bucket;
+        return null;
+    }
+
+    function applyAuthoritativeRateLimits(weekly, weeklyReset, session, sessionReset, sourceLabel) {
+        const percentScale = root.utilizationPayloadUsesPercentScale([weekly, session]);
+        const weeklyNorm = root.normalizeUtilization(weekly, percentScale);
+        const sessionNorm = root.normalizeUtilization(session, percentScale);
+        if (weeklyNorm < 0 && sessionNorm < 0)
+            return false;
+
+        root.hasAuthoritativeRateLimit = true;
+        root.rateLimitPercent = -1;
+        root.rateLimitLabel = "Weekly (7-day)";
+        root.rateLimitResetAt = "";
+        root.secondaryRateLimitPercent = -1;
+        root.secondaryRateLimitLabel = "Session (5-hour)";
+        root.secondaryRateLimitResetAt = "";
+
+        if (weeklyNorm >= 0)
+            root.rateLimitPercent = weeklyNorm;
+        if (sessionNorm >= 0)
+            root.secondaryRateLimitPercent = sessionNorm;
+        if (weeklyReset !== null && weeklyReset !== undefined)
+            root.rateLimitResetAt = root.normalizeResetAt(weeklyReset);
+        if (sessionReset !== null && sessionReset !== undefined)
+            root.secondaryRateLimitResetAt = root.normalizeResetAt(sessionReset);
+
+        if (root.rateLimitPercent < 0 && sessionNorm >= 0) {
+            root.rateLimitPercent = sessionNorm;
+            root.rateLimitLabel = root.secondaryRateLimitLabel;
+            root.rateLimitResetAt = root.secondaryRateLimitResetAt;
+        }
+
+        if (sourceLabel)
+            root.rateLimitLabel = root.rateLimitLabel + " (" + sourceLabel + ")";
+        return true;
+    }
+
+    function finishRefresh() {
+        root.refreshing = false;
+        root.lastRefreshedAtMs = Date.now();
+    }
+
+    function probeOAuthUsage() {
+        root.refreshing = true;
+        const xhr = new XMLHttpRequest();
+        xhr.open("GET", "https://api.anthropic.com/api/oauth/usage");
+        xhr.setRequestHeader("Authorization", "Bearer " + root.oauthAccessToken);
+        xhr.setRequestHeader("anthropic-beta", "oauth-2025-04-20");
+        xhr.setRequestHeader("Accept", "application/json");
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState !== XMLHttpRequest.DONE)
+                return;
+
+            if (xhr.status >= 200 && xhr.status < 300) {
+                try {
+                    const payload = JSON.parse(xhr.responseText ?? "{}");
+                    const weeklyBucket = root.oauthUsageBucket(payload, "seven_day_oauth_apps") || root.oauthUsageBucket(payload, "seven_day");
+                    const sessionBucket = root.oauthUsageBucket(payload, "five_hour");
+
+                    if (root.applyAuthoritativeRateLimits(weeklyBucket?.utilization, weeklyBucket?.resets_at, sessionBucket?.utilization, sessionBucket?.resets_at, "")) {
+                        root.clearUsageStatus();
+                        root.finishRefresh();
+                        return;
+                    }
+                } catch (e) {
+                    console.error("model-usage/claude", "Failed to parse oauth usage response:", e);
+                }
+            }
+
+            const body = xhr.responseText ? String(xhr.responseText).slice(0, 220) : "";
+            const retryAfter = xhr.getResponseHeader("retry-after") || "";
+            console.warn("model-usage/claude", "OAuth usage probe unavailable (status " + xhr.status + ")" + (body ? " body=" + body : ""));
+            if (!root.hasAuthoritativeRateLimit) {
+                root.usageStatusText = "Claude limits unavailable";
+                root.authHelpText = xhr.status === 429
+                    ? "Anthropic's usage endpoint is rate limiting checks right now" + (retryAfter ? " (retry after " + retryAfter + "s)" : "") + ". Local Claude Code stats are still shown."
+                    : "Anthropic's usage endpoint returned status " + xhr.status + ". Local Claude Code stats are still shown.";
+            }
+            root.finishRefresh();
+        };
+        xhr.send();
+    }
+
+    function startProjectScanner(force) {
+        if (projectScanner.running) {
+            if (force === true)
+                root.projectScanRerunForce = true;
+            return false;
+        }
+
+        const command = ["python3", root.projectScannerScriptPath, root.resolvePath(root.providerSettings?.projectsPath ?? "~/.claude/projects")];
+        if (force === true)
+            command.push("--force");
+        projectScanner.command = command;
+        projectScanner.running = true;
+        return true;
+    }
+
+    function refresh(force) {
+        root.refreshing = true;
+        statsFile.reload();
+        historyFile.reload();
+        credentialsFile.reload();
+        root.startProjectScanner(force === true);
+
+        if (root.oauthAccessToken && root.authMode === "oauth" && !root.oauthTokenExpired())
+            root.probeRateLimits(force === true);
+    }
+
+    function formatResetTime(isoTimestamp) {
+        if (!isoTimestamp)
+            return "";
+        const reset = new Date(isoTimestamp);
+        const now = new Date();
+        const diffMs = reset.getTime() - now.getTime();
+        if (diffMs <= 0)
+            return "now";
+        const hours = Math.floor(diffMs / 3600000);
+        const mins = Math.floor((diffMs % 3600000) / 60000);
+        if (hours > 24)
+            return Math.floor(hours / 24) + "d " + (hours % 24) + "h";
+        if (hours > 0)
+            return hours + "h " + mins + "m";
+        return mins + "m";
+    }
+
+    function probeRateLimits(force) {
+        if (!root.oauthAccessToken || root.authMode !== "oauth") {
+            root.usageStatusText = "Waiting for auth";
+            root.clearAuthoritativeRateLimits();
+            root.finishRefresh();
+            return;
+        }
+
+        if (root.oauthTokenExpired()) {
+            root.clearUsageStatus();
+            root.finishRefresh();
+            return;
+        }
+
+        const nowMs = Date.now();
+        if (force !== true && root.lastProbeAtMs > 0 && (nowMs - root.lastProbeAtMs) < root.probeMinIntervalMs) {
+            root.finishRefresh();
+            return;
+        }
+        root.lastProbeAtMs = nowMs;
+
+        root.probeOAuthUsage();
+    }
+}
diff --git a/shell/plugins/model-usage/providers/Codex.qml b/shell/plugins/model-usage/providers/Codex.qml
new file mode 100644
index 00000000..5a0ad6db
--- /dev/null
+++ b/shell/plugins/model-usage/providers/Codex.qml
@@ -0,0 +1,135 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+Item {
+  id: root
+  visible: false
+
+  property string providerId: "codex"
+  property string providerName: "Codex"
+  property string providerIcon: "ai"
+  property bool enabled: false
+  property bool ready: false
+  property bool refreshing: false
+  property double lastRefreshedAtMs: 0
+
+  property real rateLimitPercent: -1
+  property string rateLimitLabel: ""
+  property string rateLimitResetAt: ""
+  property real secondaryRateLimitPercent: -1
+  property string secondaryRateLimitLabel: ""
+  property string secondaryRateLimitResetAt: ""
+
+  property int todayPrompts: 0
+  property int todaySessions: 0
+  property real todayTotalTokens: 0
+  property var todayTokensByModel: ({})
+
+  property var recentDays: []
+  property int totalPrompts: 0
+  property int totalSessions: 0
+  property var modelUsage: ({})
+
+  property string tierLabel: ""
+  property string usageStatusText: ""
+  property string authHelpText: "Run `codex login` to authenticate."
+  property bool hasLocalStats: true
+
+  property string configModel: ""
+  property var providerSettings: ({})
+
+  readonly property string scannerPath: String(Qt.resolvedUrl("../scripts/codex_usage_scanner.py")).replace("file://", "")
+
+  Process {
+    id: usageScanner
+    command: ["python3", root.scannerPath]
+    running: false
+
+    stdout: StdioCollector {
+      onStreamFinished: root.parseScannerOutput(text)
+    }
+
+    onExited: root.finishRefresh()
+
+    stderr: StdioCollector {
+      onStreamFinished: if (text.trim() !== "") console.warn("model-usage/codex", text.trim())
+    }
+  }
+
+  Timer {
+    interval: 5 * 60 * 1000
+    running: root.enabled
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: root.refresh()
+  }
+
+  onEnabledChanged: if (enabled) refresh()
+
+  function finishRefresh() {
+    root.refreshing = false
+    root.lastRefreshedAtMs = Date.now()
+  }
+
+  function refresh(force) {
+    if (usageScanner.running)
+      return
+    root.refreshing = true
+    usageScanner.running = true
+  }
+
+  function parseScannerOutput(output) {
+    const raw = String(output || "").trim()
+    if (raw === "")
+      return
+
+    try {
+      const data = JSON.parse(raw.split("\n").pop())
+      root.ready = !!data.ready
+      root.hasLocalStats = data.hasLocalStats !== false
+
+      root.todayPrompts = data.todayPrompts || 0
+      root.todaySessions = data.todaySessions || 0
+      root.todayTotalTokens = data.todayTotalTokens || 0
+      root.todayTokensByModel = data.todayTokensByModel || ({})
+      root.recentDays = data.recentDays || []
+      root.totalPrompts = data.totalPrompts || 0
+      root.totalSessions = data.totalSessions || 0
+      root.modelUsage = data.modelUsage || ({})
+
+      root.rateLimitPercent = data.rateLimitPercent ?? -1
+      root.rateLimitLabel = data.rateLimitLabel || ""
+      root.rateLimitResetAt = data.rateLimitResetAt || ""
+      root.secondaryRateLimitPercent = data.secondaryRateLimitPercent ?? -1
+      root.secondaryRateLimitLabel = data.secondaryRateLimitLabel || ""
+      root.secondaryRateLimitResetAt = data.secondaryRateLimitResetAt || ""
+
+      root.tierLabel = data.tierLabel || ""
+      root.usageStatusText = data.usageStatusText || ""
+      root.authHelpText = data.authHelpText || "Run `codex login` to authenticate."
+    } catch (e) {
+      console.error("model-usage/codex", "Failed to parse scanner output:", e, raw)
+      root.usageStatusText = "Codex scan failed"
+      root.authHelpText = String(e)
+      root.ready = true
+    }
+  }
+
+  function formatResetTime(isoTimestamp) {
+    if (!isoTimestamp)
+      return ""
+    const reset = new Date(isoTimestamp)
+    const now = new Date()
+    const diffMs = reset.getTime() - now.getTime()
+    if (diffMs <= 0)
+      return "now"
+    const hours = Math.floor(diffMs / 3600000)
+    const mins = Math.floor((diffMs % 3600000) / 60000)
+    if (hours > 24)
+      return Math.floor(hours / 24) + "d " + (hours % 24) + "h"
+    if (hours > 0)
+      return hours + "h " + mins + "m"
+    return mins + "m"
+  }
+}
diff --git a/shell/plugins/model-usage/scripts/claude_usage_scanner.py b/shell/plugins/model-usage/scripts/claude_usage_scanner.py
new file mode 100755
index 00000000..71d0a9e8
--- /dev/null
+++ b/shell/plugins/model-usage/scripts/claude_usage_scanner.py
@@ -0,0 +1,238 @@
+#!/usr/bin/env python3
+"""Stream Claude Code project JSONL files and emit compact usage stats.
+
+This replaces the QML-side `rg --json ... | StdioCollector` path, which can
+materialize 100MB+ of ripgrep JSON in the Quickshell process. The helper keeps
+that work in a short-lived Python process, parses line-by-line, and returns a
+single compact JSON object that matches the fields Claude.qml expects.
+"""
+
+from __future__ import annotations
+
+import argparse
+import datetime as dt
+import fcntl
+import hashlib
+import json
+import os
+import sys
+import time
+from pathlib import Path
+from typing import Any
+
+
+def expand_path(value: str) -> Path:
+    return Path(os.path.expandvars(os.path.expanduser(value))).resolve()
+
+
+def date_string(value: dt.date) -> str:
+    return value.strftime("%Y-%m-%d")
+
+
+def recent_date_strings() -> list[str]:
+    today = dt.datetime.now().date()
+    return [date_string(today - dt.timedelta(days=offset)) for offset in range(6, -1, -1)]
+
+
+def local_date_string() -> str:
+    return date_string(dt.datetime.now().date())
+
+
+def local_date_from_timestamp(value: Any) -> str:
+    if value is None:
+        return local_date_string()
+
+    if isinstance(value, (int, float)):
+        try:
+            seconds = float(value) / 1000.0 if float(value) > 10_000_000_000 else float(value)
+            return date_string(dt.datetime.fromtimestamp(seconds).date())
+        except Exception:
+            return local_date_string()
+
+    raw = str(value).strip()
+    if not raw:
+        return local_date_string()
+
+    # Claude JSONL timestamps are usually ISO-8601. Python accepts offsets but
+    # not a trailing Z until we normalize it to +00:00.
+    try:
+        parsed = dt.datetime.fromisoformat(raw.replace("Z", "+00:00"))
+        if parsed.tzinfo is not None:
+            parsed = parsed.astimezone()
+        return date_string(parsed.date())
+    except Exception:
+        return local_date_string()
+
+
+def usage_token(usage: dict[str, Any], snake_key: str, camel_key: str) -> int:
+    value = usage.get(snake_key, usage.get(camel_key, 0))
+    try:
+        return round(float(value or 0))
+    except Exception:
+        return 0
+
+
+def empty_bucket() -> dict[str, int]:
+    return {
+        "inputTokens": 0,
+        "outputTokens": 0,
+        "cacheReadInputTokens": 0,
+        "cacheCreationInputTokens": 0,
+    }
+
+
+def iter_jsonl_files(projects_path: Path):
+    if not projects_path.is_dir():
+        return
+    yield from projects_path.rglob("*.jsonl")
+
+
+def scan(projects_path: Path) -> dict[str, Any]:
+    today = local_date_string()
+    recent_dates = recent_date_strings()
+    recent = {day: {"date": day, "messageCount": 0} for day in recent_dates}
+
+    seen: set[str] = set()
+    sessions: set[str] = set()
+    today_sessions: set[str] = set()
+    today_tokens: dict[str, int] = {}
+    usage_by_model: dict[str, dict[str, int]] = {}
+    prompts = 0
+    today_prompt_count = 0
+    today_token_total = 0
+    malformed_lines = 0
+    scanned_files = 0
+
+    for path in iter_jsonl_files(projects_path) or []:
+        scanned_files += 1
+        try:
+            with path.open("r", encoding="utf-8", errors="replace") as handle:
+                for line_number, line in enumerate(handle, 1):
+                    # Cheap pre-filter before JSON parsing. Matches the old rg
+                    # search and keeps files with unrelated lines inexpensive.
+                    if '"usage":' not in line:
+                        continue
+
+                    try:
+                        entry = json.loads(line)
+                    except Exception:
+                        malformed_lines += 1
+                        continue
+
+                    message = entry.get("message") if isinstance(entry.get("message"), dict) else {}
+                    if entry.get("type") != "assistant" and message.get("role") != "assistant":
+                        continue
+
+                    usage = message.get("usage") or entry.get("usage")
+                    if not isinstance(usage, dict):
+                        continue
+
+                    message_id = message.get("id") or entry.get("messageId") or ""
+                    unique_key = str(message_id) if message_id else f"{path}:{entry.get('uuid') or entry.get('requestId') or line_number}"
+                    if unique_key in seen:
+                        continue
+                    seen.add(unique_key)
+
+                    input_tokens = usage_token(usage, "input_tokens", "inputTokens")
+                    output_tokens = usage_token(usage, "output_tokens", "outputTokens")
+                    cache_read = usage_token(usage, "cache_read_input_tokens", "cacheReadInputTokens")
+                    cache_write = usage_token(usage, "cache_creation_input_tokens", "cacheCreationInputTokens")
+                    total = input_tokens + output_tokens + cache_read + cache_write
+                    if total <= 0:
+                        continue
+
+                    model = str(message.get("model") or entry.get("model") or "claude")
+                    day = local_date_from_timestamp(entry.get("timestamp") or message.get("timestamp"))
+                    session_key = str(entry.get("sessionId") or path)
+                    sessions.add(session_key)
+                    prompts += 1
+
+                    bucket = usage_by_model.setdefault(model, empty_bucket())
+                    bucket["inputTokens"] += input_tokens
+                    bucket["outputTokens"] += output_tokens
+                    bucket["cacheReadInputTokens"] += cache_read
+                    bucket["cacheCreationInputTokens"] += cache_write
+
+                    if day in recent:
+                        # Preserve existing QML behavior: recentDays.messageCount
+                        # is actually a token total, despite the legacy name.
+                        recent[day]["messageCount"] += total
+
+                    if day == today:
+                        today_prompt_count += 1
+                        today_sessions.add(session_key)
+                        today_token_total += total
+                        today_tokens[model] = today_tokens.get(model, 0) + total
+        except Exception as exc:
+            print(f"Ignoring unreadable Claude project file {path}: {exc}", file=sys.stderr)
+
+    recent_days = [recent[day] for day in recent_dates]
+    return {
+        "schemaVersion": 1,
+        "todayPrompts": today_prompt_count,
+        "todaySessions": len(today_sessions),
+        "todayTotalTokens": today_token_total,
+        "todayTokensByModel": today_tokens,
+        "recentDays": recent_days,
+        "modelUsage": usage_by_model,
+        "totalPrompts": prompts,
+        "totalSessions": len(sessions),
+        "dailyActivity": recent_days,
+        "scannedFiles": scanned_files,
+        "malformedLines": malformed_lines,
+    }
+
+
+def cache_paths(projects_path: Path) -> tuple[Path, Path]:
+    cache_root = Path(os.environ.get("XDG_CACHE_HOME", Path.home() / ".cache")) / "omarchy" / "model-usage"
+    cache_root.mkdir(parents=True, exist_ok=True)
+    digest = hashlib.sha1(str(projects_path).encode("utf-8")).hexdigest()[:16]
+    return cache_root / f"claude-projects-{digest}.json", cache_root / f"claude-projects-{digest}.lock"
+
+
+def read_fresh_cache(path: Path, max_age_seconds: int) -> str | None:
+    if max_age_seconds <= 0 or not path.exists():
+        return None
+    try:
+        if time.time() - path.stat().st_mtime <= max_age_seconds:
+            return path.read_text(encoding="utf-8")
+    except Exception:
+        return None
+    return None
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("projects_path", nargs="?", default="~/.claude/projects")
+    parser.add_argument("--cache-seconds", type=int, default=20)
+    parser.add_argument("--force", action="store_true")
+    args = parser.parse_args()
+
+    projects_path = expand_path(args.projects_path)
+    cache_file, lock_file = cache_paths(projects_path)
+
+    if not args.force:
+        cached = read_fresh_cache(cache_file, args.cache_seconds)
+        if cached is not None:
+            print(cached, end="" if cached.endswith("\n") else "\n")
+            return 0
+
+    with lock_file.open("w") as lock:
+        fcntl.flock(lock, fcntl.LOCK_EX)
+        if not args.force:
+            cached = read_fresh_cache(cache_file, args.cache_seconds)
+            if cached is not None:
+                print(cached, end="" if cached.endswith("\n") else "\n")
+                return 0
+
+        summary = scan(projects_path)
+        output = json.dumps(summary, separators=(",", ":"), sort_keys=True) + "\n"
+        tmp = cache_file.with_suffix(".json.tmp")
+        tmp.write_text(output, encoding="utf-8")
+        tmp.replace(cache_file)
+        print(output, end="")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/shell/plugins/model-usage/scripts/codex_usage_scanner.py b/shell/plugins/model-usage/scripts/codex_usage_scanner.py
new file mode 100644
index 00000000..86440221
--- /dev/null
+++ b/shell/plugins/model-usage/scripts/codex_usage_scanner.py
@@ -0,0 +1,344 @@
+import json
+import os
+import select
+import shutil
+import subprocess
+import sys
+import time
+from datetime import datetime, timedelta, timezone
+from pathlib import Path
+
+
+def local_day(value):
+  if value is None:
+    return datetime.now().strftime("%Y-%m-%d")
+  if isinstance(value, (int, float)):
+    # pi message timestamps are milliseconds; Codex timestamps are usually seconds.
+    if value > 10_000_000_000:
+      value = value / 1000
+    return datetime.fromtimestamp(value).strftime("%Y-%m-%d")
+  text = str(value)
+  try:
+    if text.endswith("Z"):
+      dt = datetime.fromisoformat(text[:-1] + "+00:00")
+    else:
+      dt = datetime.fromisoformat(text)
+    if dt.tzinfo is not None:
+      dt = dt.astimezone()
+    return dt.strftime("%Y-%m-%d")
+  except Exception:
+    return datetime.now().strftime("%Y-%m-%d")
+
+
+def number(value):
+  try:
+    return int(value or 0)
+  except Exception:
+    return 0
+
+
+def model_name(raw):
+  value = str(raw or "codex")
+  return value if value else "codex"
+
+
+def runtime_env():
+  home = str(Path.home())
+  path_parts = [
+    os.environ.get("PATH", ""),
+    f"{home}/.local/bin",
+    f"{home}/.npm-global/bin",
+    f"{home}/.local/share/mise/shims",
+  ]
+  env = os.environ.copy()
+  env["PATH"] = os.pathsep.join(part for part in path_parts if part)
+  return env
+
+
+ENV = runtime_env()
+
+
+def find_command(name):
+  return shutil.which(name, path=ENV.get("PATH"))
+
+
+now = datetime.now()
+today = now.strftime("%Y-%m-%d")
+recent_dates = [(now - timedelta(days=offset)).strftime("%Y-%m-%d") for offset in range(6, -1, -1)]
+recent_set = set(recent_dates)
+recent = {day: {"date": day, "messageCount": 0} for day in recent_dates}
+today_tokens_by_model = {}
+model_usage = {}
+sessions_by_day = {day: set() for day in recent_dates}
+today_sessions = set()
+
+today_prompts = 0
+today_total_tokens = 0
+total_prompts = 0
+total_sessions = set()
+seen_pi_messages = set()
+usage_status = ""
+usage_help = ""
+
+
+def add_usage(day, session_key, model, input_tokens, output_tokens, cache_read, cache_write):
+  global today_prompts, today_total_tokens, total_prompts
+  total = input_tokens + output_tokens + cache_read + cache_write
+  total_prompts += 1
+  total_sessions.add(session_key)
+
+  bucket = model_usage.setdefault(model, {
+    "inputTokens": 0,
+    "outputTokens": 0,
+    "cacheReadInputTokens": 0,
+    "cacheCreationInputTokens": 0,
+  })
+  bucket["inputTokens"] += input_tokens
+  bucket["outputTokens"] += output_tokens
+  bucket["cacheReadInputTokens"] += cache_read
+  bucket["cacheCreationInputTokens"] += cache_write
+
+  if day in recent:
+    recent[day]["messageCount"] += total
+    sessions_by_day[day].add(session_key)
+
+  if day == today:
+    today_prompts += 1
+    today_sessions.add(session_key)
+    today_total_tokens += total
+    today_tokens_by_model[model] = today_tokens_by_model.get(model, 0) + total
+
+
+def scan_pi_sessions():
+  root = Path.home() / ".pi" / "agent" / "sessions"
+  if not root.exists():
+    return
+  try:
+    rg = find_command("rg") or "rg"
+    proc = subprocess.Popen(
+      [rg, "--json", "-e", '"provider":"openai-codex"', "-e", '"api":"openai-codex"', str(root)],
+      stdout=subprocess.PIPE,
+      stderr=subprocess.DEVNULL,
+      text=True,
+      errors="replace",
+      env=ENV,
+    )
+  except FileNotFoundError:
+    return
+
+  assert proc.stdout is not None
+  for raw in proc.stdout:
+    try:
+      event = json.loads(raw)
+      if event.get("type") != "match":
+        continue
+      line = event.get("data", {}).get("lines", {}).get("text", "")
+      path = event.get("data", {}).get("path", {}).get("text", "pi-session")
+      entry = json.loads(line)
+    except Exception:
+      continue
+
+    if entry.get("type") != "message":
+      continue
+    message_key = path + ":" + str(entry.get("id") or "")
+    if message_key in seen_pi_messages:
+      continue
+    seen_pi_messages.add(message_key)
+    message = entry.get("message") or {}
+    if message.get("role") != "assistant":
+      continue
+    provider = str(message.get("provider") or "")
+    api = str(message.get("api") or "")
+    if provider != "openai-codex" and not api.startswith("openai-codex"):
+      continue
+
+    usage = message.get("usage") or {}
+    if not usage:
+      continue
+    total = number(usage.get("totalTokens"))
+    input_tokens = number(usage.get("input"))
+    output_tokens = number(usage.get("output"))
+    cache_read = number(usage.get("cacheRead"))
+    cache_write = number(usage.get("cacheWrite"))
+    if total and not (input_tokens or output_tokens or cache_read or cache_write):
+      input_tokens = total
+    if not (input_tokens or output_tokens or cache_read or cache_write):
+      continue
+
+    day = local_day(entry.get("timestamp") or message.get("timestamp"))
+    session_key = path
+    add_usage(day, session_key, model_name(message.get("model")), input_tokens, output_tokens, cache_read, cache_write)
+
+  try:
+    proc.wait(timeout=1)
+  except Exception:
+    proc.kill()
+
+
+def scan_native_codex_sessions():
+  codex_home = Path(os.environ.get("CODEX_HOME") or (Path.home() / ".codex"))
+  roots = [codex_home / "sessions", codex_home / "archived_sessions"]
+  files = []
+  cutoff = time.time() - 30 * 24 * 60 * 60
+  for root in roots:
+    if not root.exists():
+      continue
+    for path in root.rglob("*.jsonl"):
+      try:
+        if path.stat().st_mtime >= cutoff:
+          files.append(path)
+      except OSError:
+        pass
+
+  for path in files:
+    current_model = "codex"
+    try:
+      with path.open(errors="replace") as handle:
+        for raw in handle:
+          try:
+            entry = json.loads(raw)
+          except Exception:
+            continue
+          if entry.get("type") == "turn_context":
+            payload = entry.get("payload") or {}
+            current_model = model_name(payload.get("model") or payload.get("model_slug") or current_model)
+            continue
+          payload = entry.get("payload") or entry
+          if entry.get("type") == "response_item" and isinstance(payload, dict):
+            payload = payload.get("payload") or payload
+          if not isinstance(payload, dict):
+            continue
+          if payload.get("type") != "token_count":
+            continue
+          info = payload.get("info") or {}
+          usage = info.get("total_token_usage") or {}
+          input_tokens = number(usage.get("input_tokens"))
+          output_tokens = number(usage.get("output_tokens")) + number(usage.get("reasoning_output_tokens"))
+          cache_read = number(usage.get("cached_input_tokens"))
+          cache_write = 0
+          if not (input_tokens or output_tokens or cache_read):
+            continue
+          day = local_day(entry.get("timestamp") or path.stat().st_mtime)
+          add_usage(day, str(path), current_model, input_tokens, output_tokens, cache_read, cache_write)
+    except Exception:
+      continue
+
+
+def rpc_request(proc, request_id, method, params=None, timeout=8):
+  payload = {"id": request_id, "method": method, "params": params or {}}
+  proc.stdin.write(json.dumps(payload) + "\n")
+  proc.stdin.flush()
+  deadline = time.time() + timeout
+  while time.time() < deadline:
+    ready, _, _ = select.select([proc.stdout], [], [], 0.25)
+    if not ready:
+      continue
+    line = proc.stdout.readline()
+    if not line:
+      break
+    try:
+      message = json.loads(line)
+    except Exception:
+      continue
+    if message.get("id") == request_id:
+      return message
+  raise TimeoutError(method)
+
+
+def fetch_codex_rpc():
+  result = {
+    "rateLimitPercent": -1,
+    "rateLimitLabel": "",
+    "rateLimitResetAt": "",
+    "secondaryRateLimitPercent": -1,
+    "secondaryRateLimitLabel": "",
+    "secondaryRateLimitResetAt": "",
+    "tierLabel": "",
+  }
+  codex = find_command("codex")
+  if not codex:
+    result["usageStatusText"] = "Codex unavailable"
+    result["authHelpText"] = "codex not found in PATH"
+    return result
+
+  try:
+    proc = subprocess.Popen(
+      [codex, "-s", "read-only", "-a", "untrusted", "app-server"],
+      stdin=subprocess.PIPE,
+      stdout=subprocess.PIPE,
+      stderr=subprocess.DEVNULL,
+      text=True,
+      env=ENV,
+    )
+  except Exception as exc:
+    result["usageStatusText"] = "Codex unavailable"
+    result["authHelpText"] = str(exc)
+    return result
+
+  try:
+    rpc_request(proc, 1, "initialize", {"clientInfo": {"name": "omarchy-model-usage", "version": "1"}}, timeout=8)
+    proc.stdin.write(json.dumps({"method": "initialized", "params": {}}) + "\n")
+    proc.stdin.flush()
+    account_msg = rpc_request(proc, 2, "account/read", timeout=4)
+    limits_msg = rpc_request(proc, 3, "account/rateLimits/read", timeout=4)
+
+    account = (account_msg.get("result") or {}).get("account") or {}
+    limits = (limits_msg.get("result") or {}).get("rateLimits") or {}
+    plan = limits.get("planType") or account.get("planType") or account.get("type") or ""
+    result["tierLabel"] = str(plan) if plan else ""
+
+    def fill(prefix, window):
+      if not isinstance(window, dict):
+        return
+      used = window.get("usedPercent")
+      if used is not None:
+        result[prefix + "Percent"] = float(used) / 100.0
+      mins = number(window.get("windowDurationMins"))
+      if mins:
+        if mins == 10080:
+          result[prefix + "Label"] = "Weekly (7-day)"
+        elif mins % 60 == 0:
+          result[prefix + "Label"] = f"{mins // 60}h window"
+        else:
+          result[prefix + "Label"] = f"{mins}m window"
+      reset = window.get("resetsAt")
+      if reset:
+        result[prefix + "ResetAt"] = datetime.fromtimestamp(number(reset), timezone.utc).isoformat()
+
+    fill("rateLimit", limits.get("primary"))
+    fill("secondaryRateLimit", limits.get("secondary"))
+  except Exception as exc:
+    result["usageStatusText"] = "Codex limits unavailable"
+    result["authHelpText"] = str(exc)
+  finally:
+    try:
+      proc.terminate()
+      proc.wait(timeout=1)
+    except Exception:
+      try:
+        proc.kill()
+      except Exception:
+        pass
+  return result
+
+
+scan_pi_sessions()
+scan_native_codex_sessions()
+rpc = fetch_codex_rpc()
+
+out = {
+  "ready": True,
+  "hasLocalStats": True,
+  "todayPrompts": today_prompts,
+  "todaySessions": len(today_sessions),
+  "todayTotalTokens": today_total_tokens,
+  "todayTokensByModel": today_tokens_by_model,
+  "recentDays": [recent[day] for day in recent_dates],
+  "totalPrompts": total_prompts,
+  "totalSessions": len(total_sessions),
+  "modelUsage": model_usage,
+  "usageStatusText": usage_status,
+  "authHelpText": usage_help,
+}
+out.update(rpc)
+print(json.dumps(out, separators=(",", ":")))
diff --git a/shell/plugins/notifications/BarWidget.qml b/shell/plugins/notifications/BarWidget.qml
new file mode 100644
index 00000000..282ce215
--- /dev/null
+++ b/shell/plugins/notifications/BarWidget.qml
@@ -0,0 +1,425 @@
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+import qs.Commons
+import qs.Ui
+import "NotificationLogic.js" as NotificationLogic
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.notifications"
+
+
+  property bool popupOpen: false
+  function close() { popupOpen = false }
+
+  // Always default to the pending tab when there's anything unseen, no
+  // matter how the popup was opened (click, keybind/IPC, or the close
+  // path). Keeps the spec from drifting based on the user's last manual
+  // tab selection.
+  onPopupOpenChanged: {
+    if (popupOpen) {
+      activeTab = pendingCount > 0 ? "pending" : "past"
+    }
+  }
+
+  // Look up the long-running notifications service through the shell host.
+  readonly property var hostShell: bar && bar.shell ? bar.shell : null
+  readonly property var notificationService: hostShell && typeof hostShell.firstPartyServiceFor === "function"
+    ? hostShell.firstPartyServiceFor("omarchy.notifications")
+    : null
+
+  function isChromiumDerived(app, appIcon) {
+    return NotificationLogic.isChromiumDerived(app, appIcon)
+  }
+
+  function sanitizeBody(s, app, appIcon) {
+    return NotificationLogic.sanitizeBody(s, app, appIcon)
+  }
+
+  function notificationIconSource(icon) {
+    var value = String(icon || "")
+    if (value.length === 0) return ""
+    if (value.indexOf("file://") === 0 || value.indexOf("image://") === 0) return value
+    if (value.charAt(0) === "/") return Util.fileUrl(value)
+    return Quickshell.iconPath(value, true)
+  }
+
+  readonly property int pendingCount: notificationService ? notificationService.pendingModel.count : 0
+  readonly property int pastCount: notificationService ? notificationService.pastModel.count : 0
+  readonly property bool dnd: notificationService ? notificationService.doNotDisturb : false
+
+  // Which tab is active in the popup. Auto-selects pending when there's
+  // something unseen; otherwise opens past.
+  property string activeTab: "pending"
+
+  readonly property string icon: {
+    if (dnd) return "󰂛"
+    if (pendingCount > 0) return "󱅫"
+    return "󰂚"
+  }
+
+  // Theme palette (mirrors HistoryPanel's tokens so the popup matches the
+  // rest of the notification stack).
+  readonly property color colForeground: Color.foreground
+  readonly property color colDim: Qt.darker(Color.foreground, 1.4)
+  readonly property color colBorder: Style.normalBorderFor(Color.foreground, Color.accent)
+  readonly property color colSurface: Style.normalFillFor(Color.foreground, Color.accent)
+  readonly property color colAccent: Color.accent
+  readonly property int cardRadius: notificationService ? notificationService.cornerRadius : 0
+
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: root.icon
+    active: root.pendingCount > 0 && !root.dnd
+    tooltipText: root.dnd ? "Do Not Disturb"
+      : (root.pendingCount > 0 ? root.pendingCount + " pending" : "No notifications")
+
+    onPressed: function(b) {
+      if (b === Qt.RightButton) {
+        if (root.notificationService) {
+          root.notificationService.setDoNotDisturb(!root.notificationService.doNotDisturb)
+        }
+      } else {
+        root.popupOpen = !root.popupOpen
+      }
+    }
+  }
+
+  // Service-side IPC (omarchy-shell notifications showHistory) flips
+  // historyOpenRequested; we toggle our local popup state from here so the
+  // keybind path lands in the same PopupCard the click path uses.
+  Connections {
+    target: root.notificationService
+    ignoreUnknownSignals: true
+    function onHistoryOpenRequested() {
+      root.popupOpen = true
+    }
+  }
+
+  PopupCard {
+    id: popup
+    anchorItem: button
+    bar: root.bar
+    owner: root
+    open: root.popupOpen
+    contentWidth: popup.fittedContentWidth(Style.space(440))
+    contentHeight: popup.cappedContentHeight(Style.space(540))
+
+    ColumnLayout {
+      anchors.fill: parent
+      spacing: Style.space(10)
+
+      // ----------------------------------------- header
+      RowLayout {
+        Layout.fillWidth: true
+        spacing: Style.space(8)
+
+        Text {
+          text: "Notifications"
+          font.family: root.bar ? root.bar.fontFamily : ""
+          color: root.colForeground
+          font.pixelSize: Style.font.title
+          font.bold: true
+        }
+
+        Item { Layout.fillWidth: true }
+
+        BorderSurface {
+          id: dndPill
+          Layout.preferredHeight: Math.max(Style.space(24), Style.font.bodySmall + Style.spacing.controlPaddingY * 2)
+          Layout.preferredWidth: dndLabel.implicitWidth + dndGlyph.implicitWidth + Style.space(18)
+          radius: Math.min(Style.space(12), root.cardRadius + Style.space(6))
+          color: dndOn ? root.colAccent : root.colSurface
+          borderSpec: Border.flat(dndOn ? root.colAccent : root.colBorder, Style.normalBorderWidth)
+
+          readonly property bool dndOn: !!root.notificationService && root.notificationService.doNotDisturb
+
+          Row {
+            anchors.centerIn: parent
+            spacing: Style.space(4)
+
+            Text {
+              id: dndGlyph
+              text: dndPill.dndOn ? "󰂛" : "󰂚"
+              font.family: root.bar ? root.bar.fontFamily : ""
+              color: dndPill.dndOn ? Color.background : root.colDim
+              font.pixelSize: Style.font.body
+              anchors.verticalCenter: parent.verticalCenter
+            }
+
+            Text {
+              id: dndLabel
+              text: dndPill.dndOn ? "DND on" : "DND off"
+              font.family: root.bar ? root.bar.fontFamily : ""
+              color: dndPill.dndOn ? Color.background : root.colDim
+              font.pixelSize: Style.font.caption
+              font.bold: true
+              anchors.verticalCenter: parent.verticalCenter
+            }
+          }
+
+          MouseArea {
+            anchors.fill: parent
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
+            onClicked: if (root.notificationService) root.notificationService.setDoNotDisturb(!dndPill.dndOn)
+          }
+        }
+      }
+
+      // ----------------------------------------- tabs
+      RowLayout {
+        Layout.fillWidth: true
+        spacing: 0
+
+        Repeater {
+          model: [
+            { key: "pending", label: "Pending",  count: root.pendingCount },
+            { key: "past",    label: "Recently", count: root.pastCount }
+          ]
+          delegate: Rectangle {
+            required property var modelData
+            readonly property bool isActive: root.activeTab === modelData.key
+
+            Layout.fillWidth: true
+            Layout.preferredHeight: Math.max(Style.space(30), Style.font.body + Style.spacing.controlPaddingY * 2)
+            color: "transparent"
+
+            Text {
+              anchors.centerIn: parent
+              text: modelData.label + (modelData.count > 0 ? "  " + modelData.count : "")
+              font.family: root.bar ? root.bar.fontFamily : ""
+              color: parent.isActive ? root.colForeground : root.colDim
+              font.pixelSize: Style.font.body
+              font.bold: parent.isActive
+            }
+
+            Rectangle {
+              anchors.left: parent.left
+              anchors.right: parent.right
+              anchors.bottom: parent.bottom
+              height: Math.max(1, Style.space(2))
+              color: parent.isActive ? root.colAccent : root.colBorder
+              opacity: parent.isActive ? 1 : 0.4
+            }
+
+            MouseArea {
+              anchors.fill: parent
+              cursorShape: Qt.PointingHandCursor
+              onClicked: root.activeTab = modelData.key
+            }
+          }
+        }
+      }
+
+      // ----------------------------------------- action row
+      RowLayout {
+        Layout.fillWidth: true
+        visible: (root.activeTab === "pending" && root.pendingCount > 0)
+              || (root.activeTab === "past" && root.pastCount > 0)
+        spacing: Style.space(8)
+
+        Item { Layout.fillWidth: true }
+
+        BorderSurface {
+          Layout.preferredWidth: actionLabel.implicitWidth + Style.space(16)
+          Layout.preferredHeight: Math.max(Style.space(22), Style.font.bodySmall + Style.spacing.controlPaddingY * 2)
+          radius: Math.min(Style.space(6), root.cardRadius)
+          color: actionArea.containsMouse ? root.colBorder : "transparent"
+          borderSpec: Border.flat(root.colBorder, Style.normalBorderWidth)
+
+          Text {
+            id: actionLabel
+            anchors.centerIn: parent
+            text: root.activeTab === "pending" ? "Mark all as seen" : "Clear recent"
+            font.family: root.bar ? root.bar.fontFamily : ""
+            color: root.colForeground
+            font.pixelSize: Style.font.caption
+          }
+
+          MouseArea {
+            id: actionArea
+            anchors.fill: parent
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
+            onClicked: {
+              if (!root.notificationService) return
+              if (root.activeTab === "pending") root.notificationService.markAllSeen()
+              else root.notificationService.clearPast()
+            }
+          }
+        }
+      }
+
+      // ----------------------------------------- list
+      ListView {
+        id: listView
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        clip: true
+        spacing: Style.space(8)
+
+        readonly property bool onPending: root.activeTab === "pending"
+        model: !root.notificationService ? null
+              : (onPending ? root.notificationService.pendingModel : root.notificationService.pastModel)
+        visible: count > 0
+
+        delegate: BorderSurface {
+          id: rowCard
+          required property int index
+          required property string app
+          required property string appIcon
+          required property string summary
+          required property string body
+          required property string image
+          required property int urgency
+          required property double timestamp
+
+          readonly property bool hasMedia: image.length > 0 && (
+            image.indexOf("image://icon//") === 0 || image.indexOf("file://") === 0)
+          readonly property string smallIconSource: image.length > 0 ? image : root.notificationIconSource(appIcon)
+          readonly property bool hasIcon: !hasMedia && smallIconSource.length > 0
+          readonly property string sanitizedBody: root.sanitizeBody(body, app, appIcon)
+
+          width: listView.width
+          implicitHeight: rowContent.implicitHeight + Style.spacing.panelGap
+          radius: root.cardRadius
+          color: "transparent"
+          borderSpec: Border.flat(root.colBorder, Style.normalBorderWidth)
+
+          MouseArea {
+            anchors.fill: parent
+            cursorShape: Qt.PointingHandCursor
+            onClicked: { /* no-op */ }
+          }
+
+          RowLayout {
+            id: rowContent
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.leftMargin: rowCard.borderLeft + Style.space(12)
+            anchors.rightMargin: rowCard.borderRight + Style.space(12)
+            spacing: Style.space(10)
+
+            Item {
+              id: imageSlot
+              Layout.preferredWidth: Style.space(32)
+              Layout.preferredHeight: Style.space(32)
+              Layout.alignment: Qt.AlignVCenter
+              // Hide on icon load failure so unresolved themed-icon names
+              // don't render Qt's broken-image placeholder.
+              visible: (rowCard.hasIcon || rowCard.hasMedia) && rowIconImage.status !== Image.Error
+
+              Image {
+                id: rowIconImage
+                anchors.fill: parent
+                source: rowCard.hasMedia ? rowCard.image : rowCard.smallIconSource
+                fillMode: rowCard.hasMedia ? Image.PreserveAspectCrop : Image.PreserveAspectFit
+                sourceSize.width: imageSlot.width * Screen.devicePixelRatio
+                sourceSize.height: imageSlot.height * Screen.devicePixelRatio
+                asynchronous: true
+                smooth: true
+              }
+            }
+
+            ColumnLayout {
+              Layout.fillWidth: true
+              spacing: Style.space(2)
+
+              Text {
+                Layout.fillWidth: true
+                visible: rowCard.summary.length > 0
+                text: rowCard.summary
+                font.family: root.bar ? root.bar.fontFamily : ""
+                color: root.colForeground
+                font.pixelSize: Style.font.subtitle
+                font.bold: true
+                wrapMode: Text.WordWrap
+                elide: Text.ElideRight
+                maximumLineCount: 1
+              }
+
+              Text {
+                Layout.fillWidth: true
+                visible: rowCard.sanitizedBody.length > 0
+                text: rowCard.sanitizedBody
+                font.family: root.bar ? root.bar.fontFamily : ""
+                textFormat: Text.PlainText
+                color: root.colDim
+                font.pixelSize: Style.font.bodySmall
+                wrapMode: Text.WordWrap
+                elide: Text.ElideRight
+                maximumLineCount: 2
+              }
+            }
+
+            Rectangle {
+              Layout.preferredWidth: Style.space(18)
+              Layout.preferredHeight: Style.space(18)
+              Layout.alignment: Qt.AlignVCenter
+              radius: Math.min(4, root.cardRadius)
+              color: rowCloseArea.containsMouse ? root.colBorder : "transparent"
+
+              Text {
+                anchors.centerIn: parent
+                text: "✕"
+                font.family: root.bar ? root.bar.fontFamily : ""
+                color: root.colDim
+                font.pixelSize: Style.font.bodySmall
+              }
+
+              MouseArea {
+                id: rowCloseArea
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onClicked: {
+                  if (!root.notificationService) return
+                  if (listView.onPending) root.notificationService.dismissPending(rowCard.index)
+                  else root.notificationService.dismissPast(rowCard.index)
+                }
+              }
+            }
+          }
+        }
+      }
+
+      // ----------------------------------------- empty state
+      Item {
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        visible: listView.count === 0
+
+        ColumnLayout {
+          anchors.centerIn: parent
+          spacing: Style.space(6)
+
+          Text {
+            Layout.alignment: Qt.AlignHCenter
+            text: "󰂚"
+            font.family: root.bar ? root.bar.fontFamily : ""
+            color: root.colBorder
+            font.pixelSize: Style.font.displayLarge
+          }
+
+          Text {
+            Layout.alignment: Qt.AlignHCenter
+            text: root.activeTab === "pending"
+              ? "Nothing waiting for you"
+              : "Nothing recent"
+            font.family: root.bar ? root.bar.fontFamily : ""
+            color: root.colDim
+            font.pixelSize: Style.font.body
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/notifications/NotificationLogic.js b/shell/plugins/notifications/NotificationLogic.js
new file mode 100644
index 00000000..53def626
--- /dev/null
+++ b/shell/plugins/notifications/NotificationLogic.js
@@ -0,0 +1,193 @@
+function isChromiumDerived(app, appIcon) {
+  var source = (String(app || "") + "\n" + String(appIcon || "")).toLowerCase()
+  return source.indexOf("chrom") >= 0 || source.indexOf("brave") >= 0 ||
+         source.indexOf("vivaldi") >= 0 || source.indexOf("microsoft-edge") >= 0 ||
+         source.indexOf("opera") >= 0
+}
+
+function sanitizeBody(body, app, appIcon) {
+  var text = String(body || "").replace(/<img[^>]*>/gi, "")
+  if (!isChromiumDerived(app, appIcon)) return text
+
+  return text
+    .replace(/^\s*<a\b[^>]*>\s*(?:https?:\/\/|www\.)?(?:[a-z0-9-]+\.)+[a-z]{2,}(?::\d+)?(?:\/[^<\s]*)?\s*<\/a>\s*/i, "")
+    .replace(/^\s*(?:https?:\/\/|www\.)?(?:[a-z0-9-]+\.)+[a-z]{2,}(?::\d+)?(?:\/\S*)?\s+/i, "")
+}
+
+function summaryStartsWithGlyph(summary) {
+  var text = String(summary || "").replace(/^\s+/, "")
+  if (!text) return false
+
+  var offset = 1
+  var first = text.charCodeAt(0)
+  if (first >= 0xd800 && first <= 0xdbff && text.length > 1) offset = 2
+
+  var spaces = 0
+  while (offset < text.length && text.charAt(offset) === " ") {
+    spaces++
+    offset++
+  }
+
+  return spaces >= 2
+}
+
+function shouldBypassDnd(notification, criticalUrgency) {
+  var appName = String((notification && notification.appName) || "")
+  if (appName === "omarchy-action") return true
+  return appName === "notify-send" && notification && notification.urgency === criticalUrgency
+}
+
+function isEphemeralApp(appName) {
+  var name = String(appName || "")
+  return name === "notify-send" || name === "omarchy-action"
+}
+
+function glyphFromHints(hints) {
+  try {
+    if (hints) {
+      var glyph = hints["omarchy-glyph"]
+      if (glyph !== undefined && glyph !== null) return String(glyph)
+    }
+  } catch (e) {
+  }
+  return ""
+}
+
+function shouldRenderCompactGlyph(glyph, iconSource) {
+  return String(glyph || "").length > 0 && String(iconSource || "").length === 0
+}
+
+function snapshotOf(notification, timestamp) {
+  var n = notification || {}
+  var id = n.id || 0
+  var expireTimeout = Number(n.expireTimeout || 0)
+  if (!isFinite(expireTimeout) || expireTimeout < 0) expireTimeout = 0
+  return {
+    id: id,
+    originalId: id,
+    app: n.appName || "",
+    appIcon: n.appIcon || "",
+    summary: String(n.summary || ""),
+    body: n.body || "",
+    image: n.image || "",
+    glyph: glyphFromHints(n.hints),
+    urgency: n.urgency,
+    expireTimeout: expireTimeout,
+    timestamp: timestamp === undefined ? Date.now() : timestamp,
+    ref: notification
+  }
+}
+
+function historyEntry(value, normalUrgency) {
+  var e = value || {}
+  return {
+    id: e.id || 0,
+    originalId: e.originalId || e.id || 0,
+    app: e.app || "",
+    appIcon: e.appIcon || "",
+    summary: e.summary || "",
+    body: e.body || "",
+    image: e.image || "",
+    glyph: e.glyph || "",
+    urgency: typeof e.urgency === "number" ? e.urgency : normalUrgency,
+    expireTimeout: 0,
+    timestamp: e.timestamp || 0,
+    ref: null
+  }
+}
+
+function dedupeByOriginalId(rows) {
+  var values = Array.isArray(rows) ? rows : []
+  var keep = {}
+  for (var i = 0; i < values.length; i++) {
+    var row = values[i]
+    if (!row) continue
+    var key = row.originalId
+    if (key === undefined || key === null) key = "_" + i
+    var prior = keep[key]
+    if (!prior || (row.timestamp || 0) >= (prior.timestamp || 0)) keep[key] = row
+  }
+
+  var out = []
+  for (var id in keep) out.push(keep[id])
+  out.sort(function(a, b) { return (b.timestamp || 0) - (a.timestamp || 0) })
+  return out
+}
+
+function parseHistory(raw, normalUrgency, historyCap) {
+  var text = String(raw || "").trim()
+  var cap = historyCap === undefined || historyCap === null ? 100 : Number(historyCap)
+  if (isNaN(cap)) cap = 100
+  cap = Math.max(0, cap)
+  if (!text) return { empty: true, error: false, dnd: null, pending: [], past: [], hadDuplicates: false }
+
+  try {
+    var parsed = JSON.parse(text)
+    var pendingRaw = (parsed && Array.isArray(parsed.pending)) ? parsed.pending : []
+    var pastRaw = (parsed && Array.isArray(parsed.past)) ? parsed.past : []
+    if (parsed && Array.isArray(parsed.entries)) pastRaw = pastRaw.concat(parsed.entries)
+
+    var pendingDeduped = dedupeByOriginalId(pendingRaw)
+    var pastDeduped = dedupeByOriginalId(pastRaw)
+
+    return {
+      empty: false,
+      error: false,
+      dnd: parsed && typeof parsed.dnd === "boolean" ? parsed.dnd : null,
+      pending: pendingDeduped.slice(0, cap).map(function(entry) { return historyEntry(entry, normalUrgency) }),
+      past: pastDeduped.slice(0, cap).map(function(entry) { return historyEntry(entry, normalUrgency) }),
+      hadDuplicates: pendingDeduped.length !== pendingRaw.length || pastDeduped.length !== pastRaw.length
+    }
+  } catch (e) {
+    return { empty: false, error: true, errorMessage: String(e), dnd: null, pending: [], past: [], hadDuplicates: false }
+  }
+}
+
+function dumpRows(rows) {
+  var values = Array.isArray(rows) ? rows : []
+  var out = []
+  for (var i = 0; i < values.length; i++) {
+    var r = values[i]
+    if (!r) continue
+    out.push({
+      id: r.id,
+      originalId: r.originalId,
+      app: r.app,
+      appIcon: r.appIcon,
+      summary: r.summary,
+      body: r.body,
+      image: r.image,
+      glyph: r.glyph || "",
+      urgency: r.urgency,
+      timestamp: r.timestamp
+    })
+  }
+  return out
+}
+
+function imageExtension(srcPath) {
+  var lower = String(srcPath || "").toLowerCase()
+  var dot = lower.lastIndexOf(".")
+  if (dot < 0) return "png"
+  var ext = lower.substring(dot + 1)
+  if (ext.length === 0 || ext.length > 5) return "png"
+  return ext
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    isChromiumDerived: isChromiumDerived,
+    sanitizeBody: sanitizeBody,
+    summaryStartsWithGlyph: summaryStartsWithGlyph,
+    shouldBypassDnd: shouldBypassDnd,
+    isEphemeralApp: isEphemeralApp,
+    glyphFromHints: glyphFromHints,
+    shouldRenderCompactGlyph: shouldRenderCompactGlyph,
+    snapshotOf: snapshotOf,
+    historyEntry: historyEntry,
+    dedupeByOriginalId: dedupeByOriginalId,
+    parseHistory: parseHistory,
+    dumpRows: dumpRows,
+    imageExtension: imageExtension
+  }
+}
diff --git a/shell/plugins/notifications/Service.qml b/shell/plugins/notifications/Service.qml
new file mode 100644
index 00000000..501b2b28
--- /dev/null
+++ b/shell/plugins/notifications/Service.qml
@@ -0,0 +1,828 @@
+// Notification service for the omarchy shell.
+
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import Quickshell.Services.Notifications
+import qs.Commons
+
+import "components"
+import "NotificationLogic.js" as NotificationLogic
+
+Item {
+  id: service
+
+  // Injected by omarchy-shell (the first-party service loader).
+  property var shell: null
+
+  property string omarchyPath: Quickshell.env("OMARCHY_PATH")
+  readonly property string home: Quickshell.env("HOME")
+  // History + DND live under XDG_STATE_HOME: they're persistent user state
+  // (history of received notifications, last-set DND preference), not
+  // regeneratable cache that a `rm -rf ~/.cache` should wipe.
+  readonly property string stateDir: home + "/.local/state/omarchy/"
+  readonly property string historyPath: stateDir + "notifications.json"
+  // Thumbnails copied from /tmp screenshots are genuinely disposable — if
+  // they vanish the row just renders without an image — so they stay in
+  // ~/.cache where regeneratable artifacts belong.
+  readonly property string cacheDir: home + "/.cache/omarchy/"
+  readonly property string imageCacheDir: cacheDir + "notification-images/"
+  // Corner radius is shared with the menu and shell panels.
+  // It mirrors Hyprland's current decoration:rounding value.
+  readonly property int cornerRadius: Style.cornerRadius
+  // Surfaces anchor relative to the omarchy bar so popups and history land
+  // alongside the other shell panels rather than on top of the bar itself.
+  // Falls back to the bar's default size (26 horizontal / 28 vertical) when
+  // shell.bar isn't reachable so the popup never lands on top of the bar.
+  readonly property string barPosition: shell && shell.barConfig ? String(shell.barConfig.position || "top") : "top"
+  readonly property bool barVertical: barPosition === "left" || barPosition === "right"
+  readonly property int defaultBarSize: barVertical ? Style.bar.sizeVertical : Style.bar.sizeHorizontal
+  readonly property int liveBarSize: shell && shell.bar && !shell.bar.barHidden ? Math.max(0, shell.bar.barSize) : defaultBarSize
+  readonly property int barClearance: liveBarSize + Style.gapsOut
+
+  // Fired by IPC (`omarchy-shell notifications showHistory`) so the
+  // bar widget can drop its PopupCard from the same anchor a click would.
+  signal historyOpenRequested()
+
+  // PersistentProperties handles in-process QML reloads. The on-disk
+  // notifications.json file is the cross-restart backstop — its `dnd` key
+  // is hydrated into persisted.doNotDisturb on startup and written back via
+  // the same debounced save timer used for history entries.
+  PersistentProperties {
+    id: persisted
+    reloadableId: "omarchy-notifications"
+    property bool doNotDisturb: false
+    onDoNotDisturbChanged: {
+      // Suppress the write that load-time hydration would otherwise trigger.
+      if (service._hydrating) return
+      service.scheduleHistorySave()
+    }
+  }
+
+  // Guards onDoNotDisturbChanged while we're hydrating from disk so the
+  // hydration assignment doesn't immediately schedule a write-back.
+  property bool _hydrating: false
+
+  readonly property alias doNotDisturb: persisted.doNotDisturb
+
+  function setDoNotDisturb(value) {
+    persisted.doNotDisturb = !!value
+  }
+
+  // popupModel feeds the on-screen toast stack.
+  // pendingModel  = notifications received but not yet "seen" by the user.
+  //                 Anything DND-suppressed lands here and stays there until
+  //                 the user reviews it; anything that pops up also lives
+  //                 here until the popup dismisses, then moves to pastModel.
+  // pastModel     = notifications the user has already seen on-screen.
+  //                 Surfaced under the Past tab in the history panel.
+  //
+  // Aliased as properties so the bar widget and HistoryPanel (outside this
+  // Item's id scope) can bind to them. QML ids aren't visible to external
+  // consumers without the alias.
+  property alias popupModel: popupModel
+  property alias pendingModel: pendingModel
+  property alias pastModel: pastModel
+  ListModel { id: popupModel }
+  ListModel { id: pendingModel }
+  ListModel { id: pastModel }
+
+  readonly property int historyCap: 100
+  property var imageCacheQueue: []
+
+  readonly property int lowPopupDuration: 5000
+  readonly property int normalPopupDuration: 8000
+  readonly property int maxPopupDuration: 30000
+
+  function durationFor(urgency, expireTimeout) {
+    switch (urgency) {
+    case NotificationUrgency.Critical:
+      return 0
+    case NotificationUrgency.Low:
+      return Math.min(maxPopupDuration, Math.max(lowPopupDuration, requestedDuration(expireTimeout)))
+    default:
+      return Math.min(maxPopupDuration, Math.max(normalPopupDuration, requestedDuration(expireTimeout)))
+    }
+  }
+
+  function requestedDuration(expireTimeout) {
+    var seconds = Number(expireTimeout || 0)
+    if (!isFinite(seconds) || seconds <= 0) return 0
+    return Math.round(seconds * 1000)
+  }
+
+  // DND bypass: only let through notifications we trust to be intentional
+  // and rare.
+  //   - omarchy-action: a user-action confirmation toast ("Theme changed",
+  //     "Screenshot saved"). The user JUST did something — their feedback
+  //     should show.
+  //   - urgency=critical AND app_name=notify-send: bare-CLI emergency alerts.
+  //     Trusted because it's almost always omarchy or system shell scripts —
+  //     chat apps set app_name to their brand (Discord/Slack/Vesktop), which
+  //     falls outside this rule.
+  function shouldBypassDnd(notification) {
+    return NotificationLogic.shouldBypassDnd(notification, NotificationUrgency.Critical)
+  }
+
+  function snapshotOf(notification) {
+    return NotificationLogic.snapshotOf(notification, Date.now())
+  }
+
+  function handleNotification(notification) {
+    // Without `tracked = true` the Notification object is destroyed as soon
+    // as this signal handler returns, which would null out the `ref` we just
+    // captured for the popup card.
+    notification.tracked = true
+    var snapshot = snapshotOf(notification)
+    // History is for notifications from real apps (Slack, Discord, mailer,
+    // etc.) — things the user might want to look back at. Skip the pending
+    // / past bookkeeping when:
+    //   - the freedesktop `transient` hint is set ("popup only, don't store")
+    //   - app_name is "notify-send" (the CLI default — means the sender
+    //     didn't bother declaring an identity, so it's almost certainly
+    //     ephemeral test/feedback noise)
+    //   - app_name is "omarchy-action" (Omarchy's own user-action
+    //     toasts — the user just triggered them, they don't
+    //     need to be archived)
+    var transient = false
+    try {
+      transient = !!(notification.hints && notification.hints["transient"])
+    } catch (e) { transient = false }
+    var appName = String(notification.appName || "")
+    var ephemeralApp = NotificationLogic.isEphemeralApp(appName)
+    if (transient || ephemeralApp) {
+      if (service.doNotDisturb && !shouldBypassDnd(notification)) {
+        notification.tracked = false
+        return
+      }
+      Qt.callLater(function() {
+        removeByOriginalId(popupModel, snapshot.originalId)
+        popupModel.insert(0, snapshot)
+      })
+      return
+    }
+
+    // Pending first, unconditionally. DND only suppresses the toast — the
+    // record still has to land somewhere the user can review later.
+    addToPending(snapshot)
+
+    // Kick off a copy of any /tmp screenshot into the persistent image cache.
+    // The cp races the popup; the popup keeps the original path so it always
+    // renders, and the history row gets rewritten to the cached path once
+    // cp.exits.
+    maybeCacheImage(snapshot)
+
+    // DND bypass rules — see ~/Work/omarchy/dnd-fix-plan.md. The pending
+    // entry already captured this notification above; we just decide here
+    // whether to also pop a toast. Chat apps abuse urgency=critical to
+    // force visibility, so critical alone isn't enough — we also require
+    // the sender to be CLI-style. See shouldBypassDnd().
+    if (service.doNotDisturb && !shouldBypassDnd(notification)) {
+      notification.tracked = false
+      return
+    }
+
+    // Qt.callLater avoids "QV4::Object::insertMember" crashes when a
+    // Repeater is mid-incubation while we mutate its model.
+    Qt.callLater(function() {
+      removeByOriginalId(popupModel, snapshot.originalId)
+      popupModel.insert(0, snapshot)
+    })
+  }
+
+  // Remove every row in `model` whose originalId matches. Chat apps reuse
+  // `replaces_id` per the freedesktop spec to update a single notification
+  // in place — without this, every Discord/Slack ping leaves a fresh row
+  // behind and pending fills with hundreds of duplicates.
+  function removeByOriginalId(model, originalId) {
+    for (var i = model.count - 1; i >= 0; i--) {
+      var row = model.get(i)
+      if (row && row.originalId === originalId) model.remove(i)
+    }
+  }
+
+  function addToPending(snapshot) {
+    Qt.callLater(function() {
+      removeByOriginalId(pendingModel, snapshot.originalId)
+      pendingModel.insert(0, snapshot)
+      while (pendingModel.count > service.historyCap) {
+        pendingModel.remove(pendingModel.count - 1)
+      }
+      scheduleHistorySave()
+    })
+  }
+
+  // Find a pending entry by its libnotify id and move it to pastModel. Called
+  // when a popup naturally dismisses (timer expired or user clicked X / the
+  // default action) — the user is assumed to have seen it.
+  function markSeenByOriginalId(originalId) {
+    Qt.callLater(function() {
+      for (var i = 0; i < pendingModel.count; i++) {
+        var entry = pendingModel.get(i)
+        if (!entry || entry.originalId !== originalId) continue
+        var snapshot = service.snapshotFromRow(entry)
+        pendingModel.remove(i)
+        pastModel.insert(0, snapshot)
+        while (pastModel.count > service.historyCap) {
+          pastModel.remove(pastModel.count - 1)
+        }
+        scheduleHistorySave()
+        return
+      }
+    })
+  }
+
+  // Copy a ListModel row into a plain JS object so we can re-insert it into
+  // a different model without sharing references.
+  function snapshotFromRow(row) {
+    return {
+      id: row.id,
+      originalId: row.originalId,
+      app: row.app,
+      appIcon: row.appIcon,
+      summary: row.summary,
+      body: row.body,
+      image: row.image,
+      glyph: row.glyph || "",
+      urgency: row.urgency,
+      expireTimeout: row.expireTimeout || 0,
+      timestamp: row.timestamp
+    }
+  }
+
+  function markAllSeen() {
+    Qt.callLater(function() {
+      while (pendingModel.count > 0) {
+        var entry = pendingModel.get(0)
+        var snapshot = service.snapshotFromRow(entry)
+        pendingModel.remove(0)
+        pastModel.insert(0, snapshot)
+      }
+      while (pastModel.count > service.historyCap) {
+        pastModel.remove(pastModel.count - 1)
+      }
+      scheduleHistorySave()
+    })
+  }
+
+  function dismissPopup(index) {
+    removePopup(index, "dismiss")
+  }
+
+  function expirePopup(index) {
+    removePopup(index, "expire")
+  }
+
+  function removePopup(index, reason) {
+    if (index < 0 || index >= popupModel.count) return
+    var entry = popupModel.get(index)
+    var ref = entry ? entry.ref : null
+    var originalId = entry ? entry.originalId : -1
+    popupModel.remove(index)
+    if (ref) {
+      try {
+        if (ref.tracked) {
+          if (reason === "expire" && typeof ref.expire === "function") ref.expire()
+          else ref.dismiss()
+        }
+      } catch (e) {
+        // Object already torn down by the server — nothing to dismiss.
+      }
+    }
+    // User (or the lifetime timer) saw the popup — archive it.
+    if (originalId >= 0) markSeenByOriginalId(originalId)
+  }
+
+  function clearPopups() {
+    while (popupModel.count > 0) dismissPopup(0)
+  }
+
+  function dismissPending(index) {
+    if (index < 0 || index >= pendingModel.count) return
+    var entry = pendingModel.get(index)
+    if (entry) maybeDeleteCachedImage(entry.image)
+    pendingModel.remove(index)
+    scheduleHistorySave()
+  }
+
+  function dismissPast(index) {
+    if (index < 0 || index >= pastModel.count) return
+    var entry = pastModel.get(index)
+    if (entry) maybeDeleteCachedImage(entry.image)
+    pastModel.remove(index)
+    scheduleHistorySave()
+  }
+
+  function clearPending() {
+    for (var i = 0; i < pendingModel.count; i++) {
+      var entry = pendingModel.get(i)
+      if (entry) maybeDeleteCachedImage(entry.image)
+    }
+    pendingModel.clear()
+    scheduleHistorySave()
+  }
+
+  function clearPast() {
+    for (var i = 0; i < pastModel.count; i++) {
+      var entry = pastModel.get(i)
+      if (entry) maybeDeleteCachedImage(entry.image)
+    }
+    pastModel.clear()
+    scheduleHistorySave()
+  }
+
+  // Invoke the libnotify "default" action on the popup's underlying
+  // notification, if it has one, then dismiss. Clients register the default
+  // action with the canonical identifier "default"; e.g. screenshot toasts
+  // use `notify-send -A default=Edit ...` so click-the-card opens the editor.
+  function invokePopupDefault(index) {
+    if (index < 0 || index >= popupModel.count) return
+    var entry = popupModel.get(index)
+    var ref = entry ? entry.ref : null
+    var invoked = false
+    if (ref && ref.actions) {
+      for (var i = 0; i < ref.actions.length; i++) {
+        var action = ref.actions[i]
+        if (action && action.identifier === "default") {
+          try { action.invoke(); invoked = true } catch (e) { console.warn("invoke default failed:", e) }
+          break
+        }
+      }
+    }
+    // Chat apps (Slack, Discord, Vesktop, etc.) rarely register a "default"
+    // libnotify action — they just expect clicking the notification to
+    // focus their window. Fall back to focusing the sending app by class so
+    // that click-to-jump actually works.
+    if (!invoked) focusApp(entry)
+    dismissPopup(index)
+  }
+
+  // Try to focus an existing Hyprland window matching the notification's
+  // sender. The helper handles case-insensitive class matching.
+  function focusApp(entry) {
+    if (!entry || !entry.app) return
+    focusAppProc.command = [
+      service.omarchyPath + "/bin/omarchy-hyprland-focus-app",
+      String(entry.app)
+    ]
+    focusAppProc.running = true
+  }
+
+  Process { id: focusAppProc; running: false }
+
+  // ---------------------------------------------------- image cache
+  //
+  // Notifications coming from screenshot helpers ship an `image-path` hint
+  // pointing at /tmp/<file>. We want the history thumbnail to outlive that
+  // file, so we copy it into a long-lived cache dir on ingress and rewrite
+  // the history row's `image` to point at the cache once cp finishes.
+  // image:// (raw-bytes) URIs aren't trivially copyable from QML; document
+  // and skip them for v1.
+
+  function imageExtension(srcPath) {
+    return NotificationLogic.imageExtension(srcPath)
+  }
+
+  function maybeCacheImage(snapshot) {
+    var image = String(snapshot.image || "")
+    if (!image) return
+    // image:// URIs are decoded from raw bytes by Quickshell's image provider.
+    // We can't copy them out from QML, so let history reference them by URI
+    // and accept that they disappear with the source notification.
+    if (image.indexOf("image://") === 0) return
+    if (image.indexOf("file:///tmp/") !== 0) return
+
+    var srcPath = decodeURIComponent(image.substring(7))
+    var ext = imageExtension(srcPath)
+    var destPath = imageCacheDir + snapshot.timestamp + "-" + snapshot.originalId + "." + ext
+    var destUri = Util.fileUrl(destPath)
+
+    imageCacheQueue = imageCacheQueue.concat([{
+      srcPath: srcPath,
+      destPath: destPath,
+      targetUri: destUri,
+      originalId: snapshot.originalId,
+      timestamp: snapshot.timestamp
+    }])
+    runNextImageCacheJob()
+  }
+
+  function runNextImageCacheJob() {
+    if (imageCacheProc.running || imageCacheQueue.length === 0) return
+
+    var job = imageCacheQueue[0]
+    imageCacheQueue = imageCacheQueue.slice(1)
+    imageCacheProc.targetUri = job.targetUri
+    imageCacheProc.matchOriginalId = job.originalId
+    imageCacheProc.matchTimestamp = job.timestamp
+    imageCacheProc.command = ["cp", "-f", job.srcPath, job.destPath]
+    imageCacheProc.running = true
+  }
+
+  function rewriteCachedImage(targetUri, originalId, timestamp) {
+    function rewrite(model) {
+      for (var i = 0; i < model.count; i++) {
+        var row = model.get(i)
+        if (row && row.originalId === originalId && row.timestamp === timestamp) {
+          model.setProperty(i, "image", targetUri)
+          return true
+        }
+      }
+      return false
+    }
+
+    return rewrite(pendingModel) || rewrite(pastModel)
+  }
+
+  function maybeDeleteCachedImage(image) {
+    var path = String(image || "")
+    if (!path) return
+    if (path.indexOf("file://") !== 0) return
+    var local = decodeURIComponent(path.substring(7))
+    if (local.indexOf(imageCacheDir) !== 0) return
+    deleteImageProc.command = ["rm", "-f", local]
+    deleteImageProc.running = true
+  }
+
+  Process {
+    id: ensureDirsProc
+    command: ["mkdir", "-p", service.stateDir, service.imageCacheDir]
+    running: false
+  }
+
+  Process {
+    id: imageCacheProc
+    property string targetUri: ""
+    property int matchOriginalId: -1
+    property double matchTimestamp: 0
+    onExited: function(exitCode) {
+      if (exitCode === 0 && targetUri && rewriteCachedImage(targetUri, matchOriginalId, matchTimestamp))
+        scheduleHistorySave()
+      targetUri = ""
+      matchOriginalId = -1
+      matchTimestamp = 0
+      runNextImageCacheJob()
+    }
+  }
+
+  Process { id: deleteImageProc; running: false }
+
+  // ---------------------------------------------------- history persistence
+
+  FileView {
+    id: historyFile
+    path: service.historyPath
+    watchChanges: false
+    atomicWrites: true
+    printErrors: false
+    onLoaded: service.loadHistory(text())
+    // First-run: the file doesn't exist yet. Without this branch,
+    // `historyLoaded` stays false forever and `scheduleHistorySave` becomes
+    // a no-op — so the file is never created and history vanishes on
+    // shell restart.
+    onLoadFailed: service.loadHistory("")
+  }
+
+  Timer {
+    id: historySaveTimer
+    interval: 200
+    repeat: false
+    onTriggered: service.flushHistory()
+  }
+
+  // Past is a rolling "recently" window. Sweep every minute and drop
+  // anything older than 15 minutes so the tab doesn't accumulate forever.
+  readonly property int pastTtlMs: 15 * 60 * 1000
+
+  Timer {
+    id: pastPruneTimer
+    interval: 60 * 1000
+    repeat: true
+    running: true
+    triggeredOnStart: true
+    onTriggered: service.prunePast()
+  }
+
+  function prunePast() {
+    if (pastModel.count === 0) return
+    var cutoff = Date.now() - service.pastTtlMs
+    var removed = false
+    for (var i = pastModel.count - 1; i >= 0; i--) {
+      var entry = pastModel.get(i)
+      if (entry && entry.timestamp && entry.timestamp < cutoff) {
+        if (entry.image) maybeDeleteCachedImage(entry.image)
+        pastModel.remove(i)
+        removed = true
+      }
+    }
+    if (removed) scheduleHistorySave()
+  }
+
+  function scheduleHistorySave() {
+    if (!service.historyLoaded) return
+    historySaveTimer.restart()
+  }
+
+  property bool historyLoaded: false
+
+  function loadHistory(raw) {
+    // FileView can fire onLoaded more than once during startup — the implicit
+    // preload when `path` resolves, plus the explicit `historyFile.reload()`
+    // in Component.onCompleted can both end up calling here. Without this
+    // guard, the second fire appends a second copy of every persisted row
+    // to the in-memory model.
+    if (service.historyLoaded) return
+
+    var parsed = NotificationLogic.parseHistory(raw, NotificationUrgency.Normal, service.historyCap)
+    if (parsed.empty) {
+      service.historyLoaded = true
+      return
+    }
+    if (parsed.error) {
+      console.warn("notifications: history parse failed:", parsed.errorMessage || "")
+      service.historyLoaded = true
+      return
+    }
+
+    if (parsed.dnd !== null) {
+      service._hydrating = true
+      persisted.doNotDisturb = parsed.dnd
+      service._hydrating = false
+    }
+
+    // Newest-first on disk; append in order so models match.
+    Qt.callLater(function() {
+      for (var i = 0; i < parsed.pending.length; i++) pendingModel.append(parsed.pending[i])
+      for (var j = 0; j < parsed.past.length; j++) pastModel.append(parsed.past[j])
+      service.historyLoaded = true
+      if (parsed.hadDuplicates) service.scheduleHistorySave()
+    })
+  }
+
+  function flushHistory() {
+    function dump(model) {
+      var out = []
+      for (var i = 0; i < model.count; i++) {
+        var r = model.get(i)
+        if (!r) continue
+        out.push({
+          id: r.id,
+          originalId: r.originalId,
+          app: r.app,
+          appIcon: r.appIcon,
+          summary: r.summary,
+          body: r.body,
+          image: r.image,
+          glyph: r.glyph || "",
+          urgency: r.urgency,
+          expireTimeout: r.expireTimeout || 0,
+          timestamp: r.timestamp
+        })
+      }
+      return out
+    }
+    var payload = {
+      version: 2,
+      dnd: persisted.doNotDisturb,
+      pending: dump(pendingModel),
+      past: dump(pastModel)
+    }
+    historyFile.setText(JSON.stringify(payload, null, 2) + "\n")
+  }
+
+  Component.onCompleted: {
+    ensureDirsProc.running = true
+    // Once mkdir has had a tick, load the existing history file. FileView
+    // surfaces an empty string when the file doesn't exist; loadHistory
+    // handles that path.
+    Qt.callLater(function() { historyFile.reload() })
+  }
+
+  // ---------------------------------------------------- IPC
+
+  IpcHandler {
+    target: "notifications"
+
+    function dndState(): string {
+      return service.doNotDisturb ? "on" : "off"
+    }
+
+    function toggleDnd(): string {
+      service.setDoNotDisturb(!service.doNotDisturb)
+      return dndState()
+    }
+
+    function setDnd(value: string): string {
+      var v = String(value || "").toLowerCase()
+      var on = v === "true" || v === "1" || v === "on" || v === "yes"
+      service.setDoNotDisturb(on)
+      return dndState()
+    }
+
+    function isDnd(): string {
+      return dndState()
+    }
+
+    function showHistory(): string {
+      service.historyOpenRequested()
+      return "ok"
+    }
+
+    // `clear` empties the past tab (the "I already saw these" bucket).
+    function clear(): string {
+      service.clearPast()
+      return "ok"
+    }
+
+    function clearPending(): string {
+      service.clearPending()
+      return "ok"
+    }
+
+    function markAllSeen(): string {
+      service.markAllSeen()
+      return "ok"
+    }
+
+    function dismissAll(): string {
+      service.clearPopups()
+      service.clearPending()
+      service.clearPast()
+      return "ok"
+    }
+
+    // dismiss the most recent popup; fall back to the most recent pending
+    // entry, then past, if no popup is currently showing.
+    function dismissOne(): string {
+      if (popupModel.count > 0) {
+        service.dismissPopup(0)
+        return "ok"
+      }
+      if (pendingModel.count > 0) {
+        service.dismissPending(0)
+        return "ok"
+      }
+      if (pastModel.count > 0) {
+        service.dismissPast(0)
+        return "ok"
+      }
+      return "none"
+    }
+
+    // Fire the default action on the most recent popup, then dismiss it.
+    function invokeLast(): string {
+      if (popupModel.count === 0) return "none"
+      service.invokePopupDefault(0)
+      return "ok"
+    }
+
+    function dismiss(summary: string): string {
+      var needle = String(summary || "")
+      if (!needle) return "none"
+      var hit = false
+      function sweep(model, dismissFn) {
+        for (var i = model.count - 1; i >= 0; i--) {
+          var row = model.get(i)
+          if (row && String(row.summary || "").indexOf(needle) !== -1) {
+            dismissFn(i)
+            hit = true
+          }
+        }
+      }
+      sweep(pendingModel, service.dismissPending)
+      sweep(pastModel, service.dismissPast)
+      sweep(popupModel, service.dismissPopup)
+      return hit ? "ok" : "none"
+    }
+
+    function ping(): string { return "ok" }
+  }
+
+  // ---------------------------------------------------- server
+
+  NotificationServer {
+    id: server
+    keepOnReload: false
+    imageSupported: true
+    actionsSupported: true
+    bodyMarkupSupported: true
+    bodyHyperlinksSupported: true
+    persistenceSupported: true
+
+    onNotification: function(notification) {
+      service.handleNotification(notification)
+    }
+  }
+
+  // -------------------------------------------------------------- popup UI
+  //
+  // One PanelWindow per output (Variants on Quickshell.screens) holding the
+  // stacked toast cards. Layer is Overlay, exclusionMode Ignore, no
+  // keyboard focus — popups are passive surfaces and must never steal input
+  // from the focused application.
+
+  Variants {
+    model: Quickshell.screens
+
+    PanelWindow {
+      id: popupWindow
+      required property var modelData
+      screen: modelData
+      visible: popupModel.count > 0
+
+      WlrLayershell.namespace: "omarchy-notifications"
+      WlrLayershell.layer: WlrLayer.Overlay
+      WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
+      exclusionMode: ExclusionMode.Ignore
+      color: "transparent"
+
+      anchors {
+        top: service.barPosition !== "bottom"
+        bottom: service.barPosition === "bottom"
+        left: service.barPosition === "left"
+        right: service.barPosition !== "left"
+      }
+      margins {
+        top:    service.barPosition === "top"    ? service.barClearance : Style.gapsOut
+        bottom: service.barPosition === "bottom" ? service.barClearance : Style.gapsOut
+        left:   service.barPosition === "left"   ? service.barClearance : Style.gapsOut
+        right:  service.barPosition === "right"  ? service.barClearance : Style.gapsOut
+      }
+
+      implicitWidth: popupColumn.implicitWidth
+      implicitHeight: popupColumn.implicitHeight
+
+      ColumnLayout {
+        id: popupColumn
+        anchors.right: parent.right
+        anchors.top: parent.top
+        spacing: Style.space(8)
+
+        Repeater {
+          model: popupModel
+
+          // The delegate is a slot Item that owns lifetime timer state. The
+          // actual visuals live in NotificationCard, which the history panel
+          // also reuses.
+          delegate: Item {
+            id: cardSlot
+            required property int index
+            required property string app
+            required property string appIcon
+            required property string summary
+            required property string body
+            required property string image
+            required property string glyph
+            required property int urgency
+            required property double expireTimeout
+            required property double timestamp
+
+            // Each card sizes itself based on mode (text vs media); the slot
+            // tracks the card so the column auto-fits to whichever is widest.
+            Layout.preferredWidth: card.implicitWidth
+            Layout.alignment: Qt.AlignRight
+            implicitHeight: card.implicitHeight
+
+            readonly property real lifetime: service.durationFor(cardSlot.urgency, cardSlot.expireTimeout)
+            property real remainingLifetime: 1.0
+            readonly property bool ticking: cardSlot.lifetime > 0 && !card.hovered
+
+            Timer {
+              interval: 50
+              repeat: true
+              running: cardSlot.ticking
+              onTriggered: {
+                if (cardSlot.lifetime <= 0) return
+                cardSlot.remainingLifetime -= 50.0 / cardSlot.lifetime
+                if (cardSlot.remainingLifetime <= 0) {
+                  cardSlot.remainingLifetime = 0
+                  service.expirePopup(cardSlot.index)
+                }
+              }
+            }
+
+            NotificationCard {
+              id: card
+              anchors.right: parent.right
+              app: cardSlot.app
+              appIcon: cardSlot.appIcon
+              summary: cardSlot.summary
+              body: cardSlot.body
+              image: cardSlot.image
+              urgency: cardSlot.urgency
+              timestamp: cardSlot.timestamp
+              cornerRadius: service.cornerRadius
+              fontFamily: service.shell && service.shell.bar ? service.shell.bar.fontFamily : ""
+              glyph: cardSlot.glyph
+
+              onCloseRequested: service.dismissPopup(cardSlot.index)
+              onCardClicked: service.invokePopupDefault(cardSlot.index)
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/notifications/components/NotificationCard.qml b/shell/plugins/notifications/components/NotificationCard.qml
new file mode 100644
index 00000000..def0b036
--- /dev/null
+++ b/shell/plugins/notifications/components/NotificationCard.qml
@@ -0,0 +1,182 @@
+// Notification card. Pure presentational — no service, Notification, or
+// ListModel references. The popup container drives lifetime; the history
+// panel drives static rendering. Both use the same component.
+
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+import qs.Commons
+import qs.Ui
+import "../NotificationLogic.js" as NotificationLogic
+
+BorderSurface {
+  id: root
+
+  property string app: ""
+  property string appIcon: ""
+  property string summary: ""
+  property string body: ""
+  property string image: ""
+  // Nerd Font glyph rendered in the icon slot when no real icon is set.
+  // Used by omarchy-notification-send so user-action toasts (`Silenced
+  // notifications` etc.) show their bell/lock/etc. glyph without leaking
+  // into the summary text.
+  property string glyph: ""
+  // NotificationUrgency: Low=0, Normal=1, Critical=2 (upstream).
+  property int urgency: 1
+  property double timestamp: 0
+  property int cornerRadius: 0
+
+  // System monospace font injected by the container.
+  property string fontFamily: ""
+
+  readonly property bool hovered: hoverTracker.hovered
+
+  signal closeRequested()
+  signal cardClicked()
+  // Prefer per-notification media/avatar data, then fall back to the app icon.
+  // The `check` flag avoids Qt's missing-texture placeholder for unknown names.
+  readonly property string smallIconSource: image.length > 0 ? image : iconSource(appIcon)
+  readonly property bool hasGlyph: glyph.length > 0
+  readonly property bool compactGlyph: NotificationLogic.shouldRenderCompactGlyph(glyph, smallIconSource)
+  readonly property bool hasSmallIcon: smallIconSource.length > 0
+  readonly property bool summaryStartsWithGlyph: NotificationLogic.summaryStartsWithGlyph(summary)
+  readonly property bool singleLineToast: sanitizedBody.length === 0
+  readonly property bool collapseRedundantIcon: singleLineToast && !hasGlyph && summaryStartsWithGlyph
+  readonly property string sanitizedBody: sanitizeBody(body)
+  readonly property string styledBody: sanitizedBody.replace(/\r\n|\r|\n/g, "<br/>")
+
+  readonly property color dimColor: Qt.darker(Color.notifications.text, 1.4)
+  readonly property color bodyColor: Qt.darker(Color.notifications.text, 1.15)
+  readonly property color accentColor: urgency === 2 ? Color.urgent : (urgency === 0 ? dimColor : Color.notifications.countdown)
+  readonly property var cardBorderSpec: Border.surfaceSpec("notifications", "border", Color.notifications.border, Math.max(1, Style.space(2)))
+
+  function sanitizeBody(s) {
+    return NotificationLogic.sanitizeBody(s, app, appIcon)
+  }
+
+  function iconSource(icon) {
+    var value = String(icon || "")
+    if (value.length === 0) return ""
+    if (value.indexOf("file://") === 0 || value.indexOf("image://") === 0) return value
+    if (value.charAt(0) === "/") return Util.fileUrl(value)
+    return Quickshell.iconPath(value, true)
+  }
+
+  implicitWidth: Style.space(380)
+  // Add vertical border insets so mainColumn (inset by border on top/left/right)
+  // doesn't push content under the bottom edge.
+  implicitHeight: mainColumn.implicitHeight + borderTop + borderBottom
+  radius: cornerRadius
+  color: Color.notifications.background
+  borderSpec: cardBorderSpec
+  clip: true
+
+  HoverHandler { id: hoverTracker }
+
+  MouseArea {
+    anchors.fill: parent
+    cursorShape: Qt.PointingHandCursor
+    onClicked: root.cardClicked()
+  }
+
+  ColumnLayout {
+    id: mainColumn
+    // Inset by the card border so the content doesn't paint over the card's
+    // outer border.
+    anchors.top: parent.top
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.topMargin: root.borderTop
+    anchors.leftMargin: root.borderLeft
+    anchors.rightMargin: root.borderRight
+    spacing: 0
+
+    // Text content.
+    RowLayout {
+      Layout.fillWidth: true
+      Layout.leftMargin: Style.space(12)
+      Layout.rightMargin: Style.space(12)
+      Layout.topMargin: root.singleLineToast ? Style.space(7) : Style.space(10)
+      Layout.bottomMargin: root.singleLineToast ? Style.space(7) : Style.space(10)
+      spacing: root.collapseRedundantIcon ? 0 : (root.compactGlyph ? Style.space(8) : Style.space(12))
+
+      Item {
+        id: smallIconSlot
+        Layout.preferredWidth: visible ? Style.space(40) : 0
+        Layout.preferredHeight: visible ? Style.space(40) : 0
+        Layout.alignment: Qt.AlignVCenter
+        // Hide the slot when the icon failed to resolve (themed-icon name
+        // not in the user's icon theme) AND we don't have a glyph fallback
+        // — prevents rendering Qt's pink broken-image placeholder.
+        visible: !root.collapseRedundantIcon && !root.compactGlyph && root.hasSmallIcon && (root.hasGlyph || smallIconImage.status !== Image.Error)
+
+        Image {
+          id: smallIconImage
+          anchors.fill: parent
+          source: root.smallIconSource
+          sourceSize.width: smallIconSlot.width * Screen.devicePixelRatio
+          sourceSize.height: smallIconSlot.height * Screen.devicePixelRatio
+          fillMode: Image.PreserveAspectFit
+          asynchronous: true
+          smooth: true
+          visible: !root.hasGlyph || smallIconImage.status === Image.Ready
+        }
+
+        // Glyph fallback (Nerd Font character) when no image icon is
+        // available. Used by omarchy-notification-send's `-g` flag.
+        Text {
+          anchors.centerIn: parent
+          visible: root.hasGlyph && smallIconImage.status !== Image.Ready
+          text: root.glyph
+          color: Color.notifications.text
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.iconLarge
+        }
+      }
+
+      Text {
+        Layout.alignment: Qt.AlignVCenter
+        visible: root.compactGlyph
+        text: root.glyph
+        color: Color.notifications.text
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.icon
+      }
+
+      ColumnLayout {
+        Layout.fillWidth: true
+        Layout.alignment: Qt.AlignVCenter
+        spacing: Style.space(2)
+
+        Text {
+          Layout.fillWidth: true
+          visible: root.summary.length > 0
+          text: root.summary
+          font.family: "Liberation Sans"
+          color: Color.notifications.text
+          font.pixelSize: Style.font.title
+          font.bold: true
+          wrapMode: Text.WordWrap
+          elide: Text.ElideRight
+          maximumLineCount: 2
+        }
+
+        Text {
+          Layout.fillWidth: true
+          Layout.topMargin: Style.space(2)
+          visible: root.sanitizedBody.length > 0
+          text: root.styledBody
+          textFormat: Text.StyledText
+          font.family: "Liberation Sans"
+          color: root.bodyColor
+          font.pixelSize: Style.font.title
+          wrapMode: Text.WordWrap
+          elide: Text.ElideRight
+          maximumLineCount: 3
+        }
+      }
+    }
+  }
+
+}
diff --git a/shell/plugins/notifications/manifest.json b/shell/plugins/notifications/manifest.json
new file mode 100644
index 00000000..404f6864
--- /dev/null
+++ b/shell/plugins/notifications/manifest.json
@@ -0,0 +1,23 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.notifications",
+  "name": "Notifications",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Notification daemon, popups, and history",
+  "kinds": [
+    "service",
+    "bar-widget"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "service": "Service.qml",
+    "barWidget": "BarWidget.qml"
+  },
+  "barWidget": {
+    "displayName": "Notification center",
+    "description": "Recent notifications + DND",
+    "category": "Status",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/osd/Osd.qml b/shell/plugins/osd/Osd.qml
new file mode 100644
index 00000000..3a89ada6
--- /dev/null
+++ b/shell/plugins/osd/Osd.qml
@@ -0,0 +1,138 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import qs.Commons
+import qs.Ui
+import "OsdModel.js" as OsdModel
+
+Item {
+  id: root
+
+  property bool opened: false
+  property string icon: ""
+  property string message: ""
+  property string iconKey: ""
+  property int value: 0
+  property int maxValue: 100
+  property bool hasProgress: true
+  property int duration: 1200
+  readonly property int cardWidth: Style.space(269)
+  readonly property int mediaCardWidth: Math.round(cardWidth * 1.5)
+  readonly property int messageWidth: Style.space(190)
+  readonly property int mediaMessageWidth: messageWidth + mediaCardWidth - cardWidth
+  readonly property bool mediaOsd: iconKey.indexOf("media") === 0 || iconKey.indexOf("player") === 0
+
+  function iconFor(name, percent) {
+    return OsdModel.iconFor(name, percent)
+  }
+
+  function show(iconName, rawMessage, rawValue, rawMax, rawProgressText, rawDuration) {
+    var next = OsdModel.stateForShow(iconName, rawMessage, rawValue, rawMax, rawProgressText, rawDuration)
+    iconKey = next.iconKey
+    maxValue = next.maxValue
+    hasProgress = next.hasProgress
+    value = next.value
+    message = next.message
+    icon = next.icon
+    duration = next.duration
+    opened = true
+    if (duration > 0) hideTimer.restart()
+    else hideTimer.stop()
+  }
+
+  function open(payloadJson) {
+    try {
+      var p = JSON.parse(payloadJson || "{}")
+      show(p.icon || "", p.message || "", p.value === undefined ? "" : String(p.value), p.max === undefined ? "100" : String(p.max), p.progressText || "", p.duration === undefined ? "1200" : String(p.duration))
+    } catch (e) {}
+  }
+
+  function close() { opened = false }
+
+  Timer {
+    id: hideTimer
+    interval: root.duration
+    onTriggered: root.opened = false
+  }
+
+  IpcHandler {
+    target: "osd"
+    function show(payloadJson: string): string {
+      root.open(payloadJson)
+      return "ok"
+    }
+    function close(): string { root.close(); return "ok" }
+    function state(): string { return root.opened ? "open" : "closed" }
+    function ping(): string { return "ok" }
+  }
+
+  PanelWindow {
+    id: panel
+    visible: root.opened
+    anchors { top: true; bottom: true; left: true; right: true }
+    color: "transparent"
+    WlrLayershell.namespace: "omarchy-osd"
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
+    exclusionMode: ExclusionMode.Ignore
+    // Visual-only surface: keep the layer-shell input region empty so the OSD
+    // never blocks clicks to the desktop below it.
+    mask: Region {}
+
+    BorderSurface {
+      id: card
+      width: root.mediaOsd ? root.mediaCardWidth : root.cardWidth
+      height: Math.max(Style.space(68), Style.font.displayLarge + Style.spacing.panelGap)
+      anchors.horizontalCenter: parent.horizontalCenter
+      anchors.bottom: parent.bottom
+      anchors.bottomMargin: Style.space(67)
+      color: Util.alpha(Color.background, 0.97)
+      borderSpec: Border.surfaceSpec("popups", "border", Color.popups.border, Math.max(1, Style.space(2)))
+      radius: Style.cornerRadius
+      opacity: root.opened ? 1 : 0
+
+      Row {
+        anchors.fill: parent
+        anchors.topMargin: card.borderTop
+        anchors.rightMargin: card.borderRight + Style.space(16)
+        anchors.bottomMargin: card.borderBottom
+        anchors.leftMargin: card.borderLeft + Style.space(16)
+        spacing: Style.space(16)
+        Text {
+          width: Style.space(28)
+          anchors.verticalCenter: parent.verticalCenter
+          horizontalAlignment: Text.AlignHCenter
+          text: root.icon
+          font.family: Style.font.family
+          font.pixelSize: Style.font.displayLarge
+          color: Color.popups.text
+        }
+        Rectangle {
+          visible: root.hasProgress
+          width: visible ? Style.space(142) : 0
+          height: Math.max(Style.space(6), Style.spacing.sm)
+          anchors.verticalCenter: parent.verticalCenter
+          color: Util.alpha(Color.popups.text, 0.45)
+          Rectangle {
+            height: parent.height
+            width: parent.width * (root.hasProgress ? root.value / root.maxValue : 0)
+            color: Color.accent
+          }
+        }
+        Text {
+          width: root.hasProgress ? Style.space(41) : (root.mediaOsd ? root.mediaMessageWidth : root.messageWidth)
+          anchors.verticalCenter: parent.verticalCenter
+          text: root.message
+          font.family: Style.font.family
+          font.bold: true
+          font.pixelSize: Style.font.title
+          color: Color.popups.text
+          elide: Text.ElideRight
+          maximumLineCount: 1
+          clip: true
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/osd/OsdModel.js b/shell/plugins/osd/OsdModel.js
new file mode 100644
index 00000000..daf12464
--- /dev/null
+++ b/shell/plugins/osd/OsdModel.js
@@ -0,0 +1,54 @@
+function clamp(value, min, max) {
+  return Math.max(min, Math.min(max, value))
+}
+
+function iconFor(name, percent) {
+  var n = String(name || "").toLowerCase()
+  if (n === "volume-muted" || n === "volume-mute" || n === "muted" || n === "mute") return ""
+  if (n === "volume-low") return ""
+  if (n === "volume-medium") return ""
+  if (n === "volume-high" || n === "volume") return ""
+  if (n === "microphone-muted" || n === "microphone-off" || n === "mic-muted" || n === "mic-off") return "󰍭"
+  if (n === "microphone" || n === "mic") return "󰍬"
+  if (n === "keyboard") return "󰌌"
+  if (n === "brightness" || n === "display") return "󰍹"
+  if (n === "touchpad") return "󰟸"
+  if (n === "touch" || n === "touchscreen") return "󰜉"
+  if (n === "media" || n === "player") return "󰝚"
+  if (n === "media-source" || n === "player-source") return "󰝚"
+  if (n === "media-play" || n === "player-play") return "󰐊"
+  if (n === "media-pause" || n === "player-pause") return "󰏤"
+  if (n === "media-next" || n === "player-next") return "󰒭"
+  if (n === "media-previous" || n === "player-previous") return "󰒮"
+  if (n.length > 0) return name
+  if (percent <= 0) return ""
+  if (percent <= 33) return ""
+  if (percent <= 66) return ""
+  return ""
+}
+
+function stateForShow(iconName, rawMessage, rawValue, rawMax, rawProgressText, rawDuration) {
+  var maxValue = Math.max(1, parseInt(rawMax || "100", 10))
+  var parsedValue = parseInt(rawValue || "0", 10)
+  var hasProgress = rawValue !== "" && !isNaN(parsedValue) && rawMessage === ""
+  var value = hasProgress ? clamp(parsedValue, 0, maxValue) : 0
+  var percent = hasProgress ? Math.round(value * 100 / maxValue) : -1
+  var parsedDuration = parseInt(rawDuration || "1200", 10)
+
+  return {
+    iconKey: String(iconName || "").toLowerCase(),
+    maxValue: maxValue,
+    hasProgress: hasProgress,
+    value: value,
+    message: String(rawMessage || (hasProgress ? (rawProgressText || percent + "%") : "")),
+    icon: iconFor(iconName, percent),
+    duration: isNaN(parsedDuration) ? 1200 : Math.max(0, parsedDuration)
+  }
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    iconFor: iconFor,
+    stateForShow: stateForShow
+  }
+}
diff --git a/shell/plugins/osd/manifest.json b/shell/plugins/osd/manifest.json
new file mode 100644
index 00000000..b2026048
--- /dev/null
+++ b/shell/plugins/osd/manifest.json
@@ -0,0 +1,14 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.osd",
+  "name": "On-screen display",
+  "version": "1.0.0",
+  "description": "Quickshell volume, brightness, and status overlays.",
+  "kinds": [
+    "panel"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "panel": "Osd.qml"
+  }
+}
diff --git a/shell/plugins/panels/audio/Model.js b/shell/plugins/panels/audio/Model.js
new file mode 100644
index 00000000..94b7cda3
--- /dev/null
+++ b/shell/plugins/panels/audio/Model.js
@@ -0,0 +1,262 @@
+function isPlaybackStream(node) {
+  if (!node || !node.isStream) return false
+  if (node.isSink === true) return true
+
+  var mediaClass = String(node.type || "")
+  return mediaClass.indexOf("Stream/Output/Audio") !== -1
+    || mediaClass.indexOf("AudioOutStream") !== -1
+    || mediaClass.indexOf("Output") !== -1
+}
+
+function isAudioSource(node) {
+  if (!node) return false
+  if (node.audio) return true
+
+  var mediaClass = String(node.type || "")
+  return mediaClass.indexOf("Audio/Source") !== -1
+    || mediaClass.indexOf("AudioSource") !== -1
+    || mediaClass.indexOf("Source") !== -1
+}
+
+function listSnapshot(list) {
+  return list && list.slice ? list.slice() : []
+}
+
+function outputVolumeName(volume, muted) {
+  if (muted) return "Muted"
+  var p = Math.round(volume * 100)
+  if (p === 0) return "Silenced"
+  if (p >= 100) return "Concert hall"
+  if (p >= 85) return "Party mode"
+  if (p >= 70) return "Cranked up"
+  if (p >= 50) return "Steady groove"
+  if (p >= 30) return "Easy listening"
+  if (p >= 15) return "Murmur"
+  return "Whisper"
+}
+
+function parseSinkAvailability(raw) {
+  var next = {}
+  var lines = String(raw || "").split("\n")
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i].trim()
+    if (!line) continue
+    var parts = line.split("\t")
+    if (parts.length >= 2) next[parts[0]] = parts[1] !== "0"
+  }
+  return next
+}
+
+function friendlyDeviceLabel(text) {
+  var label = String(text || "").trim()
+  label = label.replace(/^sof-soundwire\s+/i, "")
+  label = label.replace(/^built-?in audio\s+/i, "")
+  label = label.replace(/\s+Output$/i, "")
+  label = label.replace(/\s+Input$/i, "")
+  label = label.replace(/\bMicrophones\b/g, "Microphone")
+  return label
+}
+
+function nodeProps(node) {
+  return node && node.ready && node.properties ? node.properties : {}
+}
+
+function nodeLabel(node) {
+  if (!node) return "Unknown"
+  var p = nodeProps(node)
+  var nickname = friendlyDeviceLabel(node.nickname || node.nick || p["node.nick"] || p["device.profile.description"] || "")
+  if (nickname) return nickname
+  return friendlyDeviceLabel(node.description || p["node.description"] || node.name || "Unknown")
+}
+
+function isHeadphones(node) {
+  if (!node) return false
+  var p = nodeProps(node)
+  var blob = String([
+    node.name, node.description, node.nickname,
+    p["device.icon-name"] || "",
+    p["device.product.name"] || "",
+    p["node.description"] || "",
+    p["node.nick"] || ""
+  ].join(" ")).toLowerCase()
+  return blob.indexOf("headphone") !== -1
+    || blob.indexOf("headset") !== -1
+    || blob.indexOf("earbud") !== -1
+    || blob.indexOf("earphone") !== -1
+    || blob.indexOf("airpod") !== -1
+}
+
+function sinkGlyph(node) {
+  if (!node) return "󰓃"
+  if (isHeadphones(node)) return "󰋋"
+  var p = nodeProps(node)
+  var blob = String([
+    node.name, node.description, node.nickname,
+    p["device.icon-name"] || "",
+    p["device.product.name"] || ""
+  ].join(" ")).toLowerCase()
+  if (blob.indexOf("bluetooth") !== -1) return "󰂯"
+  if (blob.indexOf("hdmi") !== -1 || blob.indexOf("display") !== -1) return "󰍹"
+  return "󰓃"
+}
+
+function sourceGlyph(node) {
+  if (!node) return "󰍬"
+  var p = nodeProps(node)
+  var blob = String([
+    node.name, node.description, node.nickname,
+    p["device.icon-name"] || ""
+  ].join(" ")).toLowerCase()
+  if (blob.indexOf("headset") !== -1) return "󰋋"
+  if (blob.indexOf("bluetooth") !== -1) return "󰂯"
+  if (blob.indexOf("webcam") !== -1 || blob.indexOf("camera") !== -1) return "󰄀"
+  return "󰍬"
+}
+
+function friendlyStreamLabel(label) {
+  label = String(label || "").trim()
+  if (!label) return ""
+
+  var known = {
+    "spotify": "Spotify"
+  }
+  var normalized = label.toLowerCase()
+  return known[normalized] || label
+}
+
+function streamLabelKey(label) {
+  return String(label || "").trim().toLowerCase()
+}
+
+function streamLabelIsGeneric(label) {
+  return streamLabelKey(label) === "audio-src"
+}
+
+function rawStreamLabel(node) {
+  if (!node) return ""
+  var p = nodeProps(node)
+  return p["application.name"]
+    || node.description
+    || p["media.name"]
+    || p["node.name"]
+    || node.name
+}
+
+function mprisPlayerLabel(player) {
+  if (!player) return ""
+  return friendlyStreamLabel(player.identity || player.desktopEntry || "")
+}
+
+function mprisPlayerIsProxy(player) {
+  var dbusName = String(player && player.dbusName || "").toLowerCase()
+  var desktopEntry = String(player && player.desktopEntry || "").toLowerCase()
+  return dbusName.indexOf("playerctld") !== -1 || desktopEntry === "playerctld"
+}
+
+function streamRepresentsMprisPlayer(streamLabel, playerLabel) {
+  var streamKey = streamLabelKey(friendlyStreamLabel(streamLabel))
+  var playerKey = streamLabelKey(playerLabel)
+  if (!streamKey || !playerKey) return false
+  return streamKey === playerKey
+    || streamKey.indexOf(playerKey) !== -1
+    || playerKey.indexOf(streamKey) !== -1
+}
+
+function mprisLabelsFor(players, predicate) {
+  var values = Array.isArray(players) ? players : []
+  var playingCandidates = []
+  var candidates = []
+  var playingProxyCandidates = []
+  var proxyCandidates = []
+
+  for (var i = 0; i < values.length; i++) {
+    var player = values[i]
+    if (!player) continue
+    if (!player.isPlaying && !player.canPlay) continue
+
+    var playerLabel = mprisPlayerLabel(player)
+    if (!playerLabel || !predicate(playerLabel)) continue
+
+    if (mprisPlayerIsProxy(player)) {
+      if (player.isPlaying) playingProxyCandidates.push(playerLabel)
+      proxyCandidates.push(playerLabel)
+    } else {
+      if (player.isPlaying) playingCandidates.push(playerLabel)
+      candidates.push(playerLabel)
+    }
+  }
+
+  if (playingCandidates.length === 1) return playingCandidates[0]
+  if (playingCandidates.length === 0 && playingProxyCandidates.length === 1) return playingProxyCandidates[0]
+  if (candidates.length === 1) return candidates[0]
+  if (candidates.length === 0 && proxyCandidates.length === 1) return proxyCandidates[0]
+  return ""
+}
+
+function matchingMprisStreamLabel(label, players) {
+  if (streamLabelIsGeneric(label)) return ""
+  return mprisLabelsFor(players, function(playerLabel) {
+    return streamRepresentsMprisPlayer(label, playerLabel)
+  })
+}
+
+function unmatchedMprisStreamLabel(label, players, streams) {
+  if (!streamLabelIsGeneric(label)) return ""
+
+  return mprisLabelsFor(players, function(playerLabel) {
+    var values = Array.isArray(streams) ? streams : []
+    for (var i = 0; i < values.length; i++) {
+      var stream = values[i]
+      var streamLabel = rawStreamLabel(stream)
+      if (!streamLabelIsGeneric(streamLabel) && streamRepresentsMprisPlayer(streamLabel, playerLabel))
+        return false
+    }
+    return true
+  })
+}
+
+function streamLabel(node, players, streams) {
+  if (!node) return "Stream"
+  var label = rawStreamLabel(node)
+  return friendlyStreamLabel(matchingMprisStreamLabel(label, players)
+    || unmatchedMprisStreamLabel(label, players, streams)
+    || label) || "Stream"
+}
+
+function streamRepresentsPlayer(node, player, players, streams) {
+  if (!node || !player) return false
+  var playerLabel = mprisPlayerLabel(player)
+  if (!playerLabel) return false
+
+  var label = rawStreamLabel(node)
+  if (!streamLabelIsGeneric(label)) return streamRepresentsMprisPlayer(label, playerLabel)
+  return streamRepresentsMprisPlayer(streamLabel(node, players, streams), playerLabel)
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    isPlaybackStream: isPlaybackStream,
+    isAudioSource: isAudioSource,
+    listSnapshot: listSnapshot,
+    outputVolumeName: outputVolumeName,
+    parseSinkAvailability: parseSinkAvailability,
+    friendlyDeviceLabel: friendlyDeviceLabel,
+    nodeProps: nodeProps,
+    nodeLabel: nodeLabel,
+    isHeadphones: isHeadphones,
+    sinkGlyph: sinkGlyph,
+    sourceGlyph: sourceGlyph,
+    friendlyStreamLabel: friendlyStreamLabel,
+    streamLabelKey: streamLabelKey,
+    streamLabelIsGeneric: streamLabelIsGeneric,
+    rawStreamLabel: rawStreamLabel,
+    mprisPlayerLabel: mprisPlayerLabel,
+    mprisPlayerIsProxy: mprisPlayerIsProxy,
+    streamRepresentsMprisPlayer: streamRepresentsMprisPlayer,
+    mprisLabelsFor: mprisLabelsFor,
+    matchingMprisStreamLabel: matchingMprisStreamLabel,
+    unmatchedMprisStreamLabel: unmatchedMprisStreamLabel,
+    streamLabel: streamLabel,
+    streamRepresentsPlayer: streamRepresentsPlayer
+  }
+}
diff --git a/shell/plugins/panels/audio/Panel.qml b/shell/plugins/panels/audio/Panel.qml
new file mode 100644
index 00000000..788b7a7e
--- /dev/null
+++ b/shell/plugins/panels/audio/Panel.qml
@@ -0,0 +1,1090 @@
+import QtQuick
+import QtQuick.Controls
+import Quickshell
+import Quickshell.Io
+import Quickshell.Services.Mpris
+import Quickshell.Services.Pipewire
+import qs.Ui
+import qs.Commons
+import "Model.js" as Model
+
+Panel {
+  id: root
+  moduleName: "omarchy.audio"
+  ipcTarget: "omarchy.audio"
+
+  readonly property var sink: Pipewire.defaultAudioSink
+  readonly property var source: Pipewire.defaultAudioSource
+  readonly property var nodes: Pipewire.nodes ? Pipewire.nodes.values : []
+  readonly property var mprisPlayers: Mpris.players ? Mpris.players.values : []
+  readonly property var mediaService: bar && bar.shell ? bar.shell.firstPartyServiceFor("omarchy.media") : null
+  readonly property var activeMediaPlayer: mediaService ? mediaService.activePlayer : null
+
+  readonly property var candidateSinks: {
+    var list = []
+    for (var i = 0; i < nodes.length; i++) {
+      var n = nodes[i]
+      if (n && n.isSink && !n.isStream) list.push(n)
+    }
+    return list
+  }
+
+  readonly property var candidateSources: {
+    var list = []
+    for (var i = 0; i < nodes.length; i++) {
+      var n = nodes[i]
+      if (n && !n.isSink && !n.isStream && isAudioSource(n)) {
+        var name = n.name || ""
+        if (name === "quickshell") continue
+        list.push(n)
+      }
+    }
+    return list
+  }
+
+  readonly property var candidateStreams: {
+    var list = []
+    for (var i = 0; i < nodes.length; i++) {
+      var n = nodes[i]
+      if (n && n.isStream && isPlaybackStream(n)) list.push(n)
+    }
+    return list
+  }
+
+  property var sinkAvailability: ({})
+  property bool sinkAvailabilityLoaded: false
+
+  // Identify true playback streams without reading node.properties here:
+  // PwNode.properties is invalid until the node is bound, and reading it while
+  // capture streams are appearing (for example, when Voxtype starts recording)
+  // can destabilize Quickshell's Pipewire service. Quickshell versions differ
+  // in how `type` is exposed (media.class, enum name, or numeric enum), but
+  // playback streams consistently accept audio input from clients and publish
+  // `isSink: true`; capture streams publish as stream sources.
+  function isPlaybackStream(node) {
+    return Model.isPlaybackStream(node)
+  }
+
+  function isAudioSource(node) {
+    return Model.isAudioSource(node)
+  }
+
+  property var cachedAudioSinks: []
+  property var cachedAudioSources: []
+
+  readonly property var rawAudioSinks: {
+    var list = []
+    for (var i = 0; i < candidateSinks.length; i++)
+      if (sinkAvailable(candidateSinks[i])) list.push(candidateSinks[i])
+    if (sink && list.indexOf(sink) < 0) list.unshift(sink)
+    return list
+  }
+
+  readonly property var rawAudioSources: {
+    var list = candidateSources.slice()
+    if (source && list.indexOf(source) < 0) list.unshift(source)
+    return list
+  }
+
+  readonly property var audioSinks: rawAudioSinks.length > 0 ? rawAudioSinks : cachedAudioSinks
+  readonly property var audioSources: rawAudioSources.length > 0 ? rawAudioSources : cachedAudioSources
+
+  readonly property var audioStreams: {
+    var list = []
+    for (var i = 0; i < candidateStreams.length; i++)
+      if (candidateStreams[i].audio) list.push(candidateStreams[i])
+    return list
+  }
+
+  // Feed Repeaters with panel-local snapshots instead of the live PipeWire
+  // model. PipeWire can remove nodes while Quickshell is dispatching the
+  // removal signal; rebuilding a Repeater from that signal path has crashed
+  // in Quickshell's PipeWire service. The snapshot timer lets that mutation
+  // settle first, and closed panels keep their repeaters detached entirely.
+  property var displayAudioSinks: []
+  property var displayAudioSources: []
+  property var displayAudioStreams: []
+
+  readonly property real outputVolume: sink && sink.audio ? sink.audio.volume : 0
+  readonly property bool outputMuted: sink && sink.audio ? sink.audio.muted : false
+  readonly property real inputVolume: source && source.audio ? source.audio.volume : 0
+  readonly property bool inputMuted: source && source.audio ? source.audio.muted : false
+
+  onRawAudioSinksChanged: if (rawAudioSinks.length > 0) cachedAudioSinks = rawAudioSinks
+  onRawAudioSourcesChanged: if (rawAudioSources.length > 0) cachedAudioSources = rawAudioSources
+
+  // Single cursor model shared by keyboard and mouse. Sections:
+  //   "output"  — output slider + sink device list
+  //   "input"   — input slider + source device list
+  //   "streams" — per-app playback streams
+  // selectedIndex semantics within a section:
+  //   -1            → on the slider row (h/l adjusts volume, m/Enter mute)
+  //   0..N-1        → on the Nth device/stream row
+  // Visuals derive from hasCursor/current via CursorSurface, never
+  // from containsMouse — that's what keeps the highlight unique across
+  // keyboard + mouse like wifi does.
+  property string focusSection: "output"
+  property int selectedIndex: -1
+  property bool cursorActive: false
+
+  readonly property color hoverFill: bar
+    ? Style.hoverFillFor(bar.foreground, Color.accent)
+    : "transparent"
+  readonly property color selectedFill: bar
+    ? Style.selectedFillFor(bar.foreground, Color.accent)
+    : "transparent"
+
+  function sectionCount(section) {
+    if (section === "output") return displayAudioSinks.length
+    if (section === "input") return displayAudioSources.length
+    if (section === "streams") return displayAudioStreams.length
+    return 0
+  }
+
+  function sectionVisible(section) {
+    if (section === "output") return true
+    if (section === "input") return displayAudioSources.length > 0 || !!source
+    if (section === "streams") return displayAudioStreams.length > 0
+    return false
+  }
+
+  function sectionHasSlider(section) {
+    if (section === "output") return true
+    if (section === "input") return !!source
+    return false  // stream rows carry their own sliders inline; not a section-level slider
+  }
+
+  // Order of visible sections, recomputed reactively so dropping a section
+  // (e.g. no input devices) doesn't leave the cursor pointing at it.
+  readonly property var visibleSections: {
+    var list = []
+    if (sectionVisible("output")) list.push("output")
+    if (sectionVisible("input")) list.push("input")
+    if (sectionVisible("streams")) list.push("streams")
+    return list
+  }
+
+  function moveCursor(delta) {
+    var sections = visibleSections
+    if (sections.length === 0) return
+    var sIdx = sections.indexOf(focusSection)
+    if (sIdx < 0) { focusSection = sections[0]; selectedIndex = sectionHasSlider(focusSection) ? -1 : 0; return }
+
+    var idx = selectedIndex
+    var max = sectionCount(focusSection) - 1  // last device index
+    var hasSlider = sectionHasSlider(focusSection)
+    var floor = hasSlider ? -1 : 0  // -1 = slider row
+
+    if (delta > 0) {
+      if (idx < max) { selectedIndex = idx + 1; return }
+      // Fall through to next section.
+      if (sIdx < sections.length - 1) {
+        focusSection = sections[sIdx + 1]
+        selectedIndex = sectionHasSlider(focusSection) ? -1 : 0
+      }
+    } else {
+      if (idx > floor) { selectedIndex = idx - 1; return }
+      // Escape upward.
+      if (sIdx > 0) {
+        focusSection = sections[sIdx - 1]
+        var prevMax = sectionCount(focusSection) - 1
+        selectedIndex = prevMax >= 0 ? prevMax : (sectionHasSlider(focusSection) ? -1 : 0)
+      }
+    }
+  }
+
+  function moveSection(delta) {
+    var sections = visibleSections
+    if (sections.length === 0) return
+    var current = sections.indexOf(focusSection)
+    if (current < 0) current = delta > 0 ? -1 : 0
+    var next = (current + delta + sections.length) % sections.length
+    focusSection = sections[next]
+    selectedIndex = sectionHasSlider(focusSection) ? -1 : 0
+    cursorActive = true
+  }
+
+  // Adjust the slider associated with the focused section. Output and
+  // input sliders are real volume controls; on stream rows h/l adjusts
+  // that stream's volume (so keyboard parity with the inline slider).
+  // For device rows (selectedIndex >= 0 in output/input) h/l is a no-op
+  // — the cursor is on a discrete row, not on the slider, and silently
+  // moving the global slider would surprise the user.
+  function adjustVolume(delta) {
+    if (focusSection === "output" && selectedIndex === -1) {
+      setOutputVolume(outputVolume + delta)
+      return
+    }
+    if (focusSection === "input" && selectedIndex === -1) {
+      setInputVolume(inputVolume + delta)
+      return
+    }
+    if (focusSection === "streams" && selectedIndex >= 0 && selectedIndex < displayAudioStreams.length) {
+      var s = displayAudioStreams[selectedIndex]
+      if (s && s.audio) s.audio.volume = Math.max(0, Math.min(1.5, s.audio.volume + delta))
+    }
+  }
+
+  // Enter/Space: activate whatever the cursor is on.
+  function activateCursor() {
+    if (focusSection === "output") {
+      if (selectedIndex === -1) { toggleOutputMute(); return }
+      var sink = displayAudioSinks[selectedIndex]
+      if (sink) setDefaultSink(sink)
+      return
+    }
+    if (focusSection === "input") {
+      if (selectedIndex === -1) { toggleInputMute(); return }
+      var src = displayAudioSources[selectedIndex]
+      if (src) setDefaultSource(src)
+      return
+    }
+    if (focusSection === "streams" && selectedIndex >= 0) {
+      var st = displayAudioStreams[selectedIndex]
+      if (st && st.audio) st.audio.muted = !st.audio.muted
+    }
+  }
+
+  onOpenedChanged: {
+    if (opened) {
+      refreshDisplayAudioModels()
+      focusSection = "output"
+      selectedIndex = -1  // first keyboard cursor reveal starts on the output slider
+      cursorActive = false
+      Qt.callLater(resetScroll)
+    } else {
+      clearDisplayAudioModels()
+    }
+  }
+
+  // Clamp / repair the cursor whenever any list refreshes underneath us.
+  onAudioSinksChanged: scheduleDisplayAudioModelRefresh()
+  onAudioSourcesChanged: scheduleDisplayAudioModelRefresh()
+  onAudioStreamsChanged: scheduleDisplayAudioModelRefresh()
+
+  function listSnapshot(list) {
+    return Model.listSnapshot(list)
+  }
+
+  function refreshDisplayAudioModels() {
+    if (!opened) return
+    displayAudioSinks = listSnapshot(audioSinks)
+    displayAudioSources = listSnapshot(audioSources)
+    displayAudioStreams = listSnapshot(audioStreams)
+    clampCursor()
+  }
+
+  function scheduleDisplayAudioModelRefresh() {
+    if (!opened) return
+    audioModelRefreshTimer.restart()
+  }
+
+  function clearDisplayAudioModels() {
+    audioModelRefreshTimer.stop()
+    displayAudioSinks = []
+    displayAudioSources = []
+    displayAudioStreams = []
+  }
+
+  // Keep the keyboard-focused row inside the visible viewport of the
+  // ScrollView. Each cursor target (slider rows, SinkRow, SourceRow,
+  // StreamRow) calls this when it gains hasCursor. Without it, j/k can
+  // walk the selection off-screen — wifi uses ListView.positionViewAtIndex
+  // for this; we don't have that affordance with a multi-section Column.
+  function resetScroll() {
+    if (!scrollArea) return
+    var flick = scrollArea.contentItem
+    if (flick && flick.contentY !== undefined) flick.contentY = 0
+  }
+
+  function ensureCursorVisible(item) {
+    if (!item || !scrollArea) return
+    var flick = scrollArea.contentItem
+    if (!flick || flick.contentY === undefined) return
+    var margin = 6
+    var maxY = Math.max(0, (flick.contentHeight || 0) - flick.height)
+    if (maxY <= Style.space(24) || (root.focusSection === "output" && root.selectedIndex === -1)) {
+      flick.contentY = 0
+      return
+    }
+    var pt = item.mapToItem(flick.contentItem || flick, 0, 0)
+    var top = pt.y
+    var bottom = top + (item.height || 0)
+    var viewTop = flick.contentY
+    var viewBottom = viewTop + flick.height
+    if (top < viewTop + margin) flick.contentY = Math.max(0, Math.min(maxY, top - margin))
+    else if (bottom > viewBottom - margin)
+      flick.contentY = Math.max(0, Math.min(maxY, bottom + margin - flick.height))
+  }
+
+  function clampCursor() {
+    var sections = visibleSections
+    if (!sections || !sections.length) return
+    if (sections.indexOf(focusSection) < 0) {
+      focusSection = visibleSections[0]
+      selectedIndex = sectionHasSlider(focusSection) ? -1 : 0
+      return
+    }
+    var count = sectionCount(focusSection)
+    var hasSlider = sectionHasSlider(focusSection)
+    var floor = hasSlider ? -1 : 0
+    if (selectedIndex > count - 1) selectedIndex = Math.max(floor, count - 1)
+    if (selectedIndex < floor) selectedIndex = floor
+  }
+
+  function outputIcon() {
+    // Match the old Waybar pulseaudio glyph set. The Material Design speaker
+    // icons render visually smaller in JetBrainsMono Nerd Font.
+    if (!sink || !sink.audio) return ""
+    if (isHeadphones(sink)) return "󰋋"
+    if (outputMuted) return ""
+    var v = outputVolume
+    if (v >= 0.67) return ""
+    if (v >= 0.34) return ""
+    if (v > 0) return ""
+    return ""
+  }
+
+  function inputIcon() {
+    if (!source || !source.audio) return "󰍭"
+    return inputMuted ? "󰍭" : "󰍬"
+  }
+
+  // Playful mood-name for a given output volume. Mirrors the brightness
+  // panel's brightnessName ladder; bands are wide enough that small
+  // tweaks don't rename the room you're in.
+  function outputVolumeName(volume, muted) {
+    return Model.outputVolumeName(volume, muted)
+  }
+
+  function setOutputVolume(v) {
+    if (!sink || !sink.audio) return
+    sink.audio.volume = Math.max(0, Math.min(1, v))
+  }
+
+  function setInputVolume(v) {
+    if (!source || !source.audio) return
+    source.audio.volume = Math.max(0, Math.min(1, v))
+  }
+
+  function toggleOutputMute() {
+    if (sink && sink.audio) sink.audio.muted = !sink.audio.muted
+  }
+
+  function toggleInputMute() {
+    if (source && source.audio) source.audio.muted = !source.audio.muted
+  }
+
+  function setDefaultSink(node) {
+    if (!node) return
+    Pipewire.preferredDefaultAudioSink = node
+    if (root.bar && node.id !== undefined && node.name) {
+      Quickshell.execDetached([
+        root.bar.omarchyPath + "/bin/omarchy-audio-output-set-default",
+        String(node.id),
+        String(node.name)
+      ])
+    }
+  }
+
+  function setDefaultSource(node) {
+    if (!node) return
+    Pipewire.preferredDefaultAudioSource = node
+    if (root.bar && node.id !== undefined && node.name) {
+      Quickshell.execDetached([
+        root.bar.omarchyPath + "/bin/omarchy-audio-input-set-default",
+        String(node.id),
+        String(node.name)
+      ])
+    }
+  }
+
+  function sinkAvailable(node) {
+    if (!node || !node.name || !sinkAvailabilityLoaded) return true
+    var name = String(node.name)
+    return sinkAvailability[name] !== false
+  }
+
+  function updateSinkAvailability(raw) {
+    sinkAvailability = Model.parseSinkAvailability(raw)
+    sinkAvailabilityLoaded = true
+  }
+
+  function friendlyDeviceLabel(text) {
+    return Model.friendlyDeviceLabel(text)
+  }
+
+  function nodeLabel(node) {
+    return Model.nodeLabel(node)
+  }
+
+  function nodeProps(node) {
+    return Model.nodeProps(node)
+  }
+
+  function isHeadphones(node) {
+    return Model.isHeadphones(node)
+  }
+
+  function sinkGlyph(node) {
+    return Model.sinkGlyph(node)
+  }
+
+  function sourceGlyph(node) {
+    return Model.sourceGlyph(node)
+  }
+
+  function friendlyStreamLabel(label) {
+    return Model.friendlyStreamLabel(label)
+  }
+
+  function streamLabelKey(label) {
+    return Model.streamLabelKey(label)
+  }
+
+  function streamLabelIsGeneric(label) {
+    return Model.streamLabelIsGeneric(label)
+  }
+
+  function rawStreamLabel(node) {
+    return Model.rawStreamLabel(node)
+  }
+
+  function mprisPlayerLabel(player) {
+    return Model.mprisPlayerLabel(player)
+  }
+
+  function mprisPlayerIsProxy(player) {
+    return Model.mprisPlayerIsProxy(player)
+  }
+
+  function streamRepresentsMprisPlayer(streamLabel, playerLabel) {
+    return Model.streamRepresentsMprisPlayer(streamLabel, playerLabel)
+  }
+
+  function mprisLabelsFor(predicate) {
+    return Model.mprisLabelsFor(mprisPlayers, predicate)
+  }
+
+  function matchingMprisStreamLabel(label) {
+    return Model.matchingMprisStreamLabel(label, mprisPlayers)
+  }
+
+  function unmatchedMprisStreamLabel(label) {
+    // Spotify exposes its PipeWire stream as "audio-src". For generic stream
+    // names, use the one MPRIS player not already represented by another audio
+    // stream (e.g. Chromium, or ALSA apps like cliamp).
+    return Model.unmatchedMprisStreamLabel(label, mprisPlayers, displayAudioStreams)
+  }
+
+  function streamLabel(node) {
+    return Model.streamLabel(node, mprisPlayers, displayAudioStreams)
+  }
+
+  function streamRepresentsPlayer(node, player) {
+    return Model.streamRepresentsPlayer(node, player, mprisPlayers, displayAudioStreams)
+  }
+
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  PwObjectTracker { objects: root.candidateSinks }
+  PwObjectTracker { objects: root.candidateSources }
+  PwObjectTracker { objects: root.audioStreams }
+
+  PwNodePeakMonitor {
+    id: inputPeakMonitor
+    node: root.source
+    enabled: root.opened && !!root.source
+  }
+
+  Process {
+    id: sinkAvailabilityProc
+    command: [root.bar ? root.bar.omarchyPath + "/bin/omarchy-audio-sink-availability" : "omarchy-audio-sink-availability"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.updateSinkAvailability(text)
+    }
+  }
+
+  Timer {
+    interval: 5000
+    running: root.opened
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: if (!sinkAvailabilityProc.running) sinkAvailabilityProc.running = true
+  }
+
+  Timer {
+    id: audioModelRefreshTimer
+    interval: 75
+    repeat: false
+    onTriggered: root.refreshDisplayAudioModels()
+  }
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: root.outputIcon()
+    fontSize: Style.font.body
+    fixedWidth: root.bar && root.bar.vertical ? -1 : Style.space(27)
+    fixedHeight: root.bar && root.bar.vertical ? Style.space(26) : -1
+    onPressed: function(b) {
+      if (b === Qt.RightButton) root.toggleOutputMute()
+      else root.toggle()
+    }
+
+    onWheelMoved: function(delta) {
+      var step = 0.05
+      root.setOutputVolume(root.outputVolume + (delta > 0 ? step : -step))
+    }
+  }
+
+  KeyboardPanel {
+    id: panel
+    anchorItem: button
+    owner: root
+    bar: root.bar
+    open: root.opened
+    focusTarget: keyCatcher
+    contentWidth: panel.fittedContentWidth(Style.space(380))
+    contentHeight: panel.fittedContentHeight(panelColumn.implicitHeight, Style.space(560))
+
+    PanelKeyCatcher {
+      id: keyCatcher
+      anchors.fill: parent
+      onMoveRequested: function(dx, dy) {
+        if (!root.cursorActive) { root.cursorActive = true; return }
+        if (dy !== 0) root.moveCursor(dy)
+        else if (dx !== 0) root.adjustVolume(dx * 0.05)
+      }
+      onActivateRequested: if (root.cursorActive) root.activateCursor()
+      onCloseRequested: root.close()
+      onTabRequested: function(direction) { root.switchPanel(direction) }
+      onTextKey: function(t) {
+        // 'm' mutes whatever the cursor is on: focused section's slider
+        // for output/input, the focused stream for streams.
+        if (t === "m" || t === "M") {
+          if (!root.cursorActive) return
+          if (root.focusSection === "streams" && root.selectedIndex >= 0
+              && root.selectedIndex < root.displayAudioStreams.length) {
+            var s = root.displayAudioStreams[root.selectedIndex]
+            if (s && s.audio) s.audio.muted = !s.audio.muted
+          } else if (root.focusSection === "input") {
+            root.toggleInputMute()
+          } else {
+            root.toggleOutputMute()
+          }
+        }
+      }
+
+      ScrollView {
+        id: scrollArea
+        anchors.fill: parent
+        clip: true
+        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+        ScrollBar.vertical.policy: ScrollBar.AsNeeded
+
+        Column {
+          id: panelColumn
+          width: scrollArea.availableWidth
+          spacing: Style.space(14)
+
+          // ---------- Hero: speaker icon · title/status ----------
+          Item {
+            id: heroItem
+            width: parent.width
+            implicitHeight: Math.max(heroIcon.implicitHeight, heroLabels.implicitHeight)
+
+            Text {
+              id: heroIcon
+              text: root.outputIcon()
+              color: root.bar.foreground
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.display
+              opacity: root.outputMuted ? 0.5 : 1.0
+              anchors.left: parent.left
+              anchors.verticalCenter: parent.verticalCenter
+
+              MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                onClicked: root.toggleOutputMute()
+              }
+            }
+
+            Column {
+              id: heroLabels
+              anchors.left: heroIcon.right
+              anchors.leftMargin: Style.space(14)
+              anchors.right: parent.right
+              anchors.verticalCenter: parent.verticalCenter
+              spacing: Style.space(2)
+
+              Text {
+                text: "Audio"
+                color: root.bar.foreground
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.title
+                font.bold: true
+                elide: Text.ElideRight
+                width: parent.width
+              }
+
+              Text {
+                id: heroLabel
+                text: root.outputVolumeName(
+                  outputSlider.dragging ? outputSlider.liveValue : root.outputVolume,
+                  root.outputMuted
+                ).toUpperCase()
+                color: Qt.darker(root.bar.foreground, 1.4)
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.caption
+                font.bold: true
+                font.letterSpacing: 1.2
+                elide: Text.ElideRight
+                width: parent.width
+              }
+            }
+          }
+
+          // ---- Output devices ----
+          Column {
+            width: parent.width
+            spacing: Style.space(6)
+
+            Item {
+              width: parent.width
+              implicitHeight: Math.max(outputHeader.implicitHeight, outputPercent.implicitHeight)
+
+              PanelSectionHeader {
+                id: outputHeader
+                text: "OUTPUT"
+                foreground: root.bar.foreground
+                fontFamily: root.bar.fontFamily
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+              }
+
+              Text {
+                id: outputPercent
+                text: Math.round((outputSlider.dragging ? outputSlider.liveValue : root.outputVolume) * 100) + "%"
+                color: Qt.darker(root.bar.foreground, 1.4)
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.caption
+                font.bold: true
+                anchors.right: parent.right
+                anchors.rightMargin: Style.space(6)
+                anchors.verticalCenter: parent.verticalCenter
+                opacity: root.outputMuted ? 0.5 : 1.0
+              }
+            }
+
+            CursorSurface {
+              id: outputSliderRow
+              width: parent.width
+              height: outputSlider.implicitHeight + Style.spacing.controlGap
+              hasCursor: root.cursorActive && root.focusSection === "output" && root.selectedIndex === -1
+              onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(outputSliderRow)
+              foreground: root.bar.foreground
+              outline: true
+
+              PanelSlider {
+                id: outputSlider
+                bar: root.bar
+                anchors.fill: parent
+                anchors.leftMargin: Style.space(6)
+                anchors.rightMargin: Style.space(6)
+                minimum: 0
+                maximum: 1
+                step: 0.05
+                value: root.outputVolume
+                opacity: root.outputMuted ? 0.5 : 1.0
+                enabled: !!root.sink
+
+                onMoved: function(v) { root.setOutputVolume(v) }
+              }
+
+              HoverHandler {
+                onHoveredChanged: if (hovered) {
+                  root.cursorActive = true
+                  root.focusSection = "output"
+                  root.selectedIndex = -1
+                }
+              }
+            }
+
+            Repeater {
+              model: root.displayAudioSinks
+
+              SinkRow {
+                required property var modelData
+                required property int index
+                width: panelColumn.width
+                node: modelData
+                rowIndex: index
+              }
+            }
+          }
+
+          // ---- Input ----
+          Column {
+            width: parent.width
+            spacing: Style.space(6)
+            visible: root.displayAudioSources.length > 0 || !!root.source
+
+            Item {
+              width: parent.width
+              implicitHeight: Math.max(microphoneHeader.implicitHeight, microphonePercent.implicitHeight)
+
+              PanelSectionHeader {
+                id: microphoneHeader
+                text: "INPUT"
+                foreground: root.bar.foreground
+                fontFamily: root.bar.fontFamily
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+              }
+
+              Text {
+                id: microphonePercent
+                text: Math.round((inputSlider.dragging ? inputSlider.liveValue : root.inputVolume) * 100) + "%"
+                color: Qt.darker(root.bar.foreground, 1.4)
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.caption
+                font.bold: true
+                anchors.right: parent.right
+                anchors.rightMargin: Style.space(6)
+                anchors.verticalCenter: parent.verticalCenter
+                opacity: root.inputMuted ? 0.5 : 1.0
+              }
+            }
+
+            CursorSurface {
+              id: inputSliderRow
+              visible: !!root.source
+              width: parent.width
+              height: inputControls.implicitHeight + Style.spacing.controlGap
+              hasCursor: root.cursorActive && root.focusSection === "input" && root.selectedIndex === -1
+              onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(inputSliderRow)
+              foreground: root.bar.foreground
+              outline: true
+
+              Column {
+                id: inputControls
+                anchors.fill: parent
+                anchors.leftMargin: Style.space(6)
+                anchors.rightMargin: Style.space(6)
+                spacing: Style.space(5)
+
+                PanelSlider {
+                  id: inputSlider
+                  bar: root.bar
+                  width: parent.width
+                  minimum: 0
+                  maximum: 1
+                  step: 0.05
+                  value: root.inputVolume
+                  opacity: root.inputMuted ? 0.5 : 1.0
+                  enabled: !!root.source
+
+                  onMoved: function(v) { root.setInputVolume(v) }
+                }
+
+                Rectangle {
+                  width: parent.width
+                  height: Math.max(Style.space(5), Style.spacing.xs)
+                  color: Util.alpha(root.bar.foreground, 0.18)
+                  opacity: root.inputMuted ? 0.35 : 1.0
+
+                  Rectangle {
+                    height: parent.height
+                    width: parent.width * Math.max(0, Math.min(1, inputPeakMonitor.peak))
+                    color: root.bar.foreground
+                    Behavior on width { NumberAnimation { duration: 70 } }
+                  }
+                }
+              }
+
+              HoverHandler {
+                onHoveredChanged: if (hovered) {
+                  root.cursorActive = true
+                  root.focusSection = "input"
+                  root.selectedIndex = -1
+                }
+              }
+            }
+
+            Repeater {
+              model: root.displayAudioSources
+
+              SourceRow {
+                required property var modelData
+                required property int index
+                width: panelColumn.width
+                node: modelData
+                rowIndex: index
+              }
+            }
+          }
+
+          // ---- Per-app streams ----
+          Column {
+            width: parent.width
+            spacing: Style.space(10)
+            visible: root.displayAudioStreams.length > 0
+
+            PanelSectionHeader {
+              text: "SOURCES"
+              foreground: root.bar.foreground
+              fontFamily: root.bar.fontFamily
+            }
+
+            Repeater {
+              model: root.displayAudioStreams
+
+              StreamRow {
+                required property var modelData
+                required property int index
+                width: panelColumn.width
+                node: modelData
+                rowIndex: index
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // ---- Reusable inline components ----
+
+  // Output device row — cursor target inside the "output" section. Mouse
+  // hover updates the panel cursor at the root; visuals come entirely
+  // from hasCursor/current via CursorSurface, never from containsMouse.
+  component SinkRow: CursorSurface {
+    id: sinkRow
+    required property var node
+    required property int rowIndex
+
+    readonly property bool isActive: root.sink && node && root.sink.id === node.id
+    hasCursor: root.cursorActive && root.focusSection === "output" && root.selectedIndex === rowIndex
+    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(sinkRow)
+    current: isActive
+    foreground: root.bar.foreground
+    fill: root.hoverFill
+    currentFill: root.selectedFill
+    implicitHeight: sinkInner.implicitHeight + Style.spacing.xl
+
+    Row {
+      id: sinkInner
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(6)
+      anchors.rightMargin: Style.space(6)
+      spacing: Style.space(8)
+
+      Text {
+        text: root.sinkGlyph(sinkRow.node)
+        color: root.bar.foreground
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.title
+        width: Style.space(22)
+        horizontalAlignment: Text.AlignHCenter
+        anchors.verticalCenter: parent.verticalCenter
+      }
+
+      Text {
+        text: root.nodeLabel(sinkRow.node)
+        color: root.bar.foreground
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.body
+        font.bold: sinkRow.isActive
+        elide: Text.ElideRight
+        width: parent.width - Style.space(22) - Style.space(8)
+        anchors.verticalCenter: parent.verticalCenter
+      }
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      hoverEnabled: true
+      cursorShape: Qt.PointingHandCursor
+      onContainsMouseChanged: if (containsMouse) {
+        root.cursorActive = true
+        root.focusSection = "output"
+        root.selectedIndex = sinkRow.rowIndex
+      }
+      onClicked: root.setDefaultSink(sinkRow.node)
+    }
+  }
+
+  // Input device row — sibling of SinkRow for the "input" section.
+  component SourceRow: CursorSurface {
+    id: sourceRow
+    required property var node
+    required property int rowIndex
+
+    readonly property bool isActive: root.source && node && root.source.id === node.id
+    hasCursor: root.cursorActive && root.focusSection === "input" && root.selectedIndex === rowIndex
+    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(sourceRow)
+    current: isActive
+    foreground: root.bar.foreground
+    fill: root.hoverFill
+    currentFill: root.selectedFill
+    implicitHeight: sourceInner.implicitHeight + Style.spacing.xl
+
+    Row {
+      id: sourceInner
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(6)
+      anchors.rightMargin: Style.space(6)
+      spacing: Style.space(8)
+
+      Text {
+        text: root.sourceGlyph(sourceRow.node)
+        color: root.bar.foreground
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.title
+        width: Style.space(22)
+        horizontalAlignment: Text.AlignHCenter
+        anchors.verticalCenter: parent.verticalCenter
+      }
+
+      Text {
+        text: root.nodeLabel(sourceRow.node)
+        color: root.bar.foreground
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.body
+        font.bold: sourceRow.isActive
+        elide: Text.ElideRight
+        width: parent.width - Style.space(22) - Style.space(8)
+        anchors.verticalCenter: parent.verticalCenter
+      }
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      hoverEnabled: true
+      cursorShape: Qt.PointingHandCursor
+      onContainsMouseChanged: if (containsMouse) {
+        root.cursorActive = true
+        root.focusSection = "input"
+        root.selectedIndex = sourceRow.rowIndex
+      }
+      onClicked: root.setDefaultSource(sourceRow.node)
+    }
+  }
+
+  // Per-app stream row — cursor target inside the "streams" section.
+  // The stream has its own slider inline, so h/l from the keyboard
+  // adjusts THIS stream's volume (not the global output) when the cursor
+  // sits on this row. Enter/Space mutes the stream.
+  component StreamRow: CursorSurface {
+    id: streamRow
+    required property var node
+    required property int rowIndex
+
+    readonly property real streamVolume: node && node.audio ? node.audio.volume : 0
+    readonly property bool streamMuted: node && node.audio ? node.audio.muted : false
+    readonly property bool isActive: root.streamRepresentsPlayer(node, root.activeMediaPlayer)
+
+    hasCursor: root.cursorActive && root.focusSection === "streams" && root.selectedIndex === rowIndex
+    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(streamRow)
+    current: isActive
+    foreground: root.bar.foreground
+    fill: root.hoverFill
+    currentFill: root.selectedFill
+    implicitHeight: streamColumn.implicitHeight + Style.spacing.xl
+
+    Column {
+      id: streamColumn
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(6)
+      anchors.rightMargin: Style.space(6)
+      spacing: Style.space(2)
+
+      Row {
+        width: parent.width
+        spacing: Style.space(8)
+
+        Text {
+          id: streamMuteIcon
+          text: streamRow.streamMuted ? "󰝟" : "󰕾"
+          color: root.bar.foreground
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.title
+          width: Style.space(22)
+          horizontalAlignment: Text.AlignHCenter
+          anchors.verticalCenter: parent.verticalCenter
+          opacity: streamRow.streamMuted ? 0.5 : 1.0
+
+          MouseArea {
+            anchors.fill: parent
+            cursorShape: Qt.PointingHandCursor
+            onClicked: {
+              if (streamRow.node && streamRow.node.audio)
+                streamRow.node.audio.muted = !streamRow.node.audio.muted
+            }
+          }
+        }
+
+        Text {
+          text: root.streamLabel(streamRow.node)
+          color: root.bar.foreground
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.body
+          font.bold: streamRow.isActive
+          elide: Text.ElideRight
+          width: parent.width - streamMuteIcon.width - streamPct.width - Style.space(16)
+          anchors.verticalCenter: parent.verticalCenter
+        }
+
+        Text {
+          id: streamPct
+          text: Math.round(streamRow.streamVolume * 100) + "%"
+          color: Qt.darker(root.bar.foreground, 1.5)
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.caption
+          font.bold: true
+          width: Style.space(36)
+          horizontalAlignment: Text.AlignRight
+          anchors.verticalCenter: parent.verticalCenter
+          opacity: streamRow.streamMuted ? 0.5 : 1.0
+        }
+      }
+
+      PanelSlider {
+        bar: root.bar
+        width: parent.width
+        minimum: 0
+        maximum: 1.5
+        step: 0.05
+        value: streamRow.streamVolume
+        opacity: streamRow.streamMuted ? 0.5 : 1.0
+
+        onMoved: function(v) {
+          if (streamRow.node && streamRow.node.audio) streamRow.node.audio.volume = v
+        }
+      }
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      hoverEnabled: true
+      acceptedButtons: Qt.NoButton
+      propagateComposedEvents: true
+      onContainsMouseChanged: if (containsMouse) {
+        root.cursorActive = true
+        root.focusSection = "streams"
+        root.selectedIndex = streamRow.rowIndex
+      }
+    }
+  }
+}
diff --git a/shell/plugins/panels/audio/manifest.json b/shell/plugins/panels/audio/manifest.json
new file mode 100644
index 00000000..3e130f27
--- /dev/null
+++ b/shell/plugins/panels/audio/manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.audio",
+  "name": "Audio",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Volume slider, output picker, per-app mixer",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Panel.qml"
+  },
+  "barWidget": {
+    "displayName": "Audio",
+    "description": "Volume slider, output picker, per-app mixer",
+    "category": "Audio",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/panels/bluetooth/Model.js b/shell/plugins/panels/bluetooth/Model.js
new file mode 100644
index 00000000..c463b924
--- /dev/null
+++ b/shell/plugins/panels/bluetooth/Model.js
@@ -0,0 +1,113 @@
+function deviceLabel(device) {
+  if (!device) return ""
+  return String(device.deviceName || device.name || "").trim()
+}
+
+function toArray(values) {
+  if (!values) return []
+  if (Array.isArray(values)) return values.slice()
+
+  var length = Number(values.length || 0)
+  if (!isFinite(length) || length <= 0) return []
+
+  var list = []
+  for (var i = 0; i < length; i++) list.push(values[i])
+  return list
+}
+
+function isUuidLike(value) {
+  var text = String(value || "").trim()
+  if (text === "") return false
+  return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(text)
+    || /^[0-9a-f]{32}$/i.test(text)
+    || /^0x[0-9a-f]{4,32}$/i.test(text)
+    || /^0000[0-9a-f]{4}-0000-1000-8000-00805f9b34fb$/i.test(text)
+}
+
+function isAddressLike(value) {
+  var text = String(value || "").trim()
+  return /^([0-9a-f]{2}[:-]){5}[0-9a-f]{2}$/i.test(text)
+}
+
+function hasHumanName(device) {
+  var label = deviceLabel(device)
+  return label !== "" && !isUuidLike(label) && !isAddressLike(label)
+}
+
+function sortedByLabel(devices) {
+  var list = toArray(devices)
+  list.sort(function(a, b) { return deviceLabel(a).localeCompare(deviceLabel(b)) })
+  return list
+}
+
+function deviceLists(devices) {
+  var values = toArray(devices)
+  var connected = []
+  var known = []
+  var discovered = []
+
+  for (var i = 0; i < values.length; i++) {
+    var d = values[i]
+    if (!d || !hasHumanName(d)) continue
+    if (d.connected) connected.push(d)
+    else if (d.paired || d.bonded || d.trusted) known.push(d)
+    else discovered.push(d)
+  }
+
+  return {
+    connected: sortedByLabel(connected),
+    known: sortedByLabel(known),
+    discovered: sortedByLabel(discovered)
+  }
+}
+
+function cloneMap(map) {
+  var next = ({})
+  for (var key in map || {}) next[key] = map[key]
+  return next
+}
+
+function pendingAction(actions, address) {
+  return address && actions && actions[address] ? actions[address] : ""
+}
+
+function withPendingAction(actions, address, action) {
+  var next = cloneMap(actions)
+  if (!address) return next
+  if (action) next[address] = action
+  else delete next[address]
+  return next
+}
+
+function visibleSections(lists, discovering) {
+  var sections = []
+  if (lists && lists.connected && lists.connected.length > 0) sections.push("connected")
+  if (lists && lists.known && lists.known.length > 0) sections.push("known")
+  if (discovering && lists && lists.discovered && lists.discovered.length > 0) sections.push("discovered")
+  return sections
+}
+
+function sectionDevices(lists, section) {
+  if (!lists) return []
+  if (section === "connected") return lists.connected || []
+  if (section === "known") return lists.known || []
+  if (section === "discovered") return lists.discovered || []
+  return []
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    deviceLabel: deviceLabel,
+    toArray: toArray,
+    isUuidLike: isUuidLike,
+    isAddressLike: isAddressLike,
+    hasHumanName: hasHumanName,
+    sortedByLabel: sortedByLabel,
+    deviceLists: deviceLists,
+    cloneMap: cloneMap,
+    pendingAction: pendingAction,
+    withPendingAction: withPendingAction,
+    visibleSections: visibleSections,
+    sectionDevices: sectionDevices
+  }
+}
diff --git a/shell/plugins/panels/bluetooth/Panel.qml b/shell/plugins/panels/bluetooth/Panel.qml
new file mode 100644
index 00000000..589cc0a9
--- /dev/null
+++ b/shell/plugins/panels/bluetooth/Panel.qml
@@ -0,0 +1,768 @@
+import QtQuick
+import QtQuick.Controls
+import Quickshell
+import Quickshell.Io
+import Quickshell.Bluetooth
+import qs.Ui
+import qs.Commons
+import "Model.js" as Model
+
+Panel {
+  id: root
+  moduleName: "omarchy.bluetooth"
+  ipcTarget: "omarchy.bluetooth"
+
+  // Address -> "connecting" | "disconnecting" | "forgetting".
+  // The actual Bluetooth sequencing lives in bin/omarchy-bluetooth-device;
+  // this map only keeps the panel responsive while BlueZ catches up.
+  property var pendingActions: ({})
+
+  readonly property var adapter: Bluetooth.defaultAdapter
+  readonly property var devices: Bluetooth.devices ? Bluetooth.devices.values : []
+
+  function deviceLabel(device) {
+    return Model.deviceLabel(device)
+  }
+
+  function isUuidLike(value) {
+    return Model.isUuidLike(value)
+  }
+
+  function isAddressLike(value) {
+    return Model.isAddressLike(value)
+  }
+
+  function hasHumanName(device) {
+    return Model.hasHumanName(device)
+  }
+
+  readonly property var deviceGroups: Model.deviceLists(devices)
+  readonly property var connectedDevices: deviceGroups.connected || []
+  readonly property var knownDevices: deviceGroups.known || []
+  readonly property var discoveredDevices: deviceGroups.discovered || []
+
+  readonly property string icon: {
+    if (!adapter) return ""
+    if (!adapter.enabled) return "󰂲"
+    if (connectedDevices.length > 0) return "󰂱"
+    return "󰂯"
+  }
+
+  property int phraseIndex: 0
+  readonly property var activePhrases: [
+    "Untangling wires",
+    "Streaming vikings",
+    "Pairing mysteries",
+    "Herding headsets",
+    "Taming radios",
+    "Summoning speakers",
+    "Wrangling codecs",
+    "Polishing packets"
+  ]
+  readonly property bool rotatingPhrases: adapter && adapter.enabled
+  readonly property string heroStatusText: {
+    if (!adapter) return "No adapter"
+    if (!adapter.enabled) return "Bluetooth off"
+    return activePhrases[phraseIndex % activePhrases.length]
+  }
+
+  // Single cursor model shared by keyboard and mouse. Sections:
+  //   "connected"  — currently connected devices; Enter disconnects.
+  //   "known"      — remembered devices; Enter connects.
+  //   "discovered" — unremembered devices visible while scanning; Enter connects.
+  // Visuals always come from CursorSurface (hasCursor / current),
+  // never from containsMouse. Mouse hover updates root cursor state too,
+  // guaranteeing one highlight on screen.
+  property string focusSection: "connected"
+  property int selectedIndex: 0
+  property bool actionFocused: false
+  property bool cursorActive: false
+
+  // Stable identity for the focused device. Devices move between sections as
+  // they connect, disconnect, pair, or get forgotten, so follow the BlueZ
+  // address across section changes instead of preserving a stale row index.
+  property string focusedDeviceAddress: ""
+
+  readonly property color hoverFill: bar
+    ? Style.hoverFillFor(bar.foreground, Color.accent)
+    : "transparent"
+  readonly property color selectedFill: bar
+    ? Style.selectedFillFor(bar.foreground, Color.accent)
+    : "transparent"
+
+  function sectionCount(section) {
+    if (section === "connected") return connectedDevices.length
+    if (section === "known") return knownDevices.length
+    if (section === "discovered") return discoveredDevices.length
+    return 0
+  }
+
+  function sectionVisible(section) {
+    if (section === "connected") return connectedDevices.length > 0
+    if (section === "known") return knownDevices.length > 0
+    if (section === "discovered") return adapter && adapter.discovering && discoveredDevices.length > 0
+    return false
+  }
+
+  readonly property var visibleSections: {
+    return Model.visibleSections(deviceGroups, adapter && adapter.discovering)
+  }
+
+  function devicesForSection(section) {
+    return Model.sectionDevices(deviceGroups, section)
+  }
+
+  function deviceAt(section, index) {
+    var list = devicesForSection(section)
+    return index >= 0 && index < list.length ? list[index] : null
+  }
+
+  function cloneMap(map) {
+    return Model.cloneMap(map)
+  }
+
+  function pendingAction(address) {
+    return Model.pendingAction(pendingActions, address)
+  }
+
+  function setPendingAction(address, action) {
+    if (!address) return
+    pendingActions = Model.withPendingAction(pendingActions, address, action)
+    if (action) pendingTimeout.restart()
+  }
+
+  function deviceCommand(action, address) {
+    var command = root.bar && root.bar.omarchyPath
+      ? root.bar.omarchyPath + "/bin/omarchy-bluetooth-device"
+      : "omarchy-bluetooth-device"
+    return [command, action, address]
+  }
+
+  function runDeviceAction(device, action, pending) {
+    if (!device || !device.address) return
+    setPendingAction(device.address, pending)
+    Quickshell.execDetached(deviceCommand(action, device.address))
+  }
+
+  function connectDevice(device) {
+    if (!device || device.connected) return
+    if (device.paired || device.bonded || device.trusted) runDeviceAction(device, "connect", "connecting")
+    else runDeviceAction(device, "pair", "connecting")
+  }
+
+  function disconnectDevice(device) {
+    if (!device || !device.address) return
+    if (!device.connected) return
+    setPendingAction(device.address, "disconnecting")
+    if (device.disconnect) device.disconnect()
+    Quickshell.execDetached(deviceCommand("disconnect", device.address))
+  }
+
+  function forgetDevice(device) {
+    if (!device || !device.address) return
+    runDeviceAction(device, "forget", "forgetting")
+  }
+
+  function syncPendingActions() {
+    var next = cloneMap(pendingActions)
+    var changed = false
+
+    for (var address in next) {
+      var action = next[address]
+      var found = null
+
+      for (var i = 0; i < devices.length; i++) {
+        var d = devices[i]
+        if (d && d.address === address) {
+          found = d
+          break
+        }
+      }
+
+      if ((action === "connecting" && found && found.connected)
+          || (action === "disconnecting" && found && !found.connected)
+          || (action === "forgetting" && (!found || (!found.paired && !found.bonded && !found.trusted)))) {
+        delete next[address]
+        changed = true
+      }
+    }
+
+    if (changed) pendingActions = next
+  }
+
+  // j/k navigates between device sections row-by-row.
+  function moveCursor(delta) {
+    var sections = visibleSections
+    if (!sections || sections.length === 0) return
+    var sIdx = sections.indexOf(focusSection)
+    if (sIdx < 0) { focusSection = sections[0]; selectedIndex = 0; actionFocused = false; return }
+
+    var idx = selectedIndex
+    var max = sectionCount(focusSection) - 1
+
+    if (delta > 0) {
+      if (idx < max) { selectedIndex = idx + 1; actionFocused = false; return }
+      if (sIdx < sections.length - 1) {
+        focusSection = sections[sIdx + 1]
+        selectedIndex = 0
+        actionFocused = false
+      }
+    } else {
+      if (idx > 0) { selectedIndex = idx - 1; actionFocused = false; return }
+      if (sIdx > 0) {
+        focusSection = sections[sIdx - 1]
+        selectedIndex = sectionCount(focusSection) - 1
+        actionFocused = false
+      }
+    }
+  }
+
+  function moveCursorH(delta) {
+    if (!cursorActive) { cursorActive = true; return }
+    if (focusSection !== "known" && focusSection !== "connected") return
+    var dev = deviceAt(focusSection, selectedIndex)
+    if (!dev || !dev.address) return
+    if (delta > 0) actionFocused = true
+    else if (delta < 0) actionFocused = false
+  }
+
+  function activateCursor() {
+    if (actionFocused) {
+      deleteSelected()
+      return
+    }
+
+    if (focusSection === "connected" || focusSection === "known") {
+      var dev = deviceAt(focusSection, selectedIndex)
+      if (!dev) return
+      if (dev.connected) disconnectDevice(dev)
+      else connectDevice(dev)
+      return
+    }
+    if (focusSection === "discovered") {
+      var d = discoveredDevices[selectedIndex]
+      if (!d) return
+      connectDevice(d)
+    }
+  }
+
+  // 'x' forgets remembered devices. For connected devices this first
+  // disconnects, then removes the BlueZ pairing record via omarchy-bluetooth-device.
+  function deleteSelected() {
+    if (focusSection !== "known" && focusSection !== "connected") return
+    var dev = deviceAt(focusSection, selectedIndex)
+    if (!dev) return
+    forgetDevice(dev)
+  }
+
+  onOpenedChanged: {
+    if (opened) {
+      if (adapter && adapter.enabled && !adapter.discovering) adapter.discovering = true
+      if (connectedDevices.length > 0) { focusSection = "connected"; selectedIndex = 0 }
+      else if (knownDevices.length > 0) { focusSection = "known"; selectedIndex = 0 }
+      else if (discoveredDevices.length > 0) { focusSection = "discovered"; selectedIndex = 0 }
+      actionFocused = false
+      cursorActive = false
+    }
+  }
+
+  function updateFocusedAddress() {
+    var d = deviceAt(focusSection, selectedIndex)
+    focusedDeviceAddress = d ? (d.address || "") : ""
+  }
+
+  function reselectFocusedDevice() {
+    if (focusedDeviceAddress === "") {
+      clampCursor()
+      return
+    }
+
+    var sections = ["connected", "known", "discovered"]
+    for (var s = 0; s < sections.length; s++) {
+      var section = sections[s]
+      if (!sectionVisible(section)) continue
+      var list = devicesForSection(section)
+      for (var i = 0; i < list.length; i++) {
+        if (list[i] && list[i].address === focusedDeviceAddress) {
+          focusSection = section
+          selectedIndex = i
+          clampCursor()
+          return
+        }
+      }
+    }
+
+    clampCursor()
+  }
+
+  onSelectedIndexChanged: updateFocusedAddress()
+  onFocusSectionChanged: updateFocusedAddress()
+  onConnectedDevicesChanged: { reselectFocusedDevice(); syncPendingActions() }
+  onKnownDevicesChanged: { reselectFocusedDevice(); syncPendingActions() }
+  onDiscoveredDevicesChanged: { reselectFocusedDevice(); syncPendingActions() }
+  onVisibleSectionsChanged: clampCursor()
+
+  // Keep the keyboard-focused row inside the visible viewport of the device
+  // Flickable. Each DeviceRow calls this when it gains hasCursor. Without
+  // it, j/k can walk the selection off-screen in a long device list.
+  function ensureCursorVisible(item) {
+    if (!item || !deviceFlick) return
+    var pt = item.mapToItem(deviceFlick.contentItem, 0, 0)
+    var top = pt.y
+    var bottom = top + (item.height || 0)
+    var viewTop = deviceFlick.contentY
+    var viewBottom = viewTop + deviceFlick.height
+    var margin = 6
+    if (top < viewTop + margin) deviceFlick.contentY = Math.max(0, top - margin)
+    else if (bottom > viewBottom - margin)
+      deviceFlick.contentY = bottom + margin - deviceFlick.height
+  }
+
+  function clampCursor() {
+    var sections = visibleSections
+    if (!sections || !sections.length) {
+      selectedIndex = 0
+      return
+    }
+    if (sections.indexOf(focusSection) < 0) {
+      focusSection = sections[0]
+      selectedIndex = 0
+      return
+    }
+    var count = sectionCount(focusSection)
+    if (count === 0) {
+      // Section emptied out — bounce to the previous visible one.
+      var sIdx = sections.indexOf(focusSection)
+      focusSection = sIdx > 0 ? sections[sIdx - 1] : sections[0]
+      selectedIndex = Math.max(0, sectionCount(focusSection) - 1)
+      return
+    }
+    if (selectedIndex > count - 1) selectedIndex = count - 1
+    if (selectedIndex < 0) selectedIndex = 0
+  }
+
+  visible: adapter !== null
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  Connections {
+    target: root.adapter || null
+    function onEnabledChanged() {
+      if (root.opened && root.adapter && root.adapter.enabled && !root.adapter.discovering)
+        root.adapter.discovering = true
+    }
+  }
+
+  Timer {
+    id: pendingTimeout
+    interval: 20000
+    repeat: false
+    onTriggered: root.pendingActions = ({})
+  }
+
+  Timer {
+    id: phraseTimer
+    interval: 2800
+    running: root.opened && root.rotatingPhrases
+    repeat: true
+    onTriggered: phraseSwap.restart()
+  }
+
+  SequentialAnimation {
+    id: phraseSwap
+    PropertyAnimation {
+      target: heroStatus; property: "opacity"
+      to: 0.0; duration: 180; easing.type: Easing.OutQuad
+    }
+    ScriptAction {
+      script: root.phraseIndex = (root.phraseIndex + 1) % root.activePhrases.length
+    }
+    PropertyAnimation {
+      target: heroStatus; property: "opacity"
+      to: 1.0; duration: 260; easing.type: Easing.InQuad
+    }
+  }
+
+  Connections {
+    target: root
+    function onRotatingPhrasesChanged() {
+      if (!root.rotatingPhrases) {
+        phraseSwap.stop()
+        heroStatus.opacity = 1.0
+      }
+    }
+  }
+
+  function toggleBluetooth() {
+    if (!adapter) return
+    adapter.enabled = !adapter.enabled
+    if (adapter.enabled) Qt.callLater(function() {
+      if (root.adapter) root.adapter.discovering = true
+    })
+  }
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: root.icon
+    fixedWidth: root.bar && root.bar.vertical ? -1 : Style.space(27)
+    fixedHeight: root.bar && root.bar.vertical ? Style.space(26) : -1
+    onPressed: function(b) {
+      if (b === Qt.RightButton) root.toggleBluetooth()
+      else if (b === Qt.MiddleButton) root.bar.run("omarchy-launch-bluetooth")
+      else root.toggle()
+    }
+  }
+
+  KeyboardPanel {
+    id: panel
+    anchorItem: button
+    owner: root
+    bar: root.bar
+    open: root.opened
+    focusTarget: keyCatcher
+    contentWidth: panel.fittedContentWidth(Style.space(380))
+    contentHeight: panel.fittedContentHeight(column.implicitHeight)
+
+    PanelKeyCatcher {
+      id: keyCatcher
+      anchors.fill: parent
+      onMoveRequested: function(dx, dy) {
+        if (!root.cursorActive) { root.cursorActive = true; return }
+        if (dy !== 0) root.moveCursor(dy)
+        else if (dx !== 0) root.moveCursorH(dx)
+      }
+      onActivateRequested: if (root.cursorActive) root.activateCursor()
+      onCloseRequested: root.close()
+      onTabRequested: function(direction) { root.switchPanel(direction) }
+      onDeleteRequested: if (root.cursorActive) root.deleteSelected()
+
+      Column {
+        id: column
+        anchors.fill: parent
+        spacing: Style.space(10)
+
+        // ---------- Hero: Bluetooth icon · status ----------
+        Item {
+          width: parent.width
+          implicitHeight: Math.max(heroIcon.implicitHeight, heroLabels.implicitHeight)
+
+          Text {
+            id: heroIcon
+            anchors.left: parent.left
+            anchors.verticalCenter: parent.verticalCenter
+            text: root.icon
+            color: root.bar.foreground
+            font.family: root.bar.fontFamily
+            font.pixelSize: Style.font.display
+            opacity: root.adapter && root.adapter.enabled ? 1.0 : 0.5
+
+            MouseArea {
+              id: heroIconMouse
+              anchors.fill: parent
+              hoverEnabled: true
+              cursorShape: root.adapter ? Qt.PointingHandCursor : Qt.ArrowCursor
+              enabled: !!root.adapter
+              onClicked: root.toggleBluetooth()
+            }
+
+            PanelToolTip {
+              visible: heroIconMouse.containsMouse
+              text: root.adapter && root.adapter.enabled ? "Turn Bluetooth off" : "Turn Bluetooth on"
+              fontFamily: root.bar.fontFamily
+            }
+          }
+
+          Column {
+            id: heroLabels
+            anchors.left: heroIcon.right
+            anchors.leftMargin: Style.space(14)
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
+            spacing: Style.space(2)
+
+            Text {
+              text: "Bluetooth"
+              color: root.bar.foreground
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.title
+              font.bold: true
+              elide: Text.ElideRight
+              width: parent.width
+            }
+
+            Text {
+              id: heroStatus
+              text: root.heroStatusText.toUpperCase()
+              color: Qt.darker(root.bar.foreground, 1.4)
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.caption
+              font.bold: true
+              font.letterSpacing: 1.2
+              elide: Text.ElideRight
+              width: parent.width
+            }
+          }
+        }
+
+        // Scrollable device list — capped so a noisy neighborhood doesn't
+        // grow the popup past the screen.
+        Flickable {
+          id: deviceFlick
+          width: parent.width
+          height: Math.min(deviceList.implicitHeight, Style.space(400))
+          contentWidth: width
+          contentHeight: deviceList.implicitHeight
+          clip: true
+          boundsBehavior: Flickable.StopAtBounds
+
+          ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
+
+          Column {
+            id: deviceList
+            width: parent.width
+            spacing: Style.space(10)
+
+            // Connected devices.
+            PanelSectionHeader {
+              visible: root.connectedDevices.length > 0
+              text: "CONNECTED"
+              foreground: root.bar.foreground
+              fontFamily: root.bar.fontFamily
+            }
+
+            Repeater {
+              model: root.connectedDevices
+              DeviceRow {
+                required property var modelData
+                required property int index
+                width: deviceList.width
+                dev: modelData
+                rowIndex: index
+                sectionName: "connected"
+                isDiscovered: false
+              }
+            }
+
+            // Remembered devices.
+            PanelSectionHeader {
+              visible: root.knownDevices.length > 0
+              text: "PAIRED"
+              foreground: root.bar.foreground
+              fontFamily: root.bar.fontFamily
+            }
+
+            Repeater {
+              model: root.knownDevices
+              DeviceRow {
+                required property var modelData
+                required property int index
+                width: deviceList.width
+                dev: modelData
+                rowIndex: index
+                sectionName: "known"
+                isDiscovered: false
+              }
+            }
+
+            // Discovered (unpaired) devices, only shown while scanning.
+            PanelSectionHeader {
+              visible: root.adapter && root.adapter.discovering && root.discoveredDevices.length > 0
+              text: "AVAILABLE"
+              foreground: root.bar.foreground
+              fontFamily: root.bar.fontFamily
+            }
+
+            Repeater {
+              model: root.adapter && root.adapter.discovering ? root.discoveredDevices : []
+              DeviceRow {
+                required property var modelData
+                required property int index
+                width: deviceList.width
+                dev: modelData
+                rowIndex: index
+                sectionName: "discovered"
+                isDiscovered: true
+              }
+            }
+
+            Text {
+              visible: root.connectedDevices.length === 0
+                       && root.knownDevices.length === 0
+                       && (!root.adapter || !root.adapter.discovering || root.discoveredDevices.length === 0)
+              text: !root.adapter ? "No Bluetooth adapter"
+                  : !root.adapter.enabled ? "Turn Bluetooth on to scan"
+                  : root.adapter.discovering ? "Scanning for devices…"
+                  : "No paired devices. Reopen this panel to scan again."
+              color: Qt.darker(root.bar.foreground, 1.5)
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.bodySmall
+              wrapMode: Text.WordWrap
+              width: deviceList.width
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // Two-line device row showing name + live status. Pending state is owned
+  // by the panel so it survives rows moving between sections.
+  component DeviceRow: CursorSurface {
+    id: row
+    required property var dev
+    required property int rowIndex
+    required property string sectionName
+    required property bool isDiscovered
+
+    readonly property bool isConnected: dev && dev.connected
+    readonly property int devState: dev && dev.state !== undefined ? dev.state : -1
+    readonly property string action: root.pendingAction(dev ? dev.address : "")
+    readonly property string actionTooltip: {
+      if (!dev) return ""
+      if (isConnected) return "Disconnect"
+      if (isDiscovered) return "Pair"
+      return "Connect"
+    }
+
+    readonly property bool rowSelected: root.cursorActive && root.focusSection === sectionName && root.selectedIndex === rowIndex
+    readonly property bool forgetAvailable: (sectionName === "known" || sectionName === "connected") && !isDiscovered
+    readonly property bool showForgetButton: forgetAvailable && (rowMouse.containsMouse || rowSelected)
+
+    hasCursor: rowSelected && !root.actionFocused
+    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(row)
+    current: isConnected
+    foreground: root.bar.foreground
+    fill: root.hoverFill
+    currentFill: root.selectedFill
+
+    readonly property string statusText: {
+      if (!dev) return ""
+      if (action === "forgetting") return "Forgetting…"
+      if (action === "disconnecting" || devState === 2) return "Disconnecting…"
+      if (isConnected) {
+        if (dev.batteryAvailable) return Math.round(dev.battery * 100) + "%"
+        return sectionName === "connected" ? "" : "Connected"
+      }
+      if (action === "connecting" || devState === 3 || dev.pairing === true) return "Connecting…"
+      if (isDiscovered) return ""
+      return ""
+    }
+
+    readonly property color statusColor: {
+      if (isConnected) return root.bar.foreground
+      if (action !== "" || devState === 3 || dev.pairing === true) return root.bar.foreground
+      return Qt.darker(root.bar.foreground, 1.5)
+    }
+
+    implicitHeight: rowContent.implicitHeight + Style.spacing.rowPaddingX
+
+    MouseArea {
+      id: rowMouse
+      anchors.fill: parent
+      hoverEnabled: true
+      acceptedButtons: Qt.LeftButton | Qt.RightButton
+      cursorShape: row.dev ? Qt.PointingHandCursor : Qt.ArrowCursor
+
+      onContainsMouseChanged: if (containsMouse) {
+        root.cursorActive = true
+        root.focusSection = row.sectionName
+        root.selectedIndex = row.rowIndex
+        root.actionFocused = false
+      }
+
+      onClicked: function(mouse) {
+        if (!row.dev) return
+        if (mouse.button === Qt.RightButton) {
+          if (row.isConnected) root.disconnectDevice(row.dev)
+          else if (!row.isDiscovered) root.forgetDevice(row.dev)
+          return
+        }
+        if (row.isConnected) root.disconnectDevice(row.dev)
+        else root.connectDevice(row.dev)
+      }
+    }
+
+    PanelToolTip {
+      visible: row.actionTooltip !== "" && rowMouse.containsMouse && !root.actionFocused
+      text: row.actionTooltip
+      fontFamily: root.bar.fontFamily
+    }
+
+    Item {
+      id: rowContent
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(10)
+      anchors.rightMargin: Style.space(10)
+      implicitHeight: Math.max(deviceIcon.implicitHeight, info.implicitHeight, forgetBtn.implicitHeight)
+
+      Text {
+        id: deviceIcon
+        text: row.isConnected ? "󰂱" : "󰂯"
+        color: row.statusColor
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.heading
+        anchors.left: parent.left
+        anchors.verticalCenter: parent.verticalCenter
+      }
+
+      Column {
+        id: info
+        spacing: Style.space(1)
+        anchors.left: deviceIcon.right
+        anchors.leftMargin: Style.space(10)
+        anchors.right: forgetBtn.visible ? forgetBtn.left : parent.right
+        anchors.rightMargin: forgetBtn.visible ? Style.space(8) : 0
+        anchors.verticalCenter: parent.verticalCenter
+
+        Text {
+          text: root.deviceLabel(row.dev) || "Device"
+          color: root.bar.foreground
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.body
+          elide: Text.ElideRight
+          width: parent.width
+        }
+        Text {
+          visible: row.statusText !== ""
+          text: row.statusText
+          color: row.statusColor
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.caption
+          elide: Text.ElideRight
+          width: parent.width
+        }
+      }
+
+      PanelActionButton {
+        id: forgetBtn
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        visible: row.showForgetButton
+        iconText: "󰅙"
+        tooltipText: "Forget"
+        foreground: root.bar.foreground
+        hoverColor: root.bar.foreground
+        fontFamily: root.bar.fontFamily
+        hasCursor: row.rowSelected && root.actionFocused
+        onHovered: function(isHovered) {
+          if (!isHovered) {
+            if (rowMouse.containsMouse) root.actionFocused = false
+            return
+          }
+          root.cursorActive = true
+          root.focusSection = row.sectionName
+          root.selectedIndex = row.rowIndex
+          root.actionFocused = true
+        }
+        onClicked: {
+          if (!row.dev) return
+          root.forgetDevice(row.dev)
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/panels/bluetooth/manifest.json b/shell/plugins/panels/bluetooth/manifest.json
new file mode 100644
index 00000000..6c87c6d9
--- /dev/null
+++ b/shell/plugins/panels/bluetooth/manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.bluetooth",
+  "name": "Bluetooth",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Bluetooth device list with connect/disconnect",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Panel.qml"
+  },
+  "barWidget": {
+    "displayName": "Bluetooth",
+    "description": "Bluetooth device list with connect/disconnect",
+    "category": "Network",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/panels/dropbox/DropboxIcon.qml b/shell/plugins/panels/dropbox/DropboxIcon.qml
new file mode 100644
index 00000000..6302b87c
--- /dev/null
+++ b/shell/plugins/panels/dropbox/DropboxIcon.qml
@@ -0,0 +1,45 @@
+import QtQuick
+import QtQuick.Shapes
+import qs.Commons
+
+Item {
+  id: root
+
+  property real iconSize: Style.font.icon
+  property color color: Color.foreground
+
+  width: iconSize * 1.18
+  height: iconSize
+  implicitWidth: iconSize * 1.18
+  implicitHeight: iconSize
+
+  Shape {
+    anchors.fill: parent
+    antialiasing: true
+    layer.enabled: true
+    layer.samples: 4
+    scale: 0.95
+
+    Tile { cx: root.width * 0.25; cy: root.height * 0.188 }
+    Tile { cx: root.width * 0.75; cy: root.height * 0.188 }
+    Tile { cx: root.width * 0.25; cy: root.height * 0.564 }
+    Tile { cx: root.width * 0.75; cy: root.height * 0.564 }
+    Tile { cx: root.width * 0.50; cy: root.height * 0.812 }
+  }
+
+  component Tile: ShapePath {
+    property real cx: 0
+    property real cy: 0
+    readonly property real tileWidth: root.width * 0.50
+    readonly property real tileHeight: root.height * 0.376
+
+    fillColor: root.color
+    strokeWidth: 0
+    startX: cx
+    startY: cy - tileHeight / 2
+    PathLine { x: cx + tileWidth / 2; y: cy }
+    PathLine { x: cx; y: cy + tileHeight / 2 }
+    PathLine { x: cx - tileWidth / 2; y: cy }
+    PathLine { x: cx; y: cy - tileHeight / 2 }
+  }
+}
diff --git a/shell/plugins/panels/dropbox/Model.js b/shell/plugins/panels/dropbox/Model.js
new file mode 100644
index 00000000..f2eaea74
--- /dev/null
+++ b/shell/plugins/panels/dropbox/Model.js
@@ -0,0 +1,137 @@
+var IMAGE_EXTENSIONS = {
+  jpg: true, jpeg: true, png: true, gif: true, webp: true, avif: true, heic: true,
+  svg: true, bmp: true, tif: true, tiff: true
+}
+
+var VIDEO_EXTENSIONS = {
+  mp4: true, mov: true, mkv: true, webm: true, avi: true, m4v: true, mpg: true,
+  mpeg: true, wmv: true
+}
+
+var DOCUMENT_EXTENSIONS = {
+  pdf: true, txt: true, md: true, doc: true, docx: true, xls: true, xlsx: true,
+  ppt: true, pptx: true, odt: true, ods: true, odp: true, rtf: true, csv: true,
+  pages: true, numbers: true, key: true
+}
+
+function parseStatus(raw) {
+  var text = String(raw || "").trim()
+  if (text === "") return defaultStatus()
+  try {
+    var parsed = JSON.parse(text)
+    if (!parsed || typeof parsed !== "object") return defaultStatus()
+    parsed.files = Array.isArray(parsed.files) ? parsed.files : []
+    return parsed
+  } catch (e) {
+    var failed = defaultStatus()
+    failed.ok = false
+    failed.lastError = "Failed to parse Dropbox status"
+    return failed
+  }
+}
+
+function defaultStatus() {
+  return {
+    ok: true,
+    installed: false,
+    running: false,
+    authenticated: false,
+    statusText: "Unavailable",
+    accountPath: "",
+    plan: "",
+    usedBytes: 0,
+    quotaBytes: 0,
+    usagePercent: 0,
+    quotaKnown: false,
+    files: []
+  }
+}
+
+function fileExtension(name) {
+  var value = String(name || "").toLowerCase()
+  var index = value.lastIndexOf(".")
+  return index >= 0 ? value.substring(index + 1) : ""
+}
+
+function fileKind(name) {
+  var ext = fileExtension(name)
+  if (IMAGE_EXTENSIONS[ext]) return "image"
+  if (VIDEO_EXTENSIONS[ext]) return "video"
+  if (DOCUMENT_EXTENSIONS[ext]) return "document"
+  return "misc"
+}
+
+function fileGlyph(name) {
+  var kind = fileKind(name)
+  if (kind === "image") return "󰋩"
+  if (kind === "video") return "󰈫"
+  if (kind === "document") return "󰈙"
+  return "󰈔"
+}
+
+function formatBytes(bytes) {
+  var value = Number(bytes || 0)
+  if (!isFinite(value) || value <= 0) return "0 B"
+  var units = ["B", "KB", "MB", "GB", "TB"]
+  var index = 0
+  while (value >= 1000 && index < units.length - 1) {
+    value = value / 1000
+    index++
+  }
+  var decimals = value >= 100 || index === 0 ? 0 : (value >= 10 ? 1 : 2)
+  return value.toFixed(decimals).replace(/\.0+$/, "").replace(/(\.\d)0$/, "$1") + " " + units[index]
+}
+
+function formatPercent(value) {
+  var number = Number(value || 0)
+  if (!isFinite(number) || number <= 0) return "0%"
+  if (number >= 10) return Math.round(number) + "%"
+  return number.toFixed(1).replace(/\.0$/, "") + "%"
+}
+
+function usageText(usedBytes, quotaBytes, quotaKnown) {
+  if (quotaKnown && Number(quotaBytes || 0) > 0) {
+    return formatBytes(usedBytes) + " of " + formatBytes(quotaBytes)
+  }
+  return formatBytes(usedBytes)
+}
+
+function relativeTime(timestampSec, nowMs) {
+  var ts = Number(timestampSec || 0)
+  if (!isFinite(ts) || ts <= 0) return "Unknown time"
+  var now = nowMs === undefined ? Date.now() : Number(nowMs)
+  var diff = Math.max(0, Math.floor((now - ts * 1000) / 1000))
+  if (diff < 60) return "Just now"
+  var minutes = Math.floor(diff / 60)
+  if (minutes < 60) return minutes + "m ago"
+  var hours = Math.floor(minutes / 60)
+  if (hours < 24) return hours + "h ago"
+  var days = Math.floor(hours / 24)
+  if (days < 30) return days + "d ago"
+  var months = Math.floor(days / 30)
+  if (months < 12) return months + "mo ago"
+  return Math.floor(days / 365) + "y ago"
+}
+
+function fileMeta(file, nowMs) {
+  if (!file) return ""
+  var parts = [relativeTime(file.modifiedTs, nowMs)]
+  var folder = String(file.folder || "")
+  if (folder !== "") parts.push(folder)
+  return parts.join(" · ")
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    parseStatus: parseStatus,
+    defaultStatus: defaultStatus,
+    fileExtension: fileExtension,
+    fileKind: fileKind,
+    fileGlyph: fileGlyph,
+    formatBytes: formatBytes,
+    formatPercent: formatPercent,
+    usageText: usageText,
+    relativeTime: relativeTime,
+    fileMeta: fileMeta
+  }
+}
diff --git a/shell/plugins/panels/dropbox/Panel.qml b/shell/plugins/panels/dropbox/Panel.qml
new file mode 100644
index 00000000..bb1b23a6
--- /dev/null
+++ b/shell/plugins/panels/dropbox/Panel.qml
@@ -0,0 +1,498 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import qs.Ui
+import "Model.js" as Model
+
+Panel {
+  id: root
+  moduleName: "omarchy.dropbox"
+  ipcTarget: "omarchy.dropbox"
+  manageIpc: false
+
+  property string focusSection: "login"
+  property int fileIndex: 0
+  property bool cursorActive: false
+  property int phraseIndex: 0
+
+  readonly property var activePhrases: [
+    "Filing files",
+    "Distributing data",
+    "Shuffling folders",
+    "Boxing bytes",
+    "Sorting stuff",
+    "Syncing secrets",
+    "Packing packets",
+    "Moving memories",
+    "Wrangling revisions",
+    "Cataloging chaos"
+  ]
+  readonly property string heroPhraseText: activePhrases[phraseIndex % activePhrases.length]
+  readonly property color foreground: bar ? bar.foreground : Color.foreground
+  readonly property color urgent: bar ? bar.urgent : Color.urgent
+  readonly property color dim: Qt.darker(foreground, 1.55)
+  readonly property string fontFamily: bar ? bar.fontFamily : Style.font.family
+  readonly property color iconColor: dropbox.authenticated ? foreground : dim
+  readonly property color barIconColor: dropbox.authenticated ? barForeground : Qt.darker(barForeground, 1.55)
+
+  function ensureCursor() {
+    if (!dropbox.authenticated) {
+      focusSection = "login"
+      fileIndex = 0
+      return
+    }
+    if (dropbox.files.length === 0) {
+      focusSection = "header"
+      fileIndex = 0
+      return
+    }
+    if (focusSection !== "files") focusSection = "files"
+    if (fileIndex >= dropbox.files.length) fileIndex = Math.max(0, dropbox.files.length - 1)
+    if (fileIndex < 0) fileIndex = 0
+  }
+
+  function moveCursor(dx, dy) {
+    cursorActive = true
+    ensureCursor()
+    if (focusSection === "files" && dy !== 0) {
+      fileIndex = Math.max(0, Math.min(dropbox.files.length - 1, fileIndex + dy))
+      scrollCursorIntoView()
+    }
+  }
+
+  function activateCursor() {
+    ensureCursor()
+    if (focusSection === "login") dropbox.login()
+    else if (focusSection === "files") dropbox.openFile(selectedFile())
+  }
+
+  function selectedFile() {
+    if (dropbox.files.length === 0) return null
+    return dropbox.files[Math.max(0, Math.min(fileIndex, dropbox.files.length - 1))]
+  }
+
+  function setFileCursor(index) {
+    cursorActive = true
+    focusSection = "files"
+    fileIndex = index
+    scrollCursorIntoView()
+  }
+
+  function scrollItemIntoView(item) {
+    if (!panelFlick || !item) return
+    Qt.callLater(function() {
+      if (!item) return
+      var margin = Style.space(6)
+      var point = item.mapToItem(panelFlick.contentItem, 0, 0)
+      var top = point.y
+      var bottom = top + item.height
+      var viewTop = panelFlick.contentY
+      var viewBottom = viewTop + panelFlick.height
+      var maxY = Math.max(0, panelFlick.contentHeight - panelFlick.height)
+      if (top < viewTop + margin) panelFlick.contentY = Math.max(0, top - margin)
+      else if (bottom > viewBottom - margin) panelFlick.contentY = Math.min(maxY, bottom + margin - panelFlick.height)
+    })
+  }
+
+  function scrollCursorIntoView() {
+    if (focusSection === "files" && fileColumn && fileIndex >= 0 && fileIndex < fileColumn.children.length) {
+      scrollItemIntoView(fileColumn.children[fileIndex])
+    }
+  }
+
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  onOpenedChanged: if (opened) {
+    cursorActive = false
+    if (panelFlick) panelFlick.contentY = 0
+    dropbox.refresh()
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+  onFileIndexChanged: scrollCursorIntoView()
+
+  Service {
+    id: dropbox
+    settings: root.settings
+    omarchyPath: root.bar ? root.bar.omarchyPath : Quickshell.env("OMARCHY_PATH")
+  }
+
+  Connections {
+    target: dropbox
+    function onAuthenticatedChanged() { root.ensureCursor() }
+    function onFilesChanged() { root.ensureCursor() }
+  }
+
+  IpcHandler {
+    target: root.ipcTarget
+    function open(): void { root.open() }
+    function close(): void { root.close() }
+    function show(): void { root.open() }
+    function hide(): void { root.close() }
+    function toggle(): void { root.toggle() }
+    function refresh(): string { dropbox.refresh(); return "ok" }
+    function login(): string { dropbox.login(); return "ok" }
+    function status(): string { return dropbox.statusText }
+  }
+
+  Item {
+    id: button
+    anchors.fill: parent
+    implicitWidth: root.bar && root.bar.vertical ? root.bar.barSize : Style.space(27)
+    implicitHeight: root.bar && root.bar.vertical ? Style.space(26) : (root.bar ? root.bar.barSize : Style.space(26))
+
+    property var registeredBar: null
+
+    function triggerPress(buttonCode) {
+      if (buttonCode === Qt.RightButton) dropbox.refresh()
+      else if (buttonCode === Qt.MiddleButton) dropbox.login()
+      else root.toggle()
+    }
+
+    function syncClickRegistration() {
+      if (registeredBar && registeredBar.unregisterClickTarget) registeredBar.unregisterClickTarget(button)
+      registeredBar = root.bar
+      if (registeredBar && registeredBar.registerClickTarget) registeredBar.registerClickTarget(button)
+    }
+
+    Component.onCompleted: syncClickRegistration()
+    Component.onDestruction: if (registeredBar && registeredBar.unregisterClickTarget) registeredBar.unregisterClickTarget(button)
+
+    Connections {
+      target: root
+      function onBarChanged() { button.syncClickRegistration() }
+    }
+
+    DropboxIcon {
+      anchors.centerIn: parent
+      iconSize: Style.space(12)
+      color: root.barIconColor
+      opacity: dropbox.authenticated ? 1.0 : 0.6
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
+      hoverEnabled: true
+      cursorShape: Qt.PointingHandCursor
+      onClicked: function(mouse) { button.triggerPress(mouse.button) }
+    }
+  }
+
+  KeyboardPanel {
+    id: panel
+    anchorItem: button
+    owner: root
+    bar: root.bar
+    open: root.opened
+    focusTarget: keyCatcher
+    contentWidth: panel.fittedContentWidth(Style.space(380))
+    contentHeight: panel.fittedContentHeight(column.implicitHeight, Style.space(560))
+
+    PanelKeyCatcher {
+      id: keyCatcher
+      anchors.fill: parent
+      onMoveRequested: function(dx, dy) {
+        if (!root.cursorActive) { root.cursorActive = true; return }
+        root.moveCursor(dx, dy)
+      }
+      onActivateRequested: if (root.cursorActive) root.activateCursor()
+      onCloseRequested: root.close()
+      onTabRequested: function(direction) { root.switchPanel(direction) }
+      onTextKey: function(t) {
+        if (t === "r" || t === "R") dropbox.refresh()
+        else if (t === "l" || t === "L") dropbox.login()
+      }
+
+      Flickable {
+        id: panelFlick
+        anchors.fill: parent
+        contentWidth: width
+        contentHeight: column.implicitHeight
+        clip: true
+        boundsBehavior: Flickable.StopAtBounds
+        flickableDirection: Flickable.VerticalFlick
+        ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
+
+        Column {
+          id: column
+          width: panelFlick.width
+          spacing: Style.space(12)
+
+          PanelHero {
+            id: hero
+            visible: dropbox.authenticated
+            width: parent.width
+            title: "Dropbox"
+            meta: root.heroPhraseText
+            foreground: root.foreground
+            fontFamily: root.fontFamily
+            iconOpacity: 1.0
+            iconComponent: Component {
+              DropboxIcon {
+                iconSize: Style.font.display
+                color: root.iconColor
+              }
+            }
+          }
+
+          Text {
+            visible: dropbox.actionStatus !== "" || dropbox.lastError !== ""
+            width: parent.width
+            text: dropbox.actionStatus !== "" ? dropbox.actionStatus : dropbox.lastError
+            color: dropbox.lastError !== "" && dropbox.actionStatus === "" ? root.urgent : root.dim
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.bodySmall
+            wrapMode: Text.WordWrap
+          }
+
+          LoginButton {
+            visible: !dropbox.authenticated
+            width: parent.width
+          }
+
+          Column {
+            visible: dropbox.authenticated
+            width: parent.width
+            spacing: Style.spacing.labelGap
+
+            Column {
+              width: parent.width
+              spacing: Style.spacing.labelGap
+              InfoPair { label: "Stored"; value: Model.usageText(dropbox.usedBytes, dropbox.quotaBytes, dropbox.quotaKnown) }
+            }
+          }
+
+          PanelSeparator {
+            visible: dropbox.authenticated
+            foreground: root.foreground
+          }
+
+          Column {
+            visible: dropbox.authenticated
+            width: parent.width
+            spacing: Style.space(10)
+
+            PanelSectionHeader {
+              text: "RECENT FILES"
+              foreground: root.foreground
+              fontFamily: root.fontFamily
+            }
+
+            Text {
+              visible: dropbox.files.length === 0
+              width: parent.width
+              text: "No synced files found."
+              color: root.dim
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.body
+              horizontalAlignment: Text.AlignHCenter
+            }
+
+            Column {
+              id: fileColumn
+              visible: dropbox.files.length > 0
+              width: parent.width
+              spacing: Style.space(6)
+
+              Repeater {
+                model: dropbox.files
+                FileRow {
+                  required property var modelData
+                  required property int index
+                  width: fileColumn.width
+                  file: modelData
+                  rowIndex: index
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  Timer {
+    id: phraseTimer
+    interval: 2800
+    running: root.opened && dropbox.authenticated
+    repeat: true
+    onTriggered: phraseSwap.restart()
+  }
+
+  SequentialAnimation {
+    id: phraseSwap
+    PropertyAnimation {
+      target: hero; property: "metaOpacity"
+      to: 0.0; duration: 180; easing.type: Easing.OutQuad
+    }
+    ScriptAction {
+      script: root.phraseIndex = (root.phraseIndex + 1) % root.activePhrases.length
+    }
+    PropertyAnimation {
+      target: hero; property: "metaOpacity"
+      to: 1.0; duration: 260; easing.type: Easing.InQuad
+    }
+  }
+
+  component LoginButton: CursorSurface {
+    id: loginButton
+
+    hasCursor: root.cursorActive && root.focusSection === "login"
+    foreground: root.foreground
+
+    implicitHeight: loginRow.implicitHeight + Style.spacing.rowPaddingX
+
+    MouseArea {
+      anchors.fill: parent
+      hoverEnabled: true
+      cursorShape: dropbox.installed && !dropbox.busy ? Qt.PointingHandCursor : Qt.ArrowCursor
+      enabled: dropbox.installed && !dropbox.busy
+      onEntered: {
+        root.cursorActive = true
+        root.focusSection = "login"
+      }
+      onClicked: dropbox.login()
+    }
+
+    RowLayout {
+      id: loginRow
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(10)
+      anchors.rightMargin: Style.space(10)
+      spacing: Style.space(8)
+
+      Text {
+        text: ""
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.heading
+        Layout.alignment: Qt.AlignVCenter
+      }
+
+      ColumnLayout {
+        Layout.fillWidth: true
+        spacing: Style.space(1)
+
+        Text {
+          Layout.fillWidth: true
+          text: dropbox.installed ? "Login to Dropbox" : "Dropbox CLI is not installed"
+          color: root.foreground
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.body
+          elide: Text.ElideRight
+        }
+
+        Text {
+          Layout.fillWidth: true
+          text: dropbox.installed ? "Start the authentication flow" : "Install Dropbox from the service menu"
+          color: root.dim
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.caption
+          elide: Text.ElideRight
+        }
+      }
+
+      PanelActionButton {
+        iconText: "󰌋"
+        foreground: root.foreground
+        fontFamily: root.fontFamily
+        enabled: dropbox.installed && !dropbox.busy
+        Layout.alignment: Qt.AlignVCenter
+        onClicked: dropbox.login()
+      }
+    }
+  }
+
+  component FileRow: CursorSurface {
+    id: fileRow
+    property var file: null
+    property int rowIndex: 0
+    readonly property string fileName: file ? String(file.name || "Untitled") : "Untitled"
+
+    hasCursor: root.cursorActive && root.focusSection === "files" && root.fileIndex === rowIndex
+    foreground: root.foreground
+
+    implicitHeight: fileContent.implicitHeight + Style.spacing.rowPaddingX
+
+    MouseArea {
+      anchors.fill: parent
+      hoverEnabled: true
+      cursorShape: Qt.PointingHandCursor
+      onEntered: root.setFileCursor(fileRow.rowIndex)
+      onClicked: dropbox.openFile(fileRow.file)
+    }
+
+    RowLayout {
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(10)
+      anchors.rightMargin: Style.space(10)
+      spacing: Style.space(8)
+
+      Text {
+        text: Model.fileGlyph(fileRow.fileName)
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.icon
+        Layout.alignment: Qt.AlignVCenter
+      }
+
+      ColumnLayout {
+        id: fileContent
+        Layout.fillWidth: true
+        spacing: Style.space(1)
+
+        Text {
+          Layout.fillWidth: true
+          text: fileRow.fileName
+          color: root.foreground
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.body
+          elide: Text.ElideRight
+        }
+
+        Text {
+          Layout.fillWidth: true
+          text: Model.fileMeta(fileRow.file)
+          color: root.dim
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.caption
+          elide: Text.ElideRight
+        }
+      }
+    }
+  }
+
+  component InfoPair: Row {
+    property string label: ""
+    property string value: ""
+
+    width: parent.width
+    spacing: Style.space(8)
+
+    InfoLabel { text: label }
+    Item { width: Math.max(0, parent.width - parent.children[0].implicitWidth - parent.children[2].implicitWidth - parent.spacing * 2); height: 1 }
+    InfoValue { text: value }
+  }
+
+  component InfoLabel: Text {
+    color: root.foreground
+    opacity: 0.6
+    font.family: root.fontFamily
+    font.pixelSize: Style.font.bodySmall
+  }
+
+  component InfoValue: Text {
+    color: root.foreground
+    font.family: root.fontFamily
+    font.pixelSize: Style.font.bodySmall
+    elide: Text.ElideRight
+  }
+}
diff --git a/shell/plugins/panels/dropbox/Service.qml b/shell/plugins/panels/dropbox/Service.qml
new file mode 100644
index 00000000..44f90ebb
--- /dev/null
+++ b/shell/plugins/panels/dropbox/Service.qml
@@ -0,0 +1,183 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import "Model.js" as Model
+
+Item {
+  id: root
+
+  property var settings: ({})
+  property string omarchyPath: Quickshell.env("OMARCHY_PATH")
+
+  property bool installed: false
+  property bool running: false
+  property bool authenticated: false
+  property bool refreshing: false
+  property string statusText: "Checking…"
+  property string accountPath: ""
+  property string plan: ""
+  property double usedBytes: 0
+  property double quotaBytes: 0
+  property double usagePercent: 0
+  property bool quotaKnown: false
+  property var files: []
+  property string actionStatus: ""
+  property string lastError: ""
+
+  readonly property int refreshIntervalSec: intSetting("refreshIntervalSec", 60, 10, 3600)
+  readonly property bool busy: statusProcess.running || loginProcess.running
+  readonly property string helperPath: (omarchyPath || "") + "/shell/plugins/panels/dropbox/status.py"
+
+  property string _statusOutput: ""
+  property string _statusError: ""
+  property string _loginOutput: ""
+  property string _loginError: ""
+  property bool _loginUrlOpened: false
+
+  function setting(name, fallback) {
+    var value = settings ? settings[name] : undefined
+    return value === undefined || value === null ? fallback : value
+  }
+
+  function intSetting(name, fallback, min, max) {
+    var n = parseInt(String(setting(name, fallback)), 10)
+    if (!isFinite(n)) n = fallback
+    if (n < min) n = min
+    if (n > max) n = max
+    return n
+  }
+
+  function refresh() {
+    if (statusProcess.running || helperPath === "/shell/plugins/panels/dropbox/status.py") return
+    _statusOutput = ""
+    _statusError = ""
+    refreshing = true
+    statusProcess.command = ["python3", helperPath, "25"]
+    statusProcess.running = true
+  }
+
+  function applyStatus(raw) {
+    var parsed = Model.parseStatus(raw)
+    if (!parsed.ok) {
+      lastError = parsed.lastError || "Failed to read Dropbox status"
+      return
+    }
+    installed = parsed.installed === true
+    running = parsed.running === true
+    authenticated = parsed.authenticated === true
+    statusText = String(parsed.statusText || (installed ? "Stopped" : "Not installed"))
+    accountPath = String(parsed.accountPath || "")
+    plan = String(parsed.plan || "")
+    usedBytes = Number(parsed.usedBytes || 0)
+    quotaBytes = Number(parsed.quotaBytes || 0)
+    usagePercent = Number(parsed.usagePercent || 0)
+    quotaKnown = parsed.quotaKnown === true
+    files = parsed.files || []
+    lastError = ""
+  }
+
+  function elideStatus(text) {
+    var value = String(text || "").replace(/\s+/g, " ").trim()
+    return value.length > 140 ? value.substring(0, 137) + "…" : value
+  }
+
+  function login() {
+    if (!installed || loginProcess.running) return
+    _loginOutput = ""
+    _loginError = ""
+    _loginUrlOpened = false
+    actionStatus = "Starting Dropbox login…"
+    loginProcess.command = ["dropbox-cli", "start"]
+    loginProcess.running = true
+  }
+
+  function openFile(file) {
+    if (!file || !file.path) return
+    Quickshell.execDetached(["uwsm-app", "--", "nautilus", "--select", fileUri(String(file.path))])
+  }
+
+  function fileUri(path) {
+    var parts = String(path || "").split("/")
+    for (var i = 0; i < parts.length; i++) parts[i] = encodeURIComponent(parts[i])
+    return "file://" + parts.join("/")
+  }
+
+  function openAuthUrlFrom(text) {
+    if (_loginUrlOpened) return true
+    var match = String(text || "").match(/https?:\/\/\S+/)
+    if (match && match[0]) {
+      _loginUrlOpened = true
+      Qt.openUrlExternally(match[0])
+      actionStatus = "Opened Dropbox login"
+      actionStatusTimer.restart()
+      return true
+    }
+    return false
+  }
+
+  function handleLoginOutput(data, isError) {
+    var text = String(data || "")
+    if (isError) _loginError += text + "\n"
+    else _loginOutput += text + "\n"
+    openAuthUrlFrom(text)
+  }
+
+  Timer {
+    id: refreshTimer
+    interval: root.refreshIntervalSec * 1000
+    repeat: true
+    running: true
+    triggeredOnStart: true
+    onTriggered: root.refresh()
+  }
+
+  Timer {
+    id: delayedRefresh
+    interval: 1000
+    repeat: false
+    onTriggered: root.refresh()
+  }
+
+  Timer {
+    id: actionStatusTimer
+    interval: 2200
+    repeat: false
+    onTriggered: root.actionStatus = ""
+  }
+
+  Process {
+    id: statusProcess
+    running: false
+    command: []
+    stdout: StdioCollector { id: statusStdout; waitForEnd: true; onStreamFinished: root._statusOutput = text }
+    stderr: StdioCollector { id: statusStderr; waitForEnd: true; onStreamFinished: root._statusError = text }
+    onExited: function(exitCode) {
+      root.refreshing = false
+      var stdout = String(statusStdout.text || root._statusOutput || "")
+      var stderr = String(statusStderr.text || root._statusError || "")
+      if (exitCode === 0) root.applyStatus(stdout)
+      else root.lastError = root.elideStatus(stderr || stdout || "Could not read Dropbox status")
+    }
+  }
+
+  Process {
+    id: loginProcess
+    running: false
+    command: []
+    stdout: SplitParser { onRead: function(data) { root.handleLoginOutput(data, false) } }
+    stderr: SplitParser { onRead: function(data) { root.handleLoginOutput(data, true) } }
+    onExited: function(exitCode) {
+      var combined = String(root._loginOutput || "") + "\n" + String(root._loginError || "")
+      var opened = root.openAuthUrlFrom(combined)
+      if (exitCode !== 0 && !opened) {
+        root.lastError = root.elideStatus(combined || "Dropbox login failed")
+        root.actionStatus = root.lastError
+      } else if (!opened) {
+        root.actionStatus = ""
+        root.lastError = ""
+      }
+      delayedRefresh.restart()
+    }
+  }
+}
diff --git a/shell/plugins/panels/dropbox/manifest.json b/shell/plugins/panels/dropbox/manifest.json
new file mode 100644
index 00000000..c5f87fcd
--- /dev/null
+++ b/shell/plugins/panels/dropbox/manifest.json
@@ -0,0 +1,35 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.dropbox",
+  "name": "Dropbox",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "license": "MIT",
+  "description": "Dropbox status, storage usage, login, and recent synced files in the Omarchy bar.",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Panel.qml"
+  },
+  "barWidget": {
+    "displayName": "Dropbox",
+    "description": "Log in to Dropbox, view storage usage, and open recent synced files.",
+    "category": "Files",
+    "allowMultiple": false,
+    "defaults": {
+      "refreshIntervalSec": 60
+    },
+    "schema": [
+      {
+        "key": "refreshIntervalSec",
+        "type": "integer",
+        "label": "Refresh interval (seconds)",
+        "min": 10,
+        "max": 3600,
+        "step": 5,
+        "defaultValue": 60
+      }
+    ]
+  }
+}
diff --git a/shell/plugins/panels/dropbox/status.py b/shell/plugins/panels/dropbox/status.py
new file mode 100644
index 00000000..61880347
--- /dev/null
+++ b/shell/plugins/panels/dropbox/status.py
@@ -0,0 +1,128 @@
+import json
+import os
+import shutil
+import subprocess
+import sys
+import heapq
+from pathlib import Path
+
+
+PLAN_QUOTAS = {
+  "basic": 2_000_000_000,
+  "plus": 2_000_000_000_000,
+  "pro": 3_000_000_000_000,
+  "professional": 3_000_000_000_000,
+  "essentials": 3_000_000_000_000,
+}
+
+
+def read_info():
+  info_path = Path.home() / ".dropbox" / "info.json"
+  if not info_path.exists():
+    return {}
+  try:
+    with info_path.open("r", encoding="utf-8") as handle:
+      return json.load(handle)
+  except (OSError, json.JSONDecodeError):
+    return {}
+
+
+def dropbox_account(info):
+  for key in ("personal", "business"):
+    account = info.get(key)
+    if isinstance(account, dict):
+      return account
+  return {}
+
+
+def command_output(command):
+  try:
+    completed = subprocess.run(command, check=False, capture_output=True, text=True, timeout=4)
+  except (OSError, subprocess.TimeoutExpired):
+    return 1, ""
+  return completed.returncode, (completed.stdout + completed.stderr).strip()
+
+
+def scan_dropbox(path, limit):
+  total = 0
+  counter = 0
+  recent = []
+  try:
+    for root, dirs, files in os.walk(path):
+      dirs[:] = [name for name in dirs if not os.path.islink(os.path.join(root, name))]
+      for name in files:
+        file_path = os.path.join(root, name)
+        if os.path.islink(file_path):
+          continue
+        try:
+          stat = os.stat(file_path)
+        except OSError:
+          continue
+        total += stat.st_size
+        rel = os.path.relpath(file_path, path)
+        folder = os.path.dirname(rel)
+        row = {
+          "name": name,
+          "path": file_path,
+          "folder": "/" if folder in ("", ".") else folder,
+          "modifiedTs": int(stat.st_mtime),
+          "sizeBytes": stat.st_size,
+        }
+        counter += 1
+        entry = (row["modifiedTs"], counter, row)
+        if len(recent) < limit:
+          heapq.heappush(recent, entry)
+        else:
+          heapq.heappushpop(recent, entry)
+  except OSError:
+    return 0, []
+  rows = [entry[2] for entry in sorted(recent, reverse=True)]
+  return total, rows
+
+
+def main():
+  limit = 25
+  if len(sys.argv) > 1:
+    try:
+      limit = max(1, min(100, int(sys.argv[1])))
+    except ValueError:
+      limit = 25
+
+  dropbox_cli = shutil.which("dropbox-cli")
+  info = read_info()
+  account = dropbox_account(info)
+  account_path = account.get("path") if isinstance(account.get("path"), str) else ""
+  plan = account.get("subscription_type") if isinstance(account.get("subscription_type"), str) else ""
+  quota = PLAN_QUOTAS.get(plan.lower(), 0)
+  authenticated = account_path != "" and Path(account_path).exists()
+
+  running = False
+  status_text = "Not installed"
+  if dropbox_cli:
+    running_exit, _ = command_output([dropbox_cli, "running"])
+    status_exit, status_output = command_output([dropbox_cli, "status"])
+    status_text = status_output if status_exit == 0 and status_output else ("Running" if running else "Stopped")
+    stopped = "not running" in status_text.lower() or status_text.lower() == "stopped"
+    running = running_exit == 0 or (status_exit == 0 and status_text != "" and not stopped)
+
+  used, files = scan_dropbox(account_path, limit) if authenticated else (0, [])
+  usage_percent = (used / quota * 100) if quota > 0 else 0
+
+  print(json.dumps({
+    "ok": True,
+    "installed": dropbox_cli is not None,
+    "running": running,
+    "authenticated": authenticated,
+    "statusText": status_text,
+    "accountPath": account_path,
+    "plan": plan,
+    "usedBytes": used,
+    "quotaBytes": quota,
+    "usagePercent": usage_percent,
+    "quotaKnown": quota > 0,
+    "files": files,
+  }))
+
+
+if __name__ == "__main__":
+  main()
diff --git a/shell/plugins/panels/monitor/Model.js b/shell/plugins/panels/monitor/Model.js
new file mode 100644
index 00000000..afe3efca
--- /dev/null
+++ b/shell/plugins/panels/monitor/Model.js
@@ -0,0 +1,52 @@
+function clampBrightness(value) {
+  var n = Number(value)
+  if (!isFinite(n)) return 1
+  return Math.max(1, Math.min(100, Math.round(n)))
+}
+
+function normalizeScale(scale) {
+  var n = parseFloat(String(scale || ""))
+  if (!isFinite(n)) return ""
+  return String(Math.round(n * 100) / 100)
+}
+
+function brightnessName(percent) {
+  var p = Math.round(percent)
+  if (p >= 95) return "Sun blast"
+  if (p >= 80) return "Solar flare"
+  if (p >= 65) return "Golden hour"
+  if (p >= 45) return "Even day"
+  if (p >= 30) return "Soft glow"
+  if (p >= 20) return "Lamp light"
+  if (p >= 10) return "Candlelit"
+  return "Night owl"
+}
+
+function parseDisplays(raw) {
+  var displays = []
+  try {
+    displays = raw ? JSON.parse(String(raw)) : []
+  } catch (e) {
+    displays = []
+  }
+  if (!Array.isArray(displays)) displays = []
+
+  var count = 0
+  for (var i = 0; i < displays.length; i++) {
+    if (displays[i] && displays[i].enabled) count++
+  }
+
+  return {
+    displays: displays,
+    enabledDisplayCount: count
+  }
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    clampBrightness: clampBrightness,
+    normalizeScale: normalizeScale,
+    brightnessName: brightnessName,
+    parseDisplays: parseDisplays
+  }
+}
diff --git a/shell/plugins/panels/monitor/Panel.qml b/shell/plugins/panels/monitor/Panel.qml
new file mode 100644
index 00000000..0a1f5972
--- /dev/null
+++ b/shell/plugins/panels/monitor/Panel.qml
@@ -0,0 +1,682 @@
+import QtQuick
+import QtQuick.Controls
+import Quickshell
+import Quickshell.Io
+import qs.Ui
+import qs.Commons
+import "Model.js" as Model
+
+Panel {
+  id: root
+  moduleName: "omarchy.monitor"
+  ipcTarget: "omarchy.monitor"
+  manageIpc: false
+
+  // manageIpc: false so this panel can own the single IpcHandler the target
+  // permits — needed for the brightness + state methods below.
+  property int brightnessPercent: 0
+  property int pendingBrightnessPercent: 0
+  property bool brightnessSetQueued: false
+  property bool brightnessAvailable: false
+  property string internalMonitor: ""
+  property string externalMonitor: ""
+  property string focusedMonitor: ""
+  property bool internalEnabled: false
+  property bool mirrorEnabled: false
+  property string monitorScale: ""
+  property var displays: []
+  property int enabledDisplayCount: 0
+
+  // Cursor model shared by keyboard and mouse. Sections:
+  //   "brightness" - single slider row, selectedIndex = -1 sentinel
+  //                  (mirrors Audio's slider rows). Only present if a
+  //                  controllable backlight was detected.
+  //   "scale"      - 6 Button scale presets; treated as a single
+  //                  horizontal row from j/k's perspective. h/l moves
+  //                  between presets, identical to bluetooth's header.
+  //   "monitors"   - vertical display row list for enabling/disabling displays;
+  //                  j/k walks each row.
+  // Mouse hover on a target updates root state via the components' `hovered`
+  // signal so keyboard cursor and pointer share one highlight.
+  readonly property var scaleValues: ["1", "1.25", "1.6", "2", "3", "4"]
+  property string focusSection: "scale"
+  property int selectedIndex: 0
+  property bool cursorActive: false
+
+  readonly property var visibleSections: {
+    var list = []
+    if (brightnessAvailable) list.push("brightness")
+    list.push("scale")
+    if (displays.length > 1) list.push("monitors")
+    return list
+  }
+
+  function sectionCount(section) {
+    if (section === "brightness") return 0  // only the slider sentinel at -1
+    if (section === "scale") return scaleValues.length
+    if (section === "monitors") return displays.length
+    return 0
+  }
+
+  function sectionIsSingleRow(section) {
+    // brightness has only the slider; scale presets sit horizontally.
+    return section === "brightness" || section === "scale"
+  }
+
+  function sectionFirstIndex(section) {
+    if (section === "brightness") return -1
+    return 0
+  }
+
+  function moveCursor(delta) {
+    var sections = visibleSections
+    if (!sections || sections.length === 0) return
+    var sIdx = sections.indexOf(focusSection)
+    if (sIdx < 0) {
+      focusSection = sections[0]
+      selectedIndex = sectionFirstIndex(focusSection)
+      return
+    }
+    var inSingleRow = sectionIsSingleRow(focusSection)
+    var max = inSingleRow ? 0 : sectionCount(focusSection) - 1
+
+    if (delta > 0) {
+      if (!inSingleRow && selectedIndex < max) { selectedIndex = selectedIndex + 1; return }
+      if (sIdx < sections.length - 1) {
+        focusSection = sections[sIdx + 1]
+        selectedIndex = sectionFirstIndex(focusSection)
+      }
+    } else {
+      if (!inSingleRow && selectedIndex > 0) { selectedIndex = selectedIndex - 1; return }
+      if (sIdx > 0) {
+        var prev = sections[sIdx - 1]
+        focusSection = prev
+        // Coming up from below — land on the last navigable row of the prev
+        // section, or its sentinel for single-row sections.
+        selectedIndex = sectionIsSingleRow(prev) ? sectionFirstIndex(prev) : sectionCount(prev) - 1
+      }
+    }
+  }
+
+  // h/l: in scale section, walks the preset row; everywhere else, no-op
+  // because adjustBrightness handles horizontal motion on the brightness
+  // slider.
+  function moveCursorH(delta) {
+    if (focusSection !== "scale") return
+    var next = selectedIndex + delta
+    if (next < 0) next = 0
+    if (next > scaleValues.length - 1) next = scaleValues.length - 1
+    selectedIndex = next
+  }
+
+  function adjustBrightness(delta) {
+    if (focusSection !== "brightness") return
+    if (!brightnessAvailable) return
+    setBrightness(root.brightnessPercent + delta)
+  }
+
+  function activateCursor() {
+    if (focusSection === "scale" && selectedIndex >= 0 && selectedIndex < scaleValues.length) {
+      setScale(scaleValues[selectedIndex])
+      return
+    }
+    if (focusSection === "monitors" && selectedIndex >= 0 && selectedIndex < displays.length) {
+      var d = displays[selectedIndex]
+      if (d) toggleDisplay(d.name, d.enabled)
+    }
+    // brightness: no separate action; the slider value is the action.
+  }
+
+  function clampCursor() {
+    var sections = visibleSections
+    if (!sections || !sections.length) return
+    if (sections.indexOf(focusSection) < 0) {
+      focusSection = sections[0]
+      selectedIndex = sectionFirstIndex(focusSection)
+      return
+    }
+    var count = sectionCount(focusSection)
+    if (sectionIsSingleRow(focusSection)) {
+      // brightness uses -1 sentinel; scale clamps into the preset range.
+      if (focusSection === "brightness") selectedIndex = -1
+      else if (selectedIndex < 0 || selectedIndex >= count) selectedIndex = 0
+      return
+    }
+    if (count === 0) {
+      var sIdx = sections.indexOf(focusSection)
+      focusSection = sIdx > 0 ? sections[sIdx - 1] : sections[0]
+      selectedIndex = sectionFirstIndex(focusSection)
+      return
+    }
+    if (selectedIndex > count - 1) selectedIndex = count - 1
+    if (selectedIndex < 0) selectedIndex = 0
+  }
+
+  // Keep the keyboard-focused row inside the viewport when the panel grows
+  // taller than its allotted height (lots of displays). Mirrors audio's
+  // ensureCursorVisible helper.
+  function ensureCursorVisible(item) {
+    if (!item || !scrollArea) return
+    var flick = scrollArea.contentItem
+    if (!flick || flick.contentY === undefined) return
+    var pt = item.mapToItem(flick.contentItem || flick, 0, 0)
+    var top = pt.y
+    var bottom = top + (item.height || 0)
+    var viewTop = flick.contentY
+    var viewBottom = viewTop + flick.height
+    var margin = 6
+    if (top < viewTop + margin) flick.contentY = Math.max(0, top - margin)
+    else if (bottom > viewBottom - margin)
+      flick.contentY = bottom + margin - flick.height
+  }
+
+  function brightnessIpc(percent) {
+    var value = Number(percent)
+    root.setBrightness(value)
+    return "got " + root.pendingBrightnessPercent
+  }
+
+  function stateIpc() {
+    return JSON.stringify({
+      brightness: root.brightnessPercent,
+      brightnessAvailable: root.brightnessAvailable,
+      focusedMonitor: root.focusedMonitor,
+      scale: root.monitorScale,
+      displays: root.displays
+    })
+  }
+
+  IpcHandler {
+    target: "omarchy.monitor"
+
+    function brightness(percent: string): string { return root.brightnessIpc(percent) }
+    function state(): string { return root.stateIpc() }
+    function open() { root.open() }
+    function close() { root.close() }
+    function toggle() { root.toggle() }
+    function show() { root.open() }
+    function hide() { root.close() }
+  }
+
+  function refresh() {
+    if (!stateProc.running) stateProc.running = true
+  }
+
+  function setBrightness(value) {
+    var percent = Model.clampBrightness(value)
+    root.brightnessPercent = percent
+    root.pendingBrightnessPercent = percent
+
+    if (setBrightnessProc.running) {
+      root.brightnessSetQueued = true
+      return
+    }
+
+    root.brightnessSetQueued = false
+    setBrightnessProc.command = ["bash", "-lc", "omarchy-brightness-display --no-osd " + percent + "%"]
+    setBrightnessProc.running = true
+  }
+
+  function previewBrightness(value) {
+    root.brightnessPercent = Model.clampBrightness(value)
+    brightnessDebounce.restart()
+  }
+
+  function normalizeScale(scale) {
+    return Model.normalizeScale(scale)
+  }
+
+  // Playful mood-name for a given brightness percent. Bands intentionally
+  // span ~10–20 points so casual tweaks change the label, while small
+  // nudges within one band don't.
+  function brightnessName(percent) {
+    return Model.brightnessName(percent)
+  }
+
+  function updateDisplays(displaysJson) {
+    var parsed = Model.parseDisplays(displaysJson)
+    root.displays = parsed.displays
+    root.enabledDisplayCount = parsed.enabledDisplayCount
+  }
+
+  function toggleDisplay(name, enabled) {
+    if (!name) return
+    if (enabled && root.enabledDisplayCount <= 1) return
+
+    actionProc.command = ["hyprctl", "keyword", "monitor", name + (enabled ? ",disable" : ",preferred,auto,auto")]
+    if (!actionProc.running) actionProc.running = true
+  }
+
+  function setScale(scale) {
+    actionProc.command = ["bash", "-lc", "omarchy-hyprland-monitor-scaling " + scale]
+    if (!actionProc.running) actionProc.running = true
+  }
+
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  Component.onCompleted: refresh()
+
+  // KeyboardPanel takes Exclusive focus at map-time, so SUPER-bound IPC
+  // summons land with j/k ready to navigate. Keep a default landing point,
+  // but don't paint the cursor until hover or the first navigation key.
+  onOpenedChanged: {
+    if (opened) {
+      refresh()
+      if (brightnessAvailable) {
+        focusSection = "brightness"
+        selectedIndex = -1
+      } else {
+        focusSection = "scale"
+        selectedIndex = 0
+      }
+      cursorActive = false
+    }
+  }
+
+  onBrightnessAvailableChanged: clampCursor()
+  onDisplaysChanged: clampCursor()
+  onVisibleSectionsChanged: clampCursor()
+
+  Timer {
+    interval: 5000
+    running: true
+    repeat: true
+    onTriggered: root.refresh()
+  }
+
+  Process {
+    id: stateProc
+    command: [root.bar ? root.bar.omarchyPath + "/bin/omarchy-monitor-state" : "omarchy-monitor-state"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        var lines = String(text || "").split("\n")
+        var brightness = String(lines[0] || "").trim()
+        root.brightnessAvailable = brightness !== "unavailable" && brightness !== ""
+        root.brightnessPercent = root.brightnessAvailable ? Math.max(0, Math.min(100, parseInt(brightness, 10))) : 0
+        root.internalMonitor = String(lines[1] || "").trim()
+        root.externalMonitor = String(lines[2] || "").trim()
+        root.internalEnabled = String(lines[3] || "").trim() !== ""
+        root.mirrorEnabled = String(lines[4] || "").trim() === root.externalMonitor && root.externalMonitor !== ""
+        root.focusedMonitor = String(lines[5] || "").trim()
+        root.monitorScale = root.normalizeScale(String(lines[6] || "").trim())
+        root.updateDisplays(String(lines[7] || "[]").trim())
+      }
+    }
+  }
+
+  Timer {
+    id: brightnessDebounce
+    interval: 180
+    repeat: false
+    onTriggered: root.setBrightness(root.brightnessPercent)
+  }
+
+  Process {
+    id: setBrightnessProc
+    stdout: StdioCollector { waitForEnd: true }
+    // Do NOT call refresh() after a brightness set completes. The local
+    // brightnessPercent we just wrote is authoritative; re-reading via
+    // `omarchy-brightness-display` races the hardware/driver and can
+    // return an empty string, which the parser then coerces to 0 —
+    // visible as a "bounce to zero" after h/l keypresses. External
+    // brightness changes are still picked up by the 5s periodic refresh,
+    // the open-time refresh, and Component.onCompleted.
+    onRunningChanged: {
+      if (running) return
+      if (root.brightnessSetQueued) {
+        root.setBrightness(root.pendingBrightnessPercent)
+      }
+    }
+  }
+
+  Process {
+    id: actionProc
+    stdout: StdioCollector { waitForEnd: true }
+    onRunningChanged: if (!running) root.refresh()
+  }
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: root.displays.length > 1 ? "󰍺" : "󰍹"
+    fontSize: Style.font.subtitle
+    fixedWidth: root.bar && root.bar.vertical ? -1 : Style.space(27)
+    fixedHeight: root.bar && root.bar.vertical ? Style.space(26) : -1
+    rightExtraMargin: 4
+    onPressed: function(b) { root.toggle() }
+    onWheelMoved: function(delta) {
+      if (root.brightnessAvailable) root.setBrightness(root.brightnessPercent + (delta > 0 ? 5 : -5))
+    }
+  }
+
+  KeyboardPanel {
+    id: panel
+    anchorItem: button
+    owner: root
+    bar: root.bar
+    open: root.opened
+    focusTarget: keyCatcher
+    contentWidth: panel.fittedContentWidth(Style.space(380))
+    contentHeight: panel.fittedContentHeight(panelColumn.implicitHeight, Style.space(560))
+
+    PanelKeyCatcher {
+      id: keyCatcher
+      anchors.fill: parent
+      onMoveRequested: function(dx, dy) {
+        if (!root.cursorActive) { root.cursorActive = true; return }
+        if (dy !== 0) root.moveCursor(dy)
+        else if (dx !== 0) {
+          if (root.focusSection === "brightness") root.adjustBrightness(dx * 5)
+          else if (root.focusSection === "scale") root.moveCursorH(dx)
+        }
+      }
+      onActivateRequested: if (root.cursorActive) root.activateCursor()
+      onCloseRequested: root.close()
+      onTabRequested: function(direction) { root.switchPanel(direction) }
+
+      ScrollView {
+        id: scrollArea
+        anchors.fill: parent
+        clip: true
+        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+        ScrollBar.vertical.policy: ScrollBar.AsNeeded
+
+        Column {
+          id: panelColumn
+          width: scrollArea.availableWidth
+          spacing: Style.space(14)
+
+          // ---------- Hero: display icon · title/status ----------
+          Item {
+            width: parent.width
+            visible: root.brightnessAvailable
+            implicitHeight: Math.max(heroIcon.implicitHeight, heroLabels.implicitHeight)
+
+            Text {
+              id: heroIcon
+              text: root.displays.length > 1 ? "󰍺" : "󰍹"
+              color: root.bar.foreground
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.display
+              anchors.left: parent.left
+              anchors.verticalCenter: parent.verticalCenter
+            }
+
+            Column {
+              id: heroLabels
+              anchors.left: heroIcon.right
+              anchors.leftMargin: Style.space(14)
+              anchors.right: parent.right
+              anchors.verticalCenter: parent.verticalCenter
+              spacing: Style.space(2)
+
+              Text {
+                text: "Display"
+                color: root.bar.foreground
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.title
+                font.bold: true
+                elide: Text.ElideRight
+                width: parent.width
+              }
+
+              Text {
+                id: heroLabel
+                text: root.brightnessName(brightnessSlider.dragging ? brightnessSlider.liveValue : root.brightnessPercent).toUpperCase()
+                color: Qt.darker(root.bar.foreground, 1.4)
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.caption
+                font.bold: true
+                font.letterSpacing: 1.2
+                elide: Text.ElideRight
+                width: parent.width
+              }
+            }
+          }
+
+          // ---------- Brightness ----------
+          Column {
+            visible: root.brightnessAvailable
+            width: parent.width
+            spacing: Style.space(6)
+
+            Item {
+              width: parent.width
+              implicitHeight: Math.max(brightnessHeader.implicitHeight, brightnessPercent.implicitHeight)
+
+              PanelSectionHeader {
+                id: brightnessHeader
+                text: "BRIGHTNESS"
+                foreground: root.bar.foreground
+                fontFamily: root.bar.fontFamily
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+              }
+
+              Text {
+                id: brightnessPercent
+                text: Math.round(brightnessSlider.dragging ? brightnessSlider.liveValue : root.brightnessPercent) + "%"
+                color: Qt.darker(root.bar.foreground, 1.4)
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.caption
+                font.bold: true
+                anchors.right: parent.right
+                anchors.rightMargin: Style.space(6)
+                anchors.verticalCenter: parent.verticalCenter
+              }
+            }
+
+            CursorSurface {
+              id: brightnessRow
+              width: parent.width
+              height: brightnessSlider.implicitHeight + Style.spacing.controlGap
+              hasCursor: root.cursorActive && root.focusSection === "brightness" && root.selectedIndex === -1
+              onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(brightnessRow)
+              foreground: root.bar.foreground
+              outline: true
+
+              PanelSlider {
+                id: brightnessSlider
+                bar: root.bar
+                anchors.fill: parent
+                anchors.leftMargin: Style.space(6)
+                anchors.rightMargin: Style.space(6)
+                minimum: 1
+                maximum: 100
+                step: 1
+                value: root.brightnessPercent
+                integer: true
+                onMoved: function(v) { root.previewBrightness(v) }
+                onReleased: function(v) {
+                  brightnessDebounce.stop()
+                  root.setBrightness(v)
+                }
+              }
+
+              HoverHandler {
+                onHoveredChanged: if (hovered) {
+                  root.cursorActive = true
+                  root.focusSection = "brightness"
+                  root.selectedIndex = -1
+                }
+              }
+            }
+          }
+
+          Text {
+            visible: !root.brightnessAvailable
+            text: "No controllable backlight found"
+            color: Qt.darker(root.bar.foreground, 1.5)
+            font.family: root.bar.fontFamily
+            font.pixelSize: Style.font.bodySmall
+          }
+
+          // ---------- Scale ----------
+          Column {
+            width: parent.width
+            spacing: Style.space(10)
+
+            PanelSectionHeader {
+              text: "SCALE"
+              foreground: root.bar.foreground
+              fontFamily: root.bar.fontFamily
+            }
+
+            Grid {
+              id: scaleRow
+              width: parent.width
+              columns: root.scaleValues.length
+              spacing: Style.spacing.xs
+
+              readonly property real cellWidth: root.scaleValues.length > 0
+                ? (width - spacing * (columns - 1)) / columns
+                : 0
+
+              Repeater {
+                model: root.scaleValues
+
+                ScalePill {
+                  required property string modelData
+                  required property int index
+
+                  scaleValue: modelData
+                  scaleIndex: index
+                  width: scaleRow.cellWidth
+                }
+              }
+            }
+          }
+
+          // ---------- Monitors ----------
+          Column {
+            width: parent.width
+            spacing: Style.space(10)
+            visible: root.displays.length > 1
+
+            PanelSectionHeader {
+              text: "DISPLAYS"
+              foreground: root.bar.foreground
+              fontFamily: root.bar.fontFamily
+            }
+
+            Repeater {
+              model: root.displays
+
+              MonitorRow {
+                required property var modelData
+                required property int index
+
+                width: panelColumn.width
+                display: modelData
+                rowIndex: index
+              }
+            }
+          }
+
+          Item {
+            width: parent.width
+            height: Style.space(4)
+          }
+        }
+      }
+    }
+  }
+
+  component ScalePill: Button {
+    id: pill
+    required property string scaleValue
+    required property int scaleIndex
+
+    text: scaleValue + "x"
+    fontSize: Style.font.caption
+    foreground: root.bar.foreground
+    fontFamily: root.bar.fontFamily
+    horizontalPadding: Style.spacing.sm
+    verticalPadding: Style.spacing.controlPaddingY
+    bordered: true
+
+    active: root.normalizeScale(root.monitorScale) === root.normalizeScale(scaleValue)
+    hasCursor: root.cursorActive && root.focusSection === "scale" && root.selectedIndex === scaleIndex
+
+    onClicked: root.setScale(scaleValue)
+    onHovered: function(isHovered) {
+      if (!isHovered) return
+      root.cursorActive = true
+      root.focusSection = "scale"
+      root.selectedIndex = pill.scaleIndex
+    }
+  }
+
+  component MonitorRow: CursorSurface {
+    id: monitorRow
+    required property var display
+    required property int rowIndex
+
+    readonly property bool isFocused: display && display.focused
+    readonly property bool canToggle: display && (!display.enabled || root.enabledDisplayCount > 1)
+
+    hasCursor: root.cursorActive && root.focusSection === "monitors" && root.selectedIndex === rowIndex
+    onHasCursorChanged: if (hasCursor) root.ensureCursorVisible(monitorRow)
+    current: isFocused
+    foreground: root.bar.foreground
+    fill: Style.hoverFillFor(root.bar.foreground, Color.accent)
+    currentFill: Style.selectedFillFor(root.bar.foreground, Color.accent)
+    implicitHeight: monitorInner.implicitHeight + Style.spacing.xl
+    opacity: canToggle ? 1.0 : 0.45
+
+    Row {
+      id: monitorInner
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(6)
+      anchors.rightMargin: Style.space(6)
+      spacing: Style.space(8)
+
+      Text {
+        text: "󰍹"
+        color: root.bar.foreground
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.title
+        width: Style.space(22)
+        horizontalAlignment: Text.AlignHCenter
+        anchors.verticalCenter: parent.verticalCenter
+      }
+
+      Text {
+        text: monitorRow.display.name + (monitorRow.display.focused ? " · focused" : "")
+        color: root.bar.foreground
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.body
+        elide: Text.ElideRight
+        width: parent.width - Style.space(22) - Style.space(14) - Style.space(16)
+        anchors.verticalCenter: parent.verticalCenter
+      }
+
+      Text {
+        text: monitorRow.display.enabled ? "󰄬" : ""
+        color: root.bar.foreground
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.subtitle
+        width: Style.space(14)
+        horizontalAlignment: Text.AlignRight
+        anchors.verticalCenter: parent.verticalCenter
+      }
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      hoverEnabled: true
+      cursorShape: monitorRow.canToggle ? Qt.PointingHandCursor : Qt.ArrowCursor
+      onContainsMouseChanged: if (containsMouse) {
+        root.cursorActive = true
+        root.focusSection = "monitors"
+        root.selectedIndex = monitorRow.rowIndex
+      }
+      onClicked: if (monitorRow.canToggle) root.toggleDisplay(monitorRow.display.name, monitorRow.display.enabled)
+    }
+  }
+}
diff --git a/shell/plugins/panels/monitor/manifest.json b/shell/plugins/panels/monitor/manifest.json
new file mode 100644
index 00000000..190e3ff0
--- /dev/null
+++ b/shell/plugins/panels/monitor/manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.monitor",
+  "name": "Display",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Brightness slider and laptop display controls",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Panel.qml"
+  },
+  "barWidget": {
+    "displayName": "Display",
+    "description": "Brightness slider and laptop display controls",
+    "category": "System",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/panels/network/Model.js b/shell/plugins/panels/network/Model.js
new file mode 100644
index 00000000..65887d72
--- /dev/null
+++ b/shell/plugins/panels/network/Model.js
@@ -0,0 +1,179 @@
+function parseNetworkStatus(raw) {
+  var parts = String(raw || "disconnected\t\t\t").replace(/\r?\n+$/, "").split("\t")
+  return {
+    kind: parts[0] || "disconnected",
+    label: parts[1] || "",
+    signalStrength: parts[2] ? parseInt(parts[2], 10) : -1,
+    frequency: parts[3] || ""
+  }
+}
+
+function wifiIconFor(strength) {
+  var icons = ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"]
+  var index = Math.max(0, Math.min(4, Math.ceil(strength / 20) - 1))
+  return icons[index]
+}
+
+function connectionIcon(kind, signalStrength) {
+  if (kind === "wifi") return wifiIconFor(signalStrength)
+  if (kind === "ethernet") return "󰈀"
+  return "󰤮"
+}
+
+function formatHeaderSpeed(mbps) {
+  var v = parseInt(mbps, 10)
+  if (!v || v < 0) return ""
+  if (v >= 1000) return (v / 1000).toFixed(v % 1000 === 0 ? 0 : 1) + "gbit"
+  return v + "mbit"
+}
+
+function formatHeaderFreq(mhz) {
+  var v = parseFloat(mhz)
+  if (!v) return ""
+
+  if (v >= 2400 && v < 2500) return "2.4ghz"
+  if (v >= 4900 && v < 5925) return "5ghz"
+  if (v >= 5925 && v < 7125) return "6ghz"
+  if (v >= 57000 && v < 71000) return "60ghz"
+
+  var ghz = v / 1000
+  return ghz.toFixed(ghz % 1 === 0 ? 0 : 1) + "ghz"
+}
+
+function headerDetail(info) {
+  var value = info || {}
+  if (value.type === "ethernet") return formatHeaderSpeed(value.speed || "")
+  if (value.type === "wifi") return formatHeaderFreq(value.freq || "")
+  return ""
+}
+
+function parseKeyValue(raw) {
+  var next = {}
+  var lines = String(raw || "").split("\n")
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i]
+    if (!line) continue
+    var idx = line.indexOf("\t")
+    if (idx === -1) continue
+    next[line.substring(0, idx)] = line.substring(idx + 1).trim()
+  }
+  return next
+}
+
+function throughputState(previous, next, now) {
+  var prev = previous || {}
+  var sample = next || {}
+  var iface = sample.iface || ""
+  var rx = parseFloat(sample.rx_bytes || "0")
+  var tx = parseFloat(sample.tx_bytes || "0")
+  var previousTime = Number(prev.prevSampleTime || 0)
+
+  if (iface !== (prev.prevIface || "") || previousTime === 0) {
+    return {
+      prevIface: iface,
+      prevRxBytes: rx,
+      prevTxBytes: tx,
+      prevSampleTime: now,
+      downloadRate: 0,
+      uploadRate: 0
+    }
+  }
+
+  var downloadRate = Number(prev.downloadRate || 0)
+  var uploadRate = Number(prev.uploadRate || 0)
+  var dt = now - previousTime
+  if (dt > 0) {
+    downloadRate = Math.max(0, (rx - Number(prev.prevRxBytes || 0)) / dt)
+    uploadRate = Math.max(0, (tx - Number(prev.prevTxBytes || 0)) / dt)
+  }
+
+  return {
+    prevIface: iface,
+    prevRxBytes: rx,
+    prevTxBytes: tx,
+    prevSampleTime: now,
+    downloadRate: downloadRate,
+    uploadRate: uploadRate
+  }
+}
+
+function formatBytes(bytes) {
+  var n = Number(bytes)
+  if (!isFinite(n) || n < 0) n = 0
+  if (n < 1024) return Math.round(n) + " B"
+  if (n < 1024 * 1024) return (n / 1024).toFixed(1) + " KB"
+  if (n < 1024 * 1024 * 1024) return (n / (1024 * 1024)).toFixed(1) + " MB"
+  return (n / (1024 * 1024 * 1024)).toFixed(2) + " GB"
+}
+
+function formatRate(bytesPerSec) {
+  return formatBytes(bytesPerSec) + "/s"
+}
+
+function wifiRow(network) {
+  if (!network) return null
+  return {
+    network: network,
+    connected: !!network.connected,
+    known: !!network.known,
+    ssid: network.name || "",
+    signal: Math.round((network.signalStrength || 0) * 100),
+    security: network.security
+  }
+}
+
+function sortWifiRows(rows) {
+  var nets = Array.isArray(rows) ? rows.slice() : []
+  nets.sort(function(a, b) {
+    if (a.connected !== b.connected) return a.connected ? -1 : 1
+    if (a.known !== b.known) return a.known ? -1 : 1
+    return b.signal - a.signal
+  })
+  return nets
+}
+
+function wifiSectionTitle(wifiNetworks, index) {
+  var networks = Array.isArray(wifiNetworks) ? wifiNetworks : []
+  if (index < 0 || index >= networks.length) return ""
+
+  var net = networks[index]
+  if (!net) return ""
+
+  if (net.known && index === 0) return "KNOWN NETWORKS"
+  if (!net.known && (index === 0 || (networks[index - 1] && networks[index - 1].known))) return "OTHER NETWORKS"
+  return ""
+}
+
+function isProtected(security, openSecurity) {
+  return security !== openSecurity
+}
+
+function networkFailureReason(reason, reasons) {
+  var r = reasons || {}
+  if (reason === r.NoSecrets) return "Passphrase required"
+  if (reason === r.WifiAuthTimeout) return "Wrong password"
+  if (reason === r.WifiNetworkLost) return "Network lost"
+  if (reason === r.WifiClientDisconnected) return "Disconnected"
+  if (reason === r.WifiClientFailed) return "Connection failed"
+  return "Failed to connect"
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    parseNetworkStatus: parseNetworkStatus,
+    wifiIconFor: wifiIconFor,
+    connectionIcon: connectionIcon,
+    formatHeaderSpeed: formatHeaderSpeed,
+    formatHeaderFreq: formatHeaderFreq,
+    headerDetail: headerDetail,
+    parseKeyValue: parseKeyValue,
+    throughputState: throughputState,
+    formatBytes: formatBytes,
+    formatRate: formatRate,
+    wifiRow: wifiRow,
+    sortWifiRows: sortWifiRows,
+    wifiSectionTitle: wifiSectionTitle,
+    isProtected: isProtected,
+    networkFailureReason: networkFailureReason
+  }
+}
diff --git a/shell/plugins/panels/network/Panel.qml b/shell/plugins/panels/network/Panel.qml
new file mode 100644
index 00000000..95676d19
--- /dev/null
+++ b/shell/plugins/panels/network/Panel.qml
@@ -0,0 +1,1346 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import Quickshell.Networking
+import qs.Ui
+import qs.Commons
+import "Model.js" as Model
+
+Panel {
+  id: root
+  moduleName: "omarchy.network"
+  ipcTarget: "omarchy.network"
+
+  // Centralized close so callers can't forget to drop the passphrase prompt.
+  function close() {
+    root.controller.hide()
+    passwordSsid = ""
+  }
+
+  // Live connection details from `ip` / /sys / iw.
+  property var info: ({})  // { iface, type, ip, prefix, gateway, speed, duplex, ssid, signal, freq, bitrate, rx_bytes, tx_bytes }
+
+  // Throughput tracking. Rates are computed as deltas between successive
+  // `omarchy-network-status --verbose` samples (~1.5s apart via detailsPoll).
+  // We hold "prev" alongside a timestamp so the first sample after open or
+  // after an interface switch doesn't manufacture a spike.
+  property real prevRxBytes: 0
+  property real prevTxBytes: 0
+  property real prevSampleTime: 0
+  property string prevIface: ""
+  property real downloadRate: 0  // bytes/sec
+  property real uploadRate: 0    // bytes/sec
+  property int connectionPhraseIndex: 0
+  readonly property var connectionPhrases: [
+    "Wiring bits",
+    "Handling packets",
+    "Sorting frames",
+    "Hauling bytes",
+    "Routing crumbs",
+    "Counting collisions",
+    "Bending light",
+  ]
+  readonly property string connectionPhrase: connectionPhrases[connectionPhraseIndex % connectionPhrases.length]
+  readonly property bool networkManagerAvailable: Networking.backend === NetworkBackendType.NetworkManager
+  readonly property var networkDevices: Networking.devices ? Networking.devices.values : []
+  readonly property var wifiDevice: findDevice(DeviceType.Wifi)
+  readonly property var wifiNetworkObjects: wifiDevice && wifiDevice.networks ? wifiDevice.networks.values : []
+  readonly property var connectedWifiNetwork: findConnectedWifiNetwork()
+  property var wifiNetworks: []
+  property bool scanning: false
+  property bool wifiStationAvailable: false
+  property string dnsProvider: ""
+  property string pendingDnsProvider: ""
+
+  // Per-row in-flight state. `actionSsid` flips on for the row whose action
+  // is currently running so it can render "Connecting…" / "Disconnecting…" /
+  // "Forgetting…". `passwordSsid` is the row currently expanded into
+  // password-entry mode; we keep it open across refresh cycles so a slow scan
+  // doesn't collapse the input the user is typing into. Rows must gate
+  // comparisons on the matching `*Kind`/`*Reason` being non-empty so a
+  // hidden-SSID row (ssid == "") doesn't collide with the "" defaults.
+  property string actionSsid: ""
+  property string actionKind: ""  // "connect" | "disconnect" | "forget"
+  property string failureSsid: ""
+  property string failureReason: ""
+  property string passwordSsid: ""
+  property string passwordText: ""
+
+  // True while any wifi action is mid-flight. Rows
+  // disable themselves on this so clicks on the other rows don't silently
+  // no-op against runNetworkAction's serialized guard.
+  readonly property bool busy: actionKind !== ""
+
+  // Index into `wifiNetworks` for keyboard navigation. -1 = no selection.
+  property int selectedIndex: -1
+  property bool wifiActionFocused: false
+  property bool cursorActive: false
+
+  // Keyboard focus zone for the panel. j/k crosses row boundaries:
+  // header actions ⇄ DNS row ⇄ Wi-Fi networks. h/l move within header
+  // actions or DNS providers.
+  property string focusSection: "dns"  // "header" | "dns" | "wifi"
+  property int headerIndex: 0
+  readonly property bool canDisconnect: !!connectedWifiNetwork
+  readonly property bool headerHasDisconnect: false
+  readonly property int headerActionCount: 0
+  readonly property var dnsProviders: ["DHCP", "Cloudflare", "Google", "Custom"]
+  property int dnsIndex: 0
+
+  onHeaderActionCountChanged: clampHeaderIndex()
+
+  function clampHeaderIndex() {
+    var max = Math.max(0, headerActionCount - 1)
+    if (headerIndex > max) headerIndex = max
+    if (headerIndex < 0) headerIndex = 0
+  }
+
+  function selectHeaderByDelta(delta) {
+    headerIndex = Math.max(0, Math.min(headerActionCount - 1, headerIndex + delta))
+  }
+
+  function activateHeader() {
+    if (headerHasDisconnect && headerIndex === 0 && !busy) disconnect(connectedWifiNetwork)
+  }
+
+  function selectDnsByDelta(delta) {
+    dnsIndex = Math.max(0, Math.min(dnsProviders.length - 1, dnsIndex + delta))
+  }
+
+  function activateDns() {
+    if (dnsIndex < 0 || dnsIndex >= dnsProviders.length) return
+    setDns(dnsProviders[dnsIndex])
+  }
+
+  // Single cursor model: exactly one highlighted spot across the whole
+  // panel, located via `focusSection` + (`headerIndex` | `dnsIndex` |
+  // `selectedIndex`). Mouse hover and keyboard nav both mutate this state
+  // at the root; items never read containsMouse for visuals. See
+  // CursorSurface for the shared chrome shared by rows and pills.
+  readonly property color hoverFill: bar ? Style.hoverFillFor(bar.foreground, Color.accent) : "transparent"
+  readonly property color selectedFill: bar ? Style.selectedFillFor(bar.foreground, Color.accent) : "transparent"
+
+  // The panel below is its own layer-shell with Exclusive keyboard focus,
+  // so Hyprland grants focus when the surface is mapped (opened flips
+  // to true). That's what makes the SUPER+CTRL+W keybind actually work
+  // — OnDemand only grants focus on click/hover.
+  onOpenedChanged: {
+    if (opened) {
+      refresh(true)
+      selectedIndex = wifiNetworks.length > 0 ? 0 : -1
+      wifiActionFocused = false
+      focusSection = wifiNetworks.length > 0 ? "wifi" : "dns"
+      var idx = dnsProviders.indexOf(dnsProvider)
+      dnsIndex = idx >= 0 ? idx : 0
+      cursorActive = false
+    } else {
+      // Reset throughput tracking so the next open doesn't compute a fake
+      // rate from a sample taken minutes ago.
+      prevSampleTime = 0
+      downloadRate = 0
+      uploadRate = 0
+      if (wifiDevice) wifiDevice.scannerEnabled = false
+    }
+  }
+
+  // When the passphrase prompt closes (Esc / Cancel / success) restore
+  // focus to the keyCatcher so j/k/Enter resume working without a click.
+  // The KeyboardPanel's focusTarget covers initial popup-open; this handles
+  // the inline-editor case where focus was handed off to a child.
+  onPasswordSsidChanged: {
+    if (passwordSsid === "" && opened) {
+      passwordText = ""
+      Qt.callLater(function() { if (keyCatcher) keyCatcher.forceActiveFocus() })
+    }
+  }
+
+  // Keep selectedIndex valid as scans refresh the network list.
+  // If the list empties (station gone, e.g. wifi off), bounce the cursor
+  // back to the DNS row so the panel doesn't end up with no cursor at all.
+  onWifiNetworksChanged: {
+    if (wifiNetworks.length === 0) {
+      selectedIndex = -1
+      wifiActionFocused = false
+      if (focusSection === "wifi") focusSection = "dns"
+    } else if (passwordSsid !== "") {
+      var passwordIndex = wifiIndexForSsid(passwordSsid)
+      if (passwordIndex >= 0) {
+        selectedIndex = passwordIndex
+        focusSection = "wifi"
+      }
+    } else if (selectedIndex >= wifiNetworks.length) {
+      selectedIndex = wifiNetworks.length - 1
+    } else if (selectedIndex < 0 && opened) {
+      selectedIndex = 0
+    }
+
+    if (selectedIndex < 0 || selectedIndex >= wifiNetworks.length || !canForgetNetwork(wifiNetworks[selectedIndex])) {
+      wifiActionFocused = false
+    }
+  }
+
+  onWifiDeviceChanged: {
+    if (wifiDevice) wifiDevice.scannerEnabled = opened
+    syncWifiNetworks()
+  }
+
+  onWifiNetworkObjectsChanged: syncWifiNetworks()
+
+  function selectByDelta(delta) {
+    if (wifiNetworks.length === 0) { selectedIndex = -1; return }
+    if (selectedIndex < 0) selectedIndex = delta > 0 ? 0 : wifiNetworks.length - 1
+    else selectedIndex = Math.max(0, Math.min(wifiNetworks.length - 1, selectedIndex + delta))
+    wifiActionFocused = false
+  }
+
+  function canForgetNetwork(net) {
+    return !!(net && net.known && isProtected(net.security) && !net.connected)
+  }
+
+  function selectWifiActionByDelta(delta) {
+    if (selectedIndex < 0 || selectedIndex >= wifiNetworks.length) return
+    if (!canForgetNetwork(wifiNetworks[selectedIndex])) {
+      wifiActionFocused = false
+      return
+    }
+    if (delta > 0) wifiActionFocused = true
+    else if (delta < 0) wifiActionFocused = false
+  }
+
+  // Enter/Space on the highlighted row. Mirrors row-click semantics:
+  // connected → disconnect, protected-unknown → password prompt,
+  // open/known → connect.
+  function activateSelected() {
+    if (busy || selectedIndex < 0 || selectedIndex >= wifiNetworks.length) return
+    var net = wifiNetworks[selectedIndex]
+    if (!net) return
+    if (wifiActionFocused && canForgetNetwork(net)) { forget(net); return }
+    if (net.connected) { disconnect(net.network); return }
+    if (isProtected(net.security) && !net.known) { openPasswordPrompt(net.ssid); return }
+    connectKnown(net.ssid)
+  }
+
+  // Bar pill state. Polled locally so this panel is self-contained;
+  // populated by networkProc + networkTimer below.
+  property string kind: "disconnected"
+  property string label: ""
+  property int signalStrength: -1
+  property string frequency: ""
+
+  function updateNetwork(raw) {
+    var parsed = Model.parseNetworkStatus(raw)
+    kind = parsed.kind
+    label = parsed.label
+    signalStrength = parsed.signalStrength
+    frequency = parsed.frequency
+  }
+
+  function copyToClipboard(value) {
+    if (!value || !root.bar) return
+    Quickshell.execDetached(["bash", "-lc", "printf %s " + Util.shellQuote(value) + " | wl-copy"])
+  }
+
+  readonly property string icon: Model.connectionIcon(kind, signalStrength)
+
+  function refresh(scanWifi) {
+    if (scanWifi === undefined) scanWifi = false
+    if (!detailsProc.running) detailsProc.running = true
+    if (!dnsProc.running) {
+      dnsProc.command = ["bash", "-lc", root.dnsCommand("")]
+      dnsProc.running = true
+    }
+    if (wifiDevice) {
+      if (scanWifi) {
+        scanning = true
+        wifiDevice.scannerEnabled = false
+        scanRestart.start()
+      } else {
+        wifiDevice.scannerEnabled = true
+      }
+    }
+    syncWifiNetworks()
+  }
+
+  function formatHeaderSpeed(mbps) {
+    return Model.formatHeaderSpeed(mbps)
+  }
+
+  function formatHeaderFreq(mhz) {
+    return Model.formatHeaderFreq(mhz)
+  }
+
+  function headerDetail() {
+    return Model.headerDetail(info)
+  }
+
+  function updateDetails(raw) {
+    var next = Model.parseKeyValue(raw)
+    info = next
+    updateThroughput(next)
+  }
+
+  function updateThroughput(next) {
+    var state = Model.throughputState({
+      prevIface: prevIface,
+      prevRxBytes: prevRxBytes,
+      prevTxBytes: prevTxBytes,
+      prevSampleTime: prevSampleTime,
+      downloadRate: downloadRate,
+      uploadRate: uploadRate
+    }, next, Date.now() / 1000)
+
+    prevIface = state.prevIface
+    prevRxBytes = state.prevRxBytes
+    prevTxBytes = state.prevTxBytes
+    prevSampleTime = state.prevSampleTime
+    downloadRate = state.downloadRate
+    uploadRate = state.uploadRate
+  }
+
+  function formatBytes(bytes) {
+    return Model.formatBytes(bytes)
+  }
+
+  function formatRate(bytesPerSec) {
+    return Model.formatRate(bytesPerSec)
+  }
+
+  function findDevice(type) {
+    var devices = networkDevices || []
+    for (var i = 0; i < devices.length; i++) {
+      if (devices[i] && devices[i].type === type) return devices[i]
+    }
+    return null
+  }
+
+  function findConnectedWifiNetwork() {
+    var networks = wifiNetworkObjects || []
+    for (var i = 0; i < networks.length; i++) {
+      if (networks[i] && networks[i].connected) return networks[i]
+    }
+    return null
+  }
+
+  function syncWifiNetworks() {
+    var nets = []
+    var networks = wifiNetworkObjects || []
+
+    for (var i = 0; i < networks.length; i++) {
+      var network = networks[i]
+      if (!network) continue
+      checkActionCompletion(network)
+      var row = Model.wifiRow(network)
+      if (row) nets.push(row)
+    }
+    wifiNetworks = Model.sortWifiRows(nets)
+    wifiStationAvailable = !!wifiDevice
+    scanning = false
+  }
+
+  function wifiSectionTitle(index) {
+    return Model.wifiSectionTitle(wifiNetworks, index)
+  }
+
+  function wifiIconFor(strength) {
+    return Model.wifiIconFor(strength)
+  }
+
+  function updateDns(raw) {
+    var value = String(raw || "").trim()
+    dnsProvider = value || "DHCP"
+  }
+
+  function dnsCommand(provider) {
+    var command = root.bar ? Util.shellQuote(root.bar.omarchyPath + "/bin/omarchy-dns") : "omarchy-dns"
+    if (provider) command += " " + Util.shellQuote(provider)
+    return command
+  }
+
+  function setDns(provider) {
+    if (!root.bar || !provider || actionProc.running) return
+
+    if (provider === "Custom") {
+      var launcher = Util.shellQuote(root.bar.omarchyPath + "/bin/omarchy-launch-floating-terminal-with-presentation")
+      root.bar.run(launcher + " " + Util.shellQuote(root.dnsCommand(provider)))
+      root.close()
+      return
+    }
+
+    root.pendingDnsProvider = provider
+    actionProc.command = ["bash", "-lc", root.dnsCommand(provider)]
+    actionProc.running = true
+    root.close()
+  }
+
+  function isProtected(security) {
+    return Model.isProtected(security, WifiSecurityType.Open)
+  }
+
+  function openPasswordPrompt(ssid) {
+    if (passwordSsid !== ssid) passwordText = ""
+    passwordSsid = ssid
+  }
+
+  function networkForSsid(ssid) {
+    var networks = wifiNetworkObjects || []
+    for (var i = 0; i < networks.length; i++) {
+      if (networks[i] && networks[i].name === ssid) return networks[i]
+    }
+    return null
+  }
+
+  function wifiIndexForSsid(ssid) {
+    for (var i = 0; i < wifiNetworks.length; i++) {
+      if (wifiNetworks[i] && wifiNetworks[i].ssid === ssid) return i
+    }
+    return -1
+  }
+
+  function runNetworkAction(kind, network, callback) {
+    if (actionKind !== "" || !network) return
+    var ssid = network.name || ""
+    actionSsid = ssid
+    actionKind = kind
+    failureSsid = ""
+    failureReason = ""
+    callback(network)
+    // Safety net: if onExited never fires (process death, signal handler
+    // throws, etc.), clear the busy state so the row doesn't get stuck on
+    // "Connecting…" / "Disconnecting…" forever.
+    actionTimeout.restart()
+  }
+
+  function clearNetworkAction() {
+    actionTimeout.stop()
+    if (actionKind === "connect") passwordSsid = ""
+    failureSsid = ""
+    failureReason = ""
+    actionSsid = ""
+    actionKind = ""
+    refresh()
+  }
+
+  function failNetworkAction(network, reason) {
+    if (!network || actionKind === "" || actionSsid !== (network.name || "")) return
+    actionTimeout.stop()
+    failureSsid = actionSsid
+    failureReason = networkFailureReason(reason)
+    actionSsid = ""
+    actionKind = ""
+    refresh()
+  }
+
+  function networkFailureReason(reason) {
+    return Model.networkFailureReason(reason, {
+      NoSecrets: ConnectionFailReason.NoSecrets,
+      WifiAuthTimeout: ConnectionFailReason.WifiAuthTimeout,
+      WifiNetworkLost: ConnectionFailReason.WifiNetworkLost,
+      WifiClientDisconnected: ConnectionFailReason.WifiClientDisconnected,
+      WifiClientFailed: ConnectionFailReason.WifiClientFailed
+    })
+  }
+
+  function checkActionCompletion(network) {
+    if (!network || actionKind === "" || actionSsid !== (network.name || "")) return
+    if (actionKind === "connect" && network.connected) clearNetworkAction()
+    else if (actionKind === "disconnect" && !network.connected && !network.stateChanging) clearNetworkAction()
+    else if (actionKind === "forget" && !network.known && !network.stateChanging) clearNetworkAction()
+  }
+
+  function connectKnown(ssid) {
+    runNetworkAction("connect", networkForSsid(ssid), function(network) { network.connect() })
+  }
+
+  function connectWithPassphrase(ssid, passphrase) {
+    runNetworkAction("connect", networkForSsid(ssid), function(network) { network.connectWithPsk(passphrase) })
+  }
+
+  function disconnect(network) {
+    runNetworkAction("disconnect", network || connectedWifiNetwork, function(net) { net.disconnect() })
+  }
+
+  function forget(net) {
+    runNetworkAction("forget", net ? net.network : null, function(network) { network.forget() })
+  }
+
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  Component.onCompleted: refresh()
+
+  // Pulls everything we want about the active route's interface in one shot.
+  Process {
+    id: detailsProc
+    command: [root.bar ? root.bar.omarchyPath + "/bin/omarchy-network-status" : "omarchy-network-status", "--verbose"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.updateDetails(text)
+    }
+  }
+
+  Timer {
+    id: scanRestart
+    interval: 100
+    repeat: false
+    onTriggered: {
+      if (root.wifiDevice) root.wifiDevice.scannerEnabled = true
+      scanDone.start()
+    }
+  }
+
+  Timer {
+    id: scanDone
+    interval: 1500
+    repeat: false
+    onTriggered: root.syncWifiNetworks()
+  }
+
+  Process {
+    id: dnsProc
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.updateDns(text)
+    }
+  }
+
+  // Action runner for DNS provider changes. Wi-Fi actions use the
+  // Quickshell.Networking NetworkManager backend directly.
+  Process {
+    id: actionProc
+    stdout: StdioCollector { id: actionStdout; waitForEnd: true }
+    stderr: StdioCollector { id: actionStderr; waitForEnd: true }
+    onExited: function(exitCode) {
+      if (root.pendingDnsProvider !== "") {
+        if (exitCode === 0) root.dnsProvider = root.pendingDnsProvider
+        root.pendingDnsProvider = ""
+      }
+    }
+  }
+
+  // Poll details while the panel is open so the IP/route header catches up
+  // as soon as NetworkManager finishes activating a connection.
+  Timer {
+    id: detailsPoll
+    interval: 1500
+    repeat: true
+    running: root.opened
+    onTriggered: if (!detailsProc.running) detailsProc.running = true
+  }
+
+  Timer {
+    id: connectionPhraseTimer
+    interval: 2800
+    running: root.opened && (root.info.type === "ethernet" || (root.info.type === "wifi" && root.canDisconnect))
+    repeat: true
+    onTriggered: connectionPhraseSwap.restart()
+  }
+
+  SequentialAnimation {
+    id: connectionPhraseSwap
+    PropertyAnimation {
+      target: heroMeta; property: "opacity"
+      to: 0.0; duration: 180; easing.type: Easing.OutQuad
+    }
+    ScriptAction {
+      script: root.connectionPhraseIndex = (root.connectionPhraseIndex + 1) % root.connectionPhrases.length
+    }
+    PropertyAnimation {
+      target: heroMeta; property: "opacity"
+      to: 1.0; duration: 260; easing.type: Easing.InQuad
+    }
+  }
+
+  Connections {
+    target: root
+    function onInfoChanged() {
+      if (!(root.info.type === "ethernet" || (root.info.type === "wifi" && root.canDisconnect))) {
+        connectionPhraseSwap.stop()
+        heroMeta.opacity = 1.0
+      }
+    }
+  }
+
+  Timer {
+    id: actionTimeout
+    interval: 15000
+    repeat: false
+    onTriggered: {
+      if (!root.actionKind) return
+      var reason
+      if (root.actionKind === "connect") reason = "Timed out connecting"
+      else if (root.actionKind === "disconnect") reason = "Timed out disconnecting"
+      else reason = "Timed out forgetting"
+      root.failureSsid = root.actionSsid
+      root.failureReason = reason
+      root.actionSsid = ""
+      root.actionKind = ""
+      root.refresh()
+    }
+  }
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: root.icon
+    fixedWidth: root.bar && root.bar.vertical ? -1 : Style.space(27)
+    fixedHeight: root.bar && root.bar.vertical ? Style.space(26) : -1
+    rightExtraMargin: 5.5
+
+    onPressed: function(b) {
+      if (root.opened) root.close()
+      else { root.open(); root.refresh() }
+    }
+  }
+
+  // Keyboard-driven popup anchored to the bar widget icon. The shared
+  // KeyboardPanel handles the layer-shell PanelWindow scaffolding
+  // (Exclusive focus on map, screen binding, anchored-to-icon positioning,
+  // outside-click via an overlay MouseArea + Region mask that lets the bar
+  // remain clickable, fade animation, popout coordination). What stays
+  // here is the wifi-specific UI inside.
+  KeyboardPanel {
+    id: panel
+    anchorItem: button
+    owner: root
+    bar: root.bar
+    open: root.opened
+    focusTarget: keyCatcher
+    contentWidth: panel.fittedContentWidth(Style.space(380))
+    contentHeight: panel.fittedContentHeight(column.implicitHeight)
+
+    // Catches all unhandled keys for keyboard navigation. AfterItem priority
+    // lets the passphrase TextField (a child via focus chain) get its keys
+    // first; only events the focused subtree ignores bubble back here.
+    PanelKeyCatcher {
+      id: keyCatcher
+      anchors.fill: parent
+      // Freeze the cursor model while the inline password prompt is open;
+      // the TextField inside owns input until Esc/Enter/Cancel.
+      blocked: root.passwordSsid !== ""
+
+      onMoveRequested: function(dx, dy) {
+        if (!root.cursorActive) {
+          root.cursorActive = true
+          if (dy >= 0) return
+        }
+        if (dy !== 0) {
+          if (root.focusSection === "header") {
+            if (dy > 0) root.focusSection = "dns"
+          } else if (root.focusSection === "dns") {
+            // k from DNS moves up into the disconnect button when there is
+            // one; otherwise stays put. j drops into the wifi list if there's
+            // anywhere to land.
+            if (dy < 0) {
+              if (root.headerHasDisconnect) {
+                root.focusSection = "header"
+                root.headerIndex = 0
+              }
+            } else if (root.wifiNetworks.length > 0) {
+              root.focusSection = "wifi"
+              if (root.selectedIndex < 0) root.selectedIndex = 0
+            }
+          } else {  // wifi
+            // k from the top row escapes back up into the DNS row rather
+            // than wrapping around to the bottom of the list.
+            if (dy < 0 && root.selectedIndex <= 0) {
+              root.focusSection = "dns"
+              root.wifiActionFocused = false
+            }
+            else root.selectByDelta(dy)
+          }
+        }
+        if (dx !== 0) {
+          if (root.focusSection === "header") root.selectHeaderByDelta(dx)
+          else if (root.focusSection === "dns") root.selectDnsByDelta(dx)
+          else if (root.focusSection === "wifi") root.selectWifiActionByDelta(dx)
+        }
+      }
+      onActivateRequested: {
+        if (root.cursorActive) {
+          if (root.focusSection === "header") root.activateHeader()
+          else if (root.focusSection === "dns") root.activateDns()
+          else root.activateSelected()
+        }
+      }
+      onCloseRequested: root.close()
+      onTabRequested: function(direction) { root.switchPanel(direction) }
+      onTextKey: function(t) {
+        if (t === "r" || t === "R") root.refresh()
+      }
+
+    Column {
+      id: column
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.top: parent.top
+      spacing: Style.space(12)
+
+      // ---------- Hero: network icon · SSID + state · actions ----------
+      Item {
+        width: parent.width
+        implicitHeight: Math.max(heroIcon.implicitHeight, heroLabels.implicitHeight)
+
+        Text {
+          id: heroIcon
+          text: root.icon
+          color: root.bar.foreground
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.display
+          opacity: root.networkManagerAvailable ? 1.0 : 0.5
+          anchors.left: parent.left
+          anchors.verticalCenter: parent.verticalCenter
+
+          MouseArea {
+            id: heroIconMouse
+            anchors.fill: parent
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
+            enabled: root.networkManagerAvailable
+            onClicked: {
+              Networking.wifiEnabled = !Networking.wifiEnabled
+              Qt.callLater(function() { root.refresh(true) })
+            }
+          }
+
+          PanelToolTip {
+            visible: heroIconMouse.containsMouse
+            text: root.info.type === "ethernet" ? "Toggle network" : "Toggle Wi-Fi"
+            fontFamily: root.bar.fontFamily
+          }
+        }
+
+        Column {
+          id: heroLabels
+          anchors.left: heroIcon.right
+          anchors.leftMargin: Style.space(14)
+          anchors.right: parent.right
+          anchors.verticalCenter: parent.verticalCenter
+          spacing: Style.space(2)
+
+          Row {
+            id: heroSsid
+            width: parent.width
+
+            readonly property string title: {
+              if (root.info.type === "wifi") return root.info.ssid || "Wi-Fi"
+              if (root.info.type === "ethernet") return "Ethernet"
+              return root.info.iface || (root.kind === "disconnected" ? "Disconnected" : "No connection")
+            }
+            readonly property string detail: root.headerDetail()
+
+            Text {
+              text: heroSsid.title
+              width: Math.min(implicitWidth, Math.max(0, parent.width - (heroDetailPill.visible ? heroDetailPill.implicitWidth + Style.space(8) : 0)))
+              color: root.bar.foreground
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.title
+              font.bold: true
+              elide: Text.ElideRight
+            }
+
+            Item { width: Math.max(0, parent.width - parent.children[0].width - heroDetailPill.implicitWidth); height: 1 }
+
+            BorderSurface {
+              id: heroDetailPill
+              visible: heroSsid.detail !== ""
+              implicitWidth: heroDetail.implicitWidth + Style.space(10)
+              implicitHeight: heroDetail.implicitHeight + Style.space(4)
+              anchors.verticalCenter: parent.verticalCenter
+              color: "transparent"
+              borderSpec: Border.controlSpec("normal", root.bar.foreground, Color.accent)
+              radius: Style.cornerRadius
+
+              Text {
+                id: heroDetail
+                anchors.centerIn: parent
+                text: heroSsid.detail
+                color: Qt.darker(root.bar.foreground, 1.4)
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.body
+                font.bold: true
+              }
+            }
+          }
+
+          Text {
+            id: heroMeta
+            width: parent.width
+            text: {
+              if (root.info.type === "wifi") {
+                if (root.canDisconnect) return root.connectionPhrase.toUpperCase()
+                if (root.kind === "disconnected") return "NOT CONNECTED"
+                return ""
+              }
+              if (root.info.type === "ethernet") return root.connectionPhrase.toUpperCase()
+              if (root.kind === "disconnected") return "NOT CONNECTED"
+              return ""
+            }
+            visible: text !== ""
+            color: Qt.darker(root.bar.foreground, 1.4)
+            font.family: root.bar.fontFamily
+            font.pixelSize: Style.font.caption
+            font.bold: true
+            font.letterSpacing: 1.2
+            elide: Text.ElideRight
+          }
+        }
+
+      }
+
+      // Connection details: transfer metrics first, then IP/Gateway.
+      Column {
+        visible: !!root.info.iface
+        width: parent.width
+        spacing: Style.spacing.labelGap
+
+        GridLayout {
+          width: parent.width
+          columns: 4
+          columnSpacing: Style.space(20)
+          rowSpacing: Style.spacing.labelGap
+
+          InfoLabel { visible: root.info.rx_bytes !== undefined; text: "Receiving" }
+          DetailValue { visible: root.info.rx_bytes !== undefined; text: root.formatRate(root.downloadRate) }
+          InfoLabel { visible: root.info.rx_bytes !== undefined; text: "Sending" }
+          DetailValue { visible: root.info.rx_bytes !== undefined; text: root.formatRate(root.uploadRate) }
+
+          InfoLabel { visible: root.info.rx_bytes !== undefined; text: "Downloaded" }
+          DetailValue { visible: root.info.rx_bytes !== undefined; text: root.formatBytes(parseFloat(root.info.rx_bytes || "0")) }
+          InfoLabel { visible: root.info.rx_bytes !== undefined; text: "Uploaded" }
+          DetailValue { visible: root.info.rx_bytes !== undefined; text: root.formatBytes(parseFloat(root.info.tx_bytes || "0")) }
+
+          InfoLabel {
+            visible: !!root.info.ip || !!root.info.gateway
+            text: root.info.ip ? "IP Address" : ""
+          }
+          DetailValue {
+            visible: !!root.info.ip || !!root.info.gateway
+            text: root.info.ip || ""
+            copyable: !!root.info.ip
+            tooltipText: "Copy IP"
+          }
+          InfoLabel {
+            visible: !!root.info.ip || !!root.info.gateway
+            text: root.info.gateway ? "Gateway" : ""
+          }
+          DetailValue {
+            visible: !!root.info.ip || !!root.info.gateway
+            text: root.info.gateway || ""
+            copyable: !!root.info.gateway
+            tooltipText: "Copy gateway"
+          }
+        }
+      }
+
+      // DNS provider selection.
+      PanelSeparator {
+        foreground: root.bar.foreground
+      }
+
+      Column {
+        width: parent.width
+        spacing: Style.space(10)
+
+        PanelSectionHeader {
+          text: "DNS PROVIDER"
+          foreground: root.bar.foreground
+          fontFamily: root.bar.fontFamily
+        }
+
+        Row {
+          id: dnsRow
+          width: parent.width
+          spacing: Style.space(6)
+
+          readonly property int count: 4
+          readonly property real cellWidth: (width - spacing * (count - 1)) / count
+
+          DnsProviderPill {
+            provider: "DHCP"
+            index: 0
+            tooltipText: "Use DNS from DHCP"
+            width: dnsRow.cellWidth
+            onClicked: root.setDns(provider)
+          }
+
+          DnsProviderPill {
+            provider: "Cloudflare"
+            index: 1
+            tooltipText: "Set DNS to Cloudflare"
+            width: dnsRow.cellWidth
+            onClicked: root.setDns(provider)
+          }
+
+          DnsProviderPill {
+            provider: "Google"
+            index: 2
+            tooltipText: "Set DNS to Google"
+            width: dnsRow.cellWidth
+            onClicked: root.setDns(provider)
+          }
+
+          DnsProviderPill {
+            provider: "Custom"
+            index: 3
+            tooltipText: "Set custom DNS servers"
+            width: dnsRow.cellWidth
+            onClicked: root.setDns(provider)
+          }
+        }
+      }
+
+      // Wi-Fi networks (only if a Wi-Fi station is available).
+      PanelSeparator {
+        visible: root.wifiStationAvailable
+        foreground: root.bar.foreground
+      }
+
+      PanelSectionHeader {
+        visible: root.wifiStationAvailable && root.scanning
+        text: "SCANNING WI-FI…"
+        foreground: root.bar.foreground
+        fontFamily: root.bar.fontFamily
+      }
+
+      // Scrollable network list — cap the height so a busy neighbourhood
+      // doesn't push the popup off-screen. ListView (vs Repeater+Column)
+      // gives us positionViewAtIndex for free, which is what keeps the
+      // keyboard-selected row scrolled into view as j/k walk past the
+      // visible window.
+      ListView {
+        id: networkList
+        visible: root.wifiStationAvailable
+        width: parent.width
+        height: Math.min(contentHeight, Style.space(240))
+        spacing: Style.space(4)
+        clip: true
+        boundsBehavior: Flickable.StopAtBounds
+        interactive: contentHeight > height
+
+        ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
+
+        model: root.wifiStationAvailable ? root.wifiNetworks : []
+        currentIndex: root.selectedIndex
+        onCurrentIndexChanged: if (currentIndex >= 0) positionViewAtIndex(currentIndex, ListView.Contain)
+
+        // Wrapper takes the required props from ListView's delegate context
+        // (which doesn't bind into nested `component` declarations like
+        // NetworkRow) and passes them down explicitly.
+        delegate: Item {
+          required property var modelData
+          required property int index
+          readonly property string sectionTitle: root.wifiSectionTitle(index)
+          width: ListView.view.width
+          height: delegateColumn.implicitHeight
+
+          Column {
+            id: delegateColumn
+            width: parent.width
+            spacing: Style.space(4)
+
+            PanelSectionHeader {
+              visible: sectionTitle !== ""
+              text: sectionTitle
+              foreground: root.bar.foreground
+              fontFamily: root.bar.fontFamily
+              height: visible ? implicitHeight : 0
+            }
+
+            NetworkRow {
+              id: row
+              width: parent.width
+              net: modelData
+              index: parent.parent.index
+            }
+          }
+        }
+      }
+    }
+    }
+  }
+
+  // One DNS provider pill. The cursor + current visuals come entirely from
+  // CursorSurface; this component just binds them to the panel's cursor
+  // state and renders the label/tooltip/click target.
+  component DnsProviderPill: Button {
+    id: pill
+    required property string provider
+    required property int index
+
+    text: provider
+    fontSize: Style.font.bodySmall
+    foreground: root.bar.foreground
+    fontFamily: root.bar.fontFamily
+    horizontalPadding: Style.spacing.controlPaddingX
+    verticalPadding: Style.spacing.controlPaddingY + Style.space(2)
+    bordered: true
+
+    // Map the panel's domain semantics onto Button's structural props:
+    // `current DNS` is the pill's `active` fill; the keyboard cursor lights
+    // up `hasCursor`.
+    active: root.dnsProvider === provider
+    hasCursor: root.cursorActive && root.focusSection === "dns" && root.dnsIndex === index
+
+    onHovered: function(isHovered) {
+      if (!isHovered) return
+      root.cursorActive = true
+      root.focusSection = "dns"
+      root.dnsIndex = pill.index
+    }
+  }
+
+  // A single Wi-Fi network entry. Collapses to a one-line pill normally;
+  // expands inline to a passphrase prompt when the user picks a protected
+  // network we don't have credentials for. Clicking a connected row
+  // disconnects.
+  component NetworkRow: CursorSurface {
+    id: row
+    required property var net
+    required property int index
+
+    readonly property bool isConnected: net && net.connected
+    readonly property bool isKnown: !!(net && net.known)
+    readonly property bool isProtected: net ? root.isProtected(net.security) : false
+    readonly property bool canForgetFromLock: isKnown && isProtected && !isConnected
+    readonly property bool isSelected: root.focusSection === "wifi" && root.selectedIndex === index
+    readonly property bool forgetFocused: isSelected && root.wifiActionFocused && canForgetFromLock
+    readonly property bool forgetVisible: canForgetFromLock && (forgetFocused || rightMouse.containsMouse)
+
+    hasCursor: root.cursorActive && isSelected && !root.wifiActionFocused
+    current: isConnected
+    foreground: root.bar.foreground
+    fill: root.hoverFill
+    currentFill: root.selectedFill
+    // Gate on the matching *Kind/*Reason being non-empty so a hidden-SSID
+    // row (ssid == "") doesn't match the "" defaults of actionSsid etc.
+    readonly property bool isBusy: root.actionKind !== "" && root.actionSsid === (net ? net.ssid : "")
+    readonly property bool isFailed: root.failureReason !== "" && root.failureSsid === (net ? net.ssid : "")
+    readonly property bool isPasswordOpen: root.passwordSsid !== "" && root.passwordSsid === (net ? net.ssid : "")
+
+    Connections {
+      target: row.net ? row.net.network : null
+      function onConnectionFailed(reason) {
+        root.failNetworkAction(row.net.network, reason)
+        if (reason === ConnectionFailReason.NoSecrets) root.openPasswordPrompt(row.net.ssid)
+      }
+      function onConnectedChanged() {
+        if (row.net) root.checkActionCompletion(row.net.network)
+      }
+      function onKnownChanged() {
+        if (row.net) root.checkActionCompletion(row.net.network)
+      }
+      function onStateChangingChanged() {
+        if (row.net) root.checkActionCompletion(row.net.network)
+      }
+    }
+
+    readonly property string statusText: {
+      if (!net) return ""
+      if (isPasswordOpen) return ""
+      if (isBusy && root.actionKind === "connect") return "Connecting…"
+      if (isBusy && root.actionKind === "disconnect") return "Disconnecting…"
+      if (isBusy && root.actionKind === "forget") return "Forgetting…"
+      if (isFailed) return root.failureReason || "Failed"
+      if (isConnected) return "Connected"
+      return ""
+    }
+
+    readonly property color statusColor: {
+      if (isFailed) return root.bar.urgent
+      if (isBusy) return root.bar.foreground
+      if (isConnected) return root.bar.foreground
+      return Qt.darker(root.bar.foreground, 1.5)
+    }
+
+    implicitHeight: rowBody.implicitHeight + (isPasswordOpen ? passwordPanel.implicitHeight + Style.spacing.md : 0)
+
+    MouseArea {
+      id: rowMouse
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.top: parent.top
+      height: rowBody.implicitHeight
+      hoverEnabled: true
+      acceptedButtons: Qt.LeftButton
+      cursorShape: Qt.PointingHandCursor
+      enabled: !root.busy
+
+      // Move the cursor here when the mouse enters; mouse leaving doesn't
+      // clear it (so the cursor stays where the mouse last was and
+      // subsequent j/k pick up from this row).
+      onContainsMouseChanged: if (containsMouse) { root.cursorActive = true; root.focusSection = "wifi"; root.selectedIndex = row.index; root.wifiActionFocused = false }
+
+      onClicked: {
+        if (!row.net) return
+        // Resync cursor in case keyboard nav moved it away while the mouse
+        // stayed parked on this row — the click target is unambiguously here.
+        root.cursorActive = true
+        root.focusSection = "wifi"
+        root.selectedIndex = row.index
+        root.wifiActionFocused = false
+        if (row.isConnected) {
+          root.disconnect(row.net.network)
+          return
+        }
+        if (row.isProtected && !row.isKnown) {
+          root.openPasswordPrompt(row.net.ssid)
+          return
+        }
+        root.connectKnown(row.net.ssid)
+      }
+    }
+
+    Item {
+      id: rowBody
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.top: parent.top
+      anchors.leftMargin: Style.space(10)
+      anchors.rightMargin: Style.space(10)
+      implicitHeight: Math.max(networkIcon.implicitHeight, networkInfo.implicitHeight, rightAction.implicitHeight) + Style.spacing.rowPaddingX
+
+      Text {
+        id: networkIcon
+        text: row.net ? root.wifiIconFor(row.net.signal) : ""
+        color: row.statusColor
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.title
+        anchors.left: parent.left
+        anchors.verticalCenter: parent.verticalCenter
+      }
+
+      // Shows a lock glyph for protected networks. Known disconnected
+      // networks reveal the forget action when hovering that right edge.
+      Item {
+        id: rightAction
+        visible: row.isProtected
+        width: Style.space(22)
+        implicitHeight: lockIndicator.implicitHeight
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+
+        Text {
+          id: lockIndicator
+          width: parent.width
+          anchors.verticalCenter: parent.verticalCenter
+          horizontalAlignment: Text.AlignHCenter
+          text: row.forgetVisible ? "󰅙" : "󰌾"
+          color: row.forgetVisible ? root.bar.urgent : Qt.darker(root.bar.foreground, 1.4)
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.subtitle
+        }
+
+        BorderSurface {
+          anchors.fill: parent
+          visible: row.forgetFocused
+          color: Style.hoverFillFor(root.bar.urgent, root.bar.urgent)
+          borderSpec: Border.controlSpec("hover-cursor", root.bar.urgent, root.bar.urgent)
+          radius: Style.cornerRadius
+          z: -1
+        }
+
+        MouseArea {
+          id: rightMouse
+          anchors.fill: parent
+          hoverEnabled: true
+          acceptedButtons: Qt.LeftButton
+          enabled: row.canForgetFromLock && !root.busy
+          cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
+          onContainsMouseChanged: if (containsMouse) { root.cursorActive = true; root.focusSection = "wifi"; root.selectedIndex = row.index; root.wifiActionFocused = true }
+          onClicked: if (row.net) root.forget(row.net)
+        }
+
+        PanelToolTip {
+          visible: rightMouse.containsMouse || row.forgetFocused
+          text: "Forget network"
+          fontFamily: root.bar.fontFamily
+        }
+      }
+
+      Column {
+        id: networkInfo
+        spacing: Style.space(1)
+        anchors.left: networkIcon.right
+        anchors.leftMargin: Style.space(10)
+        anchors.right: rightAction.visible ? rightAction.left
+                      : parent.right
+        anchors.rightMargin: rightAction.visible ? Style.space(8) : 0
+        anchors.verticalCenter: parent.verticalCenter
+
+        Text {
+          text: row.net ? (row.net.ssid || "Hidden") : ""
+          color: root.bar.foreground
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.body
+          elide: Text.ElideRight
+          width: parent.width
+        }
+        Text {
+          // Signal strength is conveyed by the wifi-bars icon and the
+          // right-edge glyph/buttons carry protection or forget affordances,
+          // so the second line only carries action status (Connecting…,
+          // Connected, Failed, etc.). Collapses to zero height when empty
+          // so rows without status keep a tight one-line look.
+          text: row.statusText
+          visible: row.statusText !== ""
+          height: visible ? implicitHeight : 0
+          color: row.statusColor
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.caption
+          elide: Text.ElideRight
+          width: parent.width
+        }
+      }
+    }
+
+    Timer {
+      id: failureTimer
+      interval: 2000
+      running: row.isFailed && row.isPasswordOpen
+      onTriggered: {
+        root.failureSsid = ""
+        root.failureReason = ""
+        pwField.forceActiveFocus()
+      }
+    }
+
+    // Inline passphrase prompt — only shown when we hit a protected network
+    // we don't have saved credentials for. Submitting (Enter or the check
+    // button) fires connect; Esc cancels back to the row.
+    Item {
+      id: passwordPanel
+      visible: row.isPasswordOpen
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.top: rowMouse.bottom
+      anchors.leftMargin: Style.space(10)
+      anchors.rightMargin: Style.space(10)
+      anchors.topMargin: Style.space(4)
+      implicitHeight: pwField.implicitHeight + Style.spacing.rowGap
+      height: implicitHeight
+
+      TextField {
+        id: pwField
+        visible: !row.isBusy && !row.isFailed
+        anchors.left: parent.left
+        anchors.right: connectPwBtn.left
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.rightMargin: Style.space(6)
+        password: true
+        placeholderText: "Passphrase"
+        font.family: Style.font.family
+        font.pixelSize: Style.font.body
+        foreground: root.bar.foreground
+        horizontalPadding: Style.spacing.controlGap
+        verticalPadding: Style.spacing.controlPaddingY
+        enabled: !row.isBusy
+        text: row.isPasswordOpen ? root.passwordText : ""
+
+        onAccepted: {
+          if (!root.busy && row.net && text.length > 0) root.connectWithPassphrase(row.net.ssid, text)
+        }
+        onTextChanged: if (row.isPasswordOpen && text !== root.passwordText) root.passwordText = text
+        Keys.onEscapePressed: { root.passwordSsid = ""; root.passwordText = "" }
+
+        onVisibleChanged: if (visible) Qt.callLater(forceActiveFocus)
+        Component.onCompleted: if (visible) Qt.callLater(forceActiveFocus)
+      }
+
+      BorderSurface {
+        id: statusMsgWrapper
+        visible: row.isBusy || row.isFailed
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        height: Style.spacing.controlHeight
+        color: Style.normalFillFor(root.bar.foreground)
+        borderSpec: Border.controlSpec("normal", root.bar.foreground, Color.accent)
+        radius: Style.cornerRadius
+
+        Text {
+          anchors.fill: parent
+          horizontalAlignment: Text.AlignHCenter
+          verticalAlignment: Text.AlignVCenter
+          text: row.isFailed ? "Wrong password" : "Connecting..."
+          color: row.isFailed ? root.bar.urgent : root.bar.foreground
+          font.family: root.bar.fontFamily
+          font.pixelSize: Style.font.bodySmall
+        }
+      }
+
+      // 22×22 right-anchored to line up with lockIndicator above. Esc closes
+      // the prompt (handled by pwField.Keys.onEscapePressed)
+      // so there's no separate cancel button.
+      PanelActionButton {
+        id: connectPwBtn
+        visible: !row.isBusy && !row.isFailed
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        enabled: row.net && pwField.text.length > 0
+        iconText: "󰄬"
+        tooltipText: "Connect"
+        foreground: root.bar.foreground
+        fontFamily: root.bar.fontFamily
+        onClicked: if (row.net) root.connectWithPassphrase(row.net.ssid, root.passwordText)
+      }
+    }
+  }
+
+  // Poll the wifi/ethernet pill state every 3s. Local to this panel so
+  // Bar.qml does not need to mirror network state.
+  Process {
+    id: networkProc
+    command: [root.bar ? root.bar.omarchyPath + "/bin/omarchy-network-status" : "omarchy-network-status"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.updateNetwork(text)
+    }
+  }
+
+  Timer {
+    interval: 3000
+    running: true
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: if (!networkProc.running) networkProc.running = true
+  }
+
+  component DetailValue: InfoValue {
+    property bool copyable: false
+    property string tooltipText: "Copy to clipboard"
+
+    Layout.fillWidth: true
+    horizontalAlignment: Text.AlignRight
+
+    MouseArea {
+      id: valueMouse
+      anchors.fill: parent
+      enabled: copyable && parent.text !== ""
+      hoverEnabled: enabled
+      cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
+      onClicked: root.copyToClipboard(parent.text)
+    }
+
+    PanelToolTip {
+      visible: valueMouse.enabled && valueMouse.containsMouse
+      text: tooltipText
+      fontFamily: root.bar.fontFamily
+    }
+  }
+
+  component InfoLabel: Text {
+    color: root.bar.foreground
+    opacity: 0.6
+    font.family: root.bar.fontFamily
+    font.pixelSize: Style.font.bodySmall
+  }
+
+  component InfoValue: Text {
+    color: root.bar.foreground
+    font.family: root.bar.fontFamily
+    font.pixelSize: Style.font.bodySmall
+  }
+}
diff --git a/shell/plugins/panels/network/manifest.json b/shell/plugins/panels/network/manifest.json
new file mode 100644
index 00000000..576bdc9c
--- /dev/null
+++ b/shell/plugins/panels/network/manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.network",
+  "name": "Network",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Wi-Fi list and connection state",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Panel.qml"
+  },
+  "barWidget": {
+    "displayName": "Network",
+    "description": "Wi-Fi list and connection state",
+    "category": "Network",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/panels/power/Model.js b/shell/plugins/panels/power/Model.js
new file mode 100644
index 00000000..553d9aef
--- /dev/null
+++ b/shell/plugins/panels/power/Model.js
@@ -0,0 +1,106 @@
+function clampIndex(index, length) {
+  if (length <= 0) return 0
+  return Math.max(0, Math.min(length - 1, index))
+}
+
+function selectProfileIndex(index, delta, profiles) {
+  var values = Array.isArray(profiles) ? profiles : []
+  if (values.length === 0) return 0
+  return clampIndex(index + delta, values.length)
+}
+
+function parseKeyValue(raw) {
+  var next = {}
+  var lines = String(raw || "").split("\n")
+  for (var i = 0; i < lines.length; i++) {
+    var idx = lines[i].indexOf("\t")
+    if (idx <= 0) continue
+    next[lines[i].substring(0, idx)] = lines[i].substring(idx + 1).trim()
+  }
+  return next
+}
+
+function parseProfiles(raw, previousIndex) {
+  var lines = String(raw || "").split("\n")
+  var list = []
+  var active = ""
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i].trim()
+    if (!line) continue
+    var parts = line.split("\t")
+    list.push(parts[0])
+    if (parts[1] === "1") active = parts[0]
+  }
+  return {
+    profiles: list,
+    activeProfile: active,
+    profileIndex: clampIndex(previousIndex || 0, list.length)
+  }
+}
+
+function profileIcon(name) {
+  if (name === "power-saver") return "󰌪"
+  if (name === "balanced") return "󰊚"
+  if (name === "performance") return "󰓅"
+  return "󰂄"
+}
+
+function batteryFraction(device) {
+  return device && device.isPresent ? Math.max(0, Math.min(1, device.percentage)) : 0
+}
+
+function chargeThresholdActive(device, onBattery, states) {
+  var d = device || {}
+  var s = states || {}
+  if (!(d && d.isPresent && !onBattery)) return false
+
+  var fraction = batteryFraction(d)
+  if (d.state === s.Discharging) return false
+  if (d.state === s.PendingCharge) return true
+  if (d.state === s.FullyCharged && fraction < 0.99) return true
+  if (d.state !== s.Charging || fraction >= 0.99) return false
+
+  return Number(d.changeRate || 0) <= 0.2 || Number(d.timeToFull || 0) >= 8 * 60 * 60
+}
+
+function batteryIcon(device, onBattery, states) {
+  var d = device || {}
+  if (!d.isPresent) return ""
+
+  var chargingIcons = ["󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"]
+  var defaultIcons = ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"]
+  var index = Math.max(0, Math.min(9, Math.floor(d.percentage * 10)))
+  var threshold = chargeThresholdActive(d, onBattery, states)
+
+  if (threshold) return defaultIcons[index]
+  if (d.state === states.FullyCharged) return "󰂅"
+  if (d.state === states.Charging) return chargingIcons[index]
+  if (d.state === states.Discharging) return defaultIcons[index]
+  if (!onBattery) return ""
+  return defaultIcons[index]
+}
+
+function modeLabel(device, onBattery, states) {
+  var d = device || {}
+  if (!d.isPresent) return ""
+
+  var percentage = d.isPresent ? d.percentage : 0
+  if (chargeThresholdActive(d, onBattery, states)) return "Threshold"
+  if (!onBattery && percentage >= 1) return "Fully charged"
+  if (onBattery || d.state === states.Discharging) return "On battery"
+  return "Charging"
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    clampIndex: clampIndex,
+    selectProfileIndex: selectProfileIndex,
+    parseKeyValue: parseKeyValue,
+    parseProfiles: parseProfiles,
+    profileIcon: profileIcon,
+    batteryFraction: batteryFraction,
+    chargeThresholdActive: chargeThresholdActive,
+    batteryIcon: batteryIcon,
+    modeLabel: modeLabel
+  }
+}
diff --git a/shell/plugins/panels/power/Panel.qml b/shell/plugins/panels/power/Panel.qml
new file mode 100644
index 00000000..3062eb5e
--- /dev/null
+++ b/shell/plugins/panels/power/Panel.qml
@@ -0,0 +1,502 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import Quickshell.Services.UPower
+import qs.Commons
+import qs.Ui
+import "Model.js" as Model
+
+Panel {
+  id: root
+  moduleName: "omarchy.power"
+  ipcTarget: "omarchy.power"
+  property var batteryInfo: ({})
+  property var systemInfo: ({})
+  property var profiles: []
+  property string activeProfile: ""
+  property int profileIndex: 0
+  property bool cursorActive: false
+  readonly property bool batteryPresent: {
+    var device = UPower.displayDevice
+    return !!(device && device.isPresent)
+  }
+
+  function upowerStates() {
+    return {
+      Charging: UPowerDeviceState.Charging,
+      Discharging: UPowerDeviceState.Discharging,
+      FullyCharged: UPowerDeviceState.FullyCharged,
+      PendingCharge: UPowerDeviceState.PendingCharge
+    }
+  }
+
+  function selectProfileByDelta(delta) {
+    profileIndex = Model.selectProfileIndex(profileIndex, delta, profiles)
+  }
+
+  function activateSelectedProfile() {
+    if (profileIndex < 0 || profileIndex >= profiles.length) return
+    setProfile(profiles[profileIndex])
+  }
+
+  function batteryIcon() {
+    var device = UPower.displayDevice
+    return Model.batteryIcon(device, root.discharging, upowerStates())
+  }
+
+  function modeLabel() {
+    var device = UPower.displayDevice
+    return Model.modeLabel(device, root.discharging, upowerStates())
+  }
+
+  function profileIcon(name) {
+    return Model.profileIcon(name)
+  }
+
+  readonly property bool fullyCharged: {
+    var device = UPower.displayDevice
+    return device && device.isPresent && device.state === UPowerDeviceState.FullyCharged && !root.chargeThresholdActive
+  }
+  readonly property bool discharging: {
+    var device = UPower.displayDevice
+    return !!(device && device.isPresent && (UPower.onBattery || device.state === UPowerDeviceState.Discharging))
+  }
+  readonly property bool chargeThresholdActive: {
+    var device = UPower.displayDevice
+    return Model.chargeThresholdActive(device, root.discharging, upowerStates())
+  }
+  readonly property bool batteryFull: fullyCharged || (!root.discharging && batteryFraction >= 1)
+  readonly property bool batteryFlowIdle: batteryFull || chargeThresholdActive
+
+  // 0..1 charge level, used by the visual progress bar.
+  readonly property real batteryFraction: {
+    var d = UPower.displayDevice
+    return Model.batteryFraction(d)
+  }
+
+  readonly property bool charging: {
+    var d = UPower.displayDevice
+    return d && d.isPresent && d.state === UPowerDeviceState.Charging && !root.chargeThresholdActive
+  }
+
+  readonly property color batteryFillColor: {
+    return root.bar ? root.bar.foreground : Color.foreground
+  }
+
+  // Cute agent-flavored phrases shown in the hero status line, rotated on a
+  // timer so the panel feels alive when current is flowing (either direction).
+  readonly property var chargingPhrases: [
+    "Pumping power",
+    "Injecting electrons",
+    "Pouring juice",
+    "Amassing watts",
+    "Hoarding joules",
+    "Sucking volts",
+    "Topping reserves",
+    "Soaking amps",
+    "Inhaling kilowatts"
+  ]
+  readonly property var onBatteryPhrases: [
+    "Slurping power",
+    "Spending joules",
+    "Draining watts",
+    "Burning electrons",
+    "Sipping juice",
+    "Spending coulombs",
+    "Bleeding amps",
+    "Guzzling volts",
+    "Munching reserves"
+  ]
+  property int phraseIndex: 0
+
+  // Whichever list is "active" given the current power state.
+  readonly property var activePhrases: {
+    if (fullyCharged) return []
+    if (charging) return chargingPhrases
+    if (discharging) return onBatteryPhrases
+    return []
+  }
+  readonly property bool rotatingPhrases: activePhrases.length > 0
+
+  readonly property string heroStatusText: {
+    if (fullyCharged) return "Fully charged"
+    if (rotatingPhrases) return activePhrases[phraseIndex % activePhrases.length]
+    return modeLabel()
+  }
+
+  function refresh() {
+    if (!batteryPresent) return
+
+    if (!batteryProc.running) batteryProc.running = true
+    if (!profilesProc.running) profilesProc.running = true
+    if (!systemProc.running) systemProc.running = true
+  }
+
+  function updateKeyValue(raw, targetName) {
+    var next = Model.parseKeyValue(raw)
+    // Keep last known good data if a refresh briefly returns nothing — happens
+    // around AC plug/unplug events. Avoids the section collapsing mid-transition.
+    if (Object.keys(next).length === 0) return
+    if (targetName === "battery") batteryInfo = next
+    else systemInfo = next
+  }
+
+  function updateProfiles(raw) {
+    var parsed = Model.parseProfiles(raw, profileIndex)
+    // Same guard as battery: preserve the last known profile list across
+    // transient empty payloads so the buttons don't blink out.
+    if (parsed.profiles.length === 0) return
+    profiles = parsed.profiles
+    activeProfile = parsed.activeProfile
+    profileIndex = parsed.profileIndex
+    if (opened && activeProfile !== "") {
+      var idx = profiles.indexOf(activeProfile)
+      if (idx >= 0) profileIndex = idx
+    }
+  }
+
+  function setProfile(profile) {
+    if (!profile || actionProc.running) return
+    actionProc.command = ["powerprofilesctl", "set", profile]
+    actionProc.running = true
+  }
+
+  onOpenedChanged: {
+    if (opened) {
+      if (!batteryPresent) {
+        close()
+        return
+      }
+
+      refresh()
+      var idx = profiles.indexOf(activeProfile)
+      profileIndex = idx >= 0 ? idx : 0
+      cursorActive = false
+    }
+  }
+
+  onBatteryPresentChanged: if (!batteryPresent) close()
+
+  visible: batteryPresent
+  implicitWidth: batteryPresent ? button.implicitWidth : 0
+  implicitHeight: batteryPresent ? button.implicitHeight : 0
+
+  Process {
+    id: batteryProc
+    command: [root.bar ? root.bar.omarchyPath + "/bin/omarchy-battery-status" : "omarchy-battery-status", "--shell"]
+    stdout: StdioCollector { waitForEnd: true; onStreamFinished: root.updateKeyValue(text, "battery") }
+  }
+
+  Process {
+    id: profilesProc
+    command: [root.bar ? root.bar.omarchyPath + "/bin/omarchy-powerprofiles-list" : "omarchy-powerprofiles-list", "--active-state"]
+    stdout: StdioCollector { waitForEnd: true; onStreamFinished: root.updateProfiles(text) }
+  }
+
+  Process {
+    id: systemProc
+    command: [root.bar ? root.bar.omarchyPath + "/bin/omarchy-system-stats" : "omarchy-system-stats"]
+    stdout: StdioCollector { waitForEnd: true; onStreamFinished: root.updateKeyValue(text, "system") }
+  }
+
+  Process {
+    id: actionProc
+    onExited: root.refresh()
+  }
+
+  Timer { interval: 5000; running: root.opened; repeat: true; onTriggered: root.refresh() }
+
+  // Rotate the status phrase while the panel is open and we're in a
+  // rotating state (charging or on battery). The text swap is wrapped in a
+  // fade so the changeover reads as one organism rather than a hard cut.
+  Timer {
+    id: phraseTimer
+    interval: 2800
+    running: root.opened && root.rotatingPhrases
+    repeat: true
+    triggeredOnStart: false
+    onTriggered: phraseSwap.restart()
+  }
+
+  SequentialAnimation {
+    id: phraseSwap
+    PropertyAnimation {
+      target: heroStatus; property: "opacity"
+      to: 0.0; duration: 180; easing.type: Easing.OutQuad
+    }
+    ScriptAction {
+      script: {
+        var n = root.activePhrases.length
+        if (n > 0) root.phraseIndex = (root.phraseIndex + 1) % n
+      }
+    }
+    PropertyAnimation {
+      target: heroStatus; property: "opacity"
+      to: 1.0; duration: 260; easing.type: Easing.InQuad
+    }
+  }
+
+  // If we leave a rotating state mid-swap, halt the animation and snap back
+  // to full opacity so "FULLY CHARGED" is legible immediately rather than
+  // appearing dimmed.
+  Connections {
+    target: root
+    function onRotatingPhrasesChanged() {
+      if (!root.rotatingPhrases) {
+        phraseSwap.stop()
+        heroStatus.opacity = 1.0
+      }
+    }
+  }
+
+  WidgetButton {
+    id: button
+    anchors.fill: parent
+    bar: root.bar
+    text: root.batteryIcon()
+    fixedWidth: root.bar && root.bar.vertical ? -1 : Style.space(27)
+    fixedHeight: root.bar && root.bar.vertical ? Style.space(26) : -1
+    tooltipText: ""
+    onPressed: function(b) { if (root.batteryPresent) root.toggle() }
+  }
+
+  KeyboardPanel {
+    id: panel
+    anchorItem: button
+    owner: root
+    bar: root.bar
+    open: root.opened && root.batteryPresent
+    focusTarget: keyCatcher
+    contentWidth: panel.fittedContentWidth(Style.space(380))
+    contentHeight: panel.fittedContentHeight(column.implicitHeight)
+
+    PanelKeyCatcher {
+      id: keyCatcher
+      anchors.fill: parent
+      onMoveRequested: function(dx, dy) {
+        if (!root.cursorActive) { root.cursorActive = true; return }
+        if (dx !== 0) root.selectProfileByDelta(dx)
+        else if (dy !== 0) root.selectProfileByDelta(dy)
+      }
+      onActivateRequested: if (root.cursorActive) root.activateSelectedProfile()
+      onCloseRequested: root.close()
+      onTabRequested: function(direction) { root.switchPanel(direction) }
+
+      Column {
+        id: column
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        spacing: Style.space(14)
+
+        // ---------- Hero: battery icon · title/status · percentage ----------
+        Item {
+          width: parent.width
+          implicitHeight: Math.max(heroIcon.implicitHeight, heroLabels.implicitHeight, heroPercent.implicitHeight)
+
+          Text {
+            id: heroIcon
+            text: root.batteryIcon()
+            color: root.bar.foreground
+            font.family: root.bar.fontFamily
+            font.pixelSize: Style.font.display
+            anchors.left: parent.left
+            anchors.verticalCenter: parent.verticalCenter
+
+            Behavior on color { ColorAnimation { duration: 200 } }
+          }
+
+          Column {
+            id: heroLabels
+            anchors.left: heroIcon.right
+            anchors.leftMargin: Style.space(14)
+            anchors.right: heroPercent.left
+            anchors.rightMargin: Style.space(10)
+            anchors.verticalCenter: parent.verticalCenter
+            spacing: Style.space(2)
+
+            Text {
+              text: "Battery"
+              color: root.bar.foreground
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.title
+              font.bold: true
+              elide: Text.ElideRight
+              width: parent.width
+            }
+
+            Text {
+              id: heroStatus
+              text: root.heroStatusText.toUpperCase()
+              color: Qt.darker(root.bar.foreground, 1.4)
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.caption
+              font.bold: true
+              font.letterSpacing: 1.2
+              elide: Text.ElideRight
+              width: parent.width
+            }
+          }
+
+          Text {
+            id: heroPercent
+            text: root.batteryInfo.percentage || "—"
+            color: root.bar.foreground
+            font.family: root.bar.fontFamily
+            font.pixelSize: Style.font.displayLarge
+            font.bold: true
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
+
+            Behavior on color { ColorAnimation { duration: 200 } }
+          }
+        }
+
+        // ---------- Battery progress bar ----------
+        Item {
+          width: parent.width
+          implicitHeight: Style.space(8)
+
+          Rectangle {
+            id: barTrack
+            anchors.fill: parent
+            radius: height / 2
+            color: Qt.rgba(root.bar.foreground.r, root.bar.foreground.g, root.bar.foreground.b, 0.12)
+          }
+
+          Rectangle {
+            id: barFill
+            anchors.left: barTrack.left
+            anchors.verticalCenter: barTrack.verticalCenter
+            height: barTrack.height
+            radius: barTrack.radius
+            color: root.batteryFillColor
+            width: Math.max(barTrack.height, barTrack.width * root.batteryFraction)
+
+            Behavior on width { NumberAnimation { duration: 320; easing.type: Easing.OutCubic } }
+            Behavior on color { ColorAnimation { duration: 220 } }
+
+            // Subtle pulse while charging — visible signal that energy is flowing in.
+            SequentialAnimation on opacity {
+              running: root.charging && !root.fullyCharged && root.opened
+              loops: Animation.Infinite
+              alwaysRunToEnd: true
+              NumberAnimation { from: 1.0; to: 0.55; duration: 950; easing.type: Easing.InOutSine }
+              NumberAnimation { from: 0.55; to: 1.0; duration: 950; easing.type: Easing.InOutSine }
+            }
+          }
+        }
+
+        // ---------- Stats ----------
+        // Visibility is intentionally only gated by "we've ever loaded data" so
+        // the section never collapses mid-transition. fullyCharged is *not* part
+        // of the condition: UPower briefly reports FullyCharged on plug-in when
+        // the battery sits above the charge-control start threshold, and we
+        // refuse to flicker the whole panel for that ~1s window.
+        Row {
+          visible: root.batteryInfo.percentage !== undefined
+          width: parent.width
+          spacing: Style.space(20)
+
+          Column {
+            width: (parent.width - parent.spacing) / 2
+            spacing: Style.spacing.labelGap
+            InfoPair { label: "Battery size"; value: root.batteryInfo.size || "" }
+            InfoPair { label: "Charge cycles"; value: root.batteryInfo.cycles || "—" }
+          }
+
+          Column {
+            width: (parent.width - parent.spacing) / 2
+            spacing: Style.spacing.labelGap
+            InfoPair {
+              label: root.chargeThresholdActive ? "Charge limit" : (root.discharging ? "Time left" : "Time to full")
+              value: root.chargeThresholdActive ? (root.batteryInfo.threshold || "-") : (root.batteryFlowIdle ? "-" : (root.batteryInfo.time || "—"))
+            }
+            InfoPair {
+              label: root.chargeThresholdActive ? "Battery state" : (root.discharging ? "Discharging" : "Charging")
+              value: root.chargeThresholdActive ? "Holding" : (root.batteryFull ? "-" : (root.batteryInfo.rate || ""))
+            }
+          }
+        }
+
+        // ---------- Power profile picker ----------
+        PanelSeparator {
+          foreground: root.bar.foreground
+        }
+
+        Column {
+          width: parent.width
+          spacing: Style.space(10)
+
+          PanelSectionHeader {
+            text: "POWER PROFILE"
+            foreground: root.bar.foreground
+            fontFamily: root.bar.fontFamily
+          }
+
+          Row {
+            id: profileRow
+            width: parent.width
+            spacing: Style.space(6)
+
+            readonly property real cellWidth: root.profiles.length > 0
+              ? (width - spacing * (root.profiles.length - 1)) / root.profiles.length
+              : 0
+
+            Repeater {
+              model: root.profiles
+              Button {
+                required property var modelData
+                required property int index
+                width: profileRow.cellWidth
+                iconText: root.profileIcon(String(modelData))
+                iconSize: Style.font.title
+                text: String(modelData).charAt(0).toUpperCase() + String(modelData).slice(1)
+                fontSize: Style.font.bodySmall
+                foreground: root.bar.foreground
+                fontFamily: root.bar.fontFamily
+                horizontalPadding: Style.spacing.controlPaddingX
+                verticalPadding: Style.spacing.controlPaddingY + Style.space(2)
+                bordered: true
+                active: root.activeProfile === modelData
+                hasCursor: root.cursorActive && root.profileIndex === index
+                onClicked: root.setProfile(modelData)
+                onHovered: function(h) {
+                  if (h) {
+                    root.cursorActive = true
+                    root.profileIndex = index
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  component InfoPair: Row {
+    property string label: ""
+    property string value: ""
+
+    width: parent.width
+    spacing: Style.space(8)
+
+    InfoLabel { text: label }
+    Item { width: Math.max(0, parent.width - parent.children[0].implicitWidth - parent.children[2].implicitWidth - parent.spacing * 2); height: 1 }
+    InfoValue { text: value }
+  }
+
+  component InfoLabel: Text {
+    color: root.bar.foreground
+    opacity: 0.6
+    font.family: root.bar.fontFamily
+    font.pixelSize: Style.font.bodySmall
+  }
+
+  component InfoValue: Text {
+    color: root.bar.foreground
+    font.family: root.bar.fontFamily
+    font.pixelSize: Style.font.bodySmall
+  }
+}
diff --git a/shell/plugins/panels/power/manifest.json b/shell/plugins/panels/power/manifest.json
new file mode 100644
index 00000000..64a1eac4
--- /dev/null
+++ b/shell/plugins/panels/power/manifest.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.power",
+  "name": "Power",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Battery, power profile, and system stats",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Panel.qml"
+  },
+  "barWidget": {
+    "displayName": "Power",
+    "description": "Battery, power profile, and system stats",
+    "category": "System",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/plugins/panels/tailscale/Model.js b/shell/plugins/panels/tailscale/Model.js
new file mode 100644
index 00000000..46089a63
--- /dev/null
+++ b/shell/plugins/panels/tailscale/Model.js
@@ -0,0 +1,281 @@
+function filterIPv4(ips) {
+  var result = []
+  if (!ips || typeof ips.length !== "number") return result
+  for (var i = 0; i < ips.length; i++) {
+    var ip = String(ips[i] || "")
+    if (/^100\./.test(ip)) result.push(ip)
+  }
+  return result
+}
+
+function filterIPv6(ips) {
+  var result = []
+  if (!ips || typeof ips.length !== "number") return result
+  for (var i = 0; i < ips.length; i++) {
+    var ip = String(ips[i] || "")
+    if (/^fd7a:115c:a1e0:/i.test(ip)) result.push(ip)
+  }
+  return result
+}
+
+function cleanDnsName(name) {
+  var value = String(name || "")
+  return value.charAt(value.length - 1) === "." ? value.slice(0, -1) : value
+}
+
+function shortDnsName(name) {
+  var clean = cleanDnsName(name)
+  if (clean === "") return ""
+  return clean.split(".")[0] || clean
+}
+
+function displayHostName(hostName, dnsName) {
+  var host = String(hostName || "")
+  if (host !== "" && host.toLowerCase() !== "localhost") return host
+  return shortDnsName(dnsName) || host || "Unknown"
+}
+
+function isMullvadPeer(peer) {
+  var hostName = String((peer && peer.HostName) || "").toLowerCase()
+  var dnsName = cleanDnsName((peer && peer.DNSName) || "").toLowerCase()
+  return dnsName.indexOf(".mullvad.ts.net") !== -1 || hostName.indexOf(".mullvad.ts.net") !== -1
+}
+
+function osIcon(os) {
+  var value = String(os || "").toLowerCase()
+  if (value === "linux") return "󰌽"
+  if (value === "macos" || value === "ios") return "󰀵"
+  if (value === "windows") return "󰍲"
+  if (value === "android") return "󰀲"
+  if (value === "mullvad") return "󰖂"
+  return "󰟀"
+}
+
+function accountLabel(account) {
+  if (!account) return "Unknown account"
+  if (account.nickname) return String(account.nickname)
+  if (account.tailnet) return String(account.tailnet)
+  if (account.account) return String(account.account)
+  return String(account.id || "Unknown account")
+}
+
+function peerFromStatus(id, peer) {
+  return {
+    id: id,
+    HostName: displayHostName(peer.HostName, peer.DNSName),
+    DNSName: cleanDnsName(peer.DNSName),
+    DisplayName: displayHostName(peer.HostName, peer.DNSName),
+    TailscaleIPs: filterIPv4(peer.TailscaleIPs || []),
+    TailscaleIPv6: filterIPv6(peer.TailscaleIPs || []),
+    Online: peer.Online === true,
+    OS: String(peer.OS || ""),
+    Tags: peer.Tags || [],
+    ExitNodeOption: peer.ExitNodeOption === true,
+    ExitNode: peer.ExitNode === true,
+    Mullvad: isMullvadPeer(peer)
+  }
+}
+
+function sliceTableColumn(line, start, end) {
+  var text = String(line || "")
+  if (start < 0 || start >= text.length) return ""
+  if (end < 0) return text.substring(start).trim()
+  return text.substring(start, Math.min(end, text.length)).trim()
+}
+
+function parseExitNodeList(raw) {
+  var lines = String(raw || "").split(/\r?\n/)
+  var header = ""
+  var headerIndex = -1
+  for (var i = 0; i < lines.length; i++) {
+    if (/^\s*IP\s+HOSTNAME\s+COUNTRY\s+CITY\s+STATUS\s*$/.test(lines[i])) {
+      header = lines[i]
+      headerIndex = i
+      break
+    }
+  }
+  if (headerIndex === -1) return []
+
+  var ipStart = header.indexOf("IP")
+  var hostStart = header.indexOf("HOSTNAME")
+  var countryStart = header.indexOf("COUNTRY")
+  var cityStart = header.indexOf("CITY")
+  var statusStart = header.indexOf("STATUS")
+  var byHost = {}
+
+  for (var j = headerIndex + 1; j < lines.length; j++) {
+    var line = lines[j]
+    if (/^\s*$/.test(line) || /^\s*#/.test(line)) continue
+
+    var ip = sliceTableColumn(line, ipStart, hostStart)
+    var host = sliceTableColumn(line, hostStart, countryStart)
+    var country = sliceTableColumn(line, countryStart, cityStart)
+    var city = sliceTableColumn(line, cityStart, statusStart)
+    var status = sliceTableColumn(line, statusStart, -1)
+    if (host.indexOf(".mullvad.ts.net") === -1) continue
+
+    byHost[host] = {
+      id: "mullvad:" + host,
+      HostName: host,
+      DNSName: host,
+      DisplayName: (city && city !== "Any" ? city + ", " : "") + country,
+      TailscaleIPs: ip ? [ip] : [],
+      TailscaleIPv6: [],
+      Online: true,
+      OS: "mullvad",
+      Tags: [],
+      ExitNodeOption: true,
+      ExitNode: status !== "" && status !== "-",
+      Mullvad: true,
+      Country: country,
+      City: city,
+      Status: status
+    }
+  }
+
+  var result = []
+  for (var hostName in byHost) result.push(byHost[hostName])
+  result.sort(function(a, b) {
+    var countryCompare = String(a.Country).localeCompare(String(b.Country))
+    if (countryCompare !== 0) return countryCompare
+    return String(a.DisplayName).localeCompare(String(b.DisplayName))
+  })
+  return result
+}
+
+function mullvadRegionOptions(nodes) {
+  var byRegion = {}
+  var values = Array.isArray(nodes) ? nodes : []
+  for (var i = 0; i < values.length; i++) {
+    var node = values[i] || {}
+    if (node.Mullvad !== true) continue
+    var country = String(node.Country || "").trim()
+    var city = String(node.City || "").trim()
+    if (country === "") continue
+    if (city === "" || city === "Any") continue
+
+    var key = country + "\n" + city
+    if (byRegion[key]) continue
+
+    var option = {}
+    for (var propertyName in node) option[propertyName] = node[propertyName]
+    option.id = "mullvad-region:" + key
+    option.DisplayName = city + ", " + country
+    option.Country = country
+    option.City = city
+    option.MullvadRegion = true
+    byRegion[key] = option
+  }
+
+  var result = []
+  for (var name in byRegion) result.push(byRegion[name])
+  result.sort(function(a, b) {
+    var countryCompare = String(a.Country).localeCompare(String(b.Country))
+    if (countryCompare !== 0) return countryCompare
+    return String(a.City).localeCompare(String(b.City))
+  })
+  return result
+}
+
+function mullvadCountryOptions(nodes) {
+  return mullvadRegionOptions(nodes)
+}
+
+function parseStatus(raw) {
+  var text = String(raw || "").trim()
+  if (text === "") return { ok: true, unavailable: true, message: "Disconnected" }
+
+  try {
+    var data = JSON.parse(text)
+    var backendState = String(data.BackendState || "Unknown")
+    var self = data.Self || {}
+    var selfIps = filterIPv4(self.TailscaleIPs || data.TailscaleIPs || [])
+    var peers = []
+    var exitNodes = []
+    var rawPeers = data.Peer || {}
+
+    for (var id in rawPeers) {
+      var peer = rawPeers[id] || {}
+      var normalized = peerFromStatus(id, peer)
+      if (normalized.Mullvad) continue
+      if (normalized.Online) {
+        peers.push(normalized)
+        if (normalized.ExitNodeOption) exitNodes.push(normalized)
+      }
+    }
+
+    peers.sort(function(a, b) {
+      return String(a.HostName).localeCompare(String(b.HostName))
+    })
+    exitNodes.sort(function(a, b) {
+      return String(a.HostName).localeCompare(String(b.HostName))
+    })
+
+    return {
+      ok: true,
+      unavailable: false,
+      backendState: backendState,
+      running: backendState === "Running",
+      needsLogin: backendState === "NeedsLogin",
+      authUrl: String(data.AuthURL || ""),
+      selfName: displayHostName(self.HostName, self.DNSName),
+      selfDnsName: cleanDnsName(self.DNSName),
+      selfIp: selfIps.length > 0 ? selfIps[0] : "",
+      peers: peers,
+      exitNodes: exitNodes
+    }
+  } catch (e) {
+    return { ok: false, unavailable: true, message: "Status error", error: "Failed to parse tailscale status" }
+  }
+}
+
+function parseAccounts(raw) {
+  var text = String(raw || "").trim()
+  if (text === "") return { accounts: [], selectedAccountId: "", selectedAccountLabel: "" }
+
+  try {
+    var parsed = JSON.parse(text)
+    var next = []
+    var selected = null
+    if (parsed && typeof parsed.length === "number") {
+      for (var i = 0; i < parsed.length; i++) {
+        var rawAccount = parsed[i] || {}
+        var account = {
+          id: String(rawAccount.id || rawAccount.ID || ""),
+          nickname: String(rawAccount.nickname || rawAccount.Nickname || rawAccount.name || rawAccount.Name || ""),
+          tailnet: String(rawAccount.tailnet || rawAccount.Tailnet || ""),
+          account: String(rawAccount.account || rawAccount.Account || rawAccount.loginName || rawAccount.LoginName || rawAccount.user || rawAccount.User || ""),
+          selected: rawAccount.selected === true || rawAccount.Selected === true
+        }
+        next.push(account)
+        if (account.selected === true) selected = account
+      }
+    }
+    return {
+      accounts: next,
+      selectedAccountId: selected ? String(selected.id || "") : "",
+      selectedAccountLabel: selected ? accountLabel(selected) : ""
+    }
+  } catch (e) {
+    return { accounts: [], selectedAccountId: "", selectedAccountLabel: "" }
+  }
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    filterIPv4: filterIPv4,
+    filterIPv6: filterIPv6,
+    cleanDnsName: cleanDnsName,
+    shortDnsName: shortDnsName,
+    displayHostName: displayHostName,
+    osIcon: osIcon,
+    accountLabel: accountLabel,
+    isMullvadPeer: isMullvadPeer,
+    peerFromStatus: peerFromStatus,
+    parseExitNodeList: parseExitNodeList,
+    mullvadRegionOptions: mullvadRegionOptions,
+    mullvadCountryOptions: mullvadCountryOptions,
+    parseStatus: parseStatus,
+    parseAccounts: parseAccounts
+  }
+}
diff --git a/shell/plugins/panels/tailscale/Panel.qml b/shell/plugins/panels/tailscale/Panel.qml
new file mode 100644
index 00000000..9d3ef11a
--- /dev/null
+++ b/shell/plugins/panels/tailscale/Panel.qml
@@ -0,0 +1,1252 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import qs.Ui
+
+Panel {
+  id: root
+  moduleName: "omarchy.tailscale"
+  ipcTarget: "omarchy.tailscale"
+  manageIpc: false
+
+  readonly property real openIndicatorInlineOffset: bar && bar.vertical ? 0 : Style.spaceReal(1.5)
+  property string focusSection: "header"
+  property int headerIndex: 0
+  property int accountIndex: 0
+  property int peerIndex: 0
+  property int exitNodeIndex: 0
+  property int mullvadRegionIndex: 0
+  property bool cursorActive: false
+  property bool copyMenuOpen: false
+  property bool mullvadPickerOpen: false
+  property string mullvadQuery: ""
+  property int phraseIndex: 0
+  readonly property var activePhrases: [
+    "Encrypting connections",
+    "Sending secrets",
+    "Guarding wires",
+    "Braiding packets",
+    "Polishing tunnels",
+    "Hiding routes",
+    "Sealing ports",
+    "Sorting tailnets",
+    "Shuffling keys",
+    "Watching machines"
+  ]
+  readonly property string heroPhraseText: activePhrases[phraseIndex % activePhrases.length]
+
+  readonly property color foreground: bar ? bar.foreground : Color.foreground
+  readonly property color urgent: bar ? bar.urgent : Color.urgent
+  readonly property color dim: Qt.darker(foreground, 1.55)
+  readonly property string fontFamily: bar ? bar.fontFamily : Style.font.family
+  readonly property bool showConnections: tailscale.accounts.length > 1 || tailscale.accountsAccessDenied
+  readonly property bool showPeers: tailscale.running && tailscale.peers.length > 0
+  readonly property var recentMullvadRegions: Array.isArray(settings.recentMullvadRegions) ? settings.recentMullvadRegions : (Array.isArray(settings.recentMullvadCountries) ? settings.recentMullvadCountries : [])
+  readonly property var recentMullvadExitNodes: recentMullvadNodes()
+  readonly property var exitNodes: displayExitNodes()
+  readonly property bool showExitNodes: tailscale.running && (exitNodes.length > 0 || tailscale.mullvadRegions.length > 0)
+  readonly property var filteredMullvadRegions: filteredMullvadRegionNodes()
+  readonly property color iconColor: tailscale.running ? foreground : dim
+  readonly property color barIconColor: tailscale.running ? barForeground : Qt.darker(barForeground, 1.55)
+  readonly property color hoverFill: bar ? Style.hoverFillFor(bar.foreground, Color.accent) : "transparent"
+  readonly property color selectedFill: bar ? Style.selectedFillFor(bar.foreground, Color.accent) : "transparent"
+
+  function selectedPeer() {
+    if (tailscale.peers.length === 0) return null
+    return tailscale.peers[Math.max(0, Math.min(peerIndex, tailscale.peers.length - 1))]
+  }
+
+  function selectedExitNode() {
+    if (exitNodes.length === 0) return null
+    return exitNodes[Math.max(0, Math.min(exitNodeIndex, exitNodes.length - 1))]
+  }
+
+  function selectedMullvadRegion() {
+    if (filteredMullvadRegions.length === 0) return null
+    return filteredMullvadRegions[Math.max(0, Math.min(mullvadRegionIndex, filteredMullvadRegions.length - 1))]
+  }
+
+  function displayExitNodes() {
+    var nodes = []
+    for (var i = 0; i < tailscale.tailnetExitNodes.length; i++) nodes.push(tailscale.tailnetExitNodes[i])
+    for (var j = 0; j < recentMullvadExitNodes.length; j++) nodes.push(recentMullvadExitNodes[j])
+    if (tailscale.mullvadRegions.length > 0) nodes.push({ id: "mullvad:add", AddMullvad: true, DisplayName: "Choose Mullvad region" })
+    return nodes
+  }
+
+  function recentMullvadNodes() {
+    var nodes = []
+    var seen = {}
+    for (var a = 0; a < tailscale.mullvadRegions.length && nodes.length < 5; a++) {
+      var active = tailscale.mullvadRegions[a]
+      var activeKey = mullvadRegionKey(active)
+      if (active.ExitNode === true && activeKey !== "" && !seen[activeKey]) {
+        nodes.push(active)
+        seen[activeKey] = true
+      }
+    }
+    for (var i = 0; i < recentMullvadRegions.length && nodes.length < 5; i++) {
+      var region = String(recentMullvadRegions[i] || "")
+      if (region === "" || seen[region]) continue
+      var node = mullvadRegionNode(region)
+      if (node) {
+        nodes.push(node)
+        seen[region] = true
+      }
+    }
+    return nodes
+  }
+
+  function mullvadRegionKey(node) {
+    if (!node) return ""
+    var country = String(node.Country || "")
+    var city = String(node.City || "")
+    if (country === "" || city === "") return ""
+    return country + "\n" + city
+  }
+
+  function mullvadRegionNode(region) {
+    for (var i = 0; i < tailscale.mullvadRegions.length; i++) {
+      var node = tailscale.mullvadRegions[i]
+      if (mullvadRegionKey(node) === String(region || "")) return node
+      if (String(node.Country || "") === String(region || "")) return node
+    }
+    return null
+  }
+
+  function filteredMullvadRegionNodes() {
+    var query = String(mullvadQuery || "").trim().toLowerCase()
+    var result = []
+    for (var i = 0; i < tailscale.mullvadRegions.length; i++) {
+      var node = tailscale.mullvadRegions[i]
+      var label = (String(node.City || "") + " " + String(node.Country || "")).toLowerCase()
+      if (query === "" || label.indexOf(query) !== -1) result.push(node)
+    }
+    return result
+  }
+
+  function mullvadRegionTitle(peer) {
+    if (!peer) return "Unknown"
+    var city = String(peer.City || "").trim()
+    var country = String(peer.Country || "").trim()
+    if (city === "" || city === "Any") return country || String(peer.DisplayName || "Unknown")
+    return city
+  }
+
+  function mullvadRegionSubtitle(peer) {
+    if (!peer) return ""
+    return String(peer.Country || "").trim()
+  }
+
+  function persistRecentMullvad(region) {
+    var name = String(region || "")
+    if (name === "") return
+    var next = [name]
+    for (var i = 0; i < recentMullvadRegions.length && next.length < 5; i++) {
+      var existing = String(recentMullvadRegions[i] || "")
+      if (existing !== "" && existing !== name && next.indexOf(existing) === -1) next.push(existing)
+    }
+    if (!root.bar || !root.bar.shell || typeof root.bar.shell.updateEntryInline !== "function") return
+    var entry = { id: root.moduleName }
+    for (var key in settings) if (key !== "id") entry[key] = settings[key]
+    entry.recentMullvadRegions = next
+    root.bar.shell.updateEntryInline(root.moduleName, entry)
+  }
+
+  function chooseExitNode(peer) {
+    if (!peer) return
+    if (peer.AddMullvad === true) {
+      mullvadPickerOpen = !mullvadPickerOpen
+      mullvadRegionIndex = 0
+      if (mullvadPickerOpen) Qt.callLater(function() { if (mullvadSearch) mullvadSearch.forceActiveFocus() })
+      return
+    }
+    if (peer.Mullvad === true) persistRecentMullvad(mullvadRegionKey(peer))
+    tailscale.setExitNode(peer)
+    mullvadPickerOpen = false
+  }
+
+  function selectedAccount() {
+    if (tailscale.accounts.length === 0) return null
+    return tailscale.accounts[Math.max(0, Math.min(accountIndex, tailscale.accounts.length - 1))]
+  }
+
+  function ensureCursor() {
+    if (headerIndex < 0) headerIndex = 0
+    if (headerIndex > 0) headerIndex = 0
+    if (accountIndex >= tailscale.accounts.length) accountIndex = Math.max(0, tailscale.accounts.length - 1)
+    if (peerIndex >= tailscale.peers.length) peerIndex = Math.max(0, tailscale.peers.length - 1)
+    if (exitNodeIndex >= exitNodes.length) exitNodeIndex = Math.max(0, exitNodes.length - 1)
+    if (mullvadRegionIndex >= filteredMullvadRegions.length) mullvadRegionIndex = Math.max(0, filteredMullvadRegions.length - 1)
+    if (focusSection === "auth" && !tailscale.accountsAccessDenied) focusSection = tailscale.accounts.length > 1 ? "accounts" : (showExitNodes ? "exitNodes" : (showPeers ? "peers" : "header"))
+    if (focusSection === "accounts" && tailscale.accounts.length <= 1) focusSection = tailscale.accountsAccessDenied ? "auth" : (showExitNodes ? "exitNodes" : (showPeers ? "peers" : "header"))
+    if (focusSection === "peers" && !showPeers) focusSection = showExitNodes ? "exitNodes" : (tailscale.accountsAccessDenied ? "auth" : (tailscale.accounts.length > 1 ? "accounts" : "header"))
+    if (focusSection === "exitNodes" && !showExitNodes) focusSection = showPeers ? "peers" : (tailscale.accountsAccessDenied ? "auth" : (tailscale.accounts.length > 1 ? "accounts" : "header"))
+  }
+
+  function moveCursor(dx, dy) {
+    cursorActive = true
+    ensureCursor()
+    if (dy !== 0) {
+      if (focusSection === "header") {
+        if (dy > 0) {
+          if (tailscale.accountsAccessDenied) focusSection = "auth"
+          else if (tailscale.accounts.length > 1) focusSection = "accounts"
+          else if (showExitNodes) focusSection = "exitNodes"
+          else if (showPeers) focusSection = "peers"
+        }
+      } else if (focusSection === "auth") {
+        if (dy < 0) focusSection = "header"
+        else if (tailscale.accounts.length > 1) focusSection = "accounts"
+        else if (showExitNodes) focusSection = "exitNodes"
+        else if (showPeers) focusSection = "peers"
+      } else if (focusSection === "accounts") {
+        if (dy < 0) {
+          if (accountIndex <= 0) focusSection = tailscale.accountsAccessDenied ? "auth" : "header"
+          else accountIndex--
+        } else {
+          if (accountIndex < tailscale.accounts.length - 1) accountIndex++
+          else if (showExitNodes) focusSection = "exitNodes"
+          else if (showPeers) focusSection = "peers"
+        }
+      } else if (focusSection === "peers") {
+        if (dy < 0) {
+          if (peerIndex <= 0) focusSection = showExitNodes ? "exitNodes" : (tailscale.accounts.length > 1 ? "accounts" : (tailscale.accountsAccessDenied ? "auth" : "header"))
+          else peerIndex--
+        } else if (peerIndex < tailscale.peers.length - 1) {
+          peerIndex++
+        }
+      } else if (focusSection === "exitNodes") {
+        if (dy < 0) {
+          if (exitNodeIndex <= 0) focusSection = tailscale.accounts.length > 1 ? "accounts" : (tailscale.accountsAccessDenied ? "auth" : "header")
+          else exitNodeIndex--
+        } else if (exitNodeIndex < exitNodes.length - 1) {
+          exitNodeIndex++
+        } else if (showPeers) {
+          focusSection = "peers"
+        }
+      }
+    }
+    ensureCursor()
+    scrollCursorIntoView()
+  }
+
+  function activateCursor() {
+    ensureCursor()
+    if (focusSection === "header") {
+      tailscale.toggleTailscale()
+    } else if (focusSection === "auth") {
+      tailscale.authorizeTailscaleOperator()
+    } else if (focusSection === "accounts") {
+      var account = selectedAccount()
+      if (account) tailscale.switchAccount(account.id)
+    } else if (focusSection === "peers") {
+      openSelectedPeerCopyMenu()
+    } else if (focusSection === "exitNodes") {
+      chooseExitNode(selectedExitNode())
+    }
+  }
+
+  function moveMullvadRegionCursor(delta) {
+    if (filteredMullvadRegions.length === 0) return
+    cursorActive = true
+    mullvadRegionIndex = Math.max(0, Math.min(filteredMullvadRegions.length - 1, mullvadRegionIndex + delta))
+    scrollMullvadRegionCursorIntoView()
+  }
+
+  function activateMullvadRegionCursor() {
+    var region = selectedMullvadRegion()
+    if (region) chooseExitNode(region)
+  }
+
+  function scrollItemIntoView(item) {
+    if (!panelFlick || !item) return
+    Qt.callLater(function() {
+      if (!item) return
+      var margin = Style.space(6)
+      var point = item.mapToItem(panelFlick.contentItem, 0, 0)
+      var top = point.y
+      var bottom = top + item.height
+      var viewTop = panelFlick.contentY
+      var viewBottom = viewTop + panelFlick.height
+      var maxY = Math.max(0, panelFlick.contentHeight - panelFlick.height)
+      if (top < viewTop + margin) panelFlick.contentY = Math.max(0, top - margin)
+      else if (bottom > viewBottom - margin) panelFlick.contentY = Math.min(maxY, bottom + margin - panelFlick.height)
+    })
+  }
+
+  function scrollCursorIntoView() {
+    if (focusSection === "peers" && peerColumn && peerIndex >= 0 && peerIndex < peerColumn.children.length) scrollItemIntoView(peerColumn.children[peerIndex])
+    else if (focusSection === "exitNodes" && exitNodeColumn && exitNodeIndex >= 0 && exitNodeIndex < exitNodeColumn.children.length) scrollItemIntoView(exitNodeColumn.children[exitNodeIndex])
+  }
+
+  function scrollMullvadRegionCursorIntoView() {
+    if (mullvadRegionColumn && mullvadRegionIndex >= 0 && mullvadRegionIndex < mullvadRegionColumn.children.length) scrollItemIntoView(mullvadRegionColumn.children[mullvadRegionIndex])
+  }
+
+  function setPeerCursor(index) {
+    cursorActive = true
+    focusSection = "peers"
+    peerIndex = index
+    scrollCursorIntoView()
+  }
+
+  function openSelectedPeerCopyMenu() {
+    if (!peerColumn || peerIndex < 0 || peerIndex >= peerColumn.children.length) return
+    var item = peerColumn.children[peerIndex]
+    if (item && item.openCopyMenu) item.openCopyMenu()
+  }
+
+  function setExitNodeCursor(index) {
+    cursorActive = true
+    focusSection = "exitNodes"
+    exitNodeIndex = index
+    scrollCursorIntoView()
+  }
+
+  function setAccountCursor(index) {
+    cursorActive = true
+    focusSection = "accounts"
+    accountIndex = index
+  }
+
+  function setAuthCursor() {
+    cursorActive = true
+    focusSection = "auth"
+  }
+
+  implicitWidth: button.implicitWidth
+  implicitHeight: button.implicitHeight
+
+  onOpenedChanged: if (opened) {
+    cursorActive = false
+    if (panelFlick) panelFlick.contentY = 0
+    tailscale.refresh()
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+  onPeerIndexChanged: scrollCursorIntoView()
+  onExitNodeIndexChanged: scrollCursorIntoView()
+  onMullvadRegionIndexChanged: if (mullvadPickerOpen) scrollMullvadRegionCursorIntoView()
+  onShowConnectionsChanged: ensureCursor()
+  onShowPeersChanged: ensureCursor()
+  onShowExitNodesChanged: ensureCursor()
+  onFilteredMullvadRegionsChanged: ensureCursor()
+
+  Service {
+    id: tailscale
+    settings: root.settings
+  }
+
+  Connections {
+    target: tailscale
+    function onPeersChanged() { root.ensureCursor() }
+    function onAccountsChanged() { root.ensureCursor() }
+    function onAccountsAccessDeniedChanged() { root.ensureCursor() }
+  }
+
+  IpcHandler {
+    target: root.ipcTarget
+    function open(): void { root.open() }
+    function close(): void { root.close() }
+    function show(): void { root.open() }
+    function hide(): void { root.close() }
+    function toggle(): void { root.toggle() }
+    function refresh(): string { tailscale.refresh(); return "ok" }
+    function up(): string { tailscale.loginOrUp(); return "ok" }
+    function down(): string { tailscale.runAction(["tailscale", "down"], "Turning Tailscale off…"); return "ok" }
+    function status(): string { return tailscale.statusText }
+  }
+
+  Item {
+    id: button
+    anchors.fill: parent
+    implicitWidth: root.bar && root.bar.vertical ? root.bar.barSize : Style.space(27)
+    implicitHeight: root.bar && root.bar.vertical ? Style.space(26) : (root.bar ? root.bar.barSize : Style.space(26))
+
+    property var registeredBar: null
+
+    function triggerPress(buttonCode) {
+      if (buttonCode === Qt.RightButton) tailscale.toggleTailscale()
+      else if (buttonCode === Qt.MiddleButton) tailscale.refresh()
+      else root.toggle()
+    }
+
+    function syncClickRegistration() {
+      if (registeredBar && registeredBar.unregisterClickTarget) registeredBar.unregisterClickTarget(button)
+      registeredBar = root.bar
+      if (registeredBar && registeredBar.registerClickTarget) registeredBar.registerClickTarget(button)
+    }
+
+    Component.onCompleted: syncClickRegistration()
+    Component.onDestruction: if (registeredBar && registeredBar.unregisterClickTarget) registeredBar.unregisterClickTarget(button)
+
+    Connections {
+      target: root
+      function onBarChanged() { button.syncClickRegistration() }
+    }
+
+    TailscaleIcon {
+      anchors.centerIn: parent
+      anchors.horizontalCenterOffset: root.openIndicatorInlineOffset
+      anchors.verticalCenterOffset: -Style.space(1)
+      iconSize: Style.space(12) * 0.85
+      color: root.barIconColor
+      badgeColor: root.urgent
+      crossed: !tailscale.running && !tailscale.needsLogin
+      warning: tailscale.needsLogin
+    }
+
+    MouseArea {
+      id: mouseArea
+      anchors.fill: parent
+      acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
+      hoverEnabled: true
+      cursorShape: Qt.PointingHandCursor
+      onClicked: function(mouse) { button.triggerPress(mouse.button) }
+    }
+  }
+
+  KeyboardPanel {
+    id: panel
+    anchorItem: button
+    owner: root
+    bar: root.bar
+    open: root.opened
+    focusTarget: keyCatcher
+    contentWidth: panel.fittedContentWidth(Style.space(380))
+    contentHeight: panel.fittedContentHeight(column.implicitHeight, Style.space(560))
+
+    PanelKeyCatcher {
+      id: keyCatcher
+      anchors.fill: parent
+      blocked: root.copyMenuOpen
+      onMoveRequested: function(dx, dy) {
+        if (!root.cursorActive) { root.cursorActive = true; return }
+        root.moveCursor(dx, dy)
+      }
+      onActivateRequested: if (root.cursorActive) root.activateCursor()
+      onCloseRequested: root.close()
+      onTabRequested: function(direction) { root.switchPanel(direction) }
+      onTextKey: function(t) {
+        if (t === "t" || t === "T") tailscale.toggleTailscale()
+        else if (t === "c" || t === "C") tailscale.copyPeerIp(root.selectedPeer())
+        else if (t === "n" || t === "N") tailscale.copyPeerName(root.selectedPeer())
+        else if (t === "d" || t === "D") tailscale.copyPeerDnsName(root.selectedPeer())
+      }
+
+      Flickable {
+        id: panelFlick
+        anchors.fill: parent
+        contentWidth: width
+        contentHeight: column.implicitHeight
+        clip: true
+        boundsBehavior: Flickable.StopAtBounds
+        flickableDirection: Flickable.VerticalFlick
+        ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded }
+
+        Column {
+          id: column
+          width: panelFlick.width
+          spacing: Style.space(12)
+
+          Item {
+            id: header
+            width: parent.width
+            implicitHeight: hero.implicitHeight
+
+            PanelHero {
+              id: hero
+              width: parent.width
+              title: tailscale.installed ? (tailscale.selfName || "Tailscale") : "Tailscale"
+              meta: root.heroPhraseText
+              foreground: root.foreground
+              fontFamily: root.fontFamily
+              iconOpacity: tailscale.running ? 1.0 : 0.5
+              iconComponent: Component {
+                Item {
+                  implicitWidth: icon.implicitWidth
+                  implicitHeight: icon.implicitHeight
+
+                  TailscaleIcon {
+                    id: icon
+                    iconSize: Style.font.display
+                    color: root.iconColor
+                    badgeColor: root.urgent
+                    crossed: !tailscale.running && !tailscale.needsLogin
+                    warning: tailscale.needsLogin
+                    anchors.centerIn: parent
+                  }
+
+                  MouseArea {
+                    id: heroIconMouse
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    enabled: tailscale.installed && !tailscale.busy
+                    cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
+                    onContainsMouseChanged: if (containsMouse) {
+                      root.focusSection = "header"
+                      root.headerIndex = 0
+                    }
+                    onClicked: tailscale.toggleTailscale()
+                  }
+                }
+              }
+            }
+          }
+
+          Text {
+            visible: tailscale.actionStatus !== "" || tailscale.lastError !== ""
+            width: parent.width
+            text: tailscale.actionStatus !== "" ? tailscale.actionStatus : tailscale.lastError
+            color: tailscale.lastError !== "" && tailscale.actionStatus === "" ? root.urgent : root.dim
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.bodySmall
+            wrapMode: Text.WordWrap
+          }
+
+          CursorSurface {
+            visible: !tailscale.installed
+            width: parent.width
+            implicitHeight: missingText.implicitHeight + Style.spacing.rowPaddingX
+            foreground: root.foreground
+
+            Text {
+              id: missingText
+              anchors.left: parent.left
+              anchors.right: parent.right
+              anchors.verticalCenter: parent.verticalCenter
+              anchors.margins: Style.space(12)
+              text: "Tailscale CLI is not installed or not on PATH."
+              color: root.dim
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.body
+              wrapMode: Text.WordWrap
+            }
+          }
+
+          PanelSeparator {
+            visible: root.showConnections
+            foreground: root.foreground
+          }
+
+          Column {
+            visible: root.showConnections
+            width: parent.width
+            spacing: Style.space(10)
+
+            PanelSectionHeader {
+              text: "CONNECTIONS"
+              foreground: root.foreground
+              fontFamily: root.fontFamily
+            }
+
+            AuthRow {
+              visible: tailscale.accountsAccessDenied
+              width: parent.width
+            }
+
+            Repeater {
+              model: tailscale.accounts
+              AccountRow {
+                required property var modelData
+                required property int index
+                width: parent.width
+                account: modelData
+                rowIndex: index
+              }
+            }
+          }
+
+          PanelSeparator {
+            visible: root.showExitNodes
+            foreground: root.foreground
+          }
+
+          Column {
+            visible: root.showExitNodes
+            width: parent.width
+            spacing: Style.space(10)
+
+            PanelSectionHeader {
+              text: "EXIT NODES"
+              foreground: root.foreground
+              fontFamily: root.fontFamily
+            }
+
+            Column {
+              id: exitNodeColumn
+              width: parent.width
+              spacing: Style.space(6)
+
+              Repeater {
+                model: root.exitNodes
+                ExitNodeRow {
+                  required property var modelData
+                  required property int index
+                  width: exitNodeColumn.width
+                  peer: modelData
+                  rowIndex: index
+                }
+              }
+
+              Column {
+                visible: root.mullvadPickerOpen
+                width: parent.width
+                spacing: Style.space(6)
+
+                TextField {
+                  id: mullvadSearch
+                  width: parent.width
+                  foreground: root.foreground
+                  placeholderText: "Search regions"
+                  text: root.mullvadQuery
+                  onTextChanged: {
+                    root.mullvadQuery = text
+                    root.mullvadRegionIndex = 0
+                  }
+                  onAccepted: {
+                    root.activateMullvadRegionCursor()
+                  }
+                  Keys.onPressed: function(event) {
+                    if (event.key === Qt.Key_Down || event.text === "j") {
+                      root.moveMullvadRegionCursor(1)
+                      event.accepted = true
+                      return
+                    }
+                    if (event.key === Qt.Key_Up || event.text === "k") {
+                      root.moveMullvadRegionCursor(-1)
+                      event.accepted = true
+                      return
+                    }
+                    if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+                      root.activateMullvadRegionCursor()
+                      event.accepted = true
+                      return
+                    }
+                    if (event.key === Qt.Key_Escape) {
+                      root.mullvadPickerOpen = false
+                      keyCatcher.forceActiveFocus()
+                      event.accepted = true
+                    }
+                  }
+                }
+
+                Text {
+                  visible: root.filteredMullvadRegions.length === 0
+                  width: parent.width
+                  text: "No Mullvad regions found."
+                  color: root.dim
+                  font.family: root.fontFamily
+                  font.pixelSize: Style.font.bodySmall
+                  horizontalAlignment: Text.AlignHCenter
+                }
+
+                Column {
+                  id: mullvadRegionColumn
+                  width: parent.width
+                  spacing: Style.space(6)
+
+                  Repeater {
+                    model: root.filteredMullvadRegions
+                    MullvadRegionRow {
+                      required property var modelData
+                      required property int index
+                      width: parent.width
+                      peer: modelData
+                      rowIndex: index
+                    }
+                  }
+                }
+              }
+            }
+          }
+
+          PanelSeparator {
+            visible: tailscale.installed && tailscale.running
+            foreground: root.foreground
+          }
+
+          Column {
+            visible: tailscale.installed && tailscale.running
+            width: parent.width
+            spacing: Style.space(10)
+
+            PanelSectionHeader {
+              text: "MACHINES"
+              foreground: root.foreground
+              fontFamily: root.fontFamily
+            }
+
+            Text {
+              visible: tailscale.installed && tailscale.running && tailscale.peers.length === 0
+              width: parent.width
+              text: "No machines found on this tailnet."
+              color: root.dim
+              font.family: root.fontFamily
+              font.pixelSize: Style.font.body
+              horizontalAlignment: Text.AlignHCenter
+            }
+
+            Column {
+              id: peerColumn
+              visible: root.showPeers
+              width: parent.width
+              spacing: Style.space(6)
+
+              Repeater {
+                model: tailscale.peers
+                PeerRow {
+                  required property var modelData
+                  required property int index
+                  width: peerColumn.width
+                  peer: modelData
+                  rowIndex: index
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  Timer {
+    id: phraseTimer
+    interval: 2800
+    running: root.opened
+    repeat: true
+    onTriggered: phraseSwap.restart()
+  }
+
+  SequentialAnimation {
+    id: phraseSwap
+    PropertyAnimation {
+      target: hero; property: "metaOpacity"
+      to: 0.0; duration: 180; easing.type: Easing.OutQuad
+    }
+    ScriptAction {
+      script: root.phraseIndex = (root.phraseIndex + 1) % root.activePhrases.length
+    }
+    PropertyAnimation {
+      target: hero; property: "metaOpacity"
+      to: 1.0; duration: 260; easing.type: Easing.InQuad
+    }
+  }
+
+  component AuthRow: CursorSurface {
+    id: authRow
+
+    hasCursor: root.cursorActive && root.focusSection === "auth"
+    foreground: root.foreground
+
+    implicitHeight: row.implicitHeight + Style.spacing.rowPaddingX
+
+    MouseArea {
+      anchors.fill: parent
+      hoverEnabled: true
+      cursorShape: tailscale.busy ? Qt.ArrowCursor : Qt.PointingHandCursor
+      enabled: !tailscale.busy
+      onEntered: root.setAuthCursor()
+      onClicked: tailscale.authorizeTailscaleOperator()
+    }
+
+    RowLayout {
+      id: row
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(10)
+      anchors.rightMargin: Style.space(10)
+      spacing: Style.space(8)
+
+      Text {
+        text: "󰒃"
+        color: root.dim
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.heading
+        Layout.alignment: Qt.AlignVCenter
+      }
+
+      ColumnLayout {
+        Layout.fillWidth: true
+        spacing: Style.space(1)
+
+        Text {
+          Layout.fillWidth: true
+          text: "Authorize Tailscale operator"
+          color: root.foreground
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.body
+          elide: Text.ElideRight
+        }
+
+        Text {
+          Layout.fillWidth: true
+          text: "Allow this user to operate this Tailscale profile"
+          color: root.dim
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.caption
+          elide: Text.ElideRight
+        }
+      }
+
+    }
+  }
+
+  component AccountRow: CursorSurface {
+    id: accountRow
+    property var account: null
+    property int rowIndex: 0
+    readonly property bool selectedAccount: account && account.selected === true
+    readonly property bool switchingAccount: account && tailscale.switchingAccountId === String(account.id || "")
+    readonly property string accountText: account ? tailscale.accountLabel(account) : "Account"
+
+    hasCursor: root.cursorActive && root.focusSection === "accounts" && root.accountIndex === rowIndex
+    current: selectedAccount
+    foreground: root.foreground
+    fill: root.hoverFill
+    currentFill: root.selectedFill
+
+    implicitHeight: accountInner.implicitHeight + Style.spacing.xl
+
+    Row {
+      id: accountInner
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(6)
+      anchors.rightMargin: Style.space(6)
+      spacing: Style.space(8)
+
+      Text {
+        id: accountGlyph
+        text: ""
+        color: accountRow.selectedAccount || accountRow.switchingAccount ? root.foreground : root.dim
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        width: Style.space(22)
+        horizontalAlignment: Text.AlignHCenter
+        anchors.verticalCenter: parent.verticalCenter
+        opacity: accountRow.switchingAccount ? 0.45 : 1.0
+
+        SequentialAnimation on opacity {
+          running: accountRow.switchingAccount
+          NumberAnimation { to: 1.0; duration: 420; easing.type: Easing.InOutQuad }
+          NumberAnimation { to: 0.45; duration: 420; easing.type: Easing.InOutQuad }
+          loops: Animation.Infinite
+        }
+      }
+
+      Text {
+        text: accountRow.accountText
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        font.bold: accountRow.selectedAccount
+        elide: Text.ElideRight
+        width: parent.width - Style.space(22) - Style.space(8)
+        anchors.verticalCenter: parent.verticalCenter
+      }
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      hoverEnabled: true
+      cursorShape: Qt.PointingHandCursor
+      onEntered: root.setAccountCursor(accountRow.rowIndex)
+      onClicked: if (accountRow.account) tailscale.switchAccount(accountRow.account.id)
+    }
+  }
+
+  component PeerRow: CursorSurface {
+    id: peerRow
+    property var peer: null
+    property int rowIndex: 0
+    readonly property string peerName: peer ? String(peer.DisplayName || peer.HostName || "Unknown") : "Unknown"
+    readonly property string peerIp: peer && peer.TailscaleIPs && peer.TailscaleIPs.length > 0 ? String(peer.TailscaleIPs[0]) : ""
+    readonly property string peerIpv6: {
+      if (!peer || !peer.TailscaleIPv6 || peer.TailscaleIPv6.length === 0) return ""
+      return String(peer.TailscaleIPv6[0] || "")
+    }
+    readonly property string peerDns: peer ? String(peer.DNSName || "") : ""
+    readonly property var copyOptions: {
+      var options = []
+      if (peerName !== "") options.push({ kind: "name", label: peerName })
+      if (peerDns !== "") options.push({ kind: "dns", label: peerDns })
+      if (peerIpv6 !== "") options.push({ kind: "ipv6", label: peerIpv6 })
+      if (peerIp !== "") options.push({ kind: "ip", label: peerIp })
+      return options
+    }
+    property int copyIndex: 0
+
+    hasCursor: root.cursorActive && root.focusSection === "peers" && root.peerIndex === rowIndex
+    foreground: root.foreground
+
+    implicitHeight: Math.max(peerContent.implicitHeight, copyButton.implicitHeight) + Style.spacing.rowPaddingX
+
+    function clampCopyIndex() {
+      copyIndex = Math.max(0, Math.min(copyIndex, copyOptions.length - 1))
+    }
+
+    function openCopyMenu() {
+      if (copyOptions.length === 0) return
+      clampCopyIndex()
+      copyPopup.open()
+    }
+
+    function moveCopyCursor(delta) {
+      if (copyOptions.length === 0) return
+      copyIndex = Math.max(0, Math.min(copyOptions.length - 1, copyIndex + delta))
+    }
+
+    function copyOption(kind) {
+      if (kind === "name") tailscale.copyPeerName(peer)
+      else if (kind === "dns") tailscale.copyPeerDnsName(peer)
+      else if (kind === "ipv6") tailscale.copyToClipboard(peerIpv6, peerName + " IPv6")
+      else if (kind === "ip") tailscale.copyPeerIp(peer)
+      copyPopup.close()
+    }
+
+    function copyCurrentOption() {
+      clampCopyIndex()
+      if (copyOptions.length === 0) return
+      copyOption(copyOptions[copyIndex].kind)
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      acceptedButtons: Qt.LeftButton
+      hoverEnabled: true
+      cursorShape: Qt.ArrowCursor
+      onContainsMouseChanged: if (containsMouse) root.setPeerCursor(peerRow.rowIndex)
+    }
+
+    RowLayout {
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(10)
+      anchors.rightMargin: Style.space(8)
+      spacing: Style.space(8)
+
+      Text {
+        text: tailscale.osIcon(peer ? peer.OS : "")
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.icon
+        Layout.alignment: Qt.AlignVCenter
+      }
+
+      ColumnLayout {
+        id: peerContent
+        Layout.fillWidth: true
+        spacing: Style.space(1)
+
+        Text {
+          Layout.fillWidth: true
+          text: peerRow.peerName
+          color: root.foreground
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.body
+          elide: Text.ElideRight
+        }
+
+        Text {
+          Layout.fillWidth: true
+          text: {
+            var parts = []
+            if (peerRow.peerIp !== "") parts.push(peerRow.peerIp)
+            if (peerRow.peerDns !== "") parts.push(peerRow.peerDns)
+            return parts.join(" · ")
+          }
+          color: root.dim
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.caption
+          elide: Text.ElideRight
+        }
+      }
+
+      PanelActionButton {
+        id: copyButton
+        iconText: "󰆏"
+        foreground: root.foreground
+        fontFamily: root.fontFamily
+        enabled: peerRow.peerIp !== "" || peerRow.peerName !== "" || peerRow.peerDns !== "" || peerRow.peerIpv6 !== ""
+        Layout.alignment: Qt.AlignVCenter
+        onClicked: peerRow.openCopyMenu()
+      }
+
+      Popup {
+        id: copyPopup
+        x: copyButton.x + copyButton.width - width
+        y: copyButton.y + copyButton.height + Style.space(4)
+        width: Style.space(280)
+        padding: 0
+        modal: false
+        focus: true
+        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
+        function handleKey(event) {
+          if (event.key === Qt.Key_Escape) {
+            close()
+            event.accepted = true
+            return
+          }
+          if (event.key === Qt.Key_Down || event.text === "j") {
+            peerRow.moveCopyCursor(1)
+            event.accepted = true
+            return
+          }
+          if (event.key === Qt.Key_Up || event.text === "k") {
+            peerRow.moveCopyCursor(-1)
+            event.accepted = true
+            return
+          }
+          if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter || event.key === Qt.Key_Space) {
+            peerRow.copyCurrentOption()
+            event.accepted = true
+          }
+        }
+        onOpenedChanged: {
+          root.copyMenuOpen = opened
+          if (opened) {
+            peerRow.clampCopyIndex()
+            Qt.callLater(function() { copyPopupContent.forceActiveFocus() })
+          } else if (root.opened) {
+            Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+          }
+        }
+        background: BorderSurface {
+          color: Color.background
+          borderSpec: Border.flat(root.dim, 1)
+          radius: Style.cornerRadius
+        }
+
+        contentItem: Column {
+          id: copyPopupContent
+          width: parent.width
+          focus: true
+          Keys.priority: Keys.BeforeItem
+          Keys.onPressed: function(event) { copyPopup.handleKey(event) }
+
+          Repeater {
+            model: peerRow.copyOptions
+            CopyChoice {
+              required property var modelData
+              required property int index
+              width: parent.width
+              label: String(modelData.label || "")
+              selected: peerRow.copyIndex === index
+              onHovered: peerRow.copyIndex = index
+              onChosen: peerRow.copyOption(String(modelData.kind || ""))
+            }
+          }
+        }
+      }
+    }
+  }
+
+  component CopyChoice: CursorSurface {
+    id: copyChoice
+    signal chosen()
+    signal hovered()
+    property string label: ""
+    property bool selected: false
+
+    visible: enabled
+    foreground: root.foreground
+    hasCursor: selected
+    implicitHeight: Style.space(48)
+    radius: 0
+
+    MouseArea {
+      anchors.fill: parent
+      hoverEnabled: true
+      cursorShape: Qt.PointingHandCursor
+      onEntered: copyChoice.hovered()
+      onClicked: copyChoice.chosen()
+    }
+
+    RowLayout {
+      anchors.fill: parent
+      anchors.leftMargin: Style.space(12)
+      anchors.rightMargin: Style.space(12)
+      spacing: Style.space(10)
+
+      Text {
+        Layout.fillWidth: true
+        text: copyChoice.label
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        elide: Text.ElideRight
+      }
+
+      Text {
+        text: "󰆏"
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.icon
+        Layout.alignment: Qt.AlignVCenter
+      }
+    }
+  }
+
+  component ExitNodeRow: CursorSurface {
+    id: exitNodeRow
+    property var peer: null
+    property int rowIndex: 0
+    readonly property bool addMullvad: peer && peer.AddMullvad === true
+    readonly property bool activeExitNode: peer && peer.ExitNode === true
+    readonly property bool settingExitNode: peer && tailscale.settingExitNodeId === String(peer.id || "")
+    readonly property string peerName: peer ? String(peer.DisplayName || peer.HostName || "Unknown") : "Unknown"
+    readonly property string actionTooltip: addMullvad ? "" : (activeExitNode ? "Disconnect" : "Connect")
+
+    hasCursor: root.cursorActive && root.focusSection === "exitNodes" && root.exitNodeIndex === rowIndex
+    current: activeExitNode || settingExitNode || (addMullvad && root.mullvadPickerOpen)
+    foreground: root.foreground
+    fill: root.hoverFill
+    currentFill: root.selectedFill
+
+    implicitHeight: exitNodeInner.implicitHeight + Style.spacing.xl
+
+    Row {
+      id: exitNodeInner
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(6)
+      anchors.rightMargin: Style.space(6)
+      spacing: Style.space(8)
+
+      Text {
+        id: exitNodeGlyph
+        text: exitNodeRow.addMullvad ? "+" : (peer && peer.Mullvad === true ? "󰖂" : "󱇢")
+        color: exitNodeRow.activeExitNode || exitNodeRow.settingExitNode || exitNodeRow.addMullvad ? root.foreground : root.dim
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        width: Style.space(22)
+        horizontalAlignment: Text.AlignHCenter
+        anchors.verticalCenter: parent.verticalCenter
+
+        NumberAnimation on rotation {
+          running: exitNodeRow.settingExitNode
+          from: 0
+          to: 360
+          duration: 900
+          loops: Animation.Infinite
+        }
+
+        onRotationChanged: if (!exitNodeRow.settingExitNode && rotation !== 0) rotation = 0
+      }
+
+      Text {
+        text: exitNodeRow.peerName
+        color: root.foreground
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        font.bold: exitNodeRow.activeExitNode
+        elide: Text.ElideRight
+        width: parent.width - Style.space(22) - Style.space(8)
+        anchors.verticalCenter: parent.verticalCenter
+      }
+    }
+
+    MouseArea {
+      id: exitNodeMouse
+      anchors.fill: parent
+      hoverEnabled: true
+      cursorShape: Qt.PointingHandCursor
+      onEntered: root.setExitNodeCursor(exitNodeRow.rowIndex)
+      onClicked: root.chooseExitNode(exitNodeRow.peer)
+    }
+
+    PanelToolTip {
+      visible: exitNodeRow.actionTooltip !== "" && exitNodeMouse.containsMouse
+      text: exitNodeRow.actionTooltip
+      fontFamily: root.fontFamily
+    }
+  }
+
+  component MullvadRegionRow: CursorSurface {
+    id: regionRow
+
+    property var peer: null
+    property int rowIndex: 0
+    readonly property string regionName: root.mullvadRegionTitle(peer)
+    readonly property string regionDetail: root.mullvadRegionSubtitle(peer)
+    readonly property bool activeExitNode: peer && peer.ExitNode === true
+    readonly property bool settingExitNode: peer && tailscale.settingExitNodeId === String(peer.id || "")
+    readonly property bool selectedRegion: root.mullvadPickerOpen && root.mullvadRegionIndex === rowIndex
+    readonly property string actionTooltip: activeExitNode ? "Disconnect" : "Connect"
+
+    foreground: root.foreground
+    fill: root.hoverFill
+    currentFill: root.selectedFill
+    current: activeExitNode || settingExitNode || selectedRegion
+    implicitHeight: row.implicitHeight + Style.spacing.lg
+
+    Row {
+      id: row
+      anchors.left: parent.left
+      anchors.right: parent.right
+      anchors.verticalCenter: parent.verticalCenter
+      anchors.leftMargin: Style.space(6)
+      anchors.rightMargin: Style.space(6)
+      spacing: Style.space(8)
+
+      Text {
+        text: "󰖂"
+        color: regionRow.current ? root.foreground : root.dim
+        font.family: root.fontFamily
+        font.pixelSize: Style.font.body
+        width: Style.space(22)
+        horizontalAlignment: Text.AlignHCenter
+        anchors.verticalCenter: parent.verticalCenter
+      }
+
+      Column {
+        width: parent.width - Style.space(30)
+        anchors.verticalCenter: parent.verticalCenter
+        spacing: Style.space(1)
+
+        Text {
+          width: parent.width
+          text: regionRow.regionName
+          color: root.foreground
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.body
+          font.bold: regionRow.activeExitNode
+          elide: Text.ElideRight
+        }
+
+        Text {
+          width: parent.width
+          text: regionRow.regionDetail
+          visible: text !== ""
+          color: root.dim
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.caption
+          elide: Text.ElideRight
+        }
+      }
+    }
+
+    MouseArea {
+      id: regionMouse
+      anchors.fill: parent
+      hoverEnabled: true
+      cursorShape: Qt.PointingHandCursor
+      onEntered: root.mullvadRegionIndex = regionRow.rowIndex
+      onClicked: root.chooseExitNode(regionRow.peer)
+    }
+
+    PanelToolTip {
+      visible: regionMouse.containsMouse
+      text: regionRow.actionTooltip
+      fontFamily: root.fontFamily
+    }
+  }
+}
diff --git a/shell/plugins/panels/tailscale/README.md b/shell/plugins/panels/tailscale/README.md
new file mode 100644
index 00000000..955759e7
--- /dev/null
+++ b/shell/plugins/panels/tailscale/README.md
@@ -0,0 +1,38 @@
+# Tailscale Omarchy Widget
+
+Native Omarchy bar widget for Tailscale.
+
+## Features
+
+- Shows Tailscale connection state in the bar
+- Left click opens a keyboard-friendly panel
+- Right click toggles Tailscale on/off
+- Switch between available Tailscale connections when multiple are available
+- Browse machines from `tailscale status --json`
+- Copy a machine's Tailscale IP, host name, or DNS name
+
+## Keyboard shortcuts
+
+Inside the panel:
+
+- `j` / `k` or arrows: move cursor
+- `enter` / `space`: activate current row
+- `c`: copy selected peer IP
+- `n`: copy selected peer name
+- `d`: copy selected peer DNS name
+- `t`: toggle Tailscale
+- `r`: refresh status
+- `esc`: close
+
+## Requirements
+
+- `tailscale` CLI on `PATH`
+- `wl-copy` for clipboard copy actions
+
+## Icon
+
+Renders the Tailscale mark natively as a theme-colored 3×3 dot grid, matching the official SVG silhouette while avoiding tiny-SVG rendering quirks in the bar.
+
+## Add to the bar
+
+This widget ships as first-party plugin `omarchy.tailscale`. Add it with `omarchy plugin bar add omarchy.tailscale`, or add an entry such as `{ "id": "omarchy.tailscale" }` to one of the `bar.layout` sections in `~/.config/omarchy/shell.json`; the shell reloads `shell.json` automatically.
diff --git a/shell/plugins/panels/tailscale/Service.qml b/shell/plugins/panels/tailscale/Service.qml
new file mode 100644
index 00000000..820d3b48
--- /dev/null
+++ b/shell/plugins/panels/tailscale/Service.qml
@@ -0,0 +1,544 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import "Model.js" as Model
+
+Item {
+  id: root
+
+  property var settings: ({})
+
+  property bool installed: false
+  property bool running: false
+  property bool needsLogin: false
+  property bool refreshing: false
+  property string backendState: "Unknown"
+  property string statusText: "Checking…"
+  property string selfName: ""
+  property string selfDnsName: ""
+  property string selfIp: ""
+  property string authUrl: ""
+  property var peers: []
+  property var exitNodes: []
+  property var tailnetExitNodes: []
+  property var mullvadExitNodes: []
+  property var mullvadRegions: []
+  property var accounts: []
+  property string selectedAccountId: ""
+  property string selectedAccountLabel: ""
+  property string switchingAccountId: ""
+  property string settingExitNodeId: ""
+  property bool accountsAccessDenied: false
+  property string actionStatus: ""
+  property string lastError: ""
+
+  readonly property int refreshIntervalSec: intSetting("refreshIntervalSec", 30, 5, 3600)
+  readonly property bool busy: whichProcess.running || statusProcess.running || mullvadExitNodesProcess.running || accountsProcess.running || actionProcess.running || loginProcess.running || switchProcess.running || operatorProcess.running || exitNodeProcess.running
+  readonly property string userName: Quickshell.env("USER") || Quickshell.env("LOGNAME")
+
+  property string _statusOutput: ""
+  property string _statusError: ""
+  property string _accountsOutput: ""
+  property string _accountsError: ""
+  property string _mullvadExitNodesOutput: ""
+  property string _mullvadExitNodesError: ""
+  property string _actionOutput: ""
+  property string _actionError: ""
+  property string _loginOutput: ""
+  property string _loginError: ""
+  property bool _loginInProgress: false
+  property bool _loginUrlOpened: false
+  property string _preLoginAuthUrl: ""
+  property double _lastAccountsRefreshMs: 0
+  property string _switchOutput: ""
+  property string _switchError: ""
+  property string _exitNodeOutput: ""
+  property string _exitNodeError: ""
+  property string _operatorOutput: ""
+  property string _operatorError: ""
+
+  function setting(name, fallback) {
+    var value = settings ? settings[name] : undefined
+    return value === undefined || value === null ? fallback : value
+  }
+
+  function intSetting(name, fallback, min, max) {
+    var n = parseInt(String(setting(name, fallback)), 10)
+    if (!isFinite(n)) n = fallback
+    if (n < min) n = min
+    if (n > max) n = max
+    return n
+  }
+
+  function filterIPv4(ips) {
+    return Model.filterIPv4(ips)
+  }
+
+  function cleanDnsName(name) {
+    return Model.cleanDnsName(name)
+  }
+
+  function shortDnsName(name) {
+    return Model.shortDnsName(name)
+  }
+
+  function displayHostName(hostName, dnsName) {
+    return Model.displayHostName(hostName, dnsName)
+  }
+
+  function osIcon(os) {
+    return Model.osIcon(os)
+  }
+
+  function accountLabel(account) {
+    return Model.accountLabel(account)
+  }
+
+  function copyToClipboard(value, label) {
+    var text = String(value || "")
+    if (text === "") return
+    Quickshell.execDetached(["bash", "-c", "printf %s " + Util.shellQuote(text) + " | wl-copy"])
+  }
+
+  function copyPeerIp(peer) {
+    if (!peer) return
+    var ips = filterIPv4(peer.TailscaleIPs || [])
+    copyToClipboard(ips.length > 0 ? ips[0] : "", displayHostName(peer.HostName, peer.DNSName) + " IP")
+  }
+
+  function copyPeerName(peer) {
+    if (!peer) return
+    copyToClipboard(displayHostName(peer.HostName, peer.DNSName), displayHostName(peer.HostName, peer.DNSName) + " name")
+  }
+
+  function copyPeerDnsName(peer) {
+    if (!peer) return
+    copyToClipboard(cleanDnsName(peer.DNSName), displayHostName(peer.HostName, peer.DNSName) + " DNS name")
+  }
+
+  function refresh(forceAccounts) {
+    if (installed) {
+      refreshStatusAndAccounts(forceAccounts === true)
+      return
+    }
+    if (!whichProcess.running) {
+      refreshing = true
+      whichProcess.command = ["which", "tailscale"]
+      whichProcess.running = true
+    }
+  }
+
+  function refreshStatusAndAccounts(forceAccounts) {
+    if (!installed) return
+    if (!statusProcess.running) {
+      _statusOutput = ""
+      _statusError = ""
+      refreshing = true
+      statusProcess.command = ["tailscale", "status", "--json"]
+      statusProcess.running = true
+    }
+    if (!mullvadExitNodesProcess.running) {
+      _mullvadExitNodesOutput = ""
+      _mullvadExitNodesError = ""
+      mullvadExitNodesProcess.command = ["tailscale", "exit-node", "list"]
+      mullvadExitNodesProcess.running = true
+    }
+    var now = Date.now()
+    var shouldRefreshAccounts = forceAccounts === true || accounts.length === 0 || now - _lastAccountsRefreshMs > 60000
+    if (shouldRefreshAccounts && !accountsProcess.running) {
+      _accountsOutput = ""
+      _accountsError = ""
+      _lastAccountsRefreshMs = now
+      accountsProcess.command = ["tailscale", "switch", "--list", "--json"]
+      accountsProcess.running = true
+    }
+  }
+
+  function elideStatus(text) {
+    var value = String(text || "").replace(/\s+/g, " ").trim()
+    return value.length > 140 ? value.substring(0, 137) + "…" : value
+  }
+
+  function resetUnavailable(message) {
+    running = false
+    needsLogin = false
+    backendState = "Unavailable"
+    statusText = message
+    selfName = ""
+    selfDnsName = ""
+    selfIp = ""
+    authUrl = ""
+    peers = []
+    exitNodes = []
+    tailnetExitNodes = []
+    mullvadExitNodes = []
+    mullvadRegions = []
+    accounts = []
+    selectedAccountId = ""
+    selectedAccountLabel = ""
+    switchingAccountId = ""
+    settingExitNodeId = ""
+    accountsAccessDenied = false
+  }
+
+  function parseStatus(raw) {
+    var parsed = Model.parseStatus(raw)
+    if (!parsed.ok) {
+      resetUnavailable(parsed.message || "Status error")
+      lastError = parsed.error || "Failed to parse tailscale status"
+      console.warn("tailscale", lastError)
+      return
+    }
+    if (parsed.unavailable) {
+      resetUnavailable(parsed.message || "Disconnected")
+      return
+    }
+
+    backendState = parsed.backendState
+    running = parsed.running
+    needsLogin = parsed.needsLogin
+    authUrl = parsed.authUrl
+    if (needsLogin && _loginInProgress && !_loginUrlOpened && authUrl !== "" && authUrl !== _preLoginAuthUrl) openAuthUrlFrom(authUrl, false)
+    selfName = parsed.selfName
+    selfDnsName = parsed.selfDnsName
+    selfIp = parsed.selfIp
+    peers = parsed.running ? parsed.peers : []
+    tailnetExitNodes = parsed.running ? parsed.exitNodes : []
+    exitNodes = parsed.running ? tailnetExitNodes.concat(mullvadRegions) : []
+
+    if (needsLogin) statusText = "Needs login"
+    else if (running) {
+      statusText = "Connected"
+      _loginInProgress = false
+      _loginUrlOpened = false
+      _preLoginAuthUrl = ""
+      loginTimeoutTimer.stop()
+    } else if (backendState === "Stopped") {
+      statusText = "Disconnected"
+    } else {
+      statusText = backendState
+    }
+    lastError = ""
+  }
+
+  function parseAccounts(raw) {
+    var parsed = Model.parseAccounts(raw)
+    accounts = parsed.accounts
+    selectedAccountId = parsed.selectedAccountId
+    selectedAccountLabel = parsed.selectedAccountLabel
+    accountsAccessDenied = false
+  }
+
+  function parseMullvadExitNodes(raw) {
+    mullvadExitNodes = Model.parseExitNodeList(raw)
+    mullvadRegions = Model.mullvadRegionOptions(mullvadExitNodes)
+    exitNodes = running ? tailnetExitNodes.concat(mullvadRegions) : []
+  }
+
+  function toggleTailscale() {
+    if (!installed) return
+    if (running) runAction(["tailscale", "down"], "Turning Tailscale off…")
+    else loginOrUp()
+  }
+
+  function loginOrUp() {
+    if (!installed || loginProcess.running) return
+    _loginOutput = ""
+    _loginError = ""
+    actionStatus = needsLogin ? "Starting Tailscale login…" : "Turning Tailscale on…"
+    _loginInProgress = needsLogin
+    _loginUrlOpened = false
+    _preLoginAuthUrl = authUrl
+    var command = ["tailscale", "up"]
+    if (needsLogin) command.push("--force-reauth")
+    loginProcess.command = command
+    loginProcess.running = true
+    if (needsLogin) loginTimeoutTimer.restart()
+  }
+
+  function switchAccount(id) {
+    var accountId = String(id || "")
+    if (!installed || accountId === "" || accountId === selectedAccountId || switchProcess.running) return
+    _switchOutput = ""
+    _switchError = ""
+    switchingAccountId = accountId
+    switchProcess.command = ["tailscale", "switch", accountId]
+    switchProcess.running = true
+  }
+
+  function exitNodeTarget(peer) {
+    if (!peer) return ""
+    if (peer.Mullvad === true) {
+      var mullvadIps = filterIPv4(peer.TailscaleIPs || [])
+      if (mullvadIps.length > 0) return mullvadIps[0]
+    }
+    if (peer.DNSName) return cleanDnsName(peer.DNSName)
+    if (peer.HostName) return String(peer.HostName)
+    var ips = filterIPv4(peer.TailscaleIPs || [])
+    return ips.length > 0 ? ips[0] : ""
+  }
+
+  function setExitNode(peer) {
+    if (!installed || !running || !peer || exitNodeProcess.running) return
+    var active = peer.ExitNode === true
+    var target = active ? "" : exitNodeTarget(peer)
+    if (!active && target === "") return
+    _exitNodeOutput = ""
+    _exitNodeError = ""
+    settingExitNodeId = String(peer.id || "")
+    exitNodeProcess.command = ["tailscale", "set", "--exit-node=" + target]
+    exitNodeProcess.running = true
+  }
+
+  function authorizeTailscaleOperator() {
+    if (!installed || operatorProcess.running || userName === "") return
+    _operatorOutput = ""
+    _operatorError = ""
+    actionStatus = "Authorizing Tailscale operator..."
+    operatorProcess.command = ["pkexec", "tailscale", "set", "--operator=" + userName]
+    operatorProcess.running = true
+  }
+
+  function runAction(command, label) {
+    if (actionProcess.running) return
+    _actionOutput = ""
+    _actionError = ""
+    actionStatus = label || "Working…"
+    actionProcess.command = command
+    actionProcess.running = true
+  }
+
+  function openAuthUrlFrom(text, allowFallback) {
+    if (_loginUrlOpened) return true
+    var match = String(text || "").match(/https?:\/\/\S+/)
+    var url = match && match[0] ? match[0] : (allowFallback === true ? authUrl : "")
+    if (url !== "") {
+      _loginUrlOpened = true
+      _loginInProgress = false
+      loginTimeoutTimer.stop()
+      Qt.openUrlExternally(url)
+      actionStatus = "Opened login link"
+      actionStatusTimer.restart()
+      return true
+    }
+    return false
+  }
+
+  function handleLoginOutput(data, isError) {
+    var text = String(data || "")
+    if (isError) _loginError += text + "\n"
+    else _loginOutput += text + "\n"
+    if (_loginInProgress && !_loginUrlOpened) openAuthUrlFrom(text, false)
+  }
+
+  Timer {
+    id: refreshTimer
+    interval: root.refreshIntervalSec * 1000
+    repeat: true
+    running: true
+    triggeredOnStart: true
+    onTriggered: root.refresh()
+  }
+
+  Timer {
+    id: delayedRefresh
+    interval: 600
+    repeat: false
+    onTriggered: root.refresh()
+  }
+
+  Timer {
+    id: actionStatusTimer
+    interval: 2200
+    repeat: false
+    onTriggered: root.actionStatus = ""
+  }
+
+  Timer {
+    id: loginTimeoutTimer
+    interval: 10000
+    repeat: false
+    onTriggered: {
+      if (!root._loginInProgress || root._loginUrlOpened) return
+      if (!root.openAuthUrlFrom(root.authUrl, true)) {
+        root._loginInProgress = false
+        root.actionStatus = "Tailscale login link not available yet"
+      }
+    }
+  }
+
+  Process {
+    id: whichProcess
+    running: false
+    command: []
+    onExited: function(exitCode) {
+      root.installed = exitCode === 0
+      if (root.installed) root.refreshStatusAndAccounts()
+      else {
+        root.refreshing = false
+        root.resetUnavailable("Not installed")
+      }
+    }
+  }
+
+  Process {
+    id: statusProcess
+    running: false
+    command: []
+    stdout: StdioCollector { id: statusStdout; waitForEnd: true; onStreamFinished: root._statusOutput = text }
+    stderr: StdioCollector { id: statusStderr; waitForEnd: true; onStreamFinished: root._statusError = text }
+    onExited: function(exitCode) {
+      root.refreshing = false
+      var stdout = String(statusStdout.text || root._statusOutput || "")
+      var stderr = String(statusStderr.text || root._statusError || "")
+      if (exitCode === 0) root.parseStatus(stdout)
+      else {
+        root.resetUnavailable("Disconnected")
+        root.lastError = stderr.trim()
+      }
+    }
+  }
+
+  Process {
+    id: accountsProcess
+    running: false
+    command: []
+    stdout: StdioCollector { id: accountsStdout; waitForEnd: true; onStreamFinished: root._accountsOutput = text }
+    stderr: StdioCollector { id: accountsStderr; waitForEnd: true; onStreamFinished: root._accountsError = text }
+    onExited: function(exitCode) {
+      var stdout = String(accountsStdout.text || root._accountsOutput || "")
+      var stderr = String(accountsStderr.text || root._accountsError || "")
+      if (exitCode === 0) root.parseAccounts(stdout)
+      else {
+        root.parseAccounts("")
+        if (/profiles access denied/i.test(stderr) || /profiles access denied/i.test(stdout)) {
+          root.accountsAccessDenied = true
+          root.lastError = "Authorize Tailscale operator to show connections"
+        } else {
+          root.lastError = elideStatus(stderr || stdout || "Could not list Tailscale connections")
+        }
+      }
+    }
+  }
+
+  Process {
+    id: mullvadExitNodesProcess
+    running: false
+    command: []
+    stdout: StdioCollector { id: mullvadExitNodesStdout; waitForEnd: true; onStreamFinished: root._mullvadExitNodesOutput = text }
+    stderr: StdioCollector { id: mullvadExitNodesStderr; waitForEnd: true; onStreamFinished: root._mullvadExitNodesError = text }
+    onExited: function(exitCode) {
+      var stdout = String(mullvadExitNodesStdout.text || root._mullvadExitNodesOutput || "")
+      if (exitCode === 0) root.parseMullvadExitNodes(stdout)
+      else root.parseMullvadExitNodes("")
+    }
+  }
+
+  Process {
+    id: actionProcess
+    running: false
+    command: []
+    stdout: StdioCollector { id: actionStdout; waitForEnd: true; onStreamFinished: root._actionOutput = text }
+    stderr: StdioCollector { id: actionStderr; waitForEnd: true; onStreamFinished: root._actionError = text }
+    onExited: function(exitCode) {
+      var stdout = String(actionStdout.text || root._actionOutput || "")
+      var stderr = String(actionStderr.text || root._actionError || "")
+      if (exitCode !== 0) {
+        root.lastError = elideStatus(stderr || stdout || "Tailscale command failed")
+        root.actionStatus = root.lastError
+      } else {
+        root.lastError = ""
+        root.actionStatus = ""
+      }
+      delayedRefresh.restart()
+    }
+  }
+
+  Process {
+    id: loginProcess
+    running: false
+    command: []
+    stdout: SplitParser { onRead: function(data) { root.handleLoginOutput(data, false) } }
+    stderr: SplitParser { onRead: function(data) { root.handleLoginOutput(data, true) } }
+    onExited: function(exitCode) {
+      var combined = String(root._loginOutput || "") + "\n" + String(root._loginError || "")
+      var opened = root.openAuthUrlFrom(combined, true)
+      if (exitCode !== 0 && !opened) {
+        root._loginInProgress = false
+        root.lastError = elideStatus(combined || "tailscale up failed")
+        root.actionStatus = root.lastError
+      } else if (!opened) {
+        root.lastError = ""
+        root.actionStatus = ""
+      }
+      delayedRefresh.restart()
+    }
+  }
+
+  Process {
+    id: switchProcess
+    running: false
+    command: []
+    stdout: StdioCollector { id: switchStdout; waitForEnd: true; onStreamFinished: root._switchOutput = text }
+    stderr: StdioCollector { id: switchStderr; waitForEnd: true; onStreamFinished: root._switchError = text }
+    onExited: function(exitCode) {
+      var stdout = String(switchStdout.text || root._switchOutput || "")
+      var stderr = String(switchStderr.text || root._switchError || "")
+      if (exitCode !== 0) {
+        root.lastError = elideStatus(stderr || stdout || "Account switch failed")
+        root.actionStatus = root.lastError
+      } else {
+        root.lastError = ""
+        root.actionStatus = ""
+        root._lastAccountsRefreshMs = 0
+      }
+      root.switchingAccountId = ""
+      delayedRefresh.restart()
+    }
+  }
+
+  Process {
+    id: exitNodeProcess
+    running: false
+    command: []
+    stdout: StdioCollector { id: exitNodeStdout; waitForEnd: true; onStreamFinished: root._exitNodeOutput = text }
+    stderr: StdioCollector { id: exitNodeStderr; waitForEnd: true; onStreamFinished: root._exitNodeError = text }
+    onExited: function(exitCode) {
+      var stdout = String(exitNodeStdout.text || root._exitNodeOutput || "")
+      var stderr = String(exitNodeStderr.text || root._exitNodeError || "")
+      if (exitCode !== 0) {
+        root.lastError = elideStatus(stderr || stdout || "Exit node selection failed")
+        root.actionStatus = root.lastError
+      } else {
+        root.lastError = ""
+        root.actionStatus = ""
+      }
+      root.settingExitNodeId = ""
+      delayedRefresh.restart()
+    }
+  }
+
+  Process {
+    id: operatorProcess
+    running: false
+    command: []
+    stdout: StdioCollector { id: operatorStdout; waitForEnd: true; onStreamFinished: root._operatorOutput = text }
+    stderr: StdioCollector { id: operatorStderr; waitForEnd: true; onStreamFinished: root._operatorError = text }
+    onExited: function(exitCode) {
+      var stdout = String(operatorStdout.text || root._operatorOutput || "")
+      var stderr = String(operatorStderr.text || root._operatorError || "")
+      if (exitCode !== 0) {
+        root.lastError = elideStatus(stderr || stdout || "Tailscale authorization failed")
+        root.actionStatus = root.lastError
+      } else {
+        root.accountsAccessDenied = false
+        root.lastError = ""
+        root.actionStatus = "Tailscale operator authorized"
+        actionStatusTimer.restart()
+        root._lastAccountsRefreshMs = 0
+      }
+      delayedRefresh.restart()
+    }
+  }
+}
diff --git a/shell/plugins/panels/tailscale/TailscaleIcon.qml b/shell/plugins/panels/tailscale/TailscaleIcon.qml
new file mode 100644
index 00000000..c8b25560
--- /dev/null
+++ b/shell/plugins/panels/tailscale/TailscaleIcon.qml
@@ -0,0 +1,72 @@
+import QtQuick
+import qs.Commons
+import qs.Ui
+
+Item {
+  id: root
+
+  property real iconSize: Style.font.icon
+  property color color: Color.foreground
+  property color badgeColor: Color.urgent
+  property bool crossed: false
+  property bool warning: false
+
+  width: iconSize
+  height: iconSize
+  implicitWidth: iconSize
+  implicitHeight: iconSize
+
+  readonly property real dotSize: Math.max(2, root.iconSize * 0.24)
+  readonly property real mid: (root.iconSize - dotSize) / 2
+  readonly property real end: root.iconSize - dotSize
+
+  // Native rendering of the Tailscale mark from the SVG: a 3×3 dot grid
+  // with the inactive dots faded. This avoids Qt SVG/effect rendering quirks
+  // in tiny bar slots while keeping the official silhouette.
+  Dot { x: 0; y: 0; opacity: 0.24 }
+  Dot { x: root.mid; y: 0; opacity: 0.24 }
+  Dot { x: root.end; y: 0; opacity: 0.24 }
+  Dot { x: 0; y: root.mid; opacity: 1.0 }
+  Dot { x: root.mid; y: root.mid; opacity: 1.0 }
+  Dot { x: root.end; y: root.mid; opacity: 1.0 }
+  Dot { x: 0; y: root.end; opacity: 0.24 }
+  Dot { x: root.mid; y: root.end; opacity: 1.0 }
+  Dot { x: root.end; y: root.end; opacity: 0.24 }
+
+  Rectangle {
+    visible: root.crossed
+    anchors.centerIn: parent
+    width: parent.width * 1.22
+    height: Math.max(2, parent.height * 0.14)
+    radius: height / 2
+    color: root.badgeColor
+    rotation: -45
+  }
+
+  BorderSurface {
+    visible: root.warning
+    width: Math.max(7, parent.width * 0.42)
+    height: width
+    radius: width / 2
+    color: root.badgeColor
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+    borderSpec: Border.flat(Color.popups.background, 1)
+
+    Text {
+      anchors.centerIn: parent
+      text: "!"
+      color: Color.background
+      font.family: Style.font.family
+      font.pixelSize: Math.max(6, parent.height * 0.72)
+      font.bold: true
+    }
+  }
+
+  component Dot: Rectangle {
+    width: root.dotSize
+    height: root.dotSize
+    radius: width / 2
+    color: root.color
+  }
+}
diff --git a/shell/plugins/panels/tailscale/manifest.json b/shell/plugins/panels/tailscale/manifest.json
new file mode 100644
index 00000000..c0ace7e5
--- /dev/null
+++ b/shell/plugins/panels/tailscale/manifest.json
@@ -0,0 +1,35 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.tailscale",
+  "name": "Tailscale",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "license": "MIT",
+  "description": "Tailscale status, connection switching, machine browsing, and quick copy actions in the Omarchy bar.",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "Panel.qml"
+  },
+  "barWidget": {
+    "displayName": "Tailscale",
+    "description": "Toggle Tailscale, switch connections, browse machines, and copy machine IPs or names.",
+    "category": "Network",
+    "allowMultiple": false,
+    "defaults": {
+      "refreshIntervalSec": 30
+    },
+    "schema": [
+      {
+        "key": "refreshIntervalSec",
+        "type": "integer",
+        "label": "Refresh interval (seconds)",
+        "min": 5,
+        "max": 3600,
+        "step": 5,
+        "defaultValue": 30
+      }
+    ]
+  }
+}
diff --git a/shell/plugins/panels/weather/BarWidget.qml b/shell/plugins/panels/weather/BarWidget.qml
new file mode 100644
index 00000000..c50b739c
--- /dev/null
+++ b/shell/plugins/panels/weather/BarWidget.qml
@@ -0,0 +1,63 @@
+import QtQuick
+import qs.Commons
+import qs.Ui
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.weather"
+
+  function injectPanel() {
+    var target = panelLoader.item
+    if (!target) return
+    if ("bar" in target) target.bar = root.bar
+    if ("settings" in target) target.settings = root.settings
+    if ("anchorItem" in target) target.anchorItem = button
+  }
+
+  function refresh() {
+    if (panelLoader.item && panelLoader.item.refresh) panelLoader.item.refresh()
+  }
+
+  function togglePanel() {
+    if (panelLoader.item && panelLoader.item.toggle) panelLoader.item.toggle()
+  }
+
+  visible: panelLoader.item && panelLoader.item.label !== ""
+  implicitWidth: bar && bar.vertical ? button.implicitWidth : button.implicitWidth + Style.spacing.labelGap
+  implicitHeight: button.implicitHeight
+
+  onBarChanged: injectPanel()
+  onSettingsChanged: injectPanel()
+
+  Loader {
+    id: panelLoader
+    active: true
+    source: Qt.resolvedUrl("Panel.qml")
+    visible: false
+    onLoaded: {
+      root.injectPanel()
+      Qt.callLater(root.injectPanel)
+    }
+  }
+
+  WidgetButton {
+    id: button
+    anchors.verticalCenter: parent.verticalCenter
+    x: bar && bar.vertical ? Math.round((parent.width - width) / 2) : 0
+    width: implicitWidth
+    height: implicitHeight
+    bar: root.bar
+    text: panelLoader.item ? panelLoader.item.label : ""
+    active: panelLoader.item && panelLoader.item.klass === "active"
+    horizontalMargin: 2.5
+    // Tooltip suppressed because the panel is the detail view.
+    tooltipText: ""
+
+    onPressed: function(b) {
+      if (!root.bar) return
+      if (b === Qt.RightButton) root.bar.run("omarchy-notification-send \"$(omarchy-weather-status)\"")
+      else if (b === Qt.MiddleButton) root.refresh()
+      else root.togglePanel()
+    }
+  }
+}
diff --git a/shell/plugins/panels/weather/Model.js b/shell/plugins/panels/weather/Model.js
new file mode 100644
index 00000000..2ccb3321
--- /dev/null
+++ b/shell/plugins/panels/weather/Model.js
@@ -0,0 +1,155 @@
+function parseWeatherStatus(raw) {
+  try {
+    var data = JSON.parse(String(raw || "{}"))
+    return {
+      label: data.text || "",
+      klass: data.class || ""
+    }
+  } catch (e) {
+    return { label: "", klass: "" }
+  }
+}
+
+function isFutureForecastDate(dateString, todayString) {
+  if (!dateString) return false
+  return String(dateString).slice(0, 10) > String(todayString || "")
+}
+
+function roundedTemp(value) {
+  if (value === undefined || value === null || value === "") return ""
+  var n = parseFloat(String(value))
+  return isNaN(n) ? "" : String(Math.round(n))
+}
+
+function celsiusToFahrenheit(value) {
+  if (value === undefined || value === null || value === "") return ""
+  var n = parseFloat(String(value))
+  return isNaN(n) ? "" : (n * 9 / 5) + 32
+}
+
+function formatTemp(value, useImperial) {
+  if (value === undefined || value === null || value === "") return ""
+  return value + "°" + (useImperial ? "F" : "C")
+}
+
+function dayName(dateString, formatter) {
+  if (!dateString) return ""
+  var d = new Date(dateString + "T12:00:00")
+  if (isNaN(d.getTime())) return ""
+  if (formatter) return formatter(d)
+  return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][d.getDay()]
+}
+
+function openMeteoForecastDays(dailyForecastReport, todayString) {
+  var daily = dailyForecastReport && dailyForecastReport.daily ? dailyForecastReport.daily : null
+  if (!daily || !daily.time) return []
+
+  var result = []
+  for (var i = 0; i < daily.time.length && result.length < 3; ++i) {
+    var date = daily.time[i]
+    if (!isFutureForecastDate(date, todayString)) continue
+
+    var maxC = daily.temperature_2m_max ? daily.temperature_2m_max[i] : ""
+    var minC = daily.temperature_2m_min ? daily.temperature_2m_min[i] : ""
+    result.push({
+      date: date,
+      maxtempC: roundedTemp(maxC),
+      mintempC: roundedTemp(minC),
+      maxtempF: roundedTemp(celsiusToFahrenheit(maxC)),
+      mintempF: roundedTemp(celsiusToFahrenheit(minC)),
+      openMeteoWeatherCode: daily.weather_code ? daily.weather_code[i] : null
+    })
+  }
+  return result
+}
+
+function wttrNextForecastDays(report, todayString) {
+  var days = report && report.weather ? report.weather : []
+  var result = []
+  for (var i = 0; i < days.length && result.length < 3; ++i) {
+    if (isFutureForecastDate(days[i].date, todayString)) result.push(days[i])
+  }
+  return result
+}
+
+function buildForecastDays(report, dailyForecastReport, todayString) {
+  var days = openMeteoForecastDays(dailyForecastReport, todayString)
+  return days.length > 0 ? days : wttrNextForecastDays(report, todayString)
+}
+
+function bareTempForDay(day, kind, useImperial) {
+  if (!day) return ""
+  var v = useImperial
+    ? (kind === "max" ? day.maxtempF : day.mintempF)
+    : (kind === "max" ? day.maxtempC : day.mintempC)
+  if (v === undefined || v === null || v === "") return ""
+  return v + "°"
+}
+
+function dayIcon(day) {
+  if (!day) return ""
+  if (day.openMeteoWeatherCode !== undefined && day.openMeteoWeatherCode !== null)
+    return iconForOpenMeteoCode(day.openMeteoWeatherCode)
+  if (!day.hourly || day.hourly.length === 0) return ""
+
+  var best = day.hourly[0]
+  var bestDist = 9999
+  for (var i = 0; i < day.hourly.length; ++i) {
+    var t = parseInt(String(day.hourly[i].time || "0"), 10)
+    var dist = Math.abs(t - 1200)
+    if (dist < bestDist) {
+      bestDist = dist
+      best = day.hourly[i]
+    }
+  }
+  return iconForCode(best.weatherCode, false)
+}
+
+function iconForOpenMeteoCode(code) {
+  var c = parseInt(String(code || "0"), 10)
+  if (c === 0) return iconForCode(113, false)
+  if (c === 1 || c === 2) return iconForCode(116, false)
+  if (c === 3) return iconForCode(119, false)
+  if (c === 45 || c === 48) return iconForCode(143, false)
+  if (c === 51 || c === 53 || c === 55 || c === 56 || c === 57 || c === 61) return iconForCode(266, false)
+  if (c === 63 || c === 65 || c === 66 || c === 67 || c === 80 || c === 81 || c === 82) return iconForCode(308, false)
+  if (c === 71 || c === 73 || c === 75 || c === 77 || c === 85 || c === 86) return iconForCode(338, false)
+  if (c === 95 || c === 96 || c === 99) return iconForCode(389, false)
+  return iconForCode(119, false)
+}
+
+function iconForCode(code, night) {
+  var c = parseInt(String(code || "0"), 10)
+  switch (c) {
+    case 113: return night ? "" : ""
+    case 116: return night ? "" : ""
+    case 119: case 122: return ""
+    case 143: case 248: case 260: return ""
+    case 176: case 263: case 353: return night ? "" : ""
+    case 179: case 227: case 230: case 323: case 326: case 368: return night ? "" : ""
+    case 182: case 185: case 281: case 284: case 311: case 314:
+    case 317: case 320: case 350: case 362: case 365: case 374: case 377: return ""
+    case 200: case 386: case 389: case 392: case 395: return ""
+    case 266: case 293: case 296: case 299: case 302: case 305: case 308: case 356: case 359: return ""
+    case 329: case 332: case 335: case 338: case 371: return ""
+    default: return ""
+  }
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    parseWeatherStatus: parseWeatherStatus,
+    isFutureForecastDate: isFutureForecastDate,
+    roundedTemp: roundedTemp,
+    celsiusToFahrenheit: celsiusToFahrenheit,
+    formatTemp: formatTemp,
+    dayName: dayName,
+    openMeteoForecastDays: openMeteoForecastDays,
+    wttrNextForecastDays: wttrNextForecastDays,
+    buildForecastDays: buildForecastDays,
+    bareTempForDay: bareTempForDay,
+    dayIcon: dayIcon,
+    iconForOpenMeteoCode: iconForOpenMeteoCode,
+    iconForCode: iconForCode
+  }
+}
diff --git a/shell/plugins/panels/weather/Panel.qml b/shell/plugins/panels/weather/Panel.qml
new file mode 100644
index 00000000..8a73407f
--- /dev/null
+++ b/shell/plugins/panels/weather/Panel.qml
@@ -0,0 +1,490 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+import qs.Ui
+import "Model.js" as Model
+
+Panel {
+  id: root
+  moduleName: "omarchy.weather"
+  ipcTarget: "omarchy.weather"
+  manageIpc: false
+
+  property var anchorItem: null
+  property bool openedFromHotkey: false
+
+  function open() {
+    openedFromHotkey = false
+    setCenterHoverRevealSuppressed(false)
+    root.controller.show()
+    root.refresh()
+  }
+
+  function openFromHotkey() {
+    openedFromHotkey = true
+    setCenterHoverRevealSuppressed(true)
+    root.controller.show()
+    root.refresh()
+  }
+
+  function close() {
+    setCenterHoverRevealSuppressed(false)
+    root.controller.hide()
+  }
+
+  function toggle() {
+    if (root.opened) root.close()
+    else root.openFromHotkey()
+  }
+
+  function setCenterHoverRevealSuppressed(value) {
+    if (root.bar && "centerHoverRevealSuppressed" in root.bar)
+      root.bar.centerHoverRevealSuppressed = value
+  }
+
+  // Parsed wttr.in j1 response. Kept on failure so stale data stays visible.
+  property var report: null
+  property var dailyForecastReport: null
+  property string wttrLocation: ""
+
+  // Bar pill state. Polled locally; populated by weatherProc below.
+  property string label: ""
+  property string klass: ""
+
+  function updateWeather(raw) {
+    var data = Model.parseWeatherStatus(raw)
+    label = data.label
+    klass = data.klass
+  }
+
+  readonly property var current: report && report.current_condition && report.current_condition[0] ? report.current_condition[0] : null
+  readonly property var areaInfo: report && report.nearest_area && report.nearest_area[0] ? report.nearest_area[0] : null
+  readonly property var forecastDays: buildForecastDays()
+
+  readonly property bool useImperial: {
+    var override = setting("unit", "")
+    if (override === "imperial") return true
+    if (override === "metric") return false
+    var name = String(Qt.locale().name || "")
+    return /^en_US/.test(name) || /^en_LR/.test(name) || /^my/.test(name)
+  }
+
+  // Auto-refresh interval in minutes; clamped to a sane minimum.
+  readonly property int refreshMinutes: Math.max(1, parseInt(setting("refreshMinutes", 15), 10) || 15)
+
+  readonly property string reportLocation:  wttrLocation || (areaInfo && areaInfo.areaName && areaInfo.areaName[0] ? areaInfo.areaName[0].value : "")
+  readonly property string reportTempNum:   current ? String(useImperial ? current.temp_F : current.temp_C) : ""
+  readonly property string tempUnit:        "°" + (useImperial ? "F" : "C")
+  readonly property string reportFeels:     current ? formatTemp(useImperial ? current.FeelsLikeF : current.FeelsLikeC) : ""
+  readonly property string reportWind:      current ? (useImperial ? (current.windspeedMiles + " mph") : (current.windspeedKmph + " km/h")) : ""
+  readonly property string reportHumidity:  current ? (current.humidity + "%") : ""
+
+  function refresh() {
+    if (!forecastProc.running) forecastProc.running = true
+    if (!locationProc.running) locationProc.running = true
+  }
+
+  function refreshDailyForecast(sourceReport) {
+    var area = sourceReport && sourceReport.nearest_area && sourceReport.nearest_area[0] ? sourceReport.nearest_area[0] : root.areaInfo
+    if (!area || dailyForecastProc.running) return
+
+    var lat = parseFloat(String(area.latitude || ""))
+    var lon = parseFloat(String(area.longitude || ""))
+    if (isNaN(lat) || isNaN(lon)) return
+
+    var url = "https://api.open-meteo.com/v1/forecast"
+      + "?latitude=" + encodeURIComponent(String(lat))
+      + "&longitude=" + encodeURIComponent(String(lon))
+      + "&daily=weather_code,temperature_2m_max,temperature_2m_min"
+      + "&forecast_days=4"
+      + "&timezone=auto"
+    dailyForecastProc.command = ["curl", "-fsS", "--max-time", "5", url]
+    dailyForecastProc.running = true
+  }
+
+  function buildForecastDays() {
+    return Model.buildForecastDays(report, dailyForecastReport, Qt.formatDate(new Date(), "yyyy-MM-dd"))
+  }
+
+  function openMeteoForecastDays() {
+    return Model.openMeteoForecastDays(dailyForecastReport, Qt.formatDate(new Date(), "yyyy-MM-dd"))
+  }
+
+  function wttrNextForecastDays() {
+    return Model.wttrNextForecastDays(report, Qt.formatDate(new Date(), "yyyy-MM-dd"))
+  }
+
+  function isFutureForecastDate(dateString) {
+    return Model.isFutureForecastDate(dateString, Qt.formatDate(new Date(), "yyyy-MM-dd"))
+  }
+
+  function roundedTemp(value) {
+    return Model.roundedTemp(value)
+  }
+
+  function celsiusToFahrenheit(value) {
+    return Model.celsiusToFahrenheit(value)
+  }
+
+  function formatTemp(value) {
+    return Model.formatTemp(value, useImperial)
+  }
+
+  function dayName(dateString) {
+    return Model.dayName(dateString, function(date) { return Qt.formatDate(date, "dddd") })
+  }
+
+  // Bare degree value (no unit letter), used in the forecast row.
+  function bareTempForDay(day, kind) {
+    return Model.bareTempForDay(day, kind, useImperial)
+  }
+
+  // Representative icon for a forecast day: the hourly entry nearest noon.
+  function dayIcon(day) {
+    return Model.dayIcon(day)
+  }
+
+  function iconForOpenMeteoCode(code) {
+    return Model.iconForOpenMeteoCode(code)
+  }
+
+  // Mirrors omarchy-weather-icon's wttr.in code → nerd-font glyph mapping.
+  function iconForCode(code, night) {
+    return Model.iconForCode(code, night)
+  }
+
+  Process {
+    id: forecastProc
+    command: ["bash", "-lc", "curl -fsS --max-time 5 'https://wttr.in/?format=j1' 2>/dev/null"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        var raw = String(text || "").trim()
+        if (!raw) return
+        try {
+          var parsed = JSON.parse(raw)
+          root.report = parsed
+          root.refreshDailyForecast(parsed)
+        } catch (e) {
+          // Keep last-good report on parse failure so the popup isn't blanked.
+        }
+      }
+    }
+  }
+
+  Process {
+    id: dailyForecastProc
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        var raw = String(text || "").trim()
+        if (!raw) return
+        try {
+          root.dailyForecastReport = JSON.parse(raw)
+        } catch (e) {
+          // Keep last-good daily forecast on parse failure.
+        }
+      }
+    }
+  }
+
+  Process {
+    id: locationProc
+    command: ["bash", "-lc", "curl -fsS --max-time 4 'https://wttr.in?format=%l' 2>/dev/null"]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: {
+        var raw = String(text || "").trim()
+        if (!raw) return
+        root.wttrLocation = raw.split(",")[0]
+      }
+    }
+  }
+
+  Timer {
+    id: refreshTimer
+    interval: root.refreshMinutes * 60 * 1000
+    running: true
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: root.refresh()
+  }
+
+  IpcHandler {
+    target: root.ipcTarget
+
+    function open(): void { root.openFromHotkey() }
+    function close(): void { root.close() }
+    function show(): void { root.openFromHotkey() }
+    function hide(): void { root.close() }
+    function toggle(): void { root.toggle() }
+  }
+
+  KeyboardPanel {
+    id: panel
+    anchorItem: root.anchorItem
+    owner: root
+    bar: root.bar
+    open: root.opened
+    centerOnBar: true
+    focusTarget: keyCatcher
+    contentWidth: panel.fittedContentWidth(Style.space(480))
+    contentHeight: panel.fittedContentHeight(weatherColumn.implicitHeight)
+
+    PanelKeyCatcher {
+      id: keyCatcher
+      anchors.fill: parent
+      onCloseRequested: root.close()
+      onTabRequested: function(direction) { root.switchPanel(direction) }
+
+      Flickable {
+        id: weatherScroll
+        anchors.fill: parent
+        contentWidth: width
+        contentHeight: weatherColumn.implicitHeight
+        clip: true
+        boundsBehavior: Flickable.StopAtBounds
+
+        Column {
+          id: weatherColumn
+          width: weatherScroll.width
+          spacing: Style.space(14)
+
+      // ---- Hero row: big icon + temp on the left; location and stats stacked on the right.
+      Item {
+        width: parent.width
+        height: Math.max(heroLeft.height, heroRight.height)
+
+        Row {
+          id: heroLeft
+          anchors.left: parent.left
+          anchors.leftMargin: Style.space(16)
+          anchors.verticalCenter: parent.verticalCenter
+          spacing: Style.space(16)
+
+          Text {
+            id: heroIcon
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.verticalCenterOffset: 5
+            text: root.label || "—"
+            color: root.bar.foreground
+            font.family: root.bar.fontFamily
+            // Decorative condition emoji; intentionally larger than the
+            // Style.font.* scale's displayLarge (28).
+            font.pixelSize: 64
+          }
+
+          Row {
+            anchors.verticalCenter: parent.verticalCenter
+            spacing: Style.space(2)
+
+            Text {
+              id: tempBig
+              text: root.reportTempNum || "—"
+              color: root.bar.foreground
+              font.family: root.bar.fontFamily
+              // Hero temperature read-out; deliberately oversized, outside
+              // the Style.font.* scale.
+              font.pixelSize: 56
+              font.bold: true
+            }
+            Text {
+              text: root.current ? root.tempUnit : ""
+              color: root.bar.foreground
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.display
+              anchors.top: tempBig.top
+              anchors.topMargin: Style.space(10)
+            }
+          }
+        }
+
+        Column {
+          id: heroRight
+          anchors.right: parent.right
+          anchors.rightMargin: Style.space(20)
+          anchors.verticalCenter: parent.verticalCenter
+          spacing: Style.space(12)
+
+          Row {
+            visible: root.reportLocation !== ""
+            spacing: Style.space(6)
+
+            Text {
+              text: ""  // nf-fa-map_marker
+              color: Qt.darker(root.bar.foreground, 1.4)
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.body
+              anchors.verticalCenter: parent.verticalCenter
+            }
+            Text {
+              text: (root.reportLocation || "").toUpperCase()
+              color: Qt.darker(root.bar.foreground, 1.4)
+              font.family: root.bar.fontFamily
+              font.pixelSize: Style.font.body
+              font.letterSpacing: 1
+              anchors.verticalCenter: parent.verticalCenter
+            }
+          }
+
+          Row {
+            visible: !!root.current
+            spacing: Style.space(36)
+
+            Column {
+              spacing: Style.space(5)
+              Text {
+                text: "FEELS"
+                color: Qt.darker(root.bar.foreground, 1.5)
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.bodySmall
+                font.letterSpacing: 1
+              }
+              Text {
+                text: root.reportFeels
+                color: root.bar.foreground
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.title
+              }
+            }
+
+            Column {
+              spacing: Style.space(5)
+              Text {
+                text: "WIND"
+                color: Qt.darker(root.bar.foreground, 1.5)
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.bodySmall
+                font.letterSpacing: 1
+              }
+              Text {
+                text: root.reportWind
+                color: root.bar.foreground
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.title
+              }
+            }
+
+            Column {
+              spacing: Style.space(5)
+              Text {
+                text: "HUMID"
+                color: Qt.darker(root.bar.foreground, 1.5)
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.bodySmall
+                font.letterSpacing: 1
+              }
+              Text {
+                text: root.reportHumidity
+                color: root.bar.foreground
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.title
+              }
+            }
+          }
+        }
+      }
+
+      Text {
+        visible: !root.current
+        text: "Fetching forecast…"
+        color: Qt.darker(root.bar.foreground, 1.5)
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.bodySmall
+        font.italic: true
+      }
+
+      // ---- Divider between current conditions and forecast.
+      Rectangle {
+        visible: root.forecastDays.length > 0
+        width: parent.width
+        height: Style.spacing.hairline
+        color: root.bar.foreground
+        opacity: 0.12
+      }
+
+      // ---- Forecast row: each cell has the day icon left of a day-name + hi/lo column.
+      //      Wrapped in an Item so the block of cells can be centered within the popup.
+      Item {
+        visible: root.forecastDays.length > 0
+        width: parent.width
+        height: forecastRow.height
+
+        Row {
+          id: forecastRow
+          anchors.horizontalCenter: parent.horizontalCenter
+          spacing: Style.space(44)
+
+          Repeater {
+            model: root.forecastDays
+
+            Row {
+              required property var modelData
+              required property int index
+              spacing: Style.space(10)
+
+              Text {
+                anchors.verticalCenter: parent.verticalCenter
+                text: root.dayIcon(modelData)
+                color: root.bar.foreground
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.display
+              }
+
+              Column {
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: Style.space(2)
+
+                Text {
+                  text: root.dayName(modelData.date).toUpperCase()
+                  color: Qt.darker(root.bar.foreground, 1.4)
+                  font.family: root.bar.fontFamily
+                  font.pixelSize: Style.font.caption
+                  font.letterSpacing: 1
+                }
+
+                Row {
+                  spacing: Style.space(6)
+
+                  Text {
+                    text: root.bareTempForDay(modelData, "max")
+                    color: root.bar.foreground
+                    font.family: root.bar.fontFamily
+                    font.pixelSize: Style.font.body
+                  }
+                  Text {
+                    text: root.bareTempForDay(modelData, "min")
+                    color: Qt.darker(root.bar.foreground, 1.5)
+                    font.family: root.bar.fontFamily
+                    font.pixelSize: Style.font.body
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  }
+  }
+
+  // Poll the weather pill text/class every minute. Local to this widget.
+  Process {
+    id: weatherProc
+    command: ["bash", "-lc", root.bar ? Util.shellQuote(root.bar.omarchyPath + "/shell/plugins/panels/weather/status.sh") : ""]
+    stdout: StdioCollector {
+      waitForEnd: true
+      onStreamFinished: root.updateWeather(text)
+    }
+  }
+
+  Timer {
+    interval: 60000
+    running: true
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: if (!weatherProc.running) weatherProc.running = true
+  }
+}
diff --git a/shell/plugins/panels/weather/manifest.json b/shell/plugins/panels/weather/manifest.json
new file mode 100644
index 00000000..23fa84f8
--- /dev/null
+++ b/shell/plugins/panels/weather/manifest.json
@@ -0,0 +1,21 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.weather",
+  "name": "Weather",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Weather pill with detail popup",
+  "kinds": [
+    "bar-widget"
+  ],
+  "entryPoints": {
+    "barWidget": "BarWidget.qml"
+  },
+  "barWidget": {
+    "displayName": "Weather",
+    "description": "Weather pill with detail popup",
+    "category": "Info",
+    "allowMultiple": false,
+    "settingsForm": "weatherSettings"
+  }
+}
diff --git a/default/waybar/weather.sh b/shell/plugins/panels/weather/status.sh
similarity index 100%
rename from default/waybar/weather.sh
rename to shell/plugins/panels/weather/status.sh
diff --git a/shell/plugins/polkit/PolkitAgent.qml b/shell/plugins/polkit/PolkitAgent.qml
new file mode 100644
index 00000000..4cc34f2e
--- /dev/null
+++ b/shell/plugins/polkit/PolkitAgent.qml
@@ -0,0 +1,329 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import Quickshell.Services.Polkit
+import Quickshell.Wayland
+import qs.Commons
+import qs.Ui
+import "PolkitModel.js" as PolkitModel
+
+Item {
+  id: root
+
+  property string fontFamily: Style.font.menuFamily
+  // Bound to the central [polkit] section in shell.toml via Color.qml.
+  property color accent: Color.polkit.accent
+  property color background: Color.polkit.background
+  property color foreground: Color.polkit.text
+  property color border: Color.polkit.border
+  property color borderError: Color.polkit.borderError
+  property var borderSpec: Border.surfaceSpec("polkit", errorFlash ? "border-error" : "border", errorFlash ? borderError : border, Math.max(1, Style.space(2)), "border-alpha")
+  property color scrim: Color.polkit.scrim
+  readonly property int cornerRadius: Style.cornerRadius
+  property int contentMargin: Style.spacing.panelPadding
+  property int fieldHeight: Math.max(Style.space(42), Style.spacing.controlHeight)
+
+  property bool closing: false
+  property bool submitted: false
+  property string currentMessage: ""
+  property string currentPrompt: ""
+  property string currentSupplementary: ""
+  property bool responseRequired: false
+  property bool responseVisible: false
+  property bool failed: false
+  property bool errorFlash: false
+  property bool fingerprintFirst: false
+  property int shakeOffset: 0
+
+  readonly property bool dialogVisible: polkitAgent.isActive || closing
+  readonly property bool fingerprintWaiting: dialogVisible && !responseRequired && !submitted && (fingerprintFirst || promptLooksFingerprint(currentPrompt + " " + currentSupplementary))
+  readonly property int cardWidth: Math.min(Style.space(312), Math.max(Style.space(260), panel.width - Style.gapsOut * 2))
+  readonly property int cardHeight: panel.height > 0 ? Math.min(fieldHeight + contentMargin * 2, panel.height - Style.gapsOut * 2) : fieldHeight + contentMargin * 2
+
+  function promptLooksFingerprint(text) {
+    return PolkitModel.promptLooksFingerprint(text)
+  }
+
+  function loadPamConfig(raw) {
+    fingerprintFirst = PolkitModel.fingerprintFirstFromPamConfig(raw)
+  }
+
+  function resetSnapshot() {
+    currentMessage = ""
+    currentPrompt = ""
+    currentSupplementary = ""
+    responseRequired = false
+    responseVisible = false
+    failed = false
+    errorFlash = false
+    submitted = false
+    passwordInput.text = ""
+  }
+
+  function syncFromFlow() {
+    var flow = polkitAgent.flow
+    if (!flow) return
+
+    currentMessage = String(flow.message || "Authentication is needed...")
+    currentPrompt = String(flow.inputPrompt || "")
+    currentSupplementary = String(flow.supplementaryMessage || "")
+    responseRequired = !!flow.isResponseRequired
+    responseVisible = !!flow.responseVisible
+    failed = !!flow.failed
+
+    if (responseRequired) submitted = false
+  }
+
+  function beginFlow() {
+    closeTimer.stop()
+    closing = false
+    submitted = false
+    passwordInput.text = ""
+    syncFromFlow()
+    Qt.callLater(refocus)
+  }
+
+  function refocus() {
+    if (!dialogVisible) return
+    if (fingerprintWaiting) keyCatcher.forceActiveFocus()
+    else passwordInput.forceActiveFocus()
+  }
+
+  function submitResponse() {
+    var flow = polkitAgent.flow
+    if (!flow || !flow.isResponseRequired) return
+    submitted = true
+    errorFlash = false
+    flow.submit(passwordInput.text)
+    passwordInput.text = ""
+    keyCatcher.forceActiveFocus()
+  }
+
+  function cancelRequest() {
+    var flow = polkitAgent.flow
+    passwordInput.text = ""
+    submitted = false
+    closing = true
+    closeTimer.restart()
+    if (flow) flow.cancelAuthenticationRequest()
+  }
+
+  function triggerFailureFeedback() {
+    submitted = false
+    errorFlash = true
+    passwordInput.text = ""
+    errorTimer.restart()
+    shakeAnimation.restart()
+    Qt.callLater(refocus)
+  }
+
+  Timer {
+    id: closeTimer
+    interval: 300
+    repeat: false
+    onTriggered: {
+      closing = false
+      resetSnapshot()
+    }
+  }
+
+  Timer {
+    id: errorTimer
+    interval: 1200
+    repeat: false
+    onTriggered: root.errorFlash = false
+  }
+
+  SequentialAnimation {
+    id: shakeAnimation
+    NumberAnimation { target: root; property: "shakeOffset"; to: -8; duration: 35; easing.type: Easing.OutQuad }
+    NumberAnimation { target: root; property: "shakeOffset"; to: 8; duration: 50; easing.type: Easing.InOutQuad }
+    NumberAnimation { target: root; property: "shakeOffset"; to: 0; duration: 55; easing.type: Easing.OutQuad }
+  }
+  FileView {
+    path: "/etc/pam.d/polkit-1"
+    watchChanges: true
+    printErrors: false
+    onLoaded: root.loadPamConfig(text())
+    onLoadFailed: root.fingerprintFirst = false
+    onFileChanged: reload()
+  }
+
+  PolkitAgent {
+    id: polkitAgent
+    path: "/org/omarchy/PolkitAgent"
+
+    onAuthenticationRequestStarted: root.beginFlow()
+    onIsActiveChanged: {
+      if (isActive) root.syncFromFlow()
+      else if (!root.closing) root.resetSnapshot()
+    }
+    onIsRegisteredChanged: {
+      if (isRegistered) console.log("omarchy polkit agent registered")
+      else console.warn("omarchy polkit agent is not registered; another agent may be running")
+    }
+  }
+
+  Connections {
+    target: polkitAgent.flow
+
+    function onIsResponseRequiredChanged() {
+      root.syncFromFlow()
+      if (!polkitAgent.flow || !polkitAgent.flow.isResponseRequired) passwordInput.text = ""
+      Qt.callLater(root.refocus)
+    }
+
+    function onInputPromptChanged() { root.syncFromFlow() }
+    function onResponseVisibleChanged() { root.syncFromFlow() }
+    function onSupplementaryMessageChanged() { root.syncFromFlow() }
+    function onFailedChanged() { root.syncFromFlow() }
+
+    function onAuthenticationFailed() {
+      root.syncFromFlow()
+      root.triggerFailureFeedback()
+    }
+
+    function onAuthenticationSucceeded() {
+      root.closing = true
+      closeTimer.restart()
+    }
+
+    function onAuthenticationRequestCancelled() {
+      root.closing = true
+      closeTimer.restart()
+    }
+  }
+
+  PanelWindow {
+    id: panel
+    visible: root.dialogVisible
+    anchors { top: true; bottom: true; left: true; right: true }
+    color: "transparent"
+    WlrLayershell.namespace: "omarchy-polkit"
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+    exclusionMode: ExclusionMode.Ignore
+
+    Rectangle {
+      anchors.fill: parent
+      color: root.scrim
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      onClicked: root.refocus()
+    }
+
+    BorderSurface {
+      id: card
+      width: root.cardWidth
+      height: root.cardHeight
+      radius: root.cornerRadius
+      anchors.centerIn: parent
+      anchors.horizontalCenterOffset: root.shakeOffset
+      color: root.background
+      borderSpec: root.borderSpec
+      padding: root.contentMargin
+
+      MouseArea { anchors.fill: parent; onClicked: root.refocus() }
+
+      Item {
+        id: keyCatcher
+        anchors.fill: parent
+        focus: true
+
+        Keys.priority: Keys.BeforeItem
+        Keys.onPressed: function(event) {
+          if (event.key === Qt.Key_Escape) {
+            root.cancelRequest()
+            event.accepted = true
+          } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+            if (root.responseRequired) root.submitResponse()
+            event.accepted = true
+          }
+        }
+      }
+
+      Row {
+        id: cardRow
+        anchors.fill: parent
+        anchors.topMargin: card.contentTopInset
+        anchors.rightMargin: card.contentRightInset
+        anchors.bottomMargin: card.contentBottomInset
+        anchors.leftMargin: card.contentLeftInset
+        spacing: Style.space(14)
+
+        Text {
+          text: "\uf023"
+          color: root.errorFlash ? Color.polkit.textError : root.accent
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.iconLarge
+          width: Style.space(26)
+          height: root.fieldHeight
+          horizontalAlignment: Text.AlignHCenter
+          verticalAlignment: Text.AlignVCenter
+        }
+
+        Item {
+          width: parent.width - Style.space(40)
+          height: root.fieldHeight
+
+          TextInput {
+            id: passwordInput
+            anchors.fill: parent
+            verticalAlignment: TextInput.AlignVCenter
+            activeFocusOnPress: true
+            clip: true
+            selectionColor: Util.alpha(root.accent, 0.45)
+            selectedTextColor: root.foreground
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.iconLarge
+            echoMode: root.responseVisible ? TextInput.Normal : TextInput.Password
+            passwordCharacter: "\u2022"
+            color: root.errorFlash ? Color.polkit.textError : root.foreground
+            cursorVisible: activeFocus && !root.submitted && !root.errorFlash
+            readOnly: root.submitted || root.errorFlash
+            enabled: root.dialogVisible && !root.fingerprintWaiting
+            visible: !root.fingerprintWaiting
+            onAccepted: root.submitResponse()
+            Keys.onPressed: function(event) {
+              if (event.key === Qt.Key_Escape) {
+                root.cancelRequest()
+                event.accepted = true
+              }
+            }
+          }
+
+          Text {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
+            text: root.errorFlash ? "Wrong" : (root.submitted ? "Checking..." : "Enter password")
+            color: root.errorFlash ? Color.polkit.textError : root.foreground
+            opacity: root.errorFlash ? 1 : 0.36
+            font.family: root.fontFamily
+            font.pixelSize: Style.font.iconLarge
+            elide: Text.ElideRight
+            visible: passwordInput.visible && passwordInput.text.length === 0
+          }
+
+          Rectangle {
+            width: Math.max(1, Style.space(2))
+            height: Style.space(24)
+            anchors.left: parent.left
+            anchors.verticalCenter: parent.verticalCenter
+            color: root.errorFlash ? Color.polkit.textError : root.foreground
+            visible: passwordInput.visible && passwordInput.activeFocus && passwordInput.text.length === 0 && !root.submitted && !root.errorFlash
+          }
+
+          MouseArea {
+            anchors.fill: parent
+            acceptedButtons: Qt.LeftButton
+            enabled: passwordInput.visible
+            onClicked: passwordInput.forceActiveFocus()
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/polkit/PolkitModel.js b/shell/plugins/polkit/PolkitModel.js
new file mode 100644
index 00000000..02444d55
--- /dev/null
+++ b/shell/plugins/polkit/PolkitModel.js
@@ -0,0 +1,22 @@
+function promptLooksFingerprint(text) {
+  var s = String(text || "").toLowerCase()
+  return s.indexOf("finger") !== -1 || s.indexOf("fprint") !== -1 || s.indexOf("swipe") !== -1
+}
+
+function fingerprintFirstFromPamConfig(raw) {
+  var lines = String(raw || "").split("\n")
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i].replace(/^\s+|\s+$/g, "")
+    if (!line || line.charAt(0) === "#") continue
+    if (!line.match(/^auth\s+/)) continue
+    return line.indexOf("pam_fprintd.so") !== -1
+  }
+  return false
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    promptLooksFingerprint: promptLooksFingerprint,
+    fingerprintFirstFromPamConfig: fingerprintFirstFromPamConfig
+  }
+}
diff --git a/shell/plugins/polkit/manifest.json b/shell/plugins/polkit/manifest.json
new file mode 100644
index 00000000..1e80b655
--- /dev/null
+++ b/shell/plugins/polkit/manifest.json
@@ -0,0 +1,15 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.polkit",
+  "name": "Polkit Agent",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Theme-aware authentication dialog for privileged actions.",
+  "kinds": [
+    "service"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "service": "PolkitAgent.qml"
+  }
+}
diff --git a/shell/plugins/reminders/ReminderFlow.qml b/shell/plugins/reminders/ReminderFlow.qml
new file mode 100644
index 00000000..f8d009ad
--- /dev/null
+++ b/shell/plugins/reminders/ReminderFlow.qml
@@ -0,0 +1,172 @@
+import Quickshell
+import Quickshell.Wayland
+import QtQuick
+import qs.Commons
+import qs.Ui
+import "ReminderFlowModel.js" as ReminderFlowModel
+
+Item {
+  id: root
+
+  property string omarchyPath: Quickshell.env("OMARCHY_PATH")
+  property var shell: null
+  property var manifest: null
+
+  property bool opened: false
+  property string step: "minutes"
+  property string minutes: ""
+  property string filterText: ""
+  property string fontFamily: Style.font.menuFamily
+
+  property color background: Color.menu.background
+  property color foreground: Color.menu.text
+  property color border: Color.menu.border
+  property var borderSpec: Border.surfaceSpec("menu", "border", border, Math.max(1, Style.space(2)))
+  property color scrim: Color.menu.scrim
+  readonly property int cornerRadius: Style.cornerRadius
+  property int contentMargin: Style.spacing.panelPadding
+  property int headerHeight: Math.max(Style.space(34), Style.font.title + Style.spacing.controlPaddingY * 2)
+  property int cardWidth: Math.min(Style.space(300), panel.width - Style.gapsOut * 2)
+  property int cardHeight: Math.min(contentMargin * 2 + headerHeight, panel.height - Style.gapsOut * 2)
+  readonly property string promptText: root.step === "message" ? "Reminder message" : "Remind in minutes"
+
+  function open(payloadJson) {
+    var payload = ({})
+    try { payload = JSON.parse(payloadJson || "{}") } catch (e) { payload = ({}) }
+    if (payload.fontFamily) root.fontFamily = payload.fontFamily
+
+    root.opened = true
+    root.step = "minutes"
+    root.minutes = ""
+    root.filterText = ""
+
+    Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+  }
+
+  function close() {
+    root.opened = false
+  }
+
+  function dismiss() {
+    root.opened = false
+    if (root.shell && typeof root.shell.hide === "function")
+      root.shell.hide((root.manifest && root.manifest.id) || "omarchy.reminders")
+  }
+
+  function toggle() {
+    if (root.opened) root.dismiss()
+    else root.open("{}")
+  }
+
+  function setFilter(nextFilter) {
+    root.filterText = nextFilter
+  }
+
+  function submit() {
+    var selection = root.filterText
+
+    if (root.step === "minutes") {
+      var nextMinutes = ReminderFlowModel.validMinutes(selection)
+
+      if (!selection.trim()) {
+        root.dismiss()
+        return
+      }
+
+      if (!nextMinutes) {
+        Quickshell.execDetached([root.omarchyPath + "/bin/omarchy-notification-send", "Invalid reminder", "Enter the number of minutes"])
+        return
+      }
+
+      root.minutes = nextMinutes
+      root.step = "message"
+      root.filterText = ""
+      Qt.callLater(function() { keyCatcher.forceActiveFocus() })
+      return
+    }
+
+    if (root.step === "message") {
+      var args = [root.omarchyPath + "/bin/omarchy-reminder"].concat(ReminderFlowModel.reminderArgs(root.minutes, selection))
+      root.dismiss()
+      Quickshell.execDetached(args)
+    }
+  }
+
+  PanelWindow {
+    id: panel
+    visible: root.opened
+    anchors { top: true; bottom: true; left: true; right: true }
+    color: "transparent"
+    WlrLayershell.namespace: "omarchy-reminders"
+    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+    exclusionMode: ExclusionMode.Ignore
+
+    Rectangle {
+      anchors.fill: parent
+      color: root.scrim
+    }
+
+    MouseArea {
+      anchors.fill: parent
+      onClicked: root.dismiss()
+    }
+
+    BorderSurface {
+      id: card
+      width: root.cardWidth
+      height: root.cardHeight
+      radius: root.cornerRadius
+      anchors.centerIn: parent
+      color: root.background
+      borderSpec: root.borderSpec
+      padding: root.contentMargin
+
+      MouseArea { anchors.fill: parent; onClicked: {} }
+
+      Item {
+        id: keyCatcher
+        anchors.fill: parent
+        focus: true
+
+        Keys.priority: Keys.BeforeItem
+        Keys.onPressed: function(event) {
+          if (event.key === Qt.Key_Escape) {
+            if (root.filterText) root.setFilter("")
+            else root.dismiss()
+            event.accepted = true
+          } else if (event.key === Qt.Key_Backspace) {
+            if (root.filterText.length > 0) root.setFilter(root.filterText.slice(0, -1))
+            event.accepted = true
+          } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+            root.submit()
+            event.accepted = true
+          } else if (event.text && event.text.length === 1 && event.text.charCodeAt(0) >= 32 && event.text.charCodeAt(0) !== 127) {
+            root.setFilter(root.filterText + event.text)
+            event.accepted = true
+          }
+        }
+      }
+
+      Item {
+        anchors.fill: parent
+        anchors.topMargin: card.contentTopInset
+        anchors.rightMargin: card.contentRightInset
+        anchors.bottomMargin: card.contentBottomInset
+        anchors.leftMargin: card.contentLeftInset
+
+        Text {
+          anchors.left: parent.left
+          anchors.right: parent.right
+          anchors.verticalCenter: parent.verticalCenter
+          text: root.filterText || (root.promptText + "...")
+          color: root.foreground
+          opacity: root.filterText ? 1 : 0.58
+          font.family: root.fontFamily
+          font.pixelSize: Style.font.heading
+          elide: Text.ElideRight
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/reminders/ReminderFlowModel.js b/shell/plugins/reminders/ReminderFlowModel.js
new file mode 100644
index 00000000..05b94c8c
--- /dev/null
+++ b/shell/plugins/reminders/ReminderFlowModel.js
@@ -0,0 +1,21 @@
+function validMinutes(value) {
+  var minutes = String(value || "").trim()
+  return /^[0-9]+$/.test(minutes) && Number(minutes) > 0 ? minutes : ""
+}
+
+function reminderArgs(minutes, message) {
+  var valid = validMinutes(minutes)
+  if (!valid) return []
+
+  var args = [valid]
+  var text = String(message || "")
+  if (text.length > 0) args.push(text)
+  return args
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    validMinutes: validMinutes,
+    reminderArgs: reminderArgs
+  }
+}
diff --git a/shell/plugins/reminders/manifest.json b/shell/plugins/reminders/manifest.json
new file mode 100644
index 00000000..5745d444
--- /dev/null
+++ b/shell/plugins/reminders/manifest.json
@@ -0,0 +1,15 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.reminders",
+  "name": "Reminders",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Interactive reminder setup flow",
+  "kinds": [
+    "overlay"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "overlay": "ReminderFlow.qml"
+  }
+}
diff --git a/shell/plugins/services/battery/BatteryModel.js b/shell/plugins/services/battery/BatteryModel.js
new file mode 100644
index 00000000..2aca5dbd
--- /dev/null
+++ b/shell/plugins/services/battery/BatteryModel.js
@@ -0,0 +1,28 @@
+function batteryPercentage(device) {
+  if (!device || !device.isPresent) return -1
+  return Math.round(Number(device.percentage || 0) * 100)
+}
+
+function isDischarging(device, onBattery, dischargingState) {
+  return !!(device && device.isPresent && onBattery && device.state === dischargingState)
+}
+
+function shouldWarnLowBattery(device, onBattery, dischargingState, threshold, alreadyNotified) {
+  var level = batteryPercentage(device)
+  if (level < 0) return { level: level, notify: false, notifiedLowBattery: false }
+
+  var low = isDischarging(device, onBattery, dischargingState) && level <= threshold
+  return {
+    level: level,
+    notify: low && !alreadyNotified,
+    notifiedLowBattery: low
+  }
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    batteryPercentage: batteryPercentage,
+    isDischarging: isDischarging,
+    shouldWarnLowBattery: shouldWarnLowBattery
+  }
+}
diff --git a/shell/plugins/services/battery/Service.qml b/shell/plugins/services/battery/Service.qml
new file mode 100644
index 00000000..c2ab7625
--- /dev/null
+++ b/shell/plugins/services/battery/Service.qml
@@ -0,0 +1,58 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import Quickshell.Services.UPower
+import "BatteryModel.js" as BatteryModel
+
+Item {
+  id: root
+
+  property var shell: null
+  property string omarchyPath: Quickshell.env("OMARCHY_PATH")
+
+  readonly property int batteryThreshold: 10
+
+  PersistentProperties {
+    id: persisted
+    reloadableId: "omarchy-battery"
+    property bool notifiedLowBattery: false
+  }
+
+  function batteryPercentage() {
+    return BatteryModel.batteryPercentage(UPower.displayDevice)
+  }
+
+  function isDischarging() {
+    return BatteryModel.isDischarging(UPower.displayDevice, UPower.onBattery, UPowerDeviceState.Discharging)
+  }
+
+  function checkBattery() {
+    var state = BatteryModel.shouldWarnLowBattery(UPower.displayDevice, UPower.onBattery, UPowerDeviceState.Discharging, batteryThreshold, persisted.notifiedLowBattery)
+    persisted.notifiedLowBattery = state.notifiedLowBattery
+    if (state.notify) sendLowBatteryWarning(state.level)
+  }
+
+  function sendLowBatteryWarning(level) {
+    if (warningProcess.running) return
+    warningProcess.command = [
+      "omarchy-battery-low",
+      String(level)
+    ]
+    warningProcess.running = true
+  }
+
+  Process { id: warningProcess }
+
+  Timer {
+    interval: 30000
+    running: true
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: root.checkBattery()
+  }
+
+  Connections {
+    target: UPower
+    function onOnBatteryChanged() { root.checkBattery() }
+  }
+}
diff --git a/shell/plugins/services/battery/manifest.json b/shell/plugins/services/battery/manifest.json
new file mode 100644
index 00000000..1dc2e731
--- /dev/null
+++ b/shell/plugins/services/battery/manifest.json
@@ -0,0 +1,14 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.battery",
+  "name": "Battery",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Low battery warning service",
+  "kinds": [
+    "service"
+  ],
+  "entryPoints": {
+    "service": "Service.qml"
+  }
+}
diff --git a/shell/plugins/services/idle/IdleModel.js b/shell/plugins/services/idle/IdleModel.js
new file mode 100644
index 00000000..8e2315d0
--- /dev/null
+++ b/shell/plugins/services/idle/IdleModel.js
@@ -0,0 +1,52 @@
+function secondsFromConfig(value, fallback) {
+  var n = Number(value)
+  if (!isFinite(n) || n < 0) return fallback
+  return Math.floor(n)
+}
+
+function eventParts(event, count) {
+  try {
+    if (event && event.parse) return event.parse(count)
+  } catch (error) {
+  }
+  return String(event && event.data ? event.data : "").split(",")
+}
+
+function screensaverWindowsAfter(windows, address, visible) {
+  var key = String(address || "")
+  if (!key) {
+    var current = windows || {}
+    var existingCount = 0
+    for (var currentKey in current) {
+      if (current[currentKey]) existingCount++
+    }
+    return { windows: current, count: existingCount }
+  }
+
+  var next = {}
+  var count = 0
+  for (var existing in windows || {}) {
+    if (existing !== key && windows[existing]) {
+      next[existing] = true
+      count++
+    }
+  }
+
+  if (visible) {
+    next[key] = true
+    count++
+  }
+
+  return {
+    windows: next,
+    count: count
+  }
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    secondsFromConfig: secondsFromConfig,
+    eventParts: eventParts,
+    screensaverWindowsAfter: screensaverWindowsAfter
+  }
+}
diff --git a/shell/plugins/services/idle/Service.qml b/shell/plugins/services/idle/Service.qml
new file mode 100644
index 00000000..9542c10a
--- /dev/null
+++ b/shell/plugins/services/idle/Service.qml
@@ -0,0 +1,360 @@
+import QtQuick
+import Quickshell
+import Quickshell.Hyprland
+import Quickshell.Io
+import Quickshell.Wayland
+import "IdleModel.js" as IdleModel
+
+Item {
+  id: root
+
+  // Injected by omarchy-shell (the first-party service loader).
+  property var shell: null
+
+  readonly property string home: Quickshell.env("HOME")
+  readonly property string stayAwakeStateDir: home + "/.local/state/omarchy/indicators"
+  readonly property string stayAwakeStatePath: stayAwakeStateDir + "/stay-awake"
+  readonly property int defaultScreensaverSeconds: 150
+  readonly property int defaultLockSeconds: 300
+  readonly property var idleConfig: shell && shell.shellConfig && shell.shellConfig.idle ? shell.shellConfig.idle : ({})
+  readonly property int screensaverTimeoutSeconds: secondsFromConfig(idleConfig.screensaver, defaultScreensaverSeconds)
+  readonly property int lockTimeoutSeconds: secondsFromConfig(idleConfig.lock, defaultLockSeconds)
+  readonly property int firstIdleTimeoutSeconds: Math.min(screensaverTimeoutSeconds, lockTimeoutSeconds)
+  readonly property int screensaverDelaySeconds: Math.max(0, screensaverTimeoutSeconds - firstIdleTimeoutSeconds)
+  readonly property int lockDelaySeconds: Math.max(0, lockTimeoutSeconds - firstIdleTimeoutSeconds)
+  readonly property bool idleEnabled: stayAwakeStateLoaded && !stayAwake
+  readonly property string screensaverClass: "org.omarchy.screensaver"
+
+  property bool stayAwake: false
+  property bool stayAwakeStateLoaded: false
+  property bool hasPendingStayAwakePersist: false
+  property bool pendingStayAwakePersist: false
+  property bool idledThisCycle: false
+  property bool screensaverStartedThisCycle: false
+  property string lastEvent: "starting"
+  property string lastEventAt: ""
+  property var screensaverWindows: ({})
+  property int screensaverWindowCount: 0
+
+  function secondsFromConfig(value, fallback) {
+    return IdleModel.secondsFromConfig(value, fallback)
+  }
+
+  function nowIso() {
+    return new Date().toISOString()
+  }
+
+  function logEvent(event, details) {
+    var suffix = details === undefined || details === null || details === "" ? "" : ": " + String(details)
+    root.lastEventAt = nowIso()
+    root.lastEvent = event + suffix
+    console.log("omarchy idle " + root.lastEventAt + " " + root.lastEvent)
+  }
+
+  function runProcess(process, label, command) {
+    if (process.running) {
+      logEvent("process-skip", label + " already running")
+      return false
+    }
+    logEvent("process-start", label + " " + command)
+    process.command = ["bash", "-lc", command]
+    process.running = true
+    return true
+  }
+
+  function launchScreensaver() {
+    root.screensaverStartedThisCycle = true
+    screensaverLaunchGraceTimer.restart()
+    runProcess(screensaverProcess, "screensaver", "[[ $(omarchy-shell lock isLocked 2>/dev/null) == \"true\" ]] || omarchy-launch-screensaver")
+  }
+
+  function lockSystem(reason) {
+    logEvent("lock-system", reason || "requested")
+    screensaverTimer.stop()
+    lockTimer.stop()
+    screensaverLaunchGraceTimer.stop()
+    root.idledThisCycle = false
+    root.screensaverStartedThisCycle = false
+    resetScreensaverWindows()
+    runProcess(lockProcess, "lock", "omarchy-system-lock")
+  }
+
+  function startIdleCycle() {
+    if (root.idledThisCycle) {
+      logEvent("idle-cycle-already-running")
+      return
+    }
+
+    logEvent("idle-cycle-start", "screensaver=" + root.screensaverTimeoutSeconds + " lock=" + root.lockTimeoutSeconds)
+    root.idledThisCycle = true
+    root.screensaverStartedThisCycle = false
+    resetScreensaverWindows()
+
+    if (root.screensaverDelaySeconds === 0) launchScreensaver()
+    else screensaverTimer.restart()
+
+    if (root.lockDelaySeconds === 0) lockSystem("lock-timeout-immediate")
+    else lockTimer.restart()
+  }
+
+  function cancelIdleCycle(reason) {
+    logEvent("idle-cycle-cancel", reason || "requested")
+    screensaverTimer.stop()
+    lockTimer.stop()
+    screensaverLaunchGraceTimer.stop()
+
+    if (root.idledThisCycle) runProcess(wakeProcess, "wake", "omarchy-system-wake")
+
+    root.idledThisCycle = false
+    root.screensaverStartedThisCycle = false
+    resetScreensaverWindows()
+  }
+
+  function resetScreensaverWindows() {
+    root.screensaverWindows = ({})
+    root.screensaverWindowCount = 0
+  }
+
+  function setScreensaverWindow(address, visible) {
+    var next = IdleModel.screensaverWindowsAfter(root.screensaverWindows, address, visible)
+    root.screensaverWindows = next.windows
+    root.screensaverWindowCount = next.count
+  }
+
+  function handleScreensaverWindowOpened(address) {
+    setScreensaverWindow(address, true)
+    screensaverLaunchGraceTimer.stop()
+  }
+
+  function handleScreensaverWindowClosed(address) {
+    setScreensaverWindow(address, false)
+
+    if (!root.idleEnabled || !root.idledThisCycle || !root.screensaverStartedThisCycle) return
+    if (root.screensaverWindowCount > 0) return
+
+    // The user dismissed the screensaver before the lock deadline. Treat that
+    // as activity and cancel the pending lock; the lock timer is only allowed
+    // to fire while the screensaver remains up.
+    root.cancelIdleCycle("screensaver-dismissed")
+  }
+
+  function eventParts(event, count) {
+    return IdleModel.eventParts(event, count)
+  }
+
+  function handleHyprlandEvent(event) {
+    var name = String(event && event.name ? event.name : "")
+    if (name === "openwindow") {
+      var open = eventParts(event, 4)
+      if (String(open[2] || "") === root.screensaverClass) root.handleScreensaverWindowOpened(open[0])
+    } else if (name === "closewindow") {
+      var close = eventParts(event, 1)
+      var address = String(close[0] || "")
+      if (root.screensaverWindows[address]) root.handleScreensaverWindowClosed(address)
+    }
+  }
+
+  function handleActiveSignal() {
+    if (!root.idledThisCycle) return
+
+    // Starting the screensaver can make the compositor report activity. Keep
+    // the lock timer running once the screensaver exists (or during its short
+    // launch grace); Hyprland window events cancel the cycle if it exits before
+    // the normal lock deadline.
+    if (root.screensaverStartedThisCycle && (root.screensaverWindowCount > 0 || screensaverLaunchGraceTimer.running)) {
+      logEvent("idle-monitor-active", "screensaver cycle remains armed")
+      return
+    }
+
+    cancelIdleCycle("activity")
+  }
+
+  function handleIdleChanged() {
+    logEvent("idle-monitor", idleMonitor.isIdle ? "idle" : "active")
+    if (!root.idleEnabled) return
+
+    if (idleMonitor.isIdle) startIdleCycle()
+    else handleActiveSignal()
+  }
+
+  function statusJson() {
+    return JSON.stringify({
+      enabled: root.idleEnabled,
+      stayAwake: root.stayAwake,
+      stayAwakeStateLoaded: root.stayAwakeStateLoaded,
+      stayAwakeStatePath: root.stayAwakeStatePath,
+      idle: idleMonitor.isIdle,
+      inIdleCycle: root.idledThisCycle,
+      screensaverStarted: root.screensaverStartedThisCycle,
+      screensaver: root.screensaverTimeoutSeconds,
+      lock: root.lockTimeoutSeconds,
+      screensaverDelay: root.screensaverDelaySeconds,
+      lockDelay: root.lockDelaySeconds,
+      screensaverWindows: root.screensaverWindowCount,
+      timers: {
+        screensaver: screensaverTimer.running,
+        lock: lockTimer.running,
+        screensaverLaunchGrace: screensaverLaunchGraceTimer.running
+      },
+      processes: {
+        screensaver: screensaverProcess.running,
+        lock: lockProcess.running,
+        wake: wakeProcess.running
+      },
+      lastEvent: root.lastEvent,
+      lastEventAt: root.lastEventAt
+    })
+  }
+
+  function persistStayAwake(value) {
+    var command = value
+      ? "mkdir -p \"$HOME/.local/state/omarchy/indicators\" && touch \"$HOME/.local/state/omarchy/indicators/stay-awake\""
+      : "rm -f \"$HOME/.local/state/omarchy/indicators/stay-awake\""
+
+    if (stayAwakeStateWriter.running) {
+      root.pendingStayAwakePersist = !!value
+      root.hasPendingStayAwakePersist = true
+      return
+    }
+
+    stayAwakeStateWriter.command = ["bash", "-lc", command]
+    stayAwakeStateWriter.running = true
+  }
+
+  function refreshStayAwakeState() {
+    if (!stayAwakeStateProbe.running) stayAwakeStateProbe.running = true
+  }
+
+  function applyStayAwake(value, persist, reason) {
+    var enabled = !!value
+    var changed = !root.stayAwakeStateLoaded || root.stayAwake !== enabled
+
+    if (persist) persistStayAwake(enabled)
+
+    root.stayAwake = enabled
+    root.stayAwakeStateLoaded = true
+
+    if (!changed) return enabled ? "disabled" : "enabled"
+
+    logEvent("stay-awake", (enabled ? "enabled" : "disabled") + (reason ? " " + reason : ""))
+    if (enabled) cancelIdleCycle("stay-awake")
+    else Qt.callLater(root.handleIdleChanged)
+
+    return enabled ? "disabled" : "enabled"
+  }
+
+  function setIdleEnabled(value) {
+    return applyStayAwake(!value, true, "ipc")
+  }
+
+  IdleMonitor {
+    id: idleMonitor
+    enabled: root.idleEnabled
+    timeout: root.firstIdleTimeoutSeconds
+    respectInhibitors: true
+    onIsIdleChanged: root.handleIdleChanged()
+  }
+
+  Timer {
+    id: screensaverTimer
+    interval: root.screensaverDelaySeconds * 1000
+    repeat: false
+    onTriggered: root.launchScreensaver()
+  }
+
+  Timer {
+    id: lockTimer
+    interval: root.lockDelaySeconds * 1000
+    repeat: false
+    onTriggered: if (root.idleEnabled && root.idledThisCycle) root.lockSystem("lock-timeout")
+  }
+
+  Timer {
+    id: screensaverLaunchGraceTimer
+    interval: 3000
+    repeat: false
+    onTriggered: {
+      if (root.idleEnabled && root.idledThisCycle && root.screensaverStartedThisCycle && root.screensaverWindowCount === 0 && !idleMonitor.isIdle) {
+        root.cancelIdleCycle("screensaver-not-running")
+      }
+    }
+  }
+
+  Connections {
+    target: Hyprland
+    function onRawEvent(event) { root.handleHyprlandEvent(event) }
+  }
+
+  Process {
+    id: screensaverProcess
+    onExited: function(exitCode, exitStatus) { root.logEvent("process-exit", "screensaver exitCode=" + exitCode + " status=" + exitStatus) }
+  }
+  Process {
+    id: lockProcess
+    onExited: function(exitCode, exitStatus) { root.logEvent("process-exit", "lock exitCode=" + exitCode + " status=" + exitStatus) }
+  }
+  Process {
+    id: wakeProcess
+    onExited: function(exitCode, exitStatus) { root.logEvent("process-exit", "wake exitCode=" + exitCode + " status=" + exitStatus) }
+  }
+
+  Process {
+    id: stayAwakeStateProbe
+    command: ["bash", "-lc", "mkdir -p \"$HOME/.local/state/omarchy/indicators\"; if [[ -f $HOME/.local/state/omarchy/indicators/stay-awake ]]; then echo yes; else echo no; fi"]
+    stdout: SplitParser {
+      onRead: function(line) { root.applyStayAwake(String(line).trim() === "yes", false, "state-file") }
+    }
+    onExited: function() { stayAwakeStateDirWatcher.reload() }
+  }
+
+  Process {
+    id: stayAwakeStateWriter
+    onExited: function() {
+      if (root.hasPendingStayAwakePersist) {
+        var pending = root.pendingStayAwakePersist
+        root.hasPendingStayAwakePersist = false
+        root.persistStayAwake(pending)
+        return
+      }
+
+      root.refreshStayAwakeState()
+    }
+  }
+
+  FileView {
+    id: stayAwakeStateDirWatcher
+    path: root.stayAwakeStateDir
+    watchChanges: true
+    printErrors: false
+    onFileChanged: root.refreshStayAwakeState()
+  }
+
+  Component.onCompleted: {
+    logEvent("service-ready")
+    refreshStayAwakeState()
+  }
+
+  IpcHandler {
+    target: "idle"
+
+    function status(): string {
+      return root.statusJson()
+    }
+
+    function debug(): string {
+      return root.statusJson()
+    }
+
+    function enable(): string {
+      return root.setIdleEnabled(true)
+    }
+
+    function disable(): string {
+      return root.setIdleEnabled(false)
+    }
+
+    function toggle(): string {
+      return root.setIdleEnabled(!root.idleEnabled)
+    }
+  }
+}
diff --git a/shell/plugins/services/idle/manifest.json b/shell/plugins/services/idle/manifest.json
new file mode 100644
index 00000000..65b777b3
--- /dev/null
+++ b/shell/plugins/services/idle/manifest.json
@@ -0,0 +1,15 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.idle",
+  "name": "Idle",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "Quickshell-based idle detection for screensaver, lock, and display wake.",
+  "kinds": [
+    "service"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "service": "Service.qml"
+  }
+}
diff --git a/shell/plugins/services/media/BarWidget.qml b/shell/plugins/services/media/BarWidget.qml
new file mode 100644
index 00000000..942c8b8a
--- /dev/null
+++ b/shell/plugins/services/media/BarWidget.qml
@@ -0,0 +1,305 @@
+import QtQuick
+import Quickshell
+import qs.Ui
+import qs.Commons
+
+BarWidget {
+  id: root
+  moduleName: "omarchy.media"
+
+  readonly property var mediaService: bar && bar.shell ? bar.shell.firstPartyServiceFor("omarchy.media") : null
+  readonly property var activePlayer: mediaService ? mediaService.activePlayer : null
+  readonly property var sourcePlayers: mediaService ? mediaService.sourcePlayers : []
+
+  readonly property bool hasMedia: activePlayer !== null && (activePlayer.trackTitle || activePlayer.trackArtist)
+  readonly property string playIcon: activePlayer && activePlayer.isPlaying ? "󰏤" : "󰐊"
+  readonly property string title: activePlayer ? (activePlayer.trackTitle || "") : ""
+  readonly property string artist: activePlayer ? (activePlayer.trackArtist || "") : ""
+
+  property bool popupOpen: false
+
+  function close() { popupOpen = false }
+  property real maxLabelWidth: 180
+
+  visible: hasMedia
+  implicitWidth: hasMedia ? row.implicitWidth + Style.space(14) : 0
+  implicitHeight: barSize
+
+  Row {
+    id: row
+    anchors.centerIn: parent
+    spacing: Style.space(6)
+
+    Text {
+      id: glyph
+      anchors.verticalCenter: parent.verticalCenter
+      text: root.playIcon
+      color: activePlayer && activePlayer.isPlaying ? root.bar.barForeground : Qt.darker(root.bar.barForeground, 1.5)
+      font.family: root.bar.fontFamily
+      font.pixelSize: Style.font.body
+      Behavior on color {
+        enabled: !root.bar || root.bar.foregroundAnimationEnabled
+        ColorAnimation { duration: 160 }
+      }
+    }
+
+    Item {
+      id: scrollClip
+      width: Math.min(root.maxLabelWidth, labelText.implicitWidth)
+      height: glyph.height
+      clip: true
+      anchors.verticalCenter: parent.verticalCenter
+      visible: !root.bar.vertical && root.title !== ""
+
+      Text {
+        id: labelText
+        text: root.title + (root.artist ? "  ·  " + root.artist : "")
+        color: root.bar.barForeground
+        font.family: root.bar.fontFamily
+        font.pixelSize: Style.font.body
+        anchors.verticalCenter: parent.verticalCenter
+
+        property bool needsScroll: implicitWidth > scrollClip.width
+
+        NumberAnimation on x {
+          id: scrollAnim
+          running: labelText.needsScroll && !root.popupOpen && !root.bar.vertical
+          loops: Animation.Infinite
+          duration: Math.max(6000, labelText.implicitWidth * 25)
+          from: scrollClip.width
+          to: -labelText.implicitWidth
+          easing.type: Easing.Linear
+        }
+      }
+    }
+  }
+
+  MouseArea {
+    anchors.fill: parent
+    hoverEnabled: true
+    cursorShape: root.activePlayer ? Qt.PointingHandCursor : Qt.ArrowCursor
+    acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
+
+    onClicked: function(mouse) {
+      if (!root.activePlayer) return
+      if (mouse.button === Qt.MiddleButton) {
+        if (root.mediaService) root.mediaService.runAction("next", false)
+      } else if (mouse.button === Qt.RightButton) {
+        root.popupOpen = !root.popupOpen
+      } else {
+        if (root.mediaService) root.mediaService.runAction("playPause", false)
+      }
+    }
+    onWheel: function(wheel) {
+      if (!root.activePlayer) return
+      if (wheel.angleDelta.y > 0 && root.mediaService) root.mediaService.runAction("previous", false)
+      else if (wheel.angleDelta.y < 0 && root.mediaService) root.mediaService.runAction("next", false)
+    }
+    onEntered: if (root.bar) root.bar.showTooltip(root, root.hasMedia ? (root.title + (root.artist ? " — " + root.artist : "")) : "")
+    onExited: if (root.bar) root.bar.hideTooltip(root)
+  }
+
+  PopupCard {
+    id: popup
+    anchorItem: root
+    bar: root.bar
+    owner: root
+    open: root.popupOpen
+    contentWidth: popup.fittedContentWidth(Style.space(320))
+    contentHeight: popup.fittedContentHeight(column.implicitHeight)
+
+    Column {
+      id: column
+      anchors.fill: parent
+      spacing: Style.space(10)
+
+      Row {
+        spacing: Style.space(10)
+        width: parent.width
+
+        BorderSurface {
+          width: Style.space(64)
+          height: Style.space(64)
+          radius: Style.spacing.labelGap
+          color: Style.normalFillFor(root.bar.foreground, Color.accent)
+          borderSpec: Border.controlSpec("normal", root.bar.foreground, Color.accent)
+
+          Image {
+            anchors.fill: parent
+            anchors.margins: Style.space(2)
+            fillMode: Image.PreserveAspectCrop
+            asynchronous: true
+            source: root.activePlayer && root.activePlayer.trackArtUrl ? root.activePlayer.trackArtUrl : ""
+            visible: source !== ""
+          }
+
+          Text {
+            anchors.centerIn: parent
+            visible: !root.activePlayer || !root.activePlayer.trackArtUrl
+            text: "󰝚"
+            color: root.bar.foreground
+            font.family: root.bar.fontFamily
+            font.pixelSize: Style.font.displayLarge
+          }
+        }
+
+        Column {
+          spacing: Style.space(4)
+          width: parent.width - Style.space(74)
+
+          Text {
+            text: root.title || "Nothing playing"
+            color: root.bar.foreground
+            font.family: root.bar.fontFamily
+            font.pixelSize: Style.font.subtitle
+            font.bold: true
+            elide: Text.ElideRight
+            width: parent.width
+          }
+
+          Text {
+            text: root.artist
+            color: Qt.darker(root.bar.foreground, 1.3)
+            font.family: root.bar.fontFamily
+            font.pixelSize: Style.font.bodySmall
+            elide: Text.ElideRight
+            width: parent.width
+            visible: text !== ""
+          }
+
+          Text {
+            text: root.activePlayer && root.activePlayer.trackAlbum ? root.activePlayer.trackAlbum : ""
+            color: Qt.darker(root.bar.foreground, 1.6)
+            font.family: root.bar.fontFamily
+            font.pixelSize: Style.font.caption
+            elide: Text.ElideRight
+            width: parent.width
+            visible: text !== ""
+          }
+        }
+      }
+
+      Row {
+        anchors.horizontalCenter: parent.horizontalCenter
+        spacing: Style.space(6)
+
+        Button {
+          iconText: "󰒮"
+          foreground: root.bar.foreground
+          horizontalPadding: Style.spacing.controlPaddingX
+          verticalPadding: Style.spacing.controlPaddingY
+          enabled: root.activePlayer && root.activePlayer.canGoPrevious
+          opacity: enabled ? 1.0 : 0.4
+          onClicked: if (root.mediaService) root.mediaService.runAction("previous", false, root.mediaService.playerKey(root.activePlayer))
+        }
+
+        Button {
+          iconText: root.activePlayer && root.activePlayer.isPlaying ? "󰏤" : "󰐊"
+          foreground: root.bar.foreground
+          horizontalPadding: Style.spacing.panelGap
+          verticalPadding: Style.spacing.controlPaddingY
+          iconSize: Style.font.iconLarge
+          enabled: root.activePlayer && (root.activePlayer.canTogglePlaying || root.activePlayer.canPlay || root.activePlayer.canPause)
+          opacity: enabled ? 1.0 : 0.4
+          onClicked: if (root.mediaService) root.mediaService.runAction("playPause", false, root.mediaService.playerKey(root.activePlayer))
+        }
+
+        Button {
+          iconText: "󰒭"
+          foreground: root.bar.foreground
+          horizontalPadding: Style.spacing.controlPaddingX
+          verticalPadding: Style.spacing.controlPaddingY
+          enabled: root.activePlayer && root.activePlayer.canGoNext
+          opacity: enabled ? 1.0 : 0.4
+          onClicked: if (root.mediaService) root.mediaService.runAction("next", false, root.mediaService.playerKey(root.activePlayer))
+        }
+      }
+
+      PanelSeparator {
+        visible: root.sourcePlayers.length > 1
+        foreground: root.bar.foreground
+      }
+
+      Column {
+        id: sourceList
+        visible: root.sourcePlayers.length > 1
+        width: parent.width
+        spacing: Style.space(4)
+
+        Repeater {
+          model: root.sourcePlayers
+
+          BorderSurface {
+            id: sourceRow
+            required property var modelData
+
+            readonly property var player: modelData
+            readonly property bool selected: root.activePlayer && player
+              && root.mediaService.playerKey(root.activePlayer) === root.mediaService.playerKey(player)
+            readonly property string sourceTitle: player ? (player.trackTitle || player.identity || player.desktopEntry || "Media source") : "Media source"
+            readonly property string sourceDetail: player && player.trackArtist ? player.trackArtist : (player && player.identity ? player.identity : "")
+
+            width: sourceList.width
+            height: sourceInner.implicitHeight + Style.space(10)
+            radius: Style.spacing.labelGap
+            color: selected ? Style.selectedFillFor(root.bar.foreground, Color.accent) : "transparent"
+            borderSpec: selected ? Border.controlSpec("normal", root.bar.foreground, Color.accent) : Border.none()
+
+            Row {
+              id: sourceInner
+              anchors.left: parent.left
+              anchors.right: parent.right
+              anchors.verticalCenter: parent.verticalCenter
+              anchors.leftMargin: sourceRow.borderLeft + Style.space(8)
+              anchors.rightMargin: sourceRow.borderRight + Style.space(8)
+              spacing: Style.space(8)
+
+              Text {
+                text: sourceRow.player && sourceRow.player.isPlaying ? "󰏤" : "󰐊"
+                color: root.bar.foreground
+                font.family: root.bar.fontFamily
+                font.pixelSize: Style.font.body
+                width: Style.space(18)
+                horizontalAlignment: Text.AlignHCenter
+                anchors.verticalCenter: parent.verticalCenter
+              }
+
+              Column {
+                width: parent.width - Style.space(26)
+                spacing: Style.space(1)
+                anchors.verticalCenter: parent.verticalCenter
+
+                Text {
+                  text: sourceRow.sourceTitle
+                  color: root.bar.foreground
+                  font.family: root.bar.fontFamily
+                  font.pixelSize: Style.font.bodySmall
+                  font.bold: sourceRow.selected
+                  elide: Text.ElideRight
+                  width: parent.width
+                }
+
+                Text {
+                  text: sourceRow.sourceDetail
+                  color: Qt.darker(root.bar.foreground, 1.5)
+                  font.family: root.bar.fontFamily
+                  font.pixelSize: Style.font.caption
+                  elide: Text.ElideRight
+                  width: parent.width
+                  visible: text !== ""
+                }
+              }
+            }
+
+            MouseArea {
+              anchors.fill: parent
+              hoverEnabled: true
+              cursorShape: Qt.PointingHandCursor
+              onClicked: if (root.mediaService) root.mediaService.selectPlayer(root.mediaService.playerKey(sourceRow.player))
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shell/plugins/services/media/MediaModel.js b/shell/plugins/services/media/MediaModel.js
new file mode 100644
index 00000000..00cc9130
--- /dev/null
+++ b/shell/plugins/services/media/MediaModel.js
@@ -0,0 +1,126 @@
+function isProxyPlayer(player) {
+  var dbusName = String(player && player.dbusName || "").toLowerCase()
+  var desktopEntry = String(player && player.desktopEntry || "").toLowerCase()
+  return dbusName.indexOf("playerctld") !== -1 || desktopEntry === "playerctld"
+}
+
+function hasMetadata(player) {
+  return !!(player && (player.trackTitle || player.trackArtist || player.identity || player.desktopEntry))
+}
+
+function hasTrackMetadata(player) {
+  return !!(player && (player.trackTitle || player.trackArtist || player.trackAlbum || player.trackArtUrl))
+}
+
+function playerCanControl(player) {
+  return !!(player && (player.canTogglePlaying || player.canPlay || player.canPause || player.canGoNext || player.canGoPrevious))
+}
+
+function canHandleAction(player, action) {
+  if (!player) return false
+  if (action === "next") return !!player.canGoNext
+  if (action === "previous") return !!player.canGoPrevious
+  if (action === "play") return !!(player.canPlay || player.canTogglePlaying)
+  if (action === "pause") return !!(player.canPause || player.canTogglePlaying)
+  if (action === "playPause") return !!(player.canTogglePlaying || player.canPlay || player.canPause)
+  return false
+}
+
+function canCycleSource(player) {
+  return !!(player && hasMetadata(player) && (player.isPlaying || player.canPlay))
+}
+
+function nodeProps(node) {
+  return node && node.ready && node.properties ? node.properties : {}
+}
+
+function isPlaybackStream(node) {
+  if (!node || !node.isStream) return false
+  if (node.isSink === true) return true
+
+  var mediaClass = String(node.type || "")
+  return mediaClass.indexOf("Stream/Output/Audio") !== -1
+    || mediaClass.indexOf("AudioOutStream") !== -1
+    || mediaClass.indexOf("Output") !== -1
+}
+
+function streamLabelKey(label) {
+  var key = String(label || "").toLowerCase()
+  key = key.replace(/^pipewire alsa \[/, "")
+  key = key.replace(/\]$/, "")
+  key = key.replace(/^alsa playback \[/, "")
+  key = key.replace(/[^a-z0-9]+/g, "")
+  return key
+}
+
+function rawStreamLabel(node) {
+  if (!node) return ""
+  var p = nodeProps(node)
+  return p["application.name"]
+    || node.description
+    || p["media.name"]
+    || p["node.name"]
+    || node.name
+}
+
+function playerAppLabel(player) {
+  if (!player) return ""
+  var dbus = String(player.dbusName || "")
+  dbus = dbus.replace(/^org\.mpris\.MediaPlayer2\./, "")
+  dbus = dbus.replace(/\.instance[0-9]+$/, "")
+  return player.desktopEntry || player.identity || dbus
+}
+
+function playerHasPlaybackStream(player, playbackStreams) {
+  var playerKey = streamLabelKey(playerAppLabel(player))
+  if (!playerKey) return false
+
+  var streams = Array.isArray(playbackStreams) ? playbackStreams : []
+  for (var i = 0; i < streams.length; i++) {
+    var streamKey = streamLabelKey(rawStreamLabel(streams[i]))
+    if (!streamKey) continue
+    if (streamKey === playerKey
+        || streamKey.indexOf(playerKey) !== -1
+        || playerKey.indexOf(streamKey) !== -1)
+      return true
+  }
+
+  return false
+}
+
+function playerKey(player) {
+  if (!player) return ""
+  return String(player.dbusName || player.desktopEntry || player.identity || "")
+}
+
+function labelFor(player) {
+  if (!player) return ""
+  return player.trackTitle || player.identity || player.desktopEntry || ""
+}
+
+function osdMessage(player, fallback) {
+  if (!player) return fallback
+  var label = labelFor(player)
+  if (label && player.trackArtist) return label + " - " + player.trackArtist
+  return label || fallback
+}
+
+if (typeof module !== "undefined") {
+  module.exports = {
+    isProxyPlayer: isProxyPlayer,
+    hasMetadata: hasMetadata,
+    hasTrackMetadata: hasTrackMetadata,
+    playerCanControl: playerCanControl,
+    canHandleAction: canHandleAction,
+    canCycleSource: canCycleSource,
+    nodeProps: nodeProps,
+    isPlaybackStream: isPlaybackStream,
+    streamLabelKey: streamLabelKey,
+    rawStreamLabel: rawStreamLabel,
+    playerAppLabel: playerAppLabel,
+    playerHasPlaybackStream: playerHasPlaybackStream,
+    playerKey: playerKey,
+    labelFor: labelFor,
+    osdMessage: osdMessage
+  }
+}
diff --git a/shell/plugins/services/media/Service.qml b/shell/plugins/services/media/Service.qml
new file mode 100644
index 00000000..66f9d820
--- /dev/null
+++ b/shell/plugins/services/media/Service.qml
@@ -0,0 +1,468 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import Quickshell.Services.Mpris
+import Quickshell.Services.Pipewire
+import "MediaModel.js" as MediaModel
+
+Item {
+  id: root
+
+  property var shell: null
+  property string preferredPlayerKey: ""
+  property var playerStartedAt: ({})
+  property int playSerial: 0
+
+  readonly property var players: Mpris.players ? Mpris.players.values : []
+  readonly property var nodes: Pipewire.nodes ? Pipewire.nodes.values : []
+  readonly property var playbackStreams: {
+    var list = []
+    for (var i = 0; i < nodes.length; i++) {
+      var n = nodes[i]
+      if (n && n.isStream && isPlaybackStream(n) && n.audio) list.push(n)
+    }
+    return list
+  }
+  readonly property var sourcePlayers: orderedSourcePlayers()
+  readonly property var sourceCyclePlayers: orderedCycleSourcePlayers()
+  readonly property var activePlayer: selectActivePlayer()
+  readonly property bool hasMedia: activePlayer !== null && (activePlayer.trackTitle || activePlayer.trackArtist)
+  readonly property string title: activePlayer ? (activePlayer.trackTitle || "") : ""
+  readonly property string artist: activePlayer ? (activePlayer.trackArtist || "") : ""
+  readonly property string album: activePlayer && activePlayer.trackAlbum ? activePlayer.trackAlbum : ""
+  readonly property string artUrl: activePlayer && activePlayer.trackArtUrl ? activePlayer.trackArtUrl : ""
+  readonly property string identity: activePlayer ? (activePlayer.identity || activePlayer.desktopEntry || "") : ""
+
+  function isProxyPlayer(player) {
+    return MediaModel.isProxyPlayer(player)
+  }
+
+  function hasMetadata(player) {
+    return MediaModel.hasMetadata(player)
+  }
+
+  function hasTrackMetadata(player) {
+    return MediaModel.hasTrackMetadata(player)
+  }
+
+  function playerCanControl(player) {
+    return MediaModel.playerCanControl(player)
+  }
+
+  function canHandleAction(player, action) {
+    return MediaModel.canHandleAction(player, action)
+  }
+
+  function canCycleSource(player) {
+    return MediaModel.canCycleSource(player)
+  }
+
+  function nodeProps(node) {
+    return MediaModel.nodeProps(node)
+  }
+
+  function isPlaybackStream(node) {
+    return MediaModel.isPlaybackStream(node)
+  }
+
+  function streamLabelKey(label) {
+    return MediaModel.streamLabelKey(label)
+  }
+
+  function rawStreamLabel(node) {
+    return MediaModel.rawStreamLabel(node)
+  }
+
+  function playerAppLabel(player) {
+    return MediaModel.playerAppLabel(player)
+  }
+
+  function playerHasPlaybackStream(player) {
+    return MediaModel.playerHasPlaybackStream(player, playbackStreams)
+  }
+
+  function playerKey(player) {
+    return MediaModel.playerKey(player)
+  }
+
+  function playerForKey(key) {
+    if (!key) return null
+    for (var i = 0; i < players.length; i++) {
+      var p = players[i]
+      if (playerKey(p) === key) return p
+    }
+    return null
+  }
+
+  function playerOrder(player, fallback) {
+    var key = playerKey(player)
+    var value = key ? playerStartedAt[key] : undefined
+    return value === undefined ? fallback : value
+  }
+
+  function syncPlayingOrder() {
+    var next = {}
+    var alive = {}
+    var serial = playSerial
+
+    for (var i = 0; i < players.length; i++) {
+      var p = players[i]
+      var key = playerKey(p)
+      if (!key) continue
+
+      alive[key] = true
+      if (!p.isPlaying) continue
+
+      if (playerStartedAt[key] === undefined) {
+        serial += 1
+        next[key] = serial
+      } else {
+        next[key] = playerStartedAt[key]
+      }
+    }
+
+    if (preferredPlayerKey && !alive[preferredPlayerKey]) preferredPlayerKey = ""
+
+    playSerial = serial
+    playerStartedAt = next
+  }
+
+  function orderedSourcePlayers() {
+    var list = []
+    for (var i = 0; i < players.length; i++) {
+      var p = players[i]
+      if (hasMetadata(p)) list.push(p)
+    }
+
+    list.sort(function(a, b) {
+      if (!!a.isPlaying !== !!b.isPlaying) return a.isPlaying ? -1 : 1
+      if (isProxyPlayer(a) !== isProxyPlayer(b)) return isProxyPlayer(a) ? 1 : -1
+      if (a.isPlaying && b.isPlaying) {
+        var orderDelta = playerOrder(a, 1000) - playerOrder(b, 1000)
+        if (orderDelta !== 0) return orderDelta
+      }
+      return labelFor(a).localeCompare(labelFor(b))
+    })
+
+    return list
+  }
+
+  function orderedCycleSourcePlayers() {
+    var list = []
+    for (var i = 0; i < players.length; i++) {
+      var p = players[i]
+      if (canCycleSource(p)) list.push(p)
+    }
+
+    list.sort(function(a, b) {
+      if (isProxyPlayer(a) !== isProxyPlayer(b)) return isProxyPlayer(a) ? 1 : -1
+      return labelFor(a).localeCompare(labelFor(b))
+    })
+
+    return list
+  }
+
+  function oldestPlayingPlayer(requirePlaybackStream) {
+    var oldest = null
+    var oldestOrder = 0
+    var playingProxy = null
+    var proxyOrder = 0
+
+    for (var i = 0; i < players.length; i++) {
+      var p = players[i]
+      if (!p) continue
+
+      var proxyPlayer = isProxyPlayer(p)
+      if (p.isPlaying) {
+        if (requirePlaybackStream && !playerHasPlaybackStream(p)) continue
+
+        var order = playerOrder(p, i + 1000)
+        if (!proxyPlayer && (!oldest || order < oldestOrder)) {
+          oldest = p
+          oldestOrder = order
+        } else if (proxyPlayer && (!playingProxy || order < proxyOrder)) {
+          playingProxy = p
+          proxyOrder = order
+        }
+      }
+    }
+
+    return oldest || playingProxy || null
+  }
+
+  function selectActivePlayer() {
+    var preferred = null
+    var trackPlayer = null
+    var trackProxy = null
+    var streamPlayer = null
+    var streamProxy = null
+    var controllablePlayer = null
+    var controllableProxy = null
+    var identityPlayer = null
+    var identityProxy = null
+
+    for (var i = 0; i < players.length; i++) {
+      var p = players[i]
+      if (!p) continue
+
+      var proxy = isProxyPlayer(p)
+
+      if (preferredPlayerKey && playerKey(p) === preferredPlayerKey && hasMetadata(p)) preferred = p
+
+      if (playerHasPlaybackStream(p)) {
+        if (!proxy && !streamPlayer) streamPlayer = p
+        else if (proxy && !streamProxy) streamProxy = p
+      } else if (hasTrackMetadata(p)) {
+        if (!proxy && !trackPlayer) trackPlayer = p
+        else if (proxy && !trackProxy) trackProxy = p
+      } else if (playerCanControl(p)) {
+        if (!proxy && !controllablePlayer) controllablePlayer = p
+        else if (proxy && !controllableProxy) controllableProxy = p
+      } else if (hasMetadata(p)) {
+        if (!proxy && !identityPlayer) identityPlayer = p
+        else if (proxy && !identityProxy) identityProxy = p
+      }
+    }
+
+    if (preferred && preferred.isPlaying) return preferred
+    var streamCandidate = streamPlayer || streamProxy
+    var streamPreferred = preferred && playerHasPlaybackStream(preferred) ? preferred : null
+    return oldestPlayingPlayer(true) || oldestPlayingPlayer(false) || streamPreferred || streamCandidate || preferred || trackPlayer || trackProxy || controllablePlayer || controllableProxy || identityPlayer || identityProxy || null
+  }
+
+  function labelFor(player) {
+    return MediaModel.labelFor(player)
+  }
+
+  function osdMessage(player, fallback) {
+    return MediaModel.osdMessage(player, fallback)
+  }
+
+  function showOsd(actionLabel, iconName, player) {
+    if (!shell) return
+    shell.summon("omarchy.osd", JSON.stringify({
+      icon: iconName || "media",
+      message: osdMessage(player || activePlayer, actionLabel)
+    }))
+  }
+
+  function selectPlayer(key) {
+    var player = playerForKey(key)
+    if (!player || !hasMetadata(player)) return false
+    preferredPlayerKey = playerKey(player)
+    return true
+  }
+
+  function playPlayer(player) {
+    if (!player) return false
+    if (player.canPlay) {
+      player.play()
+      return true
+    }
+    return false
+  }
+
+  function pausePlayer(player) {
+    if (!player) return false
+    if (player.canPause) {
+      player.pause()
+      return true
+    }
+    if (player.canTogglePlaying && player.isPlaying) {
+      player.togglePlaying()
+      return true
+    }
+    return false
+  }
+
+  function switchSource(delta, transferPlayback, showFeedback) {
+    var list = sourceCyclePlayers
+    if (!list || list.length === 0) return false
+
+    var activeKey = playerKey(activePlayer)
+    var index = 0
+    for (var i = 0; i < list.length; i++) {
+      if (playerKey(list[i]) === activeKey) {
+        index = i
+        break
+      }
+    }
+
+    index = (index + delta + list.length) % list.length
+    var current = activePlayer
+    var next = list[index]
+    var currentWasPlaying = current && current.isPlaying
+    var currentKey = playerKey(current)
+    var nextKey = playerKey(next)
+
+    preferredPlayerKey = nextKey
+
+    if (transferPlayback && currentWasPlaying && next && nextKey !== currentKey) {
+      var nextWasPlaying = next.isPlaying
+      var nextStarted = nextWasPlaying || playPlayer(next)
+      if (nextStarted) pausePlayer(current)
+    }
+
+    if (showFeedback !== false) Qt.callLater(function() {
+      root.showOsd("Source", "media-source", next)
+    })
+
+    return true
+  }
+
+  function playerForAction(action, targetKey) {
+    var targeted = playerForKey(targetKey)
+    if (targeted) return targeted
+
+    if (action === "pause" || action === "playPause") {
+      var oldest = oldestPlayingPlayer(true) || oldestPlayingPlayer(false)
+      if (oldest) return oldest
+    }
+
+    if (canHandleAction(activePlayer, action)) return activePlayer
+
+    var list = sourcePlayers
+    for (var i = 0; i < list.length; i++) {
+      if (canHandleAction(list[i], action)) return list[i]
+    }
+
+    return activePlayer
+  }
+
+  function runAction(action, showFeedback, targetKey) {
+    var player = playerForAction(action, targetKey)
+    var key = playerKey(player)
+    var actionLabel = "Play/pause"
+    var iconName = "media"
+    var handled = false
+
+    if (action === "next") {
+      actionLabel = "Next"
+      iconName = "media-next"
+      if (player && player.canGoNext) {
+        player.next()
+        handled = true
+      }
+    } else if (action === "previous") {
+      actionLabel = "Previous"
+      iconName = "media-previous"
+      if (player && player.canGoPrevious) {
+        player.previous()
+        handled = true
+      }
+    } else if (action === "play") {
+      actionLabel = "Play"
+      iconName = "media-play"
+      if (player && player.canPlay) {
+        player.play()
+        handled = true
+      } else if (player && player.canTogglePlaying && !player.isPlaying) {
+        player.togglePlaying()
+        handled = true
+      }
+    } else if (action === "pause") {
+      actionLabel = "Pause"
+      iconName = "media-pause"
+      if (player && player.canPause) {
+        player.pause()
+        handled = true
+      } else if (player && player.canTogglePlaying && player.isPlaying) {
+        player.togglePlaying()
+        handled = true
+      }
+    } else if (action === "playPause") {
+      actionLabel = player && player.isPlaying ? "Pause" : "Play"
+      iconName = player && player.isPlaying ? "media-pause" : "media-play"
+      if (player && player.isPlaying && player.canPause) {
+        player.pause()
+        handled = true
+      } else if (player && !player.isPlaying && player.canPlay) {
+        player.play()
+        handled = true
+      } else if (player && player.canTogglePlaying) {
+        player.togglePlaying()
+        handled = true
+      }
+    }
+
+    if (handled && key) preferredPlayerKey = key
+    if (showFeedback !== false) Qt.callLater(function() { root.showOsd(actionLabel, iconName, player) })
+    return handled
+  }
+
+  Timer {
+    interval: 500
+    running: true
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: root.syncPlayingOrder()
+  }
+
+  PwObjectTracker { objects: root.playbackStreams }
+
+  function statusJson() {
+    var p = activePlayer
+    return JSON.stringify({
+      hasPlayer: p !== null,
+      hasMedia: root.hasMedia,
+      playing: p ? !!p.isPlaying : false,
+      identity: p ? (p.identity || "") : "",
+      desktopEntry: p ? (p.desktopEntry || "") : "",
+      title: p ? (p.trackTitle || "") : "",
+      artist: p ? (p.trackArtist || "") : "",
+      album: p && p.trackAlbum ? p.trackAlbum : "",
+      artUrl: p && p.trackArtUrl ? p.trackArtUrl : "",
+      canGoNext: p ? !!p.canGoNext : false,
+      canGoPrevious: p ? !!p.canGoPrevious : false,
+      canTogglePlaying: p ? !!p.canTogglePlaying : false
+    })
+  }
+
+  IpcHandler {
+    target: "media"
+
+    function status(): string {
+      return root.statusJson()
+    }
+
+    function playPause(): string {
+      return root.runAction("playPause", true) ? "ok" : "unhandled"
+    }
+
+    function next(): string {
+      return root.runAction("next", true) ? "ok" : "unhandled"
+    }
+
+    function previous(): string {
+      return root.runAction("previous", true) ? "ok" : "unhandled"
+    }
+
+    function play(): string {
+      return root.runAction("play", true) ? "ok" : "unhandled"
+    }
+
+    function pause(): string {
+      return root.runAction("pause", true) ? "ok" : "unhandled"
+    }
+
+    function sourceNext(): string {
+      return root.switchSource(1, false, true) ? "ok" : "unhandled"
+    }
+
+    function sourcePrevious(): string {
+      return root.switchSource(-1, false, true) ? "ok" : "unhandled"
+    }
+
+    function sourceSwitch(): string {
+      return root.switchSource(1, true, true) ? "ok" : "unhandled"
+    }
+
+    function sourceSwitchPrevious(): string {
+      return root.switchSource(-1, true, true) ? "ok" : "unhandled"
+    }
+
+    function ping(): string {
+      return "ok"
+    }
+  }
+}
diff --git a/shell/plugins/services/media/manifest.json b/shell/plugins/services/media/manifest.json
new file mode 100644
index 00000000..661c65a5
--- /dev/null
+++ b/shell/plugins/services/media/manifest.json
@@ -0,0 +1,23 @@
+{
+  "schemaVersion": 1,
+  "id": "omarchy.media",
+  "name": "Media",
+  "version": "1.0.0",
+  "author": "Omarchy",
+  "description": "MPRIS media control service",
+  "kinds": [
+    "service",
+    "bar-widget"
+  ],
+  "keepLoaded": true,
+  "entryPoints": {
+    "service": "Service.qml",
+    "barWidget": "BarWidget.qml"
+  },
+  "barWidget": {
+    "displayName": "Media",
+    "description": "MPRIS now-playing with playback controls",
+    "category": "Media",
+    "allowMultiple": false
+  }
+}
diff --git a/shell/services/BarWidgetRegistry.qml b/shell/services/BarWidgetRegistry.qml
new file mode 100644
index 00000000..69491289
--- /dev/null
+++ b/shell/services/BarWidgetRegistry.qml
@@ -0,0 +1,49 @@
+import QtQuick
+
+// Instance, not a singleton — instantiated once by shell.qml and injected into
+// plugins that need to read or extend the widget catalogue. Relative-path
+// singleton imports were creating per-importer instances which prevented the
+// shell host from seeing what the bar registered.
+QtObject {
+  id: registry
+
+  // { widgetId: { component: Component, metadata: var } }
+  property var widgets: ({})
+  property int revision: 0
+
+  signal changed()
+
+  function register(id, component, metadata) {
+    var key = String(id)
+    if (!key) return
+    var next = {}
+    for (var k in widgets) next[k] = widgets[k]
+    next[key] = { component: component, metadata: metadata || {} }
+    widgets = next
+    revision++
+    changed()
+  }
+
+  function unregister(id) {
+    var key = String(id)
+    if (!widgets[key]) return
+    var next = {}
+    for (var k in widgets) if (k !== key) next[k] = widgets[k]
+    widgets = next
+    revision++
+    changed()
+  }
+
+  function metadataFor(id) {
+    var entry = widgets[String(id)]
+    return entry ? entry.metadata : null
+  }
+
+  function availableIds() {
+    return Object.keys(widgets)
+  }
+
+  function has(id) {
+    return widgets[String(id)] !== undefined
+  }
+}
diff --git a/shell/services/PluginRegistry.qml b/shell/services/PluginRegistry.qml
new file mode 100644
index 00000000..f4ca0378
--- /dev/null
+++ b/shell/services/PluginRegistry.qml
@@ -0,0 +1,336 @@
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Commons
+
+// Instance, not a singleton — see BarWidgetRegistry for rationale.
+QtObject {
+  id: registry
+
+  property string home: Quickshell.env("HOME")
+  property string pluginsDir: home + "/.config/omarchy/plugins"
+
+  // Set by shell.qml at startup so we can also scan bundled first-party plugins.
+  property string firstPartyDir: ""
+
+  // Wired by shell.qml so the registry can read the canonical shell.json
+  // without owning file IO itself. shellConfigProvider returns the current
+  // effective shell config; shellConfigMutator takes a function that receives
+  // a deep-cloned config it can mutate in place and persists the result.
+  property var shellConfigProvider: null
+  property var shellConfigMutator: null
+
+  // { pluginId: manifest } — manifests have __sourceDir and __isFirstParty stamped in.
+  property var installedPlugins: ({})
+  property int registryRevision: 0
+  property bool scanning: false
+
+  signal pluginsChanged()
+  signal scanFinished()
+  signal pluginLoadFailed(string id, string error)
+
+  // ---------------------------------------------------------------- helpers
+
+  function isSafeEntryPoint(value) {
+    if (typeof value !== "string" || value.length === 0) return false
+    if (value.charAt(0) === "/") return false
+    if (value.indexOf("..") !== -1) return false
+    return true
+  }
+
+  function validateManifest(manifest, sourcePath) {
+    if (!Util.isPlainObject(manifest)) {
+      console.warn("PluginRegistry: manifest is not an object at " + sourcePath)
+      return null
+    }
+    if (manifest.schemaVersion !== 1) {
+      console.warn("PluginRegistry: unsupported schemaVersion at " + sourcePath)
+      return null
+    }
+    var required = ["id", "name", "version", "kinds", "entryPoints"]
+    for (var i = 0; i < required.length; i++) {
+      if (manifest[required[i]] === undefined) {
+        console.warn("PluginRegistry: missing required field '" + required[i] + "' at " + sourcePath)
+        return null
+      }
+    }
+    var id = String(manifest.id)
+    if (!id || id.indexOf("/") !== -1 || id.indexOf("..") !== -1 || id.charAt(0) === "/") {
+      console.warn("PluginRegistry: invalid plugin id '" + id + "' at " + sourcePath)
+      return null
+    }
+    if (!Array.isArray(manifest.kinds) || manifest.kinds.length === 0) {
+      console.warn("PluginRegistry: kinds must be a non-empty array at " + sourcePath)
+      return null
+    }
+    if (!Util.isPlainObject(manifest.entryPoints)) {
+      console.warn("PluginRegistry: entryPoints must be an object at " + sourcePath)
+      return null
+    }
+    // Every entry point must be a relative path inside the plugin's source
+    // directory. Reject the whole manifest if anything looks like an attempt
+    // to escape the plugin's sandbox.
+    for (var key in manifest.entryPoints) {
+      if (!isSafeEntryPoint(manifest.entryPoints[key])) {
+        console.warn("PluginRegistry: unsafe entryPoint '" + key + "'='"
+          + manifest.entryPoints[key] + "' at " + sourcePath)
+        return null
+      }
+    }
+    return manifest
+  }
+
+  function entryPointUrl(manifest, kind) {
+    if (!Util.isPlainObject(manifest)) return ""
+    var ep = manifest.entryPoints ? manifest.entryPoints[kind] : null
+    if (!ep) return ""
+    var dir = manifest.__sourceDir || ""
+    if (!dir) return ""
+    // Defense in depth: even after validateManifest, confirm the resolved
+    // path stays inside the plugin's sourceDir.
+    var resolved = dir.replace(/\/$/, "") + "/" + String(ep)
+    var expectedPrefix = dir.replace(/\/$/, "") + "/"
+    if (resolved.indexOf(expectedPrefix) !== 0) {
+      console.warn("PluginRegistry: entry point escapes sourceDir: " + resolved)
+      return ""
+    }
+    return Util.fileUrl(resolved)
+  }
+
+  // Enabled = the plugin id is referenced somewhere in shell.json. That can
+  // be either the active bar option in `bar.id`, a layout entry inside
+  // `bar.layout.*` (bar widgets), or a top-level entry in `plugins[]` (panels,
+  // overlays, services).
+  //
+  // Special cases (implicitly always enabled, no shell.json entry needed):
+  //   - the built-in bar option (`omarchy.bar`) is active when `bar.id` is
+  //     missing or set to `omarchy.bar`.
+  //   - first-party non-bar plugins are shell infrastructure (settings,
+  //     image-picker, ...). Requiring users to add them to plugins[] just to
+  //     summon them was a footgun: a stock shell.json with `plugins: []` would
+  //     silently make `omarchy launch bar-settings` a no-op.
+  function isEnabled(id) {
+    var key = String(id)
+    var manifest = installedPlugins[key]
+    var config = shellConfigProvider ? shellConfigProvider() : null
+    if (manifest) {
+      if (Array.isArray(manifest.kinds) && manifest.kinds.indexOf("bar") !== -1) {
+        var selectedBar = ""
+        if (Util.isPlainObject(config) && Util.isPlainObject(config.bar))
+          selectedBar = Util.canonicalWidgetId(String(config.bar.id || ""))
+        if (!selectedBar) selectedBar = "omarchy.bar"
+        return selectedBar === key
+      }
+      if (manifest.__isFirstParty) return true
+    }
+    return findEntryLocation(config, key).found
+  }
+
+  function findEntryLocation(config, id) {
+    if (!Util.isPlainObject(config)) return { found: false }
+    var key = Util.canonicalWidgetId(String(id))
+    if (Util.isPlainObject(config.bar)) {
+      var selectedBar = Util.canonicalWidgetId(String(config.bar.id || ""))
+      if (selectedBar === key) return { found: true, kind: "bar-option" }
+    }
+    if (Util.isPlainObject(config.bar) && Util.isPlainObject(config.bar.layout)) {
+      var sections = ["left", "center", "right"]
+      for (var s = 0; s < sections.length; s++) {
+        var arr = config.bar.layout[sections[s]]
+        if (!Array.isArray(arr)) continue
+        for (var i = 0; i < arr.length; i++) {
+          if (arr[i] && Util.canonicalWidgetId(arr[i].id) === key) return { found: true, kind: "bar", section: sections[s], index: i }
+        }
+      }
+    }
+    if (Array.isArray(config.plugins)) {
+      for (var j = 0; j < config.plugins.length; j++) {
+        if (config.plugins[j] && Util.canonicalWidgetId(config.plugins[j].id) === key) return { found: true, kind: "plugin", index: j }
+      }
+    }
+    return { found: false }
+  }
+
+  // Adding a plugin places it in the right section based on its declared
+  // kinds. Bar widgets default to the right section; panels/overlays/menus/
+  // services go into the plugins[] array.
+  function setEnabled(id, value) {
+    var key = Util.canonicalWidgetId(String(id))
+    if (!shellConfigMutator) {
+      console.warn("PluginRegistry.setEnabled called before shellConfigMutator wired")
+      return false
+    }
+    var manifest = installedPlugins[key]
+    if (value && !manifest) {
+      console.warn("PluginRegistry.setEnabled: unknown plugin " + key)
+      return false
+    }
+    var isBarOption = manifest && Array.isArray(manifest.kinds) && manifest.kinds.indexOf("bar") !== -1
+    var isBarWidget = manifest && Array.isArray(manifest.kinds) && manifest.kinds.indexOf("bar-widget") !== -1
+    shellConfigMutator(function(config) {
+      // Ensure shape exists.
+      if (!Util.isPlainObject(config.bar)) config.bar = { layout: { left: [], center: [], right: [] } }
+      if (!Util.isPlainObject(config.bar.layout)) config.bar.layout = { left: [], center: [], right: [] }
+      if (!Array.isArray(config.plugins)) config.plugins = []
+
+      if (isBarOption) {
+        if (value) {
+          config.bar.id = key
+        } else if (Util.canonicalWidgetId(String(config.bar.id || "")) === key) {
+          delete config.bar.id
+        }
+        return
+      }
+
+      var location = findEntryLocation(config, key)
+      if (value && !location.found) {
+        var entry = { id: key }
+        if (isBarWidget) {
+          if (!Array.isArray(config.bar.layout.right)) config.bar.layout.right = []
+          config.bar.layout.right.push(entry)
+        } else {
+          config.plugins.push(entry)
+        }
+      } else if (!value && location.found) {
+        if (location.kind === "bar") {
+          config.bar.layout[location.section].splice(location.index, 1)
+        } else if (location.kind === "plugin") {
+          config.plugins.splice(location.index, 1)
+        }
+      }
+    })
+    registryRevision++
+    pluginsChanged()
+    return true
+  }
+
+  // ---------------------------------------------------------------- scanning
+
+  // Output format produced by the rescan script:
+  //   ===<kind>::<absolute-source-dir>===
+  //   ... raw manifest.json content ...
+  //   === EOM ===
+  // (repeating for every manifest found)
+  function parseScanOutput(text) {
+    var lines = String(text || "").split("\n")
+    var firstParty = {}
+    var thirdParty = {}
+    var currentSource = null
+    var currentKind = null
+    var currentJson = []
+
+    function flush() {
+      if (!currentSource) return
+      var raw = currentJson.join("\n").trim()
+      try {
+        var manifest = JSON.parse(raw)
+        manifest.__sourceDir = currentSource
+        manifest.__isFirstParty = (currentKind === "firstparty")
+        var validated = validateManifest(manifest, currentSource + "/manifest.json")
+        if (validated) {
+          if (currentKind === "firstparty") firstParty[validated.id] = validated
+          else thirdParty[validated.id] = validated
+        }
+      } catch (e) {
+        console.warn("PluginRegistry: bad manifest at " + currentSource + ": " + e)
+      }
+      currentSource = null
+      currentKind = null
+      currentJson = []
+    }
+
+    for (var i = 0; i < lines.length; i++) {
+      var line = lines[i]
+      var startMatch = line.match(/^===([a-z]+)::(.+)===$/)
+      if (startMatch) {
+        flush()
+        currentKind = startMatch[1]
+        currentSource = startMatch[2].replace(/\/$/, "")
+        currentJson = []
+        continue
+      }
+      if (line === "=== EOM ===") {
+        flush()
+        continue
+      }
+      if (currentSource) currentJson.push(line)
+    }
+    flush()
+
+    var merged = {}
+    for (var fk in firstParty) merged[fk] = firstParty[fk]
+    // Third-party plugins never shadow first-party ids. The whole
+    // `omarchy.*` namespace is reserved for built-ins, including bar widgets
+    // registered outside the manifest-based plugin registry.
+    for (var tk in thirdParty) {
+      if (firstParty[tk] || String(tk).indexOf("omarchy.") === 0) {
+        console.warn("PluginRegistry: plugin " + tk
+          + " rejected: id is reserved for first-party Omarchy plugins")
+        continue
+      }
+      merged[tk] = thirdParty[tk]
+    }
+
+    installedPlugins = merged
+    registryRevision++
+    scanning = false
+    pluginsChanged()
+    scanFinished()
+  }
+
+  property Process scanProcess: Process {
+    onExited: function(exitCode) {
+      var output = scanStdout.text || ""
+      registry.parseScanOutput(output)
+    }
+    stdout: StdioCollector {
+      id: scanStdout
+      waitForEnd: true
+    }
+  }
+
+  property Process initProcess: Process {
+    onExited: registry.rescan()
+  }
+
+  function rescan() {
+    if (scanning) return
+    scanning = true
+    // $0 = first-party dir, $1 = third-party dir. Some bash versions need the explicit -- separator.
+    // First-party plugins may be grouped one level deeper, e.g. panels/audio
+    // or services/battery.
+    // First-party bar widgets can also carry sibling manifests such as
+    // widgets/Clock.manifest.json so multiple widgets can live in one source
+    // directory without wrapper folders.
+    // Third-party plugins stay at the top level of ~/.config/omarchy/plugins.
+    var script = ""
+      + "emit_manifest() { local kind=\"$1\"; local manifest=\"$2\"; local sub; "
+      + "  if [[ ${manifest##*/} == \"manifest.json\" ]]; then sub=\"${manifest%/manifest.json}\"; else sub=\"$(dirname -- \"$manifest\")\"; fi; "
+      + "  printf '===%s::%s===\\n' \"$kind\" \"$sub\"; "
+      + "  cat \"$manifest\"; "
+      + "  printf '\\n=== EOM ===\\n'; "
+      + "}; "
+      + "scan_firstparty() { local dir=\"$1\"; "
+      + "  [[ -d \"$dir\" ]] || return 0; "
+      + "  while IFS= read -r manifest; do emit_manifest firstparty \"$manifest\"; done < <(find \"$dir\" -mindepth 2 -maxdepth 3 -type f \\( -name manifest.json -o -name '*.manifest.json' \\) | sort); "
+      + "}; "
+      + "scan_thirdparty() { local dir=\"$1\"; "
+      + "  [[ -d \"$dir\" ]] || return 0; "
+      + "  for sub in \"$dir\"/*/; do "
+      + "    [[ -f \"$sub/manifest.json\" ]] || continue; "
+      + "    emit_manifest thirdparty \"$sub/manifest.json\"; "
+      + "  done; "
+      + "}; "
+      + "scan_firstparty \"$0\"; "
+      + "scan_thirdparty \"$1\""
+    scanProcess.command = ["bash", "-c", script, registry.firstPartyDir, registry.pluginsDir]
+    scanProcess.running = true
+  }
+
+  function ensureUserDir() {
+    initProcess.command = ["bash", "-c", "mkdir -p \"$0\"", registry.pluginsDir]
+    initProcess.running = true
+  }
+
+  Component.onCompleted: ensureUserDir()
+}
diff --git a/shell/shell.qml b/shell/shell.qml
new file mode 100644
index 00000000..2bac9598
--- /dev/null
+++ b/shell/shell.qml
@@ -0,0 +1,838 @@
+import QtQuick
+import QtQml.Models
+import Quickshell
+import Quickshell.Io
+
+import qs.Commons
+
+import "plugins/bar"
+import "services"
+
+ShellRoot {
+  id: shell
+
+  // Shared service instances. Plugins receive these via property injection
+  // rather than re-importing them as singletons — relative-path imports do
+  // not share singleton state, which silently leaves consumers with their
+  // own empty copies.
+  property PluginRegistry pluginRegistry: PluginRegistry { }
+  property BarWidgetRegistry barWidgetRegistry: BarWidgetRegistry { }
+
+  property string home: Quickshell.env("HOME")
+
+  // The omarchy-shell host is the long-running entry point. Plugins live in
+  // sibling directories under plugins/. OMARCHY_PATH is provided by the uwsm
+  // session environment and is the single source of truth for this checkout.
+  property string omarchyPath: Quickshell.env("OMARCHY_PATH")
+  readonly property string shellPath: omarchyPath + "/shell"
+  readonly property string firstPartyPluginsDir: shellPath + "/plugins"
+  readonly property string defaultsPath: omarchyPath + "/config/omarchy/shell.json"
+  readonly property string userConfigPath: home + "/.config/omarchy/shell.json"
+
+  // Bundled fallback so the shell can start even when the default shell.json is
+  // missing or unreadable. The bar config here mirrors the on-disk defaults
+  // closely enough to render a usable bar; not authoritative.
+  readonly property var builtinShellConfig: ({
+    version: 1,
+    idle: {
+      screensaver: 150,
+      lock: 300
+    },
+    bar: {
+      position: "top",
+      transparent: false,
+      centerAnchor: "omarchy.clock",
+      layout: {
+        left: [{ id: "omarchy.menu" }, { id: "omarchy.workspaces" }],
+        center: [{ id: "omarchy.clock", format: "dddd HH:mm" }],
+        right: [{ id: "omarchy.audio" }]
+      }
+    },
+    plugins: []
+  })
+
+  property var defaultsConfig: builtinShellConfig
+  property var shellConfig: builtinShellConfig
+  property bool suppressUserReload: false
+  property bool pluginReloading: false
+  property bool pluginReloadPending: false
+
+  onShellConfigChanged: {
+    if (failedBarId !== "") failedBarId = ""
+    pluginRegistry.registryRevision++
+    pluginRegistry.pluginsChanged()
+  }
+
+  function applyShellConfig() {
+    // Decide which source is canonical: a valid user shell.json overrides
+    // defaults entirely; otherwise fall back to defaults. We do not deep-merge.
+    var defaults = Util.isPlainObject(defaultsConfig) ? defaultsConfig : builtinShellConfig
+    var user = null
+    var userText = userConfigFile.text() || ""
+    if (userText.trim()) {
+      try {
+        var parsed = JSON.parse(userText)
+        if (Util.isPlainObject(parsed) && parsed.version === 1) user = parsed
+        else if (Util.isPlainObject(parsed)) console.warn("shell.json missing version: 1, using defaults")
+      } catch (e) {
+        console.warn("shell.json parse failed, using defaults:", e)
+      }
+    }
+    shellConfig = user || defaults
+  }
+
+  function loadDefaults(raw) {
+    var text = String(raw || "").trim()
+    if (!text) {
+      defaultsConfig = builtinShellConfig
+      applyShellConfig()
+      return
+    }
+    try {
+      var parsed = JSON.parse(text)
+      if (Util.isPlainObject(parsed) && parsed.version === 1) defaultsConfig = parsed
+      else defaultsConfig = builtinShellConfig
+    } catch (e) {
+      console.warn("default shell.json parse failed, using builtin:", e)
+      defaultsConfig = builtinShellConfig
+    }
+    applyShellConfig()
+  }
+
+  function persistShellConfig(nextConfig) {
+    suppressUserReload = true
+    var payload = JSON.parse(JSON.stringify(nextConfig))
+    payload.version = 1
+    shellConfig = payload
+    userConfigFile.setText(JSON.stringify(payload, null, 2) + "\n")
+  }
+
+  readonly property var barConfig: shellConfig && Util.isPlainObject(shellConfig.bar) ? shellConfig.bar : builtinShellConfig.bar
+  onBarConfigChanged: if (bar && "barConfig" in bar) bar.barConfig = shell.barConfig
+  FileView {
+    id: defaultsFile
+    path: shell.defaultsPath
+    watchChanges: true
+    printErrors: false
+    onLoaded: shell.loadDefaults(text())
+    onLoadFailed: function(error) {
+      console.warn("default shell.json load failed: " + error + " path=" + shell.defaultsPath)
+      shell.loadDefaults("")
+    }
+    onFileChanged: reload()
+  }
+
+  FileView {
+    id: userConfigFile
+    path: shell.userConfigPath
+    watchChanges: true
+    atomicWrites: true
+    printErrors: false
+    onLoaded: {
+      if (shell.suppressUserReload) {
+        shell.suppressUserReload = false
+        return
+      }
+      shell.applyShellConfig()
+    }
+    onLoadFailed: function(error) { shell.applyShellConfig() }
+    onFileChanged: reload()
+  }
+
+  Component.onCompleted: {
+    console.log("omarchy-shell paths",
+      "omarchyPath=" + shell.omarchyPath,
+      "shellDir=" + Quickshell.shellDir,
+      "firstPartyPluginsDir=" + shell.firstPartyPluginsDir,
+      "defaultsPath=" + shell.defaultsPath,
+      "userConfigPath=" + shell.userConfigPath)
+    pluginRegistry.firstPartyDir = shell.firstPartyPluginsDir
+    pluginRegistry.shellConfigProvider = function() { return shell.shellConfig }
+    pluginRegistry.shellConfigMutator = function(mutate) { shell.mutateShellConfig(mutate) }
+    // PluginRegistry.ensureUserDir() runs in its own Component.onCompleted and
+    // chains rescan() once the directory exists. We also kick a scan here in
+    // case the user dir already existed at startup.
+    pluginRegistry.rescan()
+    shell._syncServices()
+  }
+
+  function mutateShellConfig(mutator) {
+    var copy = JSON.parse(JSON.stringify(shellConfig || builtinShellConfig))
+    mutator(copy)
+    persistShellConfig(copy)
+  }
+
+  // Exposed as a property so child plugins (notifications, future panels)
+  // can read barSize/barHidden/position to anchor relative to the active bar.
+  readonly property string defaultBarId: "omarchy.bar"
+  readonly property string selectedBarId: {
+    var config = shell.barConfig
+    if (Util.isPlainObject(config)) {
+      var configured = Util.canonicalWidgetId(String(config.id || ""))
+      if (configured) return configured
+    }
+    return shell.defaultBarId
+  }
+  property string failedBarId: ""
+  readonly property bool selectedBarAvailable: {
+    var revision = shell.pluginRegistry.registryRevision
+    return shell.barOptionAvailable(shell.selectedBarId)
+  }
+  readonly property string activeBarId: selectedBarId !== failedBarId && selectedBarAvailable ? selectedBarId : defaultBarId
+  readonly property var activeBarManifest: {
+    var revision = shell.pluginRegistry.registryRevision
+    return shell.barManifestFor(shell.activeBarId)
+  }
+  readonly property string activeBarSourceUrl: activeBarId === defaultBarId ? "" : shell.pluginRegistry.entryPointUrl(activeBarManifest, "bar")
+  property var bar: null
+
+  onSelectedBarIdChanged: if (failedBarId !== "") failedBarId = ""
+
+  function barManifestFor(pluginId) {
+    var plugins = shell.pluginRegistry ? shell.pluginRegistry.installedPlugins : null
+    return plugins ? plugins[String(pluginId || "")] || null : null
+  }
+
+  function isBarOptionManifest(manifest) {
+    return manifest
+      && Array.isArray(manifest.kinds)
+      && manifest.kinds.indexOf("bar") !== -1
+      && manifest.entryPoints
+      && manifest.entryPoints.bar
+  }
+
+  function barOptionAvailable(pluginId) {
+    var id = String(pluginId || "")
+    if (id === "" || id === shell.defaultBarId) return true
+    var manifest = shell.barManifestFor(id)
+    return shell.isBarOptionManifest(manifest) && shell.pluginRegistry.entryPointUrl(manifest, "bar") !== ""
+  }
+
+  function isActiveBarOption(pluginId) {
+    return String(pluginId || "") === shell.activeBarId
+  }
+
+  function configureBar(target, manifest) {
+    if (!target) return
+    if ("omarchyPath" in target) target.omarchyPath = shell.omarchyPath
+    if ("shell" in target) target.shell = shell
+    if ("manifest" in target) target.manifest = manifest
+    if ("barWidgetRegistry" in target) target.barWidgetRegistry = shell.barWidgetRegistry
+    if ("pluginRegistry" in target) target.pluginRegistry = shell.pluginRegistry
+    if ("barConfig" in target) target.barConfig = shell.barConfig
+    shell.bar = target
+  }
+
+  Component {
+    id: defaultBarComponent
+
+    Bar {
+      omarchyPath: shell.omarchyPath
+      barWidgetRegistry: shell.barWidgetRegistry
+      barConfig: shell.barConfig
+      shell: shell
+      manifest: shell.barManifestFor(shell.defaultBarId)
+    }
+  }
+
+  Loader {
+    id: defaultBarLoader
+
+    active: shell.activeBarId === shell.defaultBarId
+    sourceComponent: defaultBarComponent
+    onLoaded: shell.configureBar(item, shell.barManifestFor(shell.defaultBarId))
+    onActiveChanged: if (!active && shell.activeBarId !== shell.defaultBarId) shell.bar = null
+  }
+
+  Loader {
+    id: pluginBarLoader
+
+    active: !shell.pluginReloading && shell.activeBarId !== shell.defaultBarId && shell.activeBarSourceUrl !== ""
+    source: shell.activeBarId !== shell.defaultBarId ? shell.activeBarSourceUrl : ""
+    asynchronous: true
+    onLoaded: shell.configureBar(item, shell.activeBarManifest)
+    onActiveChanged: if (!active) shell.bar = null
+    onStatusChanged: {
+      if (status === Loader.Error) {
+        var detail = errorString && errorString() ? errorString() : ""
+        console.warn("bar option " + shell.activeBarId + " failed to load, falling back to " + shell.defaultBarId + ":", detail)
+        shell.failedBarId = shell.activeBarId
+      }
+    }
+  }
+
+  // ------------------------------------------------------------- services
+  //
+  // Generic loader for any enabled plugin that declares kind "service".
+  // First-party infrastructure services are implicitly enabled by the registry;
+  // third-party services are enabled by adding the plugin id to shell.json.
+  Item {
+    id: serviceHost
+    visible: false
+  }
+
+  property var _services: ({})
+
+  function serviceFor(pluginId) {
+    return _services[String(pluginId)] || null
+  }
+
+  function firstPartyServiceFor(pluginId) {
+    return serviceFor(pluginId)
+  }
+
+  function ensureService(pluginId) {
+    var key = String(pluginId)
+    if (_services[key]) return _services[key]
+    var manifest = pluginRegistry && pluginRegistry.installedPlugins
+      ? pluginRegistry.installedPlugins[key] : null
+    if (!manifest) return null
+    if (!Array.isArray(manifest.kinds) || manifest.kinds.indexOf("service") === -1) return null
+    if (!manifest.entryPoints || !manifest.entryPoints.service) return null
+    var url = pluginRegistry.entryPointUrl(manifest, "service")
+    if (!url) return null
+
+    var comp = Qt.createComponent(url, Component.PreferSynchronous)
+    function finalize() {
+      if (comp.status !== Component.Ready) {
+        console.warn("service plugin load failed for " + key + ": " + comp.errorString())
+        return
+      }
+      var inst = comp.createObject(serviceHost)
+      if (!inst) {
+        console.warn("service plugin createObject returned null for", key)
+        return
+      }
+      if ("omarchyPath" in inst) inst.omarchyPath = shell.omarchyPath
+      if ("shell" in inst) inst.shell = shell
+      if ("manifest" in inst) inst.manifest = manifest
+      if ("barWidgetRegistry" in inst) inst.barWidgetRegistry = shell.barWidgetRegistry
+      if ("pluginRegistry" in inst) inst.pluginRegistry = shell.pluginRegistry
+      var snext = ({})
+      for (var sk in _services) snext[sk] = _services[sk]
+      snext[key] = inst
+      _services = snext
+    }
+    if (comp.status === Component.Loading) {
+      comp.statusChanged.connect(finalize)
+      return null
+    }
+    finalize()
+    return _services[key] || null
+  }
+
+  function _syncServices() {
+    if (!pluginRegistry || !pluginRegistry.installedPlugins) return
+    var plugins = pluginRegistry.installedPlugins
+    for (var id in plugins) {
+      var m = plugins[id]
+      if (!m) continue
+      if (!Array.isArray(m.kinds) || m.kinds.indexOf("service") === -1) continue
+      if (!m.entryPoints || !m.entryPoints.service) continue
+      if (!pluginRegistry.isEnabled(id)) continue
+      if (_services[id]) continue
+      ensureService(id)
+    }
+    // Drop services for plugins that have been disabled or removed.
+    for (var existingId in _services) {
+      var stillThere = plugins[existingId]
+      var stillEnabled = stillThere && pluginRegistry.isEnabled(existingId)
+      if (stillThere && stillEnabled) continue
+      var inst = _services[existingId]
+      if (inst && typeof inst.destroy === "function") inst.destroy()
+      var next = ({})
+      for (var k in _services) if (k !== existingId) next[k] = _services[k]
+      _services = next
+    }
+  }
+
+  function unloadPluginServices() {
+    for (var existingId in _services) {
+      var inst = _services[existingId]
+      if (inst && typeof inst.destroy === "function") inst.destroy()
+    }
+    _services = ({})
+  }
+
+  Connections {
+    target: shell.pluginRegistry
+    function onPluginsChanged() { if (!shell.pluginReloading) shell._syncServices() }
+  }
+
+  // Writes inline settings to a bar layout entry or top-level plugin entry in
+  // shell.json. moduleName is the entry id; settings is the merged plugin
+  // state. Returns true if anything actually changed. Compute the proposed
+  // new shellConfig in a local clone, and only persist if anything actually
+  // changed so reactive bindings do not dirty shell.json unnecessarily.
+  function updateEntryInline(moduleName, settings) {
+    var stripped = Util.canonicalWidgetId(moduleName)
+    var copy = JSON.parse(JSON.stringify(shellConfig || builtinShellConfig))
+    if (!Util.isPlainObject(copy.bar)) copy.bar = { layout: { left: [], center: [], right: [] } }
+    if (!Util.isPlainObject(copy.bar.layout)) copy.bar.layout = { left: [], center: [], right: [] }
+    if (!Array.isArray(copy.plugins)) copy.plugins = []
+
+    var sections = ["left", "center", "right"]
+    var foundInLayout = false
+    var dirty = false
+    for (var s = 0; s < sections.length; s++) {
+      var arr = copy.bar.layout[sections[s]] || []
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i] && Util.canonicalWidgetId(arr[i].id) === stripped) {
+          var next = { id: stripped }
+          for (var k in settings) if (k !== "id") next[k] = settings[k]
+          if (JSON.stringify(arr[i]) !== JSON.stringify(next)) {
+            arr[i] = next
+            dirty = true
+          }
+          foundInLayout = true
+        }
+      }
+    }
+    if (!foundInLayout) {
+      for (var j = 0; j < copy.plugins.length; j++) {
+        if (copy.plugins[j] && copy.plugins[j].id === stripped) {
+          var pnext = { id: stripped }
+          for (var pk in settings) if (pk !== "id") pnext[pk] = settings[pk]
+          if (JSON.stringify(copy.plugins[j]) !== JSON.stringify(pnext)) {
+            copy.plugins[j] = pnext
+            dirty = true
+          }
+        }
+      }
+    }
+    if (!dirty) return false
+    persistShellConfig(copy)
+    return true
+  }
+
+  // ---------------------------------------------------------- on-demand panels
+
+  // openPanelIds is a plain object treated as a set. A plugin id maps to
+  // `true` while the panel is summoned; deleting the key (well, building a new
+  // object without it) hides it. Reassigning the whole object is required for
+  // QML to notice the change.
+  property var openPanelIds: ({})
+
+  // Pending payloads to deliver to a plugin's open() once its loader resolves.
+  // Keyed by plugin id; the value is an array so two summon() calls before
+  // the Loader resolves both reach the plugin in arrival order rather than
+  // the second clobbering the first.
+  property var pendingPayloads: ({})
+
+  function summon(pluginId, payloadJson) {
+    var id = String(pluginId || "")
+    if (!id) return false
+    var plugins = shell.pluginRegistry.installedPlugins
+    if (!plugins[id]) {
+      console.warn("summon: unknown plugin", id)
+      return false
+    }
+    // A disabled plugin has no Loader, so setting openPanelIds would only
+    // produce an invisible "open" state that toggle() then has to unwind.
+    // Tell the caller plainly instead of silently no-op'ing.
+    if (!shell.pluginRegistry.isEnabled(id)) {
+      console.warn("summon: plugin not enabled, not summoning:", id)
+      return false
+    }
+    var next = ({})
+    for (var k in openPanelIds) next[k] = openPanelIds[k]
+    next[id] = true
+    openPanelIds = next
+
+    // Stash payload so the Loader.onLoaded handler can hand it to open().
+    var pending = ({})
+    for (var p in pendingPayloads) pending[p] = pendingPayloads[p].slice()
+    var queue = pending[id] || []
+    queue.push(payloadJson || "")
+    pending[id] = queue
+    pendingPayloads = pending
+
+    // If the plugin is keepLoaded and already mounted, deliver immediately.
+    deliverIfLoaded(id)
+    return true
+  }
+
+  function hide(pluginId) {
+    var id = String(pluginId || "")
+    if (!id) return false
+    invokeIfLoaded(id, "close", null)
+    if (!openPanelIds[id]) return true
+    var next = ({})
+    for (var k in openPanelIds) if (k !== id) next[k] = openPanelIds[k]
+    openPanelIds = next
+    return true
+  }
+
+  function isPluginOpen(pluginId) {
+    var id = String(pluginId || "")
+    var loader = panelLoaders[id]
+    if (loader && loader.item && loader.item.opened !== undefined)
+      return loader.item.opened === true
+    return openPanelIds[id] === true
+  }
+
+  function toggle(pluginId, payloadJson) {
+    var id = String(pluginId || "")
+    return isPluginOpen(id) ? hide(id) : summon(id, payloadJson)
+  }
+
+  // Map of pluginId -> Loader, populated by the Instantiator delegate below.
+  property var panelLoaders: ({})
+
+  function registerPanelLoader(pluginId, loader) {
+    var next = ({})
+    for (var k in panelLoaders) next[k] = panelLoaders[k]
+    next[pluginId] = loader
+    panelLoaders = next
+    deliverIfLoaded(pluginId)
+  }
+
+  function unregisterPanelLoader(pluginId) {
+    if (!panelLoaders[pluginId]) return
+    var next = ({})
+    for (var k in panelLoaders) if (k !== pluginId) next[k] = panelLoaders[k]
+    panelLoaders = next
+  }
+
+  function unloadPanels() {
+    for (var id in panelLoaders) hide(id)
+    panelEntries = []
+    panelLoaders = ({})
+    pendingPayloads = ({})
+    openPanelIds = ({})
+  }
+
+  function deliverIfLoaded(pluginId) {
+    var loader = panelLoaders[pluginId]
+    if (!loader || !loader.item) return
+    var queue = pendingPayloads[pluginId]
+    if (!Array.isArray(queue) || queue.length === 0) return
+    if (typeof loader.item.open === "function") {
+      for (var i = 0; i < queue.length; i++) {
+        try { loader.item.open(queue[i]) } catch (e) {
+          console.warn("plugin " + pluginId + " open() threw:", e)
+        }
+      }
+    }
+    var next = ({})
+    for (var k in pendingPayloads) if (k !== pluginId) next[k] = pendingPayloads[k].slice()
+    pendingPayloads = next
+  }
+
+  function invokeIfLoaded(pluginId, method, arg) {
+    var loader = panelLoaders[pluginId]
+    if (!loader || !loader.item) return
+    if (typeof loader.item[method] !== "function") return
+    try { loader.item[method](arg) } catch (e) {
+      console.warn("plugin " + pluginId + " " + method + "() threw:", e)
+    }
+  }
+
+  function callIfLoaded(pluginId, method, arg) {
+    var loader = panelLoaders[pluginId]
+    if (!loader || !loader.item) return "unknown"
+    if (typeof loader.item[method] !== "function") return "unknown"
+    try {
+      var result = loader.item[method](arg)
+      return result === undefined || result === null ? "ok" : String(result)
+    } catch (e) {
+      console.warn("plugin " + pluginId + " " + method + "() threw:", e)
+      return "error"
+    }
+  }
+
+  // One Loader per discoverable panel/overlay/menu plugin. Active when the
+  // host marks it open. The Loader holds onto the instance while active so the
+  // plugin's FloatingWindow + state survive between summons within a session.
+  property var panelEntries: []
+
+  function computePanelEntries() {
+    var out = []
+    var plugins = shell.pluginRegistry.installedPlugins
+    var panelKinds = ["panel", "overlay", "menu"]
+    for (var id in plugins) {
+      var m = plugins[id]
+      if (!m || !Array.isArray(m.kinds)) continue
+      var matched = false
+      for (var i = 0; i < panelKinds.length; i++)
+        if (m.kinds.indexOf(panelKinds[i]) !== -1) { matched = true; break }
+      if (!matched) continue
+      if (!shell.pluginRegistry.isEnabled(id)) continue
+      var kind = m.kinds.indexOf("panel") !== -1 ? "panel"
+        : (m.kinds.indexOf("overlay") !== -1 ? "overlay" : "menu")
+      out.push({ id: id, manifest: m, kind: kind, keepLoaded: m.keepLoaded === true })
+    }
+    return out
+  }
+
+  Connections {
+    target: shell.pluginRegistry
+    function onPluginsChanged() { if (!shell.pluginReloading) shell.panelEntries = shell.computePanelEntries() }
+  }
+
+  Instantiator {
+    model: shell.panelEntries
+    active: true
+
+    delegate: QtObject {
+      id: panelEntry
+      required property var modelData
+      readonly property string pluginId: modelData.id
+      readonly property var manifest: modelData.manifest
+      readonly property string entryKind: modelData.kind
+      readonly property bool keepLoaded: modelData.keepLoaded === true
+      readonly property string sourceUrl: shell.pluginRegistry.entryPointUrl(manifest, entryKind)
+
+      property Loader panelLoader: Loader {
+        source: panelEntry.sourceUrl
+        active: panelEntry.sourceUrl !== "" && (panelEntry.keepLoaded || shell.openPanelIds[panelEntry.pluginId] === true)
+        asynchronous: true
+        onLoaded: {
+          if (!item) return
+          if ("omarchyPath" in item) item.omarchyPath = shell.omarchyPath
+          if ("shell" in item) item.shell = shell
+          if ("manifest" in item) item.manifest = panelEntry.manifest
+          if ("barWidgetRegistry" in item) item.barWidgetRegistry = shell.barWidgetRegistry
+          if ("pluginRegistry" in item) item.pluginRegistry = shell.pluginRegistry
+          // Plugins that pair a panel UI with a service entry read shared
+          // state off `service`. Hand them the matching singleton if one was
+          // loaded.
+          if ("service" in item) item.service = shell.serviceFor(panelEntry.pluginId)
+          shell.registerPanelLoader(panelEntry.pluginId, this)
+        }
+        onStatusChanged: {
+          if (status === Loader.Error) {
+            // Loader.errorString() reflects the source-load failure even when
+            // sourceComponent is null. Surface both so the user sees something
+            // actionable instead of a panel that silently refuses to open.
+            var detail = errorString && errorString() ? errorString() : ""
+            if (!detail && sourceComponent) detail = sourceComponent.errorString()
+            console.warn("panel plugin " + panelEntry.pluginId + " failed to load:", detail)
+            shell.hide(panelEntry.pluginId)
+          }
+        }
+        Component.onDestruction: shell.unregisterPanelLoader(panelEntry.pluginId)
+      }
+    }
+  }
+
+  // ---------------------------------------------------------- plugin loader
+
+  // Mirror plugin registry state into BarWidgetRegistry whenever it changes.
+  // Each enabled plugin with kind "bar-widget" gets a Component created from
+  // its manifest entry point and registered under its manifest id. Built-in
+  // widgets use the same first-party manifest contract as third-party widgets.
+  Connections {
+    target: shell.pluginRegistry
+    function onPluginsChanged() { if (!shell.pluginReloading) shell.syncPluginWidgets() }
+  }
+
+  property var pluginWidgetComponents: ({})
+
+  function syncPluginWidgets() {
+    var plugins = shell.pluginRegistry.installedPlugins
+    var seen = ({})
+
+    for (var pluginId in plugins) {
+      var manifest = plugins[pluginId]
+      if (!manifest || !manifest.kinds || manifest.kinds.indexOf("bar-widget") === -1) continue
+      if (!shell.pluginRegistry.isEnabled(pluginId)) continue
+
+      var registryKey = String(manifest.id)
+      seen[registryKey] = true
+
+      // Already loaded with matching source — leave it alone.
+      var existing = pluginWidgetComponents[registryKey]
+      var url = shell.pluginRegistry.entryPointUrl(manifest, "barWidget")
+      if (!url) {
+        console.warn("Plugin " + manifest.id + " has no barWidget entry point")
+        continue
+      }
+      var meta = manifest.barWidget || {}
+      meta = {
+        displayName: meta.displayName || manifest.name,
+        description: meta.description || manifest.description,
+        category: meta.category || "Plugin",
+        allowMultiple: meta.allowMultiple === true,
+        defaults: meta.defaults || {},
+        settingsForm: meta.settingsForm || "",
+        schema: meta.schema || [],
+        pluginId: manifest.id,
+        sourceDir: manifest.__sourceDir || "",
+        source: "plugin"
+      }
+
+      // If the component URL is unchanged, just refresh the metadata in
+      // place. We can't skip this even when the URL matches: manifests can
+      // change schema, defaults, or sourceDir between rescans, and the
+      // settings panel reads metadata from the registry.
+      if (existing && existing.url === url && shell.barWidgetRegistry.has(registryKey)) {
+        shell.barWidgetRegistry.register(registryKey, existing.component, meta)
+        continue
+      }
+
+      loadPluginWidget(registryKey, url, meta)
+    }
+
+    // Drop registrations for plugins that are no longer present or enabled.
+    var allIds = shell.barWidgetRegistry.availableIds()
+    for (var i = 0; i < allIds.length; i++) {
+      var id = allIds[i]
+      if (!pluginWidgetComponents[id]) continue
+      if (!seen[id]) {
+        shell.barWidgetRegistry.unregister(id)
+        var next = ({})
+        for (var k in pluginWidgetComponents) if (k !== id) next[k] = pluginWidgetComponents[k]
+        pluginWidgetComponents = next
+      }
+    }
+  }
+
+  function unloadPluginWidgets() {
+    for (var id in pluginWidgetComponents) shell.barWidgetRegistry.unregister(id)
+    pluginWidgetComponents = ({})
+  }
+
+  function reloadPlugins() {
+    if (shell.pluginReloading || shell.pluginRegistry.scanning) {
+      shell.pluginReloadPending = true
+      return
+    }
+    shell.pluginReloading = true
+    shell.unloadPanels()
+    shell.unloadPluginServices()
+    shell.unloadPluginWidgets()
+    Qt.callLater(shell.finishPluginReload)
+  }
+
+  function finishPluginReload() {
+    if (!shell.pluginReloading) return
+    if (shell.pluginRegistry.scanning) {
+      shell.pluginReloadPending = true
+      return
+    }
+    if (typeof Qt.clearComponentCache === "function") Qt.clearComponentCache()
+    shell.pluginRegistry.rescan()
+  }
+
+  Connections {
+    target: shell.pluginRegistry
+    function onScanFinished() {
+      if (shell.pluginReloadPending) {
+        shell.pluginReloadPending = false
+        shell.pluginReloading = false
+        Qt.callLater(shell.reloadPlugins)
+        return
+      }
+      shell.pluginReloading = false
+      shell._syncServices()
+      shell.panelEntries = shell.computePanelEntries()
+      shell.syncPluginWidgets()
+    }
+  }
+
+  function loadPluginWidget(registryKey, url, meta) {
+    var comp = Qt.createComponent(url, Component.Asynchronous)
+    function finalize() {
+      if (comp.status === Component.Ready) {
+        shell.barWidgetRegistry.register(registryKey, comp, meta)
+        var next = ({})
+        for (var k in pluginWidgetComponents) next[k] = pluginWidgetComponents[k]
+        next[registryKey] = { url: url, component: comp }
+        pluginWidgetComponents = next
+      } else if (comp.status === Component.Error) {
+        console.warn("Plugin widget " + registryKey + " failed: " + comp.errorString())
+        shell.pluginRegistry.pluginLoadFailed(registryKey, comp.errorString())
+      }
+    }
+    if (comp.status === Component.Loading) {
+      comp.statusChanged.connect(finalize)
+    } else {
+      finalize()
+    }
+  }
+
+  // ---------------------------------------------------------- shell IPC
+
+  IpcHandler {
+    target: "shell"
+
+    function ping(): string {
+      return "ok"
+    }
+
+    function applyTheme(colorsB64: string, shellB64: string): string {
+      var colorsRaw = ""
+      var shellRaw = ""
+      try { colorsRaw = Qt.atob(String(colorsB64 || "")) } catch (e) { colorsRaw = "" }
+      try { shellRaw = Qt.atob(String(shellB64 || "")) } catch (e2) { shellRaw = "" }
+      Color.loadColors(colorsRaw)
+      Color.loadShell(shellRaw)
+      Style.scheduleRefresh()
+      return "ok"
+    }
+
+    function rescanPlugins(): void {
+      shell.reloadPlugins()
+    }
+
+    function reloadConfig(): string {
+      userConfigFile.reload()
+      return "ok"
+    }
+
+    function setPluginEnabled(id: string, enabled: string): string {
+      return shell.pluginRegistry.setEnabled(id, enabled === "true") ? "ok" : "unknown"
+    }
+
+    function listPlugins(): string {
+      var out = []
+      var plugins = shell.pluginRegistry.installedPlugins
+      for (var id in plugins) {
+        var kinds = plugins[id].kinds || []
+        var isBarOption = Array.isArray(kinds) && kinds.indexOf("bar") !== -1
+        var active = isBarOption && shell.isActiveBarOption(id)
+        out.push({
+          id: id,
+          name: plugins[id].name,
+          kinds: kinds,
+          enabled: isBarOption ? active : shell.pluginRegistry.isEnabled(id),
+          active: active,
+          firstParty: !!plugins[id].__isFirstParty
+        })
+      }
+      return JSON.stringify(out)
+    }
+
+    // Returns the effective shell.json content as JSON. Useful for debugging
+    // and for CLI tools that want to inspect the merged state without
+    // re-implementing the load logic.
+    function listShellConfig(): string {
+      return JSON.stringify(shell.shellConfig || {})
+    }
+
+    function debugBarGeometry(): string {
+      return JSON.stringify(shell.bar && shell.bar.debugBarGeometry ? shell.bar.debugBarGeometry() : [])
+    }
+
+    function openBarConfig(): string {
+      return shell.bar && shell.bar.openConfigPanel && shell.bar.openConfigPanel() ? "ok" : "unknown"
+    }
+
+    function summon(id: string, payloadJson: string): string {
+      return shell.summon(id, payloadJson) ? "ok" : "unknown"
+    }
+
+    function hide(id: string): void {
+      shell.hide(id)
+    }
+
+    function toggle(id: string, payloadJson: string): void {
+      shell.toggle(id, payloadJson)
+    }
+
+    function call(id: string, method: string, arg: string): string {
+      return shell.callIfLoaded(id, method, arg)
+    }
+  }
+}
diff --git a/test/all b/test/all
new file mode 100755
index 00000000..693a8c4e
--- /dev/null
+++ b/test/all
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -euo pipefail
+
+ROOT=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)
+tests=(
+  "$ROOT/test/cli"
+  "$ROOT/test/shell"
+)
+
+for test in "${tests[@]}"; do
+  printf '==> %s\n' "${test#$ROOT/}"
+  "$test"
+done
diff --git a/test/cli b/test/cli
new file mode 100755
index 00000000..6d945fde
--- /dev/null
+++ b/test/cli
@@ -0,0 +1,489 @@
+#!/bin/bash
+
+set -euo pipefail
+
+ROOT=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)
+CLI="$ROOT/bin/omarchy"
+TMPDIR=""
+PI_TMPDIR=""
+THEME_TMPDIR=""
+
+export PATH="$ROOT/bin:$PATH"
+
+pass() {
+  printf 'ok - %s\n' "$1"
+}
+
+fail() {
+  printf 'not ok - %s\n' "$1" >&2
+  exit 1
+}
+
+assert_output_contains() {
+  local description="$1"
+  local output="$2"
+  local expected="$3"
+
+  if [[ $output != *"$expected"* ]]; then
+    printf 'Expected output to contain: %s\n' "$expected" >&2
+    printf 'Actual output:\n%s\n' "$output" >&2
+    fail "$description"
+  fi
+
+  pass "$description"
+}
+
+cleanup() {
+  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
+  [[ -n $PI_TMPDIR && -d $PI_TMPDIR ]] && rm -rf "$PI_TMPDIR"
+  [[ -n $THEME_TMPDIR && -d $THEME_TMPDIR ]] && rm -rf "$THEME_TMPDIR"
+}
+trap cleanup EXIT
+
+output=$("$CLI" --help)
+assert_output_contains "main help renders" "$output" "Omarchy command center"
+assert_output_contains "main help includes hardware group" "$output" "hw"
+assert_output_contains "main help includes package group" "$output" "pkg"
+if grep -Eq '^  [a-z0-9-]+[[:space:]].*\([0-9]+\)$' <<<"$output"; then
+  fail "main help does not show group counts"
+fi
+pass "main help does not show group counts"
+
+output=$("$CLI" commands)
+assert_output_contains "commands lists documented commands" "$output" "omarchy theme set <theme-name>"
+
+"$CLI" commands --json | jq -e '.ok == true and (.commands | length >= 200)' >/dev/null
+pass "commands --json is valid JSON with full bin coverage"
+
+"$CLI" commands --json | jq -e 'all(.commands[]; .summary != "undocumented")' >/dev/null
+pass "all included commands have summaries"
+
+"$CLI" commands --json | jq -e 'all(.commands[]; has("binary") and has("filename_route") and has("routes") and (has("legacy") | not) and (has("usage") | not) and (has("visibility") | not) and (has("mutates") | not) and (has("interactive") | not))' >/dev/null
+pass "JSON uses binary/routes and omits legacy/usage/extra metadata"
+
+"$CLI" commands --check >/dev/null
+pass "commands --check passes"
+
+"$CLI" commands --all >/dev/null
+pass "commands --all does not crash"
+
+"$CLI" commands --all --json | jq -e '.commands[] | select(.route == "omarchy hyprland window gaps toggle" and .summary != "undocumented")' >/dev/null
+pass "fallback commands are inferred and documented"
+
+"$CLI" commands --all --json | jq -e '.commands[] | select(.route == "omarchy dev benchmark")' >/dev/null
+pass "benchmark command is discoverable in all commands"
+
+"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-pkg-add" and .route == "omarchy pkg add" and .filename_route == "omarchy pkg add" and (.routes | index("omarchy pkg add")))' >/dev/null
+pass "JSON exposes direct pkg add route"
+
+"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-install-gaming-xbox-cloud" and .route == "omarchy install gaming xbox-cloud" and .filename_route == "omarchy install gaming xbox cloud" and (.routes | index("omarchy install gaming xbox cloud")))' >/dev/null
+pass "Xbox Cloud installer keeps hyphenated canonical route"
+
+"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-install-gaming-xbox-controllers" and .route == "omarchy install gaming xbox-controllers" and .filename_route == "omarchy install gaming xbox controllers" and (.routes | index("omarchy install gaming xbox controllers")))' >/dev/null
+pass "Xbox controller installer keeps hyphenated canonical route"
+
+"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-remove-gaming-xbox-controllers" and .route == "omarchy remove gaming xbox-controllers" and .filename_route == "omarchy remove gaming xbox controllers" and (.routes | index("omarchy remove gaming xbox controllers")))' >/dev/null
+pass "Xbox controller remover keeps hyphenated canonical route"
+
+"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-install-gaming-geforce-now" and .route == "omarchy install gaming geforce-now" and .filename_route == "omarchy install gaming geforce now" and (.routes | index("omarchy install gaming geforce now")))' >/dev/null
+pass "GeForce NOW installer keeps hyphenated canonical route"
+
+"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-remove-gaming-geforce-now" and .route == "omarchy remove gaming geforce-now" and .filename_route == "omarchy remove gaming geforce now" and (.routes | index("omarchy remove gaming geforce now")))' >/dev/null
+pass "GeForce NOW remover keeps hyphenated canonical route"
+
+"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-install-gaming-gpu-lib32" and .route == "omarchy install gaming gpu-lib32" and .filename_route == "omarchy install gaming gpu lib32" and (.routes | index("omarchy install gaming gpu lib32")))' >/dev/null
+pass "GPU lib32 installer keeps hyphenated canonical route"
+
+"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-refresh-pacman" and .requires_sudo == true)' >/dev/null
+pass "sudo metadata marks sudo commands"
+
+output=$("$CLI" theme --help)
+assert_output_contains "group help renders" "$output" "Theme commands"
+
+output=$("$CLI" install --help)
+assert_output_contains "install group help renders" "$output" "Install commands"
+assert_output_contains "install group includes browser route" "$output" "omarchy install browser"
+
+output=$("$CLI" install)
+assert_output_contains "bare group renders help instead of picker" "$output" "Install commands"
+assert_output_contains "bare group includes browser route" "$output" "omarchy install browser"
+
+output=$("$CLI" toggle)
+assert_output_contains "bare root command with children renders help" "$output" "Toggle commands"
+assert_output_contains "bare toggle help includes child route" "$output" "omarchy toggle nightlight"
+
+output=$("$CLI" pkg --help)
+assert_output_contains "package group includes pkg add fallback route" "$output" "omarchy pkg add <packages...>"
+
+output=$("$CLI" restart --help)
+assert_output_contains "restart group includes inferred commands" "$output" "omarchy restart btop"
+assert_output_contains "restart group includes all restart commands" "$output" "omarchy restart wifi"
+
+output=$("$CLI" hw --help)
+assert_output_contains "hardware group help renders" "$output" "omarchy hw asus rog"
+assert_output_contains "hardware group includes touchpad" "$output" "omarchy hw touchpad"
+
+output=$("$CLI" hw asus)
+assert_output_contains "partial hardware prefix renders matching commands" "$output" "omarchy hw asus rog"
+assert_output_contains "partial hardware prefix includes nested match" "$output" "omarchy hw asus zenbook ux5406aa"
+
+output=$("$CLI" menu --help)
+assert_output_contains "menu group includes share fallback route" "$output" "omarchy menu share"
+
+output=$("$CLI" share)
+assert_output_contains "bare required-arg alias renders CLI help" "$output" "Usage:"
+assert_output_contains "bare share help uses canonical route" "$output" "omarchy share <clipboard|file|folder> [path...]"
+
+output=$("$CLI" menu share)
+assert_output_contains "bare required-arg filename route renders CLI help" "$output" "omarchy share <clipboard|file|folder> [path...]"
+
+CLI="$CLI" python3 <<'PY'
+import json
+import os
+import subprocess
+import sys
+
+cli = os.environ['CLI']
+commands = json.loads(subprocess.check_output([cli, 'commands', '--json'], text=True))['commands']
+by_group = {}
+for command in commands:
+  binary = command['binary']
+  stem = binary.removeprefix('omarchy-')
+  group = stem.split('-', 1)[0]
+  filename_route = 'omarchy ' + stem.replace('-', ' ')
+  by_group.setdefault(group, []).append((binary, filename_route, command['route']))
+
+missing = []
+for group, rows in sorted(by_group.items()):
+  proc = subprocess.run([cli, group, '--help'], text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+  output = proc.stdout + proc.stderr
+  if proc.returncode != 0:
+    missing.append((group, '<group-help-failed>', f'exit {proc.returncode}'))
+    continue
+  for binary, filename_route, canonical_route in rows:
+    if filename_route not in output and canonical_route not in output and binary not in output:
+      missing.append((group, binary, filename_route))
+
+if missing:
+  for row in missing:
+    print('\t'.join(row), file=sys.stderr)
+  sys.exit(1)
+PY
+pass "every filename-derived group help represents its bins"
+
+output=$(timeout 5 "$CLI" theme set --help)
+assert_output_contains "command help renders without executing" "$output" "Binary:"
+assert_output_contains "theme set help names binary" "$output" "omarchy-theme-set"
+
+output=$(timeout 5 "$CLI" update --help)
+assert_output_contains "mutating command help does not execute target" "$output" "omarchy-update"
+if [[ $output == *"omarchy update perform"* ]]; then
+  fail "hidden update perform compatibility wrapper is not shown"
+fi
+pass "hidden update perform compatibility wrapper is not shown"
+
+output=$("$CLI" screenshot --help)
+assert_output_contains "root alias resolves to command help" "$output" "omarchy-capture-screenshot"
+
+"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-capture-screenshot") | .aliases | index("omarchy screenshot")' >/dev/null
+pass "aliases are included in JSON metadata"
+
+output=$("$CLI" pkg add --help)
+assert_output_contains "pkg add help resolves" "$output" "omarchy-pkg-add"
+assert_output_contains "pkg add help shows direct route" "$output" "omarchy pkg add <packages...>"
+
+output=$("$CLI" system reboot --help)
+assert_output_contains "system command help is safe" "$output" "omarchy-system-reboot"
+
+output=$("$CLI" dev benchmark --repeat=1)
+assert_output_contains "benchmark command runs" "$output" "Omarchy CLI benchmark"
+
+"$CLI" theme list >/dev/null
+pass "safe dispatch works for theme list"
+
+"$CLI" theme current >/dev/null
+pass "safe dispatch works for theme current"
+
+"$CLI" font list >/dev/null
+pass "safe dispatch works for font list"
+
+"$CLI" font current >/dev/null
+pass "safe dispatch works for font current"
+
+PI_TMPDIR=$(mktemp -d)
+NEXT_THEME="$PI_TMPDIR/.config/omarchy/current/next-theme"
+CURRENT_THEME="$PI_TMPDIR/.config/omarchy/current/theme"
+USER_THEMED="$PI_TMPDIR/.config/omarchy/themed"
+mkdir -p "$NEXT_THEME" "$CURRENT_THEME" "$USER_THEMED"
+
+cat >"$NEXT_THEME/colors.toml" <<'EOF'
+mode = "light"
+accent = "#336699"
+hyprland_active_border = "rgba(010203ee) rgba(040506ee) 45deg"
+cursor = "#ffffff"
+foreground = "#ffffff"
+background = "#000000"
+selection_foreground = "#000000"
+selection_background = "#808080"
+red = "#ff0000"
+green = "#00ff00"
+yellow = "#ffff00"
+blue = "#0000ff"
+magenta = "#ff00ff"
+cyan = "#00ffff"
+muted = "#111111"
+bright_red = "#ff1111"
+bright_green = "#11ff11"
+bright_yellow = "#ffff11"
+bright_blue = "#1111ff"
+bright_magenta = "#ff11ff"
+bright_cyan = "#11ffff"
+bright_fg = "#eeeeee"
+EOF
+
+cat >"$USER_THEMED/mix-test.txt.tpl" <<'EOF'
+mix={{ mix background foreground 50% }}
+strip={{ mix_strip background foreground 50% }}
+rgb={{ mix_rgb background foreground 50% }}
+EOF
+
+cat >"$USER_THEMED/gradient-test.txt.tpl" <<'EOF'
+hypr={{ hypr_gradient hyprland_active_border accent }}
+shell={{ gradient_start hyprland_active_border accent }}
+shell-gradient={{ shell_gradient hyprland_active_border accent }}
+fallback-hypr={{ hypr_gradient missing accent }}
+fallback-shell={{ gradient_start missing accent }}
+fallback-shell-gradient={{ shell_gradient missing accent }}
+EOF
+
+cat >"$USER_THEMED/alias-test.txt.tpl" <<'EOF'
+color={{ color1 }}
+strip={{ color1_strip }}
+rgb={{ color1_rgb }}
+magenta={{ magenta }}
+legacy-purple={{ purple }}
+bright-magenta={{ bright_magenta }}
+legacy-bright-purple={{ bright_purple }}
+EOF
+
+cat >"$NEXT_THEME/shell.lock.toml" <<'EOF'
+text = "#ffffff"
+placeholder = "#ffffff"
+border = "#ffffff"
+EOF
+
+OMARCHY_PATH="$ROOT" HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-theme-set-templates"
+grep -qx 'mix=#808080' "$NEXT_THEME/mix-test.txt" || fail "theme template mix helper works"
+grep -qx 'strip=808080' "$NEXT_THEME/mix-test.txt" || fail "theme template mix_strip helper works"
+grep -qx 'rgb=128,128,128' "$NEXT_THEME/mix-test.txt" || fail "theme template mix_rgb helper works"
+pass "theme template color mix helpers work"
+
+grep -qx 'color=#ff0000' "$NEXT_THEME/alias-test.txt" || fail "theme template semantic aliases expose legacy colorN"
+grep -qx 'strip=ff0000' "$NEXT_THEME/alias-test.txt" || fail "theme template legacy colorN_strip works"
+grep -qx 'rgb=255,0,0' "$NEXT_THEME/alias-test.txt" || fail "theme template legacy colorN_rgb works"
+grep -qx 'magenta=#ff00ff' "$NEXT_THEME/alias-test.txt" || fail "theme template magenta helper works"
+grep -qx 'legacy-purple=#ff00ff' "$NEXT_THEME/alias-test.txt" || fail "theme template purple alias works"
+grep -qx 'bright-magenta=#ff11ff' "$NEXT_THEME/alias-test.txt" || fail "theme template bright magenta helper works"
+grep -qx 'legacy-bright-purple=#ff11ff' "$NEXT_THEME/alias-test.txt" || fail "theme template bright purple alias works"
+pass "theme template semantic aliases expose legacy colorN helpers"
+
+osc_summary=$("$ROOT/bin/omarchy-theme-osc" "$NEXT_THEME/colors.toml" | python -c 'import sys; data = sys.stdin.buffer.read(); print(data.count(b"]4;"), b"]4;1;#ff0000" in data, b"]4;15;#eeeeee" in data)')
+[[ $osc_summary == "16 True True" ]] || fail "theme OSC aliases semantic colors to ANSI palette"
+pass "theme OSC aliases semantic colors to ANSI palette"
+
+grep -qx 'hypr={ colors = { "rgba(010203ee)", "rgba(040506ee)" }, angle = 45 }' "$NEXT_THEME/gradient-test.txt" || fail "theme template hypr_gradient helper works"
+grep -qx 'shell=#010203' "$NEXT_THEME/gradient-test.txt" || fail "theme template gradient_start helper works"
+grep -qx 'shell-gradient=rgba(010203ee) rgba(040506ee) 45deg' "$NEXT_THEME/gradient-test.txt" || fail "theme template shell_gradient helper works"
+grep -qx 'fallback-hypr="#336699"' "$NEXT_THEME/gradient-test.txt" || fail "theme template hypr_gradient fallback works"
+grep -qx 'fallback-shell=#336699' "$NEXT_THEME/gradient-test.txt" || fail "theme template gradient_start fallback works"
+grep -qx 'fallback-shell-gradient=#336699' "$NEXT_THEME/gradient-test.txt" || fail "theme template shell_gradient fallback works"
+pass "theme template gradient helpers work"
+
+awk '
+  /^\[lock\]$/ { in_lock = 1; next }
+  /^\[/ { in_lock = 0 }
+  in_lock && /^text = "#ffffff"$/ { text = 1 }
+  in_lock && /^placeholder = "#ffffff"$/ { placeholder = 1 }
+  in_lock && /^border = "#ffffff"$/ { border = 1 }
+  END { exit(text && placeholder && border ? 0 : 1) }
+' "$NEXT_THEME/shell.toml" || fail "theme shell section override is merged"
+pass "theme shell section override is merged"
+
+jq -e '.name == "omarchy-system" and .vars.panel == "#0f0f0f" and .vars.border == "#4d4d4d" and .colors.accent == "accent"' "$NEXT_THEME/pi.json" >/dev/null
+pass "pi theme template is generated from standard themed templates"
+cp "$NEXT_THEME/pi.json" "$CURRENT_THEME/pi.json"
+
+echo '{"name":"omarchy-system","vars":{"custom":"yes"}}' >"$NEXT_THEME/pi.json"
+OMARCHY_PATH="$ROOT" HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-theme-set-templates"
+jq -e '.name == "omarchy-system" and .vars.custom == "yes"' "$NEXT_THEME/pi.json" >/dev/null
+pass "theme-specific pi.json overrides the default template"
+
+HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-theme-set-pi"
+[[ ! -d $PI_TMPDIR/.pi ]] || fail "pi theme sync skips missing Pi agent when not activating"
+pass "pi theme sync skips missing Pi agent when not activating"
+
+HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-theme-set-pi" --activate
+[[ -f $PI_TMPDIR/.pi/agent/themes/omarchy-system.json ]] || fail "pi theme file is synced"
+pass "pi theme file is synced"
+[[ -f $PI_TMPDIR/.pi/agent/settings.json ]] || fail "pi settings file is generated"
+pass "pi settings file is generated"
+jq -e '.name == "omarchy-system" and .vars.panel == "#0f0f0f"' "$PI_TMPDIR/.pi/agent/themes/omarchy-system.json" >/dev/null
+pass "pi synced theme JSON is valid"
+jq -e '.theme == "omarchy-system"' "$PI_TMPDIR/.pi/agent/settings.json" >/dev/null
+pass "pi generated theme is activated"
+
+jq '.model = "keep-me"' "$PI_TMPDIR/.pi/agent/settings.json" >"$PI_TMPDIR/settings.json.tmp"
+mv "$PI_TMPDIR/settings.json.tmp" "$PI_TMPDIR/.pi/agent/settings.json"
+HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-theme-set-pi" --activate
+jq -e '.theme == "omarchy-system" and .model == "keep-me"' "$PI_TMPDIR/.pi/agent/settings.json" >/dev/null
+pass "pi theme activation preserves existing settings"
+
+THEME_TMPDIR=$(mktemp -d)
+OMARCHY_PATH="$ROOT" HOME="$THEME_TMPDIR" OMARCHY_THEME_HEADLESS=1 "$ROOT/bin/omarchy-theme-set" "Tokyo Night"
+background_path=$(readlink -f "$THEME_TMPDIR/.config/omarchy/current/background" 2>/dev/null || true)
+expected_background="$THEME_TMPDIR/.config/omarchy/current/theme/backgrounds/0-swirl-buck.jpg"
+[[ $background_path == "$expected_background" ]] || fail "headless theme set creates current background symlink"
+[[ -f $background_path ]] || fail "headless theme background target exists"
+pass "headless theme set creates current background symlink"
+
+cp "$NEXT_THEME/colors.toml" "$CURRENT_THEME/colors.toml"
+cp "$NEXT_THEME/vscode-theme.json" "$CURRENT_THEME/vscode-theme.json"
+
+FAKE_BIN="$PI_TMPDIR/fake-bin"
+mkdir -p "$FAKE_BIN"
+
+cat >"$FAKE_BIN/tmux" <<'EOF'
+#!/bin/bash
+case "$1" in
+  list-sessions)
+    [[ $2 == "-F" ]] && echo "session-1"
+    exit 0
+    ;;
+  set-environment|set-option|refresh-client)
+    echo "$*" >>"${TMUX_LOG:-/dev/null}"
+    exit 0
+    ;;
+  list-panes|list-clients)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+EOF
+chmod +x "$FAKE_BIN/tmux"
+
+TMUX_LOG="$PI_TMPDIR/tmux.log" PATH="$FAKE_BIN:$ROOT/bin:$PATH" HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-theme-set-tmux"
+grep -q 'set-environment -g COLORFGBG 0;15' "$PI_TMPDIR/tmux.log" || fail "tmux sync reads mode from colors.toml"
+pass "tmux sync reads mode from colors.toml"
+
+cat >"$FAKE_BIN/gsettings" <<'EOF'
+#!/bin/bash
+echo "$*" >>"${GSETTINGS_LOG:-/dev/null}"
+EOF
+chmod +x "$FAKE_BIN/gsettings"
+
+GSETTINGS_LOG="$PI_TMPDIR/gsettings.log" DBUS_SESSION_BUS_ADDRESS="unix:path=$PI_TMPDIR/bus" PATH="$FAKE_BIN:$ROOT/bin:$PATH" HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-theme-set-gnome"
+grep -q 'org.gnome.desktop.interface color-scheme prefer-light' "$PI_TMPDIR/gsettings.log" || fail "gnome sync reads mode from colors.toml"
+pass "gnome sync reads mode from colors.toml"
+
+cat >"$FAKE_BIN/omarchy-cmd-present" <<'EOF'
+#!/bin/bash
+[[ $1 == "code" ]]
+EOF
+chmod +x "$FAKE_BIN/omarchy-cmd-present"
+
+cat >"$FAKE_BIN/omarchy-toggle-enabled" <<'EOF'
+#!/bin/bash
+exit 1
+EOF
+chmod +x "$FAKE_BIN/omarchy-toggle-enabled"
+
+mkdir -p "$PI_TMPDIR/.vscode/extensions"
+echo '{"local.omarchy-theme-1.0.0":true}' >"$PI_TMPDIR/.vscode/extensions/.obsolete"
+PATH="$FAKE_BIN:$ROOT/bin:$PATH" HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-theme-set-vscode"
+jq -e '.contributes.themes[0].uiTheme == "vs"' "$PI_TMPDIR/.vscode/extensions/omarchy-theme/package.json" >/dev/null || fail "vscode generated light theme uses VS Code light uiTheme"
+pass "vscode generated light theme uses VS Code light uiTheme"
+[[ -L $PI_TMPDIR/.vscode/extensions/omarchy-theme/themes/omarchy-color-theme.json ]] || fail "vscode generated theme references current theme file"
+[[ $(readlink "$PI_TMPDIR/.vscode/extensions/omarchy-theme/themes/omarchy-color-theme.json") == "$PI_TMPDIR/.config/omarchy/current/theme/vscode-theme.json" ]] || fail "vscode generated theme references current theme file"
+pass "vscode generated theme references current theme file"
+[[ ! -f $PI_TMPDIR/.vscode/extensions/.obsolete ]] || fail "vscode generated theme clears obsolete extension marker"
+pass "vscode generated theme clears obsolete extension marker"
+jq -e '.[] | select(.identifier.id == "local.omarchy-theme" and .relativeLocation == "omarchy-theme")' "$PI_TMPDIR/.vscode/extensions/extensions.json" >/dev/null || fail "vscode generated theme registers local extension"
+pass "vscode generated theme registers local extension"
+
+for binary in \
+  omarchy-update \
+  omarchy-theme-set \
+  omarchy-capture-screenshot \
+  omarchy-system-reboot \
+  omarchy-pkg-add; do
+  [[ -x $ROOT/bin/$binary ]] || fail "binary is executable: $binary"
+  pass "binary is executable: $binary"
+done
+
+while IFS= read -r binary_path; do
+  header=$(awk '
+    NR == 1 && /^#!/ { next }
+    /^[[:space:]]*$/ { if (seen) print; next }
+    /^[[:space:]]*#/ { seen=1; print; next }
+    { exit }
+  ' "$binary_path")
+
+  grep -q '^# omarchy:summary=' <<<"$header" || fail "metadata summary is present: $binary_path"
+  ! grep -q '^# omarchy:binary=' <<<"$header" || fail "metadata does not repeat inferred binary: $binary_path"
+  ! grep -q '^# omarchy:args=$' <<<"$header" || fail "metadata does not include empty args: $binary_path"
+  ! grep -Eq '^# omarchy:(legacy|usage|visibility|mutates|interactive)=' <<<"$header" || fail "metadata avoids removed fields: $binary_path"
+  ! grep -Eq '^# omarchy:requires-sudo=false$' <<<"$header" || fail "metadata omits false booleans: $binary_path"
+done < <(find "$ROOT/bin" -maxdepth 1 -type f -executable -name 'omarchy-*' | sort)
+pass "all executable bins have slim self-documenting metadata"
+
+TMPDIR=$(mktemp -d)
+ln -s "$CLI" "$TMPDIR/omarchy"
+
+{
+  printf '#!/bin/bash\n\n'
+  printf '# ordinary comments are fine\n'
+  printf '# omarchy:this malformed line should be ignored\n'
+  printf '# omarchy:group=weird\n'
+  printf '# omarchy:name=test\n'
+  printf '# omarchy:summary=Survives malformed metadata comments\n'
+  printf '# omarchy:made-up=value\n'
+  printf 'echo weird-ok\n'
+} >"$TMPDIR/omarchy-weird-test"
+chmod +x "$TMPDIR/omarchy-weird-test"
+
+{
+  printf '#!/bin/bash\n\n'
+  printf '# a partial metadata header should not destroy fallback routing\n'
+  printf '# omarchy:summary=Partial metadata keeps inferred route\n'
+  printf '# omarchy:made-up=value\n'
+  printf 'echo partial-ok\n'
+} >"$TMPDIR/omarchy-partial-meta-test"
+chmod +x "$TMPDIR/omarchy-partial-meta-test"
+
+{
+  printf '#!/bin/bash\n\n'
+  printf 'echo body-metadata-ok\n'
+  printf '# omarchy:group=wrong\n'
+  printf '# omarchy:name=wrong\n'
+} >"$TMPDIR/omarchy-body-metadata-test"
+chmod +x "$TMPDIR/omarchy-body-metadata-test"
+
+"$TMPDIR/omarchy" commands --all --json | jq -e '.commands[] | select(.route == "omarchy weird test" and .summary == "Survives malformed metadata comments")' >/dev/null
+pass "unknown metadata values are non-fatal"
+
+"$TMPDIR/omarchy" commands --all --json | jq -e '.commands[] | select(.route == "omarchy partial meta test" and .summary == "Partial metadata keeps inferred route")' >/dev/null
+pass "partial metadata keeps inferred fallback route"
+
+"$TMPDIR/omarchy" commands --all --json | jq -e '.commands[] | select(.route == "omarchy body metadata test" and .summary == "Run the body metadata test command")' >/dev/null
+pass "metadata-looking comments after script body are ignored"
+
+output=$("$TMPDIR/omarchy" weird test)
+assert_output_contains "temporary metadata command dispatches" "$output" "weird-ok"
+
+output=$("$TMPDIR/omarchy" partial meta test)
+assert_output_contains "partial metadata command dispatches" "$output" "partial-ok"
+
+output=$("$TMPDIR/omarchy" body metadata test)
+assert_output_contains "body metadata command dispatches by filename" "$output" "body-metadata-ok"
diff --git a/test/omarchy-cli-test.sh b/test/omarchy-cli-test.sh
deleted file mode 100644
index 8e9fd341..00000000
--- a/test/omarchy-cli-test.sh
+++ /dev/null
@@ -1,265 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-ROOT=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)
-CLI="$ROOT/bin/omarchy"
-TMPDIR=""
-
-export PATH="$ROOT/bin:$PATH"
-
-pass() {
-  printf 'ok - %s\n' "$1"
-}
-
-fail() {
-  printf 'not ok - %s\n' "$1" >&2
-  exit 1
-}
-
-assert_output_contains() {
-  local description="$1"
-  local output="$2"
-  local expected="$3"
-
-  if [[ $output != *"$expected"* ]]; then
-    printf 'Expected output to contain: %s\n' "$expected" >&2
-    printf 'Actual output:\n%s\n' "$output" >&2
-    fail "$description"
-  fi
-
-  pass "$description"
-}
-
-cleanup() {
-  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
-}
-trap cleanup EXIT
-
-output=$("$CLI" --help)
-assert_output_contains "main help renders" "$output" "Omarchy command center"
-assert_output_contains "main help includes hardware group" "$output" "hw"
-assert_output_contains "main help includes package group" "$output" "pkg"
-if grep -Eq '^  [a-z0-9-]+[[:space:]].*\([0-9]+\)$' <<<"$output"; then
-  fail "main help does not show group counts"
-fi
-pass "main help does not show group counts"
-
-output=$("$CLI" commands)
-assert_output_contains "commands lists documented commands" "$output" "omarchy theme set <theme-name>"
-
-"$CLI" commands --json | jq -e '.ok == true and (.commands | length >= 200)' >/dev/null
-pass "commands --json is valid JSON with full bin coverage"
-
-"$CLI" commands --json | jq -e 'all(.commands[]; .summary != "undocumented")' >/dev/null
-pass "all included commands have summaries"
-
-"$CLI" commands --json | jq -e 'all(.commands[]; has("binary") and has("filename_route") and has("routes") and (has("legacy") | not) and (has("usage") | not) and (has("visibility") | not) and (has("mutates") | not) and (has("interactive") | not))' >/dev/null
-pass "JSON uses binary/routes and omits legacy/usage/extra metadata"
-
-"$CLI" commands --check >/dev/null
-pass "commands --check passes"
-
-"$CLI" commands --all >/dev/null
-pass "commands --all does not crash"
-
-"$CLI" commands --all --json | jq -e '.commands[] | select(.route == "omarchy hyprland window gaps toggle" and .summary != "undocumented")' >/dev/null
-pass "fallback commands are inferred and documented"
-
-"$CLI" commands --all --json | jq -e '.commands[] | select(.route == "omarchy dev benchmark")' >/dev/null
-pass "benchmark command is discoverable in all commands"
-
-"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-pkg-add" and .route == "omarchy pkg add" and .filename_route == "omarchy pkg add" and (.routes | index("omarchy pkg add")))' >/dev/null
-pass "JSON exposes direct pkg add route"
-
-"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-refresh-pacman" and .requires_sudo == true)' >/dev/null
-pass "sudo metadata marks sudo commands"
-
-output=$("$CLI" theme --help)
-assert_output_contains "group help renders" "$output" "Theme commands"
-
-output=$("$CLI" install --help)
-assert_output_contains "install group help renders" "$output" "Install commands"
-assert_output_contains "install group includes browser route" "$output" "omarchy install browser"
-
-output=$("$CLI" install)
-assert_output_contains "bare group renders help instead of picker" "$output" "Install commands"
-assert_output_contains "bare group includes browser route" "$output" "omarchy install browser"
-
-output=$("$CLI" toggle)
-assert_output_contains "bare root command with children renders help" "$output" "Toggle commands"
-assert_output_contains "bare toggle help includes child route" "$output" "omarchy toggle waybar"
-
-output=$("$CLI" pkg --help)
-assert_output_contains "package group includes pkg add fallback route" "$output" "omarchy pkg add <packages...>"
-
-output=$("$CLI" restart --help)
-assert_output_contains "restart group includes inferred commands" "$output" "omarchy restart btop"
-assert_output_contains "restart group includes all restart commands" "$output" "omarchy restart wifi"
-
-output=$("$CLI" hw --help)
-assert_output_contains "hardware group help renders" "$output" "omarchy hw asus rog"
-assert_output_contains "hardware group includes touchpad" "$output" "omarchy hw touchpad"
-
-output=$("$CLI" hw asus)
-assert_output_contains "partial hardware prefix renders matching commands" "$output" "omarchy hw asus rog"
-assert_output_contains "partial hardware prefix includes nested match" "$output" "omarchy hw asus zenbook ux5406aa"
-
-output=$("$CLI" menu --help)
-assert_output_contains "menu group includes share fallback route" "$output" "omarchy menu share"
-
-output=$("$CLI" share)
-assert_output_contains "bare required-arg alias renders CLI help" "$output" "Usage:"
-assert_output_contains "bare share help uses canonical route" "$output" "omarchy share <clipboard|file|folder> [path...]"
-
-output=$("$CLI" menu share)
-assert_output_contains "bare required-arg filename route renders CLI help" "$output" "omarchy share <clipboard|file|folder> [path...]"
-
-output=$("$CLI" branch set)
-assert_output_contains "bare required-choice route renders CLI help" "$output" "omarchy branch set <master|rc|dev>"
-
-CLI="$CLI" python3 <<'PY'
-import json
-import os
-import subprocess
-import sys
-
-cli = os.environ['CLI']
-commands = json.loads(subprocess.check_output([cli, 'commands', '--json'], text=True))['commands']
-by_group = {}
-for command in commands:
-  binary = command['binary']
-  stem = binary.removeprefix('omarchy-')
-  group = stem.split('-', 1)[0]
-  filename_route = 'omarchy ' + stem.replace('-', ' ')
-  by_group.setdefault(group, []).append((binary, filename_route, command['route']))
-
-missing = []
-for group, rows in sorted(by_group.items()):
-  proc = subprocess.run([cli, group, '--help'], text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-  output = proc.stdout + proc.stderr
-  if proc.returncode != 0:
-    missing.append((group, '<group-help-failed>', f'exit {proc.returncode}'))
-    continue
-  for binary, filename_route, canonical_route in rows:
-    if filename_route not in output and canonical_route not in output and binary not in output:
-      missing.append((group, binary, filename_route))
-
-if missing:
-  for row in missing:
-    print('\t'.join(row), file=sys.stderr)
-  sys.exit(1)
-PY
-pass "every filename-derived group help represents its bins"
-
-output=$(timeout 5 "$CLI" theme set --help)
-assert_output_contains "command help renders without executing" "$output" "Binary:"
-assert_output_contains "theme set help names binary" "$output" "omarchy-theme-set"
-
-output=$(timeout 5 "$CLI" update --help)
-assert_output_contains "mutating command help does not execute target" "$output" "omarchy-update"
-assert_output_contains "root command help shows related child commands" "$output" "omarchy update perform"
-
-output=$("$CLI" screenshot --help)
-assert_output_contains "root alias resolves to command help" "$output" "omarchy-capture-screenshot"
-
-"$CLI" commands --json | jq -e '.commands[] | select(.binary == "omarchy-capture-screenshot") | .aliases | index("omarchy screenshot")' >/dev/null
-pass "aliases are included in JSON metadata"
-
-output=$("$CLI" pkg add --help)
-assert_output_contains "pkg add help resolves" "$output" "omarchy-pkg-add"
-assert_output_contains "pkg add help shows direct route" "$output" "omarchy pkg add <packages...>"
-
-output=$("$CLI" system reboot --help)
-assert_output_contains "system command help is safe" "$output" "omarchy-system-reboot"
-
-output=$("$CLI" dev benchmark --repeat=1)
-assert_output_contains "benchmark command runs" "$output" "Omarchy CLI benchmark"
-
-"$CLI" theme list >/dev/null
-pass "safe dispatch works for theme list"
-
-"$CLI" theme current >/dev/null
-pass "safe dispatch works for theme current"
-
-"$CLI" font list >/dev/null
-pass "safe dispatch works for font list"
-
-"$CLI" font current >/dev/null
-pass "safe dispatch works for font current"
-
-for binary in \
-  omarchy-update \
-  omarchy-theme-set \
-  omarchy-capture-screenshot \
-  omarchy-system-reboot \
-  omarchy-pkg-add; do
-  [[ -x $ROOT/bin/$binary ]] || fail "binary is executable: $binary"
-  pass "binary is executable: $binary"
-done
-
-while IFS= read -r binary_path; do
-  header=$(awk '
-    NR == 1 && /^#!/ { next }
-    /^[[:space:]]*$/ { if (seen) print; next }
-    /^[[:space:]]*#/ { seen=1; print; next }
-    { exit }
-  ' "$binary_path")
-
-  grep -q '^# omarchy:summary=' <<<"$header" || fail "metadata summary is present: $binary_path"
-  ! grep -q '^# omarchy:binary=' <<<"$header" || fail "metadata does not repeat inferred binary: $binary_path"
-  ! grep -q '^# omarchy:args=$' <<<"$header" || fail "metadata does not include empty args: $binary_path"
-  ! grep -Eq '^# omarchy:(legacy|usage|visibility|mutates|interactive)=' <<<"$header" || fail "metadata avoids removed fields: $binary_path"
-  ! grep -Eq '^# omarchy:requires-sudo=false$' <<<"$header" || fail "metadata omits false booleans: $binary_path"
-done < <(find "$ROOT/bin" -maxdepth 1 -type f -executable -name 'omarchy-*' | sort)
-pass "all executable bins have slim self-documenting metadata"
-
-TMPDIR=$(mktemp -d)
-ln -s "$CLI" "$TMPDIR/omarchy"
-
-{
-  printf '#!/bin/bash\n\n'
-  printf '# ordinary comments are fine\n'
-  printf '# omarchy:this malformed line should be ignored\n'
-  printf '# omarchy:group=weird\n'
-  printf '# omarchy:name=test\n'
-  printf '# omarchy:summary=Survives malformed metadata comments\n'
-  printf '# omarchy:made-up=value\n'
-  printf 'echo weird-ok\n'
-} >"$TMPDIR/omarchy-weird-test"
-chmod +x "$TMPDIR/omarchy-weird-test"
-
-{
-  printf '#!/bin/bash\n\n'
-  printf '# a partial metadata header should not destroy fallback routing\n'
-  printf '# omarchy:summary=Partial metadata keeps inferred route\n'
-  printf '# omarchy:made-up=value\n'
-  printf 'echo partial-ok\n'
-} >"$TMPDIR/omarchy-partial-meta-test"
-chmod +x "$TMPDIR/omarchy-partial-meta-test"
-
-{
-  printf '#!/bin/bash\n\n'
-  printf 'echo body-metadata-ok\n'
-  printf '# omarchy:group=wrong\n'
-  printf '# omarchy:name=wrong\n'
-} >"$TMPDIR/omarchy-body-metadata-test"
-chmod +x "$TMPDIR/omarchy-body-metadata-test"
-
-"$TMPDIR/omarchy" commands --all --json | jq -e '.commands[] | select(.route == "omarchy weird test" and .summary == "Survives malformed metadata comments")' >/dev/null
-pass "unknown metadata values are non-fatal"
-
-"$TMPDIR/omarchy" commands --all --json | jq -e '.commands[] | select(.route == "omarchy partial meta test" and .summary == "Partial metadata keeps inferred route")' >/dev/null
-pass "partial metadata keeps inferred fallback route"
-
-"$TMPDIR/omarchy" commands --all --json | jq -e '.commands[] | select(.route == "omarchy body metadata test" and .summary == "Run the body metadata test command")' >/dev/null
-pass "metadata-looking comments after script body are ignored"
-
-output=$("$TMPDIR/omarchy" weird test)
-assert_output_contains "temporary metadata command dispatches" "$output" "weird-ok"
-
-output=$("$TMPDIR/omarchy" partial meta test)
-assert_output_contains "partial metadata command dispatches" "$output" "partial-ok"
-
-output=$("$TMPDIR/omarchy" body metadata test)
-assert_output_contains "body metadata command dispatches by filename" "$output" "body-metadata-ok"
diff --git a/test/shell b/test/shell
new file mode 100755
index 00000000..215b98aa
--- /dev/null
+++ b/test/shell
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -euo pipefail
+
+ROOT=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)
+TEST_DIR="$ROOT/test/shell.d"
+
+shopt -s nullglob
+tests=()
+for test in "$TEST_DIR"/*-test.sh; do
+  [[ $(basename "$test") == "base-test.sh" ]] && continue
+  tests+=("$test")
+done
+shopt -u nullglob
+
+if (( ${#tests[@]} == 0 )); then
+  echo "No shell tests found in $TEST_DIR" >&2
+  exit 1
+fi
+
+for test in "${tests[@]}"; do
+  printf '==> %s\n' "${test#$ROOT/}"
+  bash "$test"
+done
diff --git a/test/shell.d/audio-test.sh b/test/shell.d/audio-test.sh
new file mode 100644
index 00000000..710835d8
--- /dev/null
+++ b/test/shell.d/audio-test.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const audio = requireFromRoot('shell/plugins/panels/audio/Model.js')
+
+assert(audio.isPlaybackStream({ isStream: true, isSink: true }), 'audio detects sink-backed playback streams')
+assert(audio.isPlaybackStream({ isStream: true, type: 'Stream/Output/Audio' }), 'audio detects typed playback streams')
+assert(!audio.isPlaybackStream({ isStream: false, isSink: true }), 'audio rejects non-stream playback nodes')
+assert(audio.isAudioSource({ audio: {} }), 'audio detects nodes with audio as sources')
+assert(audio.isAudioSource({ type: 'Audio/Source' }), 'audio detects typed source nodes')
+
+assertEqual(audio.outputVolumeName(0, false), 'Silenced', 'audio labels silent output')
+assertEqual(audio.outputVolumeName(0.9, false), 'Party mode', 'audio labels loud output')
+assertEqual(audio.outputVolumeName(0.5, true), 'Muted', 'audio labels muted output')
+
+assertDeepEqual(audio.parseSinkAvailability('alsa_output\t1\nhdmi_output\t0\n'), { alsa_output: true, hdmi_output: false }, 'audio parses sink availability')
+assertEqual(audio.friendlyDeviceLabel('Built-in Audio Speakers Output'), 'Speakers', 'audio cleans device labels')
+assertEqual(
+  audio.nodeLabel({ ready: true, properties: { 'node.nick': 'Built-in Audio Microphones Input' }, name: 'alsa_input' }),
+  'Microphone',
+  'audio chooses friendly node labels'
+)
+
+const headphones = { ready: true, name: 'bluez_output.airpods', properties: { 'device.product.name': 'AirPods Headphones' } }
+assert(audio.isHeadphones(headphones), 'audio detects headphone devices')
+assertEqual(audio.sinkGlyph(headphones), '󰋋', 'audio uses headphone sink glyph')
+assert(audio.sourceGlyph({ ready: true, properties: { 'device.icon-name': 'camera-webcam' } }).length > 0, 'audio maps webcam source glyph')
+
+assertEqual(audio.friendlyStreamLabel('spotify'), 'Spotify', 'audio normalizes known stream labels')
+assert(audio.streamRepresentsMprisPlayer('Chromium', 'Chromium Browser'), 'audio matches related stream and MPRIS labels')
+
+const players = [
+  { identity: 'Spotify', canPlay: true, isPlaying: true, dbusName: 'org.mpris.MediaPlayer2.spotify' },
+  { identity: 'Chromium', canPlay: true, isPlaying: false, dbusName: 'org.mpris.MediaPlayer2.chromium' }
+]
+const streams = [
+  { ready: true, properties: { 'application.name': 'Chromium' } },
+  { ready: true, properties: { 'application.name': 'audio-src' } }
+]
+
+assertEqual(audio.matchingMprisStreamLabel('Chromium', players), 'Chromium', 'audio finds matching MPRIS labels')
+assertEqual(audio.unmatchedMprisStreamLabel('audio-src', players, streams), 'Spotify', 'audio uses unmatched MPRIS player for generic streams')
+assertEqual(audio.streamLabel(streams[1], players, streams), 'Spotify', 'audio labels generic streams from MPRIS')
+assert(audio.streamRepresentsPlayer(streams[1], players[0], players, streams), 'audio links generic streams to active player')
+JS
diff --git a/test/shell.d/background-test.sh b/test/shell.d/background-test.sh
new file mode 100644
index 00000000..db512476
--- /dev/null
+++ b/test/shell.d/background-test.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+source "$(dirname "$0")/base-test.sh"
+
+run_node_test <<'JS'
+const fs = require('fs')
+
+const backgroundQml = fs.readFileSync(path.join(root, 'shell/plugins/background/Background.qml'), 'utf8')
+
+assert(
+  /theme=\$\(omarchy-theme-switcher\); \[\[ -n \$theme \]\] && omarchy-theme-set \\"\$theme\\" >\/dev\/null 2>&1 &/.test(backgroundQml),
+  'background theme switcher starts theme application asynchronously after selection'
+)
+JS
diff --git a/test/shell.d/bar-test.sh b/test/shell.d/bar-test.sh
new file mode 100644
index 00000000..679b6a5f
--- /dev/null
+++ b/test/shell.d/bar-test.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+if perl -0ne 'exit(/drag\s*\.\s*target\s*:\s*[^;]*\bslot\b/s ? 0 : 1)' "$ROOT/shell/plugins/bar/Bar.qml"; then
+  fail "bar module dragging must not mutate ModuleSlot positions"
+fi
+pass "bar module dragging leaves layout-managed slots in place"
+
+run_node_test <<'JS'
+const bar = requireFromRoot('shell/plugins/bar/BarModel.js')
+
+assertEqual(bar.normalizePosition('left'), 'left', 'bar accepts valid positions')
+assertEqual(bar.normalizePosition('sideways'), 'top', 'bar defaults invalid positions')
+assertDeepEqual(bar.entrySettings({ id: 'omarchy.clock', format: 'HH:mm' }), { format: 'HH:mm' }, 'bar extracts entry settings')
+assertEqual(bar.entryId({ id: 'omarchy.clock' }), 'omarchy.clock', 'bar extracts object entry ids')
+assertEqual(bar.entryId('omarchy.clock'), 'omarchy.clock', 'bar extracts string entry ids')
+
+const entries = [{ id: 'a' }, { id: 'omarchy.tray' }, { id: 'b' }]
+assertDeepEqual(bar.pinTrayToInner(entries, 'left').map(bar.entryId), ['a', 'b', 'omarchy.tray'], 'bar pins tray to left inner edge')
+assertDeepEqual(bar.pinTrayToInner(entries, 'right').map(bar.entryId), ['omarchy.tray', 'a', 'b'], 'bar pins tray to right inner edge')
+
+assertEqual(bar.moduleString({ id: 'custom', label: 42 }, 'label', 'fallback'), '42', 'bar stringifies module settings')
+assertEqual(bar.entryIndex(entries, 'b'), 2, 'bar finds entry indexes')
+assertDeepEqual(bar.entriesBefore(entries, 'b').map(bar.entryId), ['a', 'omarchy.tray'], 'bar returns entries before target')
+assertDeepEqual(bar.entriesAfter(entries, 'a').map(bar.entryId), ['omarchy.tray', 'b'], 'bar returns entries after target')
+
+assertEqual(bar.expandPath('~/module.qml', '/home/dhh'), '/home/dhh/module.qml', 'bar expands tilde paths')
+assertEqual(bar.expandPath('$HOME/module.qml', '/home/dhh'), '/home/dhh/module.qml', 'bar expands HOME paths')
+assert(bar.customModuleSafeName('local.weather'), 'bar accepts safe custom module names')
+assert(!bar.customModuleSafeName('../escape'), 'bar rejects path traversal custom module names')
+assertEqual(bar.customModuleType({ id: 'custom', exec: 'date' }), 'command', 'bar infers command custom modules')
+assertEqual(bar.customModuleType({ id: 'custom', source: '~/Custom.qml' }), 'qml', 'bar infers qml custom modules')
+assertEqual(
+  bar.customModulePath({ id: 'local.weather' }, '/home/dhh', '/home/dhh/.config/omarchy'),
+  '/home/dhh/.config/omarchy/bar/modules/local.weather.qml',
+  'bar builds default custom module paths'
+)
+JS
diff --git a/test/shell.d/bar-text-color-test.sh b/test/shell.d/bar-text-color-test.sh
new file mode 100755
index 00000000..14770a99
--- /dev/null
+++ b/test/shell.d/bar-text-color-test.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+require_command magick
+
+TMPDIR=$(mktemp -d)
+trap 'rm -rf "$TMPDIR"' EXIT
+
+export PATH="$ROOT/bin:$PATH"
+
+light_top="$TMPDIR/light-top.png"
+dark_top="$TMPDIR/dark-top.png"
+
+magick -size 100x100 xc:'#202020' -fill '#f5f5f5' -draw 'rectangle 0,0 99,19' "$light_top"
+magick -size 100x100 xc:'#f5f5f5' -fill '#202020' -draw 'rectangle 0,0 99,19' "$dark_top"
+
+result=$(HOME="$TMPDIR" omarchy-shell-bar-text-color top 20 '#ffffff' '#101010' --background "$light_top" --screen 100x100)
+[[ $result == "#101010" ]] || fail "transparent bar text switches to background color on light wallpaper" "expected #101010, got $result"
+pass "transparent bar text switches to background color on light wallpaper"
+
+result=$(HOME="$TMPDIR" omarchy-shell-bar-text-color top 20 '#ffffff' '#101010' --background "$dark_top" --screen 100x100)
+[[ $result == "#ffffff" ]] || fail "transparent bar text keeps text color on dark wallpaper" "expected #ffffff, got $result"
+pass "transparent bar text keeps text color on dark wallpaper"
+
+result=$(HOME="$TMPDIR" omarchy-shell-bar-text-color top 20 '#ffffff' '#101010' --background "$TMPDIR/missing.png" --screen 100x100)
+[[ $result == "#ffffff" ]] || fail "transparent bar text falls back to text color when sampling fails" "expected #ffffff, got $result"
+pass "transparent bar text falls back to text color when sampling fails"
diff --git a/test/shell.d/bar-widget-contract-test.sh b/test/shell.d/bar-widget-contract-test.sh
new file mode 100755
index 00000000..7cdd5b22
--- /dev/null
+++ b/test/shell.d/bar-widget-contract-test.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+TMPDIR=""
+QS_PID=""
+
+cleanup() {
+  if [[ -n $QS_PID ]] && kill -0 "$QS_PID" 2>/dev/null; then
+    kill "$QS_PID" 2>/dev/null || true
+    wait "$QS_PID" 2>/dev/null || true
+  fi
+  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
+}
+trap cleanup EXIT
+
+if [[ -z ${WAYLAND_DISPLAY:-} ]]; then
+  pass "no Wayland compositor; skipping bar widget contract test"
+  exit 0
+fi
+
+if ! command -v quickshell >/dev/null 2>&1; then
+  pass "quickshell not installed; skipping bar widget contract test"
+  exit 0
+fi
+
+require_command jq
+require_command python3
+
+bar_widgets=$(ROOT="$ROOT" python3 <<'PY'
+import base64
+import json
+import os
+from pathlib import Path
+
+root = Path(os.environ["ROOT"])
+entries = []
+for manifest_path in sorted((root / "shell/plugins").glob("**/manifest.json")) + sorted((root / "shell/plugins").glob("**/*.manifest.json")):
+  manifest = json.loads(manifest_path.read_text())
+  if "bar-widget" not in manifest.get("kinds", []):
+    continue
+  entry_point = manifest.get("entryPoints", {}).get("barWidget")
+  if not entry_point:
+    continue
+  entries.append({
+    "id": manifest["id"],
+    "url": (manifest_path.parent / entry_point).resolve().as_uri(),
+    "manifest": manifest,
+  })
+
+print(base64.b64encode(json.dumps(entries).encode()).decode())
+PY
+)
+
+TMPDIR=$(mktemp -d)
+result="$TMPDIR/result.json"
+log="$TMPDIR/quickshell.log"
+config_dir="$TMPDIR/bar-widget-contract"
+mkdir -p "$config_dir" "$TMPDIR/home"
+cp "$SHELL_TEST_DIR/fixtures/bar-widget-contract/shell.qml" "$config_dir/shell.qml"
+ln -s "$ROOT/shell/Ui" "$config_dir/Ui"
+ln -s "$ROOT/shell/Commons" "$config_dir/Commons"
+
+OMARCHY_PATH="$ROOT" \
+OMARCHY_QML_TEST_RESULT="$result" \
+OMARCHY_QML_BAR_WIDGETS="$bar_widgets" \
+HOME="$TMPDIR/home" \
+QML2_IMPORT_PATH="$ROOT/shell${QML2_IMPORT_PATH:+:$QML2_IMPORT_PATH}" \
+QML_IMPORT_PATH="$ROOT/shell${QML_IMPORT_PATH:+:$QML_IMPORT_PATH}" \
+PATH="$ROOT/bin:$PATH" \
+  quickshell -p "$config_dir" --no-color >"$log" 2>&1 &
+QS_PID=$!
+
+for _ in {1..80}; do
+  [[ -s $result ]] && break
+  if ! kill -0 "$QS_PID" 2>/dev/null; then
+    sed -n '1,220p' "$log" >&2
+    fail "bar widget contract quickshell exited before writing result"
+  fi
+  sleep 0.1
+done
+
+[[ -s $result ]] || {
+  sed -n '1,220p' "$log" >&2
+  fail "bar widget contract test timed out"
+}
+
+if ! jq -e '.ok == true' "$result" >/dev/null; then
+  printf 'Bar widget contract result:\n' >&2
+  jq . "$result" >&2
+  printf 'Bar widget contract log:\n' >&2
+  sed -n '1,220p' "$log" >&2
+  fail "bar widget contracts pass"
+fi
+
+pass "bar widget contracts pass"
diff --git a/test/shell.d/base-test.sh b/test/shell.d/base-test.sh
new file mode 100644
index 00000000..7bb019a7
--- /dev/null
+++ b/test/shell.d/base-test.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+if [[ ${BASH_SOURCE[0]} == "$0" ]]; then
+  echo "source test/shell.d/base-test.sh from a shell test; do not run it directly" >&2
+  exit 1
+fi
+
+ROOT=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." && pwd)
+SHELL_TEST_DIR="$ROOT/test/shell.d"
+
+export ROOT
+
+pass() {
+  printf 'ok - %s\n' "$1"
+}
+
+fail() {
+  local description="$1"
+  local detail="${2:-}"
+
+  [[ -n $detail ]] && printf '%s\n' "$detail" >&2
+  printf 'not ok - %s\n' "$description" >&2
+  exit 1
+}
+
+require_command() {
+  local command="$1"
+
+  command -v "$command" >/dev/null || fail "required command is available: $command"
+}
+
+run_node_test() {
+  require_command node
+
+  {
+    cat <<'JS_PRELUDE'
+const path = require('path')
+const root = process.env.ROOT
+
+function fail(description, detail) {
+  if (detail) console.error(detail)
+  console.error(`not ok - ${description}`)
+  process.exit(1)
+}
+
+function pass(description) {
+  console.log(`ok - ${description}`)
+}
+
+function assert(condition, description, detail) {
+  if (!condition) fail(description, detail)
+  pass(description)
+}
+
+function assertEqual(actual, expected, description) {
+  assert(
+    actual === expected,
+    description,
+    `expected: ${expected}\nactual:   ${actual}`
+  )
+}
+
+function assertDeepEqual(actual, expected, description) {
+  const actualJson = JSON.stringify(actual)
+  const expectedJson = JSON.stringify(expected)
+  assert(
+    actualJson === expectedJson,
+    description,
+    `expected: ${expectedJson}\nactual:   ${actualJson}`
+  )
+}
+
+function requireFromRoot(relativePath) {
+  return require(path.join(root, relativePath))
+}
+
+JS_PRELUDE
+    cat
+  } | node
+}
diff --git a/test/shell.d/battery-test.sh b/test/shell.d/battery-test.sh
new file mode 100644
index 00000000..0447779a
--- /dev/null
+++ b/test/shell.d/battery-test.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const battery = requireFromRoot('shell/plugins/services/battery/BatteryModel.js')
+const discharging = 1
+
+assertEqual(battery.batteryPercentage({ isPresent: true, percentage: 0.126 }), 13, 'battery rounds display percentage')
+assertEqual(battery.batteryPercentage({ isPresent: false, percentage: 0.5 }), -1, 'battery reports missing battery')
+assert(battery.isDischarging({ isPresent: true, state: discharging }, true, discharging), 'battery detects discharging state')
+assert(!battery.isDischarging({ isPresent: true, state: discharging }, false, discharging), 'battery requires on-battery state')
+
+assertDeepEqual(
+  battery.shouldWarnLowBattery({ isPresent: true, percentage: 0.08, state: discharging }, true, discharging, 10, false),
+  { level: 8, notify: true, notifiedLowBattery: true },
+  'battery warns once under threshold'
+)
+assertDeepEqual(
+  battery.shouldWarnLowBattery({ isPresent: true, percentage: 0.08, state: discharging }, true, discharging, 10, true),
+  { level: 8, notify: false, notifiedLowBattery: true },
+  'battery keeps low-battery notified state'
+)
+assertDeepEqual(
+  battery.shouldWarnLowBattery({ isPresent: true, percentage: 0.4, state: discharging }, true, discharging, 10, true),
+  { level: 40, notify: false, notifiedLowBattery: false },
+  'battery clears notified state after recovery'
+)
+JS
diff --git a/test/shell.d/bluetooth-test.sh b/test/shell.d/bluetooth-test.sh
new file mode 100644
index 00000000..00848673
--- /dev/null
+++ b/test/shell.d/bluetooth-test.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+grep -q '^ConditionPathIsDirectory=/sys/class/bluetooth$' "$ROOT/default/systemd/user/bt-agent.service" || \
+  fail "bt-agent is skipped on machines without Bluetooth hardware"
+pass "bt-agent is skipped on machines without Bluetooth hardware"
+
+run_node_test <<'JS'
+const bluetooth = requireFromRoot('shell/plugins/panels/bluetooth/Model.js')
+
+assert(bluetooth.isUuidLike('0000110b-0000-1000-8000-00805f9b34fb'), 'bluetooth detects UUID-like names')
+assert(bluetooth.isAddressLike('AA:BB:CC:DD:EE:FF'), 'bluetooth detects address-like names')
+assert(!bluetooth.hasHumanName({ name: 'AA:BB:CC:DD:EE:FF' }), 'bluetooth rejects address-only device labels')
+assert(bluetooth.hasHumanName({ deviceName: 'MX Master 3S' }), 'bluetooth accepts human device labels')
+
+const devices = [
+  { name: 'Speaker', connected: false, paired: true, address: '2' },
+  { name: 'Headphones', connected: true, address: '1' },
+  { name: 'Keyboard', connected: false, address: '3' },
+  { name: 'AA:BB:CC:DD:EE:FF', connected: true, address: '4' },
+  { name: 'Mouse', connected: false, trusted: true, address: '5' }
+]
+
+const arrayLikeDevices = {
+  0: devices[0],
+  1: devices[1],
+  length: 2
+}
+assertDeepEqual(
+  bluetooth.toArray(arrayLikeDevices).map(bluetooth.deviceLabel),
+  ['Speaker', 'Headphones'],
+  'bluetooth converts Quickshell QObjectList-style values into arrays'
+)
+
+const lists = bluetooth.deviceLists(devices)
+assertDeepEqual(lists.connected.map(bluetooth.deviceLabel), ['Headphones'], 'bluetooth groups connected devices')
+assertDeepEqual(lists.known.map(bluetooth.deviceLabel), ['Mouse', 'Speaker'], 'bluetooth groups known devices by label')
+assertDeepEqual(lists.discovered.map(bluetooth.deviceLabel), ['Keyboard'], 'bluetooth groups discovered devices')
+assertDeepEqual(bluetooth.visibleSections(lists, true), ['connected', 'known', 'discovered'], 'bluetooth shows discovered section while scanning')
+assertDeepEqual(bluetooth.visibleSections(lists, false), ['connected', 'known'], 'bluetooth hides discovered section when not scanning')
+
+const arrayLikeLists = bluetooth.deviceLists({
+  0: { name: 'Earbuds', connected: true, address: '6' },
+  1: { name: 'Trackpad', paired: true, address: '7' },
+  2: { name: 'Gamepad', address: '8' },
+  length: 3
+})
+assertDeepEqual(arrayLikeLists.connected.map(bluetooth.deviceLabel), ['Earbuds'], 'bluetooth groups connected devices from array-like values')
+assertDeepEqual(arrayLikeLists.known.map(bluetooth.deviceLabel), ['Trackpad'], 'bluetooth groups known devices from array-like values')
+assertDeepEqual(arrayLikeLists.discovered.map(bluetooth.deviceLabel), ['Gamepad'], 'bluetooth groups discovered devices from array-like values')
+
+assertDeepEqual(
+  bluetooth.withPendingAction({ a: 'connecting' }, 'b', 'forgetting'),
+  { a: 'connecting', b: 'forgetting' },
+  'bluetooth adds pending actions immutably'
+)
+assertDeepEqual(bluetooth.withPendingAction({ a: 'connecting' }, 'a', ''), {}, 'bluetooth clears pending actions immutably')
+JS
diff --git a/test/shell.d/border-geometry-test.sh b/test/shell.d/border-geometry-test.sh
new file mode 100755
index 00000000..9c1d70ed
--- /dev/null
+++ b/test/shell.d/border-geometry-test.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+source "$(dirname "$0")/base-test.sh"
+
+run_node_test <<'JS'
+const fs = require('fs')
+const vm = require('vm')
+
+const source = fs.readFileSync(path.join(root, 'shell/Commons/BorderGeometry.js'), 'utf8').replace(/^\.pragma library\n/, '')
+const geometry = {}
+vm.createContext(geometry)
+vm.runInContext(source, geometry)
+
+assertDeepEqual(
+  geometry.parseWidthSpec('2 4 6 8', 1),
+  { top: 2, right: 4, bottom: 6, left: 8 },
+  'border geometry parses four-sided widths'
+)
+
+assertDeepEqual(
+  geometry.parseWidthSpec('2 4', 1),
+  { top: 2, right: 4, bottom: 2, left: 4 },
+  'border geometry parses CSS two-value widths'
+)
+
+const gradient = geometry.parseGradientSpec('rgba(010203ee) rgba(040506ee) 45deg', '#336699', 1)
+assertEqual(gradient.colors[0], '#010203ee', 'border geometry parses first rgba gradient stop')
+assertEqual(gradient.colors[1], '#040506ee', 'border geometry parses second rgba gradient stop')
+assertEqual(gradient.angle, 45, 'border geometry parses gradient angle')
+assert(gradient.enabled, 'border geometry marks multi-stop gradients enabled')
+
+assertEqual(
+  geometry.canonicalColor('0xee33ccff', 1),
+  '#33ccffee',
+  'border geometry converts legacy ARGB color to QML RGBA hex'
+)
+
+const pathData = geometry.ringPath(100, 50, 10, { top: 4, right: 2, bottom: 8, left: 6 })
+assert(pathData.includes('M 10 0'), 'border geometry emits outer rounded path')
+assert(pathData.includes('M 10 4'), 'border geometry emits inset inner rounded path')
+
+const oneSidedPath = geometry.ringPath(100, 50, 10, { top: 0, right: 0, bottom: 0, left: 4 })
+assert(oneSidedPath.includes('M 10 0.001'), 'border geometry keeps zero-width top inside outer path')
+assert(oneSidedPath.includes('99.999 10.001'), 'border geometry keeps zero-width right inside outer path')
+
+const endpoints = geometry.gradientEndpoints(100, 50, 0)
+assertEqual(Math.round(endpoints.x1), 0, 'border geometry 0deg starts at left edge')
+assertEqual(Math.round(endpoints.x2), 100, 'border geometry 0deg ends at right edge')
+JS
diff --git a/test/shell.d/button-border-stability-test.sh b/test/shell.d/button-border-stability-test.sh
new file mode 100644
index 00000000..8f5b4ce1
--- /dev/null
+++ b/test/shell.d/button-border-stability-test.sh
@@ -0,0 +1,111 @@
+#!/bin/bash
+source "$(dirname "$0")/base-test.sh"
+
+run_node_test <<'JS'
+const fs = require('fs')
+
+const buttonQml = fs.readFileSync(path.join(root, 'shell/Ui/Button.qml'), 'utf8')
+
+assert(
+  /anchors\.leftMargin:\s*root\.leftAlign \? root\._reservedContentLeftInset : 0/.test(buttonQml),
+  'Button left-aligned content uses reserved border inset'
+)
+
+assert(
+  !/implicitWidth:[^\n]*\bborderLeft\b/.test(buttonQml) && !/implicitHeight:[^\n]*\bborderTop\b/.test(buttonQml),
+  'Button implicit size does not depend on current hover/focus border'
+)
+JS
+
+if ! command -v quickshell >/dev/null 2>&1; then
+  pass "quickshell not installed; skipping Button hover geometry runtime test"
+  exit 0
+fi
+
+TMPDIR=$(mktemp -d)
+cleanup() {
+  [[ -d $TMPDIR ]] && rm -rf "$TMPDIR"
+}
+trap cleanup EXIT
+
+ln -s "$ROOT/shell/Ui" "$TMPDIR/Ui"
+ln -s "$ROOT/shell/Commons" "$TMPDIR/Commons"
+
+cat >"$TMPDIR/shell.qml" <<'QML'
+import QtQuick
+import Quickshell
+import qs.Commons
+import qs.Ui
+
+ShellRoot {
+  id: root
+
+  function fail(message) {
+    console.log("RESULT fail " + message)
+    Qt.quit()
+  }
+
+  function checkStable(button, width, height, label, next) {
+    Qt.callLater(function() {
+      if (button.implicitWidth !== width || button.implicitHeight !== height) {
+        root.fail(label + " changed from " + width + "x" + height + " to " + button.implicitWidth + "x" + button.implicitHeight)
+        return
+      }
+      next()
+    })
+  }
+
+  function runChecks() {
+    var plainWidth = plainButton.implicitWidth
+    var plainHeight = plainButton.implicitHeight
+    plainButton.hasCursor = true
+    checkStable(plainButton, plainWidth, plainHeight, "hover-cursor", function() {
+      plainButton.hasCursor = false
+      plainButton.selected = true
+      checkStable(plainButton, plainWidth, plainHeight, "selected", function() {
+        var focusWidth = focusableButton.implicitWidth
+        var focusHeight = focusableButton.implicitHeight
+        focusableButton.hasCursor = true
+        checkStable(focusableButton, focusWidth, focusHeight, "focusable hover-cursor", function() {
+          console.log("RESULT pass")
+          Qt.quit()
+        })
+      })
+    })
+  }
+
+  Component.onCompleted: {
+    Style.styleOverrides = ({
+      "hover-cursor-border-width": 3,
+      "selected-border-width": 5,
+      "focus-border-width": 7
+    })
+    Qt.callLater(runChecks)
+  }
+
+  Item {
+    Button {
+      id: plainButton
+      text: "Refresh"
+    }
+
+    Button {
+      id: focusableButton
+      text: "Save"
+      focusable: true
+    }
+  }
+}
+QML
+
+output=$(timeout 15 quickshell -p "$TMPDIR" --no-color 2>&1) || {
+  printf '%s\n' "$output" >&2
+  fail "Button hover geometry runtime fixture exits cleanly"
+}
+
+if ! grep -q "RESULT pass" <<<"$output"; then
+  printf '%s\n' "$output" >&2
+  fail "Button implicit geometry is stable across hover/selected states"
+fi
+
+pass "Button implicit geometry is stable across hover/selected states"
diff --git a/test/shell.d/chromium-ytdlp-test.sh b/test/shell.d/chromium-ytdlp-test.sh
new file mode 100755
index 00000000..3d33494f
--- /dev/null
+++ b/test/shell.d/chromium-ytdlp-test.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+TMPDIR=""
+
+export PATH="$ROOT/bin:$PATH"
+
+cleanup() {
+  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
+}
+trap cleanup EXIT
+
+require_command jq
+
+TMPDIR=$(mktemp -d)
+test_home="$TMPDIR/home"
+manifest_path="$test_home/.config/chromium/NativeMessagingHosts/com.omarchy.ytdlp.json"
+
+HOME="$test_home" OMARCHY_PATH="$ROOT" omarchy-install-chromium-ytdlp
+
+[[ -f $manifest_path ]] || fail "yt-dlp native host installer creates fresh Chromium profile root"
+pass "yt-dlp native host installer creates fresh Chromium profile root"
+
+jq -e --arg path "$ROOT/bin/omarchy-chromium-ytdlp-host" '
+  .name == "com.omarchy.ytdlp" and
+  .path == $path and
+  (.allowed_origins | index("chrome-extension://dedjgknigfeelejglamclffonmophnfl/"))
+' "$manifest_path" >/dev/null
+pass "yt-dlp native host manifest uses Omarchy host path and extension id"
+
+parse_result=$(bash -c '
+  OMARCHY_PATH="$3"
+  source "$1"
+  parse_url "$2"
+' bash "$ROOT/bin/omarchy-chromium-ytdlp-host" '{"url":"https://example.test/watch?v=\"quoted\"&name=a\\b"}' "$ROOT")
+
+[[ $parse_result == "https://example.test/watch?v=\"quoted\"&name=a\\b" ]] ||
+  fail "yt-dlp native host parses escaped JSON URLs" "$parse_result"
+pass "yt-dlp native host parses escaped JSON URLs"
+
+bash -c '
+  OMARCHY_PATH="$3"
+  source "$1"
+  valid_url "$2"
+' bash "$ROOT/bin/omarchy-chromium-ytdlp-host" "javascript:alert(1)" "$ROOT" &&
+  fail "yt-dlp native host rejects non-web URLs"
+pass "yt-dlp native host rejects non-web URLs"
diff --git a/test/shell.d/clipboard-test.sh b/test/shell.d/clipboard-test.sh
new file mode 100644
index 00000000..763a9630
--- /dev/null
+++ b/test/shell.d/clipboard-test.sh
@@ -0,0 +1,244 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const clipboard = requireFromRoot('shell/plugins/clipboard/ClipboardHistory.js')
+
+assertDeepEqual(
+  clipboard.normalizeEntry('hello'),
+  { type: 'text', text: 'hello' },
+  'clipboard normalizes string entries'
+)
+
+assertDeepEqual(
+  clipboard.normalizeEntry({ kind: 'image', path: '/tmp/a.png' }),
+  { type: 'image', path: '/tmp/a.png', mime: 'image/png' },
+  'clipboard normalizes image entries with default mime'
+)
+
+assertDeepEqual(
+  clipboard.normalizeEntry({ type: 'image', path: '/tmp/a.png', mime: 'image/png', capturedAt: 'Friday 14:42' }),
+  { type: 'image', path: '/tmp/a.png', mime: 'image/png', capturedAt: 'Friday 14:42' },
+  'clipboard keeps image capture timestamps'
+)
+
+assertDeepEqual(
+  clipboard.parseHistory(JSON.stringify(['one', '', { type: 'text', text: 'two' }, { type: 'image', path: '/tmp/a.jpg', mime: 'image/jpeg' }])),
+  [
+    { type: 'text', text: 'one' },
+    { type: 'text', text: 'two' },
+    { type: 'image', path: '/tmp/a.jpg', mime: 'image/jpeg' }
+  ],
+  'clipboard history parser drops invalid entries'
+)
+
+assertDeepEqual(clipboard.parseHistory(JSON.stringify([' ', '\n', { type: 'text', text: '\t' }])), [], 'clipboard history parser drops whitespace-only text')
+
+const history = [
+  { type: 'text', text: 'old' },
+  { type: 'text', text: 'new' },
+  { type: 'image', path: '/tmp/a.png', mime: 'image/png' }
+]
+
+assertDeepEqual(
+  clipboard.addEntry(history, { type: 'text', text: 'new' }, 100),
+  [
+    { type: 'text', text: 'new' },
+    { type: 'text', text: 'old' },
+    { type: 'image', path: '/tmp/a.png', mime: 'image/png' }
+  ],
+  'clipboard addEntry moves duplicate text to front'
+)
+
+assertDeepEqual(
+  clipboard.removeEntryAt(history, 1),
+  [
+    { type: 'text', text: 'old' },
+    { type: 'image', path: '/tmp/a.png', mime: 'image/png' }
+  ],
+  'clipboard removeEntryAt removes the requested entry'
+)
+
+assertDeepEqual(clipboard.removeEntryAt(history, 10), history, 'clipboard removeEntryAt ignores invalid indexes')
+assertDeepEqual(clipboard.clearHistory(), [], 'clipboard clearHistory returns an empty history')
+
+assertDeepEqual(
+  clipboard.displayRows(history, 'image', 50).map(row => ({ type: row.entryType, preview: row.previewText, mime: row.mime })),
+  [{ type: 'image', preview: 'Image', mime: 'image/png' }],
+  'clipboard display rows search image metadata'
+)
+
+assertDeepEqual(
+  clipboard.displayRows([{ type: 'image', path: '/tmp/a.png', mime: 'image/png', capturedAt: 'Friday 14:42' }], '', 50)[0].previewText,
+  'Screenshot from Friday 14:42',
+  'clipboard labels timestamped png image entries as screenshots'
+)
+
+assertDeepEqual(
+  clipboard.displayRows([{ type: 'image', path: '/tmp/a.jpg', mime: 'image/jpeg', capturedAt: 'Friday 14:42' }], '', 50)[0].previewText,
+  'Image from Friday 14:42',
+  'clipboard labels timestamped non-png image entries as images'
+)
+
+assertDeepEqual(
+  clipboard.displayRows(history, 'image', 50).map(row => row.index),
+  [2],
+  'clipboard display rows preserve original history indexes'
+)
+
+assertDeepEqual(
+  clipboard.displayRows([{ type: 'text', text: 'line one\nline two' }], '', 50)[0].previewText,
+  'line one line two',
+  'clipboard display rows collapse text whitespace'
+)
+
+assertDeepEqual(
+  clipboard.displayRows([{ type: 'text', text: 'file:///home/dhh/Videos/screenrecording-2026-05-29_13-56-43-720p.gif\n' }], '', 50)[0],
+  {
+    entryType: 'file',
+    fullText: '/home/dhh/Videos/screenrecording-2026-05-29_13-56-43-720p.gif',
+    previewText: 'screenrecording-2026-05-29_13-56-43-720p.gif',
+    previewImage: '/home/dhh/Videos/screenrecording-2026-05-29_13-56-43-720p.gif',
+    path: '/home/dhh/Videos/screenrecording-2026-05-29_13-56-43-720p.gif',
+    mime: 'text/plain',
+    index: 0
+  },
+  'clipboard display rows show file uri entries as files'
+)
+
+assertDeepEqual(
+  clipboard.displayRows([{ type: 'text', text: 'file:///home/dhh/One.txt\nfile:///home/dhh/Two.txt\n' }], '', 50)[0].previewText,
+  '2 files',
+  'clipboard display rows summarize multiple file uri entries'
+)
+
+assertDeepEqual(
+  clipboard.displayRows([{ type: 'text', text: 'file:///home/dhh/Videos/demo.mp4\n' }], '', 50)[0].previewImage,
+  '',
+  'clipboard display rows do not preview video file uri entries inline'
+)
+
+assertDeepEqual(clipboard.displayRows(history, '', 0), [], 'clipboard display rows supports zero result limit')
+assertDeepEqual(clipboard.addEntry(history, 'next', 0), [], 'clipboard addEntry supports zero history limit')
+JS
+
+TMPDIR=$(mktemp -d)
+trap 'rm -rf "$TMPDIR"' EXIT
+
+mkdir -p "$TMPDIR/bin" "$TMPDIR/home/.local/state/omarchy"
+
+cat >"$TMPDIR/bin/wl-copy" <<'SH'
+#!/bin/bash
+cat >"$WL_COPY_OUT"
+SH
+
+cat >"$TMPDIR/bin/wl-paste" <<'SH'
+#!/bin/bash
+if [[ $1 == "--list-types" ]]; then
+  printf '%b' "${WL_PASTE_TYPES:-text/plain\n}"
+elif [[ $1 == "--type" && $2 == "text" ]]; then
+  printf '%s' "${WL_PASTE_TEXT:-terminal copy}"
+fi
+SH
+
+cat >"$TMPDIR/bin/wtype" <<'SH'
+#!/bin/bash
+printf '%s\n' "$*" >"$WTYPE_OUT"
+SH
+
+cat >"$TMPDIR/bin/omarchy-launch-browser" <<'SH'
+#!/bin/bash
+printf '%s\n' "$*" >"$BROWSER_OUT"
+SH
+
+cat >"$TMPDIR/bin/omarchy-launch-editor" <<'SH'
+#!/bin/bash
+printf '%s\n' "$1" >"$EDITOR_PATH_OUT"
+cat "$1" >"$EDITOR_TEXT_OUT"
+SH
+
+cat >"$TMPDIR/bin/satty" <<'SH'
+#!/bin/bash
+printf '%s\n' "$*" >"$SATTY_OUT"
+SH
+
+chmod +x "$TMPDIR/bin/wl-copy" "$TMPDIR/bin/wl-paste" "$TMPDIR/bin/wtype" "$TMPDIR/bin/omarchy-launch-browser" "$TMPDIR/bin/omarchy-launch-editor" "$TMPDIR/bin/satty"
+
+capture_output=$(XDG_RUNTIME_DIR="$TMPDIR" PATH="$TMPDIR/bin:$PATH" "$ROOT/shell/plugins/clipboard/capture.sh")
+[[ $capture_output == '{"type":"text","text":"terminal copy"}' ]] || fail "clipboard capture records normal text events"
+pass "clipboard capture records normal text events"
+
+capture_output=$(printf 'closing app copy' | OMARCHY_CLIPBOARD_WATCH_MIME=text WL_PASTE_TEXT="stale read" XDG_RUNTIME_DIR="$TMPDIR" PATH="$TMPDIR/bin:$PATH" "$ROOT/shell/plugins/clipboard/capture.sh")
+[[ $capture_output == '{"type":"text","text":"closing app copy"}' ]] || fail "clipboard capture records watched text from stdin"
+pass "clipboard capture records watched text from stdin"
+
+capture_output=$(printf 'secret' | CLIPBOARD_STATE=sensitive OMARCHY_CLIPBOARD_WATCH_MIME=text XDG_RUNTIME_DIR="$TMPDIR" PATH="$TMPDIR/bin:$PATH" "$ROOT/shell/plugins/clipboard/capture.sh")
+[[ -z $capture_output ]] || fail "clipboard capture ignores sensitive watched text"
+pass "clipboard capture ignores sensitive watched text"
+
+capture_output=$(CLIPBOARD_STATE=sensitive XDG_RUNTIME_DIR="$TMPDIR" PATH="$TMPDIR/bin:$PATH" "$ROOT/shell/plugins/clipboard/capture.sh")
+[[ -z $capture_output ]] || fail "clipboard capture ignores sensitive clipboard events"
+pass "clipboard capture ignores sensitive clipboard events"
+
+capture_output=$(WL_PASTE_TYPES="text/plain\nx-kde-passwordManagerHint\n" XDG_RUNTIME_DIR="$TMPDIR" PATH="$TMPDIR/bin:$PATH" "$ROOT/shell/plugins/clipboard/capture.sh")
+[[ -z $capture_output ]] || fail "clipboard capture ignores password manager hint"
+pass "clipboard capture ignores password manager hint"
+
+jq -n --arg text "$(printf 'large block line 1\nlarge block line 2\n')" '[{type:"text", text:"ignored"}, {type:"text", text:$text}]' >"$TMPDIR/home/.local/state/omarchy/clipboard-history.json"
+
+WL_COPY_OUT="$TMPDIR/copied" WTYPE_OUT="$TMPDIR/wtype" HOME="$TMPDIR/home" PATH="$TMPDIR/bin:$PATH" \
+  "$ROOT/bin/omarchy-clipboard-paste-text" --shift-insert --history-index 1
+
+[[ $(<"$TMPDIR/copied") == "$(printf 'large block line 1\nlarge block line 2')" ]] || fail "clipboard paste helper copies history entry text"
+pass "clipboard paste helper copies history entry text"
+
+[[ $(<"$TMPDIR/wtype") == "-M shift -k Insert -m shift" ]] || fail "clipboard paste helper pastes history entries with shift insert"
+pass "clipboard paste helper pastes history entries with shift insert"
+
+rm -f "$TMPDIR/wtype"
+WL_COPY_OUT="$TMPDIR/copied" WTYPE_OUT="$TMPDIR/wtype" HOME="$TMPDIR/home" PATH="$TMPDIR/bin:$PATH" \
+  "$ROOT/bin/omarchy-clipboard-paste-text" --copy-only --history-index 1
+
+[[ $(<"$TMPDIR/copied") == "$(printf 'large block line 1\nlarge block line 2')" ]] || fail "clipboard paste helper copy-only copies history entry text"
+pass "clipboard paste helper copy-only copies history entry text"
+
+[[ ! -e "$TMPDIR/wtype" ]] || fail "clipboard paste helper copy-only skips typing"
+pass "clipboard paste helper copy-only skips typing"
+
+printf 'image-data' >"$TMPDIR/image.png"
+rm -f "$TMPDIR/wtype"
+WL_COPY_OUT="$TMPDIR/copied" WTYPE_OUT="$TMPDIR/wtype" PATH="$TMPDIR/bin:$PATH" \
+  "$ROOT/bin/omarchy-clipboard-paste-file" --copy-only image/png "$TMPDIR/image.png"
+
+[[ $(<"$TMPDIR/copied") == "image-data" ]] || fail "clipboard file paste helper copy-only copies file content"
+pass "clipboard file paste helper copy-only copies file content"
+
+[[ ! -e "$TMPDIR/wtype" ]] || fail "clipboard file paste helper copy-only skips paste keystroke"
+pass "clipboard file paste helper copy-only skips paste keystroke"
+
+jq -n --arg url 'https://example.com/docs' --arg text "$(printf 'plain text\nsecond line')" --arg image "$TMPDIR/image.png" \
+  '[{type:"text", text:$url}, {type:"text", text:$text}, {type:"image", mime:"image/png", path:$image}]' >"$TMPDIR/home/.local/state/omarchy/clipboard-history.json"
+
+BROWSER_OUT="$TMPDIR/browser" HOME="$TMPDIR/home" PATH="$TMPDIR/bin:$PATH" \
+  "$ROOT/bin/omarchy-clipboard-open" --history-index 0
+
+[[ $(<"$TMPDIR/browser") == "https://example.com/docs" ]] || fail "clipboard open helper opens URL entries in browser"
+pass "clipboard open helper opens URL entries in browser"
+
+EDITOR_PATH_OUT="$TMPDIR/editor-path" EDITOR_TEXT_OUT="$TMPDIR/editor-text" HOME="$TMPDIR/home" XDG_STATE_HOME="$TMPDIR/state" PATH="$TMPDIR/bin:$PATH" \
+  "$ROOT/bin/omarchy-clipboard-open" --history-index 1
+
+[[ $(<"$TMPDIR/editor-text") == "$(printf 'plain text\nsecond line')" ]] || fail "clipboard open helper opens text entries in editor"
+pass "clipboard open helper opens text entries in editor"
+
+[[ $(<"$TMPDIR/editor-path") == "$TMPDIR"/state/omarchy/clipboard-open/clipboard.*.txt ]] || fail "clipboard open helper writes text entries to a temporary file"
+pass "clipboard open helper writes text entries to a temporary file"
+
+SATTY_OUT="$TMPDIR/satty" HOME="$TMPDIR/home" PATH="$TMPDIR/bin:$PATH" \
+  "$ROOT/bin/omarchy-clipboard-open" --history-index 2
+
+[[ $(<"$TMPDIR/satty") == "--filename $TMPDIR/image.png --output-filename $TMPDIR/image.png" ]] || fail "clipboard open helper opens image entries in satty"
+pass "clipboard open helper opens image entries in satty"
diff --git a/test/shell.d/config-test.sh b/test/shell.d/config-test.sh
new file mode 100755
index 00000000..30431d53
--- /dev/null
+++ b/test/shell.d/config-test.sh
@@ -0,0 +1,305 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+export PATH="$ROOT/bin:$PATH"
+
+require_command jq
+require_command python3
+
+jq empty "$ROOT/config/omarchy/shell.json"
+pass "default shell.json is valid JSON"
+
+jq -e '.version == 1 and (.bar.layout.left | type == "array") and (.bar.layout.center | type == "array") and (.bar.layout.right | type == "array")' "$ROOT/config/omarchy/shell.json" >/dev/null
+pass "default shell.json has versioned bar layout"
+
+jq -e '
+  def ids: map(.id // .);
+  .bar.layout.center | ids == [
+    "omarchy.clock",
+    "omarchy.weather",
+    "omarchy.system-update",
+    "omarchy.indicators"
+  ]
+' "$ROOT/config/omarchy/shell.json" >/dev/null
+pass "default center layout keeps update next to weather"
+
+jq -e '
+  (.bar.centerAnchor // "") as $anchor |
+  any(.bar.layout.center[]; (.id // .) == $anchor)
+' "$ROOT/config/omarchy/shell.json" >/dev/null
+pass "default center anchor exists in center layout"
+
+jq -e '
+  any(.bar.layout.center[]; (.id // .) == "omarchy.clock" and (.formatAlt // "") == "d MMMM \u0027W\u0027ww yyyy")
+' "$ROOT/config/omarchy/shell.json" >/dev/null
+pass "default clock date format has no leading zero"
+
+ROOT="$ROOT" python3 <<'PY'
+import json
+import os
+import sys
+from pathlib import Path
+
+root = Path(os.environ["ROOT"])
+config = json.loads((root / "config/omarchy/shell.json").read_text())
+manifests = {}
+for manifest_path in (root / "shell/plugins").glob("**/*.manifest.json"):
+  data = json.loads(manifest_path.read_text())
+  manifests[data.get("id", "")] = (manifest_path, data)
+for manifest_path in (root / "shell/plugins").glob("**/manifest.json"):
+  data = json.loads(manifest_path.read_text())
+  manifests[data.get("id", "")] = (manifest_path, data)
+
+entries = []
+for section in ("left", "center", "right"):
+  entries.extend(config["bar"]["layout"][section])
+
+missing = []
+bad = []
+for entry in entries:
+  widget_id = entry["id"] if isinstance(entry, dict) else str(entry)
+  if not widget_id.startswith("omarchy."):
+    continue
+
+  row = manifests.get(widget_id)
+  if row is None:
+    missing.append(widget_id)
+    continue
+  manifest_path, manifest = row
+
+  if "bar-widget" not in manifest.get("kinds", []):
+    bad.append(f"{widget_id}: missing bar-widget kind")
+  entry_point = manifest.get("entryPoints", {}).get("barWidget")
+  if not entry_point:
+    bad.append(f"{widget_id}: missing barWidget entry point")
+  elif not (manifest_path.parent / entry_point).exists():
+    bad.append(f"{widget_id}: missing {entry_point}")
+
+if missing or bad:
+  for item in missing:
+    print(f"missing manifest for {item}", file=sys.stderr)
+  for item in bad:
+    print(item, file=sys.stderr)
+  sys.exit(1)
+PY
+pass "default bar widget ids resolve to manifests and entry points"
+
+ROOT="$ROOT" python3 <<'PY'
+import os
+import sys
+from pathlib import Path
+
+root = Path(os.environ["ROOT"])
+pkgs_root = root.parent / "omarchy-pkgs/pkgbuilds"
+settings_pkgbuild_path = pkgs_root / "omarchy-settings/PKGBUILD"
+omarchy_pkgbuild_path = pkgs_root / "omarchy/PKGBUILD"
+if not settings_pkgbuild_path.exists():
+  settings_pkgbuild_path = pkgs_root / "omarchy-settings-dev/PKGBUILD"
+if not omarchy_pkgbuild_path.exists():
+  omarchy_pkgbuild_path = pkgs_root / "omarchy-dev/PKGBUILD"
+pkgbuild = settings_pkgbuild_path.read_text()
+omarchy_pkgbuild = omarchy_pkgbuild_path.read_text()
+errors = []
+package_defaults = [
+  ("default/uwsm/env.d/10-omarchy", "/usr/share/uwsm/env.d/10-omarchy", "uwsm/env"),
+  ("default/uwsm/default", None, "uwsm/default"),
+  ("default/environment.d/10-omarchy-fcitx.conf", "/usr/lib/environment.d/10-omarchy-fcitx.conf", "environment.d/fcitx.conf"),
+  ("default/fontconfig/conf.avail/50-omarchy.conf", "/usr/share/fontconfig/conf.avail/50-omarchy.conf", "fontconfig/fonts.conf"),
+  ("default/xdg-terminal-exec/hyprland-xdg-terminals.list", "/usr/share/xdg-terminal-exec/hyprland-xdg-terminals.list", "xdg-terminals.list"),
+  ("default/applications/mimeapps.list", "/usr/share/applications/mimeapps.list", "mimeapps.list"),
+  ("etc/fastfetch/config.jsonc", "/etc/fastfetch/config.jsonc", "fastfetch/config.jsonc"),
+  ("default/systemd/user/bt-agent.service", "/usr/lib/systemd/user/bt-agent.service", "systemd/user/bt-agent.service"),
+  ("default/systemd/user/omarchy-sleep-lock.service", "/usr/lib/systemd/user/omarchy-sleep-lock.service", "systemd/user/omarchy-sleep-lock.service"),
+  ("default/systemd/user/omarchy-recover-internal-monitor.service", "/usr/lib/systemd/user/omarchy-recover-internal-monitor.service", "systemd/user/omarchy-recover-internal-monitor.service"),
+  ("default/systemd/user/omarchy-update-user-notify.service", "/usr/lib/systemd/user/omarchy-update-user-notify.service", "systemd/user/omarchy-update-user-notify.service"),
+  ("default/systemd/user/omarchy-update-user-notify.path", "/usr/lib/systemd/user/omarchy-update-user-notify.path", "systemd/user/omarchy-update-user-notify.path"),
+  ("default/fonts/omarchy/omarchy.ttf", "/usr/share/fonts/omarchy/omarchy.ttf", "omarchy.ttf"),
+]
+
+for source, destination, legacy in package_defaults:
+  if not (root / source).exists():
+    errors.append(f"missing package default source: {source}")
+  if (root / "config" / legacy).exists():
+    errors.append(f"legacy path still in config/: {legacy}")
+  if destination and (source not in pkgbuild or destination not in pkgbuild):
+    errors.append(f"PKGBUILD does not explicitly install {source} -> {destination}")
+
+guard_hook = "default/libalpm/hooks/00-omarchy-update-guard.hook"
+guard_destination = "/usr/share/libalpm/hooks/00-omarchy-update-guard.hook"
+if not (root / guard_hook).exists():
+  errors.append(f"missing package default source: {guard_hook}")
+if guard_hook not in omarchy_pkgbuild or guard_destination not in omarchy_pkgbuild:
+  errors.append(f"omarchy PKGBUILD does not install {guard_hook} -> {guard_destination}")
+
+if errors:
+  print("\n".join(errors), file=sys.stderr)
+  sys.exit(1)
+PY
+pass "package-owned defaults live outside config"
+
+TMPDIR=$(mktemp -d)
+mkdir -p "$TMPDIR/home/.config/omarchy"
+
+cat >"$TMPDIR/home/.config/omarchy/shell.json" <<'JSON'
+{
+  "version": 1,
+  "bar": {
+    "layout": {
+      "left": [{ "id": "omarchy.menu" }, { "id": "omarchy.workspaces" }],
+      "center": [{ "id": "omarchy.clock" }, { "id": "omarchy.weather" }],
+      "right": [{ "id": "omarchy.tray" }, { "id": "omarchy.bluetooth" }]
+    }
+  },
+  "plugins": []
+}
+JSON
+
+mkdir -p "$TMPDIR/home/.config/omarchy/plugins/local.demo-bar"
+cat >"$TMPDIR/home/.config/omarchy/plugins/local.demo-bar/manifest.json" <<'JSON'
+{
+  "schemaVersion": 1,
+  "id": "local.demo-bar",
+  "name": "Demo bar",
+  "version": "1.0.0",
+  "author": "Test",
+  "description": "Replacement bar for config tests",
+  "kinds": ["bar"],
+  "entryPoints": { "bar": "Bar.qml" }
+}
+JSON
+touch "$TMPDIR/home/.config/omarchy/plugins/local.demo-bar/Bar.qml"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar options --json | jq -e '
+  any(.[]; .id == "omarchy.bar" and .active == true) and
+  any(.[]; .id == "local.demo-bar" and .active == false)
+' >/dev/null
+pass "shell config lists bar options"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar use local.demo-bar
+jq -e '.bar.id == "local.demo-bar"' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "shell config selects a bar option"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar reset
+jq -e '.bar.id == null' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "shell config resets to built-in bar option"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar add omarchy.tailscale
+jq -e '
+  def ids: map(.id // .);
+  .bar.layout.right | ids == ["omarchy.tray", "omarchy.tailscale", "omarchy.bluetooth"]
+' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "shell config appends widgets to right by default"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar add local.left left
+jq -e '
+  def ids: map(.id // .);
+  .bar.layout.left | ids == ["omarchy.menu", "omarchy.workspaces", "local.left"]
+' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "shell config appends left widgets after workspaces"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar add local.center center
+jq -e '
+  def ids: map(.id // .);
+  .bar.layout.center | ids == ["omarchy.clock", "omarchy.weather", "local.center"]
+' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "shell config appends center widgets after weather"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar add local.first right
+jq -e '
+  def ids: map(.id // .);
+  .bar.layout.right | ids == ["omarchy.tray", "local.first", "omarchy.tailscale", "omarchy.bluetooth"]
+' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "shell config moves existing widgets without duplicates"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar show | jq -e '
+  def ids: map(.id // .);
+  (.layout.right | ids == ["omarchy.tray", "local.first", "omarchy.tailscale", "omarchy.bluetooth"]) and
+  has("version") | not
+' >/dev/null
+pass "shell config shows only bar json"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar list --json | jq -e '
+  any(.[]; .id == "omarchy.system-stats" and .addable == true and .inBar == false) and
+  all(.[]; .id != "omarchy.tailscale")
+' >/dev/null
+pass "shell config lists addable bar widgets"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar list --json --all | jq -e '
+  any(.[]; .id == "omarchy.tailscale" and .inBar == true and .addable == false) and
+  any(.[]; .id == "omarchy.indicators" and .addable == true)
+' >/dev/null
+pass "shell config list --all includes current widget status"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar position bottom
+jq -e '
+  .bar.position == "bottom" and
+  .plugins == []
+' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "shell config sets bar position"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar transparent true
+jq -e '
+  .bar.transparent == true and
+  .bar.position == "bottom" and
+  .plugins == []
+' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "shell config sets bar transparency"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar drop local.left
+jq -e '
+  def ids: map(.id // .);
+  (.bar.layout.left | ids == ["omarchy.menu", "omarchy.workspaces"]) and
+  (.bar.layout.center | ids == ["omarchy.clock", "omarchy.weather", "local.center"]) and
+  (.bar.layout.right | ids == ["omarchy.tray", "local.first", "omarchy.tailscale", "omarchy.bluetooth"])
+' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "shell config drops widgets from any section"
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" omarchy-config-shell-bar remove local.center
+jq -e '
+  def ids: map(.id // .);
+  .bar.layout.center | ids == ["omarchy.clock", "omarchy.weather"]
+' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "shell config removes widgets with remove alias"
+
+mapfile -t migrations < <(find "$ROOT/migrations" -maxdepth 1 -type f -name '*.sh' -printf '%f\n' | sort)
+[[ ${#migrations[@]} -eq 0 ]] || fail "4.0 upgrade is not modeled as a migration"
+pass "4.0 upgrade is handled outside the migration runner"
+
+clock_migration=$(grep -rl 'Remove leading zero from bar clock date' "$ROOT/migrations/user" | head -n 1 || true)
+[[ -n $clock_migration ]] || fail "clock date format user migration exists"
+
+cat >"$TMPDIR/home/.config/omarchy/shell.json" <<'JSON'
+{
+  "version": 1,
+  "bar": {
+    "layout": {
+      "left": [],
+      "center": [
+        { "id": "omarchy.clock", "formatAlt": "dd MMMM 'W'ww yyyy" },
+        { "id": "omarchy.weather" }
+      ],
+      "right": [
+        { "id": "local.clock", "formatAlt": "dd MMMM 'W'ww yyyy" }
+      ]
+    }
+  },
+  "plugins": []
+}
+JSON
+
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" bash "$clock_migration"
+
+jq -e '
+  .bar.layout.center[0].formatAlt == "d MMMM \u0027W\u0027ww yyyy" and
+  .bar.layout.right[0].formatAlt == "dd MMMM \u0027W\u0027ww yyyy"
+' "$TMPDIR/home/.config/omarchy/shell.json" >/dev/null
+pass "clock date format migration removes leading zero from clock"
+
+before=$(sha256sum "$TMPDIR/home/.config/omarchy/shell.json" | awk '{print $1}')
+HOME="$TMPDIR/home" OMARCHY_PATH="$ROOT" bash "$clock_migration"
+after=$(sha256sum "$TMPDIR/home/.config/omarchy/shell.json" | awk '{print $1}')
+[[ $before == "$after" ]] || fail "clock date format migration is idempotent"
+pass "clock date format migration is idempotent"
diff --git a/test/shell.d/dropbox-test.sh b/test/shell.d/dropbox-test.sh
new file mode 100644
index 00000000..e2cbb876
--- /dev/null
+++ b/test/shell.d/dropbox-test.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+source "$(dirname "$0")/base-test.sh"
+
+run_node_test "dropbox model helpers" <<'JS'
+const dropbox = requireFromRoot('shell/plugins/panels/dropbox/Model.js')
+
+assertEqual(dropbox.fileKind('photo.JPG'), 'image', 'dropbox detects image files')
+assertEqual(dropbox.fileKind('clip.webm'), 'video', 'dropbox detects video files')
+assertEqual(dropbox.fileKind('report.pdf'), 'document', 'dropbox detects document files')
+assertEqual(dropbox.fileKind('archive.zip'), 'misc', 'dropbox falls back to misc files')
+assertEqual(dropbox.formatBytes(1530), '1.53 KB', 'dropbox formats small byte counts')
+assertEqual(dropbox.formatBytes(2_000_000_000), '2 GB', 'dropbox formats gigabytes')
+assertEqual(dropbox.formatPercent(7.25), '7.3%', 'dropbox formats small percentages')
+assertEqual(dropbox.usageText(1000, 2000, true), '1 KB of 2 KB', 'dropbox formats known quota usage')
+assertEqual(dropbox.usageText(1000, 0, false), '1 KB', 'dropbox formats unknown quota usage')
+
+const parsed = dropbox.parseStatus(JSON.stringify({
+  installed: true,
+  running: true,
+  authenticated: true,
+  files: [{ name: 'x.txt' }]
+}))
+assert(parsed.installed && parsed.running && parsed.authenticated, 'dropbox parses status booleans')
+assertEqual(parsed.files.length, 1, 'dropbox preserves file rows')
+
+assertEqual(
+  dropbox.fileMeta({ modifiedTs: 1000, folder: 'Docs' }, 1000 * 1000 + 3600 * 1000),
+  '1h ago · Docs',
+  'dropbox file metadata includes relative time and folder'
+)
+JS
diff --git a/test/shell.d/emojis-test.sh b/test/shell.d/emojis-test.sh
new file mode 100644
index 00000000..003fcc9a
--- /dev/null
+++ b/test/shell.d/emojis-test.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const fs = require('fs')
+const emojis = requireFromRoot('shell/plugins/emojis/EmojiSearch.js')
+
+const raw = fs.readFileSync(path.join(root, 'shell/plugins/emojis/emojis.json'), 'utf8')
+const data = emojis.parseEmojis(raw)
+
+assert(data.length > 1000, 'emoji dataset parses')
+assertDeepEqual(emojis.parseEmojis('{'), [], 'invalid emoji JSON parses as empty list')
+assertDeepEqual(emojis.parseEmojis('{"e":"nope"}'), [], 'non-array emoji JSON parses as empty list')
+
+const fixture = [
+  { e: 'a', k: 'grinning face smile happy' },
+  { e: 'b', k: 'face with tears of joy joy tears' },
+  { e: 'c', k: 'flag: united states us america' }
+]
+
+assertDeepEqual(
+  emojis.filterEmojis(fixture, '  JOY  ').map(item => item.e),
+  ['b'],
+  'emoji filtering trims and lowercases query'
+)
+
+assertDeepEqual(
+  emojis.filterEmojis(fixture, '', 2).map(item => item.e),
+  ['a', 'b'],
+  'emoji filtering honors result limit'
+)
+
+assertDeepEqual(
+  emojis.filterEmojis(fixture, '', 0),
+  [],
+  'emoji filtering supports zero result limit'
+)
+
+assertEqual(
+  emojis.filterEmojis(data, 'face with tears')[0].e,
+  '\u{1F602}',
+  'emoji filtering finds face with tears of joy'
+)
+JS
+
+TMPDIR=$(mktemp -d)
+trap 'rm -rf "$TMPDIR"' EXIT
+
+mkdir -p "$TMPDIR/bin"
+
+cat >"$TMPDIR/bin/wl-copy" <<'SH'
+#!/bin/bash
+args="$*"
+target="$WL_COPY_OUT"
+if [[ $args == "--type text/plain --sensitive --foreground" ]]; then
+  target="$WL_COPY_EMOJI_OUT"
+fi
+
+printf '%s\n' "$args" >"$target.args"
+cat >"$target"
+SH
+
+cat >"$TMPDIR/bin/wtype" <<'SH'
+#!/bin/bash
+printf '%s\n' "$*" >"$WTYPE_OUT"
+SH
+
+cat >"$TMPDIR/bin/sleep" <<'SH'
+#!/bin/bash
+exit 0
+SH
+
+chmod +x "$TMPDIR/bin/wl-copy" "$TMPDIR/bin/wtype" "$TMPDIR/bin/sleep"
+
+WL_COPY_OUT="$TMPDIR/copy" WL_COPY_EMOJI_OUT="$TMPDIR/emoji" WTYPE_OUT="$TMPDIR/wtype" PATH="$TMPDIR/bin:$PATH" \
+  "$ROOT/bin/omarchy-menu-emoji-insert" "😀"
+
+[[ $(<"$TMPDIR/emoji") == "😀" ]] || fail "emoji insert helper copies emoji transiently"
+pass "emoji insert helper copies emoji transiently"
+
+[[ $(<"$TMPDIR/emoji.args") == "--type text/plain --sensitive --foreground" ]] || fail "emoji insert helper serves sensitive transient clipboard in foreground"
+pass "emoji insert helper serves transient clipboard in foreground"
+
+[[ $(<"$TMPDIR/wtype") == "-M shift -k Insert -m shift" ]] || fail "emoji insert helper pastes with shift insert"
+pass "emoji insert helper pastes with shift insert"
diff --git a/test/shell.d/firewall-config-test.sh b/test/shell.d/firewall-config-test.sh
new file mode 100644
index 00000000..e402bfb1
--- /dev/null
+++ b/test/shell.d/firewall-config-test.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname -- "${BASH_SOURCE[0]}")/base-test.sh"
+
+stub_dir=$(mktemp -d)
+trap 'rm -rf "$stub_dir"' EXIT
+
+cat >"$stub_dir/ufw" <<'STUB'
+#!/bin/bash
+printf 'ufw %s\n' "$*" >>"$TEST_LOG"
+if [[ ${1:-} == status ]]; then
+  echo 'Status: inactive'
+fi
+STUB
+
+cat >"$stub_dir/ufw-docker" <<'STUB'
+#!/bin/bash
+set -euo pipefail
+PATH="/bin:/usr/bin:/sbin:/usr/sbin:/snap/bin/"
+printf 'ufw-docker %s\n' "$*" >>"$TEST_LOG"
+if ! ufw status 2>/dev/null | grep -Fq 'Status: active'; then
+  echo 'inactive' >&2
+  exit 1
+fi
+STUB
+
+cat >"$stub_dir/sed" <<'STUB'
+#!/bin/bash
+printf 'sed %s\n' "$*" >>"$TEST_LOG"
+if [[ ${1:-} == 0,/^PATH=* ]]; then
+  exec /usr/bin/sed "$@"
+fi
+exit 0
+STUB
+
+cat >"$stub_dir/systemctl" <<'STUB'
+#!/bin/bash
+printf 'systemctl %s\n' "$*" >>"$TEST_LOG"
+STUB
+
+chmod +x "$stub_dir"/*
+
+export TEST_LOG="$stub_dir/firewall.log"
+PATH="$stub_dir:$PATH" bash -eE -c 'source "$1"' bash "$ROOT/install/config/firewall.sh"
+
+grep -q '^ufw-docker install$' "$TEST_LOG" || fail "ufw-docker rules are installed"
+grep -q '^systemctl enable ufw$' "$TEST_LOG" || fail "ufw is enabled for next boot"
+
+pass "firewall config installs ufw-docker rules without activating live UFW"
diff --git a/test/shell.d/fixtures/bar-widget-contract/shell.qml b/test/shell.d/fixtures/bar-widget-contract/shell.qml
new file mode 100644
index 00000000..40955501
--- /dev/null
+++ b/test/shell.d/fixtures/bar-widget-contract/shell.qml
@@ -0,0 +1,171 @@
+import QtQuick
+import Quickshell
+
+ShellRoot {
+  id: root
+
+  readonly property string resultPath: Quickshell.env("OMARCHY_QML_TEST_RESULT")
+  readonly property string rootPath: Quickshell.env("OMARCHY_PATH")
+  property var failures: []
+  property var createdIds: []
+  property var createdObjects: []
+
+  function fail(message) {
+    failures.push(String(message))
+  }
+
+  function assertTrue(condition, message) {
+    if (!condition) fail(message)
+  }
+
+  function assertEqual(actual, expected, message) {
+    if (actual !== expected) fail(message + " expected=" + expected + " actual=" + actual)
+  }
+
+  function shellQuote(value) {
+    return "'" + String(value).replace(/'/g, "'\\''") + "'"
+  }
+
+  function writeResult() {
+    var payload = JSON.stringify({
+      ok: failures.length === 0,
+      failures: failures,
+      created: createdIds
+    })
+
+    if (resultPath) {
+      Quickshell.execDetached(["bash", "-lc", "printf '%s' " + shellQuote(payload) + " > " + shellQuote(resultPath)])
+    }
+  }
+
+  function widgets() {
+    try {
+      return JSON.parse(Qt.atob(Quickshell.env("OMARCHY_QML_BAR_WIDGETS") || "W10="))
+    } catch (error) {
+      fail("bar widget list failed to parse: " + error)
+      return []
+    }
+  }
+
+  function safeCall(item, method, entry) {
+    if (!item || typeof item[method] !== "function") return
+    try {
+      item[method]()
+    } catch (error) {
+      fail(entry.id + " " + method + "() threw: " + error)
+    }
+  }
+
+  function finiteDimension(value) {
+    var n = Number(value)
+    return isFinite(n) && n >= 0
+  }
+
+  function loadWidget(entry) {
+    var component = Qt.createComponent(entry.url, Component.PreferSynchronous)
+    if (component.status !== Component.Ready) {
+      fail(entry.id + " failed to load: " + component.errorString())
+      return
+    }
+
+    var item = component.createObject(host, {
+      moduleName: entry.id,
+      settings: {}
+    })
+    if (!item) {
+      fail(entry.id + " failed to instantiate without bar: " + component.errorString())
+      return
+    }
+
+    if ("bar" in item) {
+      root.assertTrue(item.bar === null || item.bar === undefined, entry.id + " starts without injected bar")
+      item.bar = fakeBar
+      root.assertTrue(item.bar === fakeBar, entry.id + " accepts delayed bar injection")
+    }
+    if ("moduleName" in item) {
+      item.moduleName = entry.id
+      root.assertEqual(item.moduleName, entry.id, entry.id + " accepts moduleName injection")
+    }
+    if ("settings" in item) {
+      item.settings = {}
+      root.assertTrue(item.settings !== null && item.settings !== undefined, entry.id + " accepts settings injection")
+    }
+    if (typeof item.setting === "function") {
+      root.assertEqual(item.setting("missing", "fallback"), "fallback", entry.id + " exposes setting fallback")
+    }
+
+    safeCall(item, "refresh", entry)
+    safeCall(item, "close", entry)
+
+    createdObjects.push(item)
+    createdIds.push(entry.id)
+  }
+
+  Item { id: host }
+
+  QtObject {
+    id: mockNotificationService
+    property bool doNotDisturb: false
+    property ListModel pendingModel: ListModel {}
+    property ListModel pastModel: ListModel {}
+    function setDoNotDisturb(value) { doNotDisturb = !!value }
+  }
+
+  QtObject {
+    id: mockShell
+    property var bar: fakeBar
+    property var barConfig: ({ position: "top" })
+    property var shellConfig: ({ version: 1, idle: {}, plugins: [], bar: { layout: { left: [], center: [], right: [] } } })
+    function firstPartyServiceFor(id) {
+      if (id === "omarchy.notifications") return mockNotificationService
+      return null
+    }
+    function serviceFor(id) { return firstPartyServiceFor(id) }
+    function summon(id, payloadJson) { return true }
+    function hide(id) { return true }
+    function toggle(id, payloadJson) { return true }
+    function updateEntryInline(moduleName, settings) { return true }
+  }
+
+  QtObject {
+    id: fakeBar
+    property bool vertical: false
+    property int barSize: 26
+    property string omarchyPath: root.rootPath
+    property string fontFamily: "monospace"
+    property color foreground: "white"
+    property color background: "black"
+    property color urgent: "red"
+    property var shell: mockShell
+    function run(command) {}
+    function showTooltip(target, text) {}
+    function hideTooltip(target) {}
+    function requestPopout(owner) {}
+    function releasePopout(owner) {}
+    function registerClickTarget(target) {}
+    function unregisterClickTarget(target) {}
+  }
+
+  Timer {
+    interval: 1
+    running: true
+    repeat: false
+    onTriggered: {
+      var entries = widgets()
+      root.assertTrue(entries.length > 0, "bar widget list is not empty")
+      for (var i = 0; i < entries.length; i++) root.loadWidget(entries[i])
+
+      Qt.callLater(function() {
+        for (var j = 0; j < root.createdObjects.length; j++) {
+          var item = root.createdObjects[j]
+          var id = root.createdIds[j]
+          root.assertTrue(root.finiteDimension(item.implicitWidth), id + " has a finite implicitWidth")
+          root.assertTrue(root.finiteDimension(item.implicitHeight), id + " has a finite implicitHeight")
+          if (item && typeof item.destroy === "function") item.destroy()
+        }
+        root.assertTrue(root.createdIds.length === entries.length, "all bar widgets instantiate")
+        root.writeResult()
+      })
+    }
+  }
+}
diff --git a/test/shell.d/fixtures/indicator-contract/shell.qml b/test/shell.d/fixtures/indicator-contract/shell.qml
new file mode 100644
index 00000000..842e7bb4
--- /dev/null
+++ b/test/shell.d/fixtures/indicator-contract/shell.qml
@@ -0,0 +1,160 @@
+import QtQuick
+import Quickshell
+
+ShellRoot {
+  id: root
+
+  property string resultPath: Quickshell.env("OMARCHY_QML_TEST_RESULT")
+  property var failures: []
+  property var commands: []
+
+  function fail(message) {
+    failures.push(String(message))
+  }
+
+  function assertTrue(condition, message) {
+    if (!condition) fail(message)
+  }
+
+  QtObject {
+    id: notificationService
+    property bool doNotDisturb: false
+    function setDoNotDisturb(value) {
+      doNotDisturb = !!value
+    }
+  }
+
+  QtObject {
+    id: mockShell
+    function firstPartyServiceFor(id) {
+      return id === "omarchy.notifications" ? notificationService : null
+    }
+  }
+
+  QtObject {
+    id: mockBar
+    property bool vertical: false
+    property int barSize: 26
+    property string fontFamily: "monospace"
+    property var shell: mockShell
+    function run(command) {
+      root.commands.push(String(command))
+    }
+    function showTooltip(target, text) {}
+    function hideTooltip(target) {}
+    function registerClickTarget(target) {}
+    function unregisterClickTarget(target) {}
+  }
+
+  QtObject {
+    id: indicatorHost
+    property bool revealInactiveIndicators: true
+  }
+
+  function createIndicator(name) {
+    var component = Qt.createComponent("file://" + rootPath + "/shell/plugins/bar/indicators/" + name + ".qml")
+    if (component.status !== Component.Ready) {
+      fail(name + " failed to load: " + component.errorString())
+      return null
+    }
+
+    var item = component.createObject(root, {
+      indicatorHost: indicatorHost,
+      indicatorBlock: "inactive",
+      activeOverride: null
+    })
+    if (!item) {
+      fail(name + " failed to instantiate: " + component.errorString())
+      return null
+    }
+    return item
+  }
+
+  function injectBar(item) {
+    assertTrue(item.bar === null || item.bar === undefined, item.moduleName + " starts without bar")
+    item.bar = mockBar
+    assertTrue(item.bar === mockBar, item.moduleName + " accepts delayed bar injection")
+  }
+
+  function commandCount(command) {
+    var count = 0
+    for (var i = 0; i < commands.length; i++) {
+      if (commands[i] === command) count++
+    }
+    return count
+  }
+
+  function writeResult() {
+    var payload = JSON.stringify({
+      ok: failures.length === 0,
+      failures: failures,
+      commands: commands,
+      dnd: notificationService.doNotDisturb
+    })
+
+    if (resultPath) {
+      Quickshell.execDetached(["bash", "-lc", "printf '%s' " + shellQuote(payload) + " > " + shellQuote(resultPath)])
+    }
+  }
+
+  function shellQuote(value) {
+    return "'" + String(value).replace(/'/g, "'\\''") + "'"
+  }
+
+  readonly property string rootPath: Quickshell.env("OMARCHY_PATH")
+
+  Timer {
+    interval: 1
+    running: true
+    repeat: false
+    onTriggered: {
+      var dnd = root.createIndicator("Dnd")
+      if (dnd) {
+        dnd.moduleName = "Dnd"
+        root.injectBar(dnd)
+        notificationService.doNotDisturb = false
+        dnd.triggerPress(Qt.LeftButton)
+        root.assertTrue(notificationService.doNotDisturb === true, "DND left click toggles notification service")
+      }
+
+      var nightLight = root.createIndicator("NightLight")
+      if (nightLight) {
+        nightLight.moduleName = "NightLight"
+        root.injectBar(nightLight)
+        nightLight.triggerPress(Qt.LeftButton)
+        root.assertTrue(root.commandCount("omarchy-toggle-nightlight") === 1, "Night Light left click runs toggle command")
+      }
+
+      var screenRecording = root.createIndicator("ScreenRecording")
+      if (screenRecording) {
+        screenRecording.moduleName = "ScreenRecording"
+        root.injectBar(screenRecording)
+        screenRecording.triggerPress(Qt.LeftButton)
+        root.assertTrue(root.commandCount("omarchy-menu toggle trigger.capture.screenrecord") === 1, "Screen Recording left click opens capture menu when idle")
+        screenRecording.recording = true
+        screenRecording.triggerPress(Qt.LeftButton)
+        root.assertTrue(root.commandCount("omarchy-capture-screenrecording --stop-recording") === 1, "Screen Recording left click stops active recording")
+      }
+
+      var dictation = root.createIndicator("Dictation")
+      if (dictation) {
+        dictation.moduleName = "Dictation"
+        root.injectBar(dictation)
+        dictation.triggerPress(Qt.LeftButton)
+        dictation.triggerPress(Qt.RightButton)
+        root.assertTrue(root.commandCount("omarchy-voxtype-config") === 2, "Dictation clicks run config command")
+        root.assertTrue(root.commandCount("omarchy-voxtype-model") === 0, "Dictation clicks do not run model command")
+      }
+
+      var stayAwake = root.createIndicator("StayAwake")
+      if (stayAwake) {
+        stayAwake.moduleName = "StayAwake"
+        root.injectBar(stayAwake)
+        stayAwake.triggerPress(Qt.LeftButton)
+        root.assertTrue(root.commandCount("omarchy-toggle-idle") === 1, "Stay Awake left click runs idle toggle command")
+      }
+
+      root.writeResult()
+    }
+  }
+}
diff --git a/test/shell.d/fixtures/manifest-entrypoints/shell.qml b/test/shell.d/fixtures/manifest-entrypoints/shell.qml
new file mode 100644
index 00000000..c9a6fa34
--- /dev/null
+++ b/test/shell.d/fixtures/manifest-entrypoints/shell.qml
@@ -0,0 +1,204 @@
+import QtQuick
+import Quickshell
+
+ShellRoot {
+  id: root
+
+  readonly property string resultPath: Quickshell.env("OMARCHY_QML_TEST_RESULT")
+  readonly property string rootPath: Quickshell.env("OMARCHY_PATH")
+  property var failures: []
+  property var createdIds: []
+  property var createdObjects: []
+  property var panelBarIds: [
+    "omarchy.audio",
+    "omarchy.bluetooth",
+    "omarchy.monitor",
+    "omarchy.network",
+    "omarchy.power",
+    "omarchy.weather"
+  ]
+
+  function fail(message) {
+    failures.push(String(message))
+  }
+
+  function assertTrue(condition, message) {
+    if (!condition) fail(message)
+  }
+
+  function shellQuote(value) {
+    return "'" + String(value).replace(/'/g, "'\\''") + "'"
+  }
+
+  function writeResult() {
+    var payload = JSON.stringify({
+      ok: failures.length === 0,
+      failures: failures,
+      created: createdIds
+    })
+
+    if (resultPath) {
+      Quickshell.execDetached(["bash", "-lc", "printf '%s' " + shellQuote(payload) + " > " + shellQuote(resultPath)])
+    }
+  }
+
+  function manifests() {
+    try {
+      return JSON.parse(Qt.atob(Quickshell.env("OMARCHY_QML_MANIFESTS") || "W10="))
+    } catch (error) {
+      fail("manifest list failed to parse: " + error)
+      return []
+    }
+  }
+
+  function initialProperties(entry) {
+    var props = {}
+    if (entry.kind === "bar") {
+      props.omarchyPath = rootPath
+      props.barWidgetRegistry = fakeBarWidgetRegistry
+      props.barConfig = {
+        position: "top",
+        transparent: false,
+        centerAnchor: "",
+        layout: { left: [], center: [], right: [] }
+      }
+      props.shell = mockShell
+    } else if (entry.kind === "bar-widget" || panelBarIds.indexOf(entry.id) !== -1) {
+      props.bar = fakeBar
+      props.moduleName = entry.id
+      props.settings = {}
+    }
+    return props
+  }
+
+  function injectProperties(item, entry) {
+    if (!item) return
+    if ("omarchyPath" in item) item.omarchyPath = rootPath
+    if ("shell" in item) item.shell = mockShell
+    if ("manifest" in item) item.manifest = entry.manifest
+    if ("pluginRegistry" in item) item.pluginRegistry = mockPluginRegistry
+    if ("barWidgetRegistry" in item) item.barWidgetRegistry = fakeBarWidgetRegistry
+    if ("bar" in item) item.bar = fakeBar
+    if ("moduleName" in item) item.moduleName = entry.id
+    if ("settings" in item) item.settings = {}
+    if ("service" in item) item.service = null
+  }
+
+  function loadEntry(entry) {
+    var component = Qt.createComponent(entry.url, Component.PreferSynchronous)
+    if (component.status !== Component.Ready) {
+      fail(entry.id + " " + entry.kind + " failed to load: " + component.errorString())
+      return
+    }
+
+    var item = component.createObject(host, initialProperties(entry))
+    if (!item) {
+      fail(entry.id + " " + entry.kind + " failed to instantiate: " + component.errorString())
+      return
+    }
+
+    injectProperties(item, entry)
+    createdObjects.push(item)
+    createdIds.push(entry.id + ":" + entry.kind)
+  }
+
+  Item { id: host }
+
+  QtObject {
+    id: fakeBarWidgetRegistry
+    property var widgets: ({})
+    property int revision: 0
+    signal changed()
+    function register(id, component, metadata) {
+      var next = {}
+      for (var key in widgets) next[key] = widgets[key]
+      next[String(id)] = { component: component, metadata: metadata || {} }
+      widgets = next
+      revision++
+      changed()
+    }
+    function unregister(id) {
+      var next = {}
+      for (var key in widgets) if (key !== String(id)) next[key] = widgets[key]
+      widgets = next
+      revision++
+      changed()
+    }
+    function metadataFor(id) { return widgets[String(id)] ? widgets[String(id)].metadata : null }
+    function availableIds() { return Object.keys(widgets) }
+    function has(id) { return widgets[String(id)] !== undefined }
+  }
+
+  QtObject {
+    id: mockPluginRegistry
+    property var installedPlugins: ({})
+    function isEnabled(id) { return true }
+    function entryPointUrl(manifest, kind) { return "" }
+    function rescan() {}
+  }
+
+  QtObject {
+    id: mockNotificationService
+    property bool doNotDisturb: false
+    property ListModel pendingModel: ListModel {}
+    property ListModel pastModel: ListModel {}
+    function setDoNotDisturb(value) { doNotDisturb = !!value }
+  }
+
+  QtObject {
+    id: mockShell
+    property var bar: fakeBar
+    property var barConfig: ({ position: "top" })
+    property var shellConfig: ({ version: 1, idle: {}, plugins: [], bar: { layout: { left: [], center: [], right: [] } } })
+    function firstPartyServiceFor(id) {
+      if (id === "omarchy.notifications") return mockNotificationService
+      return null
+    }
+    function serviceFor(id) { return firstPartyServiceFor(id) }
+    function summon(id, payloadJson) { return true }
+    function hide(id) { return true }
+    function toggle(id, payloadJson) { return true }
+    function callIfLoaded(id, method, arg) { return "ok" }
+    function mutateShellConfig(mutator) {}
+    function updateEntryInline(moduleName, settings) { return true }
+  }
+
+  QtObject {
+    id: fakeBar
+    property bool vertical: false
+    property int barSize: 26
+    property string omarchyPath: root.rootPath
+    property string fontFamily: "monospace"
+    property color foreground: "white"
+    property color background: "black"
+    property color urgent: "red"
+    property var shell: mockShell
+    function run(command) {}
+    function showTooltip(target, text) {}
+    function hideTooltip(target) {}
+    function requestPopout(owner) {}
+    function releasePopout(owner) {}
+    function registerClickTarget(target) {}
+    function unregisterClickTarget(target) {}
+  }
+
+  Timer {
+    interval: 1
+    running: true
+    repeat: false
+    onTriggered: {
+      var entries = manifests()
+      root.assertTrue(entries.length > 0, "manifest entry list is not empty")
+      for (var i = 0; i < entries.length; i++) root.loadEntry(entries[i])
+
+      Qt.callLater(function() {
+        root.assertTrue(root.createdIds.length === entries.length, "all manifest entrypoints instantiate")
+        for (var j = 0; j < root.createdObjects.length; j++) {
+          var item = root.createdObjects[j]
+          if (item && typeof item.destroy === "function") item.destroy()
+        }
+        root.writeResult()
+      })
+    }
+  }
+}
diff --git a/test/shell.d/fixtures/plugin-registry/shell.qml b/test/shell.d/fixtures/plugin-registry/shell.qml
new file mode 100644
index 00000000..c808e966
--- /dev/null
+++ b/test/shell.d/fixtures/plugin-registry/shell.qml
@@ -0,0 +1,176 @@
+import QtQuick
+import Quickshell
+import "services"
+
+ShellRoot {
+  id: root
+
+  readonly property string resultPath: Quickshell.env("OMARCHY_QML_TEST_RESULT")
+  property var failures: []
+  property int changeCount: 0
+  property var config: ({
+    version: 1,
+    bar: { layout: { left: [], center: [], right: [] } },
+    plugins: []
+  })
+
+  function fail(message) {
+    failures.push(String(message))
+  }
+
+  function assertTrue(condition, message) {
+    if (!condition) fail(message)
+  }
+
+  function assertEqual(actual, expected, message) {
+    if (actual !== expected) fail(message + " expected=" + expected + " actual=" + actual)
+  }
+
+  function assertDeepEqual(actual, expected, message) {
+    var actualJson = JSON.stringify(actual)
+    var expectedJson = JSON.stringify(expected)
+    if (actualJson !== expectedJson) fail(message + " expected=" + expectedJson + " actual=" + actualJson)
+  }
+
+  function shellQuote(value) {
+    return "'" + String(value).replace(/'/g, "'\\''") + "'"
+  }
+
+  function writeResult() {
+    var payload = JSON.stringify({
+      ok: failures.length === 0,
+      failures: failures,
+      changeCount: changeCount,
+      config: config,
+      ids: Object.keys(registry.installedPlugins).sort()
+    })
+
+    if (resultPath) {
+      Quickshell.execDetached(["bash", "-lc", "printf '%s' " + shellQuote(payload) + " > " + shellQuote(resultPath)])
+    }
+  }
+
+  function manifest(id, kinds, entryPoints) {
+    return {
+      schemaVersion: 1,
+      id: id,
+      name: id,
+      version: "1.0.0",
+      kinds: kinds,
+      entryPoints: entryPoints
+    }
+  }
+
+  function block(kind, source, payload) {
+    return "===" + kind + "::" + source + "===\n"
+      + (typeof payload === "string" ? payload : JSON.stringify(payload))
+      + "\n=== EOM ===\n"
+  }
+
+  function has(id) {
+    return registry.installedPlugins[String(id)] !== undefined
+  }
+
+  function pluginIds() {
+    return Object.keys(registry.installedPlugins).sort()
+  }
+
+  function runChecks() {
+    var scan = ""
+    scan += block("firstparty", "/first/widgets/clock", manifest("omarchy.first-widget", ["bar-widget"], { barWidget: "Widget.qml" }))
+    scan += block("firstparty", "/first/bar", manifest("omarchy.bar", ["bar"], { bar: "Bar.qml" }))
+    scan += block("firstparty", "/first/panels/grouped", manifest("omarchy.grouped-panel", ["panel"], { panel: "Panel.qml" }))
+    scan += block("thirdparty", "/third/panel", manifest("third.panel", ["panel"], { panel: "Panel.qml" }))
+    scan += block("thirdparty", "/third/widget", manifest("third.widget", ["bar-widget"], { barWidget: "Widget.qml" }))
+    scan += block("thirdparty", "/third/bar", manifest("third.bar", ["bar"], { bar: "Bar.qml" }))
+    scan += block("thirdparty", "/third/shadow", manifest("omarchy.first-widget", ["panel"], { panel: "Panel.qml" }))
+    scan += block("thirdparty", "/third/reserved", manifest("omarchy.reserved", ["panel"], { panel: "Panel.qml" }))
+    scan += block("thirdparty", "/third/unsafe", manifest("third.unsafe", ["panel"], { panel: "../Panel.qml" }))
+    scan += block("thirdparty", "/third/missing", { schemaVersion: 1, id: "third.missing", name: "missing", version: "1.0.0", kinds: ["panel"] })
+    scan += block("thirdparty", "/third/schema", { schemaVersion: 2, id: "third.schema", name: "schema", version: "1.0.0", kinds: ["panel"], entryPoints: { panel: "Panel.qml" } })
+    scan += block("thirdparty", "/third/bad-json", "{")
+
+    registry.parseScanOutput(scan)
+
+    root.assertDeepEqual(pluginIds(), [
+      "omarchy.bar",
+      "omarchy.first-widget",
+      "omarchy.grouped-panel",
+      "third.bar",
+      "third.panel",
+      "third.widget"
+    ], "registry merges valid first-party and third-party manifests")
+
+    root.assertTrue(registry.installedPlugins["omarchy.first-widget"].__isFirstParty === true, "first-party manifests are stamped")
+    root.assertTrue(registry.installedPlugins["third.panel"].__isFirstParty === false, "third-party manifests are stamped")
+    root.assertEqual(registry.installedPlugins["omarchy.grouped-panel"].__sourceDir, "/first/panels/grouped", "grouped plugin source paths are preserved")
+    root.assertEqual(registry.entryPointUrl(registry.installedPlugins["third.panel"], "panel"), "file:///third/panel/Panel.qml", "entryPointUrl resolves plugin-relative paths")
+    root.assertEqual(registry.entryPointUrl(registry.installedPlugins["third.widget"], "barWidget"), "file:///third/widget/Widget.qml", "entryPointUrl resolves bar widget paths")
+
+    root.assertTrue(!has("omarchy.reserved"), "third-party omarchy namespace ids are rejected")
+    root.assertTrue(!has("third.unsafe"), "unsafe entry points are rejected")
+    root.assertTrue(!has("third.missing"), "incomplete manifests are rejected")
+    root.assertTrue(!has("third.schema"), "unsupported schema versions are rejected")
+
+    root.assertTrue(registry.isEnabled("omarchy.first-widget"), "first-party plugins are implicitly enabled")
+    root.assertTrue(registry.isEnabled("omarchy.bar"), "built-in bar option is active by default")
+    root.assertTrue(!registry.isEnabled("third.bar"), "third-party bar options start inactive")
+    root.assertTrue(!registry.isEnabled("third.panel"), "third-party plugins start disabled")
+
+    registry.setEnabled("third.bar", true)
+    root.assertEqual(root.config.bar.id, "third.bar", "enabling third-party bar options writes bar id")
+    root.assertTrue(registry.isEnabled("third.bar"), "selected third-party bar options are enabled")
+    root.assertTrue(!registry.isEnabled("omarchy.bar"), "selecting third-party bar options deactivates built-in bar")
+    registry.setEnabled("third.bar", false)
+    root.assertTrue(root.config.bar.id === undefined, "disabling active bar options resets to built-in")
+    root.assertTrue(registry.isEnabled("omarchy.bar"), "built-in bar option returns after reset")
+
+    registry.setEnabled("third.panel", true)
+    root.assertDeepEqual(root.config.plugins, [{ id: "third.panel" }], "enabling third-party panels writes plugins array")
+    root.assertTrue(registry.isEnabled("third.panel"), "enabled third-party panels are found")
+    registry.setEnabled("third.panel", false)
+    root.assertDeepEqual(root.config.plugins, [], "disabling third-party panels removes plugins array entry")
+
+    registry.setEnabled("third.widget", true)
+    root.assertDeepEqual(root.config.bar.layout.right, [{ id: "third.widget" }], "enabling bar widgets appends to right layout")
+    root.assertTrue(registry.isEnabled("third.widget"), "enabled bar widgets are found")
+    registry.setEnabled("third.widget", false)
+    root.assertDeepEqual(root.config.bar.layout.right, [], "disabling bar widgets removes layout entry")
+
+    root.config = {
+      version: 1,
+      bar: { layout: { left: [], center: [{ id: "third.widget", size: 4 }], right: [] } },
+      plugins: []
+    }
+    root.assertTrue(registry.isEnabled("third.widget"), "existing layout entries enable bar widgets")
+    registry.setEnabled("third.widget", false)
+    root.assertDeepEqual(root.config.bar.layout.center, [], "disabling existing bar widgets removes the original layout entry")
+
+    root.config = { version: 1 }
+    registry.setEnabled("third.panel", true)
+    root.assertDeepEqual(root.config.plugins, [{ id: "third.panel" }], "setEnabled repairs missing plugin config shape")
+
+    root.assertTrue(changeCount > 0, "registry emits change notifications")
+    writeResult()
+  }
+
+  PluginRegistry {
+    id: registry
+    firstPartyDir: ""
+    pluginsDir: Quickshell.env("HOME") + "/.config/omarchy/plugins"
+    shellConfigProvider: function() { return root.config }
+    shellConfigMutator: function(mutator) {
+      var next = JSON.parse(JSON.stringify(root.config || {}))
+      mutator(next)
+      root.config = next
+    }
+    onPluginsChanged: root.changeCount++
+  }
+
+  Timer {
+    interval: 100
+    running: true
+    repeat: false
+    onTriggered: root.runChecks()
+  }
+}
diff --git a/test/shell.d/fixtures/tray-menu-activation/mock-sni.py b/test/shell.d/fixtures/tray-menu-activation/mock-sni.py
new file mode 100644
index 00000000..8d94d07d
--- /dev/null
+++ b/test/shell.d/fixtures/tray-menu-activation/mock-sni.py
@@ -0,0 +1,187 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import time
+import traceback
+
+import dbus
+import dbus.service
+from dbus.mainloop.glib import DBusGMainLoop
+from gi.repository import GLib
+
+
+ITEM_PATH = "/StatusNotifierItem"
+MENU_PATH = "/StatusNotifierItem/Menu"
+
+
+def variant(value):
+  return dbus.Variant(value)
+
+
+class StatusNotifierItem(dbus.service.Object):
+  def __init__(self, bus):
+    super().__init__(bus, ITEM_PATH)
+
+  @dbus.service.method("org.freedesktop.DBus.Properties", in_signature="ss", out_signature="v")
+  def Get(self, interface, prop):
+    return variant(self.GetAll(interface)[prop])
+
+  @dbus.service.method("org.freedesktop.DBus.Properties", in_signature="s", out_signature="a{sv}")
+  def GetAll(self, interface):
+    if interface != "org.kde.StatusNotifierItem":
+      return {}
+
+    return dbus.Dictionary({
+      "Category": "ApplicationStatus",
+      "Id": "omarchy-test-tray",
+      "Title": "omarchy-test-tray",
+      "Status": "Active",
+      "WindowId": dbus.Int32(0),
+      "IconName": "dialog-information",
+      "IconThemePath": "",
+      "Menu": dbus.ObjectPath(MENU_PATH),
+      "ItemIsMenu": dbus.Boolean(False),
+      "ToolTip": dbus.Struct((
+        "",
+        dbus.Array([], signature="(iiay)"),
+        "omarchy-test-tray",
+        "",
+      ), signature=None),
+    }, signature="sv")
+
+  @dbus.service.method("org.freedesktop.DBus.Properties", in_signature="ssv")
+  def Set(self, interface, prop, value):
+    return
+
+  @dbus.service.method("org.kde.StatusNotifierItem", in_signature="ii")
+  def ContextMenu(self, x, y):
+    return
+
+  @dbus.service.method("org.kde.StatusNotifierItem", in_signature="ii")
+  def Activate(self, x, y):
+    return
+
+  @dbus.service.method("org.kde.StatusNotifierItem", in_signature="ii")
+  def SecondaryActivate(self, x, y):
+    return
+
+  @dbus.service.method("org.kde.StatusNotifierItem", in_signature="is")
+  def Scroll(self, delta, orientation):
+    return
+
+
+class DBusMenu(dbus.service.Object):
+  def __init__(self, bus, event_path):
+    super().__init__(bus, MENU_PATH)
+    self.event_path = event_path
+
+  @dbus.service.method("org.freedesktop.DBus.Properties", in_signature="ss", out_signature="v")
+  def Get(self, interface, prop):
+    return variant(self.GetAll(interface)[prop])
+
+  @dbus.service.method("org.freedesktop.DBus.Properties", in_signature="s", out_signature="a{sv}")
+  def GetAll(self, interface):
+    if interface != "com.canonical.dbusmenu":
+      return {}
+    return dbus.Dictionary({
+      "Version": dbus.UInt32(3),
+      "TextDirection": "ltr",
+      "Status": "normal",
+      "IconThemePath": dbus.Array([], signature="s"),
+    }, signature="sv")
+
+  @dbus.service.method("org.freedesktop.DBus.Properties", in_signature="ssv")
+  def Set(self, interface, prop, value):
+    return
+
+  @dbus.service.method("com.canonical.dbusmenu", in_signature="i", out_signature="b")
+  def AboutToShow(self, item_id):
+    return False
+
+  @dbus.service.method("com.canonical.dbusmenu", in_signature="ai", out_signature="aiai")
+  def AboutToShowGroup(self, item_ids):
+    return ([], [])
+
+  @dbus.service.method("com.canonical.dbusmenu", in_signature="iias", out_signature="u(ia{sv}av)")
+  def GetLayout(self, parent_id, recursion_depth, property_names):
+    print("GetLayout", int(parent_id), int(recursion_depth), list(property_names), flush=True)
+    child = (
+      dbus.Int32(2),
+      dbus.Dictionary({"label": "Sign in", "enabled": True}, signature="sv"),
+      dbus.Array([], signature="v"),
+    )
+    root = (
+      dbus.Int32(0),
+      dbus.Dictionary({"children-display": "submenu"}, signature="sv"),
+      dbus.Array([dbus.Struct(child, signature=None, variant_level=1)], signature="v"),
+    )
+    return (dbus.UInt32(1), dbus.Struct(root, signature=None))
+
+  @dbus.service.method("com.canonical.dbusmenu", in_signature="aias", out_signature="a(ia{sv})")
+  def GetGroupProperties(self, item_ids, property_names):
+    return []
+
+  @dbus.service.method("com.canonical.dbusmenu", in_signature="is", out_signature="v")
+  def GetProperty(self, item_id, name):
+    return variant("")
+
+  @dbus.service.method("com.canonical.dbusmenu", in_signature="isvu")
+  def Event(self, item_id, event_id, data, timestamp):
+    print("Event", int(item_id), str(event_id), flush=True)
+    if int(item_id) == 2 and str(event_id) == "clicked":
+      with open(self.event_path, "w", encoding="utf-8") as handle:
+        handle.write("clicked\n")
+
+  @dbus.service.method("com.canonical.dbusmenu", in_signature="a(isvu)", out_signature="ai")
+  def EventGroup(self, events):
+    for item_id, event_id, data, timestamp in events:
+      self.Event(item_id, event_id, data, timestamp)
+    return []
+
+
+def register_with_watcher(bus):
+  watcher = dbus.Interface(
+    bus.get_object("org.kde.StatusNotifierWatcher", "/StatusNotifierWatcher"),
+    "org.kde.StatusNotifierWatcher",
+  )
+  watcher.RegisterStatusNotifierItem(ITEM_PATH)
+
+
+def main():
+  try:
+    return run()
+  except Exception:
+    traceback.print_exc()
+    return 1
+
+
+def run():
+  event_path = os.environ["OMARCHY_TRAY_MENU_EVENT_RESULT"]
+  ready_path = os.environ["OMARCHY_TRAY_MENU_READY"]
+
+  DBusGMainLoop(set_as_default=True)
+  bus = dbus.SessionBus()
+  dbus.service.BusName("org.omarchy.TestStatusNotifier", bus)
+
+  StatusNotifierItem(bus)
+  DBusMenu(bus, event_path)
+
+  for _ in range(50):
+    try:
+      register_with_watcher(bus)
+      with open(ready_path, "w", encoding="utf-8") as handle:
+        handle.write("ready\n")
+      break
+    except dbus.DBusException:
+      time.sleep(0.1)
+  else:
+    print("timed out registering StatusNotifierItem", file=sys.stderr)
+    return 1
+
+  GLib.MainLoop().run()
+  return 0
+
+
+if __name__ == "__main__":
+  raise SystemExit(main())
diff --git a/test/shell.d/fixtures/tray-menu-activation/shell.qml b/test/shell.d/fixtures/tray-menu-activation/shell.qml
new file mode 100644
index 00000000..de3c90d7
--- /dev/null
+++ b/test/shell.d/fixtures/tray-menu-activation/shell.qml
@@ -0,0 +1,75 @@
+import QtQuick
+import Quickshell
+import Quickshell.Services.SystemTray
+
+ShellRoot {
+  id: root
+
+  property string resultPath: Quickshell.env("OMARCHY_QML_TEST_RESULT")
+  property var trayItem: null
+  property int attempts: 0
+  property string lastState: ""
+
+  function shellQuote(value) {
+    return "'" + String(value).replace(/'/g, "'\\''") + "'"
+  }
+
+  function writeResult(ok, message) {
+    var payload = JSON.stringify({ ok: ok, message: String(message || "") })
+    if (resultPath) {
+      Quickshell.execDetached(["bash", "-lc", "printf '%s' " + shellQuote(payload) + " > " + shellQuote(resultPath)])
+    }
+  }
+
+  function findTrayItem() {
+    var values = SystemTray.items.values
+    var ids = []
+    for (var i = 0; i < values.length; i++) {
+      ids.push(String(values[i].id || ""))
+      if (String(values[i].id || "") === "omarchy-test-tray") return values[i]
+    }
+    lastState = "items=" + ids.join(",")
+    return null
+  }
+
+  function triggerSignIn() {
+    var rows = menuOpener.children.values
+    var labels = []
+    for (var i = 0; i < rows.length; i++) {
+      var row = rows[i]
+      labels.push(String(row.text || ""))
+      if (!row.isSeparator && String(row.text || "") === "Sign in") {
+        row.triggered()
+        writeResult(true, "triggered Sign in")
+        return true
+      }
+    }
+    lastState = "item=" + String(root.trayItem ? root.trayItem.id : "") + " rows=" + labels.join(",")
+    return false
+  }
+
+  QsMenuOpener {
+    id: menuOpener
+    menu: root.trayItem ? root.trayItem.menu : null
+  }
+
+  Timer {
+    interval: 100
+    running: true
+    repeat: true
+    onTriggered: {
+      root.attempts++
+
+      if (!root.trayItem) root.trayItem = root.findTrayItem()
+      if (root.trayItem && root.triggerSignIn()) {
+        stop()
+        return
+      }
+
+      if (root.attempts >= 50) {
+        root.writeResult(false, "timed out waiting for tray menu Sign in row; " + root.lastState)
+        stop()
+      }
+    }
+  }
+}
diff --git a/test/shell.d/hyprland-window-test.sh b/test/shell.d/hyprland-window-test.sh
new file mode 100644
index 00000000..4a622588
--- /dev/null
+++ b/test/shell.d/hyprland-window-test.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+source "$(dirname "$0")/base-test.sh"
+
+tmpdir=$(mktemp -d)
+trap 'rm -rf "$tmpdir"' EXIT
+
+cat >"$tmpdir/hyprctl" <<'BASH'
+#!/bin/bash
+
+if [[ $1 == "activewindow" && $2 == "-j" ]]; then
+  printf '{"fullscreenClient":%s}\n' "${HYPR_FULLSCREEN_CLIENT:-0}"
+  exit 0
+fi
+
+if [[ $1 == "dispatch" ]]; then
+  printf '%s\n' "$*" >>"$HYPRCTL_LOG"
+  exit 0
+fi
+
+exit 1
+BASH
+chmod +x "$tmpdir/hyprctl"
+
+log="$tmpdir/hyprctl.log"
+PATH="$tmpdir:$PATH" HYPRCTL_LOG="$log" HYPR_FULLSCREEN_CLIENT=0 \
+  "$ROOT/bin/omarchy-hyprland-window-tiled-fullscreen-toggle"
+
+grep -Fq 'hl.dsp.window.fullscreen_state({ internal = 0, client = 2 })' "$log" || \
+  fail "tiled fullscreen enables client fullscreen"
+pass "tiled fullscreen enables client fullscreen"
+
+>"$log"
+PATH="$tmpdir:$PATH" HYPRCTL_LOG="$log" HYPR_FULLSCREEN_CLIENT=2 \
+  "$ROOT/bin/omarchy-hyprland-window-tiled-fullscreen-toggle"
+
+grep -Fq 'hl.dsp.window.fullscreen_state({ internal = 0, client = 0 })' "$log" || \
+  fail "tiled fullscreen disables client fullscreen"
+pass "tiled fullscreen disables client fullscreen"
diff --git a/test/shell.d/idle-test.sh b/test/shell.d/idle-test.sh
new file mode 100644
index 00000000..3d6dc64c
--- /dev/null
+++ b/test/shell.d/idle-test.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const idle = requireFromRoot('shell/plugins/services/idle/IdleModel.js')
+
+assertEqual(idle.secondsFromConfig('42.9', 10), 42, 'idle floors configured seconds')
+assertEqual(idle.secondsFromConfig('-1', 10), 10, 'idle rejects negative seconds')
+assertEqual(idle.secondsFromConfig('nope', 10), 10, 'idle rejects invalid seconds')
+
+assertDeepEqual(idle.eventParts({ data: 'a,b,c' }, 2), ['a', 'b', 'c'], 'idle parses raw event data')
+assertDeepEqual(
+  idle.eventParts({ parse: function(count) { return ['parsed', count] } }, 4),
+  ['parsed', 4],
+  'idle prefers event parser when available'
+)
+
+assertDeepEqual(
+  idle.screensaverWindowsAfter({ a: true }, 'b', true),
+  { windows: { a: true, b: true }, count: 2 },
+  'idle adds visible screensaver windows'
+)
+assertDeepEqual(
+  idle.screensaverWindowsAfter({ a: true, b: true }, 'a', false),
+  { windows: { b: true }, count: 1 },
+  'idle removes closed screensaver windows'
+)
+assertDeepEqual(
+  idle.screensaverWindowsAfter({ a: true }, '', false),
+  { windows: { a: true }, count: 1 },
+  'idle leaves screensaver windows unchanged without an address'
+)
+JS
diff --git a/test/shell.d/image-picker-test.sh b/test/shell.d/image-picker-test.sh
new file mode 100644
index 00000000..2fd8e5fa
--- /dev/null
+++ b/test/shell.d/image-picker-test.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const fs = require('fs')
+const picker = requireFromRoot('shell/plugins/image-picker/ImagePickerModel.js')
+
+assertEqual(picker.nameForPath('/themes/nord-river.png'), 'nord-river', 'image picker strips directory and extension')
+assertEqual(picker.labelForPath('/themes/nord_river.png'), 'Nord River', 'image picker builds display labels')
+
+const rows = [
+  '/themes/a/nord-river.png\t/cache/nord-river.jpg',
+  '/themes/b/nord-river.png\t/cache/duplicate.jpg',
+  '/themes/a/gruvbox-dark.jpeg',
+  '',
+  '\t/cache/no-path.jpg',
+  '/themes/a/plain'
+].join('\n')
+
+const images = picker.loadRows(rows)
+assertDeepEqual(
+  images,
+  [
+    { filePath: '/themes/a/nord-river.png', fileName: 'nord-river.png', thumbnailPath: '/cache/nord-river.jpg' },
+    { filePath: '/themes/a/gruvbox-dark.jpeg', fileName: 'gruvbox-dark.jpeg', thumbnailPath: '/themes/a/gruvbox-dark.jpeg' },
+    { filePath: '/themes/a/plain', fileName: 'plain', thumbnailPath: '/themes/a/plain' }
+  ],
+  'image picker parses rows and dedupes by file name'
+)
+
+assert(picker.itemMatches(images, 0, 'river'), 'image picker matches file names')
+assert(picker.itemMatches(images, 1, 'Gruvbox Dark'), 'image picker matches labels case-insensitively')
+assert(!picker.itemMatches(images, 2, 'river'), 'image picker rejects non-matching filters')
+assertEqual(picker.firstMatchingIndex(images, 'plain'), 2, 'image picker finds first matching index')
+assertEqual(picker.indexForSelectedImage(images, '/themes/a/gruvbox-dark.jpeg'), 1, 'image picker finds selected image')
+assertEqual(picker.indexForSelectedImage(images, '/missing.png'), 0, 'image picker defaults selected image to first row')
+
+assertEqual(picker.filteredPosition(images, 2, 'dark'), 1, 'image picker computes filtered position')
+assertEqual(picker.selectedFilteredPosition(images, 2, 'dark'), 0, 'image picker selected filtered position falls back when selected is hidden')
+assertEqual(picker.nextSelectedIndexForFilter(images, 0, 'dark'), 1, 'image picker moves selection to first match when filter hides current item')
+
+const imagePickerQml = fs.readFileSync(path.join(root, 'shell/plugins/image-picker/ImagePicker.qml'), 'utf8')
+assert(
+  /function preloadRows[\s\S]*if \(opened \|\| requestActive\) return/.test(imagePickerQml),
+  'image picker ignores cache preloads while a request is visible'
+)
+JS
diff --git a/test/shell.d/indicator-contract-test.sh b/test/shell.d/indicator-contract-test.sh
new file mode 100755
index 00000000..3746c09c
--- /dev/null
+++ b/test/shell.d/indicator-contract-test.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+TMPDIR=""
+QS_PID=""
+
+cleanup() {
+  if [[ -n $QS_PID ]] && kill -0 "$QS_PID" 2>/dev/null; then
+    kill "$QS_PID" 2>/dev/null || true
+    wait "$QS_PID" 2>/dev/null || true
+  fi
+  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
+}
+trap cleanup EXIT
+
+if ! command -v quickshell >/dev/null 2>&1; then
+  pass "quickshell not installed; skipping QML contract test"
+  exit 0
+fi
+
+require_command jq
+
+TMPDIR=$(mktemp -d)
+result="$TMPDIR/result.json"
+log="$TMPDIR/quickshell.log"
+config_dir="$TMPDIR/indicator-contract"
+mkdir -p "$config_dir" "$TMPDIR/home"
+cp "$SHELL_TEST_DIR/fixtures/indicator-contract/shell.qml" "$config_dir/shell.qml"
+ln -s "$ROOT/shell/Ui" "$config_dir/Ui"
+ln -s "$ROOT/shell/Commons" "$config_dir/Commons"
+
+OMARCHY_PATH="$ROOT" \
+OMARCHY_QML_TEST_RESULT="$result" \
+HOME="$TMPDIR/home" \
+QML2_IMPORT_PATH="$ROOT/shell${QML2_IMPORT_PATH:+:$QML2_IMPORT_PATH}" \
+QML_IMPORT_PATH="$ROOT/shell${QML_IMPORT_PATH:+:$QML_IMPORT_PATH}" \
+PATH="$ROOT/bin:$PATH" \
+  quickshell -p "$config_dir" --no-color >"$log" 2>&1 &
+QS_PID=$!
+
+for _ in {1..50}; do
+  [[ -s $result ]] && break
+  if ! kill -0 "$QS_PID" 2>/dev/null; then
+    sed -n '1,160p' "$log" >&2
+    fail "QML contract quickshell exited before writing result"
+  fi
+  sleep 0.1
+done
+
+[[ -s $result ]] || {
+  sed -n '1,160p' "$log" >&2
+  fail "QML contract test timed out"
+}
+
+if ! jq -e '.ok == true' "$result" >/dev/null; then
+  printf 'QML contract result:\n' >&2
+  jq . "$result" >&2
+  printf 'QML contract log:\n' >&2
+  sed -n '1,160p' "$log" >&2
+  fail "QML indicator contract checks pass"
+fi
+
+pass "QML indicator contract checks pass"
diff --git a/test/shell.d/launcher-remove-test.sh b/test/shell.d/launcher-remove-test.sh
new file mode 100755
index 00000000..7eb93f6a
--- /dev/null
+++ b/test/shell.d/launcher-remove-test.sh
@@ -0,0 +1,71 @@
+#!/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
+
+mkdir -p "$tmp_dir/data/applications" "$tmp_dir/bin"
+
+write_fake_command() {
+  local name="$1"
+  local prefix="$2"
+
+  cat >"$tmp_dir/bin/$name" <<SCRIPT
+#!/bin/bash
+printf '%s:%s\\n' '$prefix' "\$*" >>"\$TEST_LOG"
+SCRIPT
+  chmod +x "$tmp_dir/bin/$name"
+}
+
+write_fake_command omarchy-webapp-remove web
+write_fake_command omarchy-tui-remove tui
+write_fake_command omarchy-launch-floating-terminal-with-presentation terminal
+
+cat >"$tmp_dir/bin/pacman" <<'SCRIPT'
+#!/bin/bash
+if [[ $1 == "-Qqo" ]]; then
+  printf 'native-pkg\n'
+fi
+SCRIPT
+chmod +x "$tmp_dir/bin/pacman"
+
+cat >"$tmp_dir/data/applications/Basecamp.desktop" <<'DESKTOP'
+[Desktop Entry]
+Name=Basecamp
+Exec=omarchy-launch-webapp https://example.com
+DESKTOP
+
+cat >"$tmp_dir/data/applications/Docker.desktop" <<'DESKTOP'
+[Desktop Entry]
+Name=Docker
+Exec=xdg-terminal-exec --app-id=TUI.tile -e lazydocker
+DESKTOP
+
+cat >"$tmp_dir/data/applications/native.desktop" <<'DESKTOP'
+[Desktop Entry]
+Name=Native
+Exec=native
+DESKTOP
+
+export TEST_LOG="$tmp_dir/log"
+export PATH="$tmp_dir/bin:$PATH"
+export XDG_DATA_HOME="$tmp_dir/data"
+export XDG_DATA_DIRS=
+
+"$ROOT/bin/omarchy-remove-launcher-entry" Basecamp.desktop Basecamp
+"$ROOT/bin/omarchy-remove-launcher-entry" Docker.desktop Docker
+"$ROOT/bin/omarchy-remove-launcher-entry" native.desktop Native
+
+mapfile -t lines <"$TEST_LOG"
+
+[[ ${lines[0]} == "web:Basecamp" ]] || fail "launcher remove routes web apps by desktop name" "${lines[0]}"
+pass "launcher remove routes web apps by desktop name"
+
+[[ ${lines[1]} == "tui:Docker" ]] || fail "launcher remove routes TUIs by desktop name" "${lines[1]}"
+pass "launcher remove routes TUIs by desktop name"
+
+[[ ${lines[2]} == "terminal:echo Uninstalling Native...; sudo pacman -Rns native-pkg" ]] || fail "launcher remove opens package uninstall flow" "${lines[2]}"
+pass "launcher remove opens package uninstall flow"
diff --git a/test/shell.d/launcher-search-test.sh b/test/shell.d/launcher-search-test.sh
new file mode 100644
index 00000000..45b08ef6
--- /dev/null
+++ b/test/shell.d/launcher-search-test.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const search = requireFromRoot('shell/plugins/launcher/LauncherSearch.js')
+
+const entries = [
+  {
+    name: 'Google Contacts',
+    genericName: 'Address Book',
+    comment: 'Manage contacts',
+    keywords: ['contacts', 'address book', 'people'],
+    id: 'google-contacts.desktop'
+  },
+  {
+    name: 'Calculator',
+    genericName: 'Calculator',
+    comment: 'Perform arithmetic, scientific or financial calculations',
+    keywords: ['calculation', 'arithmetic', 'scientific', 'financial'],
+    id: 'org.gnome.Calculator.desktop'
+  },
+  {
+    name: 'OBS Studio',
+    genericName: 'Streaming/Recording Software',
+    comment: 'Free and Open Source Streaming/Recording Software',
+    keywords: ['streaming', 'recording', 'capture'],
+    id: 'com.obsproject.Studio.desktop'
+  },
+  {
+    name: 'Aether',
+    genericName: '',
+    comment: 'Minimal internet radio player',
+    keywords: ['audio', 'music', 'radio'],
+    id: 'io.github.taqi.aether.desktop'
+  },
+  {
+    name: 'Xournal++',
+    genericName: 'Notetaking',
+    comment: 'Take handwritten notes',
+    keywords: ['notes', 'pdf', 'annotation'],
+    id: 'com.github.xournalpp.xournalpp.desktop'
+  },
+  {
+    name: 'RustDesk',
+    genericName: 'Remote Desktop',
+    comment: 'Remote desktop control',
+    keywords: ['remote', 'desktop', 'control'],
+    id: 'com.rustdesk.RustDesk.desktop'
+  }
+]
+
+const contactMatches = search.sortedEntries(entries, 'contact').map(row => search.entryName(row.entry))
+assertDeepEqual(contactMatches, ['Google Contacts'], 'contact search only returns direct contact matches')
+
+assert(
+  search.fuzzyScore(entries[1], 'contact') < 0,
+  'calculator does not match contact as a loose subsequence'
+)
+
+const acronymMatches = search.sortedEntries(entries, 'gc').map(row => search.entryName(row.entry))
+assertEqual(acronymMatches[0], 'Google Contacts', 'short acronym matching still works')
+
+const directMatches = search.sortedEntries(entries, 'obs').map(row => search.entryName(row.entry))
+assertEqual(directMatches[0], 'OBS Studio', 'direct app-name matching still works')
+JS
diff --git a/test/shell.d/logging-test.sh b/test/shell.d/logging-test.sh
new file mode 100644
index 00000000..58e9a6c4
--- /dev/null
+++ b/test/shell.d/logging-test.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname -- "${BASH_SOURCE[0]}")/base-test.sh"
+
+work_dir=$(mktemp -d)
+trap 'rm -rf "$work_dir"' EXIT
+
+failing_script="$work_dir/fail.sh"
+log_file="$work_dir/install.log"
+cat >"$failing_script" <<'SCRIPT'
+echo "about to fail"
+false
+SCRIPT
+
+set +e
+(
+  set -euo pipefail
+  export OMARCHY_INSTALL_LOG_FILE="$log_file"
+  source "$ROOT/install/helpers/logging.sh"
+  run_logged "$failing_script"
+  echo "unreachable"
+)
+status=$?
+set -e
+
+(( status != 0 )) || fail "run_logged returns failing script status"
+grep -q "Starting: $failing_script" "$log_file" || fail "run_logged logs script start"
+grep -q "about to fail" "$log_file" || fail "run_logged captures script output"
+grep -q "Failed: $failing_script (exit code: 1)" "$log_file" || fail "run_logged logs failed script before errexit exits"
+
+stdout_log="$work_dir/stdout.log"
+set +e
+(
+  set -euo pipefail
+  export OMARCHY_INSTALL_LOG_FILE="$work_dir/iso-owned.log"
+  export OMARCHY_LOG_TO_STDOUT=1
+  source "$ROOT/install/helpers/logging.sh"
+  run_logged "$failing_script"
+) >"$stdout_log" 2>&1
+stdout_status=$?
+set -e
+
+(( stdout_status != 0 )) || fail "stdout run_logged returns failing script status"
+[[ ! -e $work_dir/iso-owned.log ]] || fail "stdout logging mode does not write directly to install log"
+grep -q "Starting: $failing_script" "$stdout_log" || fail "stdout logging mode emits script start"
+grep -q "about to fail" "$stdout_log" || fail "stdout logging mode emits script output"
+grep -q "Failed: $failing_script (exit code: 1)" "$stdout_log" || fail "stdout logging mode emits failure marker"
+
+pass "run_logged records failures under errexit"
diff --git a/test/shell.d/manifest-entrypoints-test.sh b/test/shell.d/manifest-entrypoints-test.sh
new file mode 100755
index 00000000..58c898fa
--- /dev/null
+++ b/test/shell.d/manifest-entrypoints-test.sh
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+TMPDIR=""
+QS_PID=""
+
+cleanup() {
+  if [[ -n $QS_PID ]] && kill -0 "$QS_PID" 2>/dev/null; then
+    kill "$QS_PID" 2>/dev/null || true
+    wait "$QS_PID" 2>/dev/null || true
+  fi
+  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
+}
+trap cleanup EXIT
+
+if [[ -z ${WAYLAND_DISPLAY:-} ]]; then
+  pass "no Wayland compositor; skipping manifest entrypoint load test"
+  exit 0
+fi
+
+if ! command -v quickshell >/dev/null 2>&1; then
+  pass "quickshell not installed; skipping manifest entrypoint load test"
+  exit 0
+fi
+
+require_command python3
+
+manifest_entries=$(ROOT="$ROOT" python3 <<'PY'
+import base64
+import json
+import os
+from pathlib import Path
+
+root = Path(os.environ["ROOT"])
+entries = []
+
+kind_entry_points = {
+  "bar": "bar",
+  "bar-widget": "barWidget",
+  "menu": "menu",
+  "overlay": "overlay",
+  "panel": "panel",
+  "service": "service",
+}
+
+for manifest_path in sorted((root / "shell/plugins").glob("**/manifest.json")) + sorted((root / "shell/plugins").glob("**/*.manifest.json")):
+  manifest = json.loads(manifest_path.read_text())
+  for kind in manifest.get("kinds", []):
+    entry_key = kind_entry_points.get(kind)
+    entry_point = manifest.get("entryPoints", {}).get(entry_key)
+    if not entry_point:
+      continue
+    entry_path = manifest_path.parent / entry_point
+    entries.append({
+      "id": manifest["id"],
+      "kind": kind,
+      "entryKey": entry_key,
+      "entryPoint": entry_point,
+      "url": entry_path.resolve().as_uri(),
+      "manifest": manifest,
+    })
+
+print(base64.b64encode(json.dumps(entries).encode()).decode())
+PY
+)
+
+TMPDIR=$(mktemp -d)
+result="$TMPDIR/result.json"
+log="$TMPDIR/quickshell.log"
+config_dir="$TMPDIR/manifest-entrypoints"
+mkdir -p "$config_dir" "$TMPDIR/home"
+cp "$SHELL_TEST_DIR/fixtures/manifest-entrypoints/shell.qml" "$config_dir/shell.qml"
+ln -s "$ROOT/shell/Ui" "$config_dir/Ui"
+ln -s "$ROOT/shell/Commons" "$config_dir/Commons"
+
+OMARCHY_PATH="$ROOT" \
+OMARCHY_QML_TEST_RESULT="$result" \
+OMARCHY_QML_MANIFESTS="$manifest_entries" \
+HOME="$TMPDIR/home" \
+QML2_IMPORT_PATH="$ROOT/shell${QML2_IMPORT_PATH:+:$QML2_IMPORT_PATH}" \
+QML_IMPORT_PATH="$ROOT/shell${QML_IMPORT_PATH:+:$QML_IMPORT_PATH}" \
+PATH="$ROOT/bin:$PATH" \
+  quickshell -p "$config_dir" --no-color >"$log" 2>&1 &
+QS_PID=$!
+
+for _ in {1..80}; do
+  [[ -s $result ]] && break
+  if ! kill -0 "$QS_PID" 2>/dev/null; then
+    sed -n '1,220p' "$log" >&2
+    fail "manifest entrypoint quickshell exited before writing result"
+  fi
+  sleep 0.1
+done
+
+[[ -s $result ]] || {
+  sed -n '1,220p' "$log" >&2
+  fail "manifest entrypoint load test timed out"
+}
+
+if ! jq -e '.ok == true' "$result" >/dev/null; then
+  printf 'Manifest entrypoint result:\n' >&2
+  jq . "$result" >&2
+  printf 'Manifest entrypoint log:\n' >&2
+  sed -n '1,220p' "$log" >&2
+  fail "manifest entrypoints load"
+fi
+
+pass "manifest entrypoints load"
diff --git a/test/shell.d/media-test.sh b/test/shell.d/media-test.sh
new file mode 100644
index 00000000..d7574e69
--- /dev/null
+++ b/test/shell.d/media-test.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const media = requireFromRoot('shell/plugins/services/media/MediaModel.js')
+
+assert(media.isProxyPlayer({ dbusName: 'org.mpris.MediaPlayer2.playerctld' }), 'media detects playerctld proxy by DBus name')
+assert(media.isProxyPlayer({ desktopEntry: 'playerctld' }), 'media detects playerctld proxy by desktop entry')
+assert(media.hasMetadata({ identity: 'Spotify' }), 'media detects identity metadata')
+assert(media.hasTrackMetadata({ trackTitle: 'Track' }), 'media detects track metadata')
+assert(media.playerCanControl({ canGoNext: true }), 'media detects controllable players')
+assert(media.canHandleAction({ canTogglePlaying: true }, 'playPause'), 'media maps playPause capability')
+assert(media.canCycleSource({ identity: 'Spotify', canPlay: true }), 'media detects cycleable sources')
+
+assert(media.isPlaybackStream({ isStream: true, type: 'Stream/Output/Audio' }), 'media detects playback streams')
+assertEqual(media.streamLabelKey('PipeWire ALSA [Chromium]'), 'chromium', 'media normalizes stream labels')
+assertEqual(
+  media.rawStreamLabel({ ready: true, properties: { 'application.name': 'Chromium' }, name: 'fallback' }),
+  'Chromium',
+  'media extracts raw stream labels'
+)
+assertEqual(
+  media.playerAppLabel({ dbusName: 'org.mpris.MediaPlayer2.spotify.instance42' }),
+  'spotify',
+  'media derives player app labels from DBus names'
+)
+assert(media.playerHasPlaybackStream(
+  { desktopEntry: 'chromium' },
+  [{ ready: true, properties: { 'application.name': 'Chromium' } }]
+), 'media matches players to playback streams')
+
+assertEqual(media.playerKey({ dbusName: 'org.mpris.MediaPlayer2.spotify' }), 'org.mpris.MediaPlayer2.spotify', 'media derives stable player keys')
+assertEqual(media.labelFor({ trackTitle: 'Song', identity: 'Spotify' }), 'Song', 'media labels players by track first')
+assertEqual(media.osdMessage({ trackTitle: 'Song', trackArtist: 'Artist' }, 'Fallback'), 'Song - Artist', 'media builds OSD messages')
+assertEqual(media.osdMessage(null, 'Fallback'), 'Fallback', 'media falls back OSD messages')
+JS
diff --git a/test/shell.d/menu-test.sh b/test/shell.d/menu-test.sh
new file mode 100644
index 00000000..6a03b91b
--- /dev/null
+++ b/test/shell.d/menu-test.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const menu = requireFromRoot('shell/plugins/menu/MenuModel.js')
+
+const parsed = menu.parseMenuJsonc(`
+{
+  // comment
+  "items": {
+    "root": { "label": "Go" },
+    "style": { "label": "Style" },
+    "style.theme": {
+      "label": "Themes",
+      "aliases": "theme",
+      "keywords": "appearance appearance colors",
+      "action": "omarchy-theme-set"
+    },
+  },
+}
+`)
+
+assertEqual(parsed.length, 3, 'menu parses JSONC with comments and trailing commas')
+assertDeepEqual(
+  parsed.find(item => item.id === 'style.theme'),
+  {
+    id: 'style.theme',
+    parent: 'style',
+    kind: 'action',
+    icon: '',
+    label: 'Themes',
+    target: '',
+    keywords: 'appearance colors',
+    description: '',
+    action: 'omarchy-theme-set',
+    provider: '',
+    aliases: ['theme'],
+    when: '',
+    checked: ''
+  },
+  'menu normalizes parsed items'
+)
+
+const user = [
+  menu.normalizeItem('style.theme', { label: 'Theme picker', aliases: ['theme', 'colors'], action: 'custom-theme' }),
+  menu.normalizeItem('tools', { label: 'Tools' })
+]
+const merged = menu.mergeMenuSources(parsed, user)
+assertEqual(merged.items['style.theme'].label, 'Theme picker', 'menu user entries override default entries')
+assertEqual(merged.items['style.theme'].order, 2, 'menu preserves original order on override')
+assert(merged.items.root, 'menu injects root when merging sources')
+
+assertEqual(menu.slugify('Power Saver!'), 'power-saver', 'menu slugifies provider rows')
+assertEqual(menu.pathFor(merged.items, 'style.theme'), 'Style › Theme picker', 'menu builds item paths')
+assertEqual(menu.parentPathFor(merged.items, 'style.theme'), 'Style', 'menu builds parent paths')
+assert(menu.isDescendantOf(merged.items, 'style.theme', 'style'), 'menu detects descendants')
+assertEqual(menu.childCount(merged.items, merged.itemOrder, 'style'), 1, 'menu counts children')
+assertEqual(menu.labelFor({ id: 'style.theme', label: 'Theme', checked: 'cmd' }, { 'style.theme': true }), 'Theme ✓', 'menu appends checked marker')
+
+const entry = merged.items['style.theme']
+assert(menu.matchesQuery(entry, 'theme', true), 'menu matches labels and aliases')
+assert(menu.matchesQuery(entry, 'colors', true), 'menu matches aliases')
+assert(!menu.matchesQuery(entry, 'missing', true), 'menu rejects missing terms')
+assert(!menu.matchesQuery(entry, 'theme', false), 'menu hides invisible matches')
+assert(menu.searchScore(merged.items, entry, 'theme') < menu.searchScore(merged.items, entry, 'appearance'), 'menu scores name matches above keyword matches')
+
+assertDeepEqual(
+  menu.displayRow(merged.items, merged.itemOrder, {}, entry, 'Style', 12, 'search'),
+  {
+    itemId: 'style.theme',
+    kind: 'action',
+    icon: '',
+    label: 'Theme picker',
+    target: 'style.theme',
+    detail: 'Style',
+    path: 'Style › Theme picker',
+    childCount: 0,
+    action: 'custom-theme',
+    provider: '',
+    score: 12,
+    section: 'search'
+  },
+  'menu builds display rows'
+)
+JS
diff --git a/test/shell.d/migrate-notify-test.sh b/test/shell.d/migrate-notify-test.sh
new file mode 100644
index 00000000..87b21ce8
--- /dev/null
+++ b/test/shell.d/migrate-notify-test.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/base-test.sh"
+
+test_tmp=$(mktemp -d)
+trap 'rm -rf "$test_tmp"' EXIT
+
+stub_bin="$test_tmp/bin"
+test_home="$test_tmp/home"
+mkdir -p "$stub_bin" "$test_home"
+
+cat >"$stub_bin/omarchy-migrate-user" <<'SH'
+#!/bin/bash
+if [[ ${1:-} == "--pending" && ${OMARCHY_TEST_PENDING_MIGRATIONS:-0} == 1 ]]; then
+  echo 200-user.sh
+  exit 0
+else
+  exit 1
+fi
+SH
+chmod +x "$stub_bin/omarchy-migrate-user"
+
+cat >"$stub_bin/systemd-run" <<'SH'
+#!/bin/bash
+exit 1
+SH
+chmod +x "$stub_bin/systemd-run"
+
+run_notify() {
+  HOME="$test_home" \
+  PATH="$stub_bin:$ROOT/bin:$PATH" \
+  OMARCHY_TEST_PENDING_MIGRATIONS="$1" \
+    "$ROOT/bin/omarchy-migrate-notify"
+}
+
+run_notify 0 >"$test_tmp/not-pending.out" 2>"$test_tmp/not-pending.err"
+[[ ! -s $test_tmp/not-pending.out ]] || fail "migration notifier stays quiet on stdout without pending migrations"
+[[ ! -s $test_tmp/not-pending.err ]] || fail "migration notifier stays quiet on stderr without pending migrations"
+pass "migration notifier ignores users with no pending migrations"
+
+run_notify 1 >"$test_tmp/pending.out" 2>"$test_tmp/pending.err"
+grep -q 'Omarchy has pending user migrations' "$test_tmp/pending.err" || fail "migration notifier explains pending migrations without notification system"
+grep -q 'user/200-user.sh' "$test_tmp/pending.err" || fail "migration notifier lists pending migration names"
+pass "migration notifier reports pending user migrations"
diff --git a/test/shell.d/migrate-scope-test.sh b/test/shell.d/migrate-scope-test.sh
new file mode 100644
index 00000000..533f638f
--- /dev/null
+++ b/test/shell.d/migrate-scope-test.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/base-test.sh"
+
+test_tmp=$(mktemp -d)
+trap 'rm -rf "$test_tmp"' EXIT
+
+test_root="$test_tmp/omarchy"
+test_home="$test_tmp/home"
+system_state="$test_tmp/system-state"
+mkdir -p "$test_root/migrations/system" "$test_root/migrations/user" "$test_home" "$system_state"
+
+cat >"$test_root/migrations/system/100-system.sh" <<'SH'
+[[ $OMARCHY_PATH == "$TEST_EXPECTED_OMARCHY_PATH" ]]
+echo system >>"$TEST_CALLS"
+SH
+cat >"$test_root/migrations/user/200-user.sh" <<'SH'
+[[ $OMARCHY_PATH == "$TEST_EXPECTED_OMARCHY_PATH" ]]
+echo user >>"$TEST_CALLS"
+SH
+
+calls="$test_tmp/calls"
+
+if ! HOME="$test_home" OMARCHY_PATH="$test_root" "$ROOT/bin/omarchy-migrate-user" --pending >"$test_tmp/user-pending.out"; then
+  fail "user migration runner reports pending migrations before state exists"
+fi
+grep -q '^200-user\.sh$' "$test_tmp/user-pending.out" || fail "user migration runner lists pending migration filename"
+pass "user migration runner detects pending migrations"
+
+HOME="$test_home" \
+OMARCHY_PATH="$test_root" \
+TEST_EXPECTED_OMARCHY_PATH="$test_root" \
+TEST_CALLS="$calls" \
+  "$ROOT/bin/omarchy-migrate-user" >"$test_tmp/user-first.out"
+[[ $(grep -c '^user$' "$calls") -eq 1 ]] || fail "user migration runner runs user migrations"
+! grep -q '^system$' "$calls" || fail "user migration runner does not run system migrations"
+[[ -f $test_home/.local/state/omarchy/migrations/user/200-user.sh ]] || fail "user migration runner records user migration marker"
+pass "user migration runner only runs user migrations"
+
+HOME="$test_home" \
+OMARCHY_PATH="$test_root" \
+TEST_EXPECTED_OMARCHY_PATH="$test_root" \
+TEST_CALLS="$calls" \
+  "$ROOT/bin/omarchy-migrate-user" >"$test_tmp/user-second.out"
+[[ $(grep -c '^user$' "$calls") -eq 1 ]] || fail "user migration runner skips completed migrations"
+pass "user migration runner skips completed migrations"
+
+if HOME="$test_home" OMARCHY_PATH="$test_root" "$ROOT/bin/omarchy-migrate-user" --pending >"$test_tmp/user-not-pending.out"; then
+  fail "user migration runner reports no pending migrations after state exists"
+fi
+pass "user migration runner detects no pending migrations"
+
+if ! OMARCHY_PATH="$test_root" OMARCHY_SYSTEM_MIGRATION_STATE="$system_state" "$ROOT/bin/omarchy-migrate-system" --pending >"$test_tmp/system-pending.out"; then
+  fail "system migration runner reports pending migrations before state exists"
+fi
+grep -q '^100-system\.sh$' "$test_tmp/system-pending.out" || fail "system migration runner lists pending migration filename"
+
+OMARCHY_PATH="$test_root" \
+OMARCHY_SYSTEM_MIGRATION_STATE="$system_state" \
+TEST_EXPECTED_OMARCHY_PATH="$test_root" \
+TEST_CALLS="$calls" \
+  "$ROOT/bin/omarchy-migrate-system" >"$test_tmp/system-first.out"
+[[ $(grep -c '^system$' "$calls") -eq 1 ]] || fail "system migration runner runs system migrations"
+[[ -f $system_state/100-system.sh ]] || fail "system migration runner records system migration marker"
+pass "system migration runner only runs system migrations"
+
+if OMARCHY_PATH="$test_root" OMARCHY_SYSTEM_MIGRATION_STATE="$system_state" "$ROOT/bin/omarchy-migrate-system" --pending >"$test_tmp/system-not-pending.out"; then
+  fail "system migration runner reports no pending migrations after state exists"
+fi
+pass "system migration runner detects no pending migrations"
+
+failure_root="$test_tmp/failure-omarchy"
+failure_home="$test_tmp/failure-home"
+failure_system_state="$test_tmp/failure-system-state"
+mkdir -p "$failure_root/migrations/system" "$failure_root/migrations/user" "$failure_home" "$failure_system_state"
+
+cat >"$failure_root/migrations/user/300-fail-user.sh" <<'SH'
+echo user-before-fail >>"$TEST_CALLS"
+false
+echo user-after-fail >>"$TEST_CALLS"
+SH
+
+set +e
+HOME="$failure_home" \
+OMARCHY_PATH="$failure_root" \
+TEST_CALLS="$calls" \
+  "$ROOT/bin/omarchy-migrate-user" >"$test_tmp/user-failure.out" 2>"$test_tmp/user-failure.err"
+user_failure_status=$?
+set -e
+[[ $user_failure_status -ne 0 ]] || fail "user migration runner exits non-zero when a migration fails"
+[[ ! -f $failure_home/.local/state/omarchy/migrations/user/300-fail-user.sh ]] || fail "user migration runner does not mark failed migration complete"
+grep -q '^user-before-fail$' "$calls" || fail "user migration runner started failing migration"
+! grep -q '^user-after-fail$' "$calls" || fail "user migration runner stops failing migration under strict mode"
+pass "user migration runner does not mark failed migrations complete"
+
+cat >"$failure_root/migrations/system/400-fail-system.sh" <<'SH'
+echo system-before-fail >>"$TEST_CALLS"
+false
+echo system-after-fail >>"$TEST_CALLS"
+SH
+
+set +e
+OMARCHY_PATH="$failure_root" \
+OMARCHY_SYSTEM_MIGRATION_STATE="$failure_system_state" \
+TEST_CALLS="$calls" \
+  "$ROOT/bin/omarchy-migrate-system" >"$test_tmp/system-failure.out" 2>"$test_tmp/system-failure.err"
+system_failure_status=$?
+set -e
+[[ $system_failure_status -ne 0 ]] || fail "system migration runner exits non-zero when a migration fails"
+[[ ! -f $failure_system_state/400-fail-system.sh ]] || fail "system migration runner does not mark failed migration complete"
+grep -q '^system-before-fail$' "$calls" || fail "system migration runner started failing migration"
+! grep -q '^system-after-fail$' "$calls" || fail "system migration runner stops failing migration under strict mode"
+pass "system migration runner does not mark failed migrations complete"
diff --git a/test/shell.d/migrate-wrapper-test.sh b/test/shell.d/migrate-wrapper-test.sh
new file mode 100644
index 00000000..1c670105
--- /dev/null
+++ b/test/shell.d/migrate-wrapper-test.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/base-test.sh"
+
+test_tmp=$(mktemp -d)
+trap 'rm -rf "$test_tmp"' EXIT
+
+stub_bin="$test_tmp/bin"
+test_home="$test_tmp/home"
+mkdir -p "$stub_bin" "$test_home"
+
+cat >"$stub_bin/omarchy-migrate-system" <<'SH'
+#!/bin/bash
+if [[ ${1:-} == "--pending" ]]; then
+  [[ ${OMARCHY_TEST_PENDING_SYSTEM:-1} == 1 ]] || exit 1
+  echo 100-system.sh
+  exit 0
+fi
+echo system >>"$TEST_CALLS"
+SH
+chmod +x "$stub_bin/omarchy-migrate-system"
+
+cat >"$stub_bin/omarchy-migrate-user" <<'SH'
+#!/bin/bash
+if [[ ${1:-} == "--pending" ]]; then
+  [[ ${OMARCHY_TEST_PENDING_USER:-1} == 1 ]] || exit 1
+  echo 200-user.sh
+  exit 0
+fi
+echo user >>"$TEST_CALLS"
+SH
+chmod +x "$stub_bin/omarchy-migrate-user"
+
+run_migrate() {
+  HOME="$test_home" \
+  PATH="$stub_bin:$PATH" \
+  TEST_CALLS="$test_tmp/calls" \
+    "$ROOT/bin/omarchy-migrate" "$@"
+}
+
+: >"$test_tmp/calls"
+run_migrate >"$test_tmp/migrate.out"
+[[ $(sed -n '1p' "$test_tmp/calls") == "system" ]] || fail "omarchy-migrate runs system migrations first"
+[[ $(sed -n '2p' "$test_tmp/calls") == "user" ]] || fail "omarchy-migrate runs user migrations second"
+[[ $(wc -l <"$test_tmp/calls") -eq 2 ]] || fail "omarchy-migrate only delegates to system and user migration runners"
+pass "omarchy-migrate runs system and user migrations without force"
+
+run_migrate --pending >"$test_tmp/pending-all.out"
+grep -q '^system/100-system\.sh$' "$test_tmp/pending-all.out" || fail "omarchy-migrate --pending lists pending system migrations"
+grep -q '^user/200-user\.sh$' "$test_tmp/pending-all.out" || fail "omarchy-migrate --pending lists pending user migrations"
+pass "omarchy-migrate --pending lists all pending migrations"
+
+run_migrate --pending user >"$test_tmp/pending-user.out"
+grep -q '^user/200-user\.sh$' "$test_tmp/pending-user.out" || fail "omarchy-migrate --pending user lists user migrations"
+! grep -q '^system/' "$test_tmp/pending-user.out" || fail "omarchy-migrate --pending user omits system migrations"
+pass "omarchy-migrate --pending user scopes pending output"
+
+if OMARCHY_TEST_PENDING_SYSTEM=0 OMARCHY_TEST_PENDING_USER=0 run_migrate --pending >"$test_tmp/not-pending.out"; then
+  fail "omarchy-migrate --pending exits non-zero without pending migrations"
+fi
+[[ ! -s $test_tmp/not-pending.out ]] || fail "omarchy-migrate --pending stays quiet without pending migrations"
+pass "omarchy-migrate --pending reports no pending migrations"
+
+if run_migrate --force >"$test_tmp/force.out" 2>&1; then
+  fail "omarchy-migrate rejects obsolete --force option"
+fi
+grep -q 'Unknown option: --force' "$test_tmp/force.out" || fail "omarchy-migrate reports obsolete --force option"
+pass "omarchy-migrate no longer needs --force"
diff --git a/test/shell.d/monitor-test.sh b/test/shell.d/monitor-test.sh
new file mode 100644
index 00000000..aa4ddac7
--- /dev/null
+++ b/test/shell.d/monitor-test.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const monitor = requireFromRoot('shell/plugins/panels/monitor/Model.js')
+
+assertEqual(monitor.clampBrightness(0), 1, 'monitor clamps minimum brightness')
+assertEqual(monitor.clampBrightness(101), 100, 'monitor clamps maximum brightness')
+assertEqual(monitor.clampBrightness(42.4), 42, 'monitor rounds brightness')
+assertEqual(monitor.clampBrightness('nope'), 1, 'monitor rejects invalid brightness')
+
+assertEqual(monitor.normalizeScale('1.250'), '1.25', 'monitor normalizes fractional scale')
+assertEqual(monitor.normalizeScale('nope'), '', 'monitor rejects invalid scale')
+
+assertEqual(monitor.brightnessName(96), 'Sun blast', 'monitor names very bright displays')
+assertEqual(monitor.brightnessName(12), 'Candlelit', 'monitor names dim displays')
+
+assertDeepEqual(
+  monitor.parseDisplays(JSON.stringify([
+    { name: 'eDP-1', enabled: true },
+    { name: 'HDMI-A-1', enabled: false },
+    { name: 'DP-1', enabled: true }
+  ])),
+  {
+    displays: [
+      { name: 'eDP-1', enabled: true },
+      { name: 'HDMI-A-1', enabled: false },
+      { name: 'DP-1', enabled: true }
+    ],
+    enabledDisplayCount: 2
+  },
+  'monitor parses display state'
+)
+
+assertDeepEqual(monitor.parseDisplays('{'), { displays: [], enabledDisplayCount: 0 }, 'monitor handles invalid display JSON')
+JS
diff --git a/test/shell.d/network-test.sh b/test/shell.d/network-test.sh
new file mode 100644
index 00000000..2824f02e
--- /dev/null
+++ b/test/shell.d/network-test.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const network = requireFromRoot('shell/plugins/panels/network/Model.js')
+
+assertDeepEqual(
+  network.parseNetworkStatus('wifi\tCafe WiFi\t78\t5200\n'),
+  { kind: 'wifi', label: 'Cafe WiFi', signalStrength: 78, frequency: '5200' },
+  'network parses bar status'
+)
+assertEqual(network.connectionIcon('wifi', 80), network.wifiIconFor(80), 'network maps wifi icon from signal')
+assertEqual(network.formatHeaderSpeed('1000'), '1gbit', 'network formats gigabit speed')
+assertEqual(network.formatHeaderSpeed('2500'), '2.5gbit', 'network formats fractional gigabit speed')
+assertEqual(network.formatHeaderFreq('2462'), '2.4ghz', 'network formats 2.4GHz wifi band')
+assertEqual(network.formatHeaderFreq('5200'), '5ghz', 'network formats 5GHz wifi band')
+assertEqual(network.formatHeaderFreq('6455.0'), '6ghz', 'network formats 6GHz wifi band')
+assertEqual(network.formatHeaderFreq('18300'), '18.3ghz', 'network falls back to exact GHz for unknown bands')
+assertEqual(network.headerDetail({ type: 'ethernet', speed: '100' }), '100mbit', 'network header uses ethernet speed')
+
+assertDeepEqual(
+  network.parseKeyValue('iface\twlan0\nrx_bytes\t100\ntx_bytes\t50\n'),
+  { iface: 'wlan0', rx_bytes: '100', tx_bytes: '50' },
+  'network parses detail key values'
+)
+assertDeepEqual(
+  network.throughputState({ prevIface: '', prevSampleTime: 0 }, { iface: 'wlan0', rx_bytes: '100', tx_bytes: '50' }, 10),
+  { prevIface: 'wlan0', prevRxBytes: 100, prevTxBytes: 50, prevSampleTime: 10, downloadRate: 0, uploadRate: 0 },
+  'network seeds throughput state on first sample'
+)
+assertDeepEqual(
+  network.throughputState({ prevIface: 'wlan0', prevRxBytes: 100, prevTxBytes: 50, prevSampleTime: 10 }, { iface: 'wlan0', rx_bytes: '300', tx_bytes: '90' }, 12),
+  { prevIface: 'wlan0', prevRxBytes: 300, prevTxBytes: 90, prevSampleTime: 12, downloadRate: 100, uploadRate: 20 },
+  'network computes throughput deltas'
+)
+
+assertEqual(network.formatBytes(1536), '1.5 KB', 'network formats bytes')
+assertEqual(network.formatRate(1536), '1.5 KB/s', 'network formats rates')
+
+const rows = network.sortWifiRows([
+  { ssid: 'Open', connected: false, known: false, signal: 95 },
+  { ssid: 'Known', connected: false, known: true, signal: 10 },
+  { ssid: 'Connected', connected: true, known: true, signal: 20 }
+])
+assertDeepEqual(rows.map(row => row.ssid), ['Connected', 'Known', 'Open'], 'network sorts wifi rows by connection and known state')
+assertEqual(network.wifiSectionTitle(rows, 0), 'KNOWN NETWORKS', 'network labels known wifi section')
+assertEqual(network.wifiSectionTitle(rows, 2), 'OTHER NETWORKS', 'network labels other wifi section')
+
+const reasons = { NoSecrets: 1, WifiAuthTimeout: 2, WifiNetworkLost: 3, WifiClientDisconnected: 4, WifiClientFailed: 5 }
+assertEqual(network.networkFailureReason(1, reasons), 'Passphrase required', 'network maps missing passphrase failures')
+assertEqual(network.networkFailureReason(2, reasons), 'Wrong password', 'network maps auth timeout failures')
+assertEqual(network.networkFailureReason(99, reasons), 'Failed to connect', 'network maps unknown failures')
+JS
diff --git a/test/shell.d/nightlight-test.sh b/test/shell.d/nightlight-test.sh
new file mode 100644
index 00000000..a075d5b7
--- /dev/null
+++ b/test/shell.d/nightlight-test.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+TMPDIR=$(mktemp -d)
+trap 'rm -rf "$TMPDIR"' EXIT
+
+mkdir -p "$TMPDIR/bin"
+
+cat >"$TMPDIR/bin/hyprctl" <<'SH'
+#!/bin/bash
+
+if [[ ${1:-} == "hyprsunset" && ${2:-} == "temperature" ]]; then
+  printf '%s\n' "${HYPRSUNSET_TEMP:-6500}"
+  exit 0
+fi
+
+exit 1
+SH
+
+chmod +x "$TMPDIR/bin/hyprctl"
+
+nightlight_status() {
+  HYPRSUNSET_TEMP="$1" PATH="$TMPDIR/bin:$PATH" "$ROOT/bin/omarchy-toggle-nightlight" --status
+}
+
+[[ $(nightlight_status 4000 | jq -r .enabled) == "true" ]] || fail "nightlight status reports 4000K as enabled"
+pass "nightlight status reports 4000K as enabled"
+
+[[ $(nightlight_status 5999 | jq -r .enabled) == "true" ]] || fail "nightlight status reports warmer-than-identity values as enabled"
+pass "nightlight status reports warmer-than-identity values as enabled"
+
+[[ $(nightlight_status 6000 | jq -r .enabled) == "false" ]] || fail "nightlight status reports identity temperature as disabled"
+pass "nightlight status reports identity temperature as disabled"
+
+[[ $(nightlight_status 6500 | jq -r .enabled) == "false" ]] || fail "nightlight status reports daylight temperature as disabled"
+pass "nightlight status reports daylight temperature as disabled"
diff --git a/test/shell.d/notification-send-test.sh b/test/shell.d/notification-send-test.sh
new file mode 100644
index 00000000..c68a59ab
--- /dev/null
+++ b/test/shell.d/notification-send-test.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+tmpdir=$(mktemp -d)
+trap 'rm -rf "$tmpdir"' EXIT
+
+stub="$tmpdir/notify-send"
+args_file="$tmpdir/args"
+
+printf '%s\n' \
+  '#!/bin/bash' \
+  'printf "%s\n" "$@" >"$OMARCHY_TEST_NOTIFY_ARGS"' \
+  >"$stub"
+chmod +x "$stub"
+
+OMARCHY_TEST_NOTIFY_ARGS="$args_file" PATH="$tmpdir:$ROOT/bin:$PATH" \
+  omarchy-notification-send --app-name custom-app -g K -u critical --image /tmp/image.png "Learn Keybindings" "Body" -a
+
+mapfile -t args <"$args_file"
+
+[[ ${args[0]} == "-a" ]] || fail "notification wrapper passes app flag"
+[[ ${args[1]} == "custom-app" ]] || fail "notification wrapper uses custom app name"
+[[ ${args[2]} == "-u" ]] || fail "notification wrapper passes urgency flag"
+[[ ${args[3]} == "critical" ]] || fail "notification wrapper uses custom urgency"
+[[ ${args[4]} == "--hint=string:omarchy-glyph:K" ]] || fail "notification wrapper converts glyph to hint"
+[[ ${args[5]} == "--hint=string:image-path:/tmp/image.png" ]] || fail "notification wrapper converts image to hint"
+[[ ${args[6]} == "-A" ]] || fail "notification wrapper passes default action flag"
+[[ ${args[7]} == "default=default" ]] || fail "notification wrapper enables default action"
+[[ ${args[8]} == "Learn Keybindings" ]] || fail "notification wrapper preserves headline"
+[[ ${args[9]} == "Body" ]] || fail "notification wrapper preserves description"
+pass "notification wrapper supports app, glyph, urgency, image, and action options"
diff --git a/test/shell.d/notifications-test.sh b/test/shell.d/notifications-test.sh
new file mode 100644
index 00000000..eb5d23d5
--- /dev/null
+++ b/test/shell.d/notifications-test.sh
@@ -0,0 +1,132 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const notifications = requireFromRoot('shell/plugins/notifications/NotificationLogic.js')
+
+assert(notifications.isChromiumDerived('Brave Browser', ''), 'notifications detect chromium-derived apps by name')
+assert(notifications.isChromiumDerived('', 'microsoft-edge'), 'notifications detect chromium-derived apps by icon')
+assert(!notifications.isChromiumDerived('Slack', ''), 'notifications do not treat unrelated apps as chromium-derived')
+
+assertEqual(
+  notifications.sanitizeBody('<img src="x">Hello', 'Slack', ''),
+  'Hello',
+  'notifications strip inline image tags'
+)
+
+assertEqual(
+  notifications.sanitizeBody('<a href="https://example.com">example.com</a> Message body', 'Chromium', ''),
+  'Message body',
+  'notifications strip chromium leading origin links'
+)
+
+assertEqual(
+  notifications.sanitizeBody('https://example.com/path Message body', 'Chromium', ''),
+  'Message body',
+  'notifications strip chromium leading origin text'
+)
+
+assertEqual(
+  notifications.sanitizeBody('https://example.com/path Message body', 'Slack', ''),
+  'https://example.com/path Message body',
+  'notifications keep non-browser leading origin text'
+)
+
+assert(notifications.summaryStartsWithGlyph('󰂚  Silenced'), 'notifications detect glyph-prefixed summaries')
+assert(!notifications.summaryStartsWithGlyph('Normal summary'), 'notifications ignore normal summaries as glyph-prefixed')
+assert(notifications.shouldRenderCompactGlyph('K', ''), 'notifications render glyph-only hints compactly')
+assert(!notifications.shouldRenderCompactGlyph('K', 'file:///tmp/image.png'), 'notifications keep image-backed glyph hints in the icon slot')
+
+assert(notifications.shouldBypassDnd({ appName: 'omarchy-action', urgency: 1 }, 2), 'omarchy action toasts bypass DND')
+assert(notifications.shouldBypassDnd({ appName: 'notify-send', urgency: 2 }, 2), 'critical notify-send bypasses DND')
+assert(!notifications.shouldBypassDnd({ appName: 'notify-send', urgency: 1 }, 2), 'normal notify-send does not bypass DND')
+assert(!notifications.shouldBypassDnd({ appName: 'Slack', urgency: 2 }, 2), 'critical app notifications do not bypass DND')
+assert(!notifications.shouldBypassDnd({ appName: 'omarchy-menu-keybindings', urgency: 1 }, 2), 'omarchy command app names do not bypass DND')
+assert(!notifications.isEphemeralApp('omarchy-menu-keybindings'), 'notifications treat omarchy command app names as normal apps')
+
+const notification = {
+  id: 12,
+  appName: 'Mail',
+  appIcon: 'mail',
+  summary: 42,
+  body: 'Body',
+  image: 'file:///tmp/mail.png',
+  hints: { 'omarchy-glyph': '!' },
+  urgency: 1,
+  expireTimeout: 1.5
+}
+const snapshot = notifications.snapshotOf(notification, 12345)
+assertDeepEqual(
+  {
+    id: snapshot.id,
+    originalId: snapshot.originalId,
+    app: snapshot.app,
+    appIcon: snapshot.appIcon,
+    summary: snapshot.summary,
+    body: snapshot.body,
+    image: snapshot.image,
+    glyph: snapshot.glyph,
+    urgency: snapshot.urgency,
+    expireTimeout: snapshot.expireTimeout,
+    timestamp: snapshot.timestamp
+  },
+  {
+    id: 12,
+    originalId: 12,
+    app: 'Mail',
+    appIcon: 'mail',
+    summary: '42',
+    body: 'Body',
+    image: 'file:///tmp/mail.png',
+    glyph: '!',
+    urgency: 1,
+    expireTimeout: 1.5,
+    timestamp: 12345
+  },
+  'notifications create stable snapshots'
+)
+
+const history = notifications.parseHistory(JSON.stringify({
+  dnd: true,
+  pending: [
+    { id: 1, originalId: 10, summary: 'old', timestamp: 100 },
+    { id: 2, originalId: 10, summary: 'new', timestamp: 200 },
+    { id: 3, originalId: 11, summary: 'other', timestamp: 150 }
+  ],
+  past: [
+    { id: 4, summary: 'past', timestamp: 50 }
+  ],
+  entries: [
+    { id: 5, summary: 'legacy', timestamp: 75 }
+  ]
+}), 1, 100)
+
+assertEqual(history.dnd, true, 'notifications parse persisted DND state')
+assertEqual(history.hadDuplicates, true, 'notifications report duplicate history rows')
+assertDeepEqual(
+  history.pending.map(row => ({ id: row.id, originalId: row.originalId, summary: row.summary, urgency: row.urgency, timestamp: row.timestamp })),
+  [
+    { id: 2, originalId: 10, summary: 'new', urgency: 1, timestamp: 200 },
+    { id: 3, originalId: 11, summary: 'other', urgency: 1, timestamp: 150 }
+  ],
+  'notifications dedupe pending history by original id'
+)
+assertDeepEqual(
+  history.past.map(row => row.summary),
+  ['legacy', 'past'],
+  'notifications merge legacy entries into past history'
+)
+assertDeepEqual(
+  notifications.parseHistory(JSON.stringify({ pending: [{ id: 1, timestamp: 1 }] }), 1, 0).pending,
+  [],
+  'notifications history parser supports zero result cap'
+)
+assert(notifications.parseHistory('{', 1, 100).error, 'notifications flag invalid history JSON')
+
+assertEqual(notifications.imageExtension('/tmp/screenshot.PNG'), 'png', 'notifications normalize image extensions')
+assertEqual(notifications.imageExtension('/tmp/no-extension'), 'png', 'notifications default missing image extension')
+assertEqual(notifications.imageExtension('/tmp/archive.reallylong'), 'png', 'notifications reject suspicious image extensions')
+JS
diff --git a/test/shell.d/osd-test.sh b/test/shell.d/osd-test.sh
new file mode 100644
index 00000000..e791d626
--- /dev/null
+++ b/test/shell.d/osd-test.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const osd = requireFromRoot('shell/plugins/osd/OsdModel.js')
+
+assertEqual(osd.iconFor('', 0), osd.iconFor('muted', 50), 'osd falls back to muted icon at zero percent')
+assertEqual(osd.iconFor('volume-high', 1), osd.iconFor('', 100), 'osd maps high volume aliases')
+assertEqual(osd.iconFor('custom-symbol', 50), 'custom-symbol', 'osd preserves unknown explicit icons')
+
+assertDeepEqual(
+  osd.stateForShow('volume', '', '75', '100', '', '800'),
+  {
+    iconKey: 'volume',
+    maxValue: 100,
+    hasProgress: true,
+    value: 75,
+    message: '75%',
+    icon: osd.iconFor('volume', 75),
+    duration: 800
+  },
+  'osd builds progress state'
+)
+
+assertDeepEqual(
+  osd.stateForShow('media-pause', 'Paused', '', '100', '', 'nope'),
+  {
+    iconKey: 'media-pause',
+    maxValue: 100,
+    hasProgress: false,
+    value: 0,
+    message: 'Paused',
+    icon: osd.iconFor('media-pause', -1),
+    duration: 1200
+  },
+  'osd builds message state'
+)
+JS
diff --git a/test/shell.d/plugin-registry-contract-test.sh b/test/shell.d/plugin-registry-contract-test.sh
new file mode 100755
index 00000000..5d45ba1b
--- /dev/null
+++ b/test/shell.d/plugin-registry-contract-test.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+TMPDIR=""
+QS_PID=""
+
+cleanup() {
+  if [[ -n $QS_PID ]] && kill -0 "$QS_PID" 2>/dev/null; then
+    kill "$QS_PID" 2>/dev/null || true
+    wait "$QS_PID" 2>/dev/null || true
+  fi
+  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
+}
+trap cleanup EXIT
+
+if ! command -v quickshell >/dev/null 2>&1; then
+  pass "quickshell not installed; skipping plugin registry contract test"
+  exit 0
+fi
+
+require_command jq
+
+TMPDIR=$(mktemp -d)
+result="$TMPDIR/result.json"
+log="$TMPDIR/quickshell.log"
+config_dir="$TMPDIR/plugin-registry"
+mkdir -p "$config_dir" "$TMPDIR/home"
+cp "$SHELL_TEST_DIR/fixtures/plugin-registry/shell.qml" "$config_dir/shell.qml"
+ln -s "$ROOT/shell/services" "$config_dir/services"
+ln -s "$ROOT/shell/Commons" "$config_dir/Commons"
+
+OMARCHY_PATH="$ROOT" \
+OMARCHY_QML_TEST_RESULT="$result" \
+HOME="$TMPDIR/home" \
+QML2_IMPORT_PATH="$ROOT/shell${QML2_IMPORT_PATH:+:$QML2_IMPORT_PATH}" \
+QML_IMPORT_PATH="$ROOT/shell${QML_IMPORT_PATH:+:$QML_IMPORT_PATH}" \
+PATH="$ROOT/bin:$PATH" \
+  quickshell -p "$config_dir" --no-color >"$log" 2>&1 &
+QS_PID=$!
+
+for _ in {1..50}; do
+  [[ -s $result ]] && break
+  if ! kill -0 "$QS_PID" 2>/dev/null; then
+    sed -n '1,180p' "$log" >&2
+    fail "plugin registry quickshell exited before writing result"
+  fi
+  sleep 0.1
+done
+
+[[ -s $result ]] || {
+  sed -n '1,180p' "$log" >&2
+  fail "plugin registry contract test timed out"
+}
+
+if ! jq -e '.ok == true' "$result" >/dev/null; then
+  printf 'Plugin registry result:\n' >&2
+  jq . "$result" >&2
+  printf 'Plugin registry log:\n' >&2
+  sed -n '1,180p' "$log" >&2
+  fail "plugin registry contract checks pass"
+fi
+
+pass "plugin registry contract checks pass"
diff --git a/test/shell.d/plugins-test.sh b/test/shell.d/plugins-test.sh
new file mode 100644
index 00000000..2da3bcd0
--- /dev/null
+++ b/test/shell.d/plugins-test.sh
@@ -0,0 +1,156 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const fs = require('fs')
+
+const pluginsDir = path.join(root, 'shell/plugins')
+const kindEntryPoints = {
+  'bar': 'bar',
+  'bar-widget': 'barWidget',
+  'menu': 'menu',
+  'overlay': 'overlay',
+  'panel': 'panel',
+  'service': 'service'
+}
+
+function isPlainObject(value) {
+  return !!value && typeof value === 'object' && !Array.isArray(value)
+}
+
+function walk(dir) {
+  const rows = []
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const fullPath = path.join(dir, entry.name)
+    if (entry.isDirectory()) {
+      rows.push(...walk(fullPath))
+    } else if (entry.isFile() && (entry.name === 'manifest.json' || entry.name.endsWith('.manifest.json'))) {
+      rows.push(fullPath)
+    }
+  }
+  return rows.sort()
+}
+
+function relativeFromPlugins(filePath) {
+  return path.relative(pluginsDir, filePath).split(path.sep).join('/')
+}
+
+function sourceDirForManifest(manifestPath) {
+  return path.dirname(manifestPath)
+}
+
+const errors = []
+
+function check(condition, detail) {
+  if (!condition) errors.push(detail)
+}
+
+function assertSafeEntryPoint(manifest, manifestPath, key, value) {
+  const label = `${manifest.id} ${key} entry point`
+  check(typeof value === 'string' && value.length > 0, `${label} must be a non-empty string`)
+  check(!path.isAbsolute(value), `${label} must be relative`)
+  check(!String(value).split(/[\\/]+/).includes('..'), `${label} must stay inside plugin source`)
+  check(fs.existsSync(path.join(sourceDirForManifest(manifestPath), String(value))), `${label} file must exist`)
+}
+
+const manifests = walk(pluginsDir)
+const manifestPaths = manifests.map(relativeFromPlugins)
+const manifestSet = new Set(manifestPaths)
+const groupedPluginRoots = new Set(['panels', 'services'])
+
+assert(manifests.length > 0, 'plugin manifests are present')
+
+for (const entry of fs.readdirSync(pluginsDir, { withFileTypes: true })) {
+  if (!entry.isDirectory() || groupedPluginRoots.has(entry.name)) continue
+  check(
+    manifestSet.has(`${entry.name}/manifest.json`),
+    `top-level plugin ${entry.name} must have a manifest`
+  )
+}
+
+for (const groupName of groupedPluginRoots) {
+  const groupRoot = path.join(pluginsDir, groupName)
+  if (!fs.existsSync(groupRoot)) continue
+
+  for (const entry of fs.readdirSync(groupRoot, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue
+    check(
+      manifestSet.has(`${groupName}/${entry.name}/manifest.json`),
+      `${groupName} plugin ${entry.name} must have a manifest`
+    )
+  }
+}
+
+for (const manifestPath of manifestPaths) {
+  const depth = manifestPath.split('/').length
+  check(depth >= 2 && depth <= 3, `${manifestPath} must be discoverable by PluginRegistry`)
+}
+
+const ids = new Set()
+for (const manifestPath of manifests) {
+  const relativePath = relativeFromPlugins(manifestPath)
+  let manifest = null
+  try {
+    manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'))
+  } catch (error) {
+    errors.push(`${relativePath} must parse as JSON: ${error.message}`)
+    continue
+  }
+
+  check(isPlainObject(manifest), `${relativePath} must parse to an object`)
+  if (!isPlainObject(manifest)) continue
+
+  check(manifest.schemaVersion === 1, `${relativePath} must use schema version 1`)
+
+  for (const field of ['id', 'name', 'version', 'description']) {
+    check(typeof manifest[field] === 'string' && manifest[field].length > 0, `${manifest.id || relativePath} must have ${field}`)
+  }
+
+  check(String(manifest.id).startsWith('omarchy.'), `${manifest.id} must use the first-party namespace`)
+  check(!String(manifest.id).includes('/') && !String(manifest.id).includes('..'), `${manifest.id} must be safe as a plugin id`)
+  check(!ids.has(manifest.id), `${manifest.id} must be unique`)
+  ids.add(manifest.id)
+
+  check(Array.isArray(manifest.kinds) && manifest.kinds.length > 0, `${manifest.id} must declare plugin kinds`)
+  check(
+    JSON.stringify([...new Set(manifest.kinds || [])]) === JSON.stringify(manifest.kinds || []),
+    `${manifest.id} must not duplicate plugin kinds`
+  )
+  check(isPlainObject(manifest.entryPoints), `${manifest.id} must have an entryPoints object`)
+
+  for (const kind of manifest.kinds || []) {
+    check(kindEntryPoints[kind], `${manifest.id} must use supported plugin kind ${kind}`)
+    const entryPointKey = kindEntryPoints[kind]
+    check(manifest.entryPoints && manifest.entryPoints[entryPointKey], `${manifest.id} must declare ${entryPointKey} entry point`)
+  }
+
+  for (const key of Object.keys(manifest.entryPoints || {})) {
+    check(Object.values(kindEntryPoints).includes(key), `${manifest.id} entry point ${key} must be a supported key`)
+    assertSafeEntryPoint(manifest, manifestPath, key, manifest.entryPoints[key])
+  }
+
+  if (manifest.keepLoaded !== undefined) {
+    check(typeof manifest.keepLoaded === 'boolean', `${manifest.id} keepLoaded must be boolean when present`)
+  }
+
+  if ((manifest.kinds || []).includes('bar-widget')) {
+    check(isPlainObject(manifest.barWidget), `${manifest.id} must have barWidget metadata`)
+    for (const field of ['displayName', 'description', 'category']) {
+      check(
+        manifest.barWidget && typeof manifest.barWidget[field] === 'string' && manifest.barWidget[field].length > 0,
+        `${manifest.id} barWidget metadata must have ${field}`
+      )
+    }
+    check(manifest.barWidget && typeof manifest.barWidget.allowMultiple === 'boolean', `${manifest.id} barWidget allowMultiple must be boolean`)
+  }
+
+  if (relativePath.endsWith('.manifest.json')) {
+    check(JSON.stringify(manifest.kinds) === JSON.stringify(['bar-widget']), `${manifest.id} sibling manifest must be a bar widget`)
+  }
+}
+
+assert(errors.length === 0, 'plugin manifests match shell registry contract', errors.join('\n'))
+JS
diff --git a/test/shell.d/polkit-test.sh b/test/shell.d/polkit-test.sh
new file mode 100644
index 00000000..1ca2a935
--- /dev/null
+++ b/test/shell.d/polkit-test.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const polkit = requireFromRoot('shell/plugins/polkit/PolkitModel.js')
+
+assert(polkit.promptLooksFingerprint('Swipe your finger'), 'polkit detects fingerprint prompts')
+assert(polkit.promptLooksFingerprint('fprintd verification'), 'polkit detects fprint prompts')
+assert(!polkit.promptLooksFingerprint('Password:'), 'polkit ignores password prompts')
+
+assert(
+  polkit.fingerprintFirstFromPamConfig(`
+# comment
+auth sufficient pam_fprintd.so
+auth include system-auth
+`),
+  'polkit detects fingerprint-first PAM config'
+)
+assert(
+  !polkit.fingerprintFirstFromPamConfig(`
+account include system-auth
+auth include system-auth
+auth sufficient pam_fprintd.so
+`),
+  'polkit detects password-first PAM config'
+)
+JS
diff --git a/test/shell.d/power-test.sh b/test/shell.d/power-test.sh
new file mode 100644
index 00000000..66ec5166
--- /dev/null
+++ b/test/shell.d/power-test.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const power = requireFromRoot('shell/plugins/panels/power/Model.js')
+const states = { Charging: 1, Discharging: 2, FullyCharged: 3, PendingCharge: 4 }
+
+assertEqual(power.selectProfileIndex(0, 1, ['balanced', 'performance']), 1, 'power advances profile selection')
+assertEqual(power.selectProfileIndex(1, 1, ['balanced', 'performance']), 1, 'power clamps profile selection')
+
+assertDeepEqual(power.parseKeyValue('time\t2:00\nenergy\t42\n'), { time: '2:00', energy: '42' }, 'power parses key-value output')
+assertDeepEqual(
+  power.parseProfiles('power-saver\t0\nbalanced\t1\nperformance\t0\n', 5),
+  { profiles: ['power-saver', 'balanced', 'performance'], activeProfile: 'balanced', profileIndex: 2 },
+  'power parses profile output and clamps selection'
+)
+
+assert(power.profileIcon('performance').length > 0, 'power maps profile icons')
+assertEqual(power.batteryFraction({ isPresent: true, percentage: 1.5 }), 1, 'power clamps battery fraction')
+
+assert(power.chargeThresholdActive({ isPresent: true, percentage: 0.8, state: states.PendingCharge }, false, states), 'power detects threshold by pending charge state')
+assert(power.chargeThresholdActive({ isPresent: true, percentage: 0.8, state: states.Charging, changeRate: 0.1, timeToFull: 120 }, false, states), 'power detects threshold by stalled charging')
+assert(!power.chargeThresholdActive({ isPresent: true, percentage: 0.8, state: states.Charging, changeRate: 1.0, timeToFull: 120 }, false, states), 'power does not flag active charging as threshold')
+assert(!power.chargeThresholdActive({ isPresent: true, percentage: 0.5, state: states.Discharging }, false, states), 'power does not flag discharging as threshold')
+assertEqual(power.modeLabel({ isPresent: true, percentage: 1, state: states.FullyCharged }, false, states), 'Fully charged', 'power labels full battery')
+assertEqual(power.modeLabel({ isPresent: true, percentage: 0.5, state: states.Discharging }, true, states), 'On battery', 'power labels battery mode')
+assertEqual(power.modeLabel({ isPresent: true, percentage: 0.5, state: states.Discharging }, false, states), 'On battery', 'power labels discharging battery mode')
+assert(power.batteryIcon({ isPresent: true, percentage: 0.4, state: states.Charging }, false, states).length > 0, 'power maps battery icons')
+JS
diff --git a/test/shell.d/reminders-test.sh b/test/shell.d/reminders-test.sh
new file mode 100644
index 00000000..4ad3c4e2
--- /dev/null
+++ b/test/shell.d/reminders-test.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const reminders = requireFromRoot('shell/plugins/reminders/ReminderFlowModel.js')
+
+assertEqual(reminders.validMinutes('15'), '15', 'reminders accepts positive integer minutes')
+assertEqual(reminders.validMinutes('  5  '), '5', 'reminders trims minute input')
+assertEqual(reminders.validMinutes('0'), '', 'reminders rejects zero minutes')
+assertEqual(reminders.validMinutes('-5'), '', 'reminders rejects negative minutes')
+assertEqual(reminders.validMinutes('1.5'), '', 'reminders rejects fractional minutes')
+assertEqual(reminders.validMinutes('soon'), '', 'reminders rejects non-numeric minutes')
+
+assertDeepEqual(
+  reminders.reminderArgs('10', 'Check the oven'),
+  ['10', 'Check the oven'],
+  'reminders builds command args with message'
+)
+
+assertDeepEqual(
+  reminders.reminderArgs('10', ''),
+  ['10'],
+  'reminders omits empty message arg'
+)
+
+assertDeepEqual(
+  reminders.reminderArgs('0', 'ignored'),
+  [],
+  'reminders command args are empty for invalid minutes'
+)
+JS
diff --git a/test/shell.d/row-border-stability-test.sh b/test/shell.d/row-border-stability-test.sh
new file mode 100755
index 00000000..35df4c9c
--- /dev/null
+++ b/test/shell.d/row-border-stability-test.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+source "$(dirname "$0")/base-test.sh"
+
+run_node_test <<'JS'
+const fs = require('fs')
+
+const menuQml = fs.readFileSync(path.join(root, 'shell/plugins/menu/Menu.qml'), 'utf8')
+const launcherQml = fs.readFileSync(path.join(root, 'shell/plugins/launcher/Launcher.qml'), 'utf8')
+
+assert(
+  /rowReservedBorderLeft:\s*Border\.left\(selectedBorderSpec\)/.test(menuQml)
+    && /rowReservedBorderRight:\s*Border\.right\(selectedBorderSpec\)/.test(menuQml),
+  'Menu rows reserve selected border insets'
+)
+
+assert(
+  !/anchors\.(left|right)Margin:[^\n]*\brow\.border(Left|Right)\b/.test(menuQml),
+  'Menu row content does not depend on current selected border state'
+)
+
+assert(
+  /rowReservedBorderLeft:\s*Border\.left\(selectedBorderSpec\)/.test(launcherQml)
+    && /rowReservedBorderRight:\s*Border\.right\(selectedBorderSpec\)/.test(launcherQml),
+  'Launcher rows reserve selected border insets'
+)
+
+assert(
+  !/anchors\.(left|right)Margin:[^\n]*\brow\.border(Left|Right)\b/.test(launcherQml),
+  'Launcher row content does not depend on current selected border state'
+)
+JS
diff --git a/test/shell.d/runtime-smoke-test.sh b/test/shell.d/runtime-smoke-test.sh
new file mode 100755
index 00000000..cb84b6a5
--- /dev/null
+++ b/test/shell.d/runtime-smoke-test.sh
@@ -0,0 +1,223 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+TMPDIR=""
+QS_PID=""
+
+cleanup() {
+  if [[ -n $QS_PID ]] && kill -0 "$QS_PID" 2>/dev/null; then
+    kill "$QS_PID" 2>/dev/null || true
+    wait "$QS_PID" 2>/dev/null || true
+  fi
+  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
+  return 0
+}
+trap cleanup EXIT
+
+if [[ -z ${WAYLAND_DISPLAY:-} ]]; then
+  pass "no Wayland compositor; skipping shell runtime smoke test"
+  exit 0
+fi
+
+if ! command -v quickshell >/dev/null 2>&1; then
+  pass "quickshell not installed; skipping shell runtime smoke test"
+  exit 0
+fi
+
+require_command jq
+
+shell_ipc() {
+  OMARCHY_PATH="$test_root" "$ROOT/bin/omarchy-shell" "$@"
+}
+
+shell_ipc_quiet() {
+  OMARCHY_PATH="$test_root" "$ROOT/bin/omarchy-shell" -q "$@"
+}
+
+fail_with_log() {
+  local description="$1"
+  sed -n '1,240p' "$log" >&2
+  fail "$description"
+}
+
+TMPDIR=$(mktemp -d)
+test_root="$TMPDIR/omarchy"
+test_home="$TMPDIR/home"
+stub_bin="$TMPDIR/bin"
+log="$TMPDIR/quickshell.log"
+mkdir -p "$test_root" "$test_home" "$stub_bin"
+cp -a "$ROOT/shell" "$test_root/shell"
+ln -s "$ROOT/config" "$test_root/config"
+ln -s "$ROOT/bin" "$test_root/bin"
+
+cat >"$stub_bin/omarchy-update-available" <<'SH'
+#!/bin/bash
+echo "Omarchy update available (test)"
+exit 0
+SH
+chmod +x "$stub_bin/omarchy-update-available"
+
+cat >"$test_root/shell/plugins/panels/weather/status.sh" <<'SH'
+#!/bin/bash
+printf '{"text":"72F","class":"sunny"}\n'
+SH
+chmod +x "$test_root/shell/plugins/panels/weather/status.sh"
+
+OMARCHY_PATH="$test_root" \
+HOME="$test_home" \
+PATH="$stub_bin:$ROOT/bin:$PATH" \
+  quickshell -p "$test_root/shell" --no-color >"$log" 2>&1 &
+QS_PID=$!
+
+for _ in {1..80}; do
+  if shell_ipc_quiet shell ping >/dev/null 2>&1; then
+    break
+  fi
+  if ! kill -0 "$QS_PID" 2>/dev/null; then
+    fail_with_log "test shell exited before IPC became available"
+  fi
+  sleep 0.1
+done
+
+plugins=""
+for _ in {1..80}; do
+  plugins=$(shell_ipc shell listPlugins 2>/dev/null || true)
+  if jq -e 'length > 0' <<<"$plugins" >/dev/null 2>&1; then
+    break
+  fi
+  if ! kill -0 "$QS_PID" 2>/dev/null; then
+    fail_with_log "test shell exited before plugins were listed"
+  fi
+  sleep 0.1
+done
+
+jq -e '
+  map(.id) as $ids |
+  all(["omarchy.menu", "omarchy.notifications", "omarchy.clock", "omarchy.osd"][]; $ids | index(.)) and
+  all(.[]; (.kinds | type == "array") and (.enabled | type == "boolean") and (.firstParty | type == "boolean"))
+' <<<"$plugins" >/dev/null || {
+  printf 'Plugins:\n%s\n' "$plugins" | jq . >&2
+  fail_with_log "shell IPC lists plugin metadata"
+}
+pass "shell IPC lists plugin metadata"
+
+shell_config=$(shell_ipc shell listShellConfig)
+jq -e '
+  .version == 1 and
+  (.bar.layout.left | type == "array") and
+  (.bar.layout.center | type == "array") and
+  (.bar.layout.right | type == "array")
+' <<<"$shell_config" >/dev/null || {
+  printf 'Shell config:\n%s\n' "$shell_config" | jq . >&2
+  fail_with_log "shell IPC returns effective shell config"
+}
+pass "shell IPC returns effective shell config"
+
+[[ $(shell_ipc shell openBarConfig) == "ok" ]] || fail_with_log "shell IPC opens bar config panel"
+[[ $(shell_ipc shell summon omarchy.launcher '{"query":"term"}') == "ok" ]] || fail_with_log "shell IPC summons launcher overlay"
+shell_ipc_quiet shell hide omarchy.launcher >/dev/null
+[[ $(shell_ipc shell summon missing.plugin "{}") == "unknown" ]] || fail_with_log "shell IPC rejects unknown plugin"
+pass "shell IPC summon and hide contract works"
+
+[[ $(shell_ipc notifications ping) == "ok" ]] || fail_with_log "notifications IPC responds"
+[[ $(shell_ipc notifications setDnd false) == "off" ]] || fail_with_log "notifications IPC toggles DND"
+[[ $(shell_ipc media ping) == "ok" ]] || fail_with_log "media IPC responds"
+jq -e '.hasPlayer | type == "boolean"' <<<"$(shell_ipc media status)" >/dev/null || fail_with_log "media IPC returns status JSON"
+jq -e '.enabled | type == "boolean"' <<<"$(shell_ipc idle status)" >/dev/null || fail_with_log "idle IPC returns status JSON"
+jq -e '.locked | type == "boolean"' <<<"$(shell_ipc lock status)" >/dev/null || fail_with_log "lock IPC returns status JSON"
+[[ $(shell_ipc image-selector ping) == "ok" ]] || fail_with_log "image selector IPC responds"
+[[ $(shell_ipc osd ping) == "ok" ]] || fail_with_log "OSD IPC responds"
+[[ $(shell_ipc osd show '{"message":"Runtime smoke","duration":0}') == "ok" ]] || fail_with_log "OSD IPC opens"
+[[ $(shell_ipc osd close) == "ok" ]] || fail_with_log "OSD IPC closes"
+pass "plugin IPC contracts respond"
+
+shell_ipc_quiet omarchy.system-update refresh >/dev/null 2>&1 || true
+sleep 0.8
+
+default_ids=$(jq -c '(.bar.layout.left + .bar.layout.center + .bar.layout.right) | map(.id // .)' "$ROOT/config/omarchy/shell.json")
+visible_default_ids='[
+  "omarchy.menu",
+  "omarchy.workspaces",
+  "omarchy.clock",
+  "omarchy.weather",
+  "omarchy.system-update",
+  "omarchy.indicators",
+  "omarchy.network",
+  "omarchy.audio",
+  "omarchy.monitor"
+]'
+
+geometry=""
+for _ in {1..80}; do
+  geometry=$(shell_ipc shell debugBarGeometry 2>/dev/null || true)
+  if jq -e --argjson expected "$default_ids" '
+    . as $rows | all($expected[]; . as $id | any($rows[]; .id == $id))
+  ' <<<"$geometry" >/dev/null 2>&1; then
+    break
+  fi
+  if ! kill -0 "$QS_PID" 2>/dev/null; then
+    fail_with_log "test shell exited before default bar geometry settled"
+  fi
+  sleep 0.1
+done
+
+if [[ -z $geometry ]]; then
+  fail_with_log "debug bar geometry returned output"
+fi
+
+jq -e --argjson expected "$default_ids" --argjson visibleExpected "$visible_default_ids" '
+  . as $rows |
+  all($expected[]; . as $id | any($rows[]; .id == $id)) and
+  all($visibleExpected[]; . as $id | any($rows[]; .id == $id and .visible == true and .width > 0 and .height > 0))
+' <<<"$geometry" >/dev/null || {
+  printf 'Geometry:\n' >&2
+  jq . <<<"$geometry" >&2
+  fail_with_log "default bar layout renders expected module slots"
+}
+pass "default bar layout renders expected module slots"
+
+jq -e '
+  map(select(.section == "center" and .visible == true and .width > 0)) | map(.id) as $center |
+  ($center | index("omarchy.weather")) != null and
+  ($center | index("omarchy.system-update")) != null and
+  ($center | index("omarchy.indicators")) != null and
+  (($center | index("omarchy.weather")) < ($center | index("omarchy.system-update"))) and
+  (($center | index("omarchy.system-update")) < ($center | index("omarchy.indicators")))
+' <<<"$geometry" >/dev/null || {
+  printf 'Geometry:\n' >&2
+  jq . <<<"$geometry" >&2
+  fail_with_log "runtime geometry places visible update between weather and indicators"
+}
+
+pass "runtime geometry places visible update between weather and indicators"
+
+HOME="$test_home" OMARCHY_PATH="$test_root" PATH="$ROOT/bin:$PATH" "$ROOT/bin/omarchy-config-shell-bar" remove omarchy.audio
+
+for _ in {1..80}; do
+  shell_config=$(shell_ipc shell listShellConfig 2>/dev/null || true)
+  geometry=$(shell_ipc shell debugBarGeometry 2>/dev/null || true)
+  if jq -e 'all(.bar.layout.right[]; (.id // .) != "omarchy.audio")' <<<"$shell_config" >/dev/null 2>&1 && \
+     jq -e 'all(.[]; .id != "omarchy.audio")' <<<"$geometry" >/dev/null 2>&1; then
+    break
+  fi
+  if ! kill -0 "$QS_PID" 2>/dev/null; then
+    fail_with_log "test shell exited before reloaded bar geometry settled"
+  fi
+  sleep 0.1
+done
+
+jq -e 'all(.bar.layout.right[]; (.id // .) != "omarchy.audio")' <<<"$shell_config" >/dev/null || {
+  printf 'Shell config after reload:\n%s\n' "$shell_config" | jq . >&2
+  fail_with_log "config shell bar remove reloads shell config"
+}
+
+jq -e 'all(.[]; .id != "omarchy.audio")' <<<"$geometry" >/dev/null || {
+  printf 'Geometry after reload:\n' >&2
+  jq . <<<"$geometry" >&2
+  fail_with_log "runtime bar layout updates after shell config reload"
+}
+
+pass "config shell bar remove reloads shell config and updates bar layout"
diff --git a/test/shell.d/screenrecording-test.sh b/test/shell.d/screenrecording-test.sh
new file mode 100644
index 00000000..93d5bc94
--- /dev/null
+++ b/test/shell.d/screenrecording-test.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/base-test.sh"
+
+tmp_dir=$(mktemp -d)
+trap 'rm -rf "$tmp_dir"' EXIT
+
+stub_bin="$tmp_dir/bin"
+mkdir -p "$stub_bin"
+
+cat >"$stub_bin/v4l2-ctl" <<'SH'
+#!/bin/bash
+
+printf '%s\n' "Built-in Webcam: Integrated Camera"
+printf '\t%s\n' "/dev/video0"
+printf '\t%s\n' "/dev/video1"
+printf '\n'
+printf '%s\n' "USB Capture Card: External Camera"
+printf '\t%s\n' "/dev/video2"
+SH
+
+cat >"$stub_bin/omarchy-menu-select" <<'SH'
+#!/bin/bash
+
+printf '%s\n' "$@" >"$OMARCHY_TEST_MENU_ARGS"
+printf '%s\n' "$3"
+SH
+
+cat >"$stub_bin/omarchy-capture-screenrecording" <<'SH'
+#!/bin/bash
+
+printf '%s\n' "$@" >"$OMARCHY_TEST_RECORDER_ARGS"
+SH
+
+cat >"$stub_bin/omarchy-notification-send" <<'SH'
+#!/bin/bash
+
+printf '%s\n' "$@" >"$OMARCHY_TEST_NOTIFICATION_ARGS"
+SH
+
+chmod +x "$stub_bin"/*
+
+export PATH="$stub_bin:$ROOT/bin:$PATH"
+export OMARCHY_TEST_MENU_ARGS="$tmp_dir/menu-args"
+export OMARCHY_TEST_RECORDER_ARGS="$tmp_dir/recorder-args"
+export OMARCHY_TEST_NOTIFICATION_ARGS="$tmp_dir/notification-args"
+
+"$ROOT/bin/omarchy-capture-screenrecording-with-webcam"
+
+expected_menu_args="$tmp_dir/expected-menu-args"
+printf '%s\n' \
+  "Select Webcam" \
+  "/dev/video0  Built-in Webcam: Integrated Camera" \
+  "/dev/video2  USB Capture Card: External Camera" \
+  "--" \
+  "--width" \
+  "520" \
+  "--maxheight" \
+  "520" >"$expected_menu_args"
+
+if ! cmp -s "$OMARCHY_TEST_MENU_ARGS" "$expected_menu_args"; then
+  fail "screenrecording webcam picker passes each webcam as a menu option" "$(diff -u "$expected_menu_args" "$OMARCHY_TEST_MENU_ARGS")"
+fi
+pass "screenrecording webcam picker passes each webcam as a menu option"
+
+expected_recorder_args="$tmp_dir/expected-recorder-args"
+printf '%s\n' \
+  "--with-desktop-audio" \
+  "--with-microphone-audio" \
+  "--with-webcam" \
+  "--webcam-device=/dev/video2" >"$expected_recorder_args"
+
+if ! cmp -s "$OMARCHY_TEST_RECORDER_ARGS" "$expected_recorder_args"; then
+  fail "screenrecording webcam picker starts recording with selected device" "$(diff -u "$expected_recorder_args" "$OMARCHY_TEST_RECORDER_ARGS")"
+fi
+pass "screenrecording webcam picker starts recording with selected device"
diff --git a/test/shell.d/screenshot-sanity-test.sh b/test/shell.d/screenshot-sanity-test.sh
new file mode 100755
index 00000000..a905a7b4
--- /dev/null
+++ b/test/shell.d/screenshot-sanity-test.sh
@@ -0,0 +1,231 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+TMPDIR=""
+QS_PID=""
+
+cleanup() {
+  if [[ -n $QS_PID ]] && kill -0 "$QS_PID" 2>/dev/null; then
+    kill "$QS_PID" 2>/dev/null || true
+    wait "$QS_PID" 2>/dev/null || true
+  fi
+  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
+}
+trap cleanup EXIT
+
+if [[ -z ${WAYLAND_DISPLAY:-} ]]; then
+  pass "no Wayland compositor; skipping screenshot sanity test"
+  exit 0
+fi
+
+if ! command -v quickshell >/dev/null 2>&1; then
+  pass "quickshell not installed; skipping screenshot sanity test"
+  exit 0
+fi
+
+if pgrep -x slurp >/dev/null 2>&1; then
+  pass "slurp is already running; skipping screenshot sanity test"
+  exit 0
+fi
+
+require_command hyprctl
+require_command grim
+require_command jq
+require_command python3
+
+shell_ipc() {
+  OMARCHY_PATH="$test_root" "$ROOT/bin/omarchy-shell" "$@"
+}
+
+shell_ipc_quiet() {
+  OMARCHY_PATH="$test_root" "$ROOT/bin/omarchy-shell" -q "$@"
+}
+
+fail_with_log() {
+  local description="$1"
+  sed -n '1,220p' "$log" >&2
+  [[ -f $screenshot_err ]] && sed -n '1,120p' "$screenshot_err" >&2
+  fail "$description"
+}
+
+TMPDIR=$(mktemp -d)
+test_root="$TMPDIR/omarchy"
+test_home="$TMPDIR/home"
+stub_bin="$TMPDIR/bin"
+screenshot_dir="$TMPDIR/screenshots"
+log="$TMPDIR/quickshell.log"
+screenshot_err="$TMPDIR/screenshot.err"
+mkdir -p "$test_root" "$test_home" "$stub_bin" "$screenshot_dir"
+cp -a "$ROOT/shell" "$test_root/shell"
+ln -s "$ROOT/config" "$test_root/config"
+ln -s "$ROOT/bin" "$test_root/bin"
+
+cat >"$stub_bin/omarchy-update-available" <<'SH'
+#!/bin/bash
+echo "Omarchy update available (test)"
+exit 0
+SH
+chmod +x "$stub_bin/omarchy-update-available"
+
+cat >"$test_root/shell/plugins/panels/weather/status.sh" <<'SH'
+#!/bin/bash
+printf '{"text":"72F","class":"sunny"}\n'
+SH
+chmod +x "$test_root/shell/plugins/panels/weather/status.sh"
+
+OMARCHY_PATH="$test_root" \
+HOME="$test_home" \
+PATH="$stub_bin:$ROOT/bin:$PATH" \
+  quickshell -p "$test_root/shell" --no-color >"$log" 2>&1 &
+QS_PID=$!
+
+for _ in {1..80}; do
+  if shell_ipc_quiet shell ping >/dev/null 2>&1; then
+    break
+  fi
+  if ! kill -0 "$QS_PID" 2>/dev/null; then
+    fail_with_log "screenshot test shell exited before IPC became available"
+  fi
+  sleep 0.1
+done
+
+shell_ipc_quiet omarchy.system-update refresh >/dev/null 2>&1 || true
+sleep 0.8
+
+geometry=$(shell_ipc shell debugBarGeometry)
+jq -e '
+  any(.[]; .id == "omarchy.menu" and .visible == true and .width > 0 and .height > 0) and
+  any(.[]; .id == "omarchy.clock" and .visible == true and .width > 0 and .height > 0)
+' <<<"$geometry" >/dev/null || {
+  printf 'Geometry:\n' >&2
+  jq . <<<"$geometry" >&2
+  fail_with_log "screenshot test shell rendered visible bar widgets"
+}
+
+screenshot=$(
+  OMARCHY_PATH="$test_root" \
+  OMARCHY_SCREENSHOT_DIR="$screenshot_dir" \
+  HOME="$test_home" \
+  PATH="$stub_bin:$ROOT/bin:$PATH" \
+    "$ROOT/bin/omarchy" capture screenshot fullscreen save 2>"$screenshot_err" | tail -n 1
+)
+
+[[ -n $screenshot && -f $screenshot ]] || fail_with_log "fullscreen screenshot was captured"
+
+SCREENSHOT="$screenshot" GEOMETRY="$geometry" python3 <<'PY'
+import json
+import os
+import struct
+import sys
+import zlib
+
+path = os.environ["SCREENSHOT"]
+geometry = json.loads(os.environ["GEOMETRY"])
+
+with open(path, "rb") as fh:
+  data = fh.read()
+
+if data[:8] != b"\x89PNG\r\n\x1a\n":
+  print("screenshot is not a PNG", file=sys.stderr)
+  sys.exit(1)
+
+offset = 8
+width = height = bit_depth = color_type = None
+idat = bytearray()
+while offset < len(data):
+  length = struct.unpack(">I", data[offset:offset + 4])[0]
+  kind = data[offset + 4:offset + 8]
+  payload = data[offset + 8:offset + 8 + length]
+  offset += length + 12
+  if kind == b"IHDR":
+    width, height, bit_depth, color_type, compression, filtering, interlace = struct.unpack(">IIBBBBB", payload)
+    if bit_depth != 8 or compression != 0 or filtering != 0 or interlace != 0:
+      print("unsupported PNG format", file=sys.stderr)
+      sys.exit(1)
+  elif kind == b"IDAT":
+    idat.extend(payload)
+  elif kind == b"IEND":
+    break
+
+if not width or not height:
+  print("missing PNG dimensions", file=sys.stderr)
+  sys.exit(1)
+
+channels = {0: 1, 2: 3, 6: 4}.get(color_type)
+if channels is None:
+  print(f"unsupported PNG color type: {color_type}", file=sys.stderr)
+  sys.exit(1)
+
+raw = zlib.decompress(bytes(idat))
+stride = width * channels
+rows = []
+pos = 0
+prev = [0] * stride
+
+def paeth(a, b, c):
+  p = a + b - c
+  pa = abs(p - a)
+  pb = abs(p - b)
+  pc = abs(p - c)
+  if pa <= pb and pa <= pc:
+    return a
+  if pb <= pc:
+    return b
+  return c
+
+for _ in range(height):
+  filter_type = raw[pos]
+  pos += 1
+  scan = list(raw[pos:pos + stride])
+  pos += stride
+  out = [0] * stride
+  for i, value in enumerate(scan):
+    left = out[i - channels] if i >= channels else 0
+    up = prev[i]
+    up_left = prev[i - channels] if i >= channels else 0
+    if filter_type == 0:
+      out[i] = value
+    elif filter_type == 1:
+      out[i] = (value + left) & 255
+    elif filter_type == 2:
+      out[i] = (value + up) & 255
+    elif filter_type == 3:
+      out[i] = (value + ((left + up) // 2)) & 255
+    elif filter_type == 4:
+      out[i] = (value + paeth(left, up, up_left)) & 255
+    else:
+      print(f"unsupported PNG filter: {filter_type}", file=sys.stderr)
+      sys.exit(1)
+  rows.append(out)
+  prev = out
+
+visible_heights = [int(row.get("height", 0)) for row in geometry if row.get("visible") and row.get("height", 0) > 0]
+bar_height = max(24, min(80, (max(visible_heights) if visible_heights else 26) + 8))
+bar_height = min(bar_height, height)
+
+colors = set()
+non_black = 0
+sample_step_x = max(1, width // 320)
+sample_step_y = max(1, bar_height // 12)
+
+for y in range(0, bar_height, sample_step_y):
+  row = rows[y]
+  for x in range(0, width, sample_step_x):
+    i = x * channels
+    if color_type == 0:
+      rgb = (row[i], row[i], row[i])
+    else:
+      rgb = tuple(row[i:i + 3])
+    colors.add(rgb)
+    if max(rgb) > 8:
+      non_black += 1
+
+if len(colors) < 3 or non_black == 0:
+  print(f"top bar band looked blank: colors={len(colors)} non_black={non_black} size={width}x{height}", file=sys.stderr)
+  sys.exit(1)
+PY
+
+pass "fullscreen screenshot shows a nonblank bar band"
diff --git a/test/shell.d/systemd-test.sh b/test/shell.d/systemd-test.sh
new file mode 100755
index 00000000..6aa5d18e
--- /dev/null
+++ b/test/shell.d/systemd-test.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+service="$ROOT/default/systemd/user/bt-agent.service"
+
+grep -Fx 'ExecCondition=/usr/bin/systemctl is-active --quiet bluetooth.service' "$service" >/dev/null
+pass "bt-agent skips when bluetooth.service is inactive"
+
+grep -Fx 'Restart=on-failure' "$service" >/dev/null
+pass "bt-agent still restarts after runtime failures"
+
+sleep_service="$ROOT/default/systemd/user/omarchy-sleep-lock.service"
+grep -Fx 'ExecStart=/usr/bin/omarchy-system-sleep-monitor' "$sleep_service" >/dev/null
+pass "sleep lock service uses the package-backed monitor path"
+
+first_run_units="$ROOT/install/user/first-run/enable-user-units.sh"
+grep -Fx 'systemctl --user daemon-reload' "$first_run_units" >/dev/null
+grep -F 'omarchy-sleep-lock.service' "$first_run_units" >/dev/null
+pass "first-run reloads and enables the sleep lock service"
+
+upgrade_to_4="$ROOT/bin/omarchy-upgrade-to-4"
+grep -F '6870b232a6c0474b59187882e6d25ae771bba735098bcbedef8a2b73b97e2b6a' "$upgrade_to_4" >/dev/null
+grep -F 'ExecStart=%h/.local/share/omarchy/bin/omarchy-system-sleep-monitor' "$upgrade_to_4" >/dev/null
+grep -F 'ExecStart=/usr/bin/omarchy-system-sleep-monitor' "$upgrade_to_4" >/dev/null
+grep -F 'reset-failed omarchy-sleep-lock.service' "$upgrade_to_4" >/dev/null
+pass "Omarchy 4 upgrade repairs the legacy sleep lock unit path"
diff --git a/test/shell.d/tailscale-test.sh b/test/shell.d/tailscale-test.sh
new file mode 100644
index 00000000..13daf429
--- /dev/null
+++ b/test/shell.d/tailscale-test.sh
@@ -0,0 +1,170 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const tailscale = requireFromRoot('shell/plugins/panels/tailscale/Model.js')
+
+assertDeepEqual(
+  tailscale.filterIPv4(['100.64.0.1', 'fd7a:115c:a1e0::1', '192.168.1.2']),
+  ['100.64.0.1'],
+  'tailscale keeps only Tailscale IPv4 addresses'
+)
+assertDeepEqual(
+  tailscale.filterIPv6(['100.64.0.1', 'fd7a:115c:a1e0::1', 'fe80::1']),
+  ['fd7a:115c:a1e0::1'],
+  'tailscale keeps only Tailscale IPv6 addresses'
+)
+
+assertEqual(tailscale.cleanDnsName('work.tailnet.ts.net.'), 'work.tailnet.ts.net', 'tailscale strips trailing DNS dot')
+assertEqual(tailscale.displayHostName('localhost', 'work.tailnet.ts.net.'), 'work', 'tailscale falls back from localhost to short DNS name')
+
+const status = tailscale.parseStatus(JSON.stringify({
+  BackendState: 'Running',
+  AuthURL: '',
+  TailscaleIPs: ['100.74.97.73', 'fd7a:115c:a1e0::ff32:6149'],
+  Self: {
+    HostName: 'dhh-fd',
+    DNSName: 'dhh-fd.tail32f559.ts.net.',
+    TailscaleIPs: ['100.74.97.73']
+  },
+  Peer: {
+    onlineB: {
+      HostName: 'zed',
+      DNSName: 'zed.tail32f559.ts.net.',
+      TailscaleIPs: ['100.1.1.2'],
+      Online: true,
+      OS: 'linux',
+      ExitNodeOption: true,
+      ExitNode: true
+    },
+    offline: {
+      HostName: 'offline',
+      DNSName: 'offline.tail32f559.ts.net.',
+      TailscaleIPs: ['100.1.1.3'],
+      Online: false,
+      OS: 'linux'
+    },
+    offlineExit: {
+      HostName: 'mbu-ser9',
+      DNSName: 'mbu-ser9.tail32f559.ts.net.',
+      TailscaleIPs: ['100.125.28.77', 'fd7a:115c:a1e0::1037:1c4d'],
+      Online: false,
+      OS: 'linux',
+      ExitNodeOption: true,
+      ExitNode: false
+    },
+    onlineA: {
+      HostName: 'alpha',
+      DNSName: 'alpha.tail32f559.ts.net.',
+      TailscaleIPs: ['100.1.1.1', 'fd7a:115c:a1e0::1901:334b'],
+      Online: true,
+      OS: 'macos'
+    },
+    mullvadExit: {
+      HostName: 'al-tia-wg-003',
+      DNSName: 'al-tia-wg-003.mullvad.ts.net.',
+      TailscaleIPs: ['100.95.87.11'],
+      Online: true,
+      OS: 'linux',
+      ExitNodeOption: true,
+      ExitNode: false
+    }
+  }
+}))
+
+assert(status.ok && status.running, 'tailscale parses running status')
+assertEqual(status.selfIp, '100.74.97.73', 'tailscale parses self IP')
+assertDeepEqual(status.peers.map(peer => peer.HostName), ['alpha', 'zed'], 'tailscale filters offline and Mullvad peers and sorts online peers')
+assertDeepEqual(status.peers[0].TailscaleIPv6, ['fd7a:115c:a1e0::1901:334b'], 'tailscale preserves peer IPv6 addresses for copy menu')
+assert(status.peers[1].ExitNodeOption && status.peers[1].ExitNode, 'tailscale preserves exit node flags')
+assertDeepEqual(status.exitNodes.map(peer => peer.HostName), ['zed'], 'tailscale lists only online tailnet exit nodes')
+assert(tailscale.isMullvadPeer({ HostName: 'al-tia-wg-003', DNSName: 'al-tia-wg-003.mullvad.ts.net.' }), 'tailscale detects Mullvad status peers')
+
+const mullvadNodes = tailscale.parseExitNodeList(`
+ IP                  HOSTNAME                         COUNTRY            CITY                   STATUS
+ 100.65.216.13       au-adl-wg-301.mullvad.ts.net     Australia          Any                    -
+ 100.65.216.13       au-adl-wg-301.mullvad.ts.net     Australia          Adelaide               -
+ 100.70.240.117      au-bne-wg-301.mullvad.ts.net     Australia          Brisbane               -
+ 100.66.11.119       dk-cph-wg-001.mullvad.ts.net     Denmark            Copenhagen             -
+ 100.101.10.10       us-chi-wg-001.mullvad.ts.net     United States      Chicago                -
+ 100.102.10.10       us-nyc-wg-001.mullvad.ts.net     United States      New York               -
+ 100.1.2.3           office.tailnet.ts.net             Denmark            Office                 -
+
+# To use an exit node, use tailscale set --exit-node=
+`)
+
+assertDeepEqual(
+  mullvadNodes.map(node => node.DisplayName),
+  ['Adelaide, Australia', 'Brisbane, Australia', 'Copenhagen, Denmark', 'Chicago, United States', 'New York, United States'],
+  'tailscale parses Mullvad exit nodes and skips duplicate country rows'
+)
+assertEqual(mullvadNodes[2].DNSName, 'dk-cph-wg-001.mullvad.ts.net', 'tailscale preserves Mullvad hostname as exit node target')
+assertDeepEqual(mullvadNodes[2].TailscaleIPs, ['100.66.11.119'], 'tailscale preserves Mullvad exit node IP')
+assert(mullvadNodes.every(node => node.Mullvad === true && node.ExitNodeOption === true), 'tailscale marks Mullvad rows as exit nodes')
+
+const mullvadRegions = tailscale.mullvadRegionOptions(mullvadNodes)
+assertDeepEqual(
+  mullvadRegions.map(node => node.DisplayName),
+  ['Adelaide, Australia', 'Brisbane, Australia', 'Copenhagen, Denmark', 'Chicago, United States', 'New York, United States'],
+  'tailscale groups Mullvad exit nodes by unique city region'
+)
+assertDeepEqual(
+  mullvadRegions.filter(node => node.Country === 'United States').map(node => node.City),
+  ['Chicago', 'New York'],
+  'tailscale keeps multiple Mullvad cities within a country'
+)
+assertEqual(mullvadRegions[0].DNSName, 'au-adl-wg-301.mullvad.ts.net', 'tailscale uses a concrete city endpoint for grouped regions')
+assertEqual(mullvadRegions[2].DNSName, 'dk-cph-wg-001.mullvad.ts.net', 'tailscale preserves first available city endpoint')
+
+const stopped = tailscale.parseStatus(JSON.stringify({
+  BackendState: 'Stopped',
+  Peer: {
+    online: {
+      HostName: 'alpha',
+      DNSName: 'alpha.tail32f559.ts.net.',
+      TailscaleIPs: ['100.1.1.1'],
+      Online: true,
+      OS: 'macos'
+    }
+  }
+}))
+
+assert(stopped.ok && !stopped.running, 'tailscale parses stopped status')
+
+const accounts = tailscale.parseAccounts(JSON.stringify([
+  {
+    id: 'db1b',
+    nickname: 'Home',
+    tailnet: 'dhh.github',
+    account: 'dhh@github',
+    selected: true
+  },
+  {
+    id: '1785',
+    nickname: 'Work',
+    tailnet: '37signals.com',
+    account: 'david@37signals.com',
+    selected: false
+  }
+]))
+
+assertEqual(accounts.accounts.length, 2, 'tailscale parses multiple connections')
+assertEqual(accounts.selectedAccountId, 'db1b', 'tailscale records selected connection id')
+assertEqual(accounts.selectedAccountLabel, 'Home', 'tailscale labels connections by nickname')
+assertDeepEqual(
+  accounts.accounts.map(account => account.nickname),
+  ['Home', 'Work'],
+  'tailscale preserves connection nicknames'
+)
+assertEqual(
+  tailscale.accountLabel({ nickname: '', tailnet: 'tailnet.example', account: 'user@example', id: 'abcd' }),
+  'tailnet.example',
+  'tailscale labels connections by tailnet when nickname is missing'
+)
+
+assertDeepEqual(tailscale.parseStatus('{'), { ok: false, unavailable: true, message: 'Status error', error: 'Failed to parse tailscale status' }, 'tailscale reports invalid status JSON')
+assertDeepEqual(tailscale.parseAccounts('{'), { accounts: [], selectedAccountId: '', selectedAccountLabel: '' }, 'tailscale handles invalid account JSON')
+JS
diff --git a/test/shell.d/terminal-keybinding-migration-test.sh b/test/shell.d/terminal-keybinding-migration-test.sh
new file mode 100644
index 00000000..04a4c373
--- /dev/null
+++ b/test/shell.d/terminal-keybinding-migration-test.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+source "$(dirname "${BASH_SOURCE[0]}")/base-test.sh"
+
+migration=$(grep -rl 'Make Shift+Enter distinguishable for terminals and Codex' "$ROOT/migrations" | head -n 1 || true)
+[[ -n $migration ]] || fail "terminal Shift+Enter migration exists"
+
+TMPDIR=$(mktemp -d)
+trap 'rm -rf "$TMPDIR"' EXIT
+
+test_home="$TMPDIR/home"
+mkdir -p \
+  "$test_home/.config/alacritty" \
+  "$test_home/.config/foot" \
+  "$test_home/.config/ghostty" \
+  "$test_home/.config/kitty"
+
+cp "$ROOT/config/alacritty/alacritty.toml" "$test_home/.config/alacritty/alacritty.toml"
+sed -i 's/\\u001B\[13;2u/\\u001B\\r/' "$test_home/.config/alacritty/alacritty.toml"
+
+cp "$ROOT/config/kitty/kitty.conf" "$test_home/.config/kitty/kitty.conf"
+sed -i '/shift+enter/d' "$test_home/.config/kitty/kitty.conf"
+
+cp "$ROOT/config/ghostty/config" "$test_home/.config/ghostty/config"
+sed -i '/shift+enter/d' "$test_home/.config/ghostty/config"
+
+cp "$ROOT/config/foot/foot.ini" "$test_home/.config/foot/foot.ini"
+sed -i '/text-bindings/,$d' "$test_home/.config/foot/foot.ini"
+
+HOME="$test_home" bash "$migration" >/dev/null
+
+grep -qxF '{ key = "Return", mods = "Shift", chars = "\u001B[13;2u" },' "$test_home/.config/alacritty/alacritty.toml" ||
+  fail "migration updates Alacritty Shift+Return to CSI-u"
+pass "migration updates Alacritty Shift+Return to CSI-u"
+
+grep -qxF 'map shift+enter send_text all \e[13;2u' "$test_home/.config/kitty/kitty.conf" ||
+  fail "migration adds Kitty Shift+Enter CSI-u binding"
+grep -qxF 'map alt+shift+enter send_text all \e[13;4u' "$test_home/.config/kitty/kitty.conf" ||
+  fail "migration adds Kitty Alt+Shift+Enter CSI-u binding"
+pass "migration adds Kitty CSI-u bindings"
+
+grep -qxF 'keybind = shift+enter=csi:13;2u' "$test_home/.config/ghostty/config" ||
+  fail "migration adds Ghostty Shift+Enter CSI-u binding"
+grep -qxF 'keybind = alt+shift+enter=csi:13;4u' "$test_home/.config/ghostty/config" ||
+  fail "migration adds Ghostty Alt+Shift+Enter CSI-u binding"
+pass "migration adds Ghostty CSI-u bindings"
+
+grep -qxF '\x1b[13;2u=Shift+Return' "$test_home/.config/foot/foot.ini" ||
+  fail "migration adds Foot Shift+Return CSI-u binding"
+grep -qxF '\x1b[13;4u=Mod1+Shift+Return' "$test_home/.config/foot/foot.ini" ||
+  fail "migration adds Foot Alt+Shift+Return CSI-u binding"
+pass "migration adds Foot CSI-u bindings"
+
+before=$(find "$test_home/.config" -type f -print0 | sort -z | xargs -0 sha256sum)
+HOME="$test_home" bash "$migration" >/dev/null
+after=$(find "$test_home/.config" -type f -print0 | sort -z | xargs -0 sha256sum)
+
+[[ $before == "$after" ]] || fail "terminal Shift+Enter migration is idempotent"
+pass "terminal Shift+Enter migration is idempotent"
diff --git a/test/shell.d/toggle-test.sh b/test/shell.d/toggle-test.sh
new file mode 100644
index 00000000..945dc8af
--- /dev/null
+++ b/test/shell.d/toggle-test.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+TMPDIR=""
+
+export PATH="$ROOT/bin:$PATH"
+
+cleanup() {
+  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
+}
+trap cleanup EXIT
+
+TMPDIR=$(mktemp -d)
+test_home="$TMPDIR/home"
+flag="$test_home/.local/state/omarchy/toggles/example"
+bar_flag="$test_home/.local/state/omarchy/toggles/bar-off"
+
+HOME="$test_home" omarchy-toggle example on
+[[ -f $flag ]] || fail "generic toggle enables explicit on state"
+pass "generic toggle enables explicit on state"
+
+HOME="$test_home" omarchy-toggle example on
+[[ -f $flag ]] || fail "generic toggle on is idempotent"
+pass "generic toggle on is idempotent"
+
+HOME="$test_home" omarchy-toggle example off
+[[ ! -f $flag ]] || fail "generic toggle disables explicit off state"
+pass "generic toggle disables explicit off state"
+
+HOME="$test_home" omarchy-toggle example
+[[ -f $flag ]] || fail "generic toggle flips disabled state on"
+pass "generic toggle flips disabled state on"
+
+HOME="$test_home" omarchy-toggle example toggle
+[[ ! -f $flag ]] || fail "generic toggle flips enabled state off"
+pass "generic toggle flips enabled state off"
+
+HOME="$test_home" omarchy-toggle-bar on
+[[ -f $bar_flag ]] || fail "bar on enables bar-off toggle"
+pass "bar on enables bar-off toggle"
+
+HOME="$test_home" omarchy-toggle-bar on
+[[ -f $bar_flag ]] || fail "bar on is idempotent"
+pass "bar on is idempotent"
+
+HOME="$test_home" omarchy-toggle-bar off
+[[ ! -f $bar_flag ]] || fail "bar off disables bar-off toggle"
+pass "bar off disables bar-off toggle"
diff --git a/test/shell.d/tray-menu-test.sh b/test/shell.d/tray-menu-test.sh
new file mode 100644
index 00000000..a7405eda
--- /dev/null
+++ b/test/shell.d/tray-menu-test.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+TMPDIR=""
+QS_PID=""
+MOCK_PID=""
+
+cleanup() {
+  if [[ -n $MOCK_PID ]] && kill -0 "$MOCK_PID" 2>/dev/null; then
+    kill "$MOCK_PID" 2>/dev/null || true
+    wait "$MOCK_PID" 2>/dev/null || true
+  fi
+  if [[ -n $QS_PID ]] && kill -0 "$QS_PID" 2>/dev/null; then
+    kill "$QS_PID" 2>/dev/null || true
+    wait "$QS_PID" 2>/dev/null || true
+  fi
+  [[ -n $TMPDIR && -d $TMPDIR ]] && rm -rf "$TMPDIR"
+  return 0
+}
+trap cleanup EXIT
+
+if ! command -v quickshell >/dev/null 2>&1; then
+  pass "quickshell not installed; skipping tray menu activation test"
+  exit 0
+fi
+
+require_command jq
+require_command python
+
+python - <<'PY' || {
+import dbus
+import gi
+PY
+  pass "python DBus bindings unavailable; skipping tray menu activation test"
+  exit 0
+}
+
+TMPDIR=$(mktemp -d)
+config_dir="$TMPDIR/tray-menu-activation"
+result="$TMPDIR/result.json"
+event_result="$TMPDIR/event"
+ready="$TMPDIR/ready"
+qs_log="$TMPDIR/quickshell.log"
+mock_log="$TMPDIR/mock-sni.log"
+mkdir -p "$config_dir" "$TMPDIR/home"
+cp "$SHELL_TEST_DIR/fixtures/tray-menu-activation/shell.qml" "$config_dir/shell.qml"
+
+OMARCHY_PATH="$ROOT" \
+OMARCHY_QML_TEST_RESULT="$result" \
+HOME="$TMPDIR/home" \
+  quickshell -p "$config_dir" --no-color >"$qs_log" 2>&1 &
+QS_PID=$!
+
+OMARCHY_TRAY_MENU_EVENT_RESULT="$event_result" \
+OMARCHY_TRAY_MENU_READY="$ready" \
+  python "$SHELL_TEST_DIR/fixtures/tray-menu-activation/mock-sni.py" >"$mock_log" 2>&1 &
+MOCK_PID=$!
+
+for _ in {1..80}; do
+  [[ -s $event_result ]] && break
+
+  if ! kill -0 "$QS_PID" 2>/dev/null; then
+    sed -n '1,160p' "$qs_log" >&2
+    fail "tray menu activation quickshell exited before triggering menu item"
+  fi
+
+  if ! kill -0 "$MOCK_PID" 2>/dev/null; then
+    sed -n '1,160p' "$mock_log" >&2
+    fail "mock StatusNotifierItem exited before receiving menu event"
+  fi
+
+  sleep 0.1
+done
+
+if [[ ! -s $event_result ]]; then
+  [[ -s $result ]] && jq . "$result" >&2
+  printf 'Quickshell log:\n' >&2
+  sed -n '1,160p' "$qs_log" >&2
+  printf 'Mock SNI log:\n' >&2
+  sed -n '1,160p' "$mock_log" >&2
+  fail "tray menu sends DBusMenu clicked event"
+fi
+
+pass "tray menu sends DBusMenu clicked event"
diff --git a/test/shell.d/tray-test.sh b/test/shell.d/tray-test.sh
new file mode 100644
index 00000000..d2b2a25e
--- /dev/null
+++ b/test/shell.d/tray-test.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test "tray model helpers" <<'JS'
+const tray = requireFromRoot('shell/plugins/bar/widgets/TrayModel.js')
+
+assert(tray.isDropboxTrayItem({ id: 'dropbox-client' }), 'tray detects dropbox item ids')
+assert(tray.isDropboxTrayItem({ title: 'Dropbox' }), 'tray detects dropbox item titles')
+assert(!tray.isDropboxTrayItem({ id: 'nextcloud' }), 'tray ignores non-dropbox items')
+
+const layout = {
+  left: [{ id: 'omarchy.menu' }],
+  center: [],
+  right: [{ id: 'omarchy.dropbox' }, { id: 'omarchy.tray' }]
+}
+
+assert(tray.layoutHasWidget(layout, 'omarchy.dropbox'), 'tray finds dedicated dropbox widget in layout')
+assert(tray.ownedByDedicatedWidget({ id: 'dropbox' }, layout), 'tray suppresses dropbox when dedicated widget is in bar')
+assert(!tray.ownedByDedicatedWidget({ id: 'dropbox' }, { left: [], center: [], right: [] }), 'tray keeps dropbox when dedicated widget is absent')
+assert(!tray.ownedByDedicatedWidget({ id: 'nextcloud' }, layout), 'tray keeps unrelated tray items')
+JS
diff --git a/test/shell.d/update-available-test.sh b/test/shell.d/update-available-test.sh
new file mode 100644
index 00000000..13604e00
--- /dev/null
+++ b/test/shell.d/update-available-test.sh
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/base-test.sh"
+
+test_tmp=$(mktemp -d)
+trap 'rm -rf "$test_tmp"' EXIT
+
+stub_bin="$test_tmp/bin"
+test_home="$test_tmp/home"
+state_home="$test_tmp/state"
+mkdir -p "$stub_bin" "$test_home" "$state_home"
+
+cat >"$stub_bin/fakeroot" <<'SH'
+#!/bin/bash
+exit 0
+SH
+chmod +x "$stub_bin/fakeroot"
+
+cat >"$stub_bin/checkupdates" <<'SH'
+#!/bin/bash
+case "${TEST_CHECKUPDATES:-updates}" in
+  updates)
+    printf 'linux 6.1-1 -> 6.1-2\nomarchy 4.0.0-1 -> 4.0.1-1\n'
+    exit 0
+    ;;
+  none)
+    exit 2
+    ;;
+  fail)
+    echo "check failed" >&2
+    exit 1
+    ;;
+esac
+SH
+chmod +x "$stub_bin/checkupdates"
+
+cat >"$stub_bin/pacman" <<'SH'
+#!/bin/bash
+case "$1" in
+  -Qem)
+    [[ ${TEST_AUR_INSTALLED:-0} == "1" ]] && exit 0 || exit 1
+    ;;
+  -Qu)
+    if [[ ${TEST_PACMAN_FALLBACK_UPDATES:-0} == "1" ]]; then
+      echo "fallback-pkg 1-1 -> 1-2"
+    fi
+    exit 0
+    ;;
+esac
+exit 0
+SH
+chmod +x "$stub_bin/pacman"
+
+cat >"$stub_bin/yay" <<'SH'
+#!/bin/bash
+if [[ ${TEST_YAY_UPDATES:-0} == "1" ]]; then
+  echo "aur-helper 1-1 -> 1-2"
+fi
+exit 0
+SH
+chmod +x "$stub_bin/yay"
+
+run_checker() {
+  HOME="$test_home" \
+  XDG_STATE_HOME="$state_home" \
+  PATH="$stub_bin:$PATH" \
+  OMARCHY_UPDATE_CHECK_TIMEOUT=5 \
+    "$ROOT/bin/omarchy-update-available"
+}
+
+capture_checker() {
+  local stdout_file="$1"
+  local stderr_file="$2"
+  shift 2
+
+  set +e
+  (
+    export "$@"
+    run_checker
+  ) >"$stdout_file" 2>"$stderr_file"
+  local status=$?
+  set -e
+  return "$status"
+}
+
+stdout="$test_tmp/stdout"
+stderr="$test_tmp/stderr"
+
+if capture_checker "$stdout" "$stderr" TEST_CHECKUPDATES=updates TEST_AUR_INSTALLED=0; then
+  status=0
+else
+  status=$?
+fi
+[[ $status -eq 0 ]] || fail "update checker exits successfully when system updates are available"
+grep -q '^linux ' "$stdout" || fail "update checker prints system package updates"
+grep -q '^omarchy ' "$state_home/omarchy/updates/packages" || fail "update checker stores system package updates"
+[[ $(wc -l <"$state_home/omarchy/updates/available") -eq 2 ]] || fail "update checker stores combined update list"
+pass "update checker detects system package updates"
+
+if capture_checker "$stdout" "$stderr" TEST_CHECKUPDATES=none TEST_AUR_INSTALLED=1 TEST_YAY_UPDATES=1; then
+  status=0
+else
+  status=$?
+fi
+[[ $status -eq 0 ]] || fail "update checker exits successfully when AUR updates are available"
+grep -q '^aur-helper ' "$stdout" || fail "update checker prints AUR package updates"
+grep -q '^aur-helper ' "$state_home/omarchy/updates/aur" || fail "update checker stores AUR package updates"
+pass "update checker detects AUR package updates"
+
+if capture_checker "$stdout" "$stderr" TEST_CHECKUPDATES=none TEST_AUR_INSTALLED=0; then
+  status=0
+else
+  status=$?
+fi
+[[ $status -eq 1 ]] || fail "update checker exits non-zero when no updates are available"
+grep -q '^System is up to date$' "$stdout" || fail "update checker prints up-to-date message"
+[[ ! -s "$state_home/omarchy/updates/available" ]] || fail "update checker clears combined update list when up to date"
+pass "update checker reports up-to-date systems"
diff --git a/test/shell.d/update-lock-test.sh b/test/shell.d/update-lock-test.sh
new file mode 100644
index 00000000..aef0b6fe
--- /dev/null
+++ b/test/shell.d/update-lock-test.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/base-test.sh"
+
+test_tmp=$(mktemp -d)
+trap 'rm -rf "$test_tmp"' EXIT
+
+stub_bin="$test_tmp/bin"
+test_home="$test_tmp/home"
+runtime_dir="$test_tmp/runtime"
+mkdir -p "$stub_bin" "$test_home" "$runtime_dir"
+
+run_with_lock_env() {
+  HOME="$test_home" \
+  XDG_RUNTIME_DIR="$runtime_dir" \
+  XDG_STATE_HOME="$test_tmp/state" \
+  PATH="$stub_bin:$ROOT/bin:$PATH" \
+    "$@"
+}
+
+write_stub() {
+  local name="$1"
+  local body="$2"
+
+  cat >"$stub_bin/$name" <<SH
+#!/bin/bash
+$body
+SH
+  chmod +x "$stub_bin/$name"
+}
+
+for command in \
+  omarchy-toggle-idle \
+  systemd-inhibit \
+  omarchy-update-keyring \
+  omarchy-update-system-pkgs \
+  omarchy-migrate \
+  omarchy-update-aur-pkgs \
+  omarchy-update-mise \
+  omarchy-update-orphan-pkgs \
+  omarchy-hook \
+  omarchy-update-analyze-logs \
+  omarchy-shell \
+  omarchy-update-restart; do
+  write_stub "$command" 'exit 0'
+done
+write_stub omarchy-update-available 'exit 1'
+
+# omarchy-update should hold the lock before snapshotting, so a second update
+# cannot even enter its pre-update snapshot.
+update_snapshot_marker="$test_tmp/update-snapshot-started"
+write_stub omarchy-snapshot 'echo started >"$TEST_MARKER"; sleep 2; exit 0'
+
+OMARCHY_UPDATE_LOGGED=1 TEST_MARKER="$update_snapshot_marker" run_with_lock_env "$ROOT/bin/omarchy-update" -y >"$test_tmp/update-first.out" 2>&1 &
+update_pid=$!
+
+for _ in {1..50}; do
+  [[ -f $update_snapshot_marker ]] && break
+  sleep 0.05
+done
+[[ -f $update_snapshot_marker ]] || fail "first omarchy-update reached snapshot under lock"
+
+set +e
+OMARCHY_UPDATE_LOGGED=1 TEST_MARKER="$test_tmp/update-second-snapshot-started" run_with_lock_env "$ROOT/bin/omarchy-update" -y >"$test_tmp/update-second.out" 2>&1
+update_second_status=$?
+set -e
+
+wait "$update_pid"
+
+[[ $update_second_status -ne 0 ]] || fail "second omarchy-update exits non-zero while update lock is held"
+grep -q "already running" "$test_tmp/update-second.out" || fail "second omarchy-update reports held update lock"
+[[ ! -f $test_tmp/update-second-snapshot-started ]] || fail "second omarchy-update did not snapshot while lock was held"
+pass "omarchy-update prevents overlapping top-level updates"
+
+# omarchy-update-perform is now only a compatibility wrapper around
+# omarchy-update -y, but it should still respect the same update lock.
+perform_marker="$test_tmp/perform-started"
+write_stub omarchy-update-keyring 'echo started >"$TEST_MARKER"; sleep 2; exit 0'
+
+TEST_MARKER="$perform_marker" run_with_lock_env "$ROOT/bin/omarchy-update-perform" >"$test_tmp/perform-first.out" 2>&1 &
+perform_pid=$!
+
+for _ in {1..50}; do
+  [[ -f $perform_marker ]] && break
+  sleep 0.05
+done
+[[ -f $perform_marker ]] || fail "first omarchy-update-perform delegated to update under lock"
+
+set +e
+TEST_MARKER="$test_tmp/perform-second-started" run_with_lock_env "$ROOT/bin/omarchy-update-perform" >"$test_tmp/perform-second.out" 2>&1
+perform_second_status=$?
+set -e
+
+wait "$perform_pid"
+
+[[ $perform_second_status -ne 0 ]] || fail "second omarchy-update-perform exits non-zero while update lock is held"
+grep -q "already running" "$test_tmp/perform-second.out" || fail "second omarchy-update-perform reports held update lock"
+[[ ! -f $test_tmp/perform-second-started ]] || fail "second omarchy-update-perform did not snapshot while lock was held"
+pass "omarchy-update-perform compatibility wrapper respects update lock"
diff --git a/test/shell.d/update-orphan-test.sh b/test/shell.d/update-orphan-test.sh
new file mode 100644
index 00000000..7d2b05cd
--- /dev/null
+++ b/test/shell.d/update-orphan-test.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/base-test.sh"
+
+test_tmp=$(mktemp -d)
+trap 'rm -rf "$test_tmp"' EXIT
+
+stub_bin="$test_tmp/bin"
+test_home="$test_tmp/home"
+mkdir -p "$stub_bin" "$test_home"
+
+write_stub() {
+  local name="$1"
+  local body="$2"
+
+  cat >"$stub_bin/$name" <<SH
+#!/bin/bash
+$body
+SH
+  chmod +x "$stub_bin/$name"
+}
+
+run_orphan_checker() {
+  HOME="$test_home" PATH="$stub_bin:$PATH" "$ROOT/bin/omarchy-update-orphan-pkgs"
+}
+
+write_stub pacman 'if [[ $1 == "-Qtdq" ]]; then printf "old-lib\nunused-tool\n"; exit 0; fi; exit 1'
+write_stub sudo 'echo "sudo should not be called" >&2; exit 99'
+write_stub gum 'echo "gum should not be called" >&2; exit 99'
+
+run_orphan_checker >"$test_tmp/noninteractive.out" 2>"$test_tmp/noninteractive.err"
+grep -q '^  old-lib$' "$test_tmp/noninteractive.out" || fail "orphan checker lists orphan packages"
+grep -q 'Re-run omarchy-update-orphan-pkgs in a terminal' "$test_tmp/noninteractive.out" || fail "orphan checker does not remove packages non-interactively"
+pass "orphan checker only reports orphans non-interactively"
+
+write_stub pacman 'if [[ $1 == "-Qtdq" ]]; then exit 0; fi; exit 1'
+run_orphan_checker >"$test_tmp/none.out" 2>"$test_tmp/none.err"
+[[ ! -s $test_tmp/none.out ]] || fail "orphan checker stays quiet when no orphans exist"
+pass "orphan checker stays quiet without orphans"
diff --git a/test/shell.d/update-pacman-guard-test.sh b/test/shell.d/update-pacman-guard-test.sh
new file mode 100644
index 00000000..054cd40c
--- /dev/null
+++ b/test/shell.d/update-pacman-guard-test.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/base-test.sh"
+
+test_tmp=$(mktemp -d)
+trap 'rm -rf "$test_tmp"' EXIT
+
+run_guard() {
+  OMARCHY_PACMAN_CMDLINE="$1" "$ROOT/bin/omarchy-update-pacman-guard"
+}
+
+if run_guard "pacman -Syu --noconfirm" >"$test_tmp/direct.out" 2>"$test_tmp/direct.err"; then
+  fail "pacman guard blocks direct system upgrades"
+fi
+grep -q 'omarchy update' "$test_tmp/direct.err" || fail "pacman guard explains omarchy update entrypoint"
+pass "pacman guard blocks direct pacman -Syu"
+
+if run_guard "pacman --sync --refresh --sysupgrade" >"$test_tmp/long.out" 2>"$test_tmp/long.err"; then
+  fail "pacman guard blocks long-form system upgrades"
+fi
+pass "pacman guard blocks long-form pacman sysupgrade"
+
+OMARCHY_UPDATE_PACMAN=1 run_guard "pacman -Syu --noconfirm" >"$test_tmp/omarchy.out" 2>"$test_tmp/omarchy.err"
+[[ ! -s $test_tmp/omarchy.err ]] || fail "pacman guard stays quiet for omarchy update pacman call"
+pass "pacman guard allows omarchy update pacman call"
+
+OMARCHY_ALLOW_DIRECT_PACMAN=1 run_guard "pacman -Syu --noconfirm" >"$test_tmp/override.out" 2>"$test_tmp/override.err"
+[[ ! -s $test_tmp/override.err ]] || fail "pacman guard stays quiet for explicit direct pacman override"
+pass "pacman guard allows explicit direct pacman override"
+
+run_guard "pacman -S firefox" >"$test_tmp/install.out" 2>"$test_tmp/install.err"
+[[ ! -s $test_tmp/install.err ]] || fail "pacman guard stays quiet for non-sysupgrade pacman command"
+pass "pacman guard ignores non-system-upgrade transactions"
diff --git a/test/shell.d/weather-test.sh b/test/shell.d/weather-test.sh
new file mode 100644
index 00000000..889afa58
--- /dev/null
+++ b/test/shell.d/weather-test.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+run_node_test <<'JS'
+const weather = requireFromRoot('shell/plugins/panels/weather/Model.js')
+
+assertDeepEqual(
+  weather.parseWeatherStatus('{"text":"☀","class":"sunny"}'),
+  { label: '☀', klass: 'sunny' },
+  'weather parses pill status JSON'
+)
+assertDeepEqual(weather.parseWeatherStatus('{'), { label: '', klass: '' }, 'weather handles invalid pill status JSON')
+
+assertEqual(weather.roundedTemp('21.6'), '22', 'weather rounds temperatures')
+assertEqual(weather.roundedTemp('nope'), '', 'weather ignores invalid temperatures')
+assertEqual(weather.formatTemp(72, true), '72°F', 'weather formats imperial temperatures')
+assertEqual(weather.formatTemp(22, false), '22°C', 'weather formats metric temperatures')
+assertEqual(weather.dayName('2026-05-25'), 'Monday', 'weather derives day names')
+
+const openMeteo = {
+  daily: {
+    time: ['2026-05-25', '2026-05-26', '2026-05-27', '2026-05-28', '2026-05-29'],
+    temperature_2m_max: [20.1, 21.6, 18.2, 17.9, 22.4],
+    temperature_2m_min: [12.2, 13.1, 10.8, 9.2, 11.5],
+    weather_code: [0, 63, 95, 3, 1]
+  }
+}
+
+assertDeepEqual(
+  weather.openMeteoForecastDays(openMeteo, '2026-05-25').map(day => ({
+    date: day.date,
+    maxtempC: day.maxtempC,
+    mintempF: day.mintempF,
+    code: day.openMeteoWeatherCode
+  })),
+  [
+    { date: '2026-05-26', maxtempC: '22', mintempF: '56', code: 63 },
+    { date: '2026-05-27', maxtempC: '18', mintempF: '51', code: 95 },
+    { date: '2026-05-28', maxtempC: '18', mintempF: '49', code: 3 }
+  ],
+  'weather builds future Open-Meteo forecast days'
+)
+
+const wttr = {
+  weather: [
+    { date: '2026-05-25', maxtempC: '20', mintempC: '12' },
+    { date: '2026-05-26', maxtempC: '22', mintempC: '13' }
+  ]
+}
+assertEqual(weather.buildForecastDays(wttr, {}, '2026-05-25')[0].date, '2026-05-26', 'weather falls back to wttr forecast')
+assertEqual(weather.bareTempForDay({ maxtempC: '22', mintempC: '13', maxtempF: '72', mintempF: '55' }, 'max', false), '22°', 'weather formats forecast metric highs')
+assertEqual(weather.bareTempForDay({ maxtempC: '22', mintempC: '13', maxtempF: '72', mintempF: '55' }, 'min', true), '55°', 'weather formats forecast imperial lows')
+
+assert(weather.dayIcon({ openMeteoWeatherCode: 95 }).length > 0, 'weather maps Open-Meteo weather icons')
+assertEqual(
+  weather.dayIcon({ hourly: [{ time: '900', weatherCode: 113 }, { time: '1200', weatherCode: 389 }, { time: '1800', weatherCode: 116 }] }),
+  weather.iconForCode(389, false),
+  'weather picks hourly forecast icon nearest noon'
+)
+JS
diff --git a/themes/catppuccin-latte/btop.theme b/themes/catppuccin-latte/btop.theme
deleted file mode 100644
index 87ed1817..00000000
--- a/themes/catppuccin-latte/btop.theme
+++ /dev/null
@@ -1,84 +0,0 @@
-# https://github.com/catppuccin/btop/blob/main/themes/catppuccin_latte.theme
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#eff1f5"
-
-# Main text color
-theme[main_fg]="#4c4f69"
-
-# Title color for boxes
-theme[title]="#4c4f69"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#1e66f5"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#bcc0cc"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#1e66f5"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#8c8fa1"
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#dc8a78"
-
-# Background color of the percentage meters
-theme[meter_bg]="#bcc0cc"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#dc8a78"
-
-# CPU, Memory, Network, Proc box outline colors
-theme[cpu_box]="#8839ef" #Mauve
-theme[mem_box]="#40a02b" #Green
-theme[net_box]="#e64553" #Maroon
-theme[proc_box]="#1e66f5" #Blue
-
-# Box divider line and small boxes line color
-theme[div_line]="#9ca0b0"
-
-# Temperature graph color (Green -> Yellow -> Red)
-theme[temp_start]="#40a02b"
-theme[temp_mid]="#df8e1d"
-theme[temp_end]="#d20f39"
-
-# CPU graph colors (Teal -> Lavender)
-theme[cpu_start]="#179299"
-theme[cpu_mid]="#209fb5"
-theme[cpu_end]="#7287fd"
-
-# Mem/Disk free meter (Mauve -> Lavender -> Blue)
-theme[free_start]="#8839ef"
-theme[free_mid]="#7287fd"
-theme[free_end]="#1e66f5"
-
-# Mem/Disk cached meter (Sapphire -> Lavender)
-theme[cached_start]="#209fb5"
-theme[cached_mid]="#1e66f5"
-theme[cached_end]="#7287fd"
-
-# Mem/Disk available meter (Peach -> Red)
-theme[available_start]="#fe640b"
-theme[available_mid]="#e64553"
-theme[available_end]="#d20f39"
-
-# Mem/Disk used meter (Green -> Sky)
-theme[used_start]="#40a02b"
-theme[used_mid]="#179299"
-theme[used_end]="#04a5e5"
-
-# Download graph colors (Peach -> Red)
-theme[download_start]="#fe640b"
-theme[download_mid]="#e64553"
-theme[download_end]="#d20f39"
-
-# Upload graph colors (Green -> Sky)
-theme[upload_start]="#40a02b"
-theme[upload_mid]="#179299"
-theme[upload_end]="#04a5e5"
-
-# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
-theme[process_start]="#209fb5"
-theme[process_mid]="#7287fd"
-theme[process_end]="#8839ef"
diff --git a/themes/catppuccin-latte/colors.toml b/themes/catppuccin-latte/colors.toml
index 87c37d4a..f126fd56 100644
--- a/themes/catppuccin-latte/colors.toml
+++ b/themes/catppuccin-latte/colors.toml
@@ -1,3 +1,5 @@
+mode = "light"
+
 accent = "#1e66f5"
 cursor = "#dc8a78"
 foreground = "#4c4f69"
@@ -5,19 +7,28 @@ background = "#eff1f5"
 selection_foreground = "#eff1f5"
 selection_background = "#dc8a78"
 
-color0 = "#bcc0cc"
-color1 = "#d20f39"
-color2 = "#40a02b"
-color3 = "#df8e1d"
-color4 = "#1e66f5"
-color5 = "#ea76cb"
-color6 = "#179299"
-color7 = "#5c5f77"
-color8 = "#acb0be"
-color9 = "#d20f39"
-color10 = "#40a02b"
-color11 = "#df8e1d"
-color12 = "#1e66f5"
-color13 = "#ea76cb"
-color14 = "#179299"
-color15 = "#6c6f85"
+bg = "#eff1f5"
+lighter_bg = "#dce0e8"
+selection = "#ccd0da"
+muted = "#acb0be"
+dark_fg = "#9ca0b0"
+fg = "#8c8fa1"
+light_fg = "#5c5f77"
+bright_fg = "#4c4f69"
+
+red = "#d20f39"
+yellow = "#df8e1d"
+orange = "#d84e2b"
+green = "#40a02b"
+cyan = "#179299"
+blue = "#1e66f5"
+magenta = "#ea76cb"
+brown = "#6c2715"
+dark_bg = "#e3e4e8"
+darker_bg = "#d7d8dc"
+bright_red = "#d20f39"
+bright_yellow = "#df8e1d"
+bright_green = "#40a02b"
+bright_cyan = "#179299"
+bright_blue = "#1e66f5"
+bright_magenta = "#ea76cb"
\ No newline at end of file
diff --git a/themes/catppuccin-latte/light.mode b/themes/catppuccin-latte/light.mode
deleted file mode 100644
index 66bb2d04..00000000
--- a/themes/catppuccin-latte/light.mode
+++ /dev/null
@@ -1 +0,0 @@
-# This will set "prefer-light" and use "Adwaita" as the theme
diff --git a/themes/catppuccin/btop.theme b/themes/catppuccin/btop.theme
deleted file mode 100644
index f0395b35..00000000
--- a/themes/catppuccin/btop.theme
+++ /dev/null
@@ -1,83 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#1E1E2E"
-
-# Main text color
-theme[main_fg]="#c6d0f5"
-
-# Title color for boxes
-theme[title]="#c6d0f5"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#8caaee"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#51576d"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#8caaee"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#838ba7"
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#f2d5cf"
-
-# Background color of the percentage meters
-theme[meter_bg]="#51576d"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#f2d5cf"
-
-# CPU, Memory, Network, Proc box outline colors
-theme[cpu_box]="#ca9ee6" #Mauve
-theme[mem_box]="#a6d189" #Green
-theme[net_box]="#ea999c" #Maroon
-theme[proc_box]="#8caaee" #Blue
-
-# Box divider line and small boxes line color
-theme[div_line]="#737994"
-
-# Temperature graph color (Green -> Yellow -> Red)
-theme[temp_start]="#a6d189"
-theme[temp_mid]="#e5c890"
-theme[temp_end]="#e78284"
-
-# CPU graph colors (Teal -> Lavender)
-theme[cpu_start]="#81c8be"
-theme[cpu_mid]="#85c1dc"
-theme[cpu_end]="#babbf1"
-
-# Mem/Disk free meter (Mauve -> Lavender -> Blue)
-theme[free_start]="#ca9ee6"
-theme[free_mid]="#babbf1"
-theme[free_end]="#8caaee"
-
-# Mem/Disk cached meter (Sapphire -> Lavender)
-theme[cached_start]="#85c1dc"
-theme[cached_mid]="#8caaee"
-theme[cached_end]="#babbf1"
-
-# Mem/Disk available meter (Peach -> Red)
-theme[available_start]="#ef9f76"
-theme[available_mid]="#ea999c"
-theme[available_end]="#e78284"
-
-# Mem/Disk used meter (Green -> Sky)
-theme[used_start]="#a6d189"
-theme[used_mid]="#81c8be"
-theme[used_end]="#99d1db"
-
-# Download graph colors (Peach -> Red)
-theme[download_start]="#ef9f76"
-theme[download_mid]="#ea999c"
-theme[download_end]="#e78284"
-
-# Upload graph colors (Green -> Sky)
-theme[upload_start]="#a6d189"
-theme[upload_mid]="#81c8be"
-theme[upload_end]="#99d1db"
-
-# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
-theme[process_start]="#85c1dc"
-theme[process_mid]="#babbf1"
-theme[process_end]="#ca9ee6"
diff --git a/themes/catppuccin/colors.toml b/themes/catppuccin/colors.toml
index 6943ef1f..54520347 100644
--- a/themes/catppuccin/colors.toml
+++ b/themes/catppuccin/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 accent = "#89b4fa"
 cursor = "#f5e0dc"
 foreground = "#cdd6f4"
@@ -5,19 +7,28 @@ background = "#1e1e2e"
 selection_foreground = "#1e1e2e"
 selection_background = "#f5e0dc"
 
-color0 = "#45475a"
-color1 = "#f38ba8"
-color2 = "#a6e3a1"
-color3 = "#f9e2af"
-color4 = "#89b4fa"
-color5 = "#f5c2e7"
-color6 = "#94e2d5"
-color7 = "#bac2de"
-color8 = "#585b70"
-color9 = "#f38ba8"
-color10 = "#a6e3a1"
-color11 = "#f9e2af"
-color12 = "#89b4fa"
-color13 = "#f5c2e7"
-color14 = "#94e2d5"
-color15 = "#a6adc8"
+bg = "#1e1e2e"
+lighter_bg = "#313244"
+selection = "#45475a"
+muted = "#585b70"
+dark_fg = "#6c7086"
+fg = "#9399b2"
+light_fg = "#bac2de"
+bright_fg = "#cdd6f4"
+
+red = "#f38ba8"
+yellow = "#f9e2af"
+orange = "#f6b6ab"
+green = "#a6e3a1"
+cyan = "#94e2d5"
+blue = "#89b4fa"
+magenta = "#f5c2e7"
+brown = "#7b5b55"
+dark_bg = "#161622"
+darker_bg = "#101019"
+bright_red = "#f38ba8"
+bright_yellow = "#f9e2af"
+bright_green = "#a6e3a1"
+bright_cyan = "#94e2d5"
+bright_blue = "#89b4fa"
+bright_magenta = "#f5c2e7"
\ No newline at end of file
diff --git a/themes/ethereal/btop.theme b/themes/ethereal/btop.theme
deleted file mode 100644
index 135da3db..00000000
--- a/themes/ethereal/btop.theme
+++ /dev/null
@@ -1,70 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#060B1E"
-
-# Main text color
-theme[main_fg]="#ffcead"
-
-# Title color for boxes
-theme[title]="#c89dc1"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#a3bfd1"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#6d7db6"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#ffcead"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#6d7db6"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#c89dc1"
-
-# Box outline and divider line color
-theme[cpu_box]="#92a593"
-theme[mem_box]="#92a593"
-theme[net_box]="#92a593"
-theme[proc_box]="#92a593"
-theme[div_line]="#6d7db6"
-
-# Gradient for all meters and graphs
-theme[temp_start]="#a3bfd1"
-theme[temp_mid]="#7d82d9"
-theme[temp_end]="#92a593"
-
-
-theme[cpu_start]="#a3bfd1"
-theme[cpu_mid]="#7d82d9"
-theme[cpu_end]="#92a593"
-
-
-theme[free_start]="#7d82d9"
-theme[free_mid]="#E9BB4F"
-theme[free_end]="#E9BB4F"
-
-
-theme[cached_start]="#E9BB4F"
-theme[cached_mid]="#E9BB4F"
-theme[cached_end]="#E9BB4F"
-
-
-theme[available_start]="#a3bfd1"
-theme[available_mid]="#a3bfd1"
-theme[available_end]="#a3bfd1"
-
-
-theme[used_start]="#92a593"
-theme[used_mid]="#92a593"
-theme[used_end]="#92a593"
-
-
-theme[download_start]="#E9BB4F"
-theme[download_mid]="#a3bfd1"
-theme[download_end]="#7d82d9"
-
-
-theme[upload_start]="#E9BB4F"
-theme[upload_mid]="#a3bfd1"
-theme[upload_end]="#7d82d9"
\ No newline at end of file
diff --git a/themes/ethereal/colors.toml b/themes/ethereal/colors.toml
index dbce1ae4..e515b85c 100644
--- a/themes/ethereal/colors.toml
+++ b/themes/ethereal/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 accent = "#7d82d9"
 cursor = "#ffcead"
 foreground = "#ffcead"
@@ -5,19 +7,28 @@ background = "#060B1E"
 selection_foreground = "#060B1E"
 selection_background = "#ffcead"
 
-color0 = "#3C486D"
-color1 = "#ED5B5A"
-color2 = "#92a593"
-color3 = "#E9BB4F"
-color4 = "#7d82d9"
-color5 = "#c89dc1"
-color6 = "#a3bfd1"
-color7 = "#F99957"
-color8 = "#6d7db6"
-color9 = "#faaaa9"
-color10 = "#c4cfc4"
-color11 = "#f7dc9c"
-color12 = "#c2c4f0"
-color13 = "#ead7e7"
-color14 = "#dfeaf0"
-color15 = "#ffcead"
+bg = "#060B1E"
+lighter_bg = "#131a3a"
+selection = "#252e56"
+muted = "#3d4573"
+dark_fg = "#6d7db6"
+fg = "#9a96a8"
+light_fg = "#c9b8a6"
+bright_fg = "#ffcead"
+
+red = "#ED5B5A"
+yellow = "#E9BB4F"
+orange = "#eb8b54"
+green = "#92a593"
+cyan = "#a3bfd1"
+blue = "#7d82d9"
+magenta = "#c89dc1"
+brown = "#75452a"
+dark_bg = "#040816"
+darker_bg = "#030610"
+bright_red = "#faaaa9"
+bright_yellow = "#f7dc9c"
+bright_green = "#c4cfc4"
+bright_cyan = "#dfeaf0"
+bright_blue = "#c2c4f0"
+bright_magenta = "#ead7e7"
\ No newline at end of file
diff --git a/themes/everforest/btop.theme b/themes/everforest/btop.theme
deleted file mode 100644
index 2ad33bbe..00000000
--- a/themes/everforest/btop.theme
+++ /dev/null
@@ -1,92 +0,0 @@
-# All graphs and meters can be gradients
-# For single color graphs leave "mid" and "end" variable empty.
-# Use "start" and "end" variables for two color gradient
-# Use "start", "mid" and "end" for three color gradient
-
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#2d353b"
-
-# Main text color
-theme[main_fg]="#d3c6aa"
-
-# Title color for boxes
-theme[title]="#d3c6aa"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#e67e80"
-
-# Background color of selected items
-theme[selected_bg]="#3d484d"
-
-# Foreground color of selected items
-theme[selected_fg]="#dbbc7f"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#2d353b"
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#d3c6aa"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#a7c080"
-
-# Cpu box outline color
-theme[cpu_box]="#3d484d"
-
-# Memory/disks box outline color
-theme[mem_box]="#3d484d"
-
-# Net up/down box outline color
-theme[net_box]="#3d484d"
-
-# Processes box outline color
-theme[proc_box]="#3d484d"
-
-# Box divider line and small boxes line color
-theme[div_line]="#3d484d"
-
-# Temperature graph colors
-theme[temp_start]="#a7c080"
-theme[temp_mid]="#dbbc7f"
-theme[temp_end]="#f85552"
-
-# CPU graph colors
-theme[cpu_start]="#a7c080"
-theme[cpu_mid]="#dbbc7f"
-theme[cpu_end]="#f85552"
-
-# Mem/Disk free meter
-theme[free_start]="#f85552"
-theme[free_mid]="#dbbc7f"
-theme[free_end]="#a7c080"
-
-# Mem/Disk cached meter
-theme[cached_start]="#7fbbb3"
-theme[cached_mid]="#83c092"
-theme[cached_end]="#a7c080"
-
-# Mem/Disk available meter
-theme[available_start]="#f85552"
-theme[available_mid]="#dbbc7f"
-theme[available_end]="#a7c080"
-
-# Mem/Disk used meter
-theme[used_start]="#a7c080"
-theme[used_mid]="#dbbc7f"
-theme[used_end]="#f85552"
-
-# Download graph colors
-theme[download_start]="#a7c080"
-theme[download_mid]="#83c092"
-theme[download_end]="#7fbbb3"
-
-# Upload graph colors
-theme[upload_start]="#dbbc7f"
-theme[upload_mid]="#e69875"
-theme[upload_end]="#e67e80"
-
-# Process box color gradient for threads, mem and cpu usage
-theme[process_start]="#a7c080"
-theme[process_mid]="#e67e80"
-theme[process_end]="#f85552"
-
diff --git a/themes/everforest/colors.toml b/themes/everforest/colors.toml
index 9aaeeb5a..7a5fb444 100644
--- a/themes/everforest/colors.toml
+++ b/themes/everforest/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 accent = "#7fbbb3"
 cursor = "#d3c6aa"
 foreground = "#d3c6aa"
@@ -5,19 +7,28 @@ background = "#2d353b"
 selection_foreground = "#2d353b"
 selection_background = "#d3c6aa"
 
-color0 = "#475258"
-color1 = "#e67e80"
-color2 = "#a7c080"
-color3 = "#dbbc7f"
-color4 = "#7fbbb3"
-color5 = "#d699b6"
-color6 = "#83c092"
-color7 = "#d3c6aa"
-color8 = "#475258"
-color9 = "#e67e80"
-color10 = "#a7c080"
-color11 = "#dbbc7f"
-color12 = "#7fbbb3"
-color13 = "#d699b6"
-color14 = "#83c092"
-color15 = "#d3c6aa"
+bg = "#2d353b"
+lighter_bg = "#343f44"
+selection = "#3d484d"
+muted = "#475258"
+dark_fg = "#4f585e"
+fg = "#7a8478"
+light_fg = "#9da9a0"
+bright_fg = "#d3c6aa"
+
+red = "#e67e80"
+yellow = "#dbbc7f"
+orange = "#e09d7f"
+green = "#a7c080"
+cyan = "#83c092"
+blue = "#7fbbb3"
+magenta = "#d699b6"
+brown = "#704e3f"
+dark_bg = "#21272c"
+darker_bg = "#181d20"
+bright_red = "#e67e80"
+bright_yellow = "#dbbc7f"
+bright_green = "#a7c080"
+bright_cyan = "#83c092"
+bright_blue = "#7fbbb3"
+bright_magenta = "#d699b6"
\ No newline at end of file
diff --git a/themes/flexoki-light/btop.theme b/themes/flexoki-light/btop.theme
deleted file mode 100644
index 0caf9c65..00000000
--- a/themes/flexoki-light/btop.theme
+++ /dev/null
@@ -1,78 +0,0 @@
-# Main bg
-theme[main_bg]="#FFFCF0"
-
-# Main text color
-theme[main_fg]="#100F0F"
-
-# Title color for boxes
-theme[title]="#100F0F"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#205EA6"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#414868"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#100F0F"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#6F6E69"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#205EA6"
-
-# Cpu box outline color
-theme[cpu_box]="#6F6E69"
-
-# Memory/disks box outline color
-theme[mem_box]="#6F6E69"
-
-# Net up/down box outline color
-theme[net_box]="#6F6E69"
-
-# Processes box outline color
-theme[proc_box]="#6F6E69"
-
-# Box divider line and small boxes line color
-theme[div_line]="#6F6E69"
-
-# Temperature graph colors
-theme[temp_start]="#66800B"
-theme[temp_mid]="#BC5215"
-theme[temp_end]="#AF3029"
-
-# CPU graph colors
-theme[cpu_start]="#66800B"
-theme[cpu_mid]="#BC5215"
-theme[cpu_end]="#AF3029"
-
-# Mem/Disk free meter
-theme[free_start]="#66800B"
-theme[free_mid]="#BC5215"
-theme[free_end]="#AF3029"
-
-# Mem/Disk cached meter
-theme[cached_start]="#66800B"
-theme[cached_mid]="#BC5215"
-theme[cached_end]="#AF3029"
-
-# Mem/Disk available meter
-theme[available_start]="#66800B"
-theme[available_mid]="#BC5215"
-theme[available_end]="#AF3029"
-
-# Mem/Disk used meter
-theme[used_start]="#66800B"
-theme[used_mid]="#BC5215"
-theme[used_end]="#AF3029"
-
-# Download graph colors
-theme[download_start]="#66800B"
-theme[download_mid]="#BC5215"
-theme[download_end]="#AF3029"
-
-# Upload graph colors
-theme[upload_start]="#66800B"
-theme[upload_mid]="#BC5215"
-theme[upload_end]="#AF3029"
diff --git a/themes/flexoki-light/colors.toml b/themes/flexoki-light/colors.toml
index 1e3b8860..192dc824 100644
--- a/themes/flexoki-light/colors.toml
+++ b/themes/flexoki-light/colors.toml
@@ -1,3 +1,5 @@
+mode = "light"
+
 accent = "#205EA6"
 cursor = "#100F0F"
 foreground = "#100F0F"
@@ -5,19 +7,28 @@ background = "#FFFCF0"
 selection_foreground = "#100F0F"
 selection_background = "#CECDC3"
 
-color0 = "#DAD8CE"
-color1 = "#D14D41"
-color2 = "#879A39"
-color3 = "#D0A215"
-color4 = "#205EA6"
-color5 = "#CE5D97"
-color6 = "#3AA99F"
-color7 = "#B7B5AC"
-color8 = "#100F0F"
-color9 = "#D14D41"
-color10 = "#879A39"
-color11 = "#D0A215"
-color12 = "#4385BE"
-color13 = "#CE5D97"
-color14 = "#3AA99F"
-color15 = "#CECDC3"
+bg = "#FFFCF0"
+lighter_bg = "#E6E4D9"
+selection = "#CECDC3"
+muted = "#B7B5AC"
+dark_fg = "#878580"
+fg = "#6F6E69"
+light_fg = "#403E3C"
+bright_fg = "#100F0F"
+
+red = "#D14D41"
+yellow = "#D0A215"
+orange = "#d0772b"
+green = "#879A39"
+cyan = "#3AA99F"
+blue = "#205EA6"
+magenta = "#CE5D97"
+brown = "#683b15"
+dark_bg = "#f2efe4"
+darker_bg = "#e5e2d8"
+bright_red = "#D14D41"
+bright_yellow = "#D0A215"
+bright_green = "#879A39"
+bright_cyan = "#3AA99F"
+bright_blue = "#4385BE"
+bright_magenta = "#CE5D97"
\ No newline at end of file
diff --git a/themes/flexoki-light/light.mode b/themes/flexoki-light/light.mode
deleted file mode 100644
index e65461b9..00000000
--- a/themes/flexoki-light/light.mode
+++ /dev/null
@@ -1 +0,0 @@
-# This will set "prefer-light" and use "Adwaita" as the theme
\ No newline at end of file
diff --git a/themes/gruvbox/btop.theme b/themes/gruvbox/btop.theme
deleted file mode 100644
index 05849545..00000000
--- a/themes/gruvbox/btop.theme
+++ /dev/null
@@ -1,92 +0,0 @@
-#Bashtop gruvbox (https://github.com/morhetz/gruvbox) theme
-#by BachoSeven
-
-# Colors should be in 6 or 2 character hexadecimal or single spaced rgb decimal: "#RRGGBB", "#BW" or "0-255 0-255 0-255"
-# example for white: "#FFFFFF", "#ff" or "255 255 255".
-
-# All graphs and meters can be gradients
-# For single color graphs leave "mid" and "end" variable empty.
-# Use "start" and "end" variables for two color gradient
-# Use "start", "mid" and "end" for three color gradient
-
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#282828"
-
-# Main text color
-theme[main_fg]="#a89984"
-
-# Title color for boxes
-theme[title]="#ebdbb2"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#d79921"
-
-# Background color of selected items
-theme[selected_bg]="#282828"
-
-# Foreground color of selected items
-theme[selected_fg]="#fabd2f"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#282828"
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#585858"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#98971a"
-
-# Cpu box outline color
-theme[cpu_box]="#a89984"
-
-# Memory/disks box outline color
-theme[mem_box]="#a89984"
-
-# Net up/down box outline color
-theme[net_box]="#a89984"
-
-# Processes box outline color
-theme[proc_box]="#a89984"
-
-# Box divider line and small boxes line color
-theme[div_line]="#a89984"
-
-# Temperature graph colors
-theme[temp_start]="#458588"
-theme[temp_mid]="#d3869b"
-theme[temp_end]="#fb4394"
-
-# CPU graph colors
-theme[cpu_start]="#b8bb26"
-theme[cpu_mid]="#d79921"
-theme[cpu_end]="#fb4934"
-
-# Mem/Disk free meter
-theme[free_start]="#4e5900"
-theme[free_mid]=""
-theme[free_end]="#98971a"
-
-# Mem/Disk cached meter
-theme[cached_start]="#458588"
-theme[cached_mid]=""
-theme[cached_end]="#83a598"
-
-# Mem/Disk available meter
-theme[available_start]="#d79921"
-theme[available_mid]=""
-theme[available_end]="#fabd2f"
-
-# Mem/Disk used meter
-theme[used_start]="#cc241d"
-theme[used_mid]=""
-theme[used_end]="#fb4934"
-
-# Download graph colors
-theme[download_start]="#3d4070"
-theme[download_mid]="#6c71c4"
-theme[download_end]="#a3a8f7"
-
-# Upload graph colors
-theme[upload_start]="#701c45"
-theme[upload_mid]="#b16286"
-theme[upload_end]="#d3869b"
diff --git a/themes/gruvbox/colors.toml b/themes/gruvbox/colors.toml
index 57847f0a..2b71c62b 100644
--- a/themes/gruvbox/colors.toml
+++ b/themes/gruvbox/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 accent = "#7daea3"
 cursor = "#bdae93"
 foreground = "#d4be98"
@@ -5,19 +7,28 @@ background = "#282828"
 selection_foreground = "#ebdbb2"
 selection_background = "#d65d0e"
 
-color0 = "#3c3836"
-color1 = "#ea6962"
-color2 = "#a9b665"
-color3 = "#d8a657"
-color4 = "#7daea3"
-color5 = "#d3869b"
-color6 = "#89b482"
-color7 = "#d4be98"
-color8 = "#3c3836"
-color9 = "#ea6962"
-color10 = "#a9b665"
-color11 = "#d8a657"
-color12 = "#7daea3"
-color13 = "#d3869b"
-color14 = "#89b482"
-color15 = "#d4be98"
+bg = "#282828"
+lighter_bg = "#3c3836"
+selection = "#504945"
+muted = "#665c54"
+dark_fg = "#7c6f64"
+fg = "#a89984"
+light_fg = "#bdae93"
+bright_fg = "#d4be98"
+
+red = "#ea6962"
+yellow = "#d8a657"
+orange = "#e1875c"
+green = "#a9b665"
+cyan = "#89b482"
+blue = "#7daea3"
+magenta = "#d3869b"
+brown = "#70432e"
+dark_bg = "#1e1e1e"
+darker_bg = "#161616"
+bright_red = "#ea6962"
+bright_yellow = "#d8a657"
+bright_green = "#a9b665"
+bright_cyan = "#89b482"
+bright_blue = "#7daea3"
+bright_magenta = "#d3869b"
\ No newline at end of file
diff --git a/themes/hackerman/btop.theme b/themes/hackerman/btop.theme
deleted file mode 100644
index 76091891..00000000
--- a/themes/hackerman/btop.theme
+++ /dev/null
@@ -1,70 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#0B0C16"
-
-# Main text color
-theme[main_fg]="#ddf7ff"
-
-# Title color for boxes
-theme[title]="#86a7df"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#7cf8f7"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#6a6e95"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#ddf7ff"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#6a6e95"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#86a7df"
-
-# Box outline and divider line color
-theme[cpu_box]="#4fe88f"
-theme[mem_box]="#4fe88f"
-theme[net_box]="#4fe88f"
-theme[proc_box]="#4fe88f"
-theme[div_line]="#6a6e95"
-
-# Gradient for all meters and graphs
-theme[temp_start]="#7cf8f7"
-theme[temp_mid]="#829dd4"
-theme[temp_end]="#4fe88f"
-
-
-theme[cpu_start]="#7cf8f7"
-theme[cpu_mid]="#829dd4"
-theme[cpu_end]="#4fe88f"
-
-
-theme[free_start]="#829dd4"
-theme[free_mid]="#50f7d4"
-theme[free_end]="#50f7d4"
-
-
-theme[cached_start]="#50f7d4"
-theme[cached_mid]="#50f7d4"
-theme[cached_end]="#50f7d4"
-
-
-theme[available_start]="#7cf8f7"
-theme[available_mid]="#7cf8f7"
-theme[available_end]="#7cf8f7"
-
-
-theme[used_start]="#4fe88f"
-theme[used_mid]="#4fe88f"
-theme[used_end]="#4fe88f"
-
-
-theme[download_start]="#50f7d4"
-theme[download_mid]="#7cf8f7"
-theme[download_end]="#829dd4"
-
-
-theme[upload_start]="#50f7d4"
-theme[upload_mid]="#7cf8f7"
-theme[upload_end]="#829dd4"
\ No newline at end of file
diff --git a/themes/hackerman/colors.toml b/themes/hackerman/colors.toml
index 517ff366..00b449ed 100644
--- a/themes/hackerman/colors.toml
+++ b/themes/hackerman/colors.toml
@@ -1,23 +1,35 @@
+mode = "dark"
+
 accent = "#82FB9C"
+hyprland_active_border = "rgba(26a269ee) rgba(2ec27eee) 45deg"
 cursor = "#ddf7ff"
 foreground = "#ddf7ff"
 background = "#0B0C16"
 selection_foreground = "#0B0C16"
 selection_background = "#ddf7ff"
 
-color0 = "#3E4058"
-color1 = "#50f872"
-color2 = "#4fe88f"
-color3 = "#50f7d4"
-color4 = "#829dd4"
-color5 = "#86a7df"
-color6 = "#7cf8f7"
-color7 = "#85E1FB"
-color8 = "#6a6e95"
-color9 = "#85ff9d"
-color10 = "#9cf7c2"
-color11 = "#a4ffec"
-color12 = "#c4d2ed"
-color13 = "#cddbf4"
-color14 = "#d1fffe"
-color15 = "#ddf7ff"
+bg = "#0B0C16"
+lighter_bg = "#151828"
+selection = "#1f253a"
+muted = "#2d3450"
+dark_fg = "#6a6e95"
+fg = "#8e95b8"
+light_fg = "#b5c5db"
+bright_fg = "#ddf7ff"
+
+red = "#50f872"
+yellow = "#50f7d4"
+orange = "#50f7a3"
+green = "#4fe88f"
+cyan = "#7cf8f7"
+blue = "#829dd4"
+magenta = "#86a7df"
+brown = "#287b51"
+dark_bg = "#080910"
+darker_bg = "#06060c"
+bright_red = "#85ff9d"
+bright_yellow = "#a4ffec"
+bright_green = "#9cf7c2"
+bright_cyan = "#d1fffe"
+bright_blue = "#c4d2ed"
+bright_magenta = "#cddbf4"
\ No newline at end of file
diff --git a/themes/kanagawa/btop.theme b/themes/kanagawa/btop.theme
deleted file mode 100644
index 5202748d..00000000
--- a/themes/kanagawa/btop.theme
+++ /dev/null
@@ -1,86 +0,0 @@
-# Bashtop Kanagawa-wave (https://github.com/rebelot/kanagawa.nvim) theme
-# By: philikarus
-
-# Main bg
-theme[main_bg]="#1f1f28"
-
-# Main text color
-theme[main_fg]="#dcd7ba"
-
-# Title color for boxes
-theme[title]="#dcd7ba"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#C34043"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#223249"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#dca561"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#727169"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#7aa89f"
-
-# Cpu box outline color
-theme[cpu_box]="#727169"
-
-# Memory/disks box outline color
-theme[mem_box]="#727169"
-
-# Net up/down box outline color
-theme[net_box]="#727169"
-
-# Processes box outline color
-theme[proc_box]="#727169"
-
-# Box divider line and small boxes line color
-theme[div_line]="#727169"
-
-# Temperature graph colors
-theme[temp_start]="#98BB6C"
-theme[temp_mid]="#DCA561"
-theme[temp_end]="#E82424"
-
-# CPU graph colors
-theme[cpu_start]="#98BB6C"
-theme[cpu_mid]="#DCA561"
-theme[cpu_end]="#E82424"
-
-# Mem/Disk free meter
-theme[free_start]="#E82424"
-theme[free_mid]="#C34043"
-theme[free_end]="#FF5D62"
-
-# Mem/Disk cached meter
-theme[cached_start]="#C0A36E"
-theme[cached_mid]="#DCA561"
-theme[cached_end]="#FF9E3B"
-
-# Mem/Disk available meter
-theme[available_start]="#938AA9"
-theme[available_mid]="#957FBB"
-theme[available_end]="#9CABCA"
-
-# Mem/Disk used meter
-theme[used_start]="#658594"
-theme[used_mid]="#7E9CDB"
-theme[used_end]="#7FB4CA"
-
-# Download graph colors
-theme[download_start]="#7E9CDB"
-theme[download_mid]="#938AA9"
-theme[download_end]="#957FBB"
-
-# Upload graph colors
-theme[upload_start]="#DCA561"
-theme[upload_mid]="#E6C384"
-theme[upload_end]="#E82424"
-
-# Process box color gradient for threads, mem and cpu usage
-theme[process_start]="#98BB6C"
-theme[process_mid]="#DCA561"
-theme[process_end]="#C34043"
diff --git a/themes/kanagawa/colors.toml b/themes/kanagawa/colors.toml
index 7ca002ee..bedebb6e 100644
--- a/themes/kanagawa/colors.toml
+++ b/themes/kanagawa/colors.toml
@@ -1,23 +1,34 @@
-accent = "#7e9cd8"
+mode = "dark"
+
+accent = "#dcd7ba"
 cursor = "#c8c093"
 foreground = "#dcd7ba"
 background = "#1f1f28"
 selection_foreground = "#c8c093"
 selection_background = "#2d4f67"
 
-color0 = "#090618"
-color1 = "#c34043"
-color2 = "#76946a"
-color3 = "#c0a36e"
-color4 = "#7e9cd8"
-color5 = "#957fb8"
-color6 = "#6a9589"
-color7 = "#c8c093"
-color8 = "#727169"
-color9 = "#e82424"
-color10 = "#98bb6c"
-color11 = "#e6c384"
-color12 = "#7fb4ca"
-color13 = "#938aa9"
-color14 = "#7aa89f"
-color15 = "#dcd7ba"
+bg = "#1f1f28"
+lighter_bg = "#223249"
+selection = "#363646"
+muted = "#54546D"
+dark_fg = "#727169"
+fg = "#938aa9"
+light_fg = "#c8c093"
+bright_fg = "#dcd7ba"
+
+red = "#c34043"
+yellow = "#c0a36e"
+orange = "#c17158"
+green = "#76946a"
+cyan = "#6a9589"
+blue = "#7e9cd8"
+magenta = "#957fb8"
+brown = "#60382c"
+dark_bg = "#17171e"
+darker_bg = "#111116"
+bright_red = "#e82424"
+bright_yellow = "#e6c384"
+bright_green = "#98bb6c"
+bright_cyan = "#7aa89f"
+bright_blue = "#7fb4ca"
+bright_magenta = "#938aa9"
\ No newline at end of file
diff --git a/themes/kanagawa/hyprland.conf b/themes/kanagawa/hyprland.conf
deleted file mode 100644
index 0ee92cac..00000000
--- a/themes/kanagawa/hyprland.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-$activeBorderColor = rgb(dcd7ba)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
-
-# Kanagawa backdrop is too strong for detault opacity
-windowrule = opacity 0.98 0.95, match:tag terminal
diff --git a/themes/kanagawa/hyprland.lua b/themes/kanagawa/hyprland.lua
new file mode 100644
index 00000000..5b619e0c
--- /dev/null
+++ b/themes/kanagawa/hyprland.lua
@@ -0,0 +1,18 @@
+local active_border_color = "rgb(dcd7ba)"
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+    },
+  },
+
+  group = {
+    col = {
+      border_active = active_border_color,
+    },
+  },
+})
+
+-- Kanagawa backdrop is too strong for default opacity.
+o.window({ tag = "terminal" }, { opacity = "0.98 0.95" })
diff --git a/themes/last-horizon/backgrounds/1-eyes-wide.jpg b/themes/last-horizon/backgrounds/1-eyes-wide.jpg
new file mode 100644
index 00000000..0a9dcdd0
Binary files /dev/null and b/themes/last-horizon/backgrounds/1-eyes-wide.jpg differ
diff --git a/themes/last-horizon/backgrounds/2-blink.jpg b/themes/last-horizon/backgrounds/2-blink.jpg
new file mode 100644
index 00000000..1a474773
Binary files /dev/null and b/themes/last-horizon/backgrounds/2-blink.jpg differ
diff --git a/themes/last-horizon/backgrounds/3-bokeh.jpg b/themes/last-horizon/backgrounds/3-bokeh.jpg
new file mode 100644
index 00000000..c929e51f
Binary files /dev/null and b/themes/last-horizon/backgrounds/3-bokeh.jpg differ
diff --git a/themes/last-horizon/backgrounds/4-new-horizons.jpg b/themes/last-horizon/backgrounds/4-new-horizons.jpg
new file mode 100644
index 00000000..f3dca1eb
Binary files /dev/null and b/themes/last-horizon/backgrounds/4-new-horizons.jpg differ
diff --git a/themes/last-horizon/btop.theme b/themes/last-horizon/btop.theme
new file mode 100644
index 00000000..8ee3766b
--- /dev/null
+++ b/themes/last-horizon/btop.theme
@@ -0,0 +1,93 @@
+# Main background
+theme[main_bg]="#0c0b0c"
+
+# Main text color
+theme[main_fg]="#e2dddc"
+
+# Title color for boxes
+theme[title]="#b59790"
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#c4d8e2"
+
+# Background color of selected item in processes box
+theme[selected_bg]="#e2dddc"
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#0c0b0c"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#584e51"
+
+# Color of text appearing on top of graphs
+theme[graph_text]="#e2dddc"
+
+# Background color of the percentage meters
+theme[meter_bg]="#1e1d1e"
+
+# Misc colors for processes box
+theme[proc_misc]="#e2dddc"
+
+# CPU, Memory, Network, Proc box outline colors
+theme[cpu_box]="#584e51"
+theme[mem_box]="#584e51"
+theme[net_box]="#584e51"
+theme[proc_box]="#584e51"
+
+# Box divider line and small boxes line color
+theme[div_line]="#6B5E73"
+
+# Temperature graph color (Green -> Yellow -> Red)
+theme[temp_start]="#87a9b0"
+theme[temp_mid]="#6B5E73"
+theme[temp_end]="#c38b7b"
+
+# CPU graph colors (Blue -> Cyan -> Magenta)
+theme[cpu_start]="#b59790"
+theme[cpu_mid]="#a5a0b6"
+theme[cpu_end]="#c4d8e2"
+
+# Mem/Disk free meter (Reversed "Available" colors: Cyan -> Blue -> Purple)
+theme[free_start]="#c4d8e2"
+theme[free_mid]="#b59790"
+theme[free_end]="#6B5E73"
+
+# Mem/Disk cached meter
+theme[cached_start]="#b59790"
+theme[cached_mid]="#c4d8e2"
+theme[cached_end]="#e2dddc"
+
+# Mem/Disk available meter (Purple -> Blue -> Cyan)
+theme[available_start]="#6B5E73"
+theme[available_mid]="#b59790"
+theme[available_end]="#a5a0b6"
+
+# Mem/Disk used meter
+theme[used_start]="#c38b7b"
+theme[used_mid]="#6B5E73"
+theme[used_end]="#584e51"
+
+# Download graph colors
+theme[download_start]="#87a9b0"
+theme[download_mid]="#a5a0b6"
+theme[download_end]="#cfd3cd"
+
+# Upload graph colors
+theme[upload_start]="#b59790"
+theme[upload_mid]="#c4d8e2"
+theme[upload_end]="#e2dddc"
+
+# Process box color gradient
+theme[process_start]="#c4d8e2"
+theme[process_mid]="#a5a0b6"
+theme[process_end]="#c38b7b"
+
+# Graph gradient colors
+theme[gradient_color_0]="#0c0b0c"
+theme[gradient_color_1]="#584e51"
+theme[gradient_color_2]="#6B5E73"
+theme[gradient_color_3]="#c38b7b"
+theme[gradient_color_4]="#87a9b0"
+theme[gradient_color_5]="#b59790"
+theme[gradient_color_6]="#a5a0b6"
+theme[gradient_color_7]="#FAFCFB"
diff --git a/themes/last-horizon/chromium.theme b/themes/last-horizon/chromium.theme
new file mode 100644
index 00000000..717aa9ed
--- /dev/null
+++ b/themes/last-horizon/chromium.theme
@@ -0,0 +1 @@
+12,11,12
diff --git a/themes/last-horizon/colors.toml b/themes/last-horizon/colors.toml
new file mode 100644
index 00000000..1624df40
--- /dev/null
+++ b/themes/last-horizon/colors.toml
@@ -0,0 +1,41 @@
+mode = "dark"
+
+# Accent and UI colors
+accent = "#b59790"
+hyprland_active_border = "rgba(8a8588ee) rgba(e2dddcee)"
+hyprland_inactive_border = "rgba(584e51aa)"
+active_border_color = "#d6d3de"
+active_tab_background = "#a5a0b6"
+
+# Cursor colors
+cursor = "#e2dddc"
+
+# Primary colors
+foreground = "#FAFCFB"
+background = "#0c0b0c"
+
+# Selection colors
+selection_foreground = "#0c0b0c"
+selection_background = "#FAFCFB"
+
+bg = "#0c0b0c"
+lighter_bg = "#0c0b0c"
+selection = "#FAFCFB"
+muted = "#584e51"
+dark_fg = "#584e51"
+fg = "#FAFCFB"
+light_fg = "#cfd3cd"
+bright_fg = "#e2dddc"
+
+red = "#c38b7b"
+yellow = "#6B5E73"
+green = "#87a9b0"
+cyan = "#a5a0b6"
+blue = "#b59790"
+magenta = "#c4d8e2"
+bright_red = "#c38b7b"
+bright_yellow = "#6B5E73"
+bright_green = "#87a9b0"
+bright_cyan = "#a5a0b6"
+bright_blue = "#b59790"
+bright_magenta = "#c4d8e2"
\ No newline at end of file
diff --git a/themes/last-horizon/hyprland.lua b/themes/last-horizon/hyprland.lua
new file mode 100644
index 00000000..892f2524
--- /dev/null
+++ b/themes/last-horizon/hyprland.lua
@@ -0,0 +1,17 @@
+local active_border_color = { colors = { "rgba(8a8588ee)", "rgba(e2dddcee)" }, angle = 45 }
+local inactive_border_color = "rgba(584e51aa)"
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+      inactive_border = inactive_border_color,
+    },
+  },
+  group = {
+    col = {
+      border_active = active_border_color,
+      border_inactive = inactive_border_color,
+    },
+  },
+})
diff --git a/themes/last-horizon/icons.theme b/themes/last-horizon/icons.theme
new file mode 100644
index 00000000..24a4551d
--- /dev/null
+++ b/themes/last-horizon/icons.theme
@@ -0,0 +1 @@
+Yaru-purple
diff --git a/themes/last-horizon/neovim.lua b/themes/last-horizon/neovim.lua
new file mode 100644
index 00000000..a21fa316
--- /dev/null
+++ b/themes/last-horizon/neovim.lua
@@ -0,0 +1,41 @@
+return {
+  {
+    "bjarneo/aether.nvim",
+    branch = "v2",
+    name = "aether",
+    priority = 1000,
+    opts = {
+      transparent = false,
+      colors = {
+  bg           = "#0c0b0c",
+  bg_dark      = "#0c0b0c",
+  bg_highlight = "#716661",     -- still only change to bg_highlight
+
+  -- Foregrounds
+  fg           = "#f1f1ef",
+  fg_dark      = "#e0dbd9",
+  comment      = "#94918c",
+
+  red          = "#e36a58",
+  orange       = "#c38d72",
+  yellow       = "#c8a88a",
+  green        = "#a4dded",
+  cyan         = "#725379",
+  blue         = "#4691a1",
+  purple       = "#c9a3c9",
+  magenta      = "#b9a0d1",
+      },
+    },
+    config = function(_, opts)
+      require("aether").setup(opts)
+      vim.cmd.colorscheme("aether")
+      require("aether.hotreload").setup()
+    end,
+  },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "aether",
+    },
+  },
+}
\ No newline at end of file
diff --git a/themes/last-horizon/preview-unlock.png b/themes/last-horizon/preview-unlock.png
new file mode 100644
index 00000000..8c9b95c6
Binary files /dev/null and b/themes/last-horizon/preview-unlock.png differ
diff --git a/themes/last-horizon/preview.png b/themes/last-horizon/preview.png
new file mode 100644
index 00000000..cffffd55
Binary files /dev/null and b/themes/last-horizon/preview.png differ
diff --git a/themes/last-horizon/unlock.png b/themes/last-horizon/unlock.png
new file mode 100644
index 00000000..56853ba2
Binary files /dev/null and b/themes/last-horizon/unlock.png differ
diff --git a/themes/last-horizon/vscode.json b/themes/last-horizon/vscode.json
new file mode 100644
index 00000000..9f38b214
--- /dev/null
+++ b/themes/last-horizon/vscode.json
@@ -0,0 +1,4 @@
+{
+  "name": "Ship at Sea",
+  "extension": "rikkarth.ship-at-sea"
+}
\ No newline at end of file
diff --git a/themes/last-horizon/waybar.css b/themes/last-horizon/waybar.css
new file mode 100644
index 00000000..ab9682ae
--- /dev/null
+++ b/themes/last-horizon/waybar.css
@@ -0,0 +1,2 @@
+@define-color background #0c0b0c;
+@define-color foreground #FAFCFB;
diff --git a/themes/lumon/colors.toml b/themes/lumon/colors.toml
index 1ddfcb14..ed8fe608 100644
--- a/themes/lumon/colors.toml
+++ b/themes/lumon/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 # Accent and UI colors
 accent = "#8bc9eb"
 active_border_color = "#f2fcff"
@@ -5,31 +7,33 @@ active_tab_background = "#6fb8e3"
 
 # Cursor colors
 cursor = "#f2fcff"
-
-# Primary colors
 foreground = "#d6e2ee"
 background = "#16242d"
-
-# Selection colors
 selection_foreground = "#1b2d40"
 selection_background = "#4d9ed3"
 
-# Normal colors (ANSI 0-7)
-color0  = "#1b2d40"
-color1  = "#4d86b0"
-color2  = "#5e95bc"
-color3  = "#6fa4c9"
-color4  = "#6fb8e3"
-color5  = "#8bc9eb"
-color6  = "#b4e4f6"
-color7  = "#d6e2ee"
+bg = "#16242d"
+lighter_bg = "#1b2d40"
+selection = "#243d56"
+muted = "#304860"
+dark_fg = "#4d86b0"
+fg = "#6fa4c9"
+light_fg = "#d6e2ee"
+bright_fg = "#f2fcff"
 
-# Bright colors (ANSI 8-15)
-color8  = "#304860"
-color9  = "#73a6cb"
-color10 = "#86b7d8"
-color11 = "#9dcae5"
-color12 = "#f2fcff"
-color13 = "#b1d8ee"
-color14 = "#d1eef8"
-color15 = "#ffffff"
+red = "#4d86b0"
+yellow = "#6fa4c9"
+orange = "#8bc9eb"
+green = "#5e95bc"
+cyan = "#b4e4f6"
+blue = "#6fb8e3"
+magenta = "#8bc9eb"
+brown = "#456475"
+dark_bg = "#101b21"
+darker_bg = "#0b1216"
+bright_red = "#73a6cb"
+bright_yellow = "#9dcae5"
+bright_green = "#86b7d8"
+bright_cyan = "#d1eef8"
+bright_blue = "#f2fcff"
+bright_magenta = "#b1d8ee"
\ No newline at end of file
diff --git a/themes/lumon/hyprland.conf b/themes/lumon/hyprland.conf
deleted file mode 100644
index 40d21b4a..00000000
--- a/themes/lumon/hyprland.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-$activeBorderColor = rgb(f2fcff)
-$activeShadowColor = rgb(6fb8e3)
-$inactiveBorderColor = rgba(30486099)
-$inactiveShadowColor = rgba(30486077)
-
-general {
-    col.active_border = $activeBorderColor
-    col.inactive_border = $inactiveBorderColor
-    gaps_in = 8
-    gaps_out = 16
-}
-
-group {
-    col.border_active = $activeBorderColor
-    col.border_inactive = $inactiveBorderColor
-}
-
-decoration {
-    shadow {
-      enabled = true
-      range = 16
-      render_power = 4
-      color = $activeShadowColor
-      color_inactive = $inactiveShadowColor
-    }
-}
diff --git a/themes/lumon/hyprland.lua b/themes/lumon/hyprland.lua
new file mode 100644
index 00000000..497830a3
--- /dev/null
+++ b/themes/lumon/hyprland.lua
@@ -0,0 +1,32 @@
+local active_border_color = "rgb(f2fcff)"
+local active_shadow_color = "rgb(6fb8e3)"
+local inactive_border_color = "rgba(30486099)"
+local inactive_shadow_color = "rgba(30486077)"
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+      inactive_border = inactive_border_color,
+    },
+    gaps_in = 8,
+    gaps_out = 16,
+  },
+
+  group = {
+    col = {
+      border_active = active_border_color,
+      border_inactive = inactive_border_color,
+    },
+  },
+
+  decoration = {
+    shadow = {
+      enabled = true,
+      range = 16,
+      render_power = 4,
+      color = active_shadow_color,
+      color_inactive = inactive_shadow_color,
+    },
+  },
+})
diff --git a/themes/lumon/swayosd.css b/themes/lumon/swayosd.css
deleted file mode 100644
index 53c3f054..00000000
--- a/themes/lumon/swayosd.css
+++ /dev/null
@@ -1,44 +0,0 @@
-@define-color background-color #1b2d40;
-@define-color border-color #304860;
-@define-color label #d6e2ee;
-@define-color image #d6e2ee;
-@define-color progress #6fb8e3;
-@define-color edge-light #f2fcff;
-
-/* Cancel out Omarchy defaults */
-window:not(:backdrop),
-window:backdrop {
-    border: none;
-    border-width: 0;
-    background-color: transparent;
-    box-shadow: none;
-    padding: 12px;
-}
-
-/* Draw the Lumon OSD shell */
-window:not(:backdrop) #container,
-window:backdrop #container {
-    border: 2px solid alpha(@border-color, 0.92);
-    background-color: alpha(@background-color, 0.95);
-    padding: 12px 16px;
-    background-clip: padding-box;
-}
-
-image,
-label {
-    color: @label;
-}
-
-progressbar {
-    min-height: 8px;
-}
-
-progressbar trough {
-    background: alpha(@border-color, 0.24);
-    box-shadow: inset 0 1px rgba(242, 252, 255, 0.03);
-}
-
-progressbar progress {
-    background: linear-gradient(90deg, @progress, @edge-light);
-    box-shadow: 0 0 10px rgba(111, 184, 227, 0.18);
-}
diff --git a/themes/matte-black/btop.theme b/themes/matte-black/btop.theme
deleted file mode 100644
index c8cdcd02..00000000
--- a/themes/matte-black/btop.theme
+++ /dev/null
@@ -1,92 +0,0 @@
-# ────────────────────────────────────────────────────────────
-# Bashtop theme - Omarchy Matte Black
-# by tahayvr
-# https://github.com/tahayvr
-# ────────────────────────────────────────────────────────────
-
-# Colors should be in 6 or 2 character hexadecimal or single spaced rgb decimal: "#RRGGBB", "#BW" or "0-255 0-255 0-255"
-# example for white: "#ffffff", "#ff" or "255 255 255".
-
-# All graphs and meters can be gradients
-# For single color graphs leave "mid" and "end" variable empty.
-# Use "start" and "end" variables for two color gradient
-# Use "start", "mid" and "end" for three color gradient
-
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]=""
-
-# Main text color
-theme[main_fg]="#EAEAEA"
-
-# Title color for boxes
-theme[title]="#8a8a8d"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#f59e0b"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#f59e0b"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#EAEAEA"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#333333"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#8a8a8d"
-
-# Cpu box outline color
-theme[cpu_box]="#8a8a8d"
-
-# Memory/disks box outline color
-theme[mem_box]="#8a8a8d"
-
-# Net up/down box outline color
-theme[net_box]="#8a8a8d"
-
-# Processes box outline color
-theme[proc_box]="#8a8a8d"
-
-# Box divider line and small boxes line color
-theme[div_line]="#8a8a8d"
-
-# Temperature graph colors
-theme[temp_start]="#8a8a8d"
-theme[temp_mid]="#f59e0b"
-theme[temp_end]="#b91c1c"
-
-# CPU graph colors
-theme[cpu_start]="#8a8a8d"
-theme[cpu_mid]="#f59e0b"
-theme[cpu_end]="#b91c1c"
-
-# Mem/Disk free meter
-theme[free_start]="#8a8a8d"
-theme[free_mid]="#f59e0b"
-theme[free_end]="#b91c1c"
-
-# Mem/Disk cached meter
-theme[cached_start]="#8a8a8d"
-theme[cached_mid]="#f59e0b"
-theme[cached_end]="#b91c1c"
-
-# Mem/Disk available meter
-theme[available_start]="#8a8a8d"
-theme[available_mid]="#f59e0b"
-theme[available_end]="#b91c1c"
-
-# Mem/Disk used meter
-theme[used_start]="#8a8a8d"
-theme[used_mid]="#f59e0b"
-theme[used_end]="#b91c1c"
-
-# Download graph colors
-theme[download_start]="#8a8a8d"
-theme[download_mid]="#f59e0b"
-theme[download_end]="#b91c1c"
-
-# Upload graph colors
-theme[upload_start]="#8a8a8d"
-theme[upload_mid]="#f59e0b"
-theme[upload_end]="#b91c1c"
diff --git a/themes/matte-black/colors.toml b/themes/matte-black/colors.toml
index 5e1a8cca..60c0b543 100644
--- a/themes/matte-black/colors.toml
+++ b/themes/matte-black/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 accent = "#e68e0d"
 cursor = "#eaeaea"
 foreground = "#bebebe"
@@ -5,19 +7,28 @@ background = "#121212"
 selection_foreground = "#bebebe"
 selection_background = "#515151"
 
-color0 = "#333333"
-color1 = "#D35F5F"
-color2 = "#FFC107"
-color3 = "#b91c1c"
-color4 = "#e68e0d"
-color5 = "#D35F5F"
-color6 = "#bebebe"
-color7 = "#bebebe"
-color8 = "#8a8a8d"
-color9 = "#B91C1C"
-color10 = "#FFC107"
-color11 = "#b90a0a"
-color12 = "#f59e0b"
-color13 = "#B91C1C"
-color14 = "#eaeaea"
-color15 = "#ffffff"
+bg = "#121212"
+lighter_bg = "#1e1e1e"
+selection = "#2a2a2a"
+muted = "#333333"
+dark_fg = "#555555"
+fg = "#777777"
+light_fg = "#8a8a8d"
+bright_fg = "#bebebe"
+
+red = "#D35F5F"
+yellow = "#b91c1c"
+orange = "#c63d3d"
+green = "#FFC107"
+cyan = "#bebebe"
+blue = "#e68e0d"
+magenta = "#D35F5F"
+brown = "#631e1e"
+dark_bg = "#0d0d0d"
+darker_bg = "#090909"
+bright_red = "#B91C1C"
+bright_yellow = "#b90a0a"
+bright_green = "#FFC107"
+bright_cyan = "#eaeaea"
+bright_blue = "#f59e0b"
+bright_magenta = "#B91C1C"
\ No newline at end of file
diff --git a/themes/miasma/btop.theme b/themes/miasma/btop.theme
deleted file mode 100644
index 4db76eb7..00000000
--- a/themes/miasma/btop.theme
+++ /dev/null
@@ -1,70 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#222222"
-
-# Main text color
-theme[main_fg]="#c2c2b0"
-
-# Title color for boxes
-theme[title]="#bb7744"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#c9a554"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#e4c47a"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#000000"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#666666"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#bb7744"
-
-# Box outline and divider line color
-theme[cpu_box]="#5f875f"
-theme[mem_box]="#5f875f"
-theme[net_box]="#5f875f"
-theme[proc_box]="#5f875f"
-theme[div_line]="#666666"
-
-# Gradient for all meters and graphs
-theme[temp_start]="#c9a554"
-theme[temp_mid]="#78824b"
-theme[temp_end]="#5f875f"
-
-
-theme[cpu_start]="#c9a554"
-theme[cpu_mid]="#78824b"
-theme[cpu_end]="#5f875f"
-
-
-theme[free_start]="#78824b"
-theme[free_mid]="#b36d43"
-theme[free_end]="#b36d43"
-
-
-theme[cached_start]="#b36d43"
-theme[cached_mid]="#b36d43"
-theme[cached_end]="#b36d43"
-
-
-theme[available_start]="#c9a554"
-theme[available_mid]="#c9a554"
-theme[available_end]="#c9a554"
-
-
-theme[used_start]="#5f875f"
-theme[used_mid]="#5f875f"
-theme[used_end]="#5f875f"
-
-
-theme[download_start]="#b36d43"
-theme[download_mid]="#c9a554"
-theme[download_end]="#78824b"
-
-
-theme[upload_start]="#b36d43"
-theme[upload_mid]="#c9a554"
-theme[upload_end]="#78824b"
diff --git a/themes/miasma/colors.toml b/themes/miasma/colors.toml
index 705ce2e4..131255cd 100644
--- a/themes/miasma/colors.toml
+++ b/themes/miasma/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 accent = "#78824b"
 cursor = "#c7c7c7"
 foreground = "#c2c2b0"
@@ -5,19 +7,28 @@ background = "#222222"
 selection_foreground = "#c2c2b0"
 selection_background = "#78824b"
 
-color0 = "#000000"
-color1 = "#685742"
-color2 = "#5f875f"
-color3 = "#b36d43"
-color4 = "#78824b"
-color5 = "#bb7744"
-color6 = "#c9a554"
-color7 = "#d7c483"
-color8 = "#666666"
-color9 = "#685742"
-color10 = "#5f875f"
-color11 = "#b36d43"
-color12 = "#78824b"
-color13 = "#bb7744"
-color14 = "#c9a554"
-color15 = "#d7c483"
+bg = "#222222"
+lighter_bg = "#2c2c2c"
+selection = "#383838"
+muted = "#444444"
+dark_fg = "#555555"
+fg = "#666666"
+light_fg = "#8a8a7e"
+bright_fg = "#c2c2b0"
+
+red = "#685742"
+yellow = "#b36d43"
+orange = "#8d6242"
+green = "#5f875f"
+cyan = "#c9a554"
+blue = "#78824b"
+magenta = "#bb7744"
+brown = "#463121"
+dark_bg = "#191919"
+darker_bg = "#121212"
+bright_red = "#685742"
+bright_yellow = "#b36d43"
+bright_green = "#5f875f"
+bright_cyan = "#c9a554"
+bright_blue = "#78824b"
+bright_magenta = "#bb7744"
\ No newline at end of file
diff --git a/themes/nord/btop.theme b/themes/nord/btop.theme
deleted file mode 100644
index fbd0af14..00000000
--- a/themes/nord/btop.theme
+++ /dev/null
@@ -1,89 +0,0 @@
-#Bashtop theme with nord palette (https://www.nordtheme.com)
-#by Justin Zobel <justin.zobel@gmail.com>
-
-# Colors should be in 6 or 2 character hexadecimal or single spaced rgb decimal: "#RRGGBB", "#BW" or "0-255 0-255 0-255"
-# example for white: "#ffffff", "#ff" or "255 255 255".
-
-# All graphs and meters can be gradients
-# For single color graphs leave "mid" and "end" variable empty.
-# Use "start" and "end" variables for two color gradient
-# Use "start", "mid" and "end" for three color gradient
-
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#2E3440"
-
-# Main text color
-theme[main_fg]="#D8DEE9"
-
-# Title color for boxes
-theme[title]="#8FBCBB"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#5E81AC"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#4C566A"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#ECEFF4"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#4C566A"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#5E81AC"
-
-# Cpu box outline color
-theme[cpu_box]="#4C566A"
-
-# Memory/disks box outline color
-theme[mem_box]="#4C566A"
-
-# Net up/down box outline color
-theme[net_box]="#4C566A"
-
-# Processes box outline color
-theme[proc_box]="#4C566A"
-
-# Box divider line and small boxes line color
-theme[div_line]="#4C566A"
-
-# Temperature graph colors
-theme[temp_start]="#81A1C1"
-theme[temp_mid]="#88C0D0"
-theme[temp_end]="#ECEFF4"
-
-# CPU graph colors
-theme[cpu_start]="#81A1C1"
-theme[cpu_mid]="#88C0D0"
-theme[cpu_end]="#ECEFF4"
-
-# Mem/Disk free meter
-theme[free_start]="#81A1C1"
-theme[free_mid]="#88C0D0"
-theme[free_end]="#ECEFF4"
-
-# Mem/Disk cached meter
-theme[cached_start]="#81A1C1"
-theme[cached_mid]="#88C0D0"
-theme[cached_end]="#ECEFF4"
-
-# Mem/Disk available meter
-theme[available_start]="#81A1C1"
-theme[available_mid]="#88C0D0"
-theme[available_end]="#ECEFF4"
-
-# Mem/Disk used meter
-theme[used_start]="#81A1C1"
-theme[used_mid]="#88C0D0"
-theme[used_end]="#ECEFF4"
-
-# Download graph colors
-theme[download_start]="#81A1C1"
-theme[download_mid]="#88C0D0"
-theme[download_end]="#ECEFF4"
-
-# Upload graph colors
-theme[upload_start]="#81A1C1"
-theme[upload_mid]="#88C0D0"
-theme[upload_end]="#ECEFF4"
diff --git a/themes/nord/colors.toml b/themes/nord/colors.toml
index 79c2ae23..702766c8 100644
--- a/themes/nord/colors.toml
+++ b/themes/nord/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 accent = "#81a1c1"
 cursor = "#d8dee9"
 foreground = "#d8dee9"
@@ -5,19 +7,28 @@ background = "#2e3440"
 selection_foreground = "#d8dee9"
 selection_background = "#4c566a"
 
-color0 = "#3b4252"
-color1 = "#bf616a"
-color2 = "#a3be8c"
-color3 = "#ebcb8b"
-color4 = "#81a1c1"
-color5 = "#b48ead"
-color6 = "#88c0d0"
-color7 = "#e5e9f0"
-color8 = "#4c566a"
-color9 = "#bf616a"
-color10 = "#a3be8c"
-color11 = "#ebcb8b"
-color12 = "#81a1c1"
-color13 = "#b48ead"
-color14 = "#8fbcbb"
-color15 = "#eceff4"
+bg = "#2e3440"
+lighter_bg = "#3b4252"
+selection = "#434c5e"
+muted = "#4c566a"
+dark_fg = "#667080"
+fg = "#8690a0"
+light_fg = "#adb5c4"
+bright_fg = "#d8dee9"
+
+red = "#bf616a"
+yellow = "#ebcb8b"
+orange = "#d5967a"
+green = "#a3be8c"
+cyan = "#88c0d0"
+blue = "#81a1c1"
+magenta = "#b48ead"
+brown = "#6a4b3d"
+dark_bg = "#222730"
+darker_bg = "#191c23"
+bright_red = "#bf616a"
+bright_yellow = "#ebcb8b"
+bright_green = "#a3be8c"
+bright_cyan = "#8fbcbb"
+bright_blue = "#81a1c1"
+bright_magenta = "#b48ead"
\ No newline at end of file
diff --git a/themes/osaka-jade/btop.theme b/themes/osaka-jade/btop.theme
deleted file mode 100644
index 8e22ec9a..00000000
--- a/themes/osaka-jade/btop.theme
+++ /dev/null
@@ -1,87 +0,0 @@
-# Main background
-theme[main_bg]="#111c18"
-
-# Main text color
-theme[main_fg]="#F7E8B2"
-
-# Title color for boxes
-theme[title]="#D6D5BC"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#E67D64"
-
-# Background color of selected items
-theme[selected_bg]="#364538"
-
-# Foreground color of selected items
-theme[selected_fg]="#DEB266"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#32473B"  
-
-# Color of text appearing on top of graphs
-theme[graph_text]="#E6D8BA"
-
-# Misc colors for processes box
-theme[proc_misc]="#E6D8BA"
-
-# Cpu box outline color
-theme[cpu_box]="#81B8A8"
-
-# Memory/disks box outline color
-theme[mem_box]="#81B8A8"
-
-# Net up/down box outline color
-theme[net_box]="#81B8A8"
-
-# Processes box outline color
-theme[proc_box]="#81B8A8"
-
-# Box divider line and small boxes line color
-theme[div_line]="#81B8A8"
-
-# Temperature graph colors
-theme[temp_start]="#BFD99A"
-theme[temp_mid]="#E1B55E"
-theme[temp_end]="#DBB05C"
-
-# CPU graph colors
-theme[cpu_start]="#5F8C86"
-theme[cpu_mid]="#629C89"
-theme[cpu_end]="#76AD98"
-
-# Mem/Disk free meter
-theme[free_start]="#5F8C86"
-theme[free_mid]="#629C89"
-theme[free_end]="#76AD98"
-
-# Mem/Disk cached meter
-theme[cached_start]="#5F8C86"
-theme[cached_mid]="#629C89"
-theme[cached_end]="#76AD98"
-
-# Mem/Disk available meter
-theme[available_start]="#5F8C86"
-theme[available_mid]="#629C89"
-theme[available_end]="#76AD98"
-
-# Mem/Disk used meter
-theme[used_start]="#5F8C86"
-theme[used_mid]="#629C89"
-theme[used_end]="#76AD98"
-
-# Download graph colors
-theme[download_start]="#75BBB3"
-theme[download_mid]="#61949A"
-theme[download_end]="#215866"
-
-# Upload graph colors
-theme[upload_start]="#215866"
-theme[upload_mid]="#91C080"
-theme[upload_end]="#549E6A"
-
-# Process box color gradient for threads, mem and cpu usage
-theme[process_start]="#72CFA3"
-theme[process_mid]="#D0D494"
-theme[process_end]="#DB9F9C"
-
diff --git a/themes/osaka-jade/colors.toml b/themes/osaka-jade/colors.toml
index 76f763e8..70dd0c5e 100644
--- a/themes/osaka-jade/colors.toml
+++ b/themes/osaka-jade/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 accent = "#509475"
 cursor = "#D7C995"
 foreground = "#C1C497"
@@ -5,19 +7,28 @@ background = "#111c18"
 selection_foreground = "#111C18"
 selection_background = "#C1C497"
 
-color0 = "#23372B"
-color1 = "#FF5345"
-color2 = "#549e6a"
-color3 = "#459451"
-color4 = "#509475"
-color5 = "#D2689C"
-color6 = "#2DD5B7"
-color7 = "#F6F5DD"
-color8 = "#53685B"
-color9 = "#db9f9c"
-color10 = "#63b07a"
-color11 = "#E5C736"
-color12 = "#ACD4CF"
-color13 = "#75bbb3"
-color14 = "#8CD3CB"
-color15 = "#9eebb3"
+bg = "#111c18"
+lighter_bg = "#23372B"
+selection = "#32473B"
+muted = "#53685B"
+dark_fg = "#81B8A8"
+fg = "#C1C497"
+light_fg = "#D6D5BC"
+bright_fg = "#F7E8B2"
+
+red = "#FF5345"
+yellow = "#459451"
+orange = "#a2734b"
+green = "#549e6a"
+cyan = "#2DD5B7"
+blue = "#509475"
+magenta = "#D2689C"
+brown = "#513925"
+dark_bg = "#0c1512"
+darker_bg = "#090f0d"
+bright_red = "#db9f9c"
+bright_yellow = "#E5C736"
+bright_green = "#63b07a"
+bright_cyan = "#8CD3CB"
+bright_blue = "#ACD4CF"
+bright_magenta = "#75bbb3"
\ No newline at end of file
diff --git a/themes/retro-82/colors.toml b/themes/retro-82/colors.toml
index 1b5285d1..b1e51ef8 100644
--- a/themes/retro-82/colors.toml
+++ b/themes/retro-82/colors.toml
@@ -1,35 +1,34 @@
-# Accent and UI colors
+mode = "dark"
+
 accent = "#faa968"
-active_border_color = "#faa968"
-active_tab_background = "#faa968"
-
-# Cursor colors
 cursor = "#f6dcac"
-
-# Primary colors
 foreground = "#f6dcac"
 background = "#05182e"
-
-# Selection colors
 selection_foreground = "#00172e"
 selection_background = "#faa968"
 
-# Normal colors (ANSI 0-7)
-color0 = "#303442"
-color1 = "#f85525"
-color2 = "#028391"
-color3 = "#e97b3c"
-color4 = "#faa968"
-color5 = "#3f8f8a"
-color6 = "#8cbfb8"
-color7 = "#a7c9c6"
+bg = "#05182e"
+lighter_bg = "#0a2540"
+selection = "#134e5a"
+muted = "#2a6b78"
+dark_fg = "#3f8f8a"
+fg = "#8cbfb8"
+light_fg = "#a7c9c6"
+bright_fg = "#f6dcac"
 
-# Bright colors (ANSI 8-15)
-color8 = "#134e5a"
-color9 = "#f85525"
-color10 = "#028391"
-color11 = "#e97b3c"
-color12 = "#faa968"
-color13 = "#3f8f8a"
-color14 = "#8cbfb8"
-color15 = "#f6dcac"
+red = "#f85525"
+yellow = "#e97b3c"
+orange = "#faa968"
+green = "#028391"
+cyan = "#8cbfb8"
+blue = "#3f8f8a"
+magenta = "#3f8f8a"
+brown = "#743d1e"
+dark_bg = "#031222"
+darker_bg = "#020c17"
+bright_red = "#f85525"
+bright_yellow = "#e97b3c"
+bright_green = "#028391"
+bright_cyan = "#8cbfb8"
+bright_blue = "#faa968"
+bright_magenta = "#3f8f8a"
\ No newline at end of file
diff --git a/themes/retro-82/hyprland.conf b/themes/retro-82/hyprland.conf
deleted file mode 100644
index 4d4c6ad5..00000000
--- a/themes/retro-82/hyprland.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb(faa968)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/retro-82/hyprland.lua b/themes/retro-82/hyprland.lua
new file mode 100644
index 00000000..ebea23d3
--- /dev/null
+++ b/themes/retro-82/hyprland.lua
@@ -0,0 +1,15 @@
+local active_border_color = "rgb(faa968)"
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+    },
+  },
+
+  group = {
+    col = {
+      border_active = active_border_color,
+    },
+  },
+})
diff --git a/themes/retro-82/swayosd.css b/themes/retro-82/swayosd.css
deleted file mode 100644
index b3e23641..00000000
--- a/themes/retro-82/swayosd.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@define-color background-color #00172e;
-@define-color border-color #134e5a;
-@define-color label #f6dcac;
-@define-color image #f6dcac;
-@define-color progress #e97b3c;
diff --git a/themes/ristretto/btop.theme b/themes/ristretto/btop.theme
deleted file mode 100644
index b058a7fc..00000000
--- a/themes/ristretto/btop.theme
+++ /dev/null
@@ -1,82 +0,0 @@
-#Btop monokai pro ristretto theme
-#Reconfigured from monokai theme
-
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#2c2421"
-
-# Main text color
-theme[main_fg]="#e6d9db"
-
-# Title color for boxes
-theme[title]="#e6d9db"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#fd6883"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#3d2f2a"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#e6d9db"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#72696a"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#adda78"
-
-# Cpu box outline color
-theme[cpu_box]="#5b4a45"
-
-# Memory/disks box outline color
-theme[mem_box]="#5b4a45"
-
-# Net up/down box outline color
-theme[net_box]="#5b4a45"
-
-# Processes box outline color
-theme[proc_box]="#5b4a45"
-
-# Box divider line and small boxes line color
-theme[div_line]="#72696a"
-
-# Temperature graph colors
-theme[temp_start]="#a8a9eb"
-theme[temp_mid]="#f38d70"
-theme[temp_end]="#fd6a85"
-
-# CPU graph colors
-theme[cpu_start]="#adda78"
-theme[cpu_mid]="#f9cc6c"
-theme[cpu_end]="#fd6883"
-
-# Mem/Disk free meter
-theme[free_start]="#5b4a45"
-theme[free_mid]="#adda78"
-theme[free_end]="#c5e2a3"
-
-# Mem/Disk cached meter
-theme[cached_start]="#5b4a45"
-theme[cached_mid]="#85dacc"
-theme[cached_end]="#b3e8dd"
-
-# Mem/Disk available meter
-theme[available_start]="#5b4a45"
-theme[available_mid]="#f9cc6c"
-theme[available_end]="#fce2a3"
-
-# Mem/Disk used meter
-theme[used_start]="#5b4a45"
-theme[used_mid]="#fd6a85"
-theme[used_end]="#feb5c7"
-
-# Download graph colors
-theme[download_start]="#3d2f2a"
-theme[download_mid]="#a8a9eb"
-theme[download_end]="#c5c6f0"
-
-# Upload graph colors
-theme[upload_start]="#3d2f2a"
-theme[upload_mid]="#fd6a85"
-theme[upload_end]="#feb5c7"
-
diff --git a/themes/ristretto/colors.toml b/themes/ristretto/colors.toml
index b5ca9ab9..0ce5cec1 100644
--- a/themes/ristretto/colors.toml
+++ b/themes/ristretto/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 accent = "#f38d70"
 cursor = "#c3b7b8"
 foreground = "#e6d9db"
@@ -5,19 +7,28 @@ background = "#2c2525"
 selection_foreground = "#e6d9db"
 selection_background = "#403e41"
 
-color0 = "#72696a"
-color1 = "#fd6883"
-color2 = "#adda78"
-color3 = "#f9cc6c"
-color4 = "#f38d70"
-color5 = "#a8a9eb"
-color6 = "#85dacc"
-color7 = "#e6d9db"
-color8 = "#948a8b"
-color9 = "#ff8297"
-color10 = "#c8e292"
-color11 = "#fcd675"
-color12 = "#f8a788"
-color13 = "#bebffd"
-color14 = "#9bf1e1"
-color15 = "#f1e5e7"
+bg = "#2c2525"
+lighter_bg = "#3d2f2a"
+selection = "#403e41"
+muted = "#5b4a45"
+dark_fg = "#72696a"
+fg = "#948a8b"
+light_fg = "#c3b7b8"
+bright_fg = "#e6d9db"
+
+red = "#fd6883"
+yellow = "#f9cc6c"
+orange = "#fb9a77"
+green = "#adda78"
+cyan = "#85dacc"
+blue = "#f38d70"
+magenta = "#a8a9eb"
+brown = "#7d4d3b"
+dark_bg = "#211b1b"
+darker_bg = "#181414"
+bright_red = "#ff8297"
+bright_yellow = "#fcd675"
+bright_green = "#c8e292"
+bright_cyan = "#9bf1e1"
+bright_blue = "#f8a788"
+bright_magenta = "#bebffd"
\ No newline at end of file
diff --git a/themes/rose-pine/btop.theme b/themes/rose-pine/btop.theme
deleted file mode 100644
index a992faa2..00000000
--- a/themes/rose-pine/btop.theme
+++ /dev/null
@@ -1,119 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#faf4ed"
-# Base
-
-# Main text color
-theme[main_fg]="#575279"
-# Text
-
-# Title color for boxes
-theme[title]="#908caa"
-# Subtle
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#e0def4"
-# Text
-
-# Background color of selected item in processes box
-theme[selected_bg]="#524f67"
-# HL High
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#f6c177"
-# Gold
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#403d52"
-# HL Med
-
-# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-theme[graph_text]="#9ccfd8"
-# Foam
-
-# Background color of the percentage meters
-theme[meter_bg]="#9ccfd8"
-# Foam
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#c4a7e7"
-# Iris
-
-# Cpu box outline color
-theme[cpu_box]="#ebbcba"
-# Rose
-
-# Memory/disks box outline color
-theme[mem_box]="#31748f"
-# Pine
-
-# Net up/down box outline color
-theme[net_box]="#c4a7e7"
-# Iris
-
-# Processes box outline color
-theme[proc_box]="#eb6f92"
-# Love
-
-# Box divider line and small boxes line color
-theme[div_line]="#6e6a86"
-# Muted
-
-# Temperature graph colors
-theme[temp_start]="#ebbcba"
-# Rose
-theme[temp_mid]="#f6c177"
-# Gold
-theme[temp_end]="#eb6f92"
-# Love
-
-# CPU graph colors
-theme[cpu_start]="#f6c177"
-# Gold
-theme[cpu_mid]="#ebbcba"
-# Rose
-theme[cpu_end]="#eb6f92"
-# Love
-
-# Mem/Disk free meter
-# all love
-theme[free_start]="#eb6f92"
-theme[free_mid]="#eb6f92"
-theme[free_end]="#eb6f92"
-
-# Mem/Disk cached meter
-# all iris
-theme[cached_start]="#c4a7e7"
-theme[cached_mid]="#c4a7e7"
-theme[cached_end]="#c4a7e7"
-
-# Mem/Disk available meter
-# all pine
-theme[available_start]="#31748f"
-theme[available_mid]="#31748f"
-theme[available_end]="#31748f"
-
-# Mem/Disk used meter
-# all rose
-theme[used_start]="#ebbcba"
-theme[used_mid]="#ebbcba"
-theme[used_end]="#ebbcba"
-
-# Download graph colors
-# Pine for start, foam for the rest
-theme[download_start]="#31748f"
-theme[download_mid]="#9ccfd8"
-theme[download_end]="#9ccfd8"
-
-# Upload graph colors
-theme[upload_start]="#ebbcba"
-# Rose for start
-theme[upload_mid]="#eb6f92"
-# Love for mid and end
-theme[upload_end]="#eb6f92"
-
-# Process box color gradient for threads, mem and cpu usage
-theme[process_start]="#31748f"
-# Pine
-theme[process_mid]="#9ccfd8"
-# Foam for mid and end
-theme[process_end]="#9ccfd8"
diff --git a/themes/rose-pine/colors.toml b/themes/rose-pine/colors.toml
index e757ad03..298198b6 100644
--- a/themes/rose-pine/colors.toml
+++ b/themes/rose-pine/colors.toml
@@ -1,3 +1,5 @@
+mode = "light"
+
 accent = "#56949f"
 cursor = "#cecacd"
 foreground = "#575279"
@@ -5,19 +7,28 @@ background = "#faf4ed"
 selection_foreground = "#575279"
 selection_background = "#dfdad9"
 
-color0 = "#f2e9e1"
-color1 = "#b4637a"
-color2 = "#286983"
-color3 = "#ea9d34"
-color4 = "#56949f"
-color5 = "#907aa9"
-color6 = "#d7827e"
-color7 = "#575279"
-color8 = "#9893a5"
-color9 = "#b4637a"
-color10 = "#286983"
-color11 = "#ea9d34"
-color12 = "#56949f"
-color13 = "#907aa9"
-color14 = "#d7827e"
-color15 = "#575279"
+bg = "#faf4ed"
+lighter_bg = "#f2e9e1"
+selection = "#dfdad9"
+muted = "#cecacd"
+dark_fg = "#9893a5"
+fg = "#908caa"
+light_fg = "#6e6a86"
+bright_fg = "#575279"
+
+red = "#b4637a"
+yellow = "#ea9d34"
+orange = "#cf8057"
+green = "#286983"
+cyan = "#d7827e"
+blue = "#56949f"
+magenta = "#907aa9"
+brown = "#67402b"
+dark_bg = "#ede7e1"
+darker_bg = "#e1dbd5"
+bright_red = "#b4637a"
+bright_yellow = "#ea9d34"
+bright_green = "#286983"
+bright_cyan = "#d7827e"
+bright_blue = "#56949f"
+bright_magenta = "#907aa9"
\ No newline at end of file
diff --git a/themes/rose-pine/light.mode b/themes/rose-pine/light.mode
deleted file mode 100644
index 66bb2d04..00000000
--- a/themes/rose-pine/light.mode
+++ /dev/null
@@ -1 +0,0 @@
-# This will set "prefer-light" and use "Adwaita" as the theme
diff --git a/themes/solitude/backgrounds/1-on-pole.jpg b/themes/solitude/backgrounds/1-on-pole.jpg
new file mode 100644
index 00000000..5830446f
Binary files /dev/null and b/themes/solitude/backgrounds/1-on-pole.jpg differ
diff --git a/themes/solitude/backgrounds/2-wreakage.jpg b/themes/solitude/backgrounds/2-wreakage.jpg
new file mode 100644
index 00000000..5c7174a4
Binary files /dev/null and b/themes/solitude/backgrounds/2-wreakage.jpg differ
diff --git a/themes/solitude/backgrounds/3-climb.jpg b/themes/solitude/backgrounds/3-climb.jpg
new file mode 100644
index 00000000..678e4e69
Binary files /dev/null and b/themes/solitude/backgrounds/3-climb.jpg differ
diff --git a/themes/solitude/backgrounds/4-ether.jpg b/themes/solitude/backgrounds/4-ether.jpg
new file mode 100644
index 00000000..766c6cc7
Binary files /dev/null and b/themes/solitude/backgrounds/4-ether.jpg differ
diff --git a/themes/solitude/backgrounds/5-eyed.jpg b/themes/solitude/backgrounds/5-eyed.jpg
new file mode 100644
index 00000000..b8bd7be0
Binary files /dev/null and b/themes/solitude/backgrounds/5-eyed.jpg differ
diff --git a/themes/solitude/btop.theme b/themes/solitude/btop.theme
new file mode 100644
index 00000000..d188e322
--- /dev/null
+++ b/themes/solitude/btop.theme
@@ -0,0 +1,93 @@
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="#101315"
+
+# Main text color
+theme[main_fg]="#cacccc"
+
+# Title color for boxes
+theme[title]="#cacccc"
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#565d60"
+
+# Background color of selected item in processes box
+theme[selected_bg]="#a3a6a7"
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#101315"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#565d60"
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="#cbc2be"
+
+# Background color of the percentage meters
+theme[meter_bg]="#343d41"
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="#a3a6a7"
+
+# CPU, Memory, Network, Proc box outline colors
+theme[cpu_box]="#343d41"
+theme[mem_box]="#343d41"
+theme[net_box]="#343d41"
+theme[proc_box]="#343d41"
+
+# Box divider line and small boxes line color
+theme[div_line]="#343d41"
+
+# Temperature graph color (Normal -> Warm -> Hot)
+theme[temp_start]="#d9dbdc"
+theme[temp_mid]="#9fa5a9"
+theme[temp_end]="#de6145"
+
+# CPU graph colors
+theme[cpu_start]="#d9dbdc"
+theme[cpu_mid]="#9fa5a9"
+theme[cpu_end]="#de6145"
+
+# Mem/Disk free meter
+theme[free_start]="#d9dbdc"
+theme[free_mid]="#9fa5a9"
+theme[free_end]="#de6145"
+
+# Mem/Disk cached meter
+theme[cached_start]="#d9dbdc"
+theme[cached_mid]="#a5aeb4"
+theme[cached_end]="#798186"
+
+# Mem/Disk available meter
+theme[available_start]="#d9dbdc"
+theme[available_mid]="#a5aeb4"
+theme[available_end]="#798186"
+
+# Mem/Disk used meter
+theme[used_start]="#d9dbdc"
+theme[used_mid]="#9fa5a9"
+theme[used_end]="#de6145"
+
+# Download graph colors
+theme[download_start]="#d9dbdc"
+theme[download_mid]="#9fa5a9"
+theme[download_end]="#de6145"
+
+# Upload graph colors
+theme[upload_start]="#d9dbdc"
+theme[upload_mid]="#9fa5a9"
+theme[upload_end]="#de6145"
+
+# Process box color gradient for threads, mem and cpu usage
+theme[process_start]="#d9dbdc"
+theme[process_mid]="#9fa5a9"
+theme[process_end]="#de6145"
+
+# Graph gradient colors
+theme[gradient_color_0]="#101315"
+theme[gradient_color_1]="#343d41"
+theme[gradient_color_2]="#4b4e55"
+theme[gradient_color_3]="#798186"
+theme[gradient_color_4]="#9fa5a9"
+theme[gradient_color_5]="#a5aeb4"
+theme[gradient_color_6]="#d9dbdc"
+theme[gradient_color_7]="#de6145"
diff --git a/themes/solitude/colors.toml b/themes/solitude/colors.toml
new file mode 100644
index 00000000..9db3fcf0
--- /dev/null
+++ b/themes/solitude/colors.toml
@@ -0,0 +1,41 @@
+mode = "dark"
+
+# Accent and UI colors
+accent = "#798186"
+hyprland_active_border = "rgba(798186ee) rgba(caccccee)"
+hyprland_inactive_border = "rgb(1e1e1e)"
+active_border_color = "#a8adb0"
+active_tab_background = "#798186"
+
+# Cursor colors
+cursor = "#cacccc"
+
+# Primary colors
+foreground = "#cacccc"
+background = "#101315"
+
+# Selection colors
+selection_foreground = "#101315"
+selection_background = "#798186"
+
+bg = "#101315"
+lighter_bg = "#101315"
+selection = "#798186"
+muted = "#4b4e55"
+dark_fg = "#4b4e55"
+fg = "#cacccc"
+light_fg = "#cbc2be"
+bright_fg = "#a5aeb4"
+
+red = "#565d60"
+yellow = "#d9dbdc"
+green = "#9fa5a9"
+cyan = "#707070"
+blue = "#798186"
+magenta = "#aeaeae"
+bright_red = "#de6145"
+bright_yellow = "#c9c2b4"
+bright_green = "#343d41"
+bright_cyan = "#707070"
+bright_blue = "#5d6367"
+bright_magenta = "#9a9a9a"
\ No newline at end of file
diff --git a/themes/solitude/hyprland.lua b/themes/solitude/hyprland.lua
new file mode 100644
index 00000000..4f2b5901
--- /dev/null
+++ b/themes/solitude/hyprland.lua
@@ -0,0 +1,21 @@
+local active_border_color = { colors = { "rgba(798186ee)", "rgba(caccccee)" }, angle = 45 }
+local inactive_border_color = "rgb(1e1e1e)"
+
+hl.config({
+  general = {
+    col = {
+      active_border = active_border_color,
+      inactive_border = inactive_border_color,
+    },
+  },
+  group = {
+    col = {
+      border_active = active_border_color,
+      border_inactive = inactive_border_color,
+    },
+  },
+  decoration = {
+    rounding = 6,
+    rounding_power = 3,
+  },
+})
diff --git a/themes/solitude/icons.theme b/themes/solitude/icons.theme
new file mode 100644
index 00000000..4c02d898
--- /dev/null
+++ b/themes/solitude/icons.theme
@@ -0,0 +1 @@
+Yaru-sage-dark
diff --git a/themes/solitude/neovim.lua b/themes/solitude/neovim.lua
new file mode 100644
index 00000000..7caccb44
--- /dev/null
+++ b/themes/solitude/neovim.lua
@@ -0,0 +1,9 @@
+return {
+  { "ficcdaf/ashen.nvim" },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "ashen",
+    },
+  }
+}
\ No newline at end of file
diff --git a/themes/solitude/preview.png b/themes/solitude/preview.png
new file mode 100644
index 00000000..010c4448
Binary files /dev/null and b/themes/solitude/preview.png differ
diff --git a/themes/solitude/vscode.json b/themes/solitude/vscode.json
new file mode 100644
index 00000000..5fe6bd37
--- /dev/null
+++ b/themes/solitude/vscode.json
@@ -0,0 +1,4 @@
+{
+  "name": "Noctokai",
+  "extension": "farigab.noctokai-theme"
+}
diff --git a/themes/solitude/waybar.css b/themes/solitude/waybar.css
new file mode 100644
index 00000000..97c0f544
--- /dev/null
+++ b/themes/solitude/waybar.css
@@ -0,0 +1,2 @@
+@define-color background #101315;
+@define-color foreground #cacccc;
diff --git a/themes/tokyo-night/btop.theme b/themes/tokyo-night/btop.theme
deleted file mode 100644
index 290a3c79..00000000
--- a/themes/tokyo-night/btop.theme
+++ /dev/null
@@ -1,82 +0,0 @@
-# Theme: tokyo-night
-# By: Pascal Jaeger
-
-# Main bg
-theme[main_bg]="#1a1b26"
-
-# Main text color
-theme[main_fg]="#cfc9c2"
-
-# Title color for boxes
-theme[title]="#cfc9c2"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#7dcfff"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#414868"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#cfc9c2"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#565f89"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#7dcfff"
-
-# Cpu box outline color
-theme[cpu_box]="#565f89"
-
-# Memory/disks box outline color
-theme[mem_box]="#565f89"
-
-# Net up/down box outline color
-theme[net_box]="#565f89"
-
-# Processes box outline color
-theme[proc_box]="#565f89"
-
-# Box divider line and small boxes line color
-theme[div_line]="#565f89"
-
-# Temperature graph colors
-theme[temp_start]="#9ece6a"
-theme[temp_mid]="#e0af68"
-theme[temp_end]="#f7768e"
-
-# CPU graph colors
-theme[cpu_start]="#9ece6a"
-theme[cpu_mid]="#e0af68"
-theme[cpu_end]="#f7768e"
-
-# Mem/Disk free meter
-theme[free_start]="#9ece6a"
-theme[free_mid]="#e0af68"
-theme[free_end]="#f7768e"
-
-# Mem/Disk cached meter
-theme[cached_start]="#9ece6a"
-theme[cached_mid]="#e0af68"
-theme[cached_end]="#f7768e"
-
-# Mem/Disk available meter
-theme[available_start]="#9ece6a"
-theme[available_mid]="#e0af68"
-theme[available_end]="#f7768e"
-
-# Mem/Disk used meter
-theme[used_start]="#9ece6a"
-theme[used_mid]="#e0af68"
-theme[used_end]="#f7768e"
-
-# Download graph colors
-theme[download_start]="#9ece6a"
-theme[download_mid]="#e0af68"
-theme[download_end]="#f7768e"
-
-# Upload graph colors
-theme[upload_start]="#9ece6a"
-theme[upload_mid]="#e0af68"
-theme[upload_end]="#f7768e"
-
diff --git a/themes/tokyo-night/colors.toml b/themes/tokyo-night/colors.toml
index fe51dd04..3cad54b5 100644
--- a/themes/tokyo-night/colors.toml
+++ b/themes/tokyo-night/colors.toml
@@ -1,3 +1,5 @@
+mode = "dark"
+
 accent = "#7aa2f7"
 cursor = "#c0caf5"
 foreground = "#a9b1d6"
@@ -5,19 +7,28 @@ background = "#1a1b26"
 selection_foreground = "#c0caf5"
 selection_background = "#7aa2f7"
 
-color0 = "#32344a"
-color1 = "#f7768e"
-color2 = "#9ece6a"
-color3 = "#e0af68"
-color4 = "#7aa2f7"
-color5 = "#ad8ee6"
-color6 = "#449dab"
-color7 = "#787c99"
-color8 = "#444b6a"
-color9 = "#ff7a93"
-color10 = "#b9f27c"
-color11 = "#ff9e64"
-color12 = "#7da6ff"
-color13 = "#bb9af7"
-color14 = "#0db9d7"
-color15 = "#acb0d0"
+bg = "#1a1b26"
+lighter_bg = "#24283b"
+selection = "#292e42"
+muted = "#414868"
+dark_fg = "#565f89"
+fg = "#737aa2"
+light_fg = "#a9b1d6"
+bright_fg = "#cfc9c2"
+
+red = "#f7768e"
+yellow = "#e0af68"
+orange = "#eb927b"
+green = "#9ece6a"
+cyan = "#449dab"
+blue = "#7aa2f7"
+magenta = "#ad8ee6"
+brown = "#75493d"
+dark_bg = "#13141c"
+darker_bg = "#0e0e14"
+bright_red = "#ff7a93"
+bright_yellow = "#ff9e64"
+bright_green = "#b9f27c"
+bright_cyan = "#0db9d7"
+bright_blue = "#7da6ff"
+bright_magenta = "#bb9af7"
diff --git a/themes/tokyo-night/shell.lock.toml b/themes/tokyo-night/shell.lock.toml
new file mode 100644
index 00000000..80720721
--- /dev/null
+++ b/themes/tokyo-night/shell.lock.toml
@@ -0,0 +1,6 @@
+text             = "#a9b1d6"
+placeholder      = "#a9b1d6"
+text-error       = "#a9b1d6"
+border           = "#a9b1d6"
+border-active    = "#a9b1d6"
+border-error     = "#a9b1d6"
diff --git a/themes/vantablack/colors.toml b/themes/vantablack/colors.toml
index 45b8213e..ec9c89c8 100644
--- a/themes/vantablack/colors.toml
+++ b/themes/vantablack/colors.toml
@@ -1,8 +1,7 @@
-# UI Colors (extended)
+mode = "dark"
+
 accent = "#8d8d8d"
 cursor = "#ffffff"
-
-# Primary colors
 foreground = "#ffffff"
 background = "#000000"
 
@@ -10,22 +9,26 @@ background = "#000000"
 selection_foreground = "#000000"
 selection_background = "#ffffff"
 
-# Normal colors (ANSI 0-7)
-color0 = "#404040"
-color1 = "#a4a4a4"
-color2 = "#b6b6b6"
-color3 = "#cecece"
-color4 = "#8d8d8d"
-color5 = "#9b9b9b"
-color6 = "#b0b0b0"
-color7 = "#ececec"
+bg = "#000000"
+lighter_bg = "#000000"
+selection = "#ffffff"
+fg = "#ffffff"
+light_fg = "#ececec"
+bright_fg = "#ffffff"
 
-# Bright colors (ANSI 8-15)
-color8 = "#5c5c5c"
-color9 = "#a4a4a4"
-color10 = "#b6b6b6"
-color11 = "#cecece"
-color12 = "#8d8d8d"
-color13 = "#9b9b9b"
-color14 = "#b0b0b0"
-color15 = "#ffffff"
+red = "#a4a4a4"
+yellow = "#cecece"
+orange = "#b9b9b9"
+green = "#b6b6b6"
+cyan = "#b0b0b0"
+blue = "#8d8d8d"
+magenta = "#9b9b9b"
+brown = "#5c5c5c"
+dark_bg = "#090909"
+darker_bg = "#070707"
+bright_red = "#a4a4a4"
+bright_yellow = "#cecece"
+bright_green = "#b6b6b6"
+bright_cyan = "#b0b0b0"
+bright_blue = "#8d8d8d"
+bright_magenta = "#9b9b9b"
\ No newline at end of file
diff --git a/themes/white/colors.toml b/themes/white/colors.toml
index e6e072ea..66124cfe 100644
--- a/themes/white/colors.toml
+++ b/themes/white/colors.toml
@@ -1,3 +1,5 @@
+mode = "light"
+
 # UI Colors (extended)
 accent = "#6e6e6e"
 cursor = "#000000"
@@ -10,22 +12,24 @@ background = "#ffffff"
 selection_foreground = "#ffffff"
 selection_background = "#1a1a1a"
 
-# Normal colors (ANSI 0-7)
-color0 = "#c0c0c0"
-color1 = "#2a2a2a"
-color2 = "#3a3a3a"
-color3 = "#4a4a4a"
-color4 = "#1a1a1a"
-color5 = "#2e2e2e"
-color6 = "#3e3e3e"
-color7 = "#000000"
+bg = "#ffffff"
+lighter_bg = "#c0c0c0"
+selection = "#1a1a1a"
+muted = "#c0c0c0"
+dark_fg = "#c0c0c0"
+fg = "#000000"
+light_fg = "#000000"
+bright_fg = "#000000"
 
-# Bright colors (ANSI 8-15)
-color8 = "#c0c0c0"
-color9 = "#2a2a2a"
-color10 = "#3a3a3a"
-color11 = "#4a4a4a"
-color12 = "#1a1a1a"
-color13 = "#2e2e2e"
-color14 = "#3e3e3e"
-color15 = "#000000"
+red = "#2a2a2a"
+yellow = "#4a4a4a"
+green = "#3a3a3a"
+cyan = "#3e3e3e"
+blue = "#1a1a1a"
+magenta = "#2e2e2e"
+bright_red = "#2a2a2a"
+bright_yellow = "#4a4a4a"
+bright_green = "#3a3a3a"
+bright_cyan = "#3e3e3e"
+bright_blue = "#1a1a1a"
+bright_magenta = "#2e2e2e"
\ No newline at end of file
diff --git a/themes/white/light.mode b/themes/white/light.mode
deleted file mode 100644
index 66bb2d04..00000000
--- a/themes/white/light.mode
+++ /dev/null
@@ -1 +0,0 @@
-# This will set "prefer-light" and use "Adwaita" as the theme
diff --git a/version b/version
index a08ffae0..8ec49576 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-3.8.2
+4.0.0.alpha