diff --git a/bin/omarchy-battery-monitor b/bin/omarchy-battery-monitor
index 05f4a44..fd16afb 100755
--- a/bin/omarchy-battery-monitor
+++ b/bin/omarchy-battery-monitor
@@ -6,7 +6,13 @@ BATTERY_THRESHOLD=10
 NOTIFICATION_FLAG="/run/user/$UID/omarchy_battery_notified"
 
 get_battery_percentage() {
-  upower -i $(upower -e | grep 'BAT') | grep -E "percentage" | grep -o '[0-9]\+%' | sed 's/%//'
+  upower -i "$(upower -e | grep 'BAT')" \
+  | awk -F: '/percentage/ {
+      gsub(/[%[:space:]]/, "", $2);
+      val=$2;
+      printf("%d\n", (val+0.5))
+      exit
+    }'
 }
 
 get_battery_state() {
diff --git a/bin/omarchy-cmd-missing b/bin/omarchy-cmd-missing
new file mode 100755
index 0000000..4658d37
--- /dev/null
+++ b/bin/omarchy-cmd-missing
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for cmd in "$@"; do
+  if ! command -v "$cmd" &>/dev/null; then
+    exit 0
+  fi
+done
+
+exit 1
diff --git a/bin/omarchy-cmd-present b/bin/omarchy-cmd-present
new file mode 100755
index 0000000..fecdc94
--- /dev/null
+++ b/bin/omarchy-cmd-present
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for cmd in "$@"; do
+  command -v "$cmd" &>/dev/null || exit 1
+done
+
+exit 0
diff --git a/bin/omarchy-cmd-screensaver b/bin/omarchy-cmd-screensaver
index eb32060..46997e5 100755
--- a/bin/omarchy-cmd-screensaver
+++ b/bin/omarchy-cmd-screensaver
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+function exit_screensaver {
+  pkill -x tte 2>/dev/null
+  pkill -f "alacritty --class Screensaver" 2>/dev/null
+  exit 0
+}
+
+trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
+
 while true; do
   effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
   tte -i ~/.config/omarchy/branding/screensaver.txt \
@@ -7,10 +15,8 @@ while true; do
     "$effect" &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 0.01; then
-      pkill -x tte 2>/dev/null
-      pkill -f "alacritty --class Screensaver" 2>/dev/null
-      exit 0
+    if read -n 1 -t 3; then
+      exit_screensaver
     fi
   done
 done
diff --git a/bin/omarchy-install-dev-env b/bin/omarchy-install-dev-env
index 1865992..bd189b2 100755
--- a/bin/omarchy-install-dev-env
+++ b/bin/omarchy-install-dev-env
@@ -75,7 +75,7 @@ laravel)
 symfony)
   echo -e "Installing PHP and Symfony...\n"
   install_php
-  yay -S symfony-cli --noconfirm
+  omarchy-pkg-add symfony-cli
   echo -e "\nYou can now run: symfony new --webapp myproject"
   ;;
 python)
diff --git a/bin/omarchy-install-docker-dbs b/bin/omarchy-install-docker-dbs
index da9090f..20a779f 100755
--- a/bin/omarchy-install-docker-dbs
+++ b/bin/omarchy-install-docker-dbs
@@ -13,4 +13,6 @@ if [[ -n "$choices" ]]; then
     MongoDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:27017:27017" --name mongodb -e MONGO_INITDB_ROOT_USERNAME=admin -e MONGO_INITDB_ROOT_PASSWORD=admin123 mongo:noble ;;
     esac
   done
+else
+  echo "No databases selected for installation."
 fi
diff --git a/bin/omarchy-install-dropbox b/bin/omarchy-install-dropbox
index e80982d..ac5710c 100755
--- a/bin/omarchy-install-dropbox
+++ b/bin/omarchy-install-dropbox
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-# FIXME: Should not use AUR dependencies when we can avoid it
-echo "Installing all dependencies [from AUR]..."
-yay -S --noconfirm --needed \
-  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
+echo "Installing all dependencies..."
+omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 
 echo "Starting Dropbox..."
 uwsm app -- dropbox-cli start &>/dev/null &
diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index 1b2bbfa..7cbbbad 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -200,32 +200,41 @@ show_install_menu() {
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale") in
+  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
+  *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor [AUR]\n  Zed\n  Sublime Text\n  Helix") in
+  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
   *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
-  *Cursor*) aur_install_and_launch "Cursor" "cursor-bin" "cursor" ;;
+  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
   *Zed*) install_and_launch "Zed" "zed" "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 ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_ai_menu() {
-  case $(menu "Install" "󱚤  Claude Code [AUR]\n󱚤  Gemini\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
-  *Claude*) aur_install "Claude Code" "claude-code" ;;
+  ollama_pkg=$(
+    (command -v nvidia-smi &>/dev/null && echo ollama-cuda) ||
+      (command -v rocminfo &>/dev/null && echo ollama-rocm) ||
+      echo ollama
+  )
+
+  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  *Claude*) install "Claude Code" "claude-code" ;;
+  *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
-  *Studio*) aur_install "LM Studio" "lmstudio" ;;
-  *Ollama*) install "Ollama" "ollama" ;;
-  *Crush*) aur_install "Crush" "crush-bin" ;;
-  *opencode*) aur_install "opencode" "opencode-bin" ;;
+  *Studio*) install "LM Studio" "lmstudio" ;;
+  *Ollama*) install "Ollama" $ollama_pkg ;;
+  *Crush*) install "Crush" "crush-bin" ;;
+  *opencode*) install "opencode" "opencode-bin" ;;
   *) show_install_menu ;;
   esac
 }
@@ -315,11 +324,12 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n  Timezone") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n󰇅  Hardware\n  Timezone") in
   *Omarchy*) present_terminal omarchy-update ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
+  *Hardware*) show_update_hardware_menu ;;
   *Timezone*) omarchy-cmd-tzupdate ;;
   *) show_main_menu ;;
   esac
@@ -332,7 +342,7 @@ show_update_process_menu() {
   *Swayosd*) omarchy-restart-swayosd ;;
   *Walker*) omarchy-restart-walker ;;
   *Waybar*) omarchy-restart-waybar ;;
-  *) show_main_menu ;;
+  *) show_update_menu ;;
   esac
 }
 
@@ -346,7 +356,15 @@ show_update_config_menu() {
   *Swayosd*) present_terminal omarchy-refresh-swayosd ;;
   *Walker*) present_terminal omarchy-refresh-walker ;;
   *Waybar*) present_terminal omarchy-refresh-waybar ;;
-  *) show_main_menu ;;
+  *) show_update_menu ;;
+  esac
+}
+
+show_update_hardware_menu() {
+  case $(menu "Restart" "󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
+  *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
+  *) show_update_menu ;;
   esac
 }
 
diff --git a/bin/omarchy-migrate b/bin/omarchy-migrate
index 00e6556..45cf1ed 100755
--- a/bin/omarchy-migrate
+++ b/bin/omarchy-migrate
@@ -1,18 +1,27 @@
 #!/bin/bash
 
-set -e
-
 # Where we store an empty file for each migration that has already been performed.
 STATE_DIR="$HOME/.local/state/omarchy/migrations"
 mkdir -p "$STATE_DIR"
 
+# Skipped migrations are tracked separately
+mkdir -p "$STATE_DIR/skipped"
+
 # Run any pending migrations
 for file in ~/.local/share/omarchy/migrations/*.sh; do
   filename=$(basename "$file")
 
-  if [[ ! -f "$STATE_DIR/$filename" ]]; then
+  if [[ ! -f "$STATE_DIR/$filename" && ! -f "$STATE_DIR/skipped/$filename" ]]; then
     echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"
-    source $file
-    touch "$STATE_DIR/$filename"
+
+    if bash $file; then
+      touch "$STATE_DIR/$filename"
+    else
+      if gum confirm "Migration ${filename%.sh} failed. Skip and continue?"; then
+        touch "$STATE_DIR/skipped/$filename"
+      else
+        exit 1
+      fi
+    fi
   fi
 done
diff --git a/bin/omarchy-pkg-add b/bin/omarchy-pkg-add
new file mode 100755
index 0000000..116435b
--- /dev/null
+++ b/bin/omarchy-pkg-add
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for pkg in "$@"; do
+  if ! pacman -Q "$pkg" &>/dev/null; then
+    sudo pacman -S --noconfirm "$pkg" || exit 1
+  fi
+done
+
+exit 0
diff --git a/bin/omarchy-pkg-drop b/bin/omarchy-pkg-drop
new file mode 100755
index 0000000..fc9da0d
--- /dev/null
+++ b/bin/omarchy-pkg-drop
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for pkg in "$@"; do
+  if pacman -Q "$pkg" &>/dev/null; then
+    sudo pacman -Rns --noconfirm "$pkg"
+  fi
+done
diff --git a/bin/omarchy-pkg-missing b/bin/omarchy-pkg-missing
new file mode 100755
index 0000000..2556afe
--- /dev/null
+++ b/bin/omarchy-pkg-missing
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for pkg in "$@"; do
+  if ! pacman -Q "$pkg" &>/dev/null; then
+    exit 0
+  fi
+done
+
+exit 1
diff --git a/bin/omarchy-pkg-present b/bin/omarchy-pkg-present
new file mode 100755
index 0000000..6afb1f5
--- /dev/null
+++ b/bin/omarchy-pkg-present
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for pkg in "$@"; do
+  pacman -Q "$pkg" &>/dev/null || exit 1
+done
+
+exit 0
diff --git a/bin/omarchy-refresh-pacman-mirrorlist b/bin/omarchy-refresh-pacman-mirrorlist
new file mode 100755
index 0000000..d029490
--- /dev/null
+++ b/bin/omarchy-refresh-pacman-mirrorlist
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
diff --git a/bin/omarchy-restart-bluetooth b/bin/omarchy-restart-bluetooth
new file mode 100755
index 0000000..432e002
--- /dev/null
+++ b/bin/omarchy-restart-bluetooth
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rfkill unblock bluetooth
+rfkill list bluetooth
diff --git a/bin/omarchy-restart-wifi b/bin/omarchy-restart-wifi
new file mode 100755
index 0000000..b8496d9
--- /dev/null
+++ b/bin/omarchy-restart-wifi
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rfkill unblock wifi
+rfkill list wifi
diff --git a/bin/omarchy-update-system-pkgs b/bin/omarchy-update-system-pkgs
index 2c41d73..28baffd 100755
--- a/bin/omarchy-update-system-pkgs
+++ b/bin/omarchy-update-system-pkgs
@@ -1,17 +1,24 @@
 #!/bin/bash
 
-echo -e "\e[32m\nUpdate system packages\e[0m"
-echo "sudo pacman -Syu --noconfirm --ignore \"$(omarchy-pkg-ignored)\""
-sudo pacman -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)"
+# Used in package emergencies if a bad package has been pushed and we can't revoke.
+# Requires manually installing the good package using sudo pacman -U <url>
+ignored_packages=$(omarchy-pkg-ignored)
 
-if omarchy-pkg-aur-accessible; then
-  echo -e "\e[32m\nUpdate AUR packages\e[0m"
-  echo "yay -Syu --noconfirm  --ignore \"$(omarchy-pkg-ignored)\""
-  yay -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)"
-  echo
-else
-  echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
-  echo
+echo -e "\e[32m\nUpdate system packages\e[0m"
+[[ -n $ignored_packages ]] && echo "sudo pacman -Syu --noconfirm --ignore \"$ignored_packages\""
+sudo pacman -Syu --noconfirm --ignore "$ignored_packages"
+
+# Update AUR packages if any are installed
+if pacman -Qem >/dev/null; then
+  if omarchy-pkg-aur-accessible; then
+    echo -e "\e[32m\nUpdate AUR packages\e[0m"
+    [[ -n $ignored_packages ]] && echo "yay -Sua --noconfirm  --ignore \"$ignored_packages\""
+    yay -Sua --noconfirm --ignore "$ignored_packages"
+    echo
+  else
+    echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
+    echo
+  fi
 fi
 
 orphans=$(pacman -Qtdq)
diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml
index 05ec994..63fb85b 100644
--- a/config/alacritty/alacritty.toml
+++ b/config/alacritty/alacritty.toml
@@ -13,7 +13,6 @@ size = 9
 padding.x = 14
 padding.y = 14
 decorations = "None"
-opacity = 0.98
 
 [keyboard]
 bindings = [
diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc
index b2cad35..3154272 100644
--- a/config/fastfetch/config.jsonc
+++ b/config/fastfetch/config.jsonc
@@ -126,13 +126,13 @@
     },
     {
       "type": "command",
-      "key": "  OS Age ",
+      "key": "󱦟 OS Age",
       "keyColor": "magenta",
       "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
     },
     {
       "type": "uptime",
-      "key": "  Uptime ",
+      "key": "󱫐 Uptime",
       "keyColor": "magenta"
     },
     {
diff --git a/config/hypr/bindings.conf b/config/hypr/bindings.conf
index fc6d9ce..64814ca 100644
--- a/config/hypr/bindings.conf
+++ b/config/hypr/bindings.conf
@@ -25,5 +25,5 @@ bindd = SUPER, X, X, exec, omarchy-launch-webapp "https://x.com/"
 bindd = SUPER SHIFT, X, X Post, exec, omarchy-launch-webapp "https://x.com/compose/post"
 
 # Overwrite existing bindings, like putting Omarchy Menu on Super + Space
-# unbind = SUPER, Space
+# unbind = SUPER, SPACE
 # bindd = SUPER, SPACE, Omarchy menu, exec, omarchy-menu
diff --git a/default/bash/aliases b/default/bash/aliases
index d92e2ca..53254cb 100644
--- a/default/bash/aliases
+++ b/default/bash/aliases
@@ -24,12 +24,12 @@ alias ...='cd ../..'
 alias ....='cd ../../..'
 
 # Tools
-alias g='git'
 alias d='docker'
 alias r='rails'
 n() { if [ "$#" -eq 0 ]; then nvim .; else nvim "$@"; fi; }
 
 # Git
+alias g='git'
 alias gcm='git commit -m'
 alias gcam='git commit -a -m'
 alias gcad='git commit -a --amend'
diff --git a/default/bash/functions b/default/bash/functions
index 84ebf16..152deeb 100644
--- a/default/bash/functions
+++ b/default/bash/functions
@@ -65,4 +65,3 @@ img2png() {
     -define png:exclude-chunk=all \
     "${1%.*}.png"
 }
-
diff --git a/default/hypr/apps.conf b/default/hypr/apps.conf
index 07c7ec5..b8360ed 100644
--- a/default/hypr/apps.conf
+++ b/default/hypr/apps.conf
@@ -1,10 +1,12 @@
 # App-specific tweaks
-source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
+source = ~/.local/share/omarchy/default/hypr/apps/1password.conf
+source = ~/.local/share/omarchy/default/hypr/apps/bitwarden.conf
 source = ~/.local/share/omarchy/default/hypr/apps/browser.conf
 source = ~/.local/share/omarchy/default/hypr/apps/hyprshot.conf
+source = ~/.local/share/omarchy/default/hypr/apps/jetbrains.conf
+source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
+source = ~/.local/share/omarchy/default/hypr/apps/qemu.conf
 source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf
 source = ~/.local/share/omarchy/default/hypr/apps/steam.conf
 source = ~/.local/share/omarchy/default/hypr/apps/system.conf
 source = ~/.local/share/omarchy/default/hypr/apps/walker.conf
-source = ~/.local/share/omarchy/default/hypr/apps/1password.conf
-source = ~/.local/share/omarchy/default/hypr/apps/jetbrains.conf
diff --git a/default/hypr/apps/bitwarden.conf b/default/hypr/apps/bitwarden.conf
new file mode 100644
index 0000000..339ddb6
--- /dev/null
+++ b/default/hypr/apps/bitwarden.conf
@@ -0,0 +1 @@
+windowrule = noscreenshare, class:^(Bitwarden)$
diff --git a/default/hypr/apps/jetbrains.conf b/default/hypr/apps/jetbrains.conf
index d13bb16..661b0a4 100644
--- a/default/hypr/apps/jetbrains.conf
+++ b/default/hypr/apps/jetbrains.conf
@@ -1,10 +1,6 @@
 # Fixing popup size issue
 windowrule = size 50% 50%, class:(.*jetbrains.*)$, title:^$,floating:1
 
-# Fix tooltips (always have a title of `win.<id>`)
-windowrule = noinitialfocus, class:^(.*jetbrains.*)$, title:^(win.*)$
-windowrule = nofocus, class:^(.*jetbrains.*)$, title:^(win.*)$
-
 # Fix tab dragging (always have a single space character as their title)
 windowrule = noinitialfocus, class:^(.*jetbrains.*)$, title:^\\s$
 windowrule = nofocus, class:^(.*jetbrains.*)$, title:^\\s$
diff --git a/default/hypr/apps/qemu.conf b/default/hypr/apps/qemu.conf
new file mode 100644
index 0000000..104442c
--- /dev/null
+++ b/default/hypr/apps/qemu.conf
@@ -0,0 +1 @@
+windowrule = opacity 1 1, class:qemu
diff --git a/default/hypr/apps/retroarch.conf b/default/hypr/apps/retroarch.conf
index 2c019de..94be39f 100644
--- a/default/hypr/apps/retroarch.conf
+++ b/default/hypr/apps/retroarch.conf
@@ -1,3 +1,4 @@
 windowrule = fullscreen, class:com.libretro.RetroArch
 windowrule = opacity 1 1, class:com.libretro.RetroArch
+windowrule = idleinhibit fullscreen, class:com.libretro.RetroArch
 
diff --git a/default/hypr/apps/steam.conf b/default/hypr/apps/steam.conf
index de91aaa..bd6386c 100644
--- a/default/hypr/apps/steam.conf
+++ b/default/hypr/apps/steam.conf
@@ -4,3 +4,4 @@ windowrule = center, class:steam, title:Steam
 windowrule = opacity 1 1, class:steam
 windowrule = size 1100 700, class:steam, title:Steam
 windowrule = size 460 800, class:steam, title:Friends List
+windowrule = idleinhibit fullscreen, class:steam
diff --git a/default/hypr/apps/system.conf b/default/hypr/apps/system.conf
index e5fb33c..a718c95 100644
--- a/default/hypr/apps/system.conf
+++ b/default/hypr/apps/system.conf
@@ -4,7 +4,7 @@ windowrule = center, tag:floating-window
 windowrule = size 800 600, tag:floating-window
 
 windowrule = tag +floating-window, class:(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float)
-windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors), title:^(Open.*Files?|Save.*Files?|Save.*As|All Files|Save)
+windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open Folder|Save.*Files?|Save.*As|Save|All Files)
 
 # Fullscreen screensaver
 windowrule = fullscreen, class:Screensaver
diff --git a/default/pacman/mirrorlist b/default/pacman/mirrorlist
new file mode 100644
index 0000000..2d92d05
--- /dev/null
+++ b/default/pacman/mirrorlist
@@ -0,0 +1,3 @@
+Server = https://mirror.omarchy.org/$repo/os/$arch
+Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
+Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
diff --git a/default/pacman/pacman.conf b/default/pacman/pacman.conf
new file mode 100644
index 0000000..ce84c01
--- /dev/null
+++ b/default/pacman/pacman.conf
@@ -0,0 +1,30 @@
+# See the pacman.conf(5) manpage for option and repository directives
+
+[options]
+Color
+ILoveCandy
+VerbosePkgLists
+HoldPkg = pacman glibc
+Architecture = auto
+CheckSpace
+ParallelDownloads = 5
+DownloadUser = alpm
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel = Required DatabaseOptional
+LocalFileSigLevel = Optional
+
+# pacman searches repositories in the order defined here
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+# [multilib]
+# Include = /etc/pacman.d/mirrorlist
+
+[omarchy]
+SigLevel = Optional TrustAll
+Server = https://pkgs.omarchy.org/$arch
diff --git a/install.sh b/install.sh
index 794aad4..f13de37 100755
--- a/install.sh
+++ b/install.sh
@@ -3,21 +3,21 @@
 # Exit immediately if a command exits with a non-zero status
 set -eE
 
-export PATH="$HOME/.local/share/omarchy/bin:$PATH"
-OMARCHY_INSTALL=~/.local/share/omarchy/install
+OMARCHY_PATH="$HOME/.local/share/omarchy"
+OMARCHY_INSTALL="$OMARCHY_PATH/install"
+export PATH="$OMARCHY_PATH/bin:$PATH"
 
 # Preparation
 source $OMARCHY_INSTALL/preflight/show-env.sh
 source $OMARCHY_INSTALL/preflight/trap-errors.sh
 source $OMARCHY_INSTALL/preflight/guard.sh
 source $OMARCHY_INSTALL/preflight/chroot.sh
-source $OMARCHY_INSTALL/preflight/repositories.sh
+source $OMARCHY_INSTALL/preflight/pacman.sh
 source $OMARCHY_INSTALL/preflight/migrations.sh
 source $OMARCHY_INSTALL/preflight/first-run-mode.sh
 
 # Packaging
 source $OMARCHY_INSTALL/packages.sh
-source $OMARCHY_INSTALL/packaging/asdcontrol.sh
 source $OMARCHY_INSTALL/packaging/fonts.sh
 source $OMARCHY_INSTALL/packaging/lazyvim.sh
 source $OMARCHY_INSTALL/packaging/webapps.sh
@@ -39,6 +39,7 @@ source $OMARCHY_INSTALL/config/mise-ruby.sh
 source $OMARCHY_INSTALL/config/docker.sh
 source $OMARCHY_INSTALL/config/mimetypes.sh
 source $OMARCHY_INSTALL/config/localdb.sh
+source $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
 source $OMARCHY_INSTALL/config/hardware/network.sh
 source $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh
 source $OMARCHY_INSTALL/config/hardware/bluetooth.sh
@@ -46,22 +47,12 @@ source $OMARCHY_INSTALL/config/hardware/printer.sh
 source $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh
 source $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
 source $OMARCHY_INSTALL/config/hardware/nvidia.sh
+source $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
 
 # Login
 source $OMARCHY_INSTALL/login/plymouth.sh
 source $OMARCHY_INSTALL/login/limine-snapper.sh
 source $OMARCHY_INSTALL/login/alt-bootloaders.sh
 
-# Reboot
-clear
-tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
-echo
-echo "You're done! So we're ready to reboot now..." | tte --frame-rate 640 wipe
-
-if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
-  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
-  echo -e "\nRemember to remove USB installer!\n\n"
-fi
-
-sleep 5
-reboot
+# Finishing
+source $OMARCHY_INSTALL/reboot.sh
diff --git a/install/config/hardware/fix-f13-amd-audio-input.sh b/install/config/hardware/fix-f13-amd-audio-input.sh
new file mode 100755
index 0000000..32ac686
--- /dev/null
+++ b/install/config/hardware/fix-f13-amd-audio-input.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+AMD_AUDIO_CARD=$(pactl list cards | grep -B20 "Family 17h/19h" | grep "Name: " | awk '{print $2}')
+
+if [[ -n $AMD_AUDIO_CARD ]]; then
+  pactl set-card-profile "$AMD_AUDIO_CARD" "HiFi (Mic1, Mic2, Speaker)" 2>/dev/null || true
+fi
diff --git a/install/config/hardware/network.sh b/install/config/hardware/network.sh
index ff2e03e..04f2f35 100755
--- a/install/config/hardware/network.sh
+++ b/install/config/hardware/network.sh
@@ -1,11 +1,7 @@
 #!/bin/bash
 
-# Install iwd explicitly if it wasn't included in archinstall
-# This can happen if archinstall used ethernet
-if ! command -v iwctl &>/dev/null; then
-  sudo pacman -S --noconfirm --needed iwd
-  sudo systemctl enable iwd.service
-fi
+# Ensure iwd service will be started
+sudo systemctl enable iwd.service
 
 # Prevent systemd-networkd-wait-online timeout on boot
 sudo systemctl disable systemd-networkd-wait-online.service
diff --git a/install/config/sudoless-asdcontrol.sh b/install/config/sudoless-asdcontrol.sh
new file mode 100755
index 0000000..7c678f7
--- /dev/null
+++ b/install/config/sudoless-asdcontrol.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Setup sudo-less controls for controlling brightness on Apple Displays
+echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
+sudo chmod 440 /etc/sudoers.d/asdcontrol
diff --git a/install/config/theme.sh b/install/config/theme.sh
index da3f130..4bc7e32 100755
--- a/install/config/theme.sh
+++ b/install/config/theme.sh
@@ -4,6 +4,11 @@ gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
 gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
 gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
 
+# Set links for Nautilius action icons
+sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-previous-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg
+sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-next-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg
+sudo gtk-update-icon-cache /usr/share/icons/Yaru
+
 # Setup theme links
 mkdir -p ~/.config/omarchy/themes
 for f in ~/.local/share/omarchy/themes/*; do ln -nfs "$f" ~/.config/omarchy/themes/; done
diff --git a/install/packages.sh b/install/packages.sh
index 8fcbf3a..ca9621a 100644
--- a/install/packages.sh
+++ b/install/packages.sh
@@ -1,6 +1,9 @@
+#!/bin/bash
+
 sudo pacman -S --noconfirm --needed \
   1password-beta \
   1password-cli \
+  asdcontrol-git \
   alacritty \
   avahi \
   bash-completion \
@@ -26,6 +29,7 @@ sudo pacman -S --noconfirm --needed \
   fcitx5-qt \
   fd \
   ffmpegthumbnailer \
+  fontconfig \
   fzf \
   gcc14 \
   github-cli \
@@ -34,6 +38,7 @@ sudo pacman -S --noconfirm --needed \
   gnome-themes-extra \
   gum \
   gvfs-mtp \
+  gvfs-smb \
   hypridle \
   hyprland \
   hyprland-qtutils \
@@ -45,6 +50,7 @@ sudo pacman -S --noconfirm --needed \
   impala \
   imv \
   inetutils \
+  iwd \
   jq \
   kdenlive \
   kvantum-qt5 \
@@ -82,6 +88,7 @@ sudo pacman -S --noconfirm --needed \
   python-gobject \
   python-poetry-core \
   python-terminaltexteffects \
+  qt5-wayland \
   ripgrep \
   satty \
   signal-desktop \
@@ -95,7 +102,8 @@ sudo pacman -S --noconfirm --needed \
   tldr \
   tree-sitter-cli \
   ttf-cascadia-mono-nerd \
-  ttf-jetbrains-mono \
+  ttf-ia-writer \
+  ttf-jetbrains-mono-nerd \
   typora \
   tzupdate \
   ufw \
diff --git a/install/packaging/asdcontrol.sh b/install/packaging/asdcontrol.sh
deleted file mode 100755
index ff950c6..0000000
--- a/install/packaging/asdcontrol.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Install asdcontrol for controlling brightness on Apple Displays
-if ! command -v asdcontrol &>/dev/null; then
-  git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol
-  cd /tmp/asdcontrol
-  make
-  sudo make install
-  cd -
-  rm -rf /tmp/asdcontrol
-
-  # Setup sudo-less controls
-  echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
-  sudo chmod 440 /etc/sudoers.d/asdcontrol
-fi
diff --git a/install/preflight/pacman.sh b/install/preflight/pacman.sh
new file mode 100755
index 0000000..4ec80d4
--- /dev/null
+++ b/install/preflight/pacman.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Install build tools
+sudo pacman -S --needed --noconfirm base-devel
+
+# Configure pacman
+sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
+sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
+
+# Refresh all repos
+sudo pacman -Syu --noconfirm
diff --git a/install/preflight/repositories.sh b/install/preflight/repositories.sh
deleted file mode 100755
index 0e53313..0000000
--- a/install/preflight/repositories.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Install build tools
-sudo pacman -S --needed --noconfirm base-devel
-
-# Add fun and color and verbosity to the pacman installer
-if ! grep -q "ILoveCandy" /etc/pacman.conf; then
-  sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
-fi
-
-# Add the Omarchy repository
-if ! grep -q "omarchy" /etc/pacman.conf; then
-  echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch/\n" | sudo tee -a /etc/pacman.conf >/dev/null
-fi
-
-# Set mirrors to global ones only
-echo -e "Server = https://geo.mirror.pkgbuild.com/\$repo/os/\$arch\nServer = https://mirror.rackspace.com/archlinux/\$repo/os/\$arch" |
-  sudo tee /etc/pacman.d/mirrorlist >/dev/null
-
-# Only add Chaotic-AUR if the architecture is x86_64 so ARM users can build the packages
-if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ]; then
-  # Try installing Chaotic-AUR keyring and mirrorlist
-  if ! pacman-key --list-keys 3056513887B78AEB >/dev/null 2>&1 &&
-    sudo pacman-key --recv-key 3056513887B78AEB &&
-    sudo pacman-key --lsign-key 3056513887B78AEB &&
-    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' &&
-    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'; then
-
-    # Add Chaotic-AUR repo to pacman config
-    if ! grep -q "chaotic-aur" /etc/pacman.conf; then
-      echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
-    fi
-  else
-    echo -e "Failed to install Chaotic-AUR, so won't include it in pacman config!"
-  fi
-fi
-
-# Refresh all repos
-sudo pacman -Syu --noconfirm
diff --git a/install/preflight/trap-errors.sh b/install/preflight/trap-errors.sh
index de66219..39381f1 100755
--- a/install/preflight/trap-errors.sh
+++ b/install/preflight/trap-errors.sh
@@ -24,7 +24,11 @@ catch_errors() {
   echo "    ▀▀▀▀▀▀▀ ▀ ▀ ▀▀▀  ▀ ▀▀▀▀▀▀    "
   echo "                                 "
 
-  echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
+  if command -v gum >/dev/null && gum confirm "Retry installation?"; then
+    bash ~/.local/share/omarchy/install.sh
+  else
+    echo "You can retry later by running: bash ~/.local/share/omarchy/install.sh"
+  fi
 }
 
 trap catch_errors ERR
diff --git a/install/reboot.sh b/install/reboot.sh
new file mode 100644
index 0000000..d444c14
--- /dev/null
+++ b/install/reboot.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+clear
+tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
+echo
+echo "You're done! So we're ready to reboot now..." | tte --frame-rate 640 wipe
+
+if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
+  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
+  echo -e "\nRemember to remove USB installer!\n\n"
+fi
+
+sleep 5
+reboot
diff --git a/migrations/1751134561.sh b/migrations/1751134561.sh
index 367fac3..46a7ebf 100644
--- a/migrations/1751134561.sh
+++ b/migrations/1751134561.sh
@@ -1,7 +1,9 @@
 echo "Add Omarchy Package Repository"
 
+omarchy-refresh-pacman-mirrorlist
+
 if ! grep -q "omarchy" /etc/pacman.conf; then
-  sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\/\n' /etc/pacman.conf
+  sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\n' /etc/pacman.conf
   sudo systemctl restart systemd-timesyncd
   sudo pacman -Syu --noconfirm
 fi
diff --git a/migrations/1751135253.sh b/migrations/1751135253.sh
index 92e9144..c076657 100644
--- a/migrations/1751135253.sh
+++ b/migrations/1751135253.sh
@@ -1,5 +1,3 @@
 echo "Add missing installation of bat (used by the ff alias)"
-if ! command -v bat &>/dev/null; then
-  # Add missing installation of bat
-  sudo pacman -S --noconfirm --needed bat
-fi
+
+omarchy-pkg-add bat
diff --git a/migrations/1751510848.sh b/migrations/1751510848.sh
index 8bdc855..6b289d4 100644
--- a/migrations/1751510848.sh
+++ b/migrations/1751510848.sh
@@ -1,5 +1,3 @@
 echo "Installing missing fd terminal tool for finding files"
 
-if ! command -v fd &>/dev/null; then
-  sudo pacman -S --noconfirm --needed fd
-fi
+omarchy-pkg-add fd
diff --git a/migrations/1751667620.sh b/migrations/1751667620.sh
index a45252e..d93c600 100644
--- a/migrations/1751667620.sh
+++ b/migrations/1751667620.sh
@@ -1,8 +1,9 @@
 echo "Switching from vlc to mpv for the default video player"
-if ! command -v mpv &>/dev/null; then
-  sudo pacman -Rns --noconfirm vlc
+if omarchy-cmd-missing mpv; then
+  omarchy-pkg-drop vlc
   rm ~/.local/share/applications/vlc.desktop
-  sudo pacman -S --noconfirm mpv
+
+  omarchy-pkg-add mpv
   xdg-mime default mpv.desktop video/mp4
   xdg-mime default mpv.desktop video/x-msvideo
   xdg-mime default mpv.desktop video/x-matroska
diff --git a/migrations/1751672984.sh b/migrations/1751672984.sh
index 9b0308a..b2d9ecb 100644
--- a/migrations/1751672984.sh
+++ b/migrations/1751672984.sh
@@ -1,5 +1,3 @@
 echo "Add LocalSend as new default application"
 
-if ! command -v localsend &>/dev/null; then
-  sudo pacman -S --noconfirm --needed localsend
-fi
+omarchy-pkg-add localsend
diff --git a/migrations/1751679069.sh b/migrations/1751679069.sh
index a2f437f..abe68a4 100644
--- a/migrations/1751679069.sh
+++ b/migrations/1751679069.sh
@@ -1,5 +1,3 @@
 echo "Install ffmpegthumbnailer for video thumbnails in the file manager"
 
-if ! command -v ffmpegthumbnailer &>/dev/null; then
-  sudo pacman -S --noconfirm --needed ffmpegthumbnailer
-fi
+omarchy-pkg-add ffmpegthumbnailer
diff --git a/migrations/1751821819.sh b/migrations/1751821819.sh
index f8d616f..dc282c2 100644
--- a/migrations/1751821819.sh
+++ b/migrations/1751821819.sh
@@ -1,5 +1,3 @@
 echo "Install bash-completion"
 
-if ! pacman -Q bash-completion &>/dev/null; then
-  sudo pacman -S --noconfirm --needed bash-completion
-fi
+omarchy-pkg-add bash-completion
diff --git a/migrations/1751887718.sh b/migrations/1751887718.sh
index ac1894f..3d3f401 100644
--- a/migrations/1751887718.sh
+++ b/migrations/1751887718.sh
@@ -1,6 +1,6 @@
 echo "Install Impala as new wifi selection TUI"
-if ! command -v impala &>/dev/null; then
-  sudo pacman -S --noconfirm --needed impala
-  echo "You need to update the Waybar config to use Impala Wi-Fi selector in top bar."
+
+if omarchy-cmd-missing impala; then
+  omarchy-pkg-add impala
   omarchy-refresh-waybar
 fi
diff --git a/migrations/1752081088.sh b/migrations/1752081088.sh
index 6eb49a2..727988f 100644
--- a/migrations/1752081088.sh
+++ b/migrations/1752081088.sh
@@ -1,2 +1,3 @@
 echo "Permanently fix F-keys on Apple-mode keyboards (like Lofree Flow84)"
-source ~/.local/share/omarchy/install/config/hardware/fix-fkeys.sh
+
+source $OMARCHY_PATH/install/config/hardware/fix-fkeys.sh
diff --git a/migrations/1752082381.sh b/migrations/1752082381.sh
index 561fa7e..e351fd9 100644
--- a/migrations/1752082381.sh
+++ b/migrations/1752082381.sh
@@ -1,5 +1,3 @@
 echo "Adding gnome-keyring to make 1password work with 2FA codes"
 
-if ! command -v gnome-keyring &>/dev/null; then
-  sudo pacman -S --noconfirm --needed gnome-keyring
-fi
+omarchy-pkg-add gnome-keyring
diff --git a/migrations/1752091783.sh b/migrations/1752091783.sh
index 6d7160b..b8b5306 100644
--- a/migrations/1752091783.sh
+++ b/migrations/1752091783.sh
@@ -1,4 +1,4 @@
 echo "Install Plymouth splash screen"
 
-sudo pacman -S --needed --noconfirm uwsm plymouth
-source "$HOME/.local/share/omarchy/install/login/plymouth.sh"
+omarchy-pkg-add uwsm plymouth
+source "$OMARCHY_PATH/install/login/plymouth.sh"
diff --git a/migrations/1752104271.sh b/migrations/1752104271.sh
index a602fe3..dcbda81 100644
--- a/migrations/1752104271.sh
+++ b/migrations/1752104271.sh
@@ -1,4 +1,5 @@
 echo "Switching to polkit-gnome for better fingerprint authentication compatibility"
+
 if ! command -v /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &>/dev/null; then
   sudo pacman -S --noconfirm --needed polkit-gnome
   systemctl --user stop hyprpolkitagent
diff --git a/migrations/1752153188.sh b/migrations/1752153188.sh
index fca5ebf..ec4beea 100644
--- a/migrations/1752153188.sh
+++ b/migrations/1752153188.sh
@@ -1,4 +1,5 @@
 echo "Migrate to the modular implementation of hyprlock"
+
 if [ -L ~/.config/hypr/hyprlock.conf ]; then
   rm ~/.config/hypr/hyprlock.conf
   cp ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf
diff --git a/migrations/1752188554.sh b/migrations/1752188554.sh
index ffec2a2..13c5d54 100644
--- a/migrations/1752188554.sh
+++ b/migrations/1752188554.sh
@@ -1,7 +1,5 @@
 echo "Update chromium.desktop to ensure we are always using wayland"
-if [[ ! -f ~/.local/share/applications/chromium.desktop ]]; then
-  cp ~/.local/share/omarchy/applications/chromium.desktop ~/.local/share/applications/
-  xdg-settings set default-web-browser chromium.desktop
-  xdg-mime default chromium.desktop x-scheme-handler/http
-  xdg-mime default chromium.desktop x-scheme-handler/https
-fi
+
+xdg-settings set default-web-browser chromium.desktop
+xdg-mime default chromium.desktop x-scheme-handler/http
+xdg-mime default chromium.desktop x-scheme-handler/https
diff --git a/migrations/1752251002.sh b/migrations/1752251002.sh
index 39cb487..cea7a61 100644
--- a/migrations/1752251002.sh
+++ b/migrations/1752251002.sh
@@ -1,4 +1,5 @@
 echo "Migrate to the modular, variable-based implementation of waybar style.css"
+
 if [ -L ~/.config/waybar/style.css ]; then
   rm ~/.config/waybar/style.css
   cp ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/style.css
diff --git a/migrations/1752292967.sh b/migrations/1752292967.sh
index ad649ce..d587fc4 100644
--- a/migrations/1752292967.sh
+++ b/migrations/1752292967.sh
@@ -1,5 +1,6 @@
 echo "Update to use UWSM and seamless login"
-if ! command -v uwsm &>/dev/null; then
+
+if omarchy-cmd-missing uwsm; then
   sudo rm -f /etc/systemd/system/getty@tty1.service.d/override.conf
   sudo rmdir /etc/systemd/system/getty@tty1.service.d/ 2>/dev/null || true
 
@@ -14,5 +15,5 @@ if ! command -v uwsm &>/dev/null; then
     sed -i 's/^GTK_IM_MODULE=fcitx$//' "$HOME/.config/environment.d/fcitx.conf"
   fi
 
-  source ~/.local/share/omarchy/install/login/plymouth.sh
+  source $OMARCHY_PATH/install/login/plymouth.sh
 fi
diff --git a/migrations/1752543801.sh b/migrations/1752543801.sh
index d1e5bfd..7c068ad 100644
--- a/migrations/1752543801.sh
+++ b/migrations/1752543801.sh
@@ -1,3 +1,4 @@
 echo "Add color and animation to pacman installs"
+
 grep -q '^Color' /etc/pacman.conf || sudo sed -i '/^\[options\]/a Color' /etc/pacman.conf
 grep -q '^ILoveCandy' /etc/pacman.conf || sudo sed -i '/^\[options\]/a ILoveCandy' /etc/pacman.conf
diff --git a/migrations/1752678932.sh b/migrations/1752678932.sh
index 1aa8c85..915a74d 100644
--- a/migrations/1752678932.sh
+++ b/migrations/1752678932.sh
@@ -1,5 +1,3 @@
 echo "Install missing docker-buildx package for out-of-the-box Kamal compatibility"
 
-if ! docker buildx version &>/dev/null; then
-  sudo pacman -S --noconfirm --needed docker-buildx
-fi
+omarchy-pkg-add docker-buildx
diff --git a/migrations/1752725616.sh b/migrations/1752725616.sh
index 5dddefe..5f94c05 100644
--- a/migrations/1752725616.sh
+++ b/migrations/1752725616.sh
@@ -1,4 +1,5 @@
 echo "Make light themes possible"
+
 if [[ -f ~/.local/share/applications/blueberry.desktop ]]; then
   rm -f ~/.local/share/applications/blueberry.desktop
   rm -f ~/.local/share/applications/org.pulseaudio.pavucontrol.desktop
diff --git a/migrations/1752793122.sh b/migrations/1752793122.sh
index fad0646..9429d92 100644
--- a/migrations/1752793122.sh
+++ b/migrations/1752793122.sh
@@ -1,4 +1,5 @@
 echo "Rename waybar config file for syntax highlighting"
+
 if [[ -f ~/.config/waybar/config ]]; then
   mv ~/.config/waybar/config ~/.config/waybar/config.jsonc
 fi
diff --git a/migrations/1752797704.sh b/migrations/1752797704.sh
index f51aa70..b59111f 100644
--- a/migrations/1752797704.sh
+++ b/migrations/1752797704.sh
@@ -1,4 +1,5 @@
 echo "Prevent docker from requiring network readiness on boot"
+
 if [[ ! -f /etc/systemd/system/docker.service.d/no-block-boot.conf ]]; then
   sudo mkdir -p /etc/systemd/system/docker.service.d/
   sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
diff --git a/migrations/1752874371.sh b/migrations/1752874371.sh
index 649adc7..669c3b7 100644
--- a/migrations/1752874371.sh
+++ b/migrations/1752874371.sh
@@ -1,4 +1,5 @@
 echo "Add Catppuccin Latte light theme"
+
 if [[ ! -L "~/.config/omarchy/themes/catppuccin-latte" ]]; then
   ln -snf ~/.local/share/omarchy/themes/catppuccin-latte ~/.config/omarchy/themes/
 fi
diff --git a/migrations/1752885858.sh b/migrations/1752885858.sh
index 8720878..2d2b25a 100644
--- a/migrations/1752885858.sh
+++ b/migrations/1752885858.sh
@@ -1,5 +1,3 @@
 echo "Install slurp + wl-screenrec for new ALT+PrintScreen screen recorder"
 
-if ! command -v wl-screenrec &>/dev/null || ! command -v slurp &>/dev/null; then
-  sudo pacman -S --noconfirm --needed slurp wl-screenrec
-fi
+omarchy-pkg-add slurp wl-screenrec
diff --git a/migrations/1752896442.sh b/migrations/1752896442.sh
index 1b154e3..f8fa9a8 100644
--- a/migrations/1752896442.sh
+++ b/migrations/1752896442.sh
@@ -1,9 +1,8 @@
 echo "Replace volume control GUI with a TUI"
 
-if ! command -v wiremix &>/dev/null; then
-  sudo pacman -S --noconfirm --needed wiremix
-  sudo pacman -Rns --noconfirm pavucontrol
-
+if omarchy-cmd-missing wiremix; then
+  omarchy-pkg-add wiremix
+  omarchy-pkg-drop pavucontrol
   omarchy-refresh-applications
   omarchy-refresh-waybar
 fi
diff --git a/migrations/1752897642.sh b/migrations/1752897642.sh
index e1f844d..1b4b1f8 100644
--- a/migrations/1752897642.sh
+++ b/migrations/1752897642.sh
@@ -1,4 +1,3 @@
 echo "Remove needless fcitx5-configtool package"
-if pacman -Qe fcitx5-configtool &>/dev/null; then
-  sudo pacman -Rns --noconfirm fcitx5-configtool
-fi
+
+omarchy-pkg-drop fcitx5-configtool
diff --git a/migrations/1752899588.sh b/migrations/1752899588.sh
index ba778cd..562c6bd 100644
--- a/migrations/1752899588.sh
+++ b/migrations/1752899588.sh
@@ -1,2 +1,3 @@
 echo "Update .config/hypr/hyprlock.conf to include failed attempt counter"
+
 omarchy-refresh-hyprlock
diff --git a/migrations/1752955912.sh b/migrations/1752955912.sh
index 0933cb1..fa55477 100644
--- a/migrations/1752955912.sh
+++ b/migrations/1752955912.sh
@@ -1,5 +1,3 @@
 echo "Install satty for the new screenshot flow"
 
-if ! command -v satty &>/dev/null; then
-  sudo pacman -S --noconfirm --needed satty
-fi
+omarchy-pkg-add satty
diff --git a/migrations/1752981883.sh b/migrations/1752981883.sh
index bac71ab..34a5395 100644
--- a/migrations/1752981883.sh
+++ b/migrations/1752981883.sh
@@ -1,9 +1,9 @@
 echo "Replace wofi with walker as the default launcher"
 
-if ! command -v walker &>/dev/null; then
-  sudo pacman -S --noconfirm --needed walker-bin libqalculate
+if omarchy-cmd-missing walker; then
+  omarchy-pkg-add walker-bin libqalculate
 
-  sudo pacman -Rns --noconfirm wofi
+  omarchy-pkg-drop wofi
   rm -rf ~/.config/wofi
 
   mkdir -p ~/.config/walker
diff --git a/migrations/1753138691.sh b/migrations/1753138691.sh
index 53f5471..d9197ba 100644
--- a/migrations/1753138691.sh
+++ b/migrations/1753138691.sh
@@ -1,6 +1,6 @@
 echo "Install swayOSD to show volume status"
 
-if ! command -v swayosd-server &>/dev/null; then
-  sudo pacman -S --noconfirm --needed swayosd
+if omarchy-cmd-missing swayosd-server; then
+  omarchy-pkg-add swayosd
   setsid uwsm app -- swayosd-server &>/dev/null &
 fi
diff --git a/migrations/1753176520.sh b/migrations/1753176520.sh
index e26abf2..186b8a7 100644
--- a/migrations/1753176520.sh
+++ b/migrations/1753176520.sh
@@ -1,7 +1,3 @@
 echo "Install wf-recorder for screen recording for nvidia"
 
-if lspci | grep -qi 'nvidia'; then
-  if ! command -v wf-recorder &>/dev/null; then
-    sudo pacman -S --noconfirm --needed wf-recorder
-  fi
-fi
+omarchy-pkg-add wf-recorder
diff --git a/migrations/1753352057.sh b/migrations/1753352057.sh
deleted file mode 100755
index 3265f6a..0000000
--- a/migrations/1753352057.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-echo "Add Chaotic-AUR to get compiled binaries"
-
-if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.conf; then
-  # Try installing Chaotic-AUR keyring and mirrorlist
-  if sudo pacman-key --recv-key 3056513887B78AEB &&
-    sudo pacman-key --lsign-key 3056513887B78AEB &&
-    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' &&
-    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'; then
-
-    # Add Chaotic-AUR repo to pacman config
-    echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
-
-    # Refresh pacman package databases
-    sudo pacman -Syu --noconfirm
-  else
-    echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
-  fi
-fi
diff --git a/migrations/1753468218.sh b/migrations/1753468218.sh
deleted file mode 100644
index 8fa3ba5..0000000
--- a/migrations/1753468218.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Add Terminal Text Effects for rizzing Omarchy"
-
-if ! pacman -Q python-terminaltexteffects &>/dev/null; then
-  sudo pacman -S --noconfirm python-terminaltexteffects
-fi
diff --git a/migrations/1753495989.sh b/migrations/1753495989.sh
index 5c0efcd..09f164a 100644
--- a/migrations/1753495989.sh
+++ b/migrations/1753495989.sh
@@ -1,5 +1,6 @@
 echo "Allow updating of timezone by right-clicking on the clock (or running omarchy-cmd-tzupdate)"
-if ! command -v tzupdate &>/dev/null; then
-  bash ~/.local/share/omarchy/install/config/timezones.sh
+
+if omarchy-cmd-missing tzupdate; then
+  $OMARCHY_PATH/install/config/timezones.sh
   omarchy-refresh-waybar
 fi
diff --git a/migrations/1753558374.sh b/migrations/1753558374.sh
deleted file mode 100644
index b961d3e..0000000
--- a/migrations/1753558374.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Update Walker config to include = as the leader key for the calculator"
-if ! grep -q 'prefix = "="' ~/.config/walker/config.toml; then
-  omarchy-refresh-walker
-fi
diff --git a/migrations/1753998861.sh b/migrations/1753998861.sh
deleted file mode 100644
index 4751dee..0000000
--- a/migrations/1753998861.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "Update Walker config to include . as the leader key for the finder"
-if ! grep -q 'prefix = "\."' ~/.config/walker/config.toml; then
-  omarchy-refresh-walker
-fi
diff --git a/migrations/1754208139.sh b/migrations/1754208139.sh
deleted file mode 100644
index b95c744..0000000
--- a/migrations/1754208139.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Ensure screensaver doesn't start while the computer is locked"
-
-if ! grep -q "pidof hyprlock || omarchy-launch-screensaver" ~/.config/hypr/hypridle.conf; then
-  omarchy-refresh-hypridle
-fi
diff --git a/migrations/1754215439.sh b/migrations/1754215439.sh
deleted file mode 100644
index 90651bb..0000000
--- a/migrations/1754215439.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Update app launcher config to allow enough entries to show all keybindings on SUPER+K"
-
-if ! grep "max_entries = 200" ~/.config/walker/config.toml; then
-  omarchy-refresh-walker
-fi
diff --git a/migrations/1754215533.sh b/migrations/1754215533.sh
index 05a0774..2657b62 100644
--- a/migrations/1754215533.sh
+++ b/migrations/1754215533.sh
@@ -1,7 +1,7 @@
 echo "Enable auto-discovery of network printers"
 
 if [[ ! -f /etc/systemd/resolved.conf.d/10-disable-multicast.conf ]]; then
-  sudo pacman -S --noconfirm avahi nss-mdns
+  omarchy-pkg-add avahi nss-mdns
 
   # Disable multicast dns in resolved. Avahi will provide this for better network printer discovery
   sudo mkdir -p /etc/systemd/resolved.conf.d
@@ -10,7 +10,7 @@ if [[ ! -f /etc/systemd/resolved.conf.d/10-disable-multicast.conf ]]; then
 fi
 
 if ! grep -q '^CreateRemotePrinters Yes' /etc/cups/cups-browsed.conf; then
-  sudo pacman -S --noconfirm cups-browsed
+  omarchy-pkg-add cups-browsed
   # Enable automatically adding remote printers
   echo 'CreateRemotePrinters Yes' | sudo tee -a /etc/cups/cups-browsed.conf
   sudo systemctl enable --now cups-browsed.service
diff --git a/migrations/1754221967.sh b/migrations/1754221967.sh
index 7a13507..b1e42b7 100644
--- a/migrations/1754221967.sh
+++ b/migrations/1754221967.sh
@@ -1,2 +1,3 @@
 echo "Add support for accessing Android phone data via file manager"
-sudo pacman -S --noconfirm --needed gvfs-mtp
+
+omarchy-pkg-add gvfs-mtp
diff --git a/migrations/1754228679.sh b/migrations/1754228679.sh
deleted file mode 100644
index 2a80234..0000000
--- a/migrations/1754228679.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Increase time before screensaver starts to 2.5 minutes (from 1 minute)"
-omarchy-refresh-hypridle
diff --git a/migrations/1754265453.sh b/migrations/1754265453.sh
index 412d75e..ab2d092 100644
--- a/migrations/1754265453.sh
+++ b/migrations/1754265453.sh
@@ -1,2 +1,3 @@
 echo "Add chromium-flags.conf"
+
 omarchy-refresh-config chromium-flags.conf
diff --git a/migrations/1754302123.sh b/migrations/1754302123.sh
index 5e7ff59..b9b72ee 100644
--- a/migrations/1754302123.sh
+++ b/migrations/1754302123.sh
@@ -1,4 +1,5 @@
 echo "Change update-available icon in top bar from  to "
+
 if grep -q '"format": "",' ~/.config/waybar/config.jsonc; then
   sed -i 's/"format": ""/"format": ""/' ~/.config/waybar/config.jsonc
 fi
diff --git a/migrations/1754305112.sh b/migrations/1754305112.sh
deleted file mode 100644
index e23ea5d..0000000
--- a/migrations/1754305112.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Restart Walker to pick up menu selections"
-omarchy-restart-walker
diff --git a/migrations/1754332200.sh b/migrations/1754332200.sh
index fc9c350..4e92daa 100644
--- a/migrations/1754332200.sh
+++ b/migrations/1754332200.sh
@@ -1,2 +1,3 @@
 echo "Remove old Omarchy TUI app now that we have the Omarchy Menu"
-rm -rf ~/.local/share/applications/omarchy.desktop
+
+rm -f ~/.local/share/applications/omarchy.desktop
diff --git a/migrations/1754509222.sh b/migrations/1754509222.sh
index ced63c6..48f3c85 100644
--- a/migrations/1754509222.sh
+++ b/migrations/1754509222.sh
@@ -1,3 +1,3 @@
 echo "Add xmlstarlet needed for updating fonts via Omarchy menu"
 
-sudo pacman -S --noconfirm --needed xmlstarlet
+omarchy-pkg-add xmlstarlet
diff --git a/migrations/1754666868.sh b/migrations/1754666868.sh
deleted file mode 100644
index db311ae..0000000
--- a/migrations/1754666868.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Update OS icon in About from Windows to Arch"
-
-omarchy-refresh-config fastfetch/config.jsonc
diff --git a/migrations/1754668999.sh b/migrations/1754668999.sh
index b7966ed..7361dcd 100644
--- a/migrations/1754668999.sh
+++ b/migrations/1754668999.sh
@@ -1,4 +1,3 @@
 echo "Tune MTU probing for more reliable SSH"
 
-# Solve common flakiness with SSH
 echo "net.ipv4.tcp_mtu_probing=1" | sudo tee -a /etc/sysctl.d/99-sysctl.conf
diff --git a/migrations/1754679822.sh b/migrations/1754679822.sh
deleted file mode 100644
index 3787c64..0000000
--- a/migrations/1754679822.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Lock 1password on screen lock"
-
-if ! grep -q "omarchy-lock-screen" ~/.config/hypr/hypridle.conf; then
-  omarchy-refresh-hypridle
-fi
diff --git a/migrations/1754828680.sh b/migrations/1754828680.sh
deleted file mode 100644
index 6deb7c4..0000000
--- a/migrations/1754828680.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Update Walker config"
-omarchy-refresh-walker
diff --git a/migrations/1754860578.sh b/migrations/1754860578.sh
index afd4beb..c384c7a 100644
--- a/migrations/1754860578.sh
+++ b/migrations/1754860578.sh
@@ -1,4 +1,5 @@
 echo "Update polkit policy to yield to fingerprint and fido2"
+
 # If fprint exists in polkit, it was wrong and needs reset
 if [ -f /etc/pam.d/polkit-1 ] && grep -Fq 'pam_fprintd.so' /etc/pam.d/polkit-1; then
   sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
diff --git a/migrations/1754929475.sh b/migrations/1754929475.sh
index f6089a8..ac4f650 100644
--- a/migrations/1754929475.sh
+++ b/migrations/1754929475.sh
@@ -1,4 +1,5 @@
 echo "Add start burst limit to login"
+
 if [ -f /etc/systemd/system/omarchy-seamless-login.service ]; then
   cat <<EOF | sudo tee /etc/systemd/system/omarchy-seamless-login.service
 [Unit]
diff --git a/migrations/1754929737.sh b/migrations/1754929737.sh
index dedc056..e3645db 100644
--- a/migrations/1754929737.sh
+++ b/migrations/1754929737.sh
@@ -1,2 +1,3 @@
 echo "Update Walker config to add 60s timeout such that it won't conflict with screensaver"
+
 omarchy-refresh-walker
diff --git a/migrations/1754984734.sh b/migrations/1754984734.sh
index fc39b17..843e4a0 100644
--- a/migrations/1754984734.sh
+++ b/migrations/1754984734.sh
@@ -1,21 +1,23 @@
 echo "Configure Docker to use the host's DNS resolver"
 
-# If the daemon configuration has been changed since we wrote it, leave it as-is
-ORIGINAL_CONFIG='{"log-driver":"json-file","log-opts":{"max-size":"10m","max-file":"5"}}'
+if omarchy-cmd-present docker; then
+  # If the daemon configuration has been changed since we wrote it, leave it as-is
+  ORIGINAL_CONFIG='{"log-driver":"json-file","log-opts":{"max-size":"10m","max-file":"5"}}'
 
-NEW_CONFIG='{
-    "log-driver": "json-file",
-    "log-opts": { "max-size": "10m", "max-file": "5" },
-    "dns": ["172.17.0.1"],
-    "bip": "172.17.0.1/16"
-}'
+  NEW_CONFIG='{
+      "log-driver": "json-file",
+      "log-opts": { "max-size": "10m", "max-file": "5" },
+      "dns": ["172.17.0.1"],
+      "bip": "172.17.0.1/16"
+  }'
 
-if grep -Fq "$ORIGINAL_CONFIG" /etc/docker/daemon.json 2>/dev/null; then
-  echo "$NEW_CONFIG" | sudo tee /etc/docker/daemon.json >/dev/null
+  if grep -Fq "$ORIGINAL_CONFIG" /etc/docker/daemon.json 2>/dev/null; then
+    echo "$NEW_CONFIG" | sudo tee /etc/docker/daemon.json >/dev/null
+  fi
+
+  # Expose systemd-resolved to our Docker network
+  echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
+
+  sudo systemctl restart systemd-resolved
+  sudo systemctl restart docker
 fi
-
-# Expose systemd-resolved to our Docker network
-echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
-
-sudo systemctl restart systemd-resolved
-sudo systemctl restart docker
diff --git a/migrations/1755109182.sh b/migrations/1755109182.sh
index 352e342..1908b94 100755
--- a/migrations/1755109182.sh
+++ b/migrations/1755109182.sh
@@ -28,5 +28,4 @@ if [ -f /etc/systemd/resolved.conf ]; then
 
   echo "DNS configuration reset to use DHCP (router DNS)"
   echo "To use Cloudflare DNS, run: omarchy-setup-dns Cloudflare"
-fi
-
+fi
\ No newline at end of file
diff --git a/migrations/1755164105.sh b/migrations/1755164105.sh
index a17ac58..e4a3f38 100644
--- a/migrations/1755164105.sh
+++ b/migrations/1755164105.sh
@@ -1,17 +1,17 @@
 echo "Switch to Omarchy Chromium for synchronized theme switching"
 
-set_theme_colors() {
-  if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]] && command -v chromium &>/dev/null; then
-    chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
-  else
-    # Use a default, neutral grey if theme doesn't have a color
-    chromium --no-startup-window --set-theme-color="28,32,39"
-  fi
-}
+if omarchy-cmd-present chromium; then
+  set_theme_colors() {
+    if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]]; then
+      chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
+    else
+      # Use a default, neutral grey if theme doesn't have a color
+      chromium --no-startup-window --set-theme-color="28,32,39"
+    fi
+  }
 
-if command -v chromium &>/dev/null; then
-  sudo pacman -Rns --noconfirm chromium || true
-  sudo pacman -S --noconfirm omarchy-chromium
+  omarchy-pkg-drop chromium
+  omarchy-pkg-add omarchy-chromium
 
   if pgrep -x chromium; then
     if gum confirm "Chromium must be restarted. Ready?"; then
diff --git a/migrations/1755436367.sh b/migrations/1755436367.sh
index b3de9b4..e7c8970 100644
--- a/migrations/1755436367.sh
+++ b/migrations/1755436367.sh
@@ -1,6 +1,6 @@
 echo "Add minimal starship prompt to terminal"
 
-if ! command -v starship &>/dev/null; then
-  sudo pacman -S --noconfirm starship
+if omarchy-cmd-missing starship; then
+  omarchy-pkg-add starship
   cp $OMARCHY_PATH/config/starship.toml ~/.config/starship.toml
 fi
diff --git a/migrations/1755455095.sh b/migrations/1755455095.sh
index 4aed9d5..2a929fe 100644
--- a/migrations/1755455095.sh
+++ b/migrations/1755455095.sh
@@ -1,9 +1,3 @@
 echo "Ensure TTE and dependencies are installed"
 
-if ! pacman -Q python-poetry-core &>/dev/null; then
-  sudo pacman -S --noconfirm python-poetry-core
-fi
-
-if ! pacman -Q python-terminaltexteffects &>/dev/null; then
-  sudo pacman -S --noconfirm python-terminaltexteffects
-fi
+omarchy-pkg-add python-poetry-core python-terminaltexteffects
diff --git a/migrations/1755459930.sh b/migrations/1755459930.sh
index 2b9c2f3..73af324 100644
--- a/migrations/1755459930.sh
+++ b/migrations/1755459930.sh
@@ -1,5 +1,3 @@
 echo "Add potentially missing dependency for power profile controls"
 
-if ! pacman -Q python-gobject &>/dev/null; then
-  sudo pacman -S --noconfirm python-gobject
-fi
+omarchy-pkg-add python-gobject
diff --git a/migrations/1755512354.sh b/migrations/1755512354.sh
deleted file mode 100644
index ffbee83..0000000
--- a/migrations/1755512354.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Update fastfetch config to include current theme name and colors"
-
-omarchy-refresh-config fastfetch/config.jsonc
diff --git a/migrations/1755527220.sh b/migrations/1755527220.sh
deleted file mode 100644
index 845c3fe..0000000
--- a/migrations/1755527220.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Turn on the screensaver by default again now that TTE has been fixed"
-
-omarchy-refresh-hypridle
diff --git a/migrations/1755548643.sh b/migrations/1755548643.sh
index 3f5367b..f98b730 100644
--- a/migrations/1755548643.sh
+++ b/migrations/1755548643.sh
@@ -1,5 +1,3 @@
 echo "Install wf-recorder for intel based device"
 
-if lspci | grep -Eqi 'nvidia|intel.*graphics'; then
-  sudo pacman -S --noconfirm --needed wf-recorder
-fi
+omarchy-pkg-add wf-recorder
diff --git a/migrations/1755865046.sh b/migrations/1755865046.sh
index b07766a..c48962e 100644
--- a/migrations/1755865046.sh
+++ b/migrations/1755865046.sh
@@ -1,6 +1,4 @@
 echo "Switch from lazydocker-bin to lazydocker official"
 
-if pacman -Q lazydocker-bin >/dev/null; then
-  sudo pacman -Rns --noconfirm lazydocker-bin
-  sudo pacman -S --noconfirm lazydocker
-fi
+omarchy-pkg-drop lazydocker-bin
+omarchy-pkg-add lazydocker
diff --git a/migrations/1755878717.sh b/migrations/1755878717.sh
deleted file mode 100644
index 164fe6a..0000000
--- a/migrations/1755878717.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-echo "Ensure Docker DNS requests are not blocked by ufw firewall"
-
-sudo ufw disable
-sudo ufw allow in proto udp from 172.16.0.0/12 to 172.17.0.1 port 53 comment 'allow-docker-dns'
-sudo ufw enable
diff --git a/migrations/1756060611.sh b/migrations/1756060611.sh
index fd22620..b1bc95d 100644
--- a/migrations/1756060611.sh
+++ b/migrations/1756060611.sh
@@ -1,15 +1,13 @@
 echo "Migrate AUR packages to official repos where possible"
 
 reinstall_package_opr() {
-  if pacman -Q $1 >/dev/null; then
+  if omarchy-pkg-present $1; then
     sudo pacman -Rns --noconfirm $1
     sudo pacman -S --noconfirm ${2:-$1}
   fi
 }
 
-if pacman -Q yay-bin-debug >/dev/null; then
-  sudo pacman -Rns --noconfirm yay-bin-debug
-fi
+omarchy-pkg-drop yay-bin-debug
 
 reinstall_package_opr yay-bin yay
 reinstall_package_opr obsidian-bin obsidian
diff --git a/migrations/1756062808.sh b/migrations/1756062808.sh
deleted file mode 100644
index 3618320..0000000
--- a/migrations/1756062808.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Update Hypridle to prevent flash of unlocked screen after sleep"
-omarchy-refresh-hypridle
diff --git a/migrations/1756115364.sh b/migrations/1756115364.sh
index cdd8113..a7c3925 100644
--- a/migrations/1756115364.sh
+++ b/migrations/1756115364.sh
@@ -1,6 +1,6 @@
 echo "Replace buggy native Zoom client with webapp"
 
-if pacman -Q zoom >/dev/null; then
-  sudo pacman -Rns --noconfirm zoom
+if omarchy-pkg-present zoom; then
+  omarchy-pkg-drop zoom
   omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/zoom.png
 fi
diff --git a/migrations/1756205202.sh b/migrations/1756205202.sh
new file mode 100644
index 0000000..8d8cc73
--- /dev/null
+++ b/migrations/1756205202.sh
@@ -0,0 +1,7 @@
+echo "Symlink files needed for Nautilus navigation icons"
+
+sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-previous-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg
+sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-next-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg
+sudo gtk-update-icon-cache /usr/share/icons/Yaru
+pkill -x nautilus || true
+
diff --git a/migrations/1756360551.sh b/migrations/1756360551.sh
deleted file mode 100644
index ac9911a..0000000
--- a/migrations/1756360551.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Move Omarchy Package Repository after Arch core/extra/multilib for extra security on resolution"
-
-sudo cp /etc/pacman.conf /etc/pacman.conf.bak
-sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
-sudo sed -i '/\[chaotic-aur\]/i\[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/\n' /etc/pacman.conf ||
-  sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch/" >> /etc/pacman.conf'
diff --git a/migrations/1756360552.sh b/migrations/1756360552.sh
new file mode 100644
index 0000000..056853d
--- /dev/null
+++ b/migrations/1756360552.sh
@@ -0,0 +1,7 @@
+echo "Move Omarchy Package Repository after Arch core/extra/multilib and remove AUR"
+
+sudo cp /etc/pacman.conf /etc/pacman.conf.bak
+sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
+sudo sed -i '/\[chaotic-aur\]/,+2 d' /etc/pacman.conf
+sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch" >> /etc/pacman.conf'
+sudo pacman -Syu --noconfirm
diff --git a/migrations/1756363651.sh b/migrations/1756363651.sh
deleted file mode 100644
index 3df0985..0000000
--- a/migrations/1756363651.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "Update About config to include the Omarchy branch name"
-
-omarchy-refresh-fastfetch
diff --git a/migrations/1756410649.sh b/migrations/1756410649.sh
new file mode 100644
index 0000000..7347f9b
--- /dev/null
+++ b/migrations/1756410649.sh
@@ -0,0 +1,7 @@
+echo "Remove any Chaotic-AUR infrastructure packages"
+
+omarchy-pkg-drop chaotic-keyring chaotic-mirrorlist
+
+if sudo pacman-key --list-keys 3056513887B78AEB >/dev/null 2>&1; then
+  sudo pacman-key --delete 3056513887B78AEB
+fi
diff --git a/migrations/1756411333.sh b/migrations/1756411333.sh
new file mode 100644
index 0000000..c44e9ce
--- /dev/null
+++ b/migrations/1756411333.sh
@@ -0,0 +1,3 @@
+echo "Use new Omarchy mirror as default"
+
+omarchy-refresh-pacman-mirrorlist
diff --git a/migrations/1756411865.sh b/migrations/1756411865.sh
new file mode 100644
index 0000000..8dcf8ef
--- /dev/null
+++ b/migrations/1756411865.sh
@@ -0,0 +1,3 @@
+echo "Add back ttf-ia-writer if it was missing"
+
+omarchy-pkg-add ttf-ia-writer
diff --git a/migrations/1756491748.sh b/migrations/1756491748.sh
new file mode 100755
index 0000000..801f82a
--- /dev/null
+++ b/migrations/1756491748.sh
@@ -0,0 +1,6 @@
+echo "Removing UseDNS=no from network files to fix DNS issue"
+
+for file in /etc/systemd/network/*.network; do
+  [[ -f "$file" ]] || continue
+  sudo sed -i '/^UseDNS=no/d' "$file"
+done
\ No newline at end of file
diff --git a/migrations/1756494998.sh b/migrations/1756494998.sh
new file mode 100644
index 0000000..e25f38d
--- /dev/null
+++ b/migrations/1756494998.sh
@@ -0,0 +1,3 @@
+echo "Remove opacity from alacritty.toml so Hyprland can control fully"
+
+sed -i '/opacity = 0.98/d' ~/.config/alacritty/alacritty.toml
diff --git a/migrations/1756507384.sh b/migrations/1756507384.sh
new file mode 100755
index 0000000..77c640e
--- /dev/null
+++ b/migrations/1756507384.sh
@@ -0,0 +1,4 @@
+echo "Replace JetBrains Mono font with the Nerd Font edition"
+
+omarchy-pkg-add ttf-jetbrains-mono-nerd
+omarchy-pkg-drop ttf-jetbrains-mono
diff --git a/migrations/1756556731.sh b/migrations/1756556731.sh
new file mode 100644
index 0000000..477b754
--- /dev/null
+++ b/migrations/1756556731.sh
@@ -0,0 +1,3 @@
+echo "Add Samba network drive support to the file manager"
+
+omarchy-pkg-add gvfs-smb
diff --git a/migrations/1756627168.sh b/migrations/1756627168.sh
new file mode 100644
index 0000000..751cd19
--- /dev/null
+++ b/migrations/1756627168.sh
@@ -0,0 +1,3 @@
+echo "Include OS Age and Uptime icons in About"
+
+omarchy-refresh-fastfetch
diff --git a/migrations/1756629295.sh b/migrations/1756629295.sh
new file mode 100644
index 0000000..8f0bea6
--- /dev/null
+++ b/migrations/1756629295.sh
@@ -0,0 +1,3 @@
+echo "Ensure qt5-wayland is installed so KeepassXC, Nextcloud, Sqlite Browser, and other apps display correctly"
+
+omarchy-pkg-add qt5-wayland
diff --git a/migrations/1756642681.sh b/migrations/1756642681.sh
new file mode 100644
index 0000000..d0117d2
--- /dev/null
+++ b/migrations/1756642681.sh
@@ -0,0 +1,3 @@
+echo "Fix audio input on AMD Framework laptops"
+
+source $OMARCHY_PATH/install/config/hardware/fix-f13-amd-audio-input.sh || true
diff --git a/themes/kanagawa/hyprland.conf b/themes/kanagawa/hyprland.conf
index 4972f14..a3dc206 100644
--- a/themes/kanagawa/hyprland.conf
+++ b/themes/kanagawa/hyprland.conf
@@ -1,3 +1,6 @@
 general {
     col.active_border = rgb(dcd7ba)
 }
+
+# Kanagawa backdrop is too strong for detault opacity
+windowrule = opacity 0.98 0.95, class:Alacritty