Prepare for a first-run flow

Will fill in with the first stuff you should do after getting setup. Teaching you how to do the basic commands.
2025-08-03 23:29:23 +00:00 · 2025-07-15 21:23:48 -07:00
292 changed files with 1625 additions and 3367 deletions
--- a/applications/blueberry.desktop
+++ b/applications/blueberry.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Bluetooth
+Comment=Configure Bluetooth settings
+Icon=bluetooth
+Exec=env GTK_THEME=Adwaita-dark blueberry
+Terminal=false
+Type=Application
+Categories=GTK;GNOME;Settings;HardwareSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
+StartupNotify=true
+NotShowIn=GNOME;KDE;Unity;
--- a/applications/mpv.desktop
+++ b/applications/mpv.desktop
@ -1,51 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Media Player
-Name[ar]=مشغل وسائط mpv
-Name[ca]=Reproductor multimèdia mpv
-Name[cs]=mpv přehrávač
-Name[da]=mpv-medieafspiller
-Name[fr]=Lecteur multimédia mpv
-Name[it]=Lettore multimediale mpv
-Name[ja]=mpv メディアプレイヤー
-Name[pl]=Odtwarzacz mpv
-Name[ru]=Проигрыватель mpv
-Name[tr]=mpv Ortam Oynatıcı
-Name[zh_CN]=mpv 媒体播放器
-Name[zh_TW]=mpv 媒體播放器
-GenericName=Multimedia player
-GenericName[ar]=مُشَغِّل وسائط متعددة
-GenericName[cs]=Multimediální přehrávač
-GenericName[da]=Multimedieafspiller
-GenericName[fr]=Lecteur multimédia
-GenericName[it]=Lettore multimediale
-GenericName[ja]=マルチメディアプレイヤー
-GenericName[ru]=Мультимедийный проигрыватель
-GenericName[tr]=Çoklu ortam oynatıcı
-GenericName[zh_CN]=多媒体播放器
-GenericName[zh_TW]=多媒體播放器
-Comment=Play movies and songs
-Comment[ar]=شَغِّل الأفلام والأغاني
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[cs]=Přehrává filmy a hudbu
-Comment[da]=Afspil film og sange
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lire des vidéos et des musiques
-Comment[ja]=映画や音楽を再生する
-Comment[it]=Riproduci video e canzoni
-Comment[pl]=Odtwarzaj filmy i muzykę
-Comment[ru]=Воспроизведение фильмов и музыки
-Comment[tr]=Filmleri ve şarkıları oynatın
-Comment[zh_CN]=播放电影和歌曲
-Comment[zh_TW]=播放電影和歌曲
-Icon=mpv
-TryExec=mpv
-Exec=mpv --player-operation-mode=pseudo-gui -- %U
-Terminal=false
-Categories=AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/mxf;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/vnd.dolby.heaac.1;audio/vnd.dolby.heaac.2;audio/aiff;audio/x-aiff;audio/m4a;audio/x-m4a;application/x-extension-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/mpeg2;audio/mpeg3;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/musepack;audio/x-musepack;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg2;video/x-mpeg3;video/mp4v-es;video/x-m4v;video/mp4;application/x-extension-mp4;video/divx;video/vnd.divx;video/msvideo;video/x-msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;audio/x-ms-asf;application/vnd.ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/avi;video/x-flic;video/fli;video/x-flc;video/flv;video/x-flv;video/x-theora;video/x-theora+ogg;video/x-matroska;video/mkv;audio/x-matroska;application/x-matroska;video/webm;audio/webm;audio/vorbis;audio/x-vorbis;audio/x-vorbis+ogg;video/x-ogm;video/x-ogm+ogg;application/x-ogm;application/x-ogm-audio;application/x-ogm-video;application/x-shorten;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;audio/eac3;audio/amr-wb;video/mp2t;audio/flac;audio/mp4;application/x-mpegurl;video/vnd.mpegurl;application/vnd.apple.mpegurl;audio/x-pn-au;video/3gp;video/3gpp;video/3gpp2;audio/3gpp;audio/3gpp2;video/dv;audio/dv;audio/opus;audio/vnd.dts;audio/vnd.dts.hd;audio/x-adpcm;application/x-cue;audio/m3u;audio/vnd.wave;video/vnd.avi;
-X-KDE-Protocols=appending,file,ftp,hls,http,https,mms,mpv,rtmp,rtmps,rtmpt,rtmpts,rtp,rtsp,rtsps,sftp,srt,srtp,webdav,webdavs
-StartupWMClass=mpv
-Keywords=mpv;media;player;video;audio;tv;
-Keywords[ar]=mpv;إم بي في;ام بي في;وسائط;مشغل;فيديو;مرئية;صوتي;تلفاز;
--- a/applications/nvim.desktop
+++ b/applications/nvim.desktop
@ -2,7 +2,7 @@
 Name=Neovim
 GenericName=Text Editor
 Comment=Edit text files
-Exec=alacritty --class=nvim --title=nvim -e nvim -- %F
+Exec=alacritty -e nvim -- %F
 Terminal=false
 Type=Application
 Keywords=Text;editor;
--- a/applications/org.pulseaudio.pavucontrol.desktop
+++ b/applications/org.pulseaudio.pavucontrol.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=Volume Control
+Comment=Adjust the volume level
+Exec=env GTK_THEME=Adwaita-dark pavucontrol
+Icon=multimedia-volume-control
+StartupNotify=true
+Type=Application
+Categories=AudioVideo;Audio;Mixer;GTK;Settings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
+Keywords=pavucontrol;PulseAudio;Microphone;Volume;Fade;Balance;Headset;Speakers;Headphones;Audio;Mixer;Output;Input;Devices;Playback;Recording;System Sounds;Sound Card;Settings;Preferences;
--- a/applications/wiremix.desktop
+++ b/applications/wiremix.desktop
@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Audio Settings
-Comment=Using Wiremix
-Exec=alacritty --class=Wiremix --title=Wiremix -e wiremix
-Icon=audio-card
-Type=Application
-Terminal=false
--- a/bin/omarchy
+++ b/bin/omarchy
@ -5,39 +5,66 @@ PATH="$PATH:$HOME/.local/share/omarchy/bin"

 show_ascii_art() {
  clear
-  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 640 --no-color expand
+  cat <<'EOF'
+ ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
+███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
+███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
+███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
+ ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
+                                          ███    ███                                    
+EOF
  echo "                                                                                 $OMARCHY_VERSION"
 }

 main_menu() {
  show_ascii_art

-  local options=("Theme" "Font" "Setup" "Update" "Manual" "Exit")
+  local options=("Theme" "Setup" "Update" "Manual" "Exit")
  choice=$(printf "%s\n" "${options[@]}" | gum choose --header "") || exit 0
  case "$choice" in
  Theme) theme_menu ;;
-  Font)
-    omarchy-font-menu
-    ack_command
-    main_menu
-    ;;
-  Update)
-    omarchy-update
-    main_menu
-    ;;
+  Update) update_menu ;;
  Setup) setup_menu ;;
  Manual) open_manual ;;
  Exit) clear && exit 0 ;;
  esac
 }

+update_menu() {
+  show_ascii_art
+  local menu=("Omarchy" "Waybar" "Wofi" "Plymouth" "Desktop apps" "Back")
+  local commands=(
+    "omarchy-update"
+    "omarchy-refresh-waybar"
+    "omarchy-refresh-wofi"
+    "omarchy-refresh-plymouth"
+    "omarchy-refresh-applications"
+    "main_menu"
+  )
+  local choice
+  choice=$(printf "%s\n" "${menu[@]}" | gum choose --header="Update") || main_menu
+  for i in "${!menu[@]}"; do
+    if [[ "${menu[$i]}" == "$choice" ]]; then
+      if [[ "$choice" == "Back" ]]; then
+        main_menu
+      else
+        eval "${commands[$i]}"
+        ack_command
+        main_menu
+      fi
+      break
+    fi
+  done
+}
+
 theme_menu() {
  show_ascii_art
-  local menu=("Pick" "Install" "Update" "Remove" "Back")
+  local menu=("Install" "Remove" "Back")
  local commands=(
-    "omarchy-theme-menu"
    "install_theme_prompt"
-    "omarchy-theme-update"
    "remove_theme_prompt"
    "main_menu"
  )
@ -77,13 +104,9 @@ remove_theme_prompt() {

 setup_menu() {
  show_ascii_art
-  local menu=("Dropbox" "Steam" "Docker DBs" "Fingerprint sensor" "Fido2 device" "Back")
+  local menu=("Fingerprint sensor" "Back")
  local commands=(
-    "omarchy-setup-dropbox"
-    "omarchy-setup-steam"
-    "setup_docker_dbs"
-    "omarchy-setup-fingerprint"
-    "omarchy-setup-fido2"
+    "omarchy-fingerprint-setup"
    "main_menu"
  )
  local choice
@ -102,27 +125,8 @@ setup_menu() {
  done
 }

-setup_docker_dbs() {
-  options=("MariaDB" "MySQL" "Redis" "PostgreSQL")
-  choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
-
-  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 ;;
-      PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres16 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:16 ;;
-      MariaDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mariadb11 -e MARIADB_ROOT_PASSWORD= -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true mariadb:11.8 ;;
-      Redis) sudo docker run -d --restart unless-stopped -p "127.0.0.1:6379:6379" --name=redis redis:7 ;;
-      esac
-    done
-  fi
-
-  main_menu
-}
-
 open_manual() {
-  setsid chromium --new-window --ozone-platform=wayland --app="https://manuals.omamix.org/2/the-omarchy-manual" >/dev/null 2>&1 &
-  clear
+  xdg-open "https://manuals.omamix.org/2/the-omarchy-manual"
 }

 ack_command() {
@ -130,3 +134,4 @@ ack_command() {
 }

 main_menu
+
--- a/bin/omarchy-cmd-apple-display-brightness
+++ b/bin/omarchy-cmd-apple-display-brightness
--- a/bin/omarchy-battery-monitor
+++ b/bin/omarchy-battery-monitor
@ -14,7 +14,7 @@ get_battery_state() {
 }

 send_notification() {
-  notify-send -u critical "󱐋 Time to recharge!" "Battery is down to ${1}%" -i battery-caution -t 30000
+  notify-send -u critical "Battery Low" "Time to recharge! (battery is at ${1}%)" -i battery-caution
 }

 BATTERY_LEVEL=$(get_battery_percentage)
--- a/bin/omarchy-cmd-screenrecord
+++ b/bin/omarchy-cmd-screenrecord
@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Set recorder based on GPU
-
-[[ -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
-  notify-send "Screen recording directory does not exist: $OUTPUT_DIR" -u critical -t 3000
-  exit 1
-fi
-
-screenrecording() {
-  filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
-  notify-send "Screen recording starting..." -t 1000
-  sleep 1
-
-  if lspci | grep -qi 'nvidia'; then
-    wf-recorder -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@"
-  else
-    wl-screenrec -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@"
-  fi
-}
-
-if pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null; then
-  pkill -x wl-screenrec
-  pkill -x wf-recorder
-  notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
-elif [[ "$1" == "output" ]]; then
-  screenrecording
-else
-  region=$(slurp) || exit 1
-  screenrecording -g "$region"
-fi
--- a/bin/omarchy-cmd-screensaver
+++ b/bin/omarchy-cmd-screensaver
@ -1,20 +0,0 @@
-#!/bin/bash
-
-if command -v tte &>/dev/null; then
-  while true; do
-    effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
-    tte -i ~/.local/share/omarchy/logo.txt \
-      --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
-      "$effect" &
-
-    while pgrep tte >/dev/null; do
-      if read -n 1 -t 0.01; then
-        pkill tte 2>/dev/null
-        pkill -f "alacritty --class Screensaver" 2>/dev/null
-        exit 0
-      fi
-    done
-  done
-else
-  gum spin --title "Can't find tte. Try: pip install terminaltexteffects" -- sleep 2
-fi
--- a/bin/omarchy-cmd-screenshot
+++ b/bin/omarchy-cmd-screenshot
@ -1,17 +0,0 @@
-#!/bin/bash
-
-[[ -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
-  notify-send "Screenshot directory does not exist: $OUTPUT_DIR" -u critical -t 3000
-  exit 1
-fi
-
-pkill slurp || hyprshot -m ${1:-region} --raw |
-  satty --filename - \
-    --output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
-    --early-exit \
-    --actions-on-enter save-to-clipboard \
-    --save-after-copy \
-    --copy-command 'wl-copy'
--- a/bin/omarchy-cmd-tzupdate
+++ b/bin/omarchy-cmd-tzupdate
@ -1,5 +0,0 @@
-#!/bin/bash
-
-sudo tzupdate
-new_timezone=$(timedatectl show -p Timezone --value)
-notify-send "Timezone has been set to $new_timezone"
--- a/bin/omarchy-dev-add-migration
+++ b/bin/omarchy-dev-add-migration
@ -1,6 +1,5 @@
 #!/bin/bash

-cd ~/.local/share/omarchy
 migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
 touch $migration_file
 nvim $migration_file
--- a/bin/omarchy-dev-config-link
+++ b/bin/omarchy-dev-config-link
@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Link all the key config files to omarchy's internal versions for quicker testing
+ln -nsf ~/.local/share/omarchy/config/hypr/hyprland.conf ~/.config/hypr/
+ln -nsf ~/.local/share/omarchy/config/hypr/hypridle.conf ~/.config/hypr/
+ln -nsf ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/
+ln -nsf ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/
+ln -nsf ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/
--- a/bin/omarchy-fingerprint-setup
+++ b/bin/omarchy-fingerprint-setup
@ -0,0 +1,36 @@
+#!/bin/bash
+
+yay -S --noconfirm --needed fprintd usbutils
+
+if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix'; then
+  echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
+else
+  # Add fingerprint authentication as an option for sudo
+  if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
+    sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
+  fi
+
+  # Add fingerprint authentication as an option for hyprpolkitagent
+  if [ ! -f /etc/pam.d/polkit-1 ] || ! grep -q pam_fprintd.so /etc/pam.d/polkit-1; then
+    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
+auth      required pam_unix.so
+auth      optional pam_fprintd.so
+
+account   required pam_unix.so
+password  required pam_unix.so
+session   required pam_unix.so
+EOF
+  fi
+
+  # Enroll the first finger
+  echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
+  sudo fprintd-enroll $USER
+
+  echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
+
+  if fprintd-verify; then
+    echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
+  else
+    echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
+  fi
+fi
--- a/bin/omarchy-first-run
+++ b/bin/omarchy-first-run
@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ ! -f ~/.local/state/omarchy/first-run.marker ]]; then
+  chromium --new-window --app=file://$HOME/.local/share/omarchy/first-run/index.html
+  mkdir -p ~/.local/state/omarchy
+  touch ~/.local/state/omarchy/first-run.marker
+fi
--- a/bin/omarchy-font-menu
+++ b/bin/omarchy-font-menu
@ -1,12 +0,0 @@
-#!/bin/bash
-
-font=$(
-  fc-list :spacing=100 -f "%{family[0]}\n" |
-    grep -v -i -E 'emoji|signwriting' |
-    sort -u |
-    gum choose --header "Choose terminal font"
-)
-
-if [[ -n "$font" ]]; then
-  sed -i "s/family = \".*\"/family = \"$font\"/g" ~/.config/alacritty/alacritty.toml
-fi
--- a/bin/omarchy-launch-screensaver
+++ b/bin/omarchy-launch-screensaver
@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Exit early if screensave is already running
-pgrep -f "alacritty --class Screensaver" && exit 0
-
-focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
-
-for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
-  hyprctl dispatch focusmonitor $m
-  hyprctl dispatch exec -- \
-    alacritty --class Screensaver \
-    -o 'colors.primary.background="#000000"' \
-    -o 'colors.cursor.cursor="#000000"' \
-    -o 'font.size=18' \
-    -o 'window.opacity=1' \
-    -e ~/.local/share/omarchy/bin/omarchy-cmd-screensaver
-done
-
-hyprctl dispatch focusmonitor $focused
--- a/bin/omarchy-menu-keybindings
+++ b/bin/omarchy-menu-keybindings
@ -1,86 +0,0 @@
-#!/bin/bash
-
-# A script to display Hyprland keybindings defined in your configuration
-# using walker for an interactive search menu.
-
-# Fetch dynamic keybindings from Hyprland
-#
-# Also do some pre-processing:
-# - Remove standard Omarchy bin path prefix
-# - Remove uwsm prefix
-# - Map numeric modifier key mask to a textual rendition
-# - Output comma-separated values that the parser can understand
-dynamic_bindings() {
-  hyprctl -j binds | \
-    jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' | \
-    sed -r \
-        -e 's/null//' \
-        -e 's,~/.local/share/omarchy/bin/,,' \
-        -e 's,uwsm app -- ,,' \
-        -e 's/@0//' \
-        -e 's/,@/,code:/' \
-        -e 's/^0,/,/' \
-        -e 's/^1,/SHIFT,/' \
-        -e 's/^4,/CTRL,/' \
-        -e 's/^5,/SHIFT CTRL,/' \
-        -e 's/^8,/ALT,/' \
-        -e 's/^9,/SHIFT ALT,/' \
-        -e 's/^12,/CTRL ALT,/' \
-        -e 's/^13,/SHIFT CTRL ALT,/' \
-        -e 's/^64,/SUPER,/' \
-        -e 's/^65,/SUPER SHIFT,/' \
-        -e 's/^68,/SUPER CTRL,/' \
-        -e 's/^69,/SUPER SHIFT CTRL,/' \
-        -e 's/^72,/SUPER ALT,/'
-}
-
-# Parse and format keybindings
-#
-# `awk` does the heavy lifting:
-# - Set the field separator to a comma ','.
-# - Joins the key combination (e.g., "SUPER + Q").
-# - Joins the command that the key executes.
-# - Prints everything in a nicely aligned format.
-parse_bindings() {
-  awk -F, '
-{
-    # Combine the modifier and key (first two fields)
-    key_combo = $1 " + " $2;
-
-    # Clean up: strip leading "+" if present, trim spaces
-    gsub(/^[ \t]*\+?[ \t]*/, "", key_combo);
-    gsub(/[ \t]+$/, "", key_combo);
-
-    # Use description, if set
-    action = $3;
-
-    if (action == "") {
-        # Reconstruct the command from the remaining fields
-        for (i = 4; i <= NF; i++) {
-            action = action $i (i < NF ? "," : "");
-        }
-
-        # Clean up trailing commas, remove leading "exec, ", and trim
-        sub(/,$/, "", action);
-        gsub(/(^|,)[[:space:]]*exec[[:space:]]*,?/, "", action);
-        gsub(/^[ \t]+|[ \t]+$/, "", action);
-        gsub(/[ \t]+/, " ", key_combo);  # Collapse multiple spaces to one
-
-        # Escape XML entities
-        gsub(/&/, "\\&amp;", action);
-        gsub(/</, "\\&lt;", action);
-        gsub(/>/, "\\&gt;", action);
-        gsub(/"/, "\\&quot;", action);
-        gsub(/'"'"'/, "\\&apos;", action);
-    }
-
-    if (action != "") {
-        printf "%-35s → %s\n", key_combo, action;
-    }
-}'
-}
-
-dynamic_bindings | \
-  sort -u | \
-  parse_bindings | \
-  walker --dmenu --theme keybindings -p 'Keybindings'
--- a/bin/omarchy-menu-power
+++ b/bin/omarchy-menu-power
@ -1,23 +0,0 @@
-#!/bin/bash
-
-show_power_menu() {
-  # The first characters are invisible sort keys.
-  local menu_options=" Lock
-󱄄 Save
-󰤄 Suspend
- Relaunch
-󰜉 Restart
-󰐥 Shutdown"
-  local selection=$(echo -e "$menu_options" | walker --dmenu --theme dmenu_150)
-
-  case "$selection" in
-  *Lock*) hyprlock ;;
-  *Save*) ~/.local/share/omarchy/bin/omarchy-launch-screensaver ;;
-  *Suspend*) systemctl suspend ;;
-  *Relaunch*) uwsm stop ;;
-  *Restart*) systemctl reboot ;;
-  *Shutdown*) systemctl poweroff ;;
-  esac
-}
-
-show_power_menu
--- a/bin/omarchy-migrate
+++ b/bin/omarchy-migrate
@ -1,18 +0,0 @@
-#!/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"
-
-# Run any pending migrations
-for file in ~/.local/share/omarchy/migrations/*.sh; do
-  filename=$(basename "$file")
-
-  if [[ ! -f "$STATE_DIR/$filename" ]]; then
-    echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"
-    source $file
-    touch "$STATE_DIR/$filename"
-  fi
-done
--- a/bin/omarchy-power-menu
+++ b/bin/omarchy-power-menu
@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Power menu for Omarchy
+# Provides power off, restart, and sleep options
+
+# Function to show power menu. The first characters are invisible sort keys.
+show_power_menu() {
+  local menu_options="\u200B Lock
+\u200C󰤄 Suspend
+\u200D Relaunch
+\u2060󰜉 Restart
+\u2063󰐥 Shutdown"
+  local selection=$(echo -e "$menu_options" | wofi --show dmenu --prompt "Power Options" --width 150 --height 195 -O alphabetical --style ~/.local/share/omarchy/default/wofi/select.css)
+
+  case "$selection" in
+  *Lock*) hyprlock ;;
+  *Suspend*) systemctl suspend ;;
+  *Relaunch*) uwsm stop ;;
+  *Restart*) systemctl reboot ;;
+  *Shutdown*) systemctl poweroff ;;
+  esac
+}
+
+# Main execution
+show_power_menu
--- a/bin/omarchy-refresh-applications
+++ b/bin/omarchy-refresh-applications
@ -10,8 +10,7 @@ mkdir -p ~/.local/share/applications
 cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/
 cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/

-# Only copy xtras if user is not in bare mode
-if [[ ! -f ~/.local/state/omarchy/bare.mode ]] && [ -z "$OMARCHY_BARE" ]; then
+if [ -z "$OMARCHY_BARE" ]; then
  cp ~/.local/share/omarchy/applications/xtras/*.desktop ~/.local/share/applications/
 fi

--- a/bin/omarchy-refresh-config
+++ b/bin/omarchy-refresh-config
@ -1,35 +0,0 @@
-#!/bin/bash
-
-# This script deploys ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z
-config_file=$1
-
-if [[ -z "$config_file" ]]; then
-  cat <<USAGE
-  Usage: $0 [config_file]
-
-  Must provide a file path from the .config directory to be refreshed.
-  To copy ~/.local/share/omarchy/config/hypr/hyprlock.conf to ~/.config/hypr/hyprlock.conf
-    
-    $0 hypr/hyprlock.conf     
-USAGE
-  exit 1
-fi
-
-# Backup the destination file (with timestamp) to avoid clobbering (Ex: hyprlock.conf.bak.1753817951)
-user_config_file="${HOME}/.config/$config_file"
-default_config_file="${HOME}/.local/share/omarchy/config/$config_file"
-backup_config_file="$user_config_file.bak.$(date +%s)"
-
-# Create preliminary backup
-cp -f "$user_config_file" "$backup_config_file" 2>/dev/null
-
-# Replace config with new default
-cp -f "$default_config_file" "$user_config_file" 2>/dev/null
-
-# Compare and delete/inform accordingly
-if cmp -s "$user_config_file" "$backup_config_file"; then
-  rm "$backup_config_file"
-else
-  echo -e "\e[31mReplaced $user_config_file with new Omarchy default.\nSaved backup as ${backup_config_file}.\n\n\e[32mChanges:\e[0m"
-  diff "$user_config_file" "$backup_config_file"
-fi
--- a/bin/omarchy-refresh-hypridle
+++ b/bin/omarchy-refresh-hypridle
@ -1,4 +0,0 @@
-#!/bin/bash
-
-omarchy-refresh-config hypr/hypridle.conf
-omarchy-restart-hypridle
--- a/bin/omarchy-refresh-hyprlock
+++ b/bin/omarchy-refresh-hyprlock
@ -1,4 +0,0 @@
-#!/bin/bash
-
-omarchy-refresh-config hypr/hyprlock.conf
-
--- a/bin/omarchy-refresh-hyprsunset
+++ b/bin/omarchy-refresh-hyprsunset
@ -1,4 +0,0 @@
-#!/bin/bash
-
-omarchy-refresh-config hypr/hyprsunset.conf
-omarchy-restart-hyprsunset
--- a/bin/omarchy-refresh-plymouth
+++ b/bin/omarchy-refresh-plymouth
@ -1,6 +1,6 @@
 #!/bin/bash

-if [[ "$1" == "-y" ]] || gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
+if gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
  sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
  sudo plymouth-set-default-theme -R omarchy
 fi
--- a/bin/omarchy-refresh-swayosd
+++ b/bin/omarchy-refresh-swayosd
@ -1,5 +0,0 @@
-#!/bin/bash
-
-omarchy-refresh-config swayosd/config.toml
-omarchy-refresh-config swayosd/style.css
-omarchy-restart-swayosd
--- a/bin/omarchy-refresh-walker
+++ b/bin/omarchy-refresh-walker
@ -1,4 +0,0 @@
-#!/bin/bash
-
-omarchy-refresh-config walker/config.toml
-omarchy-restart-walker
--- a/bin/omarchy-refresh-waybar
+++ b/bin/omarchy-refresh-waybar
@ -1,5 +1,11 @@
 #!/bin/bash

-omarchy-refresh-config waybar/config.jsonc
-omarchy-refresh-config waybar/style.css
-omarchy-restart-waybar
+if gum confirm "Refresh Waybar config? This will replace your current settings with Omarchy defaults."; then
+  # Overwrite local waybar settings with the latest in Omarchy
+  cp -f ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/ 2>/dev/null
+  cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
+
+  # Restart waybar
+  pkill waybar &>/dev/null
+  setsid waybar &>/dev/null &
+fi
--- a/bin/omarchy-refresh-wofi
+++ b/bin/omarchy-refresh-wofi
@ -0,0 +1,7 @@
+#!/bin/bash
+
+if gum confirm "Refresh Wofi config? This will replace your current settings with Omarchy defaults."; then
+  # Overwrite local waybar settings with the latest in Omarchy
+  cp -f ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/ 2>/dev/null
+  cp -f ~/.local/share/omarchy/config/wofi/style.css ~/.config/wofi/ 2>/dev/null
+fi
--- a/bin/omarchy-restart-app
+++ b/bin/omarchy-restart-app
@ -1,4 +0,0 @@
-#!/bin/bash
-
-pkill -x $1
-setsid uwsm app -- $1 >/dev/null 2>&1 &
--- a/bin/omarchy-restart-hypridle
+++ b/bin/omarchy-restart-hypridle
@ -1,3 +0,0 @@
-#!/bin/bash
-
-omarchy-restart-app hypridle
--- a/bin/omarchy-restart-hyprsunset
+++ b/bin/omarchy-restart-hyprsunset
@ -1,3 +0,0 @@
-#!/bin/bash
-
-omarchy-restart-app hyprsunset
--- a/bin/omarchy-restart-swayosd
+++ b/bin/omarchy-restart-swayosd
@ -1,3 +0,0 @@
-#!/bin/bash
-
-omarchy-restart-app swayosd-server
--- a/bin/omarchy-restart-walker
+++ b/bin/omarchy-restart-walker
@ -1,4 +0,0 @@
-#!/bin/bash
-
-pkill walker
-setsid uwsm app -- walker --gapplication-service &
--- a/bin/omarchy-restart-waybar
+++ b/bin/omarchy-restart-waybar
@ -1,3 +0,0 @@
-#!/bin/bash
-
-omarchy-restart-app waybar
--- a/bin/omarchy-restart-xcompose
+++ b/bin/omarchy-restart-xcompose
@ -1,3 +0,0 @@
-#!/bin/bash
-
-omarchy-restart-app fcitx5
--- a/bin/omarchy-setup-dropbox
+++ b/bin/omarchy-setup-dropbox
@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo "Installing all dependencies..."
-yay -S --noconfirm --needed \
-  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
-
-echo "Starting Dropbox..."
-uwsm app -- dropbox-cli start &>/dev/null &
-echo "See Dropbox icon behind   hover tray in top right and right-click for setup."
--- a/bin/omarchy-setup-fido2
+++ b/bin/omarchy-setup-fido2
@ -1,33 +0,0 @@
-#!/bin/bash
-
-if [[ "--remove" == "$1" ]]; then
-  yay -Rns --noconfirm libfido2 pam-u2f
-  sudo rm -rf /etc/fido2
-  sudo sed -i '\|^auth[[:space:]]\+sufficient[[:space:]]\+pam_u2f\.so[[:space:]]\+cue[[:space:]]\+authfile=/etc/fido2/fido2$|d' /etc/pam.d/sudo
-  echo -e "\e[32m\nYou've successfully removed the fido2 device setup.\e[0m"
-else
-  yay -S --noconfirm --needed libfido2 pam-u2f
-
-  tokens=$(fido2-token -L)
-
-  if [ -z "$tokens" ]; then
-    echo -e "\e[31m\nNo fido2 device detected. Plug it in, you may have to unlock it as well\e[0m"
-  else
-    # Create the pamu2fcfg file
-    if [ ! -f /etc/fido2/fido2 ]; then
-      sudo mkdir -p /etc/fido2
-      echo -e "\e[32m\nLet's setup your device by confirming on the device now.\e[0m"
-      pamu2fcfg >/tmp/fido2 # This needs to run as the user
-      sudo mv /tmp/fido2 /etc/fido2/fido2
-    fi
-
-    # Add fido2 auth as an option for sudo
-    if ! grep -q pam_u2f.so /etc/pam.d/sudo; then
-      sudo sed -i '1i auth    sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/sudo
-    fi
-
-    if ! sudo echo -e "\e[32m\nPerfect! Now you can use your fido2 device for sudo.\e[0m"; then
-      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
-    fi
-  fi
-fi
--- a/bin/omarchy-setup-fingerprint
+++ b/bin/omarchy-setup-fingerprint
@ -1,43 +0,0 @@
-#!/bin/bash
-
-if [[ "--remove" == "$1" ]]; then
-  yay -Rns --noconfirm fprintd
-  sudo rm -rf /etc/pam.d/polkit-1
-  sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/sudo
-  echo -e "\e[32mYou've successfully removed the fingerprint setup.\e[0m"
-else
-  yay -S --noconfirm --needed fprintd usbutils
-
-  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix'; then
-    echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
-  else
-    # Add fingerprint authentication as an option for sudo
-    if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
-      sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
-    fi
-
-    # Add fingerprint authentication as an option for hyprpolkitagent
-    if [ ! -f /etc/pam.d/polkit-1 ] || ! grep -q pam_fprintd.so /etc/pam.d/polkit-1; then
-      sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
-auth      required pam_unix.so
-auth      optional pam_fprintd.so
-
-account   required pam_unix.so
-password  required pam_unix.so
-session   required pam_unix.so
-EOF
-    fi
-
-    # Enroll the first finger
-    echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
-    sudo fprintd-enroll $USER
-
-    echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
-
-    if fprintd-verify; then
-      echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
-    else
-      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
-    fi
-  fi
-fi
--- a/bin/omarchy-setup-steam
+++ b/bin/omarchy-setup-steam
@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo "Adding multilib repository for 32-bit compatibility"
-sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
-sudo pacman -Sy
-
-echo "Now pick dependencies matching your graphics card"
-yay -S steam
-gtk-launch steam >/dev/null 2>&1 &
--- a/bin/omarchy-show-keybindings
+++ b/bin/omarchy-show-keybindings
@ -0,0 +1,59 @@
+#!/bin/bash
+
+# A script to display Hyprland keybindings defined in your configuration
+# using wofi for an interactive search menu.
+
+USER_HYPRLAND_CONF="$HOME/.config/hypr/hyprland.conf"
+OMARCHY_BINDINGS_CONF="$HOME/.local/share/omarchy/default/hypr/bindings.conf $HOME/.local/share/omarchy/default/hypr/bindings/tiling.conf $HOME/.local/share/omarchy/default/hypr/bindings/utilities.conf $HOME/.local/share/omarchy/default/hypr/bindings.conf $HOME/.local/share/omarchy/default/hypr/media.conf"
+
+OMARCHY_BINDINGS_CONF="$HOME/.local/share/omarchy/default/hypr/bindings.conf \
+$HOME/.local/share/omarchy/default/hypr/bindings/tiling.conf \
+$HOME/.local/share/omarchy/default/hypr/bindings/utilities.conf \
+$HOME/.local/share/omarchy/default/hypr/media.conf"
+
+# Process the configuration file to extract and format keybindings
+# 1. `grep` finds all lines starting with 'bind' (allowing for leading spaces).
+# 2. The first `sed` removes comments (anything after a '#').
+# 3. `awk` does the heavy lifting of formatting the output.
+#    - It sets the field separator to a comma ','.
+#    - It removes the 'bind... =' part from the beginning of the line.
+#    - It joins the key combination (e.g., "SUPER + Q").
+#    - It joins the command that the key executes.
+#    - It prints everything in a nicely aligned format.
+# 4. The final `sed` cleans up any leftover commas from the end of lines.
+grep -h '^[[:space:]]*bind' $USER_HYPRLAND_CONF $OMARCHY_BINDINGS_CONF |
+  sed 's/#.*//' |
+  sed '/^[[:space:]]*$/d' |
+  sort -u |
+  awk -F, '
+{
+    # Strip trailing comments
+    sub(/#.*/, "");
+
+    # Remove the "bind... =" part and surrounding whitespace
+    sub(/^[[:space:]]*bind[^=]*=(\+[[:space:]])?(exec, )?[[:space:]]*/, "", $1);
+
+    # Combine the modifier and key (first two fields)
+    key_combo = $1 " + " $2;
+
+    # Clean up: strip leading "+" if present, trim spaces
+    gsub(/^[ \t]*\+?[ \t]*/, "", key_combo);
+    gsub(/[ \t]+$/, "", key_combo);
+
+    # Reconstruct the command from the remaining fields
+    action = "";
+    for (i = 3; i <= NF; i++) {
+        action = action $i (i < NF ? "," : "");
+    }
+
+    # Clean up trailing commas, remove leading "exec, ", and trim
+    sub(/,$/, "", action);
+    gsub(/(^|,)[[:space:]]*exec[[:space:]]*,?/, "", action);
+    gsub(/^[ \t]+|[ \t]+$/, "", action);
+    gsub(/[ \t]+/, " ", key_combo);  # Collapse multiple spaces to one
+
+    if (action != "") {
+        printf "%-35s → %s\n", key_combo, action;
+    }
+}' |
+  flock --nonblock /tmp/.wofi.lock -c "wofi -dmenu -i --width 60% --height 70% -p 'Hyprland Keybindings' -O alphabetical  --style=\"$HOME/.local/share/omarchy/default/wofi/search.css\""
--- a/bin/omarchy-theme-bg-next
+++ b/bin/omarchy-theme-bg-next
@ -2,47 +2,36 @@

 # Cycles through the background images available

-BACKGROUNDS_DIR="$HOME/.config/omarchy/current/theme/backgrounds/"
+BACKGROUNDS_DIR="$HOME/.config/omarchy/current/backgrounds/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"

-mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
+BACKGROUNDS=($(find "$BACKGROUNDS_DIR" -type f | sort))
 TOTAL=${#BACKGROUNDS[@]}

-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
+# Get current background from symlink
+if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
  CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
-  else
+else
  # Default to first background if no symlink exists
-    CURRENT_BACKGROUND=""
-  fi
+  CURRENT_BACKGROUND=${BACKGROUNDS[0]}
+fi

-  # Find current background index
-  INDEX=-1
-  for i in "${!BACKGROUNDS[@]}"; do
+# Find current background index
+INDEX=0
+for i in "${!BACKGROUNDS[@]}"; do
  if [[ "${BACKGROUNDS[$i]}" == "$CURRENT_BACKGROUND" ]]; then
    INDEX=$i
    break
  fi
-  done
+done

-  # Get next background (wrap around)
-  if [[ $INDEX -eq -1 ]]; then
-    # Use the first background when no match was found
-    NEW_BACKGROUND="${BACKGROUNDS[0]}"
-  else
-    NEXT_INDEX=$(((INDEX + 1) % TOTAL))
-    NEW_BACKGROUND="${BACKGROUNDS[$NEXT_INDEX]}"
-  fi
+# Get next background (wrap around)
+NEXT_INDEX=$(((INDEX + 1) % TOTAL))
+NEW_BACKGROUND=${BACKGROUNDS[$NEXT_INDEX]}

-  # Set new background symlink
-  ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
+# Set new background symlink
+ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"

-  # Relaunch swaybg
-  pkill -x swaybg
-  setsid uwsm app -- swaybg -i "$CURRENT_BACKGROUND_LINK" -m fill >/dev/null 2>&1 &
-fi
+# Relaunch swaybg
+pkill -x swaybg
+setsid swaybg -i "$NEW_BACKGROUND" -m fill >/dev/null 2>&2 &
--- a/bin/omarchy-theme-install
+++ b/bin/omarchy-theme-install
@ -10,8 +10,11 @@ fi

 REPO_URL="$1"
 THEMES_DIR="$HOME/.config/omarchy/themes"
-THEME_NAME=$(basename "$REPO_URL" .git | sed -E 's/^omarchy-//; s/-theme$//')
+THEME_NAME=$(basename "$REPO_URL" .git)
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
+THEME_BACKGROUND_PATH="$THEME_PATH/backgrounds"
+BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds"
+BACKGROUNDS_THEME_PATH="$BACKGROUNDS_PATH/$THEME_NAME"

 # Remove existing theme if present
 if [ -d "$THEME_PATH" ]; then
@ -24,5 +27,12 @@ if ! git clone "$REPO_URL" "$THEME_PATH"; then
  exit 1
 fi

+# Copy backgrounds if present
+if [ -d $THEME_BACKGROUND_PATH ]; then
+  mkdir -p $BACKGROUNDS_THEME_PATH
+  cp $THEME_BACKGROUND_PATH/* $BACKGROUNDS_THEME_PATH/
+fi
+
 # Apply the new theme with omarchy-theme-set
 omarchy-theme-set $THEME_NAME
+
--- a/bin/omarchy-theme-menu
+++ b/bin/omarchy-theme-menu
@ -6,7 +6,7 @@ CURRENT_THEME_NAME=$(basename "$(realpath "$CURRENT_THEME_DIR")")

 # Build themes list with pretty display names
 mapfile -t themes < <(
-  find "$THEMES_DIR" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) | sort | while read -r path; do
+  find "$THEMES_DIR" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) | while read -r path; do
    filename=$(basename "$path")
    display_name=$(echo "$filename" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g')

@ -15,11 +15,17 @@ mapfile -t themes < <(
    else
      echo "$display_name"
    fi
-  done
+  done | sort
 )

-# Show Walker menu
-selection=$(printf '%s\n' "${themes[@]}" | walker --dmenu --theme dmenu_250 2>/dev/null)
+# Show Wofi menu (with markup support)
+selection=$(printf '%s\n' "${themes[@]}" | wofi \
+  --show dmenu \
+  --allow-markup \
+  --width 150 \
+  --height 300 \
+  -O alphabetical \
+  --style ~/.local/share/omarchy/default/wofi/select.css)

 # Remove any Pango markup before converting back to filename
 clean_selection=$(echo "$selection" | sed -E 's/<[^>]+>//g')
@ -29,3 +35,4 @@ selected_theme=$(echo "$clean_selection" | tr '[:upper:]' '[:lower:]' | tr ' ' '

 # Apply the selected theme
 "$HOME/.local/share/omarchy/bin/omarchy-theme-set" "$selected_theme"
+
--- a/bin/omarchy-theme-next
+++ b/bin/omarchy-theme-next
@ -30,5 +30,5 @@ NEXT_INDEX=$(((INDEX + 1) % TOTAL))
 NEW_THEME=${THEMES[$NEXT_INDEX]}
 NEW_THEME_NAME=$(basename "$NEW_THEME")

-"$HOME/.local/share/omarchy/bin/omarchy-theme-set" $NEW_THEME_NAME
+omarchy-theme-set $NEW_THEME_NAME
 notify-send "Theme changed to $NEW_THEME_NAME" -t 2000
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@ -13,6 +13,7 @@ CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"

 THEME_NAME="$1"
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
+BACKGROUND_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME"

 # Check if the theme entered exists
 if [[ ! -d "$THEME_PATH" ]]; then
@ -21,34 +22,21 @@ if [[ ! -d "$THEME_PATH" ]]; then
 fi

 # Update theme symlinks
+ln -nsf "$BACKGROUND_PATH" "$HOME/.config/omarchy/current/backgrounds"
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"

-# Change gnome modes
-if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
-else
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
-fi
-
-# Change gnome icon theme color
-if [[ -f ~/.config/omarchy/current/theme/icons.theme ]]; then
-  gsettings set org.gnome.desktop.interface icon-theme "$(<~/.config/omarchy/current/theme/icons.theme)"
-else
-  gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
-fi
-
 # Trigger alacritty config reload
 touch "$HOME/.config/alacritty/alacritty.toml"

 # Restart components to apply new theme
-pkill -SIGUSR2 btop
-"$HOME/.local/share/omarchy/bin/omarchy-restart-waybar"
-pkill swayosd-server
-setsid uwsm app -- swayosd-server &>/dev/null &
+pkill -SIGUSR2 waybar
 makoctl reload
 hyprctl reload

 # Set new background
-"$HOME/.local/share/omarchy/bin/omarchy-theme-bg-next"
+first_bg=$(find "$HOME/.config/omarchy/current/backgrounds/" -type f | head -n 1)
+if [[ -n "$first_bg" ]]; then
+  ln -nsf "$first_bg" "$HOME/.config/omarchy/current/background"
+  pkill -x swaybg
+  setsid swaybg -i "$HOME/.config/omarchy/current/background" -m fill >/dev/null &
+fi
--- a/bin/omarchy-theme-update
+++ b/bin/omarchy-theme-update
@ -1,4 +0,0 @@
-#!/bin/bash
-for dir in ~/.config/omarchy/themes/*/; do
-    [ -d "$dir" ] && [ ! -L "${dir%/}" ] && echo "Updating: $(basename "$dir")" && git -C "$dir" pull
-done
--- a/bin/omarchy-toggle-idle
+++ b/bin/omarchy-toggle-idle
@ -1,9 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash

-if pgrep -x hypridle >/dev/null; then
+if pgrep -x hypridle > /dev/null; then
  pkill -x hypridle
  notify-send "Stop locking computer when idle"
 else
-  uwsm app -- hypridle >/dev/null 2>&1 &
+  setsid hypridle &> /dev/null &
  notify-send "Now locking computer when idle"
 fi
--- a/bin/omarchy-toggle-nightlight
+++ b/bin/omarchy-toggle-nightlight
@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Default temperature values
-ON_TEMP=4000
-OFF_TEMP=6500
-
-# Query the current temperature
-CURRENT_TEMP=$(hyprctl hyprsunset temperature 2>/dev/null | grep -oE '[0-9]+')
-
-restart_nightlighted_waybar() {
-  if grep -q "custom/nightlight" ~/.config/waybar/config.jsonc; then
-    omarchy-restart-waybar # restart waybar in case user has waybar module for hyprsunset
-  fi
-}
-
-if [[ "$CURRENT_TEMP" == "$OFF_TEMP" ]]; then
-  hyprctl hyprsunset temperature $ON_TEMP
-  notify-send "  Nightlight screen temperature"
-  restart_nightlighted_waybar
-else
-  hyprctl hyprsunset temperature $OFF_TEMP
-  notify-send "   Daylight screen temperature"
-  restart_nightlighted_waybar
-fi
-
--- a/bin/omarchy-update
+++ b/bin/omarchy-update
@ -1,25 +1,31 @@
 #!/bin/bash

-# Exit immediately if a command exits with a non-zero status
-set -e
+cd ~/.local/share/omarchy

-# Show logo
-clear
-cat <~/.local/share/omarchy/logo.txt
-
-# Get the latest while trying to preserve any modifications
-omarchy_path=~/.local/share/omarchy
-git -C $omarchy_path pull --autostash
-git -C $omarchy_path diff --check || git -C $omarchy_path reset --merge
-
-# Run migrations
-"$HOME/.local/share/omarchy/bin/omarchy-migrate"
-
-# Update system packages
-echo -e "\e[32m\nUpdate system packages\e[0m"
-yay -Syu --noconfirm
-
-# Offer to reboot if the kernel has been changed
-if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $2}')" ]; then
-  gum confirm "Linux kernel has been updated. Reboot?" && sudo reboot now
+if [[ $1 == "all" ]]; then
+  # Run all migrations
+  last_updated_at=1
+else
+  # Remember the version we're at before upgrading
+  last_updated_at=$(git log -1 --format=%cd --date=unix)
 fi
+
+# Get the latest
+git pull
+
+# Run any pending migrations
+for file in migrations/*.sh; do
+  filename=$(basename "$file")
+  migrate_at="${filename%.sh}"
+
+  if [ $migrate_at -gt $last_updated_at ]; then
+    echo -e "\e[32m\nRunning migration ($migrate_at)\e[0m"
+    source $file
+  fi
+done
+
+# Back to where we came from
+cd - >/dev/null
+
+echo -e "\e[32m\nUpdating system packages\e[0m"
+yay -Syu --noconfirm
--- a/bin/omarchy-update-available
+++ b/bin/omarchy-update-available
@ -1,13 +0,0 @@
-#!/bin/bash
-
-omarchy_path="$HOME/.local/share/omarchy"
-latest_tag=$(git -C $omarchy_path ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
-current_tag=$(git -C $omarchy_path describe --tags $(git -C $omarchy_path rev-list --tags --max-count=1))
-
-if [[ "$current_tag" != "$latest_tag" ]]; then
-  echo "Omarchy update available ($latest_tag)"
-  exit 0
-else
-  echo "Omarchy is up to date ($current_tag)"
-  exit 1
-fi
--- a/boot.sh
+++ b/boot.sh
@ -1,27 +1,20 @@
-#!/bin/bash
-
-ansi_art='                 ▄▄▄                                                   
- ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄ 
+ascii_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
+███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
+███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
+███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
 ███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
-███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
-███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
-███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
- ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀ 
-                                       ███   █▀                                  '
+ ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
+                                          ███    ███                                    '

-clear
-echo -e "\n$ansi_art\n"
+echo -e "\n$ascii_art\n"

-sudo pacman -Sy --noconfirm --needed git
+pacman -Q git &>/dev/null || sudo pacman -Sy --noconfirm --needed git

-# Use custom repo if specified, otherwise default to basecamp/omarchy
-OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
-
-echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
+echo -e "\nCloning Omarchy..."
 rm -rf ~/.local/share/omarchy/
-git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
+git clone https://github.com/basecamp/omarchy.git ~/.local/share/omarchy >/dev/null

 # Use custom branch if instructed
 if [[ -n "$OMARCHY_REF" ]]; then
--- a/config/fastfetch/config.jsonc
+++ b/config/fastfetch/config.jsonc
@ -47,7 +47,7 @@
        {
            "type": "swap",
            "key": "└ └󰓡 ",
-      "keyColor": "green"
+            "keyColor": "green",
        },
        {
            "type": "custom",
@ -79,12 +79,6 @@
            "keyColor": "yellow"
        },
        "break",
-    {
-      "type": "command",
-      "key": "│ ├Ø",
-      "keyColor": "blue",
-      "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"Omarchy $version\""
-    },
        {
            "type": "de",
            "key": " DE",
@ -103,17 +97,17 @@
        {
            "type": "icons",
            "key": "│ ├󰀻",
-      "keyColor": "blue"
+            "keyColor": "blue",
        },
        {
            "type": "cursor",
            "key": "│ ├",
-      "keyColor": "blue"
+            "keyColor": "blue",
        },
        {
            "type": "terminalfont",
            "key": "│ ├",
-      "keyColor": "blue"
+            "keyColor": "blue",
        },
        {
            "type": "terminal",
@ -144,6 +138,7 @@
            "type": "custom",
            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
        },
-    "break"
+        "break",
    ]
 }
+
--- a/config/hypr/hypridle.conf
+++ b/config/hypr/hypridle.conf
@ -2,13 +2,6 @@ general {
    lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
    before_sleep_cmd = loginctl lock-session    # lock before suspend.
    after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
-    on_lock_cmd = pkill -f "alacritty --class Screensaver" # avoid running screensaver when locked
-    on_unlock_cmd = omarchy-restart-waybar                 # prevent stacking of waybar when waking
-}
-
-listener {
-    timeout = 180                                             # 2.5min
-    on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already)
 }

 listener {
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@ -19,33 +19,33 @@ source = ~/.local/share/omarchy/default/hypr/windows.conf
 source = ~/.config/omarchy/current/theme/hyprland.conf

 # Application bindings
-$terminal = uwsm app -- alacritty
-$browser = uwsm app -- chromium --new-window --ozone-platform=wayland
+$terminal = alacritty
+$browser = chromium --new-window --ozone-platform=wayland
 $webapp = $browser --app

-bindd = SUPER, return, Terminal, exec, $terminal
-bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
-bindd = SUPER, B, Browser, exec, $browser
-bindd = SUPER, M, Music, exec, uwsm app -- spotify
-bindd = SUPER, N, Neovim, exec, $terminal -e nvim
-bindd = SUPER, T, Activity, exec, $terminal -e btop
-bindd = SUPER, D, Docker, exec, $terminal -e lazydocker
-bindd = SUPER, G, Signal, exec, uwsm app -- signal-desktop
-bindd = SUPER, O, Obsidian, exec, uwsm app -- obsidian -disable-gpu
-bindd = SUPER, slash, Passwords, exec, uwsm app -- 1password
+bind = SUPER, return, exec, $terminal
+bind = SUPER, F, exec, nautilus --new-window
+bind = SUPER, B, exec, $browser
+bind = SUPER, M, exec, spotify
+bind = SUPER, N, exec, $terminal -e nvim
+bind = SUPER, T, exec, $terminal -e btop
+bind = SUPER, D, exec, $terminal -e lazydocker
+bind = SUPER, G, exec, signal-desktop
+bind = SUPER, O, exec, obsidian -disable-gpu
+bind = SUPER, slash, exec, 1password

-bindd = SUPER, A, ChatGPT, exec, $webapp="https://chatgpt.com"
-bindd = SUPER SHIFT, A, Grok, exec, $webapp="https://grok.com"
-bindd = SUPER, C, Calendar, exec, $webapp="https://app.hey.com/calendar/weeks/"
-bindd = SUPER, E, Email, exec, $webapp="https://app.hey.com"
-bindd = SUPER, Y, YouTube, exec, $webapp="https://youtube.com/"
-bindd = SUPER SHIFT, G, WhatsApp, exec, $webapp="https://web.whatsapp.com/"
-bindd = SUPER ALT, G, Google Messages, exec, $webapp="https://messages.google.com/web/conversations"
-bindd = SUPER, X, X, exec, $webapp="https://x.com/"
-bindd = SUPER SHIFT, X, X Post, exec, $webapp="https://x.com/compose/post"
+bind = SUPER, A, exec, $webapp="https://chatgpt.com"
+bind = SUPER SHIFT, A, exec, $webapp="https://grok.com"
+bind = SUPER, C, exec, $webapp="https://app.hey.com/calendar/weeks/"
+bind = SUPER, E, exec, $webapp="https://app.hey.com"
+bind = SUPER, Y, exec, $webapp="https://youtube.com/"
+bind = SUPER SHIFT, G, exec, $webapp="https://web.whatsapp.com/"
+bind = SUPER ALT, G, exec, $webapp="https://messages.google.com/web/conversations"
+bind = SUPER, X, exec, $webapp="https://x.com/"
+bind = SUPER SHIFT, X, exec, $webapp="https://x.com/compose/post"

 # Extra autostart processes
-# exec-once = uwsm app -- my-service
+# exec-once = dropbox-cli start

 # Extra env variables
 # Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)
@ -56,7 +56,7 @@ bindd = SUPER SHIFT, X, X Post, exec, $webapp="https://x.com/compose/post"
 input {
  # Use multiple keyboard layouts and switch between them with Alt + Space
  # kb_layout = us,dk
-  kb_options = compose:caps # ,grp:alt_space_toggle
+  # kb_options = compose:caps,grp:alt_space_toggle

  # Change speed of keyboard repeat
  repeat_rate = 40
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@ -1,5 +1,14 @@
+# ────────────────────────────────────────────────────────────
+#  Hyprlock — minimal blur with ringed input
+# ────────────────────────────────────────────────────────────
+
 source = ~/.config/omarchy/current/theme/hyprlock.conf

+general {
+    disable_loading_bar = true
+    no_fade_in = false
+}
+
 background {
    monitor =
    color = $color
@ -21,11 +30,13 @@ input-field {
    outline_thickness = 4

    font_family = CaskaydiaMono Nerd Font
+    font_size = 32
    font_color = $font_color

+    placeholder_color = $placeholder_color
    placeholder_text =   Enter Password 󰈷 
    check_color = $check_color
-    fail_text = <i>$PAMFAIL ($ATTEMPTS)</i>
+    fail_text = Wrong

    rounding = 0
    shadow_passes = 0
--- a/config/hypr/hyprsunset.conf
+++ b/config/hypr/hyprsunset.conf
@ -1,6 +0,0 @@
-# Makes hyprsunset do nothing to the screen by default
-# Without this, the default applies some tint to the monitor
-profile {
-    time = 00:00
-    identity = true
-}
--- a/config/hypr/monitors.conf
+++ b/config/hypr/monitors.conf
@ -1,20 +1,17 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
-# List current monitors and resolutions possible: hyprctl monitors
-# Format: monitor = [port], resolution, position, scale
-# You must relaunch Hyprland after changing any envs (use Super+Esc, then Relaunch)

-# Optimized for retina-class 2x displays, like 13" 2.8K, 27" 5K, 32" 6K.
+# Change to 1 if on a 1x display (then change last "auto" to 1 in monitor=)
+# Change to something like 1.75 for fractional scaling (can work well with 1.66667 monitor scaling)
+# Note: You must relaunch Hyprland after changing any env like this (use Super+Esc, then Relaunch)
 env = GDK_SCALE,2
+
+# Use single default monitor (see all monitors with: hyprctl monitors)
+# Format: monitor = [port], resolution, position, scale
 monitor=,preferred,auto,auto

-# Good compromise for 27" or 32" 4K monitors (but fractional!)
-# env = GDK_SCALE,1.75
+# Exmaple for fractional scaling that works well with GDK_SCALE,1.75
 # monitor=,preferred,auto,1.666667

-# Straight 1x setup for low-resolution displays like 1080p or 1440p
-# env = GDK_SCALE,1
-# monitor=,preferred,auto,1
-
 # Example for Framework 13 w/ 6K XDR Apple display
-# monitor = DP-5, 6016x3384@60, auto, 2
-# monitor = eDP-1, 2880x1920@120, auto, 2
+# monitor = DP-5, 6016x3384@60.00, auto, 2
+# monitor = eDP-1, 2880x1920@120.00, auto, 2
--- a/config/swayosd/config.toml
+++ b/config/swayosd/config.toml
@ -1,4 +0,0 @@
-[server]
-show_percentage = true
-max_volume = 150
-style = "./style.css"
--- a/config/swayosd/style.css
+++ b/config/swayosd/style.css
@ -1,28 +0,0 @@
-@import "../omarchy/current/theme/swayosd.css";
-
-window {
-  border-radius: 0;
-  opacity: 0.97;
-  border: 2px solid @border-color;
-
-  background-color: @background-color;
-}
-
-label {
-  font-family: 'CaskaydiaMono Nerd Font', monospace;
-  font-size: 11pt;
-
-  color: @label;
-}
-
-image {
-  color: @image;
-}
-
-progressbar {
-  border-radius: 0;
-}
-
-progress {
-  background-color: @progress;
-}
--- a/config/walker/config.toml
+++ b/config/walker/config.toml
@ -1,293 +0,0 @@
-app_launch_prefix = "uwsm app -- "
-terminal_title_flag = ""
-locale = ""
-close_when_open = true                                             # Toggle on reopen
-theme = "omarchy-default"
-theme_base = []
-theme_location = ["~/.local/share/omarchy/default/walker/themes/"]
-monitor = ""
-hotreload_theme = true
-as_window = false
-timeout = 0
-disable_click_to_close = false
-force_keyboard_focus = true
-
-[keys]
-accept_typeahead = ["tab"]
-trigger_labels = "lalt"
-next = ["down"]
-prev = ["up"]
-close = ["esc"]
-remove_from_history = ["shift backspace"]
-resume_query = ["ctrl r"]
-toggle_exact_search = ["ctrl m"]
-
-[keys.activation_modifiers]
-keep_open = "shift"
-alternate = "alt"
-
-[keys.ai]
-clear_session = ["ctrl x"]
-copy_last_response = ["ctrl c"]
-resume_session = ["ctrl r"]
-run_last_responstruee = ["ctrl e"]
-
-[events]
-on_activate = ""
-on_selection = ""
-on_exit = ""
-on_launch = ""
-on_query_change = ""
-
-[list]
-dynamic_sub = true
-keyboard_scroll_style = "emacs"
-max_entries = 200
-show_initial_entries = true
-single_click = true
-visibility_threshold = 20
-placeholder = "No Results"
-
-[search]
-argument_delimiter = "#"
-placeholder = " Search..."
-delay = 0
-resume_last_query = false
-
-[activation_mode]
-labels = "jkl;asdf"
-
-[builtins.hyprland_keybinds]
-show_sub_when_single = true
-path = "~/.config/hypr/hyprland.conf"
-weight = 5
-name = "hyprland_keybinds"
-placeholder = "Hyprland Keybinds"
-switcher_only = true
-hidden = true
-
-[builtins.applications]
-weight = 5
-name = "applications"
-placeholder = " Search..."
-prioritize_new = false
-hide_actions_with_empty_query = true
-context_aware = false
-refresh = true
-show_sub_when_single = false
-show_icon_when_single = true
-show_generic = true
-history = false
-icon = ""
-hidden = true
-
-[builtins.applications.actions]
-enabled = false
-hide_category = true
-hide_without_query = true
-
-[builtins.bookmarks]
-weight = 5
-placeholder = "Bookmarks"
-name = "bookmarks"
-icon = "bookmark"
-switcher_only = true
-hidden = true
-
-[[builtins.bookmarks.entries]]
-label = "Walker"
-url = "https://github.com/abenz1267/walker"
-keywords = ["walker", "github"]
-
-[[builtins.bookmarks.entries]]
-label = "Omarchy - Github"
-url = "https://github.com/basecamp/omarchy"
-keywords = ["omarchy", "github"]
-
-[[builtins.bookmarks.entries]]
-label = "Omarchy Manual"
-url = "https://manuals.omamix.org/2/the-omarchy-manual"
-keywords = ["omarchy"]
-
-[builtins.xdph_picker]
-hidden = true
-weight = 5
-placeholder = "Screen/Window Picker"
-show_sub_when_single = true
-name = "xdphpicker"
-switcher_only = true
-
-[builtins.ai]
-weight = 5
-placeholder = "AI"
-name = "ai"
-icon = "help-browser"
-switcher_only = true
-show_sub_when_single = true
-
-[[builtins.ai.anthropic.prompts]]
-model = "claude-3-7-sonnet-20250219"
-temperature = 1
-max_tokens = 1_000
-label = "General Assistant"
-prompt = "You are a helpful general assistant. Keep your answers short and precise."
-
-[builtins.calc]
-require_number = true
-weight = 5
-name = "Calculator"
-icon = "accessories-calculator"
-placeholder = "Calculator"
-min_chars = 3                   # Min chars to calculate. 3 allows "3+3"
-prefix = "="
-
-[builtins.windows]
-weight = 5
-icon = "view-restore"
-name = "windows"
-placeholder = "Windows"
-show_icon_when_single = true
-switcher_only = true
-hidden = true
-
-[builtins.clipboard]
-always_put_new_on_top = true
-exec = "wl-copy"
-weight = 5
-name = "clipboard"
-avoid_line_breaks = true
-placeholder = "Clipboard"
-image_height = 300
-max_entries = 10
-switcher_only = true
-hidden = true
-
-[builtins.commands]
-weight = 5
-icon = "utilities-terminal"
-switcher_only = true
-name = "commands"
-placeholder = "Commands"
-hidden = true
-
-[builtins.custom_commands]
-weight = 5
-icon = "utilities-terminal"
-name = "custom_commands"
-placeholder = "Custom Commands"
-hidden = true
-
-[builtins.emojis]
-exec = "wl-copy"
-weight = 5
-name = "Emojis"
-placeholder = "Emojis"
-switcher_only = true
-history = true
-typeahead = true
-show_unqualified = false
-prefix = ":"
-
-[builtins.symbols]
-after_copy = ""
-weight = 5
-name = "symbols"
-placeholder = "Symbols"
-switcher_only = true
-history = true
-typeahead = true
-hidden = true
-
-[builtins.finder]
-use_fd = true
-fd_flags = "--ignore-vcs --type file --type directory"
-cmd_alt = "xdg-open $(dirname ~/%RESULT%)"
-weight = 5
-icon = "file"
-name = "Finder"
-placeholder = "Finder"
-switcher_only = true
-ignore_gitignore = true
-refresh = true
-concurrency = 8
-show_icon_when_single = true
-preview_images = true
-hidden = false
-prefix = "."
-
-[builtins.runner]
-eager_loading = true
-weight = 5
-icon = "utilities-terminal"
-name = "runner"
-placeholder = "Runner"
-typeahead = true
-history = true
-generic_entry = false       # Generic command runner
-shell_config = ""           # Path to shell to parse for aliases
-refresh = true
-use_fd = false
-switcher_only = true
-hidden = true
-
-[builtins.ssh]
-weight = 5
-icon = "preferences-system-network"
-name = "ssh"
-placeholder = "SSH"
-switcher_only = true
-history = true
-refresh = true
-hidden = true
-
-[builtins.switcher]
-weight = 5
-name = "switcher"
-placeholder = "Switcher"
-prefix = "/"
-
-[builtins.websearch]
-keep_selection = true
-weight = 5
-icon = "applications-internet"
-name = "websearch"
-placeholder = "Websearch"
-switcher_only = true
-hidden = true
-
-[[builtins.websearch.entries]]
-name = "Google"
-url = "https://www.google.com/search?q=%TERM%"
-
-[[builtins.websearch.entries]]
-name = "DuckDuckGo"
-url = "https://duckduckgo.com/?q=%TERM%"
-switcher_only = true
-
-[[builtins.websearch.entries]]
-name = "Ecosia"
-url = "https://www.ecosia.org/search?q=%TERM%"
-switcher_only = true
-
-[[builtins.websearch.entries]]
-name = "Yandex"
-url = "https://yandex.com/search/?text=%TERM%"
-switcher_only = true
-
-[builtins.dmenu]
-hidden = true
-weight = 5
-name = "dmenu"
-placeholder = "Dmenu"
-switcher_only = true
-show_icon_when_single = true
-
-[builtins.translation]
-delay = 1000
-weight = 5
-name = "translation"
-icon = "accessories-dictionary"
-placeholder = "Translation"
-switcher_only = true
-provider = "googlefree"
-hidden = true
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@ -8,8 +8,7 @@
    "hyprland/workspaces"
  ],
  "modules-center": [
-    "clock",
-    "custom/update"
+    "clock"
  ],
  "modules-right": [
    "group/tray-expander",
@ -43,12 +42,6 @@
      "5": []
    }
  },
-  "custom/update": {
-    "format": "",
-    "exec": "~/.local/share/omarchy/bin/omarchy-update-available",
-    "on-click": "alacritty --class Omarchy --title Omarchy -e omarchy-update",
-    "interval": 3600
-  },
  "cpu": {
    "interval": 5,
    "format": "󰍛",
@ -57,8 +50,7 @@
  "clock": {
    "format": "{:%A %H:%M}",
    "format-alt": "{:%d %B W%V %Y}",
-    "tooltip": false,
-    "on-click-right": "~/.local/share/omarchy/bin/omarchy-cmd-tzupdate"
+    "tooltip": false
  },
  "network": {
    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
@ -100,11 +92,11 @@
    "format-disabled": "󰂲",
    "format-connected": "",
    "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "blueberry"
+    "on-click": "GTK_THEME=Adwaita-dark blueberry"
  },
  "pulseaudio": {
    "format": "{icon}",
-    "on-click": "alacritty --class=Wiremix -e wiremix",
+    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
    "on-click-right": "pamixer -t",
    "tooltip-format": "Playing at {volume}%",
    "scroll-step": 5,
@ -132,4 +124,66 @@
    "icon-size": 12,
    "spacing": 12
  }
+},
+  "cpu": {
+    "interval": 5,
+    "format": "󰍛",
+    "on-click": "alacritty -e btop"
+  },
+  "clock": {
+    "format": "{:%A %H:%M}",
+    "format-alt": "{:%d %B W%V %Y}",
+    "tooltip": false
+  },
+  "network": {
+    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
+    "format" : "{icon}",
+    "format-wifi" : "{icon}",
+    "format-ethernet" : "󰀂",
+    "format-disconnected" : "󰖪",
+    "tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
+    "tooltip-format-ethernet": "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
+    "tooltip-format-disconnected": "Disconnected",
+    "interval": 3,
+    "nospacing": 1,
+    "on-click": "alacritty --class=Impala -e impala"
+  },
+  "battery": {
+    "format": "{capacity}% {icon}",
+    "format-discharging": "{icon}",
+    "format-charging":    "{icon}",
+    "format-plugged":     "",
+    "format-icons": {
+      "charging": [
+        "󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"
+      ],
+      "default": [
+        "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
+      ]
+    },
+    "format-full": "󰂅",
+    "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
+    "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
+    "interval": 5,
+    "states": {
+      "warning": 20,
+      "critical": 10
+    }
+  },
+  "bluetooth": {
+    "format": "",
+    "format-disabled": "󰂲",
+    "format-connected": "",
+    "tooltip-format": "Devices connected: {num_connections}",
+    "on-click": "GTK_THEME=Adwaita-dark blueberry"
+  },
+  "pulseaudio": {
+    "format": "",
+    "format-muted": "󰝟",
+    "scroll-step": 5,
+    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
+    "tooltip-format": "Playing at {volume}%",
+    "on-click-right": "pamixer -t",
+    "ignored-sinks": ["Easy Effects Sink"]
+  }
 }
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@ -23,11 +23,6 @@
  all: initial;
  padding: 0 6px;
  margin: 0 1.5px;
-  min-width: 9px;
-}
-
-#workspaces button.empty {
-  opacity: 0.5;
 }

 #tray,
--- a/config/wofi/config
+++ b/config/wofi/config
@ -0,0 +1,15 @@
+width=600
+height=350
+location=center
+show=drun
+prompt=Search...
+filter_rate=100
+allow_markup=true
+no_actions=true
+halign=fill
+orientation=vertical
+content_halign=fill
+insensitive=true
+allow_images=true
+image_size=40
+gtk_dark=true
--- a/config/wofi/style.css
+++ b/config/wofi/style.css
@ -0,0 +1,73 @@
+/* Colors are defined by theme files and can be referenced via @base, @text, @selected-text, and @border */
+
+* {
+  font-family: 'CaskaydiaMono Nerd Font', monospace;
+  font-size: 18px;
+}
+
+window {
+  margin: 0px;
+  padding: 20px;
+  background-color: @base;
+  opacity: 0.95;
+}
+
+#inner-box {
+  margin: 0;
+  padding: 0;
+  border: none;
+  background-color: @base;
+}
+
+#outer-box {
+  margin: 0;
+  padding: 20px;
+  border: none;
+  background-color: @base;
+  border: 2px solid @border;
+}
+
+#scroll {
+  margin: 0;
+  padding: 0;
+  border: none;
+  background-color: @base;
+}
+
+#input {
+  margin: 0;
+  padding: 10px;
+  border: none;
+  background-color: @base;
+  color: @text;
+}
+
+#input:focus {
+  outline: none;
+  box-shadow: none;
+  border: none;
+}
+
+#text {
+  margin: 5px;
+  border: none;
+  color: @text;
+}
+
+#entry {
+  background-color: @base;
+}
+
+#entry:selected {
+  outline: none;
+  border: none;
+}
+
+#entry:selected #text {
+  color: @selected-text;
+}
+
+#entry image {
+  -gtk-icon-transform: scale(0.7);
+}
+
--- a/default/bash/aliases
+++ b/default/bash/aliases
@ -15,7 +15,7 @@ zd() {
  fi
 }
 open() {
-  xdg-open "$@" >/dev/null 2>&1 &
+  xdg-open "$@" >/dev/null 2>&1
 }

 # Directories
@ -24,10 +24,10 @@ alias ...='cd ../..'
 alias ....='cd ../../..'

 # Tools
+alias n='nvim'
 alias g='git'
 alias d='docker'
 alias r='rails'
-n() { if [ "$#" -eq 0 ]; then nvim .; else nvim "$@"; fi; }

 # Git
 alias gcm='git commit -m'
--- a/default/bash/envs
+++ b/default/bash/envs
@ -1,4 +1,3 @@
 # Editor used by CLI
 export EDITOR="nvim"
 export SUDO_EDITOR="$EDITOR"
-export BAT_THEME=ansi
--- a/default/bash/functions
+++ b/default/bash/functions
@ -65,3 +65,9 @@ web2app-remove() {
  rm "$DESKTOP_FILE"
  rm "$ICON_PATH"
 }
+
+# Ensure changes to ~/.XCompose are immediately available
+refresh-xcompose() {
+  pkill fcitx5
+  setsid fcitx5 &>/dev/null &
+}
--- a/default/bash/init
+++ b/default/bash/init
@ -7,8 +7,8 @@ if command -v zoxide &> /dev/null; then
 fi

 if command -v fzf &> /dev/null; then
-  if [[ -f /usr/share/fzf/completion.bash ]]; then
-    source /usr/share/fzf/completion.bash
+  if [[ -f /usr/share/bash-completion/completions/fzf ]]; then
+    source /usr/share/bash-completion/completions/fzf
  fi
  if [[ -f /usr/share/fzf/key-bindings.bash ]]; then
    source /usr/share/fzf/key-bindings.bash
--- a/default/bash/rc
+++ b/default/bash/rc
@ -4,4 +4,4 @@ source ~/.local/share/omarchy/default/bash/functions
 source ~/.local/share/omarchy/default/bash/prompt
 source ~/.local/share/omarchy/default/bash/init
 source ~/.local/share/omarchy/default/bash/envs
-[[ $- == *i* ]] && bind -f ~/.local/share/omarchy/default/bash/inputrc
+bind -f ~/.local/share/omarchy/default/bash/inputrc
--- a/default/bash/shell
+++ b/default/bash/shell
@ -12,6 +12,3 @@ fi
 # Set complete path
 export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/omarchy/bin:$PATH"
 set +h
-
-# Omarchy path
-export OMARCHY_PATH="/home/$USER/.local/share/omarchy"
--- a/default/bashrc
+++ b/default/bashrc
@ -1,14 +0,0 @@
-# All the default Omarchy aliases and functions
-# (don't mess with these directly, just overwrite them here!)
-source ~/.local/share/omarchy/default/bash/rc
-
-# Add your own exports, aliases, and functions here.
-#
-# Make an alias for invoking commands you use constantly
-# alias p='python'
-#
-# Use VSCode instead of neovim as your default editor
-# export EDITOR="code"
-#
-# Set a custom prompt with the directory revealed (alternatively use https://starship.rs)
-# PS1="\W \[\e]0;\w\a\]$PS1"
--- a/default/hypr/apps.conf
+++ b/default/hypr/apps.conf
@ -1,7 +0,0 @@
-# App-specific tweaks
-source = ~/.local/share/omarchy/default/hypr/apps/chromium.conf
-source = ~/.local/share/omarchy/default/hypr/apps/hyprshot.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
--- a/default/hypr/apps/chromium.conf
+++ b/default/hypr/apps/chromium.conf
@ -1,6 +0,0 @@
-# Force chromium into a tile to deal with --app bug
-windowrule = tile, class:^(Chromium)$
-
-# Only slight opacity when unfocused
-windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$
-windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube
--- a/default/hypr/apps/hyprshot.conf
+++ b/default/hypr/apps/hyprshot.conf
@ -1,2 +0,0 @@
-# Remove 1px border around hyprshot screenshots
-layerrule = noanim, selection
--- a/default/hypr/apps/retroarch.conf
+++ b/default/hypr/apps/retroarch.conf
@ -1,3 +0,0 @@
-windowrule = fullscreen, class:com.libretro.RetroArch
-windowrule = opacity 1 1, class:com.libretro.RetroArch
-
--- a/default/hypr/apps/steam.conf
+++ b/default/hypr/apps/steam.conf
@ -1,4 +0,0 @@
-# Float Steam, fullscreen RetroArch
-windowrule = float, class:steam
-windowrule = center, class:steam, title:Steam
-windowrule = opacity 1 1, class:steam
--- a/default/hypr/apps/system.conf
+++ b/default/hypr/apps/system.conf
@ -1,16 +0,0 @@
-# Float and center settings and previews
-windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
-windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
-windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty)$
-windowrule = size 600 470, class:Omarchy
-windowrule = size 700 470 class:About
-
-# Float and center file pickers
-windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
-windowrule = center, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
-
-# Fullscreen screensaver
-windowrule = fullscreen, class:Screensaver
-
-# No transparency on media windows
-windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
--- a/default/hypr/apps/walker.conf
+++ b/default/hypr/apps/walker.conf
@ -1,2 +0,0 @@
-# Application-sepcific animation
-layerrule = noanim, walker
--- a/default/hypr/autostart.conf
+++ b/default/hypr/autostart.conf
@ -1,10 +1,5 @@
-exec-once = uwsm app -- hypridle
-exec-once = uwsm app -- mako
-exec-once = uwsm app -- waybar
-exec-once = uwsm app -- fcitx5
-exec-once = uwsm app -- hyprsunset
-exec-once = uwsm app -- swaybg -i ~/.config/omarchy/current/background -m fill
-exec-once = uwsm app -- swayosd-server
-exec-once = uwsm app -- walker --gapplication-service
+exec-once = hypridle & mako & waybar & fcitx5
+exec-once = swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = wl-clip-persist --clipboard regular --all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'
+exec-once = ~/.local/share/omarchy/bin/omarchy-first-run
--- a/default/hypr/bindings.conf
+++ b/default/hypr/bindings.conf
@ -1,15 +1,15 @@
 # Deprecated bindings file. New installations include everything directly.

-bindd = SUPER, return, Terminal, exec, $terminal
-bindd = SUPER, F, File manager, exec, $fileManager
-bindd = SUPER, B, Web browser, exec, $browser
-bindd = SUPER, M, Music player, exec, $music
-bindd = SUPER, N, Neovim, exec, $terminal -e nvim
-bindd = SUPER, T, Top, exec, $terminal -e btop
-bindd = SUPER, D, Lazy Docker, exec, $terminal -e lazydocker
-bindd = SUPER, G, Messenger, exec, $messenger
-bindd = SUPER, O, Obsidian, exec, obsidian -disable-gpu
-bindd = SUPER, slash, Pasword manager, exec, $passwordManager
+bind = SUPER, return, exec, $terminal
+bind = SUPER, F, exec, $fileManager
+bind = SUPER, B, exec, $browser
+bind = SUPER, M, exec, $music
+bind = SUPER, N, exec, $terminal -e nvim
+bind = SUPER, T, exec, $terminal -e btop
+bind = SUPER, D, exec, $terminal -e lazydocker
+bind = SUPER, G, exec, $messenger
+bind = SUPER, O, exec, obsidian -disable-gpu
+bind = SUPER, slash, exec, $passwordManager

 source = ~/.local/share/omarchy/default/hypr/bindings/media.conf
 source = ~/.local/share/omarchy/default/hypr/bindings/tiling.conf
--- a/default/hypr/bindings/media.conf
+++ b/default/hypr/bindings/media.conf
@ -1,16 +1,13 @@
-# Only display the OSD on the currently focused monitor
-$osdclient = swayosd-client --monitor "$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
-
-# Laptop multimedia keys for volume and LCD brightness (with OSD)
-bindeld = ,XF86AudioRaiseVolume, Volume up, exec, $osdclient --output-volume raise
-bindeld = ,XF86AudioLowerVolume, Volume down, exec, $osdclient --output-volume lower
-bindeld = ,XF86AudioMute, Mute, exec, $osdclient --output-volume mute-toggle
-bindeld = ,XF86AudioMicMute, Mute microphone, exec, $osdclient --input-volume mute-toggle
-bindeld = ,XF86MonBrightnessUp, Brightness up, exec, $osdclient --brightness raise
-bindeld = ,XF86MonBrightnessDown, Brightness down, exec, $osdclient --brightness lower
+# Laptop multimedia keys for volume and LCD brightness
+bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
+bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
+bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-

 # Requires playerctl
-bindld = , XF86AudioNext, Next track, exec, $osdclient --playerctl next
-bindld = , XF86AudioPause, Pause, exec, $osdclient --playerctl play-pause
-bindld = , XF86AudioPlay, Play, exec, $osdclient --playerctl play-pause
-bindld = , XF86AudioPrev, Previous track, exec, $osdclient --playerctl previous
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = , XF86AudioPause, exec, playerctl play-pause
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = , XF86AudioPrev, exec, playerctl previous
--- a/default/hypr/bindings/tiling.conf
+++ b/default/hypr/bindings/tiling.conf
@ -1,62 +1,58 @@
 # Close window
-bindd = SUPER, W, Close active window, killactive,
+bind = SUPER, W, killactive,

 # Control tiling
-bindd = SUPER, J, Toggle split, togglesplit, # dwindle
-bindd = SUPER, P, Pseudo window, pseudo, # dwindle
-bindd = SUPER, V, Toggle floating, togglefloating,
-bindd = SHIFT, F11, Force full screen, fullscreen, 0
+bind = SUPER, J, togglesplit, # dwindle
+bind = SUPER, P, pseudo, # dwindle
+bind = SUPER, V, togglefloating,

 # Move focus with mainMod + arrow keys
-bindd = SUPER, left, Move focus left, movefocus, l
-bindd = SUPER, right, Move focus right, movefocus, r
-bindd = SUPER, up, Move focus up, movefocus, u
-bindd = SUPER, down, Move focus down, movefocus, d
+bind = SUPER, left, movefocus, l
+bind = SUPER, right, movefocus, r
+bind = SUPER, up, movefocus, u
+bind = SUPER, down, movefocus, d

 # Switch workspaces with mainMod + [0-9]
-bindd = SUPER, code:10, Switch to workspace 1, workspace, 1
-bindd = SUPER, code:11, Switch to workspace 2, workspace, 2
-bindd = SUPER, code:12, Switch to workspace 3, workspace, 3
-bindd = SUPER, code:13, Switch to workspace 4, workspace, 4
-bindd = SUPER, code:14, Switch to workspace 5, workspace, 5
-bindd = SUPER, code:15, Switch to workspace 6, workspace, 6
-bindd = SUPER, code:16, Switch to workspace 7, workspace, 7
-bindd = SUPER, code:17, Switch to workspace 8, workspace, 8
-bindd = SUPER, code:18, Switch to workspace 9, workspace, 9
-bindd = SUPER, code:19, Switch to workspace 10, workspace, 10
+bind = SUPER, code:10, workspace, 1
+bind = SUPER, code:11, workspace, 2
+bind = SUPER, code:12, workspace, 3
+bind = SUPER, code:13, workspace, 4
+bind = SUPER, code:14, workspace, 5
+bind = SUPER, code:15, workspace, 6
+bind = SUPER, code:16, workspace, 7
+bind = SUPER, code:17, workspace, 8
+bind = SUPER, code:18, workspace, 9
+bind = SUPER, code:19, workspace, 10

 # Move active window to a workspace with mainMod + SHIFT + [0-9]
-bindd = SUPER SHIFT, code:10, Move window to workspace 1, movetoworkspace, 1
-bindd = SUPER SHIFT, code:11, Move window to workspace 1, movetoworkspace, 2
-bindd = SUPER SHIFT, code:12, Move window to workspace 1, movetoworkspace, 3
-bindd = SUPER SHIFT, code:13, Move window to workspace 1, movetoworkspace, 4
-bindd = SUPER SHIFT, code:14, Move window to workspace 1, movetoworkspace, 5
-bindd = SUPER SHIFT, code:15, Move window to workspace 1, movetoworkspace, 6
-bindd = SUPER SHIFT, code:16, Move window to workspace 1, movetoworkspace, 7
-bindd = SUPER SHIFT, code:17, Move window to workspace 1, movetoworkspace, 8
-bindd = SUPER SHIFT, code:18, Move window to workspace 1, movetoworkspace, 9
-bindd = SUPER SHIFT, code:19, Move window to workspace 1, movetoworkspace, 10
+bind = SUPER SHIFT, code:10, movetoworkspace, 1
+bind = SUPER SHIFT, code:11, movetoworkspace, 2
+bind = SUPER SHIFT, code:12, movetoworkspace, 3
+bind = SUPER SHIFT, code:13, movetoworkspace, 4
+bind = SUPER SHIFT, code:14, movetoworkspace, 5
+bind = SUPER SHIFT, code:15, movetoworkspace, 6
+bind = SUPER SHIFT, code:16, movetoworkspace, 7
+bind = SUPER SHIFT, code:17, movetoworkspace, 8
+bind = SUPER SHIFT, code:18, movetoworkspace, 9
+bind = SUPER SHIFT, code:19, movetoworkspace, 10

 # Swap active window with the one next to it with mainMod + SHIFT + arrow keys
-bindd = SUPER SHIFT, left, Swap window to the left, swapwindow, l
-bindd = SUPER SHIFT, right, Swap window to the right, swapwindow, r
-bindd = SUPER SHIFT, up, Swap window up, swapwindow, u
-bindd = SUPER SHIFT, down, Swap window down, swapwindow, d
-
-# Cycle through applications on active workspace
-bindd = ALT, Tab, Cycle to next window, cyclenext
-bindd = ALT, Tab, Reveal active window on top, bringactivetotop
+bind = SUPER SHIFT, left, swapwindow, l
+bind = SUPER SHIFT, right, swapwindow, r
+bind = SUPER SHIFT, up, swapwindow, u
+bind = SUPER SHIFT, down, swapwindow, d

 # Resize active window
-bindd = SUPER, minus, Expand window left, resizeactive, -100 0
-bindd = SUPER, equal, Shrink window left, resizeactive, 100 0
-bindd = SUPER SHIFT, minus, Shrink window up, resizeactive, 0 -100
-bindd = SUPER SHIFT, equal, Expand window down, resizeactive, 0 100
+bind = SUPER, minus, resizeactive, -100 0
+bind = SUPER, equal, resizeactive, 100 0
+bind = SUPER SHIFT, minus, resizeactive, 0 -100
+bind = SUPER SHIFT, equal, resizeactive, 0 100

 # Scroll through existing workspaces with mainMod + scroll
-bindd = SUPER, mouse_down, Scroll active worspace forward, workspace, e+1
-bindd = SUPER, mouse_up, Scroll active workspace backward, workspace, e-1
+bind = SUPER, mouse_down, workspace, e+1
+bind = SUPER, mouse_up, workspace, e-1

 # Move/resize windows with mainMod + LMB/RMB and dragging
-bindmd = SUPER, mouse:272, Move window, movewindow
-bindmd = SUPER, mouse:273, Resize window, resizewindow
+bindm = SUPER, mouse:272, movewindow
+bindm = SUPER, mouse:273, resizewindow
+
--- a/default/hypr/bindings/utilities.conf
+++ b/default/hypr/bindings/utilities.conf
@ -1,42 +1,32 @@
 # Launching
-bindd = SUPER, space, Launch apps, exec, walker
-bindd = SUPER, K, Show key bindings, exec, ~/.local/share/omarchy/bin/omarchy-menu-keybindings
+bind = SUPER, space, exec, pkill wofi || wofi --show drun --sort-order=alphabetical --style="$HOME/.local/share/omarchy/default/wofi/search.css"
+bind = SUPER, K, exec, ~/.local/share/omarchy/bin/omarchy-show-keybindings

 # Aesthetics
-bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, pkill -SIGUSR1 waybar
-bindd = SUPER CTRL, SPACE, Next background in theme, exec, ~/.local/share/omarchy/bin/omarchy-theme-bg-next
-bindd = SUPER SHIFT CTRL, SPACE, Pick new theme, exec, ~/.local/share/omarchy/bin/omarchy-theme-menu
+bind = SUPER SHIFT, SPACE, exec, pkill -SIGUSR1 waybar
+bind = SUPER CTRL, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-theme-bg-next
+bind = SUPER SHIFT CTRL, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-theme-menu

 # Notifications
-bindd = SUPER, comma, Dismiss last notification, exec, makoctl dismiss
-bindd = SUPER SHIFT, comma, Dismiss all notifications, exec, makoctl dismiss --all
-bindd = SUPER CTRL, comma, Toggle silencing notifications, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"
+bind = SUPER, comma, exec, makoctl dismiss
+bind = SUPER SHIFT, comma, exec, makoctl dismiss --all
+bind = SUPER CTRL, comma, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"

 # Power menu controls lock, suspend, relaunch, restart, shutdown
-bindd = SUPER, ESCAPE, Power menu, exec, ~/.local/share/omarchy/bin/omarchy-menu-power
+bind = SUPER, ESCAPE, exec, ~/.local/share/omarchy/bin/omarchy-power-menu

 # Toggle idling
-bindd = SUPER CTRL, I, Toggle locking on idle, exec, ~/.local/share/omarchy/bin/omarchy-toggle-idle
-
-# Toggle nightlight
-bindd = SUPER CTRL, N, Toggle nightlight, exec, ~/.local/share/omarchy/bin/omarchy-toggle-nightlight
+bind = SUPER CTRL, I, exec, ~/.local/share/omarchy/bin/omarchy-toggle-idle

 # Control Apple Display brightness
-bindd = CTRL, F1, Apple Display brightness down, exec, ~/.local/share/omarchy/bin/omarchy-cmd-apple-display-brightness -5000
-bindd = CTRL, F2, Apple Display brightness up, exec, ~/.local/share/omarchy/bin/omarchy-cmd-apple-display-brightness +5000
-bindd = SHIFT CTRL, F2, Apple Display full brightness, exec, ~/.local/share/omarchy/bin/omarchy-cmd-apple-display-brightness +60000
+bind = CTRL, F1, exec, ~/.local/share/omarchy/bin/omarchy-apple-display-brightness -5000
+bind = CTRL, F2, exec, ~/.local/share/omarchy/bin/omarchy-apple-display-brightness +5000
+bind = SHIFT CTRL, F2, exec, ~/.local/share/omarchy/bin/omarchy-apple-display-brightness +60000

 # Screenshots
-bindd = , PRINT, Screenshot of region, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot
-bindd = SHIFT, PRINT, Screenshot of window, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot window
-bindd = CTRL, PRINT, Screenshot of display, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot output
-
-# Screen recordings
-bindd = ALT, PRINT, Screen record a region, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenrecord
-bindd = CTRL ALT, PRINT, Screen record display, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenrecord output
-
-# Screensaver
-bindd = SUPER ALT, SPACE, Screensaver, exec, ~/.local/share/omarchy/bin/omarchy-launch-screensaver
+bind = , PRINT, exec, hyprshot -m region
+bind = SHIFT, PRINT, exec, hyprshot -m window
+bind = CTRL, PRINT, exec, hyprshot -m output

 # Color picker
-bindd = SUPER, PRINT, Color picker, exec, hyprpicker -a
+bind = SUPER, PRINT, exec, hyprpicker -a
--- a/default/hypr/envs.conf
+++ b/default/hypr/envs.conf
@ -3,8 +3,8 @@ env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24

 # Force all apps to use Wayland
-env = GDK_BACKEND,wayland,x11,*
-env = QT_QPA_PLATFORM,wayland;xcb
+env = GDK_BACKEND,wayland
+env = QT_QPA_PLATFORM,wayland
 env = QT_STYLE_OVERRIDE,kvantum
 env = SDL_VIDEODRIVER,wayland
 env = MOZ_ENABLE_WAYLAND,1
--- a/default/hypr/windows.conf
+++ b/default/hypr/windows.conf
@ -1,11 +1,32 @@
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 windowrule = suppressevent maximize, class:.*

-# Just dash of opacity by default
+# Force chromium into a tile to deal with --app bug
+windowrule = tile, class:^(Chromium)$
+
+# Float and center settings and previews
+windowrule = float, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$
+windowrule = size 800 600, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer)$
+windowrule = size 645 350, class:Omarchy
+windowrule = center, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$
+
+# Float and center file pickers
+windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
+windowrule = center, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
+
+# Float Steam, fullscreen RetroArch
+windowrule = float, class:^(steam)$
+windowrule = fullscreen, class:^(com.libretro.RetroArch)$
+
+# Just dash of opacity
 windowrule = opacity 0.97 0.9, class:.*
+windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$
+windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube
+windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv)$
+windowrule = opacity 1 1, class:^(com.libretro.RetroArch|steam)$

 # Fix some dragging issues with XWayland
 windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0

-# App-specific tweaks
-source = ~/.local/share/omarchy/default/hypr/apps.conf
+# Proper background blur for wofi
+layerrule = blur,wofi
--- a/default/plymouth/logo.png
+++ b/default/plymouth/logo.png
--- a/default/plymouth/omarchy.script
+++ b/default/plymouth/omarchy.script
@ -5,8 +5,8 @@ Window.SetBackgroundBottomColor(0.101, 0.105,  0.149);

 logo.image = Image("logo.png");
 logo.sprite = Sprite(logo.image);
-logo.sprite.SetX (Window.GetWidth()  / 2 - logo.image.GetWidth()  / 2);
-logo.sprite.SetY (Window.GetHeight() / 2 - logo.image.GetHeight() / 2);
+logo.sprite.SetX (Window.GetX() + Window.GetWidth()  / 2 - logo.image.GetWidth()  / 2);
+logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight() / 2);
 logo.sprite.SetOpacity (1);

 # Use these to adjust the progress bar timing
@ -119,7 +119,7 @@ entry.image = Image("entry.png");
 bullet.image = Image("bullet.png");

 entry.sprite = Sprite(entry.image);
-entry.x = Window.GetWidth()/2 - entry.image.GetWidth() / 2;
+entry.x = Window.GetX() + Window.GetWidth()/2 - entry.image.GetWidth() / 2;
 entry.y = logo.sprite.GetY() + logo.image.GetHeight() + 40;
 entry.sprite.SetPosition(entry.x, entry.y, 10001);
 entry.sprite.SetOpacity(0);
@ -171,13 +171,8 @@ fun display_password_callback (prompt, bullets)
    for (index = 0; bullet.sprites[index]; index++)
      bullet.sprites[index].SetOpacity(0);
    
-    # Create and show bullets for current password (max 21)
-    max_bullets = 21;
-    bullets_to_show = bullets;
-    if (bullets_to_show > max_bullets)
-      bullets_to_show = max_bullets;
-    
-    for (index = 0; index < bullets_to_show; index++)
+    # Create and show bullets for current password
+    for (index = 0; index < bullets; index++)
      {
        if (!bullet.sprites[index])
          {
@ -200,7 +195,7 @@ Plymouth.SetDisplayPasswordFunction(display_password_callback);
 progress_box.image = Image("progress_box.png");
 progress_box.sprite = Sprite(progress_box.image);

-progress_box.x = Window.GetWidth() / 2 - progress_box.image.GetWidth() / 2;
+progress_box.x = Window.GetX() + Window.GetWidth() / 2 - progress_box.image.GetWidth() / 2;
 progress_box.y = entry.y + entry.image.GetHeight() / 2 - progress_box.image.GetHeight() / 2;
 progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 0);
 progress_box.sprite.SetOpacity(0);
@ -209,7 +204,7 @@ progress_bar.original_image = Image("progress_bar.png");
 progress_bar.sprite = Sprite();
 progress_bar.image = progress_bar.original_image.Scale(1, progress_bar.original_image.GetHeight());

-progress_bar.x = Window.GetWidth() / 2 - progress_bar.original_image.GetWidth() / 2;
+progress_bar.x = Window.GetX() + Window.GetWidth() / 2 - progress_bar.original_image.GetWidth() / 2;
 progress_bar.y = progress_box.y + (progress_box.image.GetHeight() - progress_bar.original_image.GetHeight()) / 2;
 progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 1);
 progress_bar.sprite.SetOpacity(0);
--- a/default/walker/themes/dmenu_150.css
+++ b/default/walker/themes/dmenu_150.css
@ -1,2 +0,0 @@
-@import url("file://~/.local/share/omarchy/default/walker/themes/omarchy-default.css");
-@import url("file://~/.config/omarchy/current/theme/walker.css");
--- a/default/walker/themes/dmenu_150.toml
+++ b/default/walker/themes/dmenu_150.toml
@ -1,10 +0,0 @@
-[ui.window.box]
-width = 150
-
-[ui.window.box.scroll.list]
-max_width = 150
-min_width = 150
-width = 150
-
-[ui.window.box.search]
-hide = true
--- a/default/walker/themes/dmenu_250.css
+++ b/default/walker/themes/dmenu_250.css
@ -1,2 +0,0 @@
-@import url("file://~/.local/share/omarchy/default/walker/themes/omarchy-default.css");
-@import url("file://~/.config/omarchy/current/theme/walker.css");
--- a/default/walker/themes/dmenu_250.toml
+++ b/default/walker/themes/dmenu_250.toml
@ -1,11 +0,0 @@
-[ui.window.box]
-width = 250
-
-[ui.window.box.scroll.list]
-max_width = 250
-min_width = 250
-width = 250
-max_height = 600
-
-[ui.window.box.search]
-hide = true
--- a/default/walker/themes/keybindings.css
+++ b/default/walker/themes/keybindings.css
@ -1,2 +0,0 @@
-@import url("file://~/.local/share/omarchy/default/walker/themes/omarchy-default.css");
-@import url("file://~/.config/omarchy/current/theme/walker.css");
--- a/default/walker/themes/keybindings.toml
+++ b/default/walker/themes/keybindings.toml
@ -1,48 +0,0 @@
-[ui.window.box]
-width = 964
-min_width = 964
-max_width = 964
-
-height = 664
-min_height = 664
-max_height = 664
-
-[ui.window.box.search]
-hide = false
-
-[ui.window.box.scroll]
-v_align = "fill"
-h_align = "fill"
-min_width = 964
-width = 964
-max_width = 964
-min_height = 664
-height = 664
-max_height = 664
-
-[ui.window.box.scroll.list]
-v_align = "fill"
-h_align = "fill"
-min_width = 900
-width = 900
-max_width = 900
-min_height = 600
-height = 600
-max_height = 600
-
-[ui.window.box.scroll.list.item]
-h_align = "fill"
-min_width = 900
-width = 900
-max_width = 900
-
-[ui.window.box.scroll.list.item.activation_label]
-hide = true
-
-[ui.window.box.scroll.list.placeholder]
-v_align = "start"
-h_align = "fill"
-hide = false
-min_width = 900
-width = 900
-max_width = 900
--- a/default/walker/themes/omarchy-default.css
+++ b/default/walker/themes/omarchy-default.css
@ -1,166 +0,0 @@
-@import url("file://~/.config/omarchy/current/theme/walker.css");
-
-/* Reset all elements */
-#window,
-#box,
-#search,
-#password,
-#input,
-#prompt,
-#clear,
-#typeahead,
-#list,
-child,
-scrollbar,
-slider,
-#item,
-#text,
-#label,
-#sub,
-#activationlabel {
-  all: unset;
-}
-
-* {
-  font-family: 'CaskaydiaMono Nerd Font', monospace;
-  font-size: 18px;
-}
-
-/* Window */
-#window {
-  background: transparent;
-  color: @text;
-}
-
-/* Main box container */
-#box {
-  background: alpha(@base, 0.95);
-  padding: 20px;
-  border: 2px solid @border;
-  border-radius: 0px;
-}
-
-/* Search container */
-#search {
-  background: @base;
-  padding: 10px;
-  margin-bottom: 0;
-}
-
-/* Hide prompt icon */
-#prompt {
-  opacity: 0;
-  min-width: 0;
-  margin: 0;
-}
-
-/* Hide clear button */
-#clear {
-  opacity: 0;
-  min-width: 0;
-}
-
-/* Input field */
-#input {
-  background: none;
-  color: @text;
-  padding: 0;
-}
-
-#input placeholder {
-  opacity: 0.5;
-  color: @text;
-}
-
-/* Hide typeahead */
-#typeahead {
-  opacity: 0;
-}
-
-/* List */
-#list {
-  background: transparent;
-}
-
-/* List items */
-child {
-  padding: 0px 12px;
-  background: transparent;
-  border-radius: 0;
-}
-
-child:selected,
-child:hover {
-  background: transparent;
-}
-
-/* Item layout */
-#item {
-  padding: 0;
-}
-
-/* Icon */
-#icon {
-  margin-right: 10px;
-  -gtk-icon-transform: scale(0.7);
-}
-
-/* Text */
-#text {
-  color: @text;
-  padding: 14px 0;
-}
-
-#label {
-  font-weight: normal;
-}
-
-/* Selected state */
-child:selected #text,
-child:selected #label,
-child:hover #text,
-child:hover #label {
-  color: @selected-text;
-}
-
-/* Hide sub text */
-#sub {
-  opacity: 0;
-  font-size: 0;
-  min-height: 0;
-}
-
-/* Hide activation label */
-#activationlabel {
-  opacity: 0;
-  min-width: 0;
-}
-
-/* Scrollbar styling */
-scrollbar {
-  opacity: 0;
-}
-
-/* Hide spinner */
-#spinner {
-  opacity: 0;
-}
-
-/* Hide AI elements */
-#aiScroll,
-#aiList,
-.aiItem {
-  opacity: 0;
-  min-height: 0;
-}
-
-/* Bar entry (switcher) */
-#bar {
-  opacity: 0;
-  min-height: 0;
-}
-
-.barentry {
-  opacity: 0;
-}
-
--- a/default/walker/themes/omarchy-default.toml
+++ b/default/walker/themes/omarchy-default.toml
@ -1,16 +0,0 @@
-[ui.window.box]
-width = 664
-min_width = 664
-max_width = 664
-height = 396
-min_height = 396
-max_height = 396
-
-# List constraints are critical - without these, the window shrinks when empty
-[ui.window.box.scroll.list]
-height = 300
-min_height = 300
-max_height = 300
-
-[ui.window.box.scroll.list.item.icon]
-pixel_size = 40
--- a/default/wofi/search.css
+++ b/default/wofi/search.css
@ -0,0 +1,73 @@
+@import ".config/omarchy/current/theme/wofi.css";
+@import ".config/wofi/style.css";
+
+* {
+  font-family: 'CaskaydiaMono Nerd Font', monospace;
+  font-size: 18px;
+}
+
+window {
+  margin: 0px;
+  padding: 20px;
+  background-color: @base;
+  opacity: 0.95;
+}
+
+#inner-box {
+  margin: 0;
+  padding: 0;
+  border: none;
+  background-color: @base;
+}
+
+#outer-box {
+  margin: 0;
+  padding: 20px;
+  border: none;
+  background-color: @base;
+  border: 2px solid @border;
+}
+
+#scroll {
+  margin: 0;
+  padding: 0;
+  border: none;
+  background-color: @base;
+}
+
+#input {
+  margin: 0;
+  padding: 10px;
+  border: none;
+  background-color: @base;
+  color: @text;
+}
+
+#input:focus {
+  outline: none;
+  box-shadow: none;
+  border: none;
+}
+
+#text {
+  margin: 5px;
+  border: none;
+  color: @text;
+}
+
+#entry {
+  background-color: @base;
+}
+
+#entry:selected {
+  outline: none;
+  border: none;
+}
+
+#entry:selected #text {
+  color: @selected-text;
+}
+
+#entry image {
+  -gtk-icon-transform: scale(0.7);
+}
--- a/Show More
+++ b/Show More