Revert "fix(aur): add -a flag to yay command to assume AUR packages (#4581 )"

This reverts commit b3dd14a038.
2026-08-02 20:28:19 +02:00 · 2026-02-17 11:55:18 +01:00
310 changed files with 1087 additions and 1877 deletions
@@ -1,11 +1,7 @@
 # Style

 - Two spaces for indentation, no tabs
- Use bash 5 conditionals: use `[[ ]]` for string/file tests and `(( ))` for numeric tests
- In `[[ ]]`, don't quote variables, but do quote string literals when comparing values (e.g., `[[ $branch == "dev" ]]`)
- Prefer `(( ))` over numeric operators inside `[[ ]]` (e.g., `(( count < 50 ))`, not `[[ $count -lt 50 ]]`)
- For strings/paths with spaces, quote them instead of escaping spaces with `\ ` (e.g., `"$APP_DIR/Disk Usage.desktop"`, not `$APP_DIR/Disk\ Usage.desktop`)
- Shebangs must use `#!/bin/bash` consistently (never `#!/usr/bin/env bash`)
+- Use Bash syntax for conditionals: `[[ -f $file ]]`, not `[ -f "$file" ]`

 # Command Naming

@@ -55,7 +51,6 @@ To create a new migration, run `omarchy-dev-add-migration --no-edit`. This creat
 Migration format:
 - No shebang line
 - Start with an `echo` describing what the migration does
- Use `$OMARCHY_PATH` to reference the omarchy directory

 Example:
 ```bash
@@ -1,21 +0,0 @@
-[Desktop Entry]
-Type=Application
-TryExec=alacritty
-Exec=alacritty
-Icon=Alacritty
-Terminal=false
-Categories=System;TerminalEmulator;
-Name=Alacritty
-GenericName=Terminal
-Comment=A fast, cross-platform, OpenGL terminal emulator
-StartupNotify=true
-StartupWMClass=Alacritty
-Actions=New;
-X-TerminalArgExec=-e
-X-TerminalArgAppId=--class=
-X-TerminalArgTitle=--title=
-X-TerminalArgDir=--working-directory=
-
-[Desktop Action New]
-Name=New Terminal
-Exec=alacritty
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -11,8 +11,8 @@ send_notification() {
  notify-send -u critical "󱐋 Time to recharge!" "Battery is down to ${1}%" -i battery-caution -t 30000
 }

-if [[ -n $BATTERY_LEVEL && $BATTERY_LEVEL =~ ^[0-9]+$ ]]; then
-  if [[ $BATTERY_STATE == "discharging" ]] && (( BATTERY_LEVEL <= BATTERY_THRESHOLD )); then
+if [[ -n "$BATTERY_LEVEL" && "$BATTERY_LEVEL" =~ ^[0-9]+$ ]]; then
+  if [[ $BATTERY_STATE == "discharging" && $BATTERY_LEVEL -le $BATTERY_THRESHOLD ]]; then
    if [[ ! -f $NOTIFICATION_FLAG ]]; then
      send_notification $BATTERY_LEVEL
      touch $NOTIFICATION_FLAG
@@ -4,9 +4,9 @@
 # Used by the battery monitor and other battery-related checks.

 for bat in /sys/class/power_supply/BAT*; do
-  [[ -r $bat/present ]] &&
-  [[ $(cat $bat/present) == "1" ]] &&
-  [[ $(cat $bat/type) == "Battery" ]] &&
+  [[ -r "$bat/present" ]] &&
+  [[ "$(cat "$bat/present")" == "1" ]] &&
+  [[ "$(cat "$bat/type")" == "Battery" ]] &&
  exit 0
 done

@@ -3,7 +3,10 @@
 # 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 '/percentage/ { 
-    print int($2)
+upower -i $(upower -e | grep BAT) \
+| awk -F: '/percentage/ {
+    gsub(/[%[:space:]]/, "", $2);
+    val=$2;
+    printf("%d\n", (val+0.5))
    exit
-}'
+  }'
@@ -9,7 +9,7 @@ else
  branch="$1"
 fi

-if [[ $branch != "master" && $branch != "rc" && $branch != "dev" ]]; then
+if [[ "$branch" != "master" && "$branch" != "rc" && "$branch" != "dev" ]]; then
  echo "Error: Invalid branch '$branch'. Must be one of: master, rc, dev"
  exit 1
 fi
@@ -8,7 +8,7 @@ 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
+  if [[ -e "/sys/class/backlight/$candidate" ]]; then
    device="$candidate"
    break
  fi
@@ -2,7 +2,7 @@

 # Adjust the brightness on Apple Studio Displays and Apple XDR Displays using asdcontrol.

-if (( $# == 0 )); then
+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)"
@@ -1,20 +1,20 @@
 #!/bin/bash

 # Adjust keyboard backlight brightness using available steps.
-# Usage: omarchy-brightness-keyboard <up|down|cycle>
+# 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
+  if [[ -e "$candidate" ]]; then
    device="$(basename "$candidate")"
    break
  fi
 done

-if [[ -z $device ]]; then
+if [[ -z "$device" ]]; then
  echo "No keyboard backlight device found" >&2
  exit 1
 fi
@@ -24,14 +24,12 @@ 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 == "cycle" ]]; then
-  new_brightness=$(( (current_brightness + 1) % (max_brightness + 1) ))
-elif [[ $direction == "up" ]]; then
+if [[ "$direction" == "up" ]]; then
  new_brightness=$((current_brightness + 1))
-  (( new_brightness > max_brightness )) && new_brightness=$max_brightness
+  [[ $new_brightness -gt $max_brightness ]] && new_brightness=$max_brightness
 else
  new_brightness=$((current_brightness - 1))
-  (( new_brightness < 0 )) && new_brightness=0
+  [[ $new_brightness -lt 0 ]] && new_brightness=0
 fi

 # Set the new brightness.
@@ -39,4 +37,4 @@ brightnessctl -d "$device" set "$new_brightness" >/dev/null

 # Use SwayOSD to display the new brightness setting.
 percent=$((new_brightness * 100 / max_brightness))
-omarchy-swayosd-kbd-brightness "$percent"
+omarchy-swayosd-brightness "$percent"
@@ -21,8 +21,8 @@ else
 fi

 case "$channel" in
-"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
-"rc") omarchy-branch-set "rc" && omarchy-refresh-pacman "rc" ;;
+"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" && sudo pacman -Suu --noconfirm ;;
+"rc") omarchy-branch-set "rc" && omarchy-refresh-pacman "rc" && sudo pacman -Suu --noconfirm ;;
 "edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
 "dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
 *) echo "Unknown channel: $channel"; exit 1; ;;
@@ -7,7 +7,7 @@ focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).n
 sinks=$(pactl -f json list sinks | jq '[.[] | select((.ports | length == 0) or ([.ports[]? | .availability != "not available"] | any))]')
 sinks_count=$(echo "$sinks" | jq '. | length')

-if (( sinks_count == 0 )); then
+if [ "$sinks_count" -eq 0 ]; then
  swayosd-client \
    --monitor "$focused_monitor" \
    --custom-message "No audio devices found"
@@ -17,7 +17,7 @@ fi
 current_sink_name=$(pactl get-default-sink)
 current_sink_index=$(echo "$sinks" | jq -r --arg name "$current_sink_name" 'map(.name) | index($name)')

-if [[ $current_sink_index != "null" ]]; then
+if [ "$current_sink_index" != "null" ]; then
  next_sink_index=$(((current_sink_index + 1) % sinks_count))
 else
  next_sink_index=0
@@ -27,28 +27,20 @@ next_sink=$(echo "$sinks" | jq -r ".[$next_sink_index]")
 next_sink_name=$(echo "$next_sink" | jq -r '.name')

 next_sink_description=$(echo "$next_sink" | jq -r '.description')
-if [[ $next_sink_description == "(null)" ]] || [[ $next_sink_description == "null" ]] || [[ -z $next_sink_description ]]; then
-  # For Bluetooth devices, the friendly name is on the Device entry (device.id), not the Sink entry (object.id)
-  device_id=$(echo "$next_sink" | jq -r '.properties."device.id"')
-  if [[ $device_id != "null" ]] && [[ -n $device_id ]]; then
-    next_sink_description=$(wpctl status | grep -E "^\s*│?\s+${device_id}\." | sed -E 's/^.*[0-9]+\.\s+//' | sed -E 's/\s+\[.*$//')
-  fi
-  # Fall back to object.id lookup if device.id didn't yield a result
-  if [[ -z $next_sink_description ]]; then
-    sink_id=$(echo "$next_sink" | jq -r '.properties."object.id"')
-    next_sink_description=$(wpctl status | grep -E "\s+\*?\s+${sink_id}\." | sed -E 's/^.*[0-9]+\.\s+//' | sed -E 's/\s+\[.*$//')
-  fi
+if [ "$next_sink_description" = "(null)" ] || [ "$next_sink_description" = "null" ] || [ -z "$next_sink_description" ]; then
+  sink_id=$(echo "$next_sink" | jq -r '.properties."object.id"')
+  next_sink_description=$(wpctl status | grep -E "\s+\*?\s+${sink_id}\." | sed -E 's/^.*[0-9]+\.\s+//' | sed -E 's/\s+\[.*$//')
 fi

 next_sink_volume=$(echo "$next_sink" | jq -r \
  '.volume | to_entries[0].value.value_percent | sub("%"; "")')
 next_sink_is_muted=$(echo "$next_sink" | jq -r '.mute')

-if [[ $next_sink_is_muted = "true" ]] || (( next_sink_volume == 0 )); then
+if [ "$next_sink_is_muted" = "true" ] || [ "$next_sink_volume" -eq 0 ]; then
  icon_state="muted"
-elif (( next_sink_volume <= 33 )); then
+elif [ "$next_sink_volume" -le 33 ]; then
  icon_state="low"
-elif (( next_sink_volume <= 66 )); then
+elif [ "$next_sink_volume" -le 66 ]; then
  icon_state="medium"
 else
  icon_state="high"
@@ -56,7 +48,7 @@ fi

 next_sink_volume_icon="sink-volume-${icon_state}-symbolic"

-if [[ $next_sink_name != $current_sink_name ]]; then
+if [ "$next_sink_name" != "$current_sink_name" ]; then
  pactl set-default-sink "$next_sink_name"
 fi

@@ -6,7 +6,7 @@ set -e

 FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode

-if [[ -f $FIRST_RUN_MODE ]]; then
+if [[ -f "$FIRST_RUN_MODE" ]]; then
  rm -f "$FIRST_RUN_MODE"

  bash "$OMARCHY_PATH/install/first-run/battery-monitor.sh"
@@ -6,7 +6,7 @@
 [[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
 OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-${XDG_VIDEOS_DIR:-$HOME/Videos}}"

-if [[ ! -d $OUTPUT_DIR ]]; then
+if [[ ! -d "$OUTPUT_DIR" ]]; then
  notify-send "Screen recording directory does not exist: $OUTPUT_DIR" -u critical -t 3000
  exit 1
 fi
@@ -35,9 +35,9 @@ start_webcam_overlay() {
  cleanup_webcam

  # Auto-detect first available webcam if none specified
-  if [[ -z $WEBCAM_DEVICE ]]; then
+  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
+    if [[ -z "$WEBCAM_DEVICE" ]]; then
      notify-send "No webcam devices found" -u critical -t 3000
      return 1
    fi
@@ -76,38 +76,26 @@ start_screenrecording() {
  local audio_devices=""
  local audio_args=""

-  [[ $DESKTOP_AUDIO == "true" ]] && audio_devices+="default_output"
+  [[ "$DESKTOP_AUDIO" == "true" ]] && audio_devices+="default_output"

-  if [[ $MICROPHONE_AUDIO == "true" ]]; then
+  if [[ "$MICROPHONE_AUDIO" == "true" ]]; then
    # Merge audio tracks into one - separate tracks only play one at a time in most players
-    [[ -n $audio_devices ]] && audio_devices+="|"
+    [[ -n "$audio_devices" ]] && audio_devices+="|"
    audio_devices+="default_input"
  fi

-  [[ -n $audio_devices ]] && audio_args+="-a $audio_devices"
+  [[ -n "$audio_devices" ]] && audio_args+="-a $audio_devices"

-  gpu-screen-recorder -w portal -k h264 -f 60 -fallback-cpu-encoding yes -o "$filename" $audio_args -ac aac &
+  gpu-screen-recorder -w portal -f 60 -fallback-cpu-encoding yes -o "$filename" $audio_args -ac aac &
  toggle_screenrecording_indicator
 }

-trim_first_frame() {
-  local latest=$(ls -t "$OUTPUT_DIR"/screenrecording-*.mp4 2>/dev/null | head -1)
-  if [[ -n $latest ]]; then
-    local trimmed="${latest%.mp4}-trimmed.mp4"
-    if ffmpeg -y -ss 0.1 -i "$latest" -c copy "$trimmed" -loglevel quiet 2>/dev/null; then
-      mv "$trimmed" "$latest"
-    else
-      rm -f "$trimmed"
-    fi
-  fi
-}
-
 stop_screenrecording() {
  pkill -SIGINT -f "^gpu-screen-recorder"  # SIGINT required to save video properly

  # Wait a maximum of 5 seconds to finish before hard killing
  local count=0
-  while pgrep -f "^gpu-screen-recorder" >/dev/null && (( count < 50 )); do
+  while pgrep -f "^gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
    sleep 0.1
    count=$((count + 1))
  done
@@ -118,7 +106,6 @@ stop_screenrecording() {
    notify-send "Screen recording error" "Recording process had to be force-killed. Video may be corrupted." -u critical -t 5000
  else
    cleanup_webcam
-    trim_first_frame
    notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
  fi
  toggle_screenrecording_indicator
@@ -138,8 +125,8 @@ if screenrecording_active; then
  else
    stop_screenrecording
  fi
-elif [[ $STOP_RECORDING == "false" ]]; then
-  [[ $WEBCAM == "true" ]] && start_webcam_overlay
+elif [[ "$STOP_RECORDING" == "false" ]]; then
+  [[ "$WEBCAM" == "true" ]] && start_webcam_overlay

  start_screenrecording || cleanup_webcam
 else
@@ -7,7 +7,7 @@
 [[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
 OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-${XDG_PICTURES_DIR:-$HOME/Pictures}}"

-if [[ ! -d $OUTPUT_DIR ]]; then
+if [[ ! -d "$OUTPUT_DIR" ]]; then
  notify-send "Screenshot directory does not exist: $OUTPUT_DIR" -u critical -t 3000
  exit 1
 fi
@@ -19,7 +19,7 @@ SCREENSHOT_EDITOR="${OMARCHY_SCREENSHOT_EDITOR:-satty}"
 # Parse --editor flag from any position
 ARGS=()
 for arg in "$@"; do
-  if [[ $arg == --editor=* ]]; then
+  if [[ "$arg" == --editor=* ]]; then
    SCREENSHOT_EDITOR="${arg#--editor=}"
  else
    ARGS+=("$arg")
@@ -29,9 +29,10 @@ set -- "${ARGS[@]}"

 open_editor() {
  local filepath="$1"
-  if [[ $SCREENSHOT_EDITOR == "satty" ]]; then
+  if [[ "$SCREENSHOT_EDITOR" == "satty" ]]; then
    satty --filename "$filepath" \
      --output-filename "$filepath" \
+      --early-exit \
      --actions-on-enter save-to-clipboard \
      --save-after-copy \
      --copy-command 'wl-copy'
@@ -43,73 +44,59 @@ open_editor() {
 MODE="${1:-smart}"
 PROCESSING="${2:-slurp}"

-# accounting for portrait/transformed displays
-JQ_MONITOR_GEO='
-  def format_geo:
-    .x as $x | .y as $y |
-    (.width / .scale | floor) as $w |
-    (.height / .scale | floor) as $h |
-    .transform as $t |
-    if $t == 1 or $t == 3 then
-      "\($x),\($y) \($h)x\($w)"
-    else
-      "\($x),\($y) \($w)x\($h)"
-    end;
-'
-
 get_rectangles() {
  local active_workspace=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .activeWorkspace.id')
-  hyprctl monitors -j | jq -r --arg ws "$active_workspace" "${JQ_MONITOR_GEO} .[] | select(.activeWorkspace.id == (\$ws | tonumber)) | format_geo"
+  hyprctl monitors -j | jq -r --arg ws "$active_workspace" '.[] | select(.activeWorkspace.id == ($ws | tonumber)) | "\(.x),\(.y) \((.width / .scale) | floor)x\((.height / .scale) | floor)"'
  hyprctl clients -j | jq -r --arg ws "$active_workspace" '.[] | select(.workspace.id == ($ws | tonumber)) | "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"'
 }

 # Select based on mode
 case "$MODE" in
  region)
-    hyprpicker -r -z >/dev/null 2>&1 & PID=$!
+    wayfreeze & PID=$!
    sleep .1
    SELECTION=$(slurp 2>/dev/null)
    kill $PID 2>/dev/null
    ;;
  windows)
-    hyprpicker -r -z >/dev/null 2>&1 & PID=$!
+    wayfreeze & PID=$!
    sleep .1
    SELECTION=$(get_rectangles | slurp -r 2>/dev/null)
    kill $PID 2>/dev/null
    ;;
  fullscreen)
-    SELECTION=$(hyprctl monitors -j | jq -r "${JQ_MONITOR_GEO} .[] | select(.focused == true) | format_geo")
+    SELECTION=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | "\(.x),\(.y) \((.width / .scale) | floor)x\((.height / .scale) | floor)"')
    ;;
  smart|*)
    RECTS=$(get_rectangles)
-    hyprpicker -r -z >/dev/null 2>&1 & PID=$!
+    wayfreeze & PID=$!
    sleep .1
    SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
    kill $PID 2>/dev/null

-  # If the selection area is L * W < 20, we'll assume you were trying to select whichever
-  # window or output it was inside of to prevent accidental 2px snapshots
-  if [[ $SELECTION =~ ^([0-9]+),([0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]]; then
-    if ((${BASH_REMATCH[3]} * ${BASH_REMATCH[4]} < 20)); then
-      click_x="${BASH_REMATCH[1]}"
-      click_y="${BASH_REMATCH[2]}"
+    # If the selection area is L * W < 20, we'll assume you were trying to select whichever
+    # window or output it was inside of to prevent accidental 2px snapshots
+    if [[ "$SELECTION" =~ ^([0-9]+),([0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]]; then
+      if (( ${BASH_REMATCH[3]} * ${BASH_REMATCH[4]} < 20 )); then
+        click_x="${BASH_REMATCH[1]}"
+        click_y="${BASH_REMATCH[2]}"

-      while IFS= read -r rect; do
-        if [[ $rect =~ ^([0-9]+),([0-9]+)[[:space:]]([0-9]+)x([0-9]+) ]]; then
-          rect_x="${BASH_REMATCH[1]}"
-          rect_y="${BASH_REMATCH[2]}"
-          rect_width="${BASH_REMATCH[3]}"
-          rect_height="${BASH_REMATCH[4]}"
+        while IFS= read -r rect; do
+          if [[ "$rect" =~ ^([0-9]+),([0-9]+)[[:space:]]([0-9]+)x([0-9]+) ]]; then
+            rect_x="${BASH_REMATCH[1]}"
+            rect_y="${BASH_REMATCH[2]}"
+            rect_width="${BASH_REMATCH[3]}"
+            rect_height="${BASH_REMATCH[4]}"

-          if ((click_x >= rect_x && click_x < rect_x + rect_width && click_y >= rect_y && click_y < rect_y + rect_height)); then
-            SELECTION="${rect_x},${rect_y} ${rect_width}x${rect_height}"
-            break
+            if (( click_x >= rect_x && click_x < rect_x+rect_width && click_y >= rect_y && click_y < rect_y+rect_height )); then
+              SELECTION="${rect_x},${rect_y} ${rect_width}x${rect_height}"
+              break
+            fi
          fi
-        fi
-      done <<<"$RECTS"
+        done <<< "$RECTS"
+      fi
    fi
-  fi
-  ;;
+    ;;
 esac

 [[ -z $SELECTION ]] && exit 0
@@ -119,11 +106,11 @@ FILEPATH="$OUTPUT_DIR/$FILENAME"

 if [[ $PROCESSING == "slurp" ]]; then
  grim -g "$SELECTION" "$FILEPATH" || exit 1
-  wl-copy <"$FILEPATH"
+  wl-copy < "$FILEPATH"

  (
-    ACTION=$(notify-send "Screenshot saved to clipboard and file" "Edit with Super + Alt + , (or click this)" -t 10000 -i "$FILEPATH" -A "default=edit")
-    [[ $ACTION == "default" ]] && open_editor "$FILEPATH"
+    ACTION=$(notify-send "Screenshot copied & saved" "Click to edit" -t 10000 -i "$FILEPATH" -A "default=edit")
+    [[ "$ACTION" == "default" ]] && open_editor "$FILEPATH"
  ) &
 else
  grim -g "$SELECTION" - | wl-copy
@@ -25,7 +25,7 @@ else
      # Pick one or more files from home directory
      FILES=$(find "$HOME" -type f 2>/dev/null | fzf --multi)
    fi
-    [[ -z $FILES ]] && exit 0
+    [ -z "$FILES" ] && exit 0
  fi
 fi

@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# Add an EFI boot entry for the Omarchy UKI, allowing the system to boot directly
-# without a bootloader like Limine. Requires UEFI firmware and a built UKI.
-
-if [[ ! -d /sys/firmware/efi ]]; then
-  echo "Error: System is not booted in UEFI mode" >&2
-  exit 1
-fi
-
-if ! efibootmgr &>/dev/null; then
-  echo "Error: efibootmgr is not available or not functional" >&2
-  exit 1
-fi
-
-if cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "American Megatrends"; then
-  echo "Error: American Megatrends firmware may not safely support custom EFI entries" >&2
-  exit 1
-fi
-
-if cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "Apple"; then
-  echo "Error: Apple firmware uses its own boot manager" >&2
-  exit 1
-fi
-
-uki_file=$(find /boot/EFI/Linux/ -name "omarchy*.efi" -printf "%f\n" 2>/dev/null | head -1)
-
-if [[ -z $uki_file ]]; then
-  echo "Error: No Omarchy UKI found in /boot/EFI/Linux/" >&2
-  exit 1
-fi
-
-boot_source=$(findmnt -n -o SOURCE /boot)
-disk=$(echo "$boot_source" | sed 's/p\?[0-9]*$//')
-part=$(echo "$boot_source" | grep -o 'p\?[0-9]*$' | sed 's/^p//')
-
-if gum confirm "Setup direct boot (so snapshot booting must be done via bios)?"; then
-  echo "Creating EFI boot entry for $uki_file"
-
-  sudo efibootmgr --create \
-    --disk "$disk" \
-    --part "$part" \
-    --label "Omarchy" \
-    --loader "\\EFI\\Linux\\$uki_file"
-fi
@@ -5,7 +5,7 @@
 NO_SUDO=false
 PRINT_ONLY=false

-while (( $# > 0 )); do
+while [[ $# -gt 0 ]]; do
  case "$1" in
    --no-sudo)
      NO_SUDO=true
@@ -25,7 +25,7 @@ done

 LOG_FILE="/tmp/omarchy-debug.log"

-if [[ $NO_SUDO = "true" ]]; then
+if [ "$NO_SUDO" = true ]; then
  DMESG_OUTPUT="(skipped - --no-sudo flag used)"
 else
  DMESG_OUTPUT="$(sudo dmesg)"
@@ -47,7 +47,7 @@ DMESG
 $DMESG_OUTPUT

 =========================================
-JOURNALCTL (CURRENT BOOT, WARNINGS+ERRORS)
+JOURNALCTL (CURRENT BOOT, ERRORS ONLY)
 =========================================
 $(journalctl -b -p 4..1)

@@ -57,7 +57,7 @@ INSTALLED PACKAGES
 $({ expac -S '%n %v (%r)' $(pacman -Qqe) 2>/dev/null; comm -13 <(pacman -Sql | sort) <(pacman -Qqe | sort) | xargs -r expac -Q '%n %v (AUR)'; } | sort)
 EOF

-if [[ $PRINT_ONLY = "true" ]]; then
+if [ "$PRINT_ONLY" = true ]; then
  cat "$LOG_FILE"
  exit 0
 fi
@@ -73,7 +73,7 @@ case "$ACTION" in
  "Upload log")
    echo "Uploading debug log to 0x0.st..."
    URL=$(curl -sF "file=@$LOG_FILE" -Fexpires=24 https://0x0.st)
-    if (( $? == 0 )) && [[ -n $URL ]]; then
+    if [ $? -eq 0 ] && [ -n "$URL" ]; then
      echo "✓ Log uploaded successfully!"
      echo "Share this URL:"
      echo ""
@@ -7,7 +7,7 @@ cd ~/.local/share/omarchy
 migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
 touch $migration_file

-if [[ $1 != "--no-edit" ]]; then
+if [[ "$1" != "--no-edit" ]]; then
  nvim $migration_file
 fi

@@ -11,7 +11,7 @@ fi

 # Find the root drive in case we are looking at partitions
 root_drive=$(lsblk -no PKNAME "$drive" 2>/dev/null | tail -n1)
-if [[ -n $root_drive ]]; then
+if [[ -n "$root_drive" ]]; then
  root_drive="/dev/$root_drive"
 else
  root_drive="$drive"
@@ -19,31 +19,11 @@ fi

 # Get basic disk information
 size=$(lsblk -dno SIZE "$drive" 2>/dev/null)
-vendor=$(lsblk -dno VENDOR "$root_drive" 2>/dev/null | sed 's/ *$//')
-model=$(lsblk -dno MODEL "$root_drive" 2>/dev/null | sed 's/ *$//')
-
-# Combine vendor and model, avoiding duplication
-label=""
-if [[ -n $vendor && -n $model ]]; then
-  if [[ $model == *$vendor* ]]; then
-    label="$model"
-  else
-    label="$vendor $model"
-  fi
-elif [[ -n $model ]]; then
-  label="$model"
-elif [[ -n $vendor ]]; then
-  label="$vendor"
-fi
+model=$(lsblk -dno MODEL "$root_drive" 2>/dev/null)

 # Format display string
 display="$drive"
-[[ -n $size ]] && display="$display ($size)"
-[[ -n $label ]] && display="$display - $label"
-
-# Append compact partition summary
-part_summary=$(lsblk -nro TYPE,NAME,FSTYPE,MOUNTPOINT "$root_drive" 2>/dev/null | \
-  awk '$1=="part" { printf "%s%s%s", s, ($3==""?"unknown":$3), ($4==""?"":"("$4")"); s=", " }')
-[[ -n $part_summary ]] && display+=" [$part_summary]"
+[[ -n "$size" ]] && display="$display ($size)"
+[[ -n "$model" ]] && display="$display - $model"

 echo "$display"
@@ -10,7 +10,7 @@ fi

 drives_with_info=""
 while IFS= read -r drive; do
-  [[ -n $drive ]] || continue
+  [[ -n "$drive" ]] || continue
  drives_with_info+="$(omarchy-drive-info "$drive")"$'\n'
 done <<<"$drives"

@@ -5,7 +5,7 @@
 encrypted_drives=$(blkid -t TYPE=crypto_LUKS -o device)

 if [[ -n $encrypted_drives ]]; then
-  if (( $(wc -l <<<encrypted_drives) == 1 )); then
+  if [[ $(wc -l <<<"$encrypted_drives") -eq 1 ]]; then
    drive_to_change="$encrypted_drives"
  else
    drive_to_change="$(omarchy-drive-select "$encrypted_drives")"
@@ -5,7 +5,7 @@

 font_name="$1"

-if [[ -n $font_name ]]; then
+if [[ -n "$font_name" ]]; then
  if fc-list | grep -iq "$font_name"; then
    if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
      sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
@@ -11,7 +11,7 @@ SWAPSIZE=$(( 1024 * ${SWAPSIZE_KB:-0} ))

 HIBERNATION_IMAGE_SIZE=$(cat /sys/power/image_size)

-if (( SWAPSIZE > HIBERNATION_IMAGE_SIZE )) && [[ -f /etc/mkinitcpio.conf.d/omarchy_resume.conf ]]; then
+if [[ "$SWAPSIZE" -gt "$HIBERNATION_IMAGE_SIZE" ]] && [[ -f /etc/mkinitcpio.conf.d/omarchy_resume.conf ]]; then
  exit 0
 else
  exit 1
@@ -6,7 +6,7 @@
 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
+if [ ! -f "$MKINITCPIO_CONF" ] || ! grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
  echo "Hibernation is not set up"
  exit 0
 fi
@@ -25,7 +25,7 @@ if swapon --show | grep -q "$SWAP_FILE"; then
 fi

 # Remove swapfile
-if [[ -f $SWAP_FILE ]]; then
+if [ -f "$SWAP_FILE" ]; then
  echo "Removing swapfile"
  sudo rm "$SWAP_FILE"
 fi
@@ -4,19 +4,15 @@
 # adds a resume hook to mkinitcpio, and configures suspend-then-hibernate.

 if [[ ! -f /sys/power/image_size ]]; then
-  echo -e "Hibernation is not supported on your system" >&2
-  exit 0
+  echo -e "\033[31mError: Hibernation is not supported on your system\033[0m" >&2
+  exit 1
 fi

-if ! command -v limine-mkinitcpio &>/dev/null; then
-  echo "Skipping hibernation setup (requires Limine bootloader)"
-  exit 0
-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
+if [ -f "$MKINITCPIO_CONF" ] && grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
  echo "Hibernation is already set up"
  exit 0
 fi
@@ -66,22 +62,10 @@ echo "HOOKS+=(resume)" | sudo tee "$MKINITCPIO_CONF" >/dev/null
 # Ensure keyboard backlight doesn't prevent sleep
 sudo cp -p "$OMARCHY_PATH/default/systemd/system-sleep/keyboard-backlight" /usr/lib/systemd/system-sleep/

-# Add resume= kernel parameters so the initramfs resume hook knows where to find the
-# hibernation image. Without these, resume happens late (after GPU drivers load) and fails.
-RESUME_DROP_IN="/etc/limine-entry-tool.d/resume.conf"
-if [[ ! -f $RESUME_DROP_IN ]]; then
-  echo "Adding resume kernel parameters"
-  sudo swapon -p 0 "$SWAP_FILE" 2>/dev/null
-  RESUME_DEVICE=$(findmnt -no SOURCE -T "$SWAP_FILE" | sed 's/\[.*\]//')
-  RESUME_OFFSET=$(btrfs inspect-internal map-swapfile -r "$SWAP_FILE")
-  sudo mkdir -p /etc/limine-entry-tool.d
-  echo "KERNEL_CMDLINE[default]+=\"resume=$RESUME_DEVICE resume_offset=$RESUME_OFFSET\"" | sudo tee "$RESUME_DROP_IN" >/dev/null
-fi
-
 # Use ACPI alarm for RTC wakeup on s2idle systems (needed for suspend-then-hibernate)
 if grep -q "\[s2idle\]" /sys/power/mem_sleep 2>/dev/null; then
  LIMINE_DROP_IN="/etc/limine-entry-tool.d/rtc-alarm.conf"
-  if [[ ! -f $LIMINE_DROP_IN ]]; then
+  if [[ ! -f "$LIMINE_DROP_IN" ]]; then
    echo "Enabling ACPI RTC alarm for s2idle suspend"
    sudo mkdir -p /etc/limine-entry-tool.d
    echo 'KERNEL_CMDLINE[default]+="rtc_cmos.use_acpi_alarm=1"' | sudo tee "$LIMINE_DROP_IN" >/dev/null
@@ -96,5 +80,5 @@ sudo limine-update
 echo

 if [[ $1 != "--force" ]] && gum confirm "Reboot to enable hibernation?"; then
-  omarchy-system-reboot
+  omarchy-cmd-reboot
 fi
@@ -4,7 +4,7 @@

 set -e

-if (( $# < 1 )); then
+if [[ $# -lt 1 ]]; then
  echo "Usage: omarchy-hook [name] [args...]"
  exit 1
 fi
@@ -2,5 +2,5 @@

 # Detect whether the computer is an Asus ROG machine.

-[[ $(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) == "ASUSTeK COMPUTER INC." ]] &&
+[[ "$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)" == "ASUSTeK COMPUTER INC." ]] &&
   grep -q "ROG" /sys/class/dmi/id/product_family 2>/dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Detect whether the computer is a Framework Laptop 16.
-
-[[ $(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) == "Framework" ]] &&
-  grep -q "Laptop 16" /sys/class/dmi/id/product_name 2>/dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Detect whether the computer is a Microsoft Surface device.
-
-[[ $(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) == "Microsoft Corporation" ]] &&
-  grep -q "Surface" /sys/class/dmi/id/product_name 2>/dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Get the active monitor (the one with the cursor)
-MONITOR_INFO=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true)')
-ACTIVE_MONITOR=$(echo "$MONITOR_INFO" | jq -r '.name')
-CURRENT_SCALE=$(echo "$MONITOR_INFO" | jq -r '.scale')
-
-# Cycle through scales: 1 → 1.6 → 2 → 3 → 1
-CURRENT_INT=$(awk -v s="$CURRENT_SCALE" 'BEGIN { printf "%.0f", s * 10 }')
-
-case "$CURRENT_INT" in
-10) NEW_SCALE=1.6 ;;
-16) NEW_SCALE=2 ;;
-20) NEW_SCALE=3 ;;
-*) NEW_SCALE=1 ;;
-esac
-
-hyprctl keyword misc:disable_scale_notification true
-hyprctl keyword monitor "$ACTIVE_MONITOR,preferred,auto,$NEW_SCALE"
-hyprctl keyword misc:disable_scale_notification false
-notify-send "󰍹    Display scaling set to ${NEW_SCALE}x"
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Check current single_window_aspect_ratio setting
-CURRENT_VALUE=$(hyprctl getoption "dwindle:single_window_aspect_ratio" 2>/dev/null | head -1)
-
-# Parse vec2 output: "vec2: [1, 1]" or "vec2: [0, 0]"
-if [[ $CURRENT_VALUE == *"[1, 1]"* ]]; then
-  hyprctl keyword dwindle:single_window_aspect_ratio "0 0"
-  notify-send "    Disable single-window square aspect ratio"
-else
-  hyprctl keyword dwindle:single_window_aspect_ratio "1 1"
-  notify-send "    Enable single-window square aspect"
-fi
@@ -1,15 +1,12 @@
 #!/bin/bash

-# Toggles the window gaps globally between no gaps and the default 10/5/2.
+# Toggles the window gaps on the active workspace between no gaps and the default 10/5/2.

-gaps=$(hyprctl getoption general:gaps_out -j | jq -r '.custom' | awk '{print $1}')
+workspace_id=$(hyprctl activeworkspace -j | jq -r .id)
+gaps=$(hyprctl workspacerules -j | jq -r ".[] | select(.workspaceString==\"$workspace_id\") | .gapsOut[0] // 0")

 if [[ $gaps == "0" ]]; then
-  hyprctl keyword general:gaps_out 10
-  hyprctl keyword general:gaps_in 5
-  hyprctl keyword general:border_size 2
-else
-  hyprctl keyword general:gaps_out 0
-  hyprctl keyword general:gaps_in 0
-  hyprctl keyword general:border_size 0
+  hyprctl keyword "workspace $workspace_id, gapsout:10, gapsin:5, bordersize:2"
+else \
+  hyprctl keyword "workspace $workspace_id, gapsout:0, gapsin:0, bordersize:0"
 fi
@@ -2,16 +2,16 @@

 # 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|deno|go|laravel|symfony|php|python|elixir|phoenix|rust|java|zig|ocaml|dotnet|clojure|scala>" >&2
+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
 fi

 install_php() {
-  omarchy-pkg-add php composer php-sqlite xdebug
+  sudo pacman -S php composer php-sqlite xdebug --noconfirm

  # Install Path for Composer
-  if [[ :$PATH: != *:$HOME/.config/composer/vendor/bin:* ]]; then
+  if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then
    echo 'export PATH="$HOME/.config/composer/vendor/bin:$PATH"' >>"$HOME/.bashrc"
    source "$HOME/.bashrc"
    echo "Added Composer global bin directory to PATH."
@@ -52,8 +52,7 @@ ruby)
  omarchy-pkg-add libyaml
  mise use --global ruby@latest
  mise settings add idiomatic_version_file_enable_tools ruby
-  mise settings add ruby.compile false
-  echo "gem: --no-document" >~/.gemrc
+  echo "gem: --no-document" > ~/.gemrc
  mise x ruby -- gem install rails --no-document
  echo -e "\nYou can now run: rails new myproject"
  ;;
@@ -142,10 +141,4 @@ clojure)
  omarchy-pkg-add rlwrap
  mise use --global clojure@latest
  ;;
-scala)
-  echo -e "Installing Scala...\n"
-  mise use --global java@latest
-  mise use --global scala@latest
-  mise use --global scala-cli@latest
-  ;;
 esac
@@ -5,13 +5,13 @@

 options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB" "MSSQL")

-if (( $# == 0 )); then
+if [[ "$#" -eq 0 ]]; then
  choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select database (return to install, esc to cancel)") || main_menu
 else
  choices="$@"
 fi

-if [[ -n $choices ]]; then
+if [[ -n "$choices" ]]; then
  for db in $choices; do
    case $db in
    MySQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8.4 ;;
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Install the NordVPN service with optional GUI.
-
-echo "Installing NordVPN..."
-omarchy-pkg-aur-add nordvpn-bin
-
-echo "Enabling NordVPN daemon..."
-sudo systemctl enable --now nordvpnd
-
-echo "Adding user to nordvpn group..."
-sudo usermod -aG nordvpn "$USER"
-
-echo -e "\nNordVPN installed! After reboot, run 'nordvpn login' to authenticate."
-
-echo
-gum confirm "Reboot now to make NordVPN usable?" && sudo reboot now
@@ -25,11 +25,33 @@ if omarchy-pkg-add $package; then
  # Copy custom desktop entry for alacritty with X-TerminalArg* keys
  if [[ $package == "alacritty" ]]; then
    mkdir -p ~/.local/share/applications
-    cp $OMARCHY_PATH/applications/Alacritty.desktop ~/.local/share/applications/
+    cat > ~/.local/share/applications/Alacritty.desktop << EOF
+[Desktop Entry]
+Type=Application
+TryExec=alacritty
+Exec=alacritty
+Icon=Alacritty
+Terminal=false
+Categories=System;TerminalEmulator;
+Name=Alacritty
+GenericName=Terminal
+Comment=A fast, cross-platform, OpenGL terminal emulator
+StartupNotify=true
+StartupWMClass=Alacritty
+Actions=New;
+X-TerminalArgExec=-e
+X-TerminalArgAppId=--class=
+X-TerminalArgTitle=--title=
+X-TerminalArgDir=--working-directory=
+
+[Desktop Action New]
+Name=New Terminal
+Exec=alacritty
+EOF
  fi

  # Update xdg-terminals.list to prioritize the proper terminal
-  cat >~/.config/xdg-terminals.list <<EOF
+  cat > ~/.config/xdg-terminals.list << EOF
 # Terminal emulator preference order for xdg-terminal-exec
 # The first found and valid terminal will be used
 $desktop_id
@@ -5,8 +5,8 @@
 set -e

 # Install xpadneo to ensure controllers work out of the box
-omarchy-pkg-add linux-headers
-omarchy-pkg-aur-add xpadneo-dkms
+sudo pacman -S --noconfirm --needed linux-headers
+yay -S --noconfirm xpadneo-dkms

 # Prevent xpad/xpadneo driver conflict
 echo blacklist xpad | sudo tee /etc/modprobe.d/blacklist-xpad.conf >/dev/null
@@ -6,7 +6,7 @@
 default_browser=$(xdg-settings get default-web-browser)
 browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)

-if $browser_exec --help | grep -q MOZ_LOG; then
+if [[ $browser_exec =~ (firefox|zen|librewolf|mullvad) ]]; then
  private_flag="--private-window"
 elif [[ $browser_exec =~ edge ]]; then
  private_flag="--inprivate"
@@ -4,4 +4,4 @@
 # 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 (( \$? != 130 )); then omarchy-show-done; fi"
+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"
@@ -10,7 +10,7 @@ fi

 WINDOW_PATTERN="$1"
 LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
-WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
+WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)

 if [[ -n $WINDOW_ADDRESS ]]; then
  hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
@@ -10,9 +10,9 @@ BACK_TO_EXIT=false
 back_to() {
  local parent_menu="$1"

-  if [[ $BACK_TO_EXIT == "true" ]]; then
+  if [[ "$BACK_TO_EXIT" == "true" ]]; then
    exit 0
-  elif [[ -n $parent_menu ]]; then
+  elif [[ -n "$parent_menu" ]]; then
    "$parent_menu"
  else
    show_main_menu
@@ -27,10 +27,10 @@ menu() {

  read -r -a args <<<"$extra"

-  if [[ -n $preselect ]]; then
+  if [[ -n "$preselect" ]]; then
    local index
    index=$(echo -e "$options" | grep -nxF "$preselect" | cut -d: -f1)
-    if [[ -n $index ]]; then
+    if [[ -n "$index" ]]; then
      args+=("-c" "$index")
    fi
  fi
@@ -52,15 +52,15 @@ open_in_editor() {
 }

 install() {
-  present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2"
+  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2"
 }

 install_and_launch() {
-  present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2 && setsid gtk-launch $3"
+  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2 && setsid gtk-launch $3"
 }

 install_font() {
-  present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2 && sleep 2 && omarchy-font-set '$3'"
+  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
 }

 install_terminal() {
@@ -68,11 +68,11 @@ install_terminal() {
 }

 aur_install() {
-  present_terminal "echo 'Installing $1 from AUR...'; omarchy-pkg-aur-add $2"
+  present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
 }

 aur_install_and_launch() {
-  present_terminal "echo 'Installing $1 from AUR...'; omarchy-pkg-aur-add $2 && setsid gtk-launch $3"
+  present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2 && setsid gtk-launch $3"
 }

 show_learn_menu() {
@@ -108,11 +108,11 @@ show_capture_menu() {

 get_webcam_list() {
  v4l2-ctl --list-devices 2>/dev/null | while IFS= read -r line; do
-    if [[ $line != $'\t'* && -n $line ]]; then
+    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"
+      [[ -n "$device" ]] && echo "$device  $name"
    fi
  done
 }
@@ -121,12 +121,12 @@ show_webcam_select_menu() {
  local devices=$(get_webcam_list)
  local count=$(echo "$devices" | grep -c . 2>/dev/null || echo 0)

-  if [[ -z $devices ]] || ((count == 0)); then
+  if [[ -z "$devices" || "$count" -eq 0 ]]; then
    notify-send "No webcam devices found" -u critical -t 3000
    return 1
  fi

-  if ((count == 1)); then
+  if [[ "$count" -eq 1 ]]; then
    echo "$devices" | awk '{print $1}'
  else
    menu "Select Webcam" "$devices" | awk '{print $1}'
@@ -136,8 +136,7 @@ show_webcam_select_menu() {
 show_screenrecord_menu() {
  omarchy-cmd-screenrecord --stop-recording && exit 0

-  case $(menu "Screenrecord" "  With no audio\n  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
-  *"With no audio") omarchy-cmd-screenrecord ;;
+  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")
@@ -181,7 +180,7 @@ show_style_menu() {
  case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n  Hyprland\n󱄄  Screensaver\n  About") in
  *Theme*) show_theme_menu ;;
  *Font*) show_font_menu ;;
-  *Background*) show_background_menu ;;
+  *Background*) omarchy-theme-bg-next ;;
  *Hyprland*) open_in_editor ~/.config/hypr/looknfeel.conf ;;
  *Screensaver*) open_in_editor ~/.config/omarchy/branding/screensaver.txt ;;
  *About*) open_in_editor ~/.config/omarchy/branding/about.txt ;;
@@ -193,13 +192,9 @@ show_theme_menu() {
  omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
 }

-show_background_menu() {
-  omarchy-launch-walker -m menus:omarchyBackgroundSelector --width 800 --minheight 400
-}
-
 show_font_menu() {
  theme=$(menu "Font" "$(omarchy-font-list)" "--width 350" "$(omarchy-font-current)")
-  if [[ $theme == "CNCLD" || -z $theme ]]; then
+  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
    back_to show_style_menu
  else
    omarchy-font-set "$theme"
@@ -208,8 +203,8 @@ show_font_menu() {

 show_setup_menu() {
  local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n  System Sleep\n󰍹  Monitors"
-  [[ -f ~/.config/hypr/bindings.conf ]] && options="$options\n  Keybindings"
-  [[ -f ~/.config/hypr/input.conf ]] && options="$options\n  Input"
+  [ -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"

  case $(menu "Setup" "$options") in
@@ -231,7 +226,7 @@ show_setup_menu() {
 show_setup_power_menu() {
  profile=$(menu "Power Profile" "$(omarchy-powerprofiles-list)" "" "$(powerprofilesctl get)")

-  if [[ $profile == "CNCLD" || -z $profile ]]; then
+  if [[ "$profile" == "CNCLD" || -z "$profile" ]]; then
    back_to show_setup_menu
  else
    powerprofilesctl set "$profile"
@@ -264,10 +259,10 @@ show_setup_config_menu() {
 show_setup_system_menu() {
  local options=""

-  if [[ -f ~/.local/state/omarchy/toggles/suspend-off ]]; then
-    options="$options󰒲  Enable Suspend"
-  else
+  if [ -f ~/.local/state/omarchy/toggles/suspend-on ]; then
    options="$options󰒲  Disable Suspend"
+  else
+    options="$options󰒲  Enable Suspend"
  fi

  if omarchy-hibernation-available; then
@@ -303,10 +298,9 @@ show_install_menu() {
 }

 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale\n󱇱  NordVPN\n󰟵  Bitwarden\n  Chromium Account") in
+  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden\n  Chromium Account") in
  *Dropbox*) present_terminal omarchy-install-dropbox ;;
  *Tailscale*) present_terminal omarchy-install-tailscale ;;
-  *NordVPN*) present_terminal omarchy-install-nordvpn ;;
  *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
  *Chromium*) present_terminal omarchy-install-chromium-google-account ;;
  *) show_install_menu ;;
@@ -317,7 +311,7 @@ show_install_editor_menu() {
  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
  *VSCode*) present_terminal omarchy-install-vscode ;;
  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
-  *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
+  *Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch dev.zed.Zed" ;;
  *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
  *Helix*) install "Helix" "helix" ;;
  *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
@@ -341,13 +335,13 @@ show_install_ai_menu() {
      echo ollama
  )

-  case $(menu "Install" "  Dictation\n󱚤  Claude Code\n󱚤  Codex\n󱚤  Gemini CLI\n󱚤  Copilot CLI\n󱚤  Cursor CLI\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
+  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 ;;
  *Claude*) install "Claude Code" "claude-code" ;;
-  *Codex*) install "Codex" "openai-codex" ;;
-  *Gemini*) install "Gemini CLI" "gemini-cli" ;;
  *Copilot*) install "Copilot CLI" "github-copilot-cli" ;;
  *Cursor*) install "Cursor CLI" "cursor-cli" ;;
+  *Gemini*) install "Gemini" "gemini-cli" ;;
+  *OpenAI*) install "OpenAI Codex" "openai-codex" ;;
  *Studio*) install "LM Studio" "lmstudio" ;;
  *Ollama*) install "Ollama" $ollama_pkg ;;
  *Crush*) install "Crush" "crush-bin" ;;
@@ -376,8 +370,7 @@ show_install_style_menu() {
 }

 show_install_font_menu() {
-  case $(menu "Install" "  Cascadia Mono\n  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono\n  Iosevka" "--width 350") in
-  *Cascadia*) install_font "Cascadia Mono" "ttf-cascadia-mono-nerd" "CaskaydiaMono Nerd Font" ;;
+  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono\n  Iosevka" "--width 350") in
  *Meslo*) install_font "Meslo LG Mono" "ttf-meslo-nerd" "MesloLGL Nerd Font" ;;
  *Fira*) install_font "Fira Code" "ttf-firacode-nerd" "FiraCode Nerd Font" ;;
  *Victor*) install_font "Victor Code" "ttf-victor-mono-nerd" "VictorMono Nerd Font" ;;
@@ -388,7 +381,7 @@ show_install_font_menu() {
 }

 show_install_development_menu() {
-  case $(menu "Install" "󰫏  Ruby on Rails\n  Docker DB\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure\n  Scala") in
+  case $(menu "Install" "󰫏  Ruby on Rails\n  Docker DB\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure") in
  *Rails*) present_terminal "omarchy-install-dev-env ruby" ;;
  *Docker*) present_terminal omarchy-install-docker-dbs ;;
  *JavaScript*) show_install_javascript_menu ;;
@@ -402,7 +395,6 @@ show_install_development_menu() {
  *NET*) present_terminal "omarchy-install-dev-env dotnet" ;;
  *OCaml*) present_terminal "omarchy-install-dev-env ocaml" ;;
  *Clojure*) present_terminal "omarchy-install-dev-env clojure" ;;
-  *Scala*) present_terminal "omarchy-install-dev-env scala" ;;
  *) show_install_menu ;;
  esac
 }
@@ -439,7 +431,7 @@ show_remove_menu() {
  *Web*) present_terminal omarchy-webapp-remove ;;
  *TUI*) present_terminal omarchy-tui-remove ;;
  *Development*) show_remove_development_menu ;;
-  *Preinstalls*) present_terminal omarchy-remove-preinstalls ;;
+  *Preinstalls*) present_terminal omarchy-remove-all ;;
  *Dictation*) present_terminal omarchy-voxtype-remove ;;
  *Theme*) present_terminal omarchy-theme-remove ;;
  *Windows*) present_terminal "omarchy-windows-vm remove" ;;
@@ -450,7 +442,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\n  Scala") 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 +455,6 @@ show_remove_development_menu() {
  *NET*) present_terminal "omarchy-remove-dev-env dotnet" ;;
  *OCaml*) present_terminal "omarchy-remove-dev-env ocaml" ;;
  *Clojure*) present_terminal "omarchy-remove-dev-env clojure" ;;
-  *Scala*) present_terminal "omarchy-remove-dev-env scala" ;;
  *) show_remove_menu ;;
  esac
 }
@@ -531,14 +522,13 @@ show_update_process_menu() {
 }

 show_update_config_menu() {
-  case $(menu "Use default config" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n󱣴  Plymouth\n  Swayosd\n  Tmux\n󰌧  Walker\n󰍜  Waybar") in
+  case $(menu "Use default config" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n󱣴  Plymouth\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
  *Hyprland*) present_terminal omarchy-refresh-hyprland ;;
  *Hypridle*) present_terminal omarchy-refresh-hypridle ;;
  *Hyprlock*) present_terminal omarchy-refresh-hyprlock ;;
  *Hyprsunset*) present_terminal omarchy-refresh-hyprsunset ;;
  *Plymouth*) present_terminal omarchy-refresh-plymouth ;;
  *Swayosd*) present_terminal omarchy-refresh-swayosd ;;
-  *Tmux*) present_terminal omarchy-refresh-tmux ;;
  *Walker*) present_terminal omarchy-refresh-walker ;;
  *Waybar*) present_terminal omarchy-refresh-waybar ;;
  *) show_update_menu ;;
@@ -567,19 +557,18 @@ show_about() {
 }

 show_system_menu() {
-  local options="󱄄  Screensaver\n  Lock"
-  [[ ! -f ~/.local/state/omarchy/toggles/suspend-off ]] && options="$options\n󰒲  Suspend"
+  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󰍃  Logout\n󰜉  Restart\n󰐥  Shutdown"
+  options="$options\n󰜉  Restart\n󰐥  Shutdown"

  case $(menu "System" "$options") in
-  *Screensaver*) omarchy-launch-screensaver force ;;
  *Lock*) omarchy-lock-screen ;;
+  *Screensaver*) omarchy-launch-screensaver force ;;
  *Suspend*) systemctl suspend ;;
  *Hibernate*) systemctl hibernate ;;
-  *Logout*) omarchy-system-logout ;;
-  *Restart*) omarchy-system-reboot ;;
-  *Shutdown*) omarchy-system-shutdown ;;
+  *Restart*) omarchy-cmd-reboot ;;
+  *Shutdown*) omarchy-cmd-shutdown ;;
  *) back_to show_main_menu ;;
  esac
 }
@@ -594,10 +583,10 @@ go_to_menu() {
  *learn*) show_learn_menu ;;
  *trigger*) show_trigger_menu ;;
  *share*) show_share_menu ;;
-  *background*) show_background_menu ;;
  *capture*) show_capture_menu ;;
  *style*) show_style_menu ;;
  *theme*) show_theme_menu ;;
+  *screenshot*) show_screenshot_menu ;;
  *screenrecord*) show_screenrecord_menu ;;
  *setup*) show_setup_menu ;;
  *power*) show_setup_power_menu ;;
@@ -613,7 +602,7 @@ go_to_menu() {
 USER_EXTENSIONS="$HOME/.config/omarchy/extensions/menu.sh"
 [[ -f $USER_EXTENSIONS ]] && source "$USER_EXTENSIONS"

-if [[ -n $1 ]]; then
+if [[ -n "$1" ]]; then
  BACK_TO_EXIT=true
  go_to_menu "$1"
 else
@@ -12,7 +12,7 @@ build_keymap_cache() {
  }

  while IFS=, read -r code sym; do
-    [[ -z $code || -z $sym ]] && continue
+    [[ -z "$code" || -z "$sym" ]] && continue
    KEYCODE_SYM_MAP["$code"]="$sym"
  done < <(
    awk '
@@ -42,13 +42,13 @@ lookup_keycode_cached() {

 parse_keycodes() {
  local start end elapsed
-  [[ ${DEBUG:-0} == "1" ]] && start=$(date +%s.%N)
+  [[ "${DEBUG:-0}" == "1" ]] && start=$(date +%s.%N)
  while IFS= read -r line; do
-    if [[ $line =~ code:([0-9]+) ]]; then
+    if [[ "$line" =~ code:([0-9]+) ]]; then
      code="${BASH_REMATCH[1]}"
      symbol=$(lookup_keycode_cached "$code" "$XKB_KEYMAP_CACHE")
      echo "${line/code:${code}/$symbol}"
-    elif [[ $line =~ mouse:([0-9]+) ]]; then
+    elif [[ "$line" =~ mouse:([0-9]+) ]]; then
      code="${BASH_REMATCH[1]}"

      case "$code" in
@@ -64,7 +64,7 @@ parse_keycodes() {
    fi
  done

-  if [[ $DEBUG == "1" ]]; then
+  if [[ "$DEBUG" == "1" ]]; then
    end=$(date +%s.%N)
    # fall back to awk if bc is missing
    if command -v bc >/dev/null 2>&1; then
@@ -168,47 +168,44 @@ prioritize_entries() {
    line = $0
    prio = 50
    if (match(line, /Terminal/)) prio = 0
-    if (match(line, /Tmux/)) prio = 1
-    if (match(line, /Browser/) && !match(line, /Browser[[:space:]]*\(/) && !match(line, /SUPER SHIFT.*\+.*B.*→.*Browser/)) prio = 2
-    if (match(line, /File manager/) && !match(line, /File manager \(cwd\)/))  prio = 3
-    if (match(line, /Launch apps/))  prio = 4
-    if (match(line, /Omarchy menu/))  prio = 5
-    if (match(line, /System menu/))  prio = 6
-    if (match(line, /Theme menu/))  prio = 7
-    if (match(line, /Full screen/))  prio = 8
-    if (match(line, /Full width/))  prio = 9
-    if (match(line, /Close window/))  prio = 10
-    if (match(line, /Close all windows/))  prio = 11
-    if (match(line, /Lock system/))  prio = 12
-    if (match(line, /Toggle window floating/))  prio = 13
-    if (match(line, /Toggle window split/))  prio = 14
-    if (match(line, /Pop window/))  prio = 15
-    if (match(line, /Universal/))  prio = 16
-    if (match(line, /Clipboard/))  prio = 17
-    if (match(line, /Audio controls/))  prio = 18
-    if (match(line, /Bluetooth controls/))  prio = 19
-    if (match(line, /Wifi controls/))  prio = 20
-    if (match(line, /Emoji picker/))  prio = 21
-    if (match(line, /Color picker/))  prio = 22
-    if (match(line, /Screenshot/))  prio = 23
-    if (match(line, /Screenrecording/))  prio = 24
-    if (match(line, /SUPER SHIFT.*\+.*B.*→.*Browser/)) prio = 25
-    if (match(line, /File manager \(cwd\)/))  prio = 26
-    if (match(line, /(Switch|Next|Former|Previous).*workspace/))  prio = 27
-    if (match(line, /Move window to workspace/))  prio = 28
-    if (match(line, /Move window silently to workspace/))  prio = 29
-    if (match(line, /Swap window/))  prio = 30
-    if (match(line, /Move window focus/))  prio = 31
-    if (match(line, /Move window$/))  prio = 32
-    if (match(line, /Resize window/))  prio = 33
-    if (match(line, /Expand window/))  prio = 34
-    if (match(line, /Shrink window/))  prio = 35
-    if (match(line, /scratchpad/))  prio = 36
-    if (match(line, /notification/))  prio = 37
-    if (match(line, /Toggle window transparency/))  prio = 38
-    if (match(line, /Toggle workspace gaps/))  prio = 39
-    if (match(line, /Toggle nightlight/))  prio = 40
-    if (match(line, /Toggle locking/))  prio = 41
+    if (match(line, /Browser/) && !match(line, /Browser[[:space:]]*\(/)) prio = 1
+    if (match(line, /File manager/))  prio = 2
+    if (match(line, /Launch apps/))  prio = 3
+    if (match(line, /Omarchy menu/))  prio = 4
+    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, /group/))  prio = 94
    if (match(line, /Scroll active workspace/))  prio = 95
    if (match(line, /Cycle to/))  prio = 96
@@ -236,7 +233,7 @@ output_keybindings() {
    prioritize_entries
 }

-if [[ $1 == "--print" || $1 == "-p" ]]; then
+if [[ "$1" == "--print" || "$1" == "-p" ]]; then
  output_keybindings
 else
  monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
@@ -245,3 +242,4 @@ else
  output_keybindings |
    walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
 fi
+
@@ -13,7 +13,7 @@ mkdir -p "$STATE_DIR/skipped"
 for file in ~/.local/share/omarchy/migrations/*.sh; do
  filename=$(basename "$file")

-  if [[ ! -f $STATE_DIR/$filename && ! -f $STATE_DIR/skipped/$filename ]]; then
+  if [[ ! -f "$STATE_DIR/$filename" && ! -f "$STATE_DIR/skipped/$filename" ]]; then
    echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"

    if bash $file; then
@@ -18,10 +18,9 @@ fzf_args=(

 pkg_names=$(yay -Slqa | fzf "${fzf_args[@]}")

-if [[ -n $pkg_names ]]; then
-  # Add aur/ prefix to each package name and convert to space-separated for yay
-  sudo -v
-  echo "$pkg_names" | sed 's/^/aur\//' | tr '\n' ' ' | xargs yay -S --noconfirm
+if [[ -n "$pkg_names" ]]; then
+  # Convert newline-separated selections to space-separated for yay
+  echo "$pkg_names" | tr '\n' ' ' | xargs yay -S --noconfirm
  sudo updatedb
  omarchy-show-done
 fi
@@ -16,7 +16,7 @@ fzf_args=(

 pkg_names=$(pacman -Slq | fzf "${fzf_args[@]}")

-if [[ -n $pkg_names ]]; then
+if [[ -n "$pkg_names" ]]; then
  # Convert newline-separated selections to space-separated for yay
  echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -S --noconfirm
  omarchy-show-done
@@ -16,7 +16,7 @@ fzf_args=(

 pkg_names=$(yay -Qqe | fzf "${fzf_args[@]}")

-if [[ -n $pkg_names ]]; then
+if [[ -n "$pkg_names" ]]; then
  # Convert newline-separated selections to space-separated for yay
  echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Rns --noconfirm
  omarchy-show-done
@@ -6,7 +6,7 @@ CONFIG_FILE="$HOME/.config/chromium-flags.conf"
 INSTALL_GOOGLE_ACCOUNTS=false

 # Check if google accounts were installed
-if [[ -f $CONFIG_FILE ]] && \
+if [[ -f "$CONFIG_FILE" ]] && \
  grep -q -- "--oauth2-client-id" "$CONFIG_FILE" && \
  grep -q -- "--oauth2-client-secret" "$CONFIG_FILE"; then
  INSTALL_GOOGLE_ACCOUNTS=true
@@ -16,6 +16,6 @@ fi
 omarchy-refresh-config chromium-flags.conf

 # Re-install Google accounts if previously configured
-if [[ $INSTALL_GOOGLE_ACCOUNTS == "true" ]]; then
+if [[ "$INSTALL_GOOGLE_ACCOUNTS" == true ]]; then
  omarchy-install-chromium-google-account
 fi
@@ -5,7 +5,7 @@

 config_file=$1

-if [[ -z $config_file ]]; then
+if [[ -z "$config_file" ]]; then
  cat <<USAGE
  Usage: $0 [config_file]

@@ -22,7 +22,7 @@ user_config_file="${HOME}/.config/$config_file"
 default_config_file="${HOME}/.local/share/omarchy/config/$config_file"
 backup_config_file="$user_config_file.bak.$(date +%s)"

-if [[ -f $user_config_file ]]; then
+if [[ -f "$user_config_file" ]]; then
  # Create preliminary backup
  cp -f "$user_config_file" "$backup_config_file" 2>/dev/null

@@ -9,7 +9,7 @@ sudo cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak

 channel="${1:-stable}"

-if [[ $channel != "stable" && $channel != "rc" && $channel != "edge" ]]; then
+if [[ "$channel" != "stable" && "$channel" != "rc" && "$channel" != "edge" ]]; then
  echo "Error: Invalid channel '$channel'. Must be one of: stable, rc, edge"
  exit 1
 fi
@@ -21,4 +21,4 @@ sudo cp -f "$OMARCHY_PATH/default/pacman/pacman-$channel.conf" /etc/pacman.conf
 sudo cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-$channel" /etc/pacman.d/mirrorlist

 # Reset all package DBs and then update
-sudo pacman -Syyuu --noconfirm
+sudo pacman -Syyu --noconfirm
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Refresh the SDDM theme from default
-
-sudo rm -rf /usr/share/sddm/themes/omarchy
-sudo cp -r $OMARCHY_PATH/default/sddm/omarchy /usr/share/sddm/themes/omarchy
@@ -3,7 +3,4 @@
 # Overwrite the user tmux config with the Omarchy default and reload tmux.

 omarchy-refresh-config tmux/tmux.conf
-
-if pgrep -x tmux; then
-  tmux source-file ~/.config/tmux/tmux.conf
-fi
+tmux source-file ~/.config/tmux/tmux.conf
@@ -10,5 +10,5 @@ if gum confirm "Are you sure you want to reinstall and lose all config changes?"
  omarchy-reinstall-pkgs
  omarchy-reinstall-configs

-  gum confirm "System has been reinstalled. Reboot?" && omarchy-system-reboot
+  gum confirm "System has been reinstalled. Reboot?" && omarchy-cmd-reboot
 fi
@@ -3,7 +3,7 @@ set -e

 # Overwrite all user configs with the Omarchy defaults.

-if (( EUID == 0 )); then
+if [ "$EUID" -eq 0 ]; then
  echo "Error: This script should not be run as root"
  exit 1
 fi
@@ -9,10 +9,6 @@ if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI w
  omarchy-webapp-remove-all
  omarchy-tui-remove-all

-  cp ~/.config/hypr/bindings.conf ~/.config/hypr/bindings.conf.bak
-  cp "$OMARCHY_PATH/default/hypr/plain-bindings.conf" ~/.config/hypr/bindings.conf
-  hyprctl reload
-
  omarchy-pkg-drop \
    aether \
    typora \
@@ -25,8 +21,5 @@ if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI w
    pinta \
    obsidian \
    obs-studio \
-    kdenlive \
-    lazydocker \
-    opencode \
-    claude-code
+    kdenlive
 fi
@@ -1,10 +1,10 @@
 #!/bin/bash

 # Remove a development environment that was previously installed via omarchy-install-dev-env.
-# Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure|scala>
+# Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure>

-if [[ -z $1 ]]; then
-  echo "Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure|scala>" >&2
+if [[ -z "$1" ]]; then
+  echo "Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure>" >&2
  exit 1
 fi

@@ -96,13 +96,6 @@ clojure)
  mise uninstall clojure --all
  mise rm -g clojure
  ;;
-scala)
-  echo -e "Removing Scala...\n"
-  mise uninstall scala --all
-  mise uninstall scala-cli --all
-  mise rm -g scala
-  mise rm -g scala-cli
-  ;;
 *)
  echo "Unknown environment: $1"
  exit 1
@@ -1,7 +1,7 @@
 #!/bin/bash

 # Restart an application by killing it and relaunching via uwsm.
-# Usage: omarchy-restart-app <application-name> [application-args...]
+# Usage: omarchy-restart-app <application-name>

 pkill -x $1
-setsid uwsm-app -- "$@" >/dev/null 2>&1 &
+setsid uwsm-app -- $1 >/dev/null 2>&1 &
@@ -12,7 +12,7 @@ restart_services() {
  fi
 }

-if (( EUID == 0 )); then
+if [[ $EUID -eq 0 ]]; then
  SCRIPT_OWNER=$(stat -c '%U' "$0")
  USER_UID=$(id -u "$SCRIPT_OWNER")
  systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
@@ -2,4 +2,4 @@

 # Restart the XCompose input method service (fcitx5) to apply new compose key settings.

-omarchy-restart-app fcitx5 --disable notificationitem
+omarchy-restart-app fcitx5
@@ -1,30 +1,7 @@
 #!/bin/bash

-lock_dns_to_resolved() {
-  for file in /etc/systemd/network/*.network; do
-    [[ -f $file ]] || continue
-    if ! grep -q "^\[DHCPv4\]" "$file"; then continue; fi
-
-    if ! sed -n '/^\[DHCPv4\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
-      sudo sed -i '/^\[DHCPv4\]/a UseDNS=no' "$file"
-    fi
-
-    if grep -q "^\[IPv6AcceptRA\]" "$file" && ! sed -n '/^\[IPv6AcceptRA\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
-      sudo sed -i '/^\[IPv6AcceptRA\]/a UseDNS=no' "$file"
-    fi
-  done
-}
-
-unlock_dns_to_dhcp() {
-  for file in /etc/systemd/network/*.network; do
-    [[ -f $file ]] || continue
-    sudo sed -i '/^\[DHCPv4\]/{n;/^UseDNS=no$/d}' "$file"
-    sudo sed -i '/^\[IPv6AcceptRA\]/{n;/^UseDNS=no$/d}' "$file"
-  done
-}
-
 if [[ -z $1 ]]; then
-  dns=$(gum choose --height 6 --header "Select DNS provider" Cloudflare Google DHCP Custom)
+  dns=$(gum choose --height 5 --header "Select DNS provider" Cloudflare DHCP Custom)
 else
  dns=$1
 fi
@@ -37,17 +14,24 @@ DNS=1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com
 FallbackDNS=9.9.9.9 149.112.112.112
 DNSOverTLS=opportunistic
 EOF
-  lock_dns_to_resolved
-  ;;
-
-Google)
-  sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
-[Resolve]
-DNS=8.8.8.8#dns.google 8.8.4.4#dns.google
-FallbackDNS=9.9.9.9 149.112.112.112
-DNSOverTLS=opportunistic
-EOF
-  lock_dns_to_resolved
+  
+  # Ensure network interfaces don't override our DNS settings
+  for file in /etc/systemd/network/*.network; do
+    [[ -f "$file" ]] || continue
+    if ! grep -q "^\[DHCPv4\]" "$file"; then continue; fi
+    
+    # Add UseDNS=no to DHCPv4 section if not present
+    if ! sed -n '/^\[DHCPv4\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
+      sudo sed -i '/^\[DHCPv4\]/a UseDNS=no' "$file"
+    fi
+    
+    # Add UseDNS=no to IPv6AcceptRA section if present
+    if grep -q "^\[IPv6AcceptRA\]" "$file" && ! sed -n '/^\[IPv6AcceptRA\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
+      sudo sed -i '/^\[IPv6AcceptRA\]/a UseDNS=no' "$file"
+    fi
+  done
+  
+  sudo systemctl restart systemd-networkd systemd-resolved
  ;;

 DHCP)
@@ -55,14 +39,21 @@ DHCP)
 [Resolve]
 DNSOverTLS=no
 EOF
-  unlock_dns_to_dhcp
+  
+  # Allow network interfaces to use DHCP DNS
+  for file in /etc/systemd/network/*.network; do
+    [[ -f "$file" ]] || continue
+    sudo sed -i '/^UseDNS=no/d' "$file"
+  done
+  
+  sudo systemctl restart systemd-networkd systemd-resolved
  ;;

 Custom)
  echo "Enter your DNS servers (space-separated, e.g. '192.168.1.1 1.1.1.1'):"
  read -r dns_servers

-  if [[ -z $dns_servers ]]; then
+  if [[ -z "$dns_servers" ]]; then
    echo "Error: No DNS servers provided."
    exit 1
  fi
@@ -72,8 +63,25 @@ Custom)
 DNS=$dns_servers
 FallbackDNS=9.9.9.9 149.112.112.112
 EOF
-  lock_dns_to_resolved
+  
+  # Ensure network interfaces don't override our DNS settings
+  for file in /etc/systemd/network/*.network; do
+    [[ -f "$file" ]] || continue
+    if ! grep -q "^\[DHCPv4\]" "$file"; then continue; fi
+    
+    # Add UseDNS=no to DHCPv4 section if not present
+    if ! sed -n '/^\[DHCPv4\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
+      sudo sed -i '/^\[DHCPv4\]/a UseDNS=no' "$file"
+    fi
+    
+    # Add UseDNS=no to IPv6AcceptRA section if present
+    if grep -q "^\[IPv6AcceptRA\]" "$file" && ! sed -n '/^\[IPv6AcceptRA\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
+      sudo sed -i '/^\[IPv6AcceptRA\]/a UseDNS=no' "$file"
+    fi
+  done
+  
+  sudo systemctl restart systemd-networkd systemd-resolved
+
  ;;
 esac

-sudo systemctl restart systemd-networkd systemd-resolved
@@ -21,7 +21,7 @@ print_info() {

 check_fido2_hardware() {
  tokens=$(fido2-token -L 2>/dev/null)
-  if [[ -z $tokens ]]; then
+  if [ -z "$tokens" ]; then
    print_error "\nNo FIDO2 device detected. Please plug it in (you may need to unlock it as well)."
    return 1
  fi
@@ -36,10 +36,10 @@ setup_pam_config() {
  fi

  # Configure polkit
-  if [[ -f /etc/pam.d/polkit-1 ]] && ! grep -q 'pam_u2f.so' /etc/pam.d/polkit-1; then
+  if [ -f /etc/pam.d/polkit-1 ] && ! grep -q 'pam_u2f.so' /etc/pam.d/polkit-1; then
    print_info "Configuring polkit for FIDO2 authentication..."
    sudo sed -i '1i auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/polkit-1
-  elif [[ ! -f /etc/pam.d/polkit-1 ]]; then
+  elif [ ! -f /etc/pam.d/polkit-1 ]; then
    print_info "Creating polkit configuration with FIDO2 authentication..."
    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
 auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2
@@ -60,20 +60,20 @@ remove_pam_config() {
  fi

  # Remove from polkit
-  if [[ -f /etc/pam.d/polkit-1 ]] && grep -Fq 'pam_u2f.so' /etc/pam.d/polkit-1; then
+  if [ -f /etc/pam.d/polkit-1 ] && grep -Fq 'pam_u2f.so' /etc/pam.d/polkit-1; then
    print_info "Removing FIDO2 authentication from polkit..."
    sudo sed -i '/pam_u2f\.so/d' /etc/pam.d/polkit-1
  fi
 }

-if [[ "--remove" == $1 ]]; then
+if [[ "--remove" == "$1" ]]; then
  print_success "Removing FIDO2 device from authentication.\n"

  # Remove PAM configuration
  remove_pam_config

  # Remove FIDO2 configuration
-  if [[ -d /etc/fido2 ]]; then
+  if [ -d /etc/fido2 ]; then
    print_info "Removing FIDO2 configuration..."
    sudo rm -rf /etc/fido2
  fi
@@ -88,14 +88,14 @@ else

  # Install required packages
  print_info "Installing required packages..."
-  omarchy-pkg-add libfido2 pam-u2f
+  sudo pacman -S --noconfirm --needed libfido2 pam-u2f

  if ! check_fido2_hardware; then
    exit 1
  fi

  # Create the pamu2fcfg file
-  if [[ ! -f /etc/fido2/fido2 ]]; then
+  if [ ! -f /etc/fido2/fido2 ]; then
    sudo mkdir -p /etc/fido2
    print_success "\nLet's setup your device by confirming on the device now."
    print_info "Touch your FIDO2 key when it lights up...\n"
@@ -24,7 +24,7 @@ check_fingerprint_hardware() {
  devices=$(fprintd-list "$USER" 2>/dev/null)

  # Exit if no devices found
-  if [[ -z $devices ]]; then
+  if [[ -z "$devices" ]]; then
    print_error "\nNo fingerprint sensor detected."
    return 1
  fi
@@ -39,10 +39,10 @@ setup_pam_config() {
  fi

  # Configure polkit
-  if [[ -f /etc/pam.d/polkit-1 ]] && ! grep -q 'pam_fprintd.so' /etc/pam.d/polkit-1; then
+  if [ -f /etc/pam.d/polkit-1 ] && ! grep -q 'pam_fprintd.so' /etc/pam.d/polkit-1; then
    print_info "Configuring polkit for fingerprint authentication..."
    sudo sed -i '1i auth      sufficient pam_fprintd.so' /etc/pam.d/polkit-1
-  elif [[ ! -f /etc/pam.d/polkit-1 ]]; then
+  elif [ ! -f /etc/pam.d/polkit-1 ]; then
    print_info "Creating polkit configuration with fingerprint authentication..."
    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
 auth      sufficient pam_fprintd.so
@@ -75,13 +75,13 @@ remove_pam_config() {
  fi

  # Remove from polkit
-  if [[ -f /etc/pam.d/polkit-1 ]] && grep -Fq 'pam_fprintd.so' /etc/pam.d/polkit-1; then
+  if [ -f /etc/pam.d/polkit-1 ] && grep -Fq 'pam_fprintd.so' /etc/pam.d/polkit-1; then
    print_info "Removing fingerprint authentication from polkit..."
    sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/polkit-1
  fi
 }

-if [[ "--remove" == $1 ]]; then
+if [[ "--remove" == "$1" ]]; then
  print_success "Removing fingerprint scanner from authentication.\n"

  # Remove PAM configuration
@@ -100,7 +100,7 @@ else

  # Install required packages
  print_info "Installing required packages..."
-  omarchy-pkg-add fprintd usbutils
+  sudo pacman -S --noconfirm --needed fprintd usbutils

  if ! check_fingerprint_hardware; then
    exit 1
@@ -31,4 +31,6 @@ create)
 restore)
  sudo limine-snapper-restore
  ;;
+delete)
+  sudo snapper -c "$config" delete 0
 esac
@@ -10,12 +10,12 @@ mkdir -p "$STATE_DIR"
 COMMAND="$1"
 STATE_NAME="$2"

-if [[ -z $COMMAND ]]; then
+if [[ -z "$COMMAND" ]]; then
  echo "Usage: omarchy-state <set|clear> <state-name-or-pattern>"
  exit 1
 fi

-if [[ -z $STATE_NAME ]]; then
+if [[ -z "$STATE_NAME" ]]; then
  echo "Usage: omarchy-state $COMMAND <state-name>"
  exit 1
 fi
@@ -6,7 +6,7 @@
 percent="$1"

 progress="$(awk -v p="$percent" 'BEGIN{printf "%.2f", p/100}')"
-[[ $progress == "0.00" ]] && progress="0.01"
+[[ "$progress" == "0.00" ]] && progress="0.01"

 swayosd-client \
  --monitor "$(hyprctl monitors -j | jq -r '.[]|select(.focused==true).name')" \
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Display keyboard brightness level using SwayOSD on the current monitor.
-# Usage: omarchy-swayosd-kbd-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 keyboard-brightness \
-  --custom-progress "$progress" \
-  --custom-progress-text "${percent}%"
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Logout command that first closes all application windows (thus giving them a chance to save state),
-# then stops the session, returning to the SDDM login screen.
-
-# Schedule the session stop after closing windows (detached from terminal)
-nohup bash -c "sleep 2 && uwsm stop" >/dev/null 2>&1 &
-
-# Now close all windows
-omarchy-hyprland-window-close-all
-sleep 1 # Allow apps like Chrome to shutdown correctly
@@ -10,13 +10,13 @@ CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 mapfile -d '' -t BACKGROUNDS < <(find -L "$USER_BACKGROUNDS_PATH" "$THEME_BACKGROUNDS_PATH" -maxdepth 1 -type f -print0 2>/dev/null | sort -z)
 TOTAL=${#BACKGROUNDS[@]}

-if (( TOTAL == 0 )); then
+if [[ $TOTAL -eq 0 ]]; then
  notify-send "No background was found for theme" -t 2000
  pkill -x swaybg
  setsid uwsm-app -- swaybg --color '#000000' >/dev/null 2>&1 &
 else
  # Get current background from symlink
-  if [[ -L $CURRENT_BACKGROUND_LINK ]]; then
+  if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
    CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
  else
    # Default to first background if no symlink exists
@@ -26,14 +26,14 @@ else
  # Find current background index
  INDEX=-1
  for i in "${!BACKGROUNDS[@]}"; do
-    if [[ ${BACKGROUNDS[$i]} == $CURRENT_BACKGROUND ]]; then
+    if [[ "${BACKGROUNDS[$i]}" == "$CURRENT_BACKGROUND" ]]; then
      INDEX=$i
      break
    fi
  done

  # Get next background (wrap around)
-  if (( INDEX == -1 )); then
+  if [[ $INDEX -eq -1 ]]; then
    # Use the first background when no match was found
    NEW_BACKGROUND="${BACKGROUNDS[0]}"
  else
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Sets the specified image as the current background
-
-if [[ -z $1 ]]; then
-  echo "Usage: omarchy-theme-bg-set <path-to-image>" >&2
-  exit 1
-fi
-
-BACKGROUND="$1"
-CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
-
-# Create symlink to the new background
-ln -nsf "$BACKGROUND" "$CURRENT_BACKGROUND_LINK"
-
-# Kill existing swaybg and start new one
-pkill -x swaybg
-setsid uwsm-app -- swaybg -i "$CURRENT_BACKGROUND_LINK" -m fill >/dev/null 2>&1 &
@@ -3,14 +3,14 @@
 # omarchy-theme-install: Install a new theme from a git repo for Omarchy
 # Usage: omarchy-theme-install <git-repo-url>

-if [[ -z $1 ]]; then
+if [ -z "$1" ]; then
  echo -e "\e[32mSee https://manuals.omamix.org/2/the-omarchy-manual/90/extra-themes\n\e[0m"
  REPO_URL=$(gum input --placeholder="Git repo URL for theme" --header="")
 else
  REPO_URL="$1"
 fi

-if [[ -z $REPO_URL ]]; then
+if [ -z "$REPO_URL" ]; then
  exit 1
 fi

@@ -19,7 +19,7 @@ THEME_NAME=$(basename "$REPO_URL" .git | sed -E 's/^omarchy-//; s/-theme$//')
 THEME_PATH="$THEMES_DIR/$THEME_NAME"

 # Remove existing theme if present
-if [[ -d $THEME_PATH ]]; then
+if [ -d "$THEME_PATH" ]; then
  rm -rf "$THEME_PATH"
 fi

@@ -3,10 +3,10 @@
 # omarchy-theme-remove: Remove a theme from Omarchy by name
 # Usage: omarchy-theme-remove <theme-name>

-if [[ -z $1 ]]; then
+if [ -z "$1" ]; then
  mapfile -t extra_themes < <(find ~/.config/omarchy/themes -mindepth 1 -maxdepth 1 -type d ! -xtype l -printf '%f\n')

-  if (( ${#extra_themes[@]} > 0 )); then
+  if [[ ${#extra_themes[@]} -gt 0 ]]; then
    THEME_NAME=$(printf '%s\n' "${extra_themes[@]}" | sort | gum choose --header="Remove extra theme")
  else
    echo "No extra themes installed."
@@ -21,12 +21,12 @@ CURRENT_DIR="$HOME/.config/omarchy/current"
 THEME_PATH="$THEMES_DIR/$THEME_NAME"

 # Ensure a theme was set
-if [[ -z $THEME_NAME ]]; then
+if [ -z "$THEME_NAME" ]; then
  exit 1
 fi

 # Check if theme exists before attempting removal
-if [[ ! -d $THEME_PATH ]]; then
+if [ ! -d "$THEME_PATH" ]; then
  echo "Error: Theme '$THEME_NAME' not found."
  exit 1
 fi
@@ -12,7 +12,11 @@ OMARCHY_THEMES_PATH="$OMARCHY_PATH/themes"

 THEME_NAME=$(echo "$1" | sed -E 's/<[^>]+>//g' | tr '[:upper:]' '[:lower:]' | tr ' ' '-')

-if [[ ! -d $OMARCHY_THEMES_PATH/$THEME_NAME ]] && [[ ! -d $USER_THEMES_PATH/$THEME_NAME ]]; then
+if [[ -d "$USER_THEMES_PATH/$THEME_NAME" ]]; then
+  THEME_PATH="$USER_THEMES_PATH/$THEME_NAME"
+elif [[ -d "$OMARCHY_THEMES_PATH/$THEME_NAME" ]]; then
+  THEME_PATH="$OMARCHY_THEMES_PATH/$THEME_NAME"
+else
  echo "Theme '$THEME_NAME' does not exist"
  exit 1
 fi
@@ -21,9 +25,8 @@ fi
 rm -rf "$NEXT_THEME_PATH"
 mkdir -p "$NEXT_THEME_PATH"

-# Copy official theme first, then overlay user customizations on top
-cp -r "$OMARCHY_THEMES_PATH/$THEME_NAME/"* "$NEXT_THEME_PATH/" 2>/dev/null
-cp -r "$USER_THEMES_PATH/$THEME_NAME/"* "$NEXT_THEME_PATH/" 2>/dev/null
+# Copy static configs
+cp -r "$THEME_PATH/"* "$NEXT_THEME_PATH/" 2>/dev/null

 # Generate dynamic configs
 omarchy-theme-set-templates
@@ -33,7 +36,7 @@ rm -rf "$CURRENT_THEME_PATH"
 mv "$NEXT_THEME_PATH" "$CURRENT_THEME_PATH"

 # Store theme name for reference
-echo "$THEME_NAME" >"$HOME/.config/omarchy/current/theme.name"
+echo "$THEME_NAME" > "$HOME/.config/omarchy/current/theme.name"

 # Change background with theme
 omarchy-theme-bg-next
@@ -54,7 +57,7 @@ omarchy-theme-set-gnome
 omarchy-theme-set-browser
 omarchy-theme-set-vscode
 omarchy-theme-set-obsidian
-omarchy-theme-set-keyboard
+omarchy-theme-set-asusctl

 # Call hook on theme set
 omarchy-hook theme-set "$THEME_NAME"
@@ -1,6 +1,6 @@
 #!/bin/bash

-ASUSCTL_THEME=~/.config/omarchy/current/theme/keyboard.rgb
+ASUSCTL_THEME=~/.config/omarchy/current/theme/asusctl.rgb

 if omarchy-cmd-present asusctl; then
  asusctl aura effect static -c $(sed 's/^#//' $ASUSCTL_THEME)
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-omarchy-theme-set-keyboard-asus-rog
-omarchy-theme-set-keyboard-f16
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-FRAMEWORK16_THEME=~/.config/omarchy/current/theme/keyboard.rgb
-
-if omarchy-cmd-present qmk_hid && [[ -f $FRAMEWORK16_THEME ]]; then
-  hex=$(cat "$FRAMEWORK16_THEME")
-  hex="${hex#\#}"
-
-  # Convert hex to QMK HSV (0-255 scale) using Python's colorsys
-  read -r h s <<< $(python3 -c "
-import colorsys
-r, g, b = int('$hex'[:2],16)/255, int('$hex'[2:4],16)/255, int('$hex'[4:6],16)/255
-h, s, v = colorsys.rgb_to_hsv(r, g, b)
-print(int(h * 255), int(s * 255))
-")
-
-  qmk_hid via --rgb-effect 1 2>/dev/null
-  qmk_hid via --rgb-hue "$h" 2>/dev/null
-  qmk_hid via --rgb-saturation "$s" 2>/dev/null
-  qmk_hid via --rgb-brightness 100 2>/dev/null
-  qmk_hid via --save 2>/dev/null
-fi
@@ -4,15 +4,15 @@

 CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"

-[[ -f $CURRENT_THEME_DIR/obsidian.css ]] || exit 0
+[ -f "$CURRENT_THEME_DIR/obsidian.css" ] || exit 0

 jq -r '.vaults | values[].path' ~/.config/obsidian/obsidian.json 2>/dev/null | while read -r vault_path; do
-  [[ -d $vault_path/.obsidian ]] || continue
+  [ -d "$vault_path/.obsidian" ] || continue

  theme_dir="$vault_path/.obsidian/themes/Omarchy"
  mkdir -p "$theme_dir"

-  [[ -f $theme_dir/manifest.json ]] || cat >"$theme_dir/manifest.json" <<'EOF'
+  [ -f "$theme_dir/manifest.json" ] || cat >"$theme_dir/manifest.json" <<'EOF'
 {
  "name": "Omarchy",
  "version": "1.0.0",
@@ -9,18 +9,18 @@ set_theme() {
  local settings_path="$2"
  local skip_flag="$3"

-  omarchy-cmd-present "$editor_cmd" && [[ ! -f $skip_flag ]] || return 0
+  omarchy-cmd-present "$editor_cmd" && [[ ! -f "$skip_flag" ]] || return 0

-  if [[ -f $VS_CODE_THEME ]]; then
+  if [[ -f "$VS_CODE_THEME" ]]; then
    theme_name=$(jq -r '.name' "$VS_CODE_THEME")
    extension=$(jq -r '.extension' "$VS_CODE_THEME")

-    if [[ -n $extension ]] && ! "$editor_cmd" --list-extensions | grep -Fxq "$extension"; then
+    if [[ -n "$extension" ]] && ! "$editor_cmd" --list-extensions | grep -Fxq "$extension"; then
      "$editor_cmd" --install-extension "$extension" >/dev/null
    fi

    mkdir -p "$(dirname "$settings_path")"
-    [[ -f $settings_path ]] || printf '{\n}\n' >"$settings_path"
+    [[ -f "$settings_path" ]] || printf '{\n}\n' >"$settings_path"

    if ! grep -q '"workbench.colorTheme"' "$settings_path"; then
      sed -i --follow-symlinks -E '0,/\{/{s/\{/{\ "workbench.colorTheme": "",/}' "$settings_path"
@@ -29,7 +29,7 @@ set_theme() {
    sed -i --follow-symlinks -E \
      "s/(\"workbench.colorTheme\"[[:space:]]*:[[:space:]]*\")[^\"]*(\")/\1$theme_name\2/" \
      "$settings_path"
-  elif [[ -f $settings_path ]]; then
+  elif [[ -f "$settings_path" ]]; then
    sed -i --follow-symlinks -E 's/\"workbench\.colorTheme\"[[:space:]]*:[^,}]*,?//' "$settings_path"
  fi
 }
@@ -1,7 +1,7 @@
 #!/bin/bash

 for dir in ~/.config/omarchy/themes/*/; do
-  if [[ -d $dir ]] && [[ ! -L ${dir%/} ]] && [[ -d $dir/.git ]]; then
+  if [[ -d $dir ]] && [[ ! -L "${dir%/}" ]] && [[ -d "$dir/.git" ]]; then
    echo "Updating: $(basename "$dir")"
    git -C "$dir" pull
  fi
@@ -6,21 +6,10 @@
 # Ensure supergfxctl has been installed
 if omarchy-cmd-missing supergfxctl; then
  omarchy-pkg-add supergfxctl
+  sudo systemctl enable supergfxd

-  # Create config before starting service to prevent hang on first boot
-  sudo tee /etc/supergfxd.conf >/dev/null <<'CONF'
-{
-  "mode": "Hybrid",
-  "vfio_enable": true,
-  "vfio_save": false,
-  "always_reboot": false,
-  "no_logind": false,
-  "logout_timeout_s": 180,
-  "hotplug_type": "None"
-}
-CONF
-
-  sudo systemctl enable --now supergfxd
+  # Needed to deal with restoring to sleep where going through VFIO first means we don't need to reboot.
+  sudo sed -i "s/\"vfio_enable\": \".*\"/\"vfio_enable\": true/" /etc/supergfxd.conf
 fi

 gpu_mode=$(supergfxctl -g)
@@ -37,25 +26,24 @@ case "$gpu_mode" in
    # Remove the startup delay override (not needed for Hybrid mode)
    sudo rm -rf /etc/systemd/system/supergfxd.service.d/delay-start.conf

-    omarchy-system-reboot
+    omarchy-cmd-reboot
  fi
  ;;
 "Hybrid")
  if gum confirm "Use only integrated GPU and reboot?"; then
-    # Switch to integrated mode and ensure vfio is enabled (needed for sleep/wake trick)
+    # Switch to integrated mode
    sudo sed -i "s/\"mode\": \".*\"/\"mode\": \"Integrated\"/" /etc/supergfxd.conf
-    sudo sed -i 's/"vfio_enable": false/"vfio_enable": true/' /etc/supergfxd.conf

    # Force igpu mode after system sleep (or dgpu could get activated)
    sudo mkdir -p /usr/lib/systemd/system-sleep
-    sudo cp -p $OMARCHY_PATH/default/systemd/system-sleep/force-igpu /usr/lib/systemd/system-sleep/
+    sudo cp -p  $OMARCHY_PATH/default/systemd/system-sleep/force-igpu /usr/lib/systemd/system-sleep/

    # Delay supergfxd startup to avoid race condition with display manager
    # that can cause system freeze when booting in Integrated mode
    sudo mkdir -p /etc/systemd/system/supergfxd.service.d
    sudo cp -p $OMARCHY_PATH/default/systemd/system/supergfxd.service.d/delay-start.conf /etc/systemd/system/supergfxd.service.d/

-    omarchy-system-reboot
+    omarchy-cmd-reboot
  fi
  ;;
 *)
@@ -2,10 +2,8 @@

 if pgrep -x hypridle >/dev/null; then
  pkill -x hypridle
-  notify-send "󱫖    Stop locking computer when idle"
+  notify-send "Stop locking computer when idle"
 else
  uwsm-app -- hypridle >/dev/null 2>&1 &
-  notify-send "󱫖    Now locking computer when idle"
+  notify-send "Now locking computer when idle"
 fi
-
-pkill -RTMIN+9 waybar
@@ -19,7 +19,7 @@ restart_nightlighted_waybar() {
  fi
 }

-if [[ $CURRENT_TEMP == $OFF_TEMP ]]; then
+if [[ "$CURRENT_TEMP" == "$OFF_TEMP" ]]; then
  hyprctl hyprsunset temperature $ON_TEMP
  notify-send "  Nightlight screen temperature"
  restart_nightlighted_waybar
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-makoctl mode -t do-not-disturb
-
-if makoctl mode | grep -q 'do-not-disturb'; then
-  notify-send "󰂛    Silenced notifications"
-else
-  notify-send "󰂚    Enabled notifications"
-fi
-
-pkill -RTMIN+10 waybar
@@ -1,12 +1,13 @@
 #!/bin/bash

-STATE_FILE=~/.local/state/omarchy/toggles/suspend-off
+STATE_FILE=~/.local/state/omarchy/toggles/suspend-on

-if [[ -f $STATE_FILE ]]; then
-  rm -f $STATE_FILE
+if [[ ! -f $STATE_FILE ]]; then
+  mkdir -p "$(dirname $STATE_FILE)"
+  touch $STATE_FILE
  notify-send "󰒲   Suspend now available in system menu"
 else
  mkdir -p "$(dirname $STATE_FILE)"
-  touch $STATE_FILE
+  rm -f $STATE_FILE
  notify-send "󰒲   Suspend removed from system menu"
 fi
@@ -2,7 +2,7 @@

 set -e

-if (( $# != 4 )); then
+if [ "$#" -ne 4 ]; then
  echo -e "\e[32mLet's create a TUI shortcut you can start with the app launcher.\n\e[0m"
  APP_NAME=$(gum input --prompt "Name> " --placeholder "My TUI")
  APP_EXEC=$(gum input --prompt "Launch Command> " --placeholder "lazydocker or bash -c 'dust; read -n 1 -s'")
@@ -15,7 +15,7 @@ else
  ICON_URL="$4"
 fi

-if [[ -z $APP_NAME || -z $APP_EXEC || -z $ICON_URL ]]; then
+if [[ -z "$APP_NAME" || -z "$APP_EXEC" || -z "$ICON_URL" ]]; then
  echo "You must set app name, app command, and icon URL!"
  exit 1
 fi
@@ -23,7 +23,7 @@ fi
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"

-if [[ ! $ICON_URL =~ ^https?:// ]] && [[ -f $ICON_URL ]]; then
+if [[ ! "$ICON_URL" =~ ^https?:// ]] && [ -f "$ICON_URL" ]; then
  ICON_PATH="$ICON_URL"
 else
  ICON_PATH="$ICON_DIR/$APP_NAME.png"
@@ -54,6 +54,6 @@ EOF

 chmod +x "$DESKTOP_FILE"

-if (( $# != 4 )); then
+if [ "$#" -ne 4 ]; then
  echo -e "You can now find $APP_NAME using the app launcher (SUPER + SPACE)\n"
 fi
@@ -5,7 +5,7 @@ set -e
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"

-if (( $# == 0 )); then
+if [ "$#" -eq 0 ]; then
  # Find all TUIs
  while IFS= read -r -d '' file; do
    if grep -qE '^Exec=.*(\$TERMINAL|xdg-terminal-exec).*-e' "$file"; then
@@ -20,7 +20,7 @@ if (( $# == 0 )); then
    # Convert newline-separated string to array
    APP_NAMES=()
    while IFS= read -r line; do
-      [[ -n $line ]] && APP_NAMES+=("$line")
+      [[ -n "$line" ]] && APP_NAMES+=("$line")
    done <<< "$APP_NAMES_STRING"
  else
    echo "No TUIs to remove."
@@ -31,7 +31,7 @@ else
  APP_NAMES=("$@")
 fi

-if (( ${#APP_NAMES[@]} == 0 )); then
+if [[ ${#APP_NAMES[@]} -eq 0 ]]; then
  echo "You must provide TUI names."
  exit 1
 fi
@@ -17,7 +17,7 @@ while IFS= read -r -d '' file; do
  fi
 done < <(find "$APP_DIR" -maxdepth 1 -name "*.desktop" -print0 2>/dev/null)

-if (( ${#tui_desktop_files[@]} == 0 )); then
+if [[ ${#tui_desktop_files[@]} -eq 0 ]]; then
  echo "No TUIs found."
  exit 0
 fi
@@ -2,10 +2,10 @@

 set -e

-trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m"' ERR
+trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m";omarchy-snapshot delete' ERR

 if [[ $1 == "-y" ]] || omarchy-update-confirm; then
-  omarchy-snapshot create || (( $? == 127 ))
+  omarchy-snapshot create || [ $? -eq 127 ]
  omarchy-update-git
  omarchy-update-perform
 fi
@@ -2,6 +2,13 @@

 update_log="/tmp/omarchy-update.log"

+# Check for errors
+if grep -qi "error" "$update_log"; then
+  echo -e "\e[31mNon-stopping errors detected during update:\e[0m"
+  grep -i "error" "$update_log"
+  echo
+fi
+
 # Check for initramfs generation failure
 if grep -q "Updating linux initcpios" "$update_log"; then
  if ! grep -q "Initcpio image generation successful" "$update_log"; then
@@ -2,19 +2,19 @@

 # Get remote tag
 latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
-if [[ -z $latest_tag ]]; then
+if [[ -z "$latest_tag" ]]; then
  echo "Error: Could not retrieve latest tag."
  exit 1
 fi

 # Get local tag
 current_tag=$(git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1))
-if [[ -z $current_tag ]]; then
+if [[ -z "$current_tag" ]]; then
  echo "Error: Could not retrieve current tag."
  exit 1
 fi

-if [[ $current_tag != $latest_tag ]]; then
+if [[ "$current_tag" != "$latest_tag" ]]; then
  echo "Omarchy update available ($latest_tag)"
  exit 0
 else
@@ -10,7 +10,7 @@ fi
 branch="$1"

 # Snapshot before switching branch
-omarchy-snapshot create || (( $? == 127 ))
+omarchy-snapshot create || [ $? -eq 127 ]

 if ! git -C "$OMARCHY_PATH" diff --quiet || ! git -C "$OMARCHY_PATH" diff --cached --quiet; then
  stashed=true
@@ -23,7 +23,7 @@ fi
 git -C "$OMARCHY_PATH" switch "$branch"

 # Reapply stash if we made one
-if [[ $stashed == "true" ]]; then
+if [[ $stashed == true ]]; then
  if ! git -C "$OMARCHY_PATH" stash pop; then
    echo "⚠️ Conflicts when applying stash — stash kept"
  fi
@@ -12,7 +12,3 @@ if omarchy-pkg-missing omarchy-keyring || ! sudo pacman-key --list-keys 40DFB630

  sudo pacman-key --list-keys 40DFB630FF42BCFFB047046CF0134EE680CAC571
 fi
-
-# Ensure we have the latest archlinux-keyring, maintainer keys might have changed
-echo -e "\e[32m\nUpdate Arch signing keys\e[0m"
-sudo pacman -Sy --noconfirm archlinux-keyring >/dev/null
@@ -1,13 +1,14 @@
 #!/bin/bash

-if [[ ! -d /usr/lib/modules/$(uname -r) ]]; then
-  gum confirm "Linux kernel has been updated. Reboot?" && omarchy-system-reboot
-elif [[ -f $HOME/.local/state/omarchy/reboot-required ]]; then
-  gum confirm "Updates require reboot. Ready?" && omarchy-system-reboot
+if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $2}')" ]; then
+  gum confirm "Linux kernel has been updated. Reboot?" && omarchy-cmd-reboot
+
+elif [ -f "$HOME/.local/state/omarchy/reboot-required" ]; then
+  gum confirm "Updates require reboot. Ready?" && omarchy-cmd-reboot
 fi

 for file in "$HOME"/.local/state/omarchy/restart-*-required; do
-  if [[ -f $file ]]; then
+  if [ -f "$file" ]; then
    filename=$(basename "$file")
    service=$(echo "$filename" | sed 's/restart-\(.*\)-required/\1/')
    echo "Restarting $service"
@@ -46,7 +46,7 @@ install)
  cat "$SYSTEM_INFO" >"$TEMP_LOG"
  cat $ARCHINSTALL_LOG $OMARCHY_LOG >>"$TEMP_LOG" 2>/dev/null

-  if [[ ! -s $TEMP_LOG ]]; then
+  if [ ! -s "$TEMP_LOG" ]; then
    echo "Error: No install logs found"
    exit 1
  fi
@@ -59,7 +59,7 @@ this-boot)
  cat "$SYSTEM_INFO" >"$TEMP_LOG"
  journalctl -b 0 >>"$TEMP_LOG" 2>/dev/null

-  if [[ ! -s $TEMP_LOG ]]; then
+  if [ ! -s "$TEMP_LOG" ]; then
    echo "Error: No logs found for current boot"
    exit 1
  fi
@@ -72,7 +72,7 @@ last-boot)
  cat "$SYSTEM_INFO" >"$TEMP_LOG"
  journalctl -b -1 >>"$TEMP_LOG" 2>/dev/null

-  if [[ ! -s $TEMP_LOG ]]; then
+  if [ ! -s "$TEMP_LOG" ]; then
    echo "Error: No logs found for previous boot"
    exit 1
  fi
@@ -80,7 +80,7 @@ last-boot)
  echo "Uploading previous boot logs to 0x0.st..."
  ;;

-installed|system-info)
+installed)
  # System info plus all installed packages
  cat "$SYSTEM_INFO" >"$TEMP_LOG"
  {
@@ -91,7 +91,7 @@ installed|system-info)
    pacman -Q 2>/dev/null || echo "Failed to get package list"
  } >>"$TEMP_LOG"

-  if [[ ! -s $TEMP_LOG ]]; then
+  if [ ! -s "$TEMP_LOG" ]; then
    echo "Error: Failed to gather system information"
    exit 1
  fi
@@ -100,7 +100,7 @@ installed|system-info)
  ;;

 *)
-  echo "Usage: $0 [install|this-boot|last-boot|installed|system-info]"
+  echo "Usage: $0 [install|this-boot|last-boot|system-info]"
  echo "  install      - Upload installation logs (default)"
  echo "  this-boot    - Upload logs from current boot"
  echo "  last-boot    - Upload logs from previous boot"
@@ -113,7 +113,7 @@ echo ""

 URL=$(curl -sF "file=@$TEMP_LOG" -Fexpires=24 https://0x0.st)

-if (( $? == 0 )) && [[ -n $URL ]]; then
+if [ $? -eq 0 ] && [ -n "$URL" ]; then
  echo "✓ Log uploaded successfully!"
  echo "Share this URL:"
  echo ""
@@ -14,5 +14,5 @@ if gum confirm "Install Voxtype + AI model (~150MB) to enable dictation?"; then
  voxtype setup systemd

  omarchy-restart-waybar
-  notify-send "    Voxtype Dictation Ready" "Press Super + Ctrl + X to toggle dictation.\nEdit ~/.config/voxtype/config.toml for options." -t 10000
+  notify-send "    Voxtype Dictation Ready" "Hold Super + Ctrl + X to dictate.\nEdit ~/.config/voxtype/config.toml for options." -t 10000
 fi
@@ -2,34 +2,17 @@

 set -e

-ICON_DIR="$HOME/.local/share/applications/icons"
-
-if (( $# < 3 )); then
+if [ "$#" -lt 3 ]; then
  echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
  APP_NAME=$(gum input --prompt "Name> " --placeholder "My favorite web app")
  APP_URL=$(gum input --prompt "URL> " --placeholder "https://example.com")
-  if [[ ! $APP_URL =~ ^[a-zA-Z][a-zA-Z0-9+.-]*: ]]; then
-    APP_URL="https://$APP_URL"
-  fi
-
-  # Try to fetch favicon automatically first.
-  FAVICON_URL="https://www.google.com/s2/favicons?domain=${APP_URL}&sz=128"
-  mkdir -p "$ICON_DIR"
-  if curl -fsSL -o "$ICON_DIR/$APP_NAME.png" "$FAVICON_URL" && [[ -s $ICON_DIR/$APP_NAME.png ]]; then
-    ICON_REF="$APP_NAME.png"
-  else
-    ICON_REF=$(gum input --prompt "Icon URL> " --placeholder "Could not fetch favicon automatically. Enter PNG icon URL (see https://dashboardicons.com)")
-  fi
-
+  ICON_REF=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
  CUSTOM_EXEC=""
  MIME_TYPES=""
  INTERACTIVE_MODE=true
 else
  APP_NAME="$1"
  APP_URL="$2"
-  if [[ ! $APP_URL =~ ^[a-zA-Z][a-zA-Z0-9+.-]*: ]]; then
-    APP_URL="https://$APP_URL"
-  fi
  ICON_REF="$3"
  CUSTOM_EXEC="$4" # Optional custom exec command
  MIME_TYPES="$5"  # Optional mime types
@@ -37,21 +20,18 @@ else
 fi

 # Ensure valid execution
-if [[ -z $APP_NAME || -z $APP_URL ]]; then
-  echo "You must set app name and app URL!"
+if [[ -z "$APP_NAME" || -z "$APP_URL" || -z "$ICON_REF" ]]; then
+  echo "You must set app name, app URL, and icon URL!"
  exit 1
 fi

-# Resolve icon from URL or from a local icon name.
-mkdir -p "$ICON_DIR"
-
-if [[ -z $ICON_REF ]]; then
-  ICON_REF="https://www.google.com/s2/favicons?domain=${APP_URL}&sz=128"
-fi
-
+# Refer to local icon or fetch remotely from URL
+ICON_DIR="$HOME/.local/share/applications/icons"
 if [[ $ICON_REF =~ ^https?:// ]]; then
  ICON_PATH="$ICON_DIR/$APP_NAME.png"
-  if ! curl -fsSL -o "$ICON_PATH" "$ICON_REF" || [[ ! -s $ICON_PATH ]]; then
+  if curl -sL -o "$ICON_PATH" "$ICON_REF"; then
+    ICON_PATH="$ICON_DIR/$APP_NAME.png"
+  else
    echo "Error: Failed to download icon."
    exit 1
  fi
@@ -60,7 +40,11 @@ else
 fi

 # Use custom exec if provided, otherwise default behavior
-EXEC_COMMAND="${CUSTOM_EXEC:-omarchy-launch-webapp $APP_URL}"
+if [[ -n $CUSTOM_EXEC ]]; then
+  EXEC_COMMAND="$CUSTOM_EXEC"
+else
+  EXEC_COMMAND="omarchy-launch-webapp $APP_URL"
+fi

 # Create application .desktop file
 DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
@@ -84,6 +68,6 @@ fi

 chmod +x "$DESKTOP_FILE"

-if [[ $INTERACTIVE_MODE == "true" ]]; then
+if [[ $INTERACTIVE_MODE == true ]]; then
  echo -e "You can now find $APP_NAME using the app launcher (SUPER + SPACE)\n"
 fi
@@ -5,7 +5,7 @@ set -e
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"

-if (( $# == 0 )); then
+if [ "$#" -eq 0 ]; then
  # Find all web apps
  while IFS= read -r -d '' file; do
    if grep -q '^Exec=.*\(omarchy-launch-webapp\|omarchy-webapp-handler\).*' "$file"; then
@@ -20,7 +20,7 @@ if (( $# == 0 )); then
    # Convert newline-separated string to array
    APP_NAMES=()
    while IFS= read -r line; do
-      [[ -n $line ]] && APP_NAMES+=("$line")
+      [[ -n "$line" ]] && APP_NAMES+=("$line")
    done <<< "$APP_NAMES_STRING"
  else
    echo "No web apps to remove."
@@ -31,7 +31,7 @@ else
  APP_NAMES=("$@")
 fi

-if (( ${#APP_NAMES[@]} == 0 )); then
+if [[ ${#APP_NAMES[@]} -eq 0 ]]; then
  echo "You must select at least one web app to remove."
  exit 1
 fi
@@ -17,7 +17,7 @@ while IFS= read -r -d '' file; do
  fi
 done < <(find "$APP_DIR" -maxdepth 1 -name "*.desktop" -print0 2>/dev/null)

-if (( ${#webapp_desktop_files[@]} == 0 )); then
+if [[ ${#webapp_desktop_files[@]} -eq 0 ]]; then
  echo "No web apps found."
  exit 0
 fi
--- a/Show More
+++ b/Show More