diff --git a/docs/SCRIPTS.md b/docs/SCRIPTS.md
index de9e2c8..f0e7209 100644
--- a/docs/SCRIPTS.md
+++ b/docs/SCRIPTS.md
@@ -24,7 +24,7 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 - `delete-dead` — Phase B verdict: remove and update callers.
 - `stub-with-notify` — Phase B verdict: temporary `notify-send` stub.
 
-## Scripts (156)
+## Scripts (162)
 
 | Script | Location | Callers | Status | Notes |
 | --- | --- | --- | --- | --- |
@@ -51,9 +51,10 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-drive-select` | `features/scripts/utils` | features/scripts/utils/nomarchy-drive-info,features/scripts/utils/nomarchy-drive-set-password | `kept` |  |
 | `nomarchy-drive-set-password` | `features/scripts/utils` | features/scripts/utils/nomarchy-drive-select,features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-env-update` | `features/scripts/utils` | core/home/bash.nix,core/system/scripts/nomarchy-pkg-add, +8 more | `kept` |  |
+| `nomarchy-font` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,core/system/fonts.nix, +6 more | `kept` |  |
 | `nomarchy-font-current` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu | `kept` |  |
-| `nomarchy-font-list` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +1 more | `kept` |  |
-| `nomarchy-font-set` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +3 more | `kept` |  |
+| `nomarchy-font-list` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-font, +2 more | `kept` |  |
+| `nomarchy-font-set` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-font, +4 more | `kept` |  |
 | `nomarchy-haptic-touchpad` | `core/system/scripts` | core/system/hardware.nix | `kept` |  |
 | `nomarchy-hibernation-available` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-hibernation-remove` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
@@ -90,8 +91,11 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-notification-dismiss` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-npx-install` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-on-boot` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/autostart.conf | `kept` |  |
-| `nomarchy-pkg-add` | `core/system/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-voxtype-install, +1 more | `kept` |  |
-| `nomarchy-pkg-remove` | `core/system/scripts` | — | `unused?` |  |
+| `nomarchy-pkg-add` | `core/system/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-pkg-install, +2 more | `kept` |  |
+| `nomarchy-pkg-aur-add` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
+| `nomarchy-pkg-drop` | `features/scripts/utils` | features/scripts/utils/nomarchy-voxtype-remove | `kept` |  |
+| `nomarchy-pkg-install` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
+| `nomarchy-pkg-remove` | `core/system/scripts` | features/scripts/utils/nomarchy-pkg-drop | `kept` |  |
 | `nomarchy-powerprofiles-list` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` |  |
 | `nomarchy-preflight-migration` | `core/system/scripts` | features/scripts/utils/nomarchy-env-update,features/scripts/utils/nomarchy-migrate-state | `kept` |  |
 | `nomarchy-refresh-config` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-refresh-fastfetch | `kept` |  |
@@ -138,15 +142,16 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-test-installer` | `features/scripts/utils` | features/scripts/utils/nomarchy-test-vm,README.md | `kept` |  |
 | `nomarchy-test-live-iso` | `features/scripts/utils` | hosts/live-iso.nix | `kept` |  |
 | `nomarchy-test-vm` | `features/scripts/utils` | features/scripts/utils/nomarchy-test-live-iso | `kept` |  |
+| `nomarchy-theme` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +14 more | `kept` |  |
 | `nomarchy-theme-bg-install` | `themes/engine/scripts` | — | `unused?` |  |
-| `nomarchy-theme-bg-next` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,README.md | `kept` |  |
+| `nomarchy-theme-bg-next` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-wallpaper, +1 more | `kept` |  |
 | `nomarchy-theme-bg-set` | `themes/engine/scripts` | — | `unused?` |  |
 | `nomarchy-theme-current` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
 | `nomarchy-theme-install` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md | `kept` |  |
-| `nomarchy-theme-list` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-welcome | `kept` |  |
+| `nomarchy-theme-list` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-theme, +1 more | `kept` |  |
 | `nomarchy-theme-refresh` | `themes/engine/scripts` | — | `unused?` |  |
 | `nomarchy-theme-remove` | `themes/engine/scripts` | — | `unused?` |  |
-| `nomarchy-theme-set` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-on-boot, +7 more | `kept` |  |
+| `nomarchy-theme-set` | `themes/engine/scripts` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-on-boot, +8 more | `kept` |  |
 | `nomarchy-theme-set-keyboard` | `themes/engine/scripts` | features/scripts/utils/nomarchy-on-boot | `kept` |  |
 | `nomarchy-theme-set-keyboard-asus-rog` | `themes/engine/scripts` | features/scripts/utils/nomarchy-on-boot,themes/engine/scripts/nomarchy-theme-set-keyboard | `kept` |  |
 | `nomarchy-theme-set-keyboard-f16` | `themes/engine/scripts` | features/scripts/utils/nomarchy-on-boot,themes/engine/scripts/nomarchy-theme-set-keyboard | `kept` |  |
@@ -176,6 +181,7 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`,
 | `nomarchy-voxtype-model` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc | `kept` |  |
 | `nomarchy-voxtype-remove` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-voxtype-status` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc | `kept` |  |
+| `nomarchy-wallpaper` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/autostart.conf,features/desktop/hyprland/default.nix, +2 more | `kept` |  |
 | `nomarchy-webapp-handler-hey` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-webapp-handler-zoom` | `features/scripts/utils` | — | `unused?` |  |
 | `nomarchy-webapp-install` | `features/scripts/utils` | features/scripts/utils/nomarchy-webapp-remove-all | `kept` |  |
@@ -196,8 +202,7 @@ Tokens grepped from `core/`, `features/`, `themes/`, `installer/`, `hosts/`, `bi
 | `nomarchy-docs-keybindings` | bin/utils/nomarchy-docs-keybindings | `missing` |
 | `nomarchy-docs-scripts` | bin/utils/nomarchy-docs-scripts | `missing` |
 | `nomarchy-dryrun` | installer/install.sh | `missing` |
-| `nomarchy-font` | core/home/config/nomarchy-skill/SKILL.md,core/system/fonts.nix, +6 more | `missing` |
-| `nomarchy-font-selector` | themes/engine/switcher.nix | `missing` |
+| `nomarchy-font-selector` | features/scripts/utils/nomarchy-font,themes/engine/switcher.nix | `missing` |
 | `nomarchy-install` | core/home/config/nomarchy-skill/SKILL.md,hosts/installer-iso.nix, +2 more | `missing` |
 | `nomarchy-install-` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
 | `nomarchy-install-docker-dbs` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
@@ -207,11 +212,8 @@ Tokens grepped from `core/`, `features/`, `themes/`, `installer/`, `hosts/`, `bi
 | `nomarchy-manual` | features/scripts/utils/nomarchy-menu,themes/engine/scripts/nomarchy-theme-install | `missing` |
 | `nomarchy-menu-rows` | bin/utils/nomarchy-docs-scripts | `missing` |
 | `nomarchy-nopasswd-` | core/system/scripts/nomarchy-sudo-passwordless-toggle | `missing` |
-| `nomarchy-pkg` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-pkg-add, +4 more | `missing` |
-| `nomarchy-pkg-` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-pkg-add, +4 more | `missing` |
-| `nomarchy-pkg-aur-add` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
-| `nomarchy-pkg-drop` | features/scripts/utils/nomarchy-voxtype-remove | `missing` |
-| `nomarchy-pkg-install` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
+| `nomarchy-pkg` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-pkg-add, +6 more | `missing` |
+| `nomarchy-pkg-` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-pkg-add, +6 more | `missing` |
 | `nomarchy-plymouth` | themes/engine/plymouth.nix | `missing` |
 | `nomarchy-refresh-` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-refresh-config, +1 more | `missing` |
 | `nomarchy-restart` | core/home/config/nomarchy-skill/SKILL.md,core/system/scripts/nomarchy-restart-xcompose, +10 more | `missing` |
@@ -222,17 +224,15 @@ Tokens grepped from `core/`, `features/`, `themes/`, `installer/`, `hosts/`, `bi
 | `nomarchy-setup-` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu | `missing` |
 | `nomarchy-skill` | core/home/configs.nix | `missing` |
 | `nomarchy-system-scripts` | core/system/hardware.nix,core/system/scripts-derivation.nix, +1 more | `missing` |
-| `nomarchy-theme` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +13 more | `missing` |
-| `nomarchy-theme-` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +13 more | `missing` |
+| `nomarchy-theme-` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +15 more | `missing` |
 | `nomarchy-theme-engine-scripts` | themes/engine/scripts.nix | `missing` |
 | `nomarchy-theme-next` | core/home/config/nomarchy-skill/SKILL.md | `missing` |
-| `nomarchy-theme-selector` | themes/engine/switcher.nix | `missing` |
+| `nomarchy-theme-selector` | features/scripts/utils/nomarchy-theme,themes/engine/switcher.nix | `missing` |
 | `nomarchy-themes-no-images` | themes/engine/files.nix | `missing` |
 | `nomarchy-toggle-` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,core/home/config/nomarchy-skill/SKILL.md, +3 more | `missing` |
 | `nomarchy-update-` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc, +1 more | `missing` |
 | `nomarchy-vm` | features/scripts/utils/nomarchy-test-vm | `missing` |
-| `nomarchy-wallpaper` | core/home/config/nomarchy/default/hypr/autostart.conf,features/desktop/hyprland/default.nix, +2 more | `missing` |
-| `nomarchy-wallpaper-selector` | themes/engine/switcher.nix | `missing` |
+| `nomarchy-wallpaper-selector` | features/scripts/utils/nomarchy-wallpaper,themes/engine/switcher.nix | `missing` |
 | `nomarchy-webapp-handler` | features/scripts/utils/nomarchy-webapp-remove,features/scripts/utils/nomarchy-webapp-remove-all | `missing` |
 | `nomarchy-windows` | features/scripts/utils/nomarchy-windows-vm | `missing` |
 
diff --git a/features/scripts/utils/nomarchy-font b/features/scripts/utils/nomarchy-font
new file mode 100755
index 0000000..62c1aae
--- /dev/null
+++ b/features/scripts/utils/nomarchy-font
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Nomarchy Font Helper
+# Usage: nomarchy-font [selector|set <name>|list]
+
+COMMAND="$1"
+
+case "$COMMAND" in
+    set)
+        shift
+        nomarchy-font-set "$@"
+        ;;
+    list)
+        nomarchy-font-list
+        ;;
+    selector|*)
+        nomarchy-font-selector
+        ;;
+esac
diff --git a/features/scripts/utils/nomarchy-pkg-aur-add b/features/scripts/utils/nomarchy-pkg-aur-add
new file mode 100755
index 0000000..96c6038
--- /dev/null
+++ b/features/scripts/utils/nomarchy-pkg-aur-add
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Nomarchy AUR Stub
+# Informs the user that AUR is not applicable to NixOS.
+
+notify-send -u critical "Nomarchy" "The AUR is an Arch Linux feature and is not available on NixOS. Try searching for the package in nixpkgs using 'nix search nixpkgs <name>'."
+echo "Error: AUR is not available on NixOS."
+exit 1
diff --git a/features/scripts/utils/nomarchy-pkg-drop b/features/scripts/utils/nomarchy-pkg-drop
new file mode 100755
index 0000000..a2e16ad
--- /dev/null
+++ b/features/scripts/utils/nomarchy-pkg-drop
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Nomarchy Package Drop Script
+# Alias for nomarchy-pkg-remove.
+
+nomarchy-pkg-remove "$@"
diff --git a/features/scripts/utils/nomarchy-pkg-install b/features/scripts/utils/nomarchy-pkg-install
new file mode 100755
index 0000000..40dec76
--- /dev/null
+++ b/features/scripts/utils/nomarchy-pkg-install
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Nomarchy Package Install Script
+# Alias for nomarchy-pkg-add for users coming from other distros.
+
+nomarchy-pkg-add "$@"
diff --git a/features/scripts/utils/nomarchy-theme b/features/scripts/utils/nomarchy-theme
new file mode 100755
index 0000000..ce89ac0
--- /dev/null
+++ b/features/scripts/utils/nomarchy-theme
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Nomarchy Theme Helper
+# Usage: nomarchy-theme [selector|set <name>|list]
+
+COMMAND="$1"
+
+case "$COMMAND" in
+    set)
+        shift
+        nomarchy-theme-set "$@"
+        ;;
+    list)
+        nomarchy-theme-list
+        ;;
+    selector|*)
+        nomarchy-theme-selector
+        ;;
+esac
diff --git a/features/scripts/utils/nomarchy-wallpaper b/features/scripts/utils/nomarchy-wallpaper
new file mode 100755
index 0000000..909e104
--- /dev/null
+++ b/features/scripts/utils/nomarchy-wallpaper
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Nomarchy Wallpaper Helper
+# Usage: nomarchy-wallpaper [selector|set <path>|next]
+
+COMMAND="$1"
+
+case "$COMMAND" in
+    set)
+        shift
+        # Wallpaper set usually involves writing to state.json and calling swww
+        # We can reuse the logic from nomarchy-wallpaper-selector if we extract it,
+        # but for now let's just trigger the selector.
+        nomarchy-wallpaper-selector
+        ;;
+    next)
+        nomarchy-theme-bg-next
+        ;;
+    selector|*)
+        nomarchy-wallpaper-selector
+        ;;
+esac