Correct message

bin/omarchy-battery-remaining

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # Returns the battery percentage remaining as an integer.
-# Used by the battery monitor and the Ctrl + Shift + Super + B hotkey.
 
 upower -i $(upower -e | grep BAT) \
 | awk -F: '/percentage/ {

bin/omarchy-branch-set

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Set the branch for Omarchy's git repository.
-
 if (($# == 0)); then
   echo "Usage: omarchy-branch-set [master|dev]"
   exit 1

bin/omarchy-brightness-display

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Adjust brightness on the most likely display device.
-# Usage: omarchy-brightness-display <step>
-
-step="${1:-+5%}"
-
-# 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
-
-# Set the actual 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 '%')"

bin/omarchy-brightness-display-apple

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Adjust the brightness on Apple Studio Displays and Apple XDR Displays using asdcontrol.
-
-if [[ $# -eq 0 ]]; then
-  echo "Adjust Apple Display Brightness by passing +5000 or -5000 (or any range from 0-60000)"
-else
-  device="$(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1)"
-  sudo asdcontrol "$device" -- "$1" >/dev/null
-  value="$(sudo asdcontrol "$device" | awk -F= '/BRIGHTNESS=/{print $2+0}')"
-  omarchy-swayosd-brightness "$(( value * 100 / 60000 ))"
-fi

bin/omarchy-brightness-keyboard

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# Adjust keyboard backlight brightness using available steps.
-# Usage: omarchy-brightness-keyboard <up|down>
-
-direction="${1:-up}"
-
-# Find keyboard backlight device (look for *kbd_backlight* pattern in leds class).
-device=""
-for candidate in /sys/class/leds/*kbd_backlight*; do
-  if [[ -e "$candidate" ]]; then
-    device="$(basename "$candidate")"
-    break
-  fi
-done
-
-if [[ -z "$device" ]]; then
-  echo "No keyboard backlight device found" >&2
-  exit 1
-fi
-
-# Get current and max brightness to determine step size.
-max_brightness="$(brightnessctl -d "$device" max)"
-current_brightness="$(brightnessctl -d "$device" get)"
-
-# Calculate step as one unit (keyboards typically have discrete levels like 0-3).
-if [[ "$direction" == "up" ]]; then
-  new_brightness=$((current_brightness + 1))
-  [[ $new_brightness -gt $max_brightness ]] && new_brightness=$max_brightness
-else
-  new_brightness=$((current_brightness - 1))
-  [[ $new_brightness -lt 0 ]] && new_brightness=0
-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-brightness "$percent"

bin/omarchy-channel-set

@@ -1,18 +1,5 @@
 #!/bin/bash
 
-# Set the Omarchy channel, which dictates what git branch and package repository is used.
-#
-# Stable uses the master branch, which only sees updates on official releases, and
-# the stable package repository, which typically lags the edge by a month to ensure
-# better compatibility.
-#
-# Edge tracks the latest package repository, but still relies on the master branch,
-# so new packages which require config changes may cause conflicts or errors.
-#
-# Dev tracks the active development dev branch, which may include partial or broken updates,
-# as well as the latest package repository. This should only be used by Omarchy developers
-# and people with a lot of experience managing Linux systems.
-
 if (($# == 0)); then
   echo "Usage: omarchy-channel-set [stable|edge|dev]"
   exit 1
@@ -21,7 +8,7 @@ else
 fi
 
 case "$channel" in
-"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" && sudo pacman -Suu --noconfirm ;;
+"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
 "edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
 "dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
 *) echo "Unknown channel: $channel"; exit 1; ;;

bin/omarchy-cmd-apple-display-brightness

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [[ $# -eq 0 ]]; then
+  echo "Adjust Apple Display Brightness by passing +5000 or -5000 (or any range from 0-60000)"
+else
+  DEVICE="$(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1)"
+  sudo asdcontrol "$DEVICE" -- "$1" >/dev/null
+  VALUE="$(sudo asdcontrol "$DEVICE" | awk -F= '/BRIGHTNESS=/{print $2+0}')"
+  swayosd-client \
+    --monitor "$(hyprctl monitors -j | jq -r '.[]|select(.focused==true).name')" \
+    --custom-icon display-brightness \
+    --custom-progress "$(awk -v v="$VALUE" 'BEGIN{printf "%.2f", v/60000}')" \
+    --custom-progress-text "$(( VALUE * 100 / 60000 ))%"
+fi

bin/omarchy-cmd-audio-switch

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Switch between audio outputs while preserving the mute status. By default mapped to Super + Mute.
-
 focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
 
 sinks=$(pactl -f json list sinks | jq '[.[] | select((.ports | length == 0) or ([.ports[]? | .availability != "not available"] | any))]')

bin/omarchy-cmd-first-run

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Finish the installation of Omarchy with items that can only be done after logging in.
-
 set -e
 
 FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode

bin/omarchy-cmd-missing

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Returns true if any of the commands passed in as arguments are missing on the system.
-
 for cmd in "$@"; do
   if ! command -v "$cmd" &>/dev/null; then
     exit 0

bin/omarchy-cmd-present

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Returns true if all the commands passed in as arguments exit on the system.
-
 for cmd in "$@"; do
   command -v "$cmd" &>/dev/null || exit 1
 done

bin/omarchy-cmd-reboot

@@ -1,13 +1,6 @@
 #!/bin/bash
 
-# Reboot command that first closes all application windows (thus giving them a chance to save state).
-# This is particularly helpful for applications like Chromium that otherwise won't shutdown cleanly.
-
 omarchy-state clear re*-required
-
-# Schedule the reboot to happen after closing windows (detached from terminal)
-nohup bash -c "sleep 2 && systemctl reboot --no-wall" >/dev/null 2>&1 &
-
-# Now close all windows
 omarchy-hyprland-window-close-all
 sleep 1 # Allow apps like Chrome to shutdown correctly
+systemctl reboot --no-wall

bin/omarchy-cmd-screenrecord

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Start and stop a screenrecording, which will be saved to ~/Videos by default.
-# Alternative location can be set via OMARCHY_SCREENRECORD_DIR or XDG_VIDEOS_DIR ENVs.
-
 [[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
 OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-${XDG_VIDEOS_DIR:-$HOME/Videos}}"
 
@@ -14,7 +11,6 @@ fi
 DESKTOP_AUDIO="false"
 MICROPHONE_AUDIO="false"
 WEBCAM="false"
-WEBCAM_DEVICE=""
 STOP_RECORDING="false"
 
 for arg in "$@"; do
@@ -22,7 +18,6 @@ for arg in "$@"; do
     --with-desktop-audio) DESKTOP_AUDIO="true" ;;
     --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
     --with-webcam) WEBCAM="true" ;;
-    --webcam-device=*) WEBCAM_DEVICE="${arg#*=}" ;;
     --stop-recording) STOP_RECORDING="true"
   esac
 done
@@ -34,15 +29,6 @@ cleanup_webcam() {
 start_webcam_overlay() {
   cleanup_webcam
 
-  # Auto-detect first available webcam if none specified
-  if [[ -z "$WEBCAM_DEVICE" ]]; then
-    WEBCAM_DEVICE=$(v4l2-ctl --list-devices 2>/dev/null | grep -m1 "^\s*/dev/video" | tr -d '\t')
-    if [[ -z "$WEBCAM_DEVICE" ]]; then
-      notify-send "No webcam devices found" -u critical -t 3000
-      return 1
-    fi
-  fi
-
   # Get monitor scale
   local scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
 
@@ -52,7 +38,7 @@ start_webcam_overlay() {
   # Try preferred 16:9 resolutions in order, use first available
   local preferred_resolutions=("640x360" "1280x720" "1920x1080")
   local video_size_arg=""
-  local available_formats=$(v4l2-ctl --list-formats-ext -d "$WEBCAM_DEVICE" 2>/dev/null)
+  local available_formats=$(v4l2-ctl --list-formats-ext -d /dev/video0 2>/dev/null)
 
   for resolution in "${preferred_resolutions[@]}"; do
     if echo "$available_formats" | grep -q "$resolution"; then
@@ -61,7 +47,7 @@ start_webcam_overlay() {
     fi
   done
 
-  ffplay -f v4l2 $video_size_arg -framerate 30 "$WEBCAM_DEVICE" \
+  ffplay -f v4l2 $video_size_arg -framerate 30 /dev/video0 \
     -vf "scale=${target_width}:-1" \
     -window_title "WebcamOverlay" \
     -noborder \

bin/omarchy-cmd-screensaver

@@ -1,13 +1,11 @@
 #!/bin/bash
 
-# Run the Omarchy screensaver using random effects from TTE.
-
 screensaver_in_focus() {
   hyprctl activewindow -j | jq -e '.class == "org.omarchy.screensaver"' >/dev/null 2>&1
 }
 
 exit_screensaver() {
-  hyprctl keyword cursor:invisible false &>/dev/null || true
+  hyprctl keyword cursor:invisible false
   pkill -x tte 2>/dev/null
   pkill -f org.omarchy.screensaver 2>/dev/null
   exit 0

bin/omarchy-cmd-screenshot

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Take a screenshot of the whole screen, a specific window, or a user-drawn region.
-# Saves to ~/Pictures by default, but that can be changed via OMARCHY_SCREENSHOT_DIR or XDG_PICTURES_DIR ENVs.
-
 [[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
 OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-${XDG_PICTURES_DIR:-$HOME/Pictures}}"
 

bin/omarchy-cmd-share

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Share clipboard, file, or folder using LocalSend. Bound to Super + Ctrl + S by default.
-
 if (($# == 0)); then
   echo "Usage: omarchy-cmd-share [clipboard|file|folder]"
   exit 1

bin/omarchy-cmd-shutdown

@@ -1,13 +1,6 @@
 #!/bin/bash
 
-# Shutdown command that first closes all application windows (thus giving them a chance to save state).
-# This is particularly helpful for applications like Chromium that otherwise won't shutdown cleanly.
-
 omarchy-state clear re*-required
-
-# Schedule the shutdown to happen after closing windows (detached from terminal)
-nohup bash -c "sleep 2 && systemctl poweroff --no-wall" >/dev/null 2>&1 &
-
-# Now close all windows
 omarchy-hyprland-window-close-all
 sleep 1 # Allow apps like Chrome to shutdown correctly
+systemctl poweroff --no-wall

bin/omarchy-cmd-terminal-cwd

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Returns the current working directory of the active terminal window,
-# so a new terminal window can be started in the same directory.
-
 # Go from current active terminal to its child shell process and run cwd there
 terminal_pid=$(hyprctl activewindow | awk '/pid:/ {print $2}')
 shell_pid=$(pgrep -P "$terminal_pid" | tail -n1)

bin/omarchy-debug

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Return exhaustive debugging information about the system to help diagnose problems.
-
 NO_SUDO=false
 PRINT_ONLY=false
 

bin/omarchy-dev-add-migration

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Creates a new Omarchy migration named after the unix timestamp of the last commit.
-# Only intended for Omarchy developers.
-
 cd ~/.local/share/omarchy
 migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
 touch $migration_file

bin/omarchy-drive-info

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-# Returns drive information about a given volumne, like /dev/nvme0, which is used by omarchy-drive-select.
-
+# Drive, like /dev/nvme0, to display information about
 if (($# == 0)); then
   echo "Usage: omarchy-drive-info [/dev/drive]"
   exit 1

bin/omarchy-drive-select

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Select a drive from a list with info that includes space and brand. Used by omarchy-drive-set-password.
+# Select a drive from a list with info that includes space and brand
 
 if (($# == 0)); then
   drives=$(lsblk -dpno NAME | grep -E '/dev/(sd|hd|vd|nvme|mmcblk|xv)')

bin/omarchy-drive-set-password

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Set a new encryption password for a drive selected.
-
 encrypted_drives=$(blkid -t TYPE=crypto_LUKS -o device)
 
 if [[ -n $encrypted_drives ]]; then

bin/omarchy-font-current

@@ -1,6 +1,3 @@
 #!/bin/bash
 
-# Returns the name of the current monospace font being used by extracting it from the Waybar stylesheet.
-# This can be changed using omarchy-font-set.
-
 grep -oP 'font-family:\s*["'\'']?\K[^;"'\'']+' ~/.config/waybar/style.css | head -n1

bin/omarchy-font-list

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-# Returns a list of all the monospace fonts available on the system that can be set using omarchy-font-set.
-
 fc-list :spacing=100 -f "%{family[0]}\n" | grep -v -i -E 'emoji|signwriting|omarchy' | sort -u

bin/omarchy-font-set

@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# Set the system-wide monospace font that should be used by the terminal, hyprlock, waybar, swayosd, etc.
-# The font name must be one of the ones returned by omarchy-font-list.
-
 font_name="$1"
 
-if [[ -n "$font_name" ]]; then
+if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; 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

bin/omarchy-hibernation-available

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Check if hibernation is supported
-if [[ ! -f /sys/power/image_size ]]; then
-  exit 1
-fi
-
-# Sum all swap sizes (excluding zram)
-SWAPSIZE_KB=$(awk '!/Filename|zram/ {sum += $3} END {print sum+0}' /proc/swaps)
-SWAPSIZE=$(( 1024 * ${SWAPSIZE_KB:-0} ))
-
-HIBERNATION_IMAGE_SIZE=$(cat /sys/power/image_size)
-
-if [[ "$SWAPSIZE" -gt "$HIBERNATION_IMAGE_SIZE" ]] && [[ -f /etc/mkinitcpio.conf.d/omarchy_resume.conf ]]; then
-  exit 0
-else
-  exit 1
-fi

bin/omarchy-hibernation-remove

@@ -1,59 +0,0 @@
-#!/bin/bash
-
-# Removes hibernation setup: disables swap, removes swapfile, removes fstab entry,
-# removes resume hook, and removes suspend-then-hibernate configuration.
-
-MKINITCPIO_CONF="/etc/mkinitcpio.conf.d/omarchy_resume.conf"
-
-# Check if hibernation is configured
-if [ ! -f "$MKINITCPIO_CONF" ] || ! grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
-  echo "Hibernation is not set up"
-  exit 0
-fi
-
-if ! gum confirm "Remove hibernation setup?"; then
-  exit 0
-fi
-
-SWAP_SUBVOLUME="/swap"
-SWAP_FILE="$SWAP_SUBVOLUME/swapfile"
-
-# Disable swap if active
-if swapon --show | grep -q "$SWAP_FILE"; then
-  echo "Disabling swap on $SWAP_FILE"
-  sudo swapoff "$SWAP_FILE"
-fi
-
-# Remove swapfile
-if [ -f "$SWAP_FILE" ]; then
-  echo "Removing swapfile"
-  sudo rm "$SWAP_FILE"
-fi
-
-# Remove swap subvolume
-if sudo btrfs subvolume show "$SWAP_SUBVOLUME" &>/dev/null; then
-  echo "Removing Btrfs subvolume $SWAP_SUBVOLUME"
-  sudo btrfs subvolume delete "$SWAP_SUBVOLUME"
-fi
-
-# Remove fstab entry
-if grep -Fq "$SWAP_FILE" /etc/fstab; then
-  echo "Removing swapfile from /etc/fstab"
-  sudo cp -a /etc/fstab "/etc/fstab.$(date +%Y%m%d%H%M%S).back"
-  sudo sed -i "\|$SWAP_FILE|d" /etc/fstab
-  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"
-
-echo "Regenerating initramfs..."
-sudo limine-mkinitcpio
-
-echo "Hibernation removed"

bin/omarchy-hibernation-setup

@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# Creates a swap file in the btrfs subvolume, adds the swap file to /etc/fstab,
-# adds a resume hook to mkinitcpio, and configures suspend-then-hibernate.
-
-if [[ ! -f /sys/power/image_size ]]; then
-  echo -e "\033[31mError: Hibernation is not supported on your system\033[0m" >&2
-  exit 1
-fi
-
-
-MKINITCPIO_CONF="/etc/mkinitcpio.conf.d/omarchy_resume.conf"
-
-# Check if hibernation is already configured
-if [ -f "$MKINITCPIO_CONF" ] && grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
-  echo "Hibernation is already set up"
-  exit 0
-fi
-
-MEM_TOTAL_HUMAN=$(free --human | awk '/Mem/ {print $2}')
-if ! gum confirm "Use $MEM_TOTAL_HUMAN on boot drive to make hibernation available?"; then
-  exit 0
-fi
-
-SWAP_SUBVOLUME="/swap"
-SWAP_FILE="$SWAP_SUBVOLUME/swapfile"
-
-# Create btrfs subvolume for swap
-if ! sudo btrfs subvolume show "$SWAP_SUBVOLUME" &>/dev/null; then
-  echo "Creating Btrfs subvolume"
-  sudo btrfs subvolume create "$SWAP_SUBVOLUME"
-  sudo chattr +C "$SWAP_SUBVOLUME"
-fi
-
-# Create swapfile
-if ! sudo swaplabel "$SWAP_FILE" &>/dev/null; then
-  echo "Creating swapfile in Btrfs subvolume"
-  MEM_TOTAL_KB="$(awk '/MemTotal/ {print $2}' /proc/meminfo)k"
-  sudo btrfs filesystem mkswapfile -s "$MEM_TOTAL_KB" "$SWAP_FILE"
-fi
-
-# Add swapfile to fstab
-if ! grep -Fq "$SWAP_FILE" /etc/fstab; then
-  echo "Adding swapfile to /etc/fstab"
-  sudo cp -a /etc/fstab "/etc/fstab.$(date +%Y%m%d%H%M%S).back"
-  printf "\n# Btrfs swapfile for system hibernation\n%s none swap defaults,pri=0 0 0\n" "$SWAP_FILE" | sudo tee -a /etc/fstab >/dev/null
-fi
-
-# Enable swap
-if ! swapon --show | grep -q "$SWAP_FILE"; then
-  echo "Enabling swap on $SWAP_FILE"
-  sudo swapon -p 0 "$SWAP_FILE"
-fi
-
-# Add resume hook to mkinitcpio
-sudo mkdir -p /etc/mkinitcpio.conf.d
-echo "Adding resume hook to $MKINITCPIO_CONF"
-echo "HOOKS+=(resume)" | sudo tee "$MKINITCPIO_CONF" >/dev/null
-
-# Configure suspend-then-hibernate
-echo "Configuring suspend-then-hibernate"
-sudo mkdir -p /etc/systemd/logind.conf.d /etc/systemd/sleep.conf.d
-sudo cp "$OMARCHY_PATH/default/systemd/lid.conf" /etc/systemd/logind.conf.d/
-sudo cp "$OMARCHY_PATH/default/systemd/hibernate.conf" /etc/systemd/sleep.conf.d/
-
-# Regenerate initramfs
-echo "Regenerating initramfs..."
-sudo limine-mkinitcpio
-
-echo
-
-if gum confirm "Reboot to enable hiberation?"; then
-  omarchy-cmd-reboot
-fi

bin/omarchy-hook

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Run a named hook, like post-update (available in ~/.config/omarchy/hooks/post-update).
-
 set -e
 
 if [[ $# -lt 1 ]]; then

bin/omarchy-hyprland-workspace-toggle-gaps

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Toggles the window gaps on the active workspace between no gaps and the default 10/5/2.
-
 workspace_id=$(hyprctl activeworkspace -j | jq -r .id)
 gaps=$(hyprctl workspacerules -j | jq -r ".[] | select(.workspaceString==\"$workspace_id\") | .gapsOut[0] // 0")
 

bin/omarchy-install-chromium-google-account

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Allow Chromium to sign in to Google accounts by adding the correct
-# oauth client id and secret to ~/.config/chromium-flags.conf.
-
 if [[ -f ~/.config/chromium-flags.conf ]]; then
   CONF=~/.config/chromium-flags.conf
 

bin/omarchy-install-dev-env

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Install one of the supported development environments. Usually called via Install > Development > * in the Omarchy Menu.
-
 if [[ -z "$1" ]]; then
   echo "Usage: omarchy-install-dev-env <ruby|node|bun|go|laravel|symfony|php|python|elixir|phoenix|rust|java|ocaml|dotnet|clojure>" >&2
   exit 1

bin/omarchy-install-docker-dbs

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Install one of the supported databases in a Docker container with the suitable development options.
-# Usually called via Install > Development > Docker DB from the Omarchy Menu.
-
 options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB" "MSSQL")
 
 if [[ "$#" -eq 0 ]]; then

bin/omarchy-install-dropbox

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Install and start the Dropbox service. Must then be authenticated via the web.
-
 echo "Installing all dependencies..."
 omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 

bin/omarchy-install-steam

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Install and launch Steam after first letting the user pick the correct grahics card drivers.
-
 set -e
 
 echo "Now pick dependencies matching your graphics card"

bin/omarchy-install-tailscale

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Install the Tailscale mesh VPN service, the tsui TUI management app, and a web app for the Tailscale Admin Console.
-
 curl -fsSL https://tailscale.com/install.sh | sh
 curl -fsSL https://neuralink.com/tsui/install.sh | bash
 

bin/omarchy-install-terminal

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Install one of the approved terminals and set it as the default for Omarchy (Super + Return etc).
-
 if (($# == 0)); then
   echo "Usage: omarchy-install-terminal [alacritty|ghostty|kitty]"
   exit 1

bin/omarchy-install-vscode

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Install VSCode and configure it to use the gnome-libsecret password store, not to update automatically, and to use the current Omarchy theme.
-
 echo "Installing VSCode..."
 omarchy-pkg-add visual-studio-code-bin
 

bin/omarchy-install-xbox-controllers

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Install support for using Xbox controllers with Steam/RetroArch/etc.
-
 set -e
 
 # Install xpadneo to ensure controllers work out of the box

bin/omarchy-launch-about

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-# Launch the fastfetch TUI that gives information about the current system.
-
 exec omarchy-launch-or-focus-tui "bash -c 'fastfetch; read -n 1 -s'"

bin/omarchy-launch-audio

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-# Launch the Omarchy audio controls TUI (provided by wiremix).
-
 omarchy-launch-or-focus-tui wiremix

bin/omarchy-launch-bluetooth

@@ -1,7 +1,4 @@
 #!/bin/bash
 
-# Launch the Omarchy bluetooth controls TUI (provided by bluetui).
-# Also attempts to unblock bluetooth service if rfkill had blocked it.
-
 rfkill unblock bluetooth
 exec omarchy-launch-or-focus-tui bluetui

bin/omarchy-launch-browser

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Launch the default browser as determined by xdg-settings.
-# Automatically converts --private into the correct flag for the given browser.
-
 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)
 

bin/omarchy-launch-editor

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Launch the default editor as determined by $EDITOR (set via ~/.config/uwsm/default) (or nvim if missing).
-# Starts suitable editors in a terminal window and otherwise as a regular application.
-
 omarchy-cmd-present "$EDITOR" || EDITOR=nvim
 
 case "$EDITOR" in

bin/omarchy-launch-floating-terminal-with-presentation

@@ -1,7 +1,4 @@
 #!/bin/bash
 
-# Launch a floating terminal with the Omarchy logo presentation, then execute the command passed in, and finally end with the omarchy-show-done presentation.
-# Used by actions such as Update System.
-
 cmd="$*"
 exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; if [ \$? -ne 130 ]; then omarchy-show-done; fi"

bin/omarchy-launch-opencode

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.opencode -e bash -c 'cd ~/Work; opencode'

bin/omarchy-launch-or-focus

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Launch or focus on a given command identified by the passed in window-pattern.
-# Use by some default bindings, like the one for Spotify, to ensure there is only one instance of the application open.
-
 if (($# == 0)); then
   echo "Usage: omarchy-launch-or-focus [window-pattern] [launch-command]"
   exit 1

bin/omarchy-launch-or-focus-tui

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Launch or focus on a given TUI identified by the passed in as the command.
-# Use by commands like omarchy-launch-wifi to ensure there is only one wifi configuration screen open.
-
 APP_ID="org.omarchy.$(basename "$1")"
 LAUNCH_COMMAND="omarchy-launch-tui $@"
 

bin/omarchy-launch-or-focus-webapp

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Launch or focus on a given web app identified by the window-pattern.
-# Use by some default bindings, like the one for WhatsApp, to ensure there is only one instance of the application open.
-
 if (($# == 0)); then
   echo "Usage: omarchy-launch-or-focus-webapp [window-pattern] [url-and-flags...]"
   exit 1
@@ -12,4 +9,4 @@ WINDOW_PATTERN="$1"
 shift
 LAUNCH_COMMAND="omarchy-launch-webapp $@"
 
-exec omarchy-launch-or-focus "$WINDOW_PATTERN" "$LAUNCH_COMMAND"
+exec omarchy-launch-or-focus "$WINDOW_PATTERN" "$LAUNCH_COMMAND"

bin/omarchy-launch-screensaver

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Launch the Omarchy screensaver in the default terminal on the system with the correct font configuration.
-
 # Exit early if we don't have the tte show
 if ! command -v tte &>/dev/null; then
   exit 1

bin/omarchy-launch-tui

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-# Launch the TUI command passed in as an argument in the default terminal with an org.omarchy.COMMAND app id for styling.
-
 exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.$(basename $1) -e "$1" "${@:2}"

bin/omarchy-launch-walker

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Launch the Walker application launcher while ensuring that it's data provider (called elephant) is runnig first.
-
 # Ensure elephant is running before launching walker
 if ! pgrep -x elephant > /dev/null; then
   setsid uwsm-app -- elephant &

bin/omarchy-launch-webapp

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Launch the passed in URL as a web app in the default browser (or chromium if the default doesn't support --app).
-
 browser=$(xdg-settings get default-web-browser)
 
 case $browser in

bin/omarchy-launch-wifi

@@ -1,7 +1,4 @@
 #!/bin/bash
 
-# Launch the Omarchy wifi controls (provided by the Impala TUI).
-# Attempts to unblock the wifi service first in case it should be been blocked.
-
 rfkill unblock wifi
 omarchy-launch-or-focus-tui impala

bin/omarchy-lock-screen

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Locks the system using hyprlock, but not before ensuring 1password has also been locked, and the screensaver stopped.
-
 # Lock the screen
 pidof hyprlock || hyprlock &
 

bin/omarchy-menu

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Launch the Omarchy Menu or takes a parameter to jump straight to a submenu.
-
 export PATH="$HOME/.local/share/omarchy/bin:$PATH"
 
 # Set to true when going directly to a submenu, so we can exit directly
@@ -88,11 +86,10 @@ show_learn_menu() {
 }
 
 show_trigger_menu() {
-  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle\n  Hardware") in
+  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle") in
   *Capture*) show_capture_menu ;;
   *Share*) show_share_menu ;;
   *Toggle*) show_toggle_menu ;;
-  *Hardware*) show_hardware_menu ;;
   *) show_main_menu ;;
   esac
 }
@@ -114,43 +111,13 @@ show_screenshot_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" -eq 0 ]]; then
-    notify-send "No webcam devices found" -u critical -t 3000
-    return 1
-  fi
-
-  if [[ "$count" -eq 1 ]]; then
-    echo "$devices" | awk '{print $1}'
-  else
-    menu "Select Webcam" "$devices" | awk '{print $1}'
-  fi
-}
-
 show_screenrecord_menu() {
   omarchy-cmd-screenrecord --stop-recording && exit 0
 
   case $(menu "Screenrecord" "  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
   *"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;;
   *"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;;
-  *"With desktop + microphone audio + webcam")
-    local device=$(show_webcam_select_menu) || { back_to show_capture_menu; return; }
-    omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam --webcam-device="$device"
-    ;;
+  *"With desktop + microphone audio + webcam") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam ;;
   *) back_to show_capture_menu ;;
   esac
 }
@@ -174,13 +141,6 @@ show_toggle_menu() {
   esac
 }
 
-show_hardware_menu() {
-  case $(menu "Toggle" "  Hybrid GPU") in
-  *"Hybrid GPU"*) present_terminal omarchy-toggle-hybrid-gpu ;;
-  *) show_trigger_menu ;;
-  esac
-}
-
 show_style_menu() {
   case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n  Hyprland\n󱄄  Screensaver\n  About") in
   *Theme*) show_theme_menu ;;
@@ -207,20 +167,20 @@ show_font_menu() {
 }
 
 show_setup_menu() {
-  local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n  System Sleep\n󰍹  Monitors"
+  local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n󰍹  Monitors"
   [ -f ~/.config/hypr/bindings.conf ] && options="$options\n  Keybindings"
   [ -f ~/.config/hypr/input.conf ] && options="$options\n  Input"
-  options="$options\n󰱔  DNS\n  Security\n  Config"
+  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*) open_in_editor ~/.config/uwsm/default ;;
   *DNS*) present_terminal omarchy-setup-dns ;;
   *Security*) show_setup_security_menu ;;
   *Config*) show_setup_config_menu ;;
@@ -238,17 +198,8 @@ show_setup_power_menu() {
   fi
 }
 
-show_setup_security_menu() {
-  case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
-  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
-  *Fido2*) present_terminal omarchy-setup-fido2 ;;
-  *) show_setup_menu ;;
-  esac
-}
-
 show_setup_config_menu() {
-  case $(menu "Setup" "  Defaults\n  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar\n󰞅  XCompose") in
-  *Defaults*) open_in_editor ~/.config/uwsm/default ;;
+  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 ;;
@@ -257,29 +208,14 @@ show_setup_config_menu() {
   *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 ;;
+  *) show_main_menu ;;
   esac
 }
 
-show_setup_system_menu() {
-  local options=""
-
-  if [ -f ~/.local/state/omarchy/toggles/suspend-on ]; then
-    options="$options󰒲  Disable Suspend"
-  else
-    options="$options󰒲  Enable 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_security_menu() {
+  case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
+  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
+  *Fido2*) present_terminal omarchy-setup-fido2 ;;
   *) show_setup_menu ;;
   esac
 }
@@ -340,10 +276,10 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "  Dictation\n󱚤  Claude Code\n󱚤  Copilot CLI\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
-  *Dictation*) present_terminal omarchy-voxtype-install ;;
+  case $(menu "Install" "  Dictation [AUR]\n󱚤  Claude Code\n󱚤  Copilot CLI [AUR]\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
+  *Dictation*) present_terminal "echo 'Installing Hyprwhspr from AUR...'; yay -S --noconfirm hyprwhspr && hyprwhspr setup" ;;
   *Claude*) install "Claude Code" "claude-code" ;;
-  *Copilot*) install "Copilot CLI" "github-copilot-cli" ;;
+  *Copilot*) aur_install "Copilot CLI" "github-copilot-cli" ;;
   *Cursor*) install "Cursor CLI" "cursor-cli" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
   *OpenAI*) install "OpenAI Codex" "openai-codex" ;;
@@ -430,12 +366,11 @@ show_install_elixir_menu() {
 }
 
 show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\n  Dictation\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
+  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
   *Package*) terminal omarchy-pkg-remove ;;
   *Web*) present_terminal omarchy-webapp-remove ;;
   *TUI*) present_terminal omarchy-tui-remove ;;
   *Development*) show_remove_development_menu ;;
-  *Dictation*) present_terminal omarchy-voxtype-remove ;;
   *Theme*) present_terminal omarchy-theme-remove ;;
   *Windows*) present_terminal "omarchy-windows-vm remove" ;;
   *Fingerprint*) present_terminal "omarchy-setup-fingerprint --remove" ;;
@@ -445,7 +380,7 @@ show_remove_menu() {
 }
 
 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") in
+  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") in
   *Rails*) present_terminal "omarchy-remove-dev-env ruby" ;;
   *JavaScript*) show_remove_javascript_menu ;;
   *Go*) present_terminal "omarchy-remove-dev-env go" ;;
@@ -463,7 +398,7 @@ show_remove_development_menu() {
 }
 
 show_remove_javascript_menu() {
-  case $(menu "Remove" "  Node.js\n  Bun\n  Deno") in
+  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" ;;
@@ -472,7 +407,7 @@ show_remove_javascript_menu() {
 }
 
 show_remove_php_menu() {
-  case $(menu "Remove" "  PHP\n  Laravel\n  Symfony") in
+  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" ;;
@@ -481,7 +416,7 @@ show_remove_php_menu() {
 }
 
 show_remove_elixir_menu() {
-  case $(menu "Remove" "  Elixir\n  Phoenix") in
+  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 ;;
@@ -555,16 +490,9 @@ show_update_password_menu() {
 }
 
 show_system_menu() {
-  local options="  Lock\n󱄄  Screensaver"
-  [ -f ~/.local/state/omarchy/toggles/suspend-on ] && options="$options\n󰒲  Suspend"
-  omarchy-hibernation-available && options="$options\n󰤁  Hibernate"
-  options="$options\n󰜉  Restart\n󰐥  Shutdown"
-
-  case $(menu "System" "$options") in
+  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰜉  Restart\n󰐥  Shutdown") in
   *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
-  *Suspend*) systemctl suspend ;;
-  *Hibernate*) systemctl hibernate ;;
   *Restart*) omarchy-cmd-reboot ;;
   *Shutdown*) omarchy-cmd-shutdown ;;
   *) back_to show_main_menu ;;
@@ -581,7 +509,6 @@ go_to_menu() {
   *learn*) show_learn_menu ;;
   *trigger*) show_trigger_menu ;;
   *share*) show_share_menu ;;
-  *capture*) show_capture_menu ;;
   *style*) show_style_menu ;;
   *theme*) show_theme_menu ;;
   *screenshot*) show_screenshot_menu ;;

bin/omarchy-menu-keybindings

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-# Display Hyprland keybindings defined in your configuration using walker for an interactive search menu.
+# A script to display Hyprland keybindings defined in your configuration
+# using walker for an interactive search menu.
 
 declare -A KEYCODE_SYM_MAP
 
@@ -175,37 +176,28 @@ prioritize_entries() {
     if (match(line, /System menu/))  prio = 5
     if (match(line, /Theme menu/))  prio = 6
     if (match(line, /Full screen/))  prio = 7
-    if (match(line, /Full width/))  prio = 8
-    if (match(line, /Close window/))  prio = 9
-    if (match(line, /Close all windows/))  prio = 10
-    if (match(line, /Lock system/))  prio = 11
-    if (match(line, /Toggle window floating/))  prio = 12
-    if (match(line, /Toggle window split/))  prio = 13
-    if (match(line, /Pop window/))  prio = 14
-    if (match(line, /Universal/))  prio = 15
-    if (match(line, /Clipboard/))  prio = 16
-    if (match(line, /Audio controls/))  prio = 17
-    if (match(line, /Bluetooth controls/))  prio = 18
-    if (match(line, /Wifi controls/))  prio = 19
-    if (match(line, /Emoji picker/))  prio = 20
-    if (match(line, /Color picker/))  prio = 21
-    if (match(line, /Screenshot/))  prio = 22
-    if (match(line, /Screenrecording/))  prio = 23
-    if (match(line, /(Switch|Next|Former|Previous).*workspace/))  prio = 24
-    if (match(line, /Move window to workspace/))  prio = 25
-    if (match(line, /Move window silently to workspace/))  prio = 26
-    if (match(line, /Swap window/))  prio = 27
-    if (match(line, /Move window focus/))  prio = 28
-    if (match(line, /Move window$/))  prio = 29
-    if (match(line, /Resize window/))  prio = 30
-    if (match(line, /Expand window/))  prio = 31
-    if (match(line, /Shrink window/))  prio = 32
-    if (match(line, /scratchpad/))  prio = 33
-    if (match(line, /notification/))  prio = 34
-    if (match(line, /Toggle window transparency/))  prio = 35
-    if (match(line, /Toggle workspace gaps/))  prio = 36
-    if (match(line, /Toggle nightlight/))  prio = 37
-    if (match(line, /Toggle locking/))  prio = 38
+    if (match(line, /Close window/))  prio = 8
+    if (match(line, /Toggle window floating/))  prio = 9
+    if (match(line, /Toggle window split/))  prio = 10
+    if (match(line, /Universal/))  prio = 11
+    if (match(line, /Clipboard/))  prio = 12
+    if (match(line, /Emoji picker/))  prio = 13
+    if (match(line, /Color picker/))  prio = 14
+    if (match(line, /Screenshot/))  prio = 15
+    if (match(line, /Screenrecording/))  prio = 16
+    if (match(line, /(Switch|Next|Former|Previous).*workspace/))  prio = 17
+    if (match(line, /Move window to workspace/))  prio = 18
+    if (match(line, /Swap window/))  prio = 19
+    if (match(line, /Move window focus/))  prio = 20
+    if (match(line, /Move window$/))  prio = 21
+    if (match(line, /Resize window/))  prio = 22
+    if (match(line, /Expand window/))  prio = 23
+    if (match(line, /Shrink window/))  prio = 24
+    if (match(line, /scratchpad/))  prio = 25
+    if (match(line, /notification/))  prio = 26
+    if (match(line, /Toggle window transparency/))  prio = 27
+    if (match(line, /Toggle workspace gaps/))  prio = 28
+    if (match(line, /Toggle nightlight/))  prio = 29
     if (match(line, /group/))  prio = 94
     if (match(line, /Scroll active workspace/))  prio = 95
     if (match(line, /Cycle to/))  prio = 96

bin/omarchy-migrate

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Run all pending migrations to bring the system in line with the installed version.
-
 # Where we store an empty file for each migration that has already been performed.
 STATE_DIR="$HOME/.local/state/omarchy/migrations"
 mkdir -p "$STATE_DIR"

bin/omarchy-notification-dismiss

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Dismiss a mako notification on the basis of its summary. Used by the first-run notifications to dismiss them after clicking for action.
-
 if (($# == 0)); then
   echo "Usage: omarchy-notification-dismiss <summary>"
   exit 1

bin/omarchy-pkg-add

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Add the named packages to the system if they're missing. Returns false if it couldn't be done.
-
 if omarchy-pkg-missing "$@"; then
   sudo pacman -S --noconfirm --needed "$@" || exit 1
 fi

bin/omarchy-pkg-aur-accessible

@@ -1,7 +1,4 @@
 #!/bin/bash
 
-# Returns true if the AUR is up and available.
-# Used by omarchy-update-system-pkgs to ensure the AUR is available before updating packages from it.
-
 curl -sf --connect-timeout 30 --retry 3 --retry-delay 3 -A "omarchy-update" \
   "https://aur.archlinux.org/rpc/?v=5&type=info&arg=base" >/dev/null

bin/omarchy-pkg-aur-add

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Add the named packages to the system from the AUR if they're missing. Returns false if it couldn't be done.
-
-if omarchy-pkg-missing "$@"; then
-  yay -S --noconfirm --needed "$@" || exit 1
-fi
-
-for pkg in "$@"; do
-  # Secondary check to handle states where pacman doesn't actually register an error
-  if ! pacman -Q "$pkg" &>/dev/null; then
-    echo -e "\033[31mError: Package '$pkg' did not install\033[0m" >&2
-    exit 1
-  fi
-done
-
-exit 0

bin/omarchy-pkg-aur-install

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Show a fuzzy-finder TUI for picking new AUR packages to install.
-
 fzf_args=(
   --multi
   --preview 'yay -Siia {1}'

bin/omarchy-pkg-drop

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Remove all the named packages from the system if they're installed (otherwise ignore).
-
 for pkg in "$@"; do
   if pacman -Q "$pkg" &>/dev/null; then
     sudo pacman -Rns --noconfirm "$pkg"

bin/omarchy-pkg-install

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Show a fuzzy-finder TUI for picking new Arch and OPR packages to install.
-
 fzf_args=(
   --multi
   --preview 'pacman -Sii {1}'

bin/omarchy-pkg-missing

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Returns true if any of the named packages are missing from the system (or false if they're all there).
-
 for pkg in "$@"; do
   if ! pacman -Q "$pkg" &>/dev/null; then
     exit 0

bin/omarchy-pkg-present

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Returns true if all of the named packages are installed on the system (or false if any of them are missing).
-
 for pkg in "$@"; do
   pacman -Q "$pkg" &>/dev/null || exit 1
 done

bin/omarchy-pkg-remove

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Show a fuzzy-finder TUI for picking packages installed on the system to be removed.
-
 fzf_args=(
   --multi
   --preview 'yay -Qi {1}'

bin/omarchy-powerprofiles-list

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Returns a list of all the available power profiles on the system.
-# Used by the Omarchy Menu under Setup > Power Profile.
-
 powerprofilesctl list |
   awk '/^\s*[* ]\s*[a-zA-Z0-9\-]+:$/ { gsub(/^[*[:space:]]+|:$/,""); print }' |
   tac

bin/omarchy-refresh-applications

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Ensure all default .desktop, web apps, and TUIs are installed.
-
 # Copy and sync icon files
 mkdir -p ~/.local/share/icons/hicolor/48x48/apps/
 cp ~/.local/share/omarchy/applications/icons/*.png ~/.local/share/icons/hicolor/48x48/apps/
@@ -12,9 +10,8 @@ mkdir -p ~/.local/share/applications
 cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/
 cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/
 
-# Refresh the webapps and TUIs
+# Refresh the webapps
 bash $OMARCHY_PATH/install/packaging/icons.sh
 bash $OMARCHY_PATH/install/packaging/webapps.sh
-bash $OMARCHY_PATH/install/packaging/tuis.sh
 
 update-desktop-database ~/.local/share/applications

bin/omarchy-refresh-chromium

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Refresh the ~/.config/chromium-flags.conf file from the Omarchy defaults.
-
 CONFIG_FILE="$HOME/.config/chromium-flags.conf"
 INSTALL_GOOGLE_ACCOUNTS=false
 

bin/omarchy-refresh-config

@@ -1,8 +1,6 @@
 #!/bin/bash
 
-# Copies the named config from ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z.
-# If the config already exists, a backup of the existing will be taken as .bak.TIMESTAMP.
-
+# This script deploys ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z
 config_file=$1
 
 if [[ -z "$config_file" ]]; then
@@ -11,8 +9,8 @@ if [[ -z "$config_file" ]]; then
 
   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
-
-    $0 hypr/hyprlock.conf
+    
+    $0 hypr/hyprlock.conf     
 USAGE
   exit 1
 fi

bin/omarchy-refresh-fastfetch

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-# Overwrite the user config for fastfetch with the Omarchy default.
-
 omarchy-refresh-config fastfetch/config.jsonc

bin/omarchy-refresh-hypridle

@@ -1,6 +1,4 @@
 #!/bin/bash
 
-# Overwrite the user config for hypridle with the Omarchy default and restart the service.
-
 omarchy-refresh-config hypr/hypridle.conf
 omarchy-restart-hypridle

bin/omarchy-refresh-hyprland

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Overwrite all the user 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

bin/omarchy-refresh-hyprlock

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-# Overwrite the user config for hyprlock with the Omarchy default.
-
 omarchy-refresh-config hypr/hyprlock.conf

bin/omarchy-refresh-hyprsunset

@@ -1,6 +1,4 @@
 #!/bin/bash
 
-# Overwrite the user config for hyprsunset with the Omarchy default and restart the service.
-#
 omarchy-refresh-config hypr/hyprsunset.conf
 omarchy-restart-hyprsunset

bin/omarchy-refresh-limine

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Overwrite the user config for the Limine bootloader and rebuild it.
-
 if [[ -f /boot/EFI/Linux/omarchy_linux.efi ]] && [[ -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi ]]; then
   echo "Cleanup extra UKI"
   sudo rm -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi
@@ -10,7 +8,27 @@ 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 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

bin/omarchy-refresh-pacman

@@ -1,19 +1,18 @@
 #!/bin/bash
 
-# Overwrite the package configuration for /etc/pacman with the Omarchy default of using its dedicated mirrors and repositories, then update all packages.
-# This is used after switching between Omarchy release channels to ensure the right packages for the right channel are available.
-
 # Take backup of existing files
 sudo cp -f /etc/pacman.conf /etc/pacman.conf.bak
 sudo cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak
 
+sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
+
 if [[ $1 == "edge" ]]; then
-  sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-edge.conf /etc/pacman.conf
   sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
+  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf
   echo "Setting channel to edge"
 else
-  sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-stable.conf /etc/pacman.conf
   sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
+  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf
   echo "Setting channel to stable"
 fi
 

bin/omarchy-refresh-plymouth

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Overwrite the user config for the Plymouth drive decryption and boot sequence with the Omarchy default and rebuild it.
-
 sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
 sudo plymouth-set-default-theme omarchy
 

bin/omarchy-refresh-swayosd

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# 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

bin/omarchy-refresh-walker

@@ -1,10 +1,8 @@
 #!/bin/bash
 
-# Overwrite the user configs for the Walker application launcher (which also powers the Omarchy Menu) and restart the services.
-
 # Ensure walker is set to autostart
 mkdir -p ~/.config/autostart/
-cp $OMARCHY_PATH/default/walker/walker.desktop ~/.config/autostart/
+cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/
 systemctl --user daemon-reload
 
 omarchy-refresh-config walker/config.toml

bin/omarchy-refresh-waybar

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Overwrite the user configs for the Waybar menu bar with the Omarchy defaults and restart the service.
-
 omarchy-refresh-config waybar/config.jsonc
 omarchy-refresh-config waybar/style.css
 omarchy-restart-waybar

bin/omarchy-reinstall

@@ -1,14 +1,33 @@
 #!/bin/bash
+
 set -e
 
-# Attempt to reinstall all default Omarchy packages and reset all the default configs.
+if [ "$EUID" -eq 0 ]; then
+  echo "Error: This script should not be run as root"
+  exit 1
+fi
 
-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"
+echo -e "This will reinstall all the default Omarchy packages and reset all default configs.\nWarning: All 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
-  omarchy-reinstall-pkgs
-  omarchy-reinstall-configs
+  echo "Resetting Omarchy repository"
+  git clone "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
+  rm -rf $OMARCHY_PATH
+  mv ~/.local/share/omarchy-new $OMARCHY_PATH
 
-  gum confirm "System has been reinstalled. Reboot?" && omarchy-cmd-reboot
+  echo "Reinstalling missing Omarchy packages"
+  mapfile -t packages < <(grep -v '^#' "$OMARCHY_PATH/install/omarchy-base.packages" | grep -v '^$')
+  sudo pacman -Syu --noconfirm --needed "${packages[@]}"
+
+  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
+
+  $(bash $OMARCHY_PATH/install/config/theme.sh)
+  $(bash $OMARCHY_PATH/install/config/git.sh)
+
+  omarchy-refresh-limine
+  omarchy-refresh-plymouth
+  omarchy-nvim-setup
 fi

bin/omarchy-reinstall-configs

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-# Overwrite all user configs with the Omarchy defaults.
-
-if [ "$EUID" -eq 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
-
-$(bash $OMARCHY_PATH/install/config/theme.sh)
-
-omarchy-refresh-limine
-omarchy-refresh-plymouth
-omarchy-nvim-setup

bin/omarchy-reinstall-git

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-# Reinstall the Omarchy configuration directory from the git source.
-
-git clone "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

bin/omarchy-reinstall-pkgs

@@ -1,14 +0,0 @@
-#!/bin/bash
-set -e
-
-# Reinstall all default Omarchy packages from the stable channel and downgrade any packages that are too new.
-
-# Set the package repository to the stable mirrors
-omarchy-refresh-pacman
-
-# Downgrade any packages to the stable setup
-sudo 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[@]}"

bin/omarchy-restart-btop

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Reload btop configuration (used by the Omarchy theme switching).
-
-pkill -SIGUSR2 btop

bin/omarchy-restart-hyprctl

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Reload hyprland configuration (used by the Omarchy theme switching).
-
-hyprctl reload >/dev/null

bin/omarchy-restart-mako

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Reload mako configuration (used by the Omarchy theme switching).
-
-makoctl reload

bin/omarchy-restart-opencode

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Reload opencode configuration (used by the Omarchy theme switching).
-
-killall -SIGUSR2 opencode

bin/omarchy-restart-terminal

@@ -4,10 +4,10 @@ if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
   touch ~/.config/alacritty/alacritty.toml
 fi
 
-if pgrep -x kitty >/dev/null; then
-  killall -SIGUSR1 kitty >/dev/null
+if pgrep -x kitty; then
+  killall -SIGUSR1 kitty
 fi
 
-if pgrep -x ghostty >/dev/null; then
+if pgrep -x ghostty; then
   killall -SIGUSR2 ghostty
 fi

bin/omarchy-setup-fingerprint

@@ -20,11 +20,7 @@ print_info() {
 }
 
 check_fingerprint_hardware() {
-  # Get fingerprint devices for the user
-  devices=$(fprintd-list "$USER" 2>/dev/null)
-
-  # Exit if no devices found
-  if [[ -z "$devices" ]]; then
+  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix|elan|validity|FPC'; then
     print_error "\nNo fingerprint sensor detected."
     return 1
   fi

bin/omarchy-swayosd-brightness

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Display brightness level using SwayOSD on the current monitor.
-# Usage: omarchy-swayosd-brightness <percent>
-
-percent="$1"
-
-progress="$(awk -v p="$percent" 'BEGIN{printf "%.2f", p/100}')"
-[[ "$progress" == "0.00" ]] && progress="0.01"
-
-swayosd-client \
-  --monitor "$(hyprctl monitors -j | jq -r '.[]|select(.focused==true).name')" \
-  --custom-icon display-brightness \
-  --custom-progress "$progress" \
-  --custom-progress-text "${percent}%"

bin/omarchy-theme-set

@@ -47,15 +47,17 @@ if pgrep -x waybar >/dev/null; then
 fi
 omarchy-restart-swayosd
 omarchy-restart-terminal
-omarchy-restart-hyprctl
-omarchy-restart-btop
-omarchy-restart-opencode
-omarchy-restart-mako
+hyprctl reload
+pkill -SIGUSR2 btop
+# pkill -SIGUSR2 opencode
+makoctl reload
 
 # Change app-specific themes
 omarchy-theme-set-gnome
 omarchy-theme-set-browser
 omarchy-theme-set-vscode
+omarchy-theme-set-vscodium
+omarchy-theme-set-cursor
 omarchy-theme-set-obsidian
 
 # Call hook on theme set

bin/omarchy-theme-set-browser

@@ -2,7 +2,7 @@
 
 CHROMIUM_THEME=~/.config/omarchy/current/theme/chromium.theme
 
-if omarchy-cmd-present chromium || omarchy-cmd-present brave; then
+if omarchy-cmd-present chromium || omarchy-cmd-present helium-browser || omarchy-cmd-present brave; then
   if [[ -f $CHROMIUM_THEME ]]; then
     THEME_RGB_COLOR=$(<$CHROMIUM_THEME)
     THEME_HEX_COLOR=$(printf '#%02x%02x%02x' ${THEME_RGB_COLOR//,/ })
@@ -13,12 +13,18 @@ if omarchy-cmd-present chromium || omarchy-cmd-present brave; then
   fi
 
   if omarchy-cmd-present chromium; then
-    echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/chromium/policies/managed/color.json" >/dev/null
-    chromium --refresh-platform-policy --no-startup-window >/dev/null
+    rm -f /etc/chromium/policies/managed/color.json
+    chromium --no-startup-window --set-theme-color="$THEME_RGB_COLOR"
+
+    if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+      chromium --no-startup-window --set-color-scheme="light"
+    else
+      chromium --no-startup-window --set-color-scheme="dark"
+    fi
   fi
 
   if omarchy-cmd-present brave; then
     echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/brave/policies/managed/color.json" >/dev/null
-    brave --refresh-platform-policy --no-startup-window >/dev/null
+    brave --refresh-platform-policy --no-startup-window
   fi
 fi

bin/omarchy-theme-set-cursor

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Call the VSCode theme setter with Cursor-specific parameters
+omarchy-theme-set-vscode cursor "$HOME/.config/Cursor/User/settings.json" "$HOME/.local/state/omarchy/toggles/skip-cursor-theme-changes"

bin/omarchy-theme-set-obsidian

@@ -1,18 +1,52 @@
 #!/bin/bash
 
-# Sync Omarchy theme to all Obsidian vaults
+# omarchy-theme-set-obsidian: Bootstrap and update Omarchy theme for Obsidian
+#
+# - Ensures registry at ~/.local/state/omarchy/obsidian-vaults
+#   - Populates by extracting vault paths from ~/.config/obsidian/obsidian.json
+# - For each valid vault:
+#   - Ensures .obsidian/themes/Omarchy/{manifest.json, theme.css}
+#   - Updates theme.css (uses current theme’s obsidian.css if present; otherwise generates -- see below)
 
+# Theme automagic generation logic:
+#
+# - Background/foreground: read from ~/.config/omarchy/current/theme/alacritty.toml [colors.primary]
+#   (background/foreground). Fallbacks: bg=#1a1b26, fg=#a9b1d6. Compute bg brightness for light/dark handling.
+# - Palette extraction: collect colors from Alacritty (primary/normal/bright/dim/selection), Waybar (@define-color),
+#   and Hyprland (col.*_border; rgba->hex). Normalize, dedupe, and count frequencies.
+# - Slot ordering: remove bg/fg, sort remaining colors by frequency, then fill 13 slots by cycling. Map slots to:
+#   h1–h6, links, inline code, marks, interactive accent, blockquote border; muted/faint use border color.
+# - Code colors: code background = closest color to bg (Euclidean RGB); if none, make a subtle bg variant (+/− RGB).
+#   code foreground = closest color to fg; fallback #e0e0e0.
+# - Border color: from btop.theme theme[div_line]; else blended mix biased toward bg (≈ (bg+fg)/3).
+# - Selection: from Alacritty [colors.selection] (background/text), honoring CellForeground/Background.
+#   If missing, background = 75% bg + 25% fg; text chosen for contrast vs selection background.
+# - Fonts: monospace from Alacritty [font] or fontconfig monospace; UI font from fontconfig sans-serif.
+
+VAULTS_FILE="$HOME/.local/state/omarchy/obsidian-vaults"
 CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
 
-[ -f "$CURRENT_THEME_DIR/obsidian.css" ] || exit 0
+ensure_vaults_file() {
+  mkdir -p "$(dirname "$VAULTS_FILE")"
+  local tmpfile
+  tmpfile="$(mktemp)"
+  # Extract the Obsidian vault location from config file <base>/<vault>/.obsidian
+  jq -r '.vaults | values[].path' ~/.config/obsidian/obsidian.json 2>/dev/null >>"$tmpfile"
+    if [ -s "$tmpfile" ]; then
+      sort -u "$tmpfile" >"$VAULTS_FILE"
+    else
+      : >"$VAULTS_FILE"
+    fi
+    rm "$tmpfile"
+}
 
-jq -r '.vaults | values[].path' ~/.config/obsidian/obsidian.json 2>/dev/null | while read -r vault_path; do
-  [ -d "$vault_path/.obsidian" ] || continue
-
-  theme_dir="$vault_path/.obsidian/themes/Omarchy"
+# Ensure theme directory and minimal manifest exist in a vault
+ensure_theme_scaffold() {
+  local vault_path="$1"
+  local theme_dir="$vault_path/.obsidian/themes/Omarchy"
   mkdir -p "$theme_dir"
-
-  [ -f "$theme_dir/manifest.json" ] || cat >"$theme_dir/manifest.json" <<'EOF'
+  if [ ! -f "$theme_dir/manifest.json" ]; then
+    cat >"$theme_dir/manifest.json" <<'EOF'
 {
   "name": "Omarchy",
   "version": "1.0.0",
@@ -22,6 +56,629 @@ jq -r '.vaults | values[].path' ~/.config/obsidian/obsidian.json 2>/dev/null | w
   "authorUrl": "https://omarchy.org"
 }
 EOF
+  fi
+  [ -f "$theme_dir/theme.css" ] || : >"$theme_dir/theme.css"
+}
 
-  cp "$CURRENT_THEME_DIR/obsidian.css" "$theme_dir/theme.css"
-done
+# Function to extract hex color from string
+extract_hex_color() {
+  echo "$1" | grep -oE '#[0-9a-fA-F]{6}' | head -1
+}
+
+# Function to convert RGB/RGBA to hex
+rgb_to_hex() {
+  local rgb_string="$1"
+  if [[ $rgb_string =~ rgba?\(([0-9]+),\s*([0-9]+),\s*([0-9]+) ]]; then
+    printf "#%02x%02x%02x\n" "${BASH_REMATCH[1]}" "${BASH_REMATCH[2]}" "${BASH_REMATCH[3]}"
+  fi
+}
+
+# Convert hex to RGB components
+hex_to_rgb() {
+  local hex="${1#\#}"
+  printf "%d %d %d\n" "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
+}
+
+# Calculate perceived brightness (0-255)
+calculate_brightness() {
+  local hex="$1"
+  read -r r g b <<<"$(hex_to_rgb "$hex")"
+  # Use perceived brightness formula
+  echo $(((r * 299 + g * 587 + b * 114) / 1000))
+}
+
+# Calculate approximate contrast ratio between two colors
+# Returns ratio scaled by 100 (e.g., 450 = 4.5:1 ratio)
+# (this is due to bash not supporting decimal math)
+calculate_contrast_ratio() {
+  local hex1="$1" hex2="$2"
+  local br1=$(calculate_brightness "$hex1")  # 0-255 range
+  local br2=$(calculate_brightness "$hex2")  # 0-255 range
+
+  # Ensure br1 is the lighter color (higher brightness)
+  if [ $br1 -lt $br2 ]; then
+    local temp=$br1
+    br1=$br2
+    br2=$temp
+  fi
+
+  # Approximate contrast ratio scaled by 100
+  # Add offset to avoid division by zero and approximate WCAG +0.05 behavior
+  echo $(((br1 + 13) * 100 / (br2 + 13)))
+}
+
+# Check if two colors meet minimum contrast threshold
+# Usage: meets_contrast_threshold <ratio> <threshold>
+# Both ratio and threshold should be scaled by 100 (e.g., 300 = 3:1)
+meets_contrast_threshold() {
+  local ratio="$1"        # Ratio scaled by 100 (from calculate_contrast_ratio)
+  local threshold="$2"    # Threshold scaled by 100 (300=3:1, 450=4.5:1, 700=7:1)
+  [ $ratio -ge $threshold ]
+}
+
+# Calculate color distance (euclidean in RGB space)
+color_distance() {
+  local hex1="$1"
+  local hex2="$2"
+  read -r r1 g1 b1 <<<"$(hex_to_rgb "$hex1")"
+  read -r r2 g2 b2 <<<"$(hex_to_rgb "$hex2")"
+  echo $(((r1 - r2) * (r1 - r2) + (g1 - g2) * (g1 - g2) + (b1 - b2) * (b1 - b2)))
+}
+
+# Extract all colors with frequency count
+extract_all_colors_with_count() {
+  local -A color_counts
+  local color
+
+  # Extract from Alacritty config
+  if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
+    # Primary colors
+    while IFS= read -r color; do
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [ -n "$color" ] && ((color_counts["$color"]++))
+    done < <(grep -E "(background|foreground|cursor|text)" "$CURRENT_THEME_DIR/alacritty.toml" | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | grep "^#")
+
+    # Normal colors
+    while IFS= read -r color; do
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [ -n "$color" ] && ((color_counts["$color"]++))
+    done < <(grep -A 20 "\[colors.normal\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep -E "(black|red|green|yellow|blue|magenta|cyan|white)" | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | grep "^#")
+
+    # Bright colors
+    while IFS= read -r color; do
+      # Add # if missing
+      [[ "$color" =~ ^[0-9a-fA-F]{6}$ ]] && color="#$color"
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [[ "$color" =~ ^#[0-9a-f]{6}$ ]] && ((color_counts["$color"]++))
+    done < <(grep -A 20 "\[colors.bright\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep -E "(black|red|green|yellow|blue|magenta|cyan|white)" | sed "s/.*[\"']//;s/[\"'].*//")
+
+    # Dim colors if present
+    while IFS= read -r color; do
+      # Add # if missing
+      [[ "$color" =~ ^[0-9a-fA-F]{6}$ ]] && color="#$color"
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [[ "$color" =~ ^#[0-9a-f]{6}$ ]] && ((color_counts["$color"]++))
+    done < <(grep -A 20 "\[colors.dim\]" "$CURRENT_THEME_DIR/alacritty.toml" 2>/dev/null | grep -E "(black|red|green|yellow|blue|magenta|cyan|white)" | sed "s/.*[\"']//;s/[\"'].*//")
+
+    # Selection colors
+    while IFS= read -r color; do
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [ -n "$color" ] && ((color_counts["$color"]++))
+    done < <(grep -A 5 "\[colors.selection\]" "$CURRENT_THEME_DIR/alacritty.toml" 2>/dev/null | grep -E "(background|text)" | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | grep "^#")
+  fi
+
+  # Extract from Waybar CSS
+  if [ -f "$CURRENT_THEME_DIR/waybar.css" ]; then
+    while IFS= read -r color; do
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [ -n "$color" ] && ((color_counts["$color"]++))
+    done < <(grep -oE '@define-color [a-z_-]+ #[0-9a-fA-F]{6}' "$CURRENT_THEME_DIR/waybar.css" | grep -oE '#[0-9a-fA-F]{6}')
+  fi
+
+  # Extract from Hyprland config
+  if [ -f "$CURRENT_THEME_DIR/hyprland.conf" ]; then
+    while IFS= read -r color; do
+      if [[ $color == rgba* ]] || [[ $color == rgb* ]]; then
+        color=$(rgb_to_hex "$color")
+      fi
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [ -n "$color" ] && ((color_counts["$color"]++))
+    done < <(grep -E "col\.(active|inactive)_border" "$CURRENT_THEME_DIR/hyprland.conf" | grep -oE 'rgba?\([^)]+\)|#[0-9a-fA-F]{6,8}' | sed 's/ff$//')
+  fi
+
+  # Output colors with their counts
+  for color in "${!color_counts[@]}"; do
+    echo "${color_counts[$color]} $color"
+  done
+}
+
+# Sort colors by frequency
+sort_colors_by_frequency() {
+  # Input is already "count color" format
+  sort -rn | cut -d' ' -f2
+}
+
+# Fill color slots with cycling if needed
+fill_color_slots() {
+  local -a colors=("$@")
+  local -a slots
+  local num_colors=${#colors[@]}
+
+  # Need 13 slots total (code colors are handled separately)
+  local slots_needed=13
+
+  if [ $num_colors -eq 0 ]; then
+    # No colors available, use defaults
+    colors=("#3d3d3d" "#5d5d5d" "#7d7d7d" "#9d9d9d" "#bd93f9" "#50fa7b")
+    num_colors=6
+  fi
+
+  # Fill slots, cycling if necessary
+  for ((i = 0; i < slots_needed; i++)); do
+    slots[$i]="${colors[$((i % num_colors))]}"
+  done
+
+  echo "${slots[@]}"
+}
+
+# Main color extraction and theme generation
+extract_theme_data() {
+  # Get primary colors from Alacritty
+  local bg_color="#1a1b26"
+  local fg_color="#a9b1d6"
+
+  if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
+    local extracted_bg=$(grep -A 5 "\[colors.primary\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^background = " | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | head -1 | tr '[:upper:]' '[:lower:]')
+    local extracted_fg=$(grep -A 5 "\[colors.primary\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^foreground = " | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | head -1 | tr '[:upper:]' '[:lower:]')
+    [ -n "$extracted_bg" ] && bg_color="$extracted_bg"
+    [ -n "$extracted_fg" ] && fg_color="$extracted_fg"
+  fi
+
+  # Determine if light or dark theme
+  local bg_brightness=$(calculate_brightness "$bg_color")
+  local is_light_theme=false
+  [ $bg_brightness -gt 127 ] && is_light_theme=true
+
+  # Extract all colors with counts
+  local color_data=$(extract_all_colors_with_count)
+
+  # Filter out background and foreground colors for the main array
+  local filtered_data=$(echo "$color_data" | grep -v "$bg_color" | grep -v "$fg_color")
+
+  # Get all unique colors (including bg/fg) for distance calculations
+  local -a all_unique_colors
+  readarray -t all_unique_colors < <(echo "$color_data" | cut -d' ' -f2 | sort -u)
+
+  # Find the 3 closest colors to background for background variations
+  local -a bg_distances
+  for color in "${all_unique_colors[@]}"; do
+    if [ "$color" != "$bg_color" ]; then
+      distance=$(color_distance "$color" "$bg_color")
+      bg_distances+=("$distance:$color")
+    fi
+  done
+
+  # All background variations use the same as primary background
+  local bg_primary_alt="$bg_color"
+  local bg_secondary="$bg_color"
+  local bg_secondary_alt="$bg_color"
+
+  # Generate code background color that will contrast with foreground text
+  read -r r g b <<<"$(hex_to_rgb "$bg_color")"
+  if [ $bg_brightness -gt 127 ]; then
+    r=$((r - 10))
+    g=$((g - 10))
+    b=$((b - 10))
+  else
+    r=$((r + 15))
+    g=$((g + 15))
+    b=$((b + 15))
+  fi
+  [ $r -lt 0 ] && r=0
+  [ $r -gt 255 ] && r=255
+  [ $g -lt 0 ] && g=0
+  [ $g -gt 255 ] && g=255
+  [ $b -lt 0 ] && b=0
+  [ $b -gt 255 ] && b=255
+  code_bg=$(printf "#%02x%02x%02x" "$r" "$g" "$b")
+
+
+  # Find closest color to foreground for code block text
+  local code_fg=""
+  min_distance=999999999
+  for color in "${all_unique_colors[@]}"; do
+    if [ "$color" != "$fg_color" ]; then
+      distance=$(color_distance "$color" "$fg_color")
+      if [ $distance -lt $min_distance ]; then
+        min_distance=$distance
+        code_fg="$color"
+      fi
+    fi
+  done
+  [ -z "$code_fg" ] && code_fg="#e0e0e0" # Fallback
+
+  # Extract text selection colors from Alacritty
+  local selection_bg=""
+  local selection_fg=""
+  if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
+    selection_bg=$(grep -A 5 "\[colors.selection\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^background = " | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | head -1 | tr '[:upper:]' '[:lower:]')
+    local selection_text=$(grep -A 5 "\[colors.selection\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^text = " | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | head -1 | tr '[:upper:]' '[:lower:]')
+
+    # If text is set to CellForeground/CellBackground, use the appropriate color
+    if [ -z "$selection_text" ] || [[ "$(grep -A 5 "\[colors.selection\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^text = ")" == *"CellForeground"* ]]; then
+      selection_fg="$fg_color"
+    elif [[ "$(grep -A 5 "\[colors.selection\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^text = ")" == *"CellBackground"* ]]; then
+      selection_fg="$bg_color"
+    else
+      selection_fg="$selection_text"
+    fi
+  fi
+
+  # Fallback if no selection colors found
+  if [ -z "$selection_bg" ]; then
+    read -r r1 g1 b1 <<<"$(hex_to_rgb "$bg_color")"
+    read -r r2 g2 b2 <<<"$(hex_to_rgb "$fg_color")"
+    local r=$(((r1 * 3 + r2) / 4)) # 75% background, 25% foreground
+    local g=$(((g1 * 3 + g2) / 4))
+    local b=$(((b1 * 3 + b2) / 4))
+    selection_bg=$(printf "#%02x%02x%02x" "$r" "$g" "$b")
+  fi
+
+  # Use contrasting color for selection text if not defined
+  if [ -z "$selection_fg" ]; then
+    # Calculate brightness of selection background
+    local sel_brightness=$(calculate_brightness "$selection_bg")
+    if [ $sel_brightness -gt 127 ]; then
+      selection_fg="$bg_color" # Dark text on light selection
+    else
+      selection_fg="$fg_color" # Light text on dark selection
+    fi
+  fi
+
+  # Extract border color from btop theme
+  local border_color=""
+  if [ -f "$CURRENT_THEME_DIR/btop.theme" ]; then
+    # Look for theme[div_line] in btop theme
+    local btop_divline=$(grep 'theme\[div_line\]' "$CURRENT_THEME_DIR/btop.theme" | head -1)
+
+    if [ -n "$btop_divline" ]; then
+      # Extract the color value after the = sign
+      local extracted=$(echo "$btop_divline" | sed 's/.*=//' | xargs)
+
+      # Check if it's a hex color and lowercase it
+      if [[ $extracted =~ ^#[0-9a-fA-F]{6}$ ]]; then
+        border_color=$(echo "$extracted" | tr '[:upper:]' '[:lower:]')
+      elif [[ $extracted =~ ^[0-9a-fA-F]{6}$ ]]; then
+        # Add # if missing and lowercase
+        border_color=$(echo "#$extracted" | tr '[:upper:]' '[:lower:]')
+      fi
+    fi
+  fi
+
+  # Fallback if no border color found
+  if [ -z "$border_color" ]; then
+    # Use a color between bg and fg
+    read -r r1 g1 b1 <<<"$(hex_to_rgb "$bg_color")"
+    read -r r2 g2 b2 <<<"$(hex_to_rgb "$fg_color")"
+    local r=$(((r1 + r2) / 3)) # Closer to background
+    local g=$(((g1 + g2) / 3))
+    local b=$(((b1 + b2) / 3))
+    border_color=$(printf "#%02x%02x%02x" "$r" "$g" "$b")
+  fi
+
+  # Set text colors for muted/faint based on contrast
+  local text_muted_color="$border_color"
+  local text_faint_color="$border_color"
+
+  # Validate border color contrast against background
+
+  # Represents a 3:1 WCAG contrast ratio
+  local ideal_contrast_ratio=300
+
+  local border_contrast=$(calculate_contrast_ratio "$border_color" "$bg_color")
+  if ! meets_contrast_threshold "$border_contrast" "$ideal_contrast_ratio"; then
+    # Override text colors for readability, keep border color for visibility
+    text_muted_color="$fg_color"
+    text_faint_color="$fg_color"
+  fi
+
+  # Get unique colors array (without bg/fg) sorted by frequency
+  local -a unique_colors
+  readarray -t unique_colors < <(echo "$filtered_data" | sort_colors_by_frequency)
+
+  # Fill the 13 color slots (code colors handled separately)
+  local -a color_slots
+  readarray -t color_slots < <(fill_color_slots "${unique_colors[@]}" | tr ' ' '\n')
+
+  # Extract fonts
+  local monospace_font="JetBrainsMono Nerd Font"
+  local ui_font="Liberation Sans"
+
+  if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
+    local alacritty_font=$(grep -A 5 "\[font\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep 'family = ' | head -1 | cut -d'"' -f2)
+    [ -n "$alacritty_font" ] && monospace_font="$alacritty_font"
+  fi
+
+  if [ -f "$HOME/.config/fontconfig/fonts.conf" ]; then
+    local fontconfig_mono=$(xmlstarlet sel -t -v '//match[@target="pattern"][test/string="monospace"]/edit[@name="family"]/string' "$HOME/.config/fontconfig/fonts.conf" 2>/dev/null || true)
+    [ -n "$fontconfig_mono" ] && monospace_font="$fontconfig_mono"
+
+    local fontconfig_sans=$(xmlstarlet sel -t -v '//match[@target="pattern"][test/string="sans-serif"]/edit[@name="family"]/string' "$HOME/.config/fontconfig/fonts.conf" 2>/dev/null || true)
+    [ -n "$fontconfig_sans" ] && ui_font="$fontconfig_sans"
+  fi
+
+  # Generate CSS with 14-slot system
+  cat <<EOF
+/* Omarchy Theme for Obsidian */
+/* Generated on $(date) from theme: $(basename "$(readlink "$CURRENT_THEME_DIR" 2>/dev/null || echo "unknown")") */
+/* Colors sorted by frequency, backgrounds by distance */
+
+.theme-dark, .theme-light {
+  /* Core colors */
+  --background-primary: $bg_color;
+  --text-normal: $fg_color;
+
+  /* Background variations (always distance-based) */
+  --background-primary-alt: $bg_primary_alt;
+  --background-secondary: $bg_secondary;
+  --background-secondary-alt: $bg_secondary_alt;
+
+  /* Code block colors (always distance-based) */
+  --code-background: $code_bg;
+  --code-foreground: $code_fg;
+
+  /* Border color from btop theme */
+  --border-color: $border_color;
+
+  /* Selection colors from Alacritty */
+  --text-selection: $selection_bg;
+  --text-selection-fg: $selection_fg;
+
+  /* 13-slot color system for remaining elements */
+  --text-title-h1: ${color_slots[0]};
+  --text-title-h2: ${color_slots[1]};
+  --text-title-h3: ${color_slots[2]};
+  --text-title-h4: ${color_slots[3]};
+  --text-title-h5: ${color_slots[4]};
+  --text-title-h6: ${color_slots[4]};  /* Same as h5 */
+  --text-link: ${color_slots[5]};
+  --markup-code: ${color_slots[6]};
+  --text-mark: ${color_slots[7]};
+  --interactive-accent: ${color_slots[8]};
+  --blockquote-border: ${color_slots[9]};
+  --text-muted: $text_muted_color;  /* Use text-specific color for muted text */
+  --text-faint: $text_faint_color;  /* Use text-specific color for faint text */
+
+  /* Additional mappings */
+  --text-accent: var(--interactive-accent);
+  --text-accent-hover: var(--interactive-accent);
+  --text-error: var(--text-title-h1);
+  --text-error-hover: var(--text-title-h1);
+  --text-highlight-bg: $fg_color;  /* Use text color as highlight background */
+  --text-on-accent: $bg_color;
+
+  --interactive-normal: var(--code-background);
+  --interactive-hover: var(--interactive-accent);
+  --interactive-accent-hover: var(--interactive-accent);
+  --interactive-success: var(--text-title-h2);
+
+  --scrollbar-bg: var(--background-primary);
+  --scrollbar-thumb-bg: var(--code-background);
+  --scrollbar-active-thumb-bg: var(--interactive-accent);
+
+  --background-modifier-border: var(--border-color);
+  --background-modifier-form-field: var(--code-background);
+  --background-modifier-form-field-highlighted: var(--code-background);
+  --background-modifier-box-shadow: rgba(0, 0, 0, 0.3);
+  --background-modifier-success: var(--interactive-success);
+  --background-modifier-error: var(--text-error);
+  --background-modifier-error-hover: var(--text-error);
+  --background-modifier-cover: rgba(0, 0, 0, 0.8);
+
+  --link-color: var(--text-link);
+  --link-color-hover: var(--text-link);
+  --link-unresolved-color: var(--text-muted);
+  --link-unresolved-opacity: 0.7;
+
+  --tag-color: var(--text-title-h3);
+  --tag-background: var(--code-background);
+
+  --graph-line: var(--text-muted);
+  --graph-node: var(--interactive-accent);
+  --graph-node-unresolved: var(--text-muted);
+  --graph-node-focused: var(--text-link);
+  --graph-node-tag: var(--text-title-h3);
+  --graph-node-attachment: var(--text-title-h2);
+
+  /* Fonts */
+  --font-interface-theme: "$ui_font";
+  --font-text-theme: "$ui_font";
+  --font-monospace-theme: "$monospace_font";
+}
+
+/* Headers */
+.cm-header-1, .markdown-rendered h1 { color: var(--text-title-h1); }
+.cm-header-2, .markdown-rendered h2 { color: var(--text-title-h2); }
+.cm-header-3, .markdown-rendered h3 { color: var(--text-title-h3); }
+.cm-header-4, .markdown-rendered h4 { color: var(--text-title-h4); }
+.cm-header-5, .markdown-rendered h5 { color: var(--text-title-h5); }
+.cm-header-6, .markdown-rendered h6 { color: var(--text-title-h6); }
+
+/* Code blocks */
+.markdown-rendered code {
+  font-family: var(--font-monospace-theme);
+  background-color: var(--code-background);
+  color: var(--markup-code);
+  padding: 2px 4px;
+  border-radius: 3px;
+}
+
+.markdown-rendered pre {
+  background-color: var(--code-background);
+  border: 1px solid var(--background-modifier-border);
+  border-radius: 5px;
+}
+
+.markdown-rendered pre code {
+  background-color: transparent;
+  color: var(--code-foreground);
+}
+
+/* Syntax highlighting */
+.cm-s-obsidian span.cm-keyword { color: var(--text-title-h1); }
+.cm-s-obsidian span.cm-string { color: var(--text-title-h2); }
+.cm-s-obsidian span.cm-number { color: var(--text-title-h3); }
+.cm-s-obsidian span.cm-comment { color: var(--text-muted); }
+.cm-s-obsidian span.cm-operator { color: var(--text-link); }
+.cm-s-obsidian span.cm-variable { color: var(--text-normal); }
+.cm-s-obsidian span.cm-def { color: var(--text-link); }
+
+/* Highlighted text */
+.markdown-rendered mark,
+.cm-s-obsidian span.cm-highlight,
+mark {
+  background-color: var(--text-highlight-bg) !important;
+  color: var(--code-background) !important;
+}
+
+/* Links */
+.markdown-rendered a {
+  color: var(--text-link);
+}
+
+/* Blockquotes */
+.markdown-rendered blockquote {
+  border-left: 4px solid var(--blockquote-border);
+  padding-left: 1em;
+}
+
+/* Status bar */
+.status-bar {
+  background-color: var(--code-background);
+  border-top: 1px solid var(--background-modifier-border);
+}
+
+/* Active file */
+.workspace-leaf.mod-active .workspace-leaf-header-title {
+  color: var(--interactive-accent);
+}
+
+.nav-file-title.is-active {
+  background-color: var(--code-background);
+  color: var(--interactive-accent);
+}
+
+/* Text selection */
+::selection {
+  background-color: var(--text-selection);
+  color: var(--text-selection-fg);
+}
+
+/* Search results */
+.search-result-file-title {
+  color: var(--interactive-accent);
+}
+
+.search-result-file-match {
+  background-color: var(--code-background);
+  color: var(--text-normal);
+  border-left: 3px solid var(--interactive-accent);
+}
+
+.search-result-file-matched-text {
+  color: var(--code-background);
+}
+
+/* Tables */
+.markdown-rendered table {
+  border: 1px solid var(--background-modifier-border);
+}
+
+.markdown-rendered th {
+  background-color: var(--code-background);
+  color: var(--text-accent);
+}
+
+.markdown-rendered td {
+  border: 1px solid var(--background-modifier-border);
+}
+
+/* Callouts */
+.callout {
+  border-left: 4px solid var(--interactive-accent);
+  background-color: var(--code-background);
+}
+.callout * {
+  color: var(--text-normal);
+}
+
+/* Modal dialogs */
+.modal {
+  background-color: var(--background-primary);
+  border: 2px solid var(--background-modifier-border);
+}
+
+/* Settings */
+.vertical-tab-header-group-title {
+  color: var(--interactive-accent);
+}
+
+.vertical-tab-nav-item.is-active {
+  background-color: var(--code-background);
+  color: var(--interactive-accent);
+}
+EOF
+}
+
+# Option handling
+if [ "${1:-}" = "--reset" ]; then
+  echo "♻️  Resetting Omarchy themes and registry..."
+  if [ -f "$VAULTS_FILE" ] && [ -s "$VAULTS_FILE" ]; then
+    while IFS= read -r vault_path || [ -n "$vault_path" ]; do
+      case "$vault_path" in ""|\#*) continue ;; esac
+      vault_path="${vault_path%/}"
+      vault_name=$(basename "$vault_path")
+      theme_dir="$vault_path/.obsidian/themes/Omarchy"
+      if [ -d "$theme_dir" ]; then
+        rm -rf "$theme_dir"
+        echo "   ✅ $vault_name (theme removed)"
+      else
+        echo "   ℹ️  $vault_name (no theme present)"
+      fi
+    done <"$VAULTS_FILE"
+  fi
+  rm -f "$VAULTS_FILE"
+  echo "✅ Registry removed"
+  exit 0
+fi
+
+# Main update logic
+echo "🔄 Updating Obsidian vaults..."
+
+# Step 1: ensure registry exists (bootstrap if needed)
+ensure_vaults_file
+
+while IFS= read -r vault_path || [ -n "$vault_path" ]; do
+  case "$vault_path" in "" | \#*) continue ;; esac
+  vault_path="${vault_path%/}"
+  vault_name=$(basename "$vault_path")
+
+  # Step 2: verify path exists; log/skip gracefully if invalid
+  if [ ! -d "$vault_path" ] || [ ! -d "$vault_path/.obsidian" ]; then
+    echo "   ❌ $vault_name (invalid entry: missing directory or .obsidian)"
+    continue
+  fi
+
+  # Ensure theme files exist for this vault
+  ensure_theme_scaffold "$vault_path"
+  THEME_DIR="$vault_path/.obsidian/themes/Omarchy"
+
+  # Step 3: update theme.css
+  if [ -f "$CURRENT_THEME_DIR/obsidian.css" ]; then
+    cp "$CURRENT_THEME_DIR/obsidian.css" "$THEME_DIR/theme.css"
+    echo "   ✅ $vault_name (custom theme)"
+  else
+    extract_theme_data >"$THEME_DIR/theme.css"
+    echo "   ✅ $vault_name (generated theme)"
+  fi
+done <"$VAULTS_FILE"