Fix again

Reapply "Correct package name"
This reverts commit 8c2f51c08c.
2026-02-17 15:25:37 +00:00 · 2025-07-29 19:20:12 +02:00 · 2025-07-29 19:18:01 +02:00 · 2025-07-29 19:17:57 +02:00
186 changed files with 982 additions and 1889 deletions
--- a/applications/About.desktop
+++ b/applications/About.desktop
@@ -2,7 +2,7 @@
 Version=1.0
 Name=About
 Comment=System information from Fastfetch
-Exec=alacritty -o "font.size=9" --class=About --title=About -e bash -c 'fastfetch; read -n 1 -s'
+Exec=alacritty --class=About --title=About -e bash -c 'fastfetch; read -n 1 -s'
 Terminal=false
 Type=Application
 Icon=Arch
--- a/applications/omarchy.desktop
+++ b/applications/omarchy.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Omarchy
+Comment=Omarchy TUI
+Exec=alacritty --class=Omarchy --title=Omarchy -e bash -c '$HOME/.local/share/omarchy/bin/omarchy'
+Icon=Arch
+Terminal=false
+Categories=System;Utility;
+StartupNotify=false 
--- a/applications/wiremix.desktop
+++ b/applications/wiremix.desktop
@@ -2,6 +2,6 @@
 Name=Audio Settings
 Comment=Using Wiremix
 Exec=alacritty --class=Wiremix --title=Wiremix -e wiremix
-Icon=audio-headphones
+Icon=audio-card
 Type=Application
 Terminal=false
--- a/bin/omarchy
+++ b/bin/omarchy
@@ -0,0 +1,157 @@
+#!/bin/bash
+
+OMARCHY_VERSION=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null)
+PATH="$PATH:$HOME/.local/share/omarchy/bin"
+
+show_ascii_art() {
+  clear
+  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 640 --no-color expand
+  echo "                                                                          $OMARCHY_VERSION"
+}
+
+main_menu() {
+  show_ascii_art
+
+  local options=("Theme" "Font" "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) update_menu ;;
+  Setup) setup_menu ;;
+  Manual) open_manual ;;
+  Exit) clear && exit 0 ;;
+  esac
+}
+
+update_menu() {
+  show_ascii_art
+  local menu=("Omarchy" "Waybar" "Walker" "Plymouth" "SwayOSD" "Desktop apps" "Back")
+  local commands=(
+    "omarchy-update"
+    "omarchy-refresh-waybar"
+    "omarchy-refresh-walker"
+    "omarchy-refresh-plymouth"
+    "omarchy-refresh-swayosd"
+    "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 commands=(
+    "omarchy-theme-menu"
+    "install_theme_prompt"
+    "omarchy-theme-update"
+    "remove_theme_prompt"
+    "main_menu"
+  )
+  local choice
+  choice=$(printf "%s\n" "${menu[@]}" | gum choose --header="Theme") || 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
+}
+
+install_theme_prompt() {
+  local url
+  url=$(gum input --placeholder="Git repo URL for theme" --header="")
+  if [[ -n "$url" ]]; then
+    omarchy-theme-install "$url"
+  fi
+  theme_menu
+}
+
+remove_theme_prompt() {
+  local theme
+  theme=$(gum input --placeholder="Theme name" --header="")
+  if [[ -n "$theme" ]]; then
+    omarchy-theme-remove "$theme"
+  fi
+  theme_menu
+}
+
+setup_menu() {
+  show_ascii_art
+  local menu=("Dropbox" "Steam" "Docker DBs" "Fingerprint sensor" "Fido2 device" "Back")
+  local commands=(
+    "omarchy-setup-dropbox"
+    "omarchy-setup-steam"
+    "setup_docker_dbs"
+    "omarchy-setup-fingerprint"
+    "omarchy-setup-fido2"
+    "main_menu"
+  )
+  local choice
+  choice=$(printf "%s\n" "${menu[@]}" | gum choose --header="Setup") || 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
+}
+
+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
+}
+
+ack_command() {
+  gum spin --spinner "globe" --title "Done!" -- sleep 1
+}
+
+main_menu
--- 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,5 +1,7 @@
 #!/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}}"

--- a/bin/omarchy-cmd-screensaver
+++ b/bin/omarchy-cmd-screensaver
@@ -1,20 +1,10 @@
 #!/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" &
+trap "exit" SIGINT

-    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
+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 0 --anchor-canvas c --anchor-text c \
+    "$effect"
+done
--- a/bin/omarchy-dev-add-migration
+++ b/bin/omarchy-dev-add-migration
@@ -4,3 +4,4 @@ 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
+echo -e "Run with:\nsource $migration_file"
--- a/bin/omarchy-font-current
+++ b/bin/omarchy-font-current
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-grep -oP 'family\s*=\s*"\K[^"]+' ~/.config/alacritty/alacritty.toml | head -n1
--- a/bin/omarchy-font-list
+++ b/bin/omarchy-font-list
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fc-list :spacing=100 -f "%{family[0]}\n" | grep -v -i -E 'emoji|signwriting' | sort -u
--- a/bin/omarchy-font-menu
+++ b/bin/omarchy-font-menu
@@ -0,0 +1,12 @@
+#!/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-font-set
+++ b/bin/omarchy-font-set
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-font_name="$1"
-
-if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
-  if fc-list | grep -iq "$font_name"; then
-    sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
-    sed -i "s/font-family: .*/font-family: $font_name;/g" ~/.config/waybar/style.css
-    sed -i "s/font-family: .*/font-family: $font_name;/g" ~/.config/swayosd/style.css
-    xmlstarlet ed -L \
-      -u '//match[@target="pattern"][test/string="monospace"]/edit[@name="family"]/string' \
-      -v "$font_name" \
-      ~/.config/fontconfig/fonts.conf
-
-    omarchy-restart-waybar
-    omarchy-restart-swayosd
-    omarchy-restart-walker
-  else
-    echo "Font '$font_name' not found."
-    exit 1
-  fi
-else
-  echo "Usage: omarchy-font-set <font-name>"
-fi
--- a/bin/omarchy-install-dev-env
+++ b/bin/omarchy-install-dev-env
@@ -1,111 +0,0 @@
-#!/bin/bash
-
-if [[ -z "$1" ]]; then
-  echo "Usage: omarchy-instal-dev-env <ruby|node|bun|go|laravel|symfony|php|python|elixir|rust|java|ocaml|dotnet>" >&2
-  exit 1
-fi
-
-install_php() {
-  yay -Sy php composer php-sqlite --noconfirm
-
-  # Install Path for Composer
-  if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then
-    echo 'export PATH="$HOME/.config/composer/vendor/bin:$PATH"' >>"$HOME/.bashrc"
-    source "$HOME/.bashrc"
-    echo "Added Composer global bin directory to PATH."
-  else
-    echo "Composer global bin directory already in PATH."
-  fi
-
-  # Enable some extensions
-  local php_ini_path="/etc/php/php.ini"
-  local extensions_to_enable=(
-    "bcmath"
-    "intl"
-    "iconv"
-    "openssl"
-    "pdo_sqlite"
-    "pdo_mysql"
-  )
-
-  for ext in "${extensions_to_enable[@]}"; do
-    sudo sed -i "s/^;extension=${ext}/extension=${ext}/" "$php_ini_path"
-  done
-}
-
-case "$1" in
-ruby)
-  echo -e "Installing Ruby on Rails...\n"
-  mise use --global ruby@latest
-  mise settings add idiomatic_version_file_enable_tools ruby
-  mise x ruby -- gem install rails --no-document
-  echo -e "\nYou can now run: rails new myproject"
-  ;;
-node)
-  echo -e "Installing Node.js...\n"
-  mise use --global node@lts
-  ;;
-bun)
-  echo -e "Installing Bun...\n"
-  mise use -g bun@latest
-  ;;
-deno)
-  echo -e "Installing Deno...\n"
-  mise use -g deno@latest
-  ;;
-go)
-  echo -e "Installing Go...\n"
-  mise use --global go@latest
-  ;;
-php)
-  echo -e "Installing PHP...\n"
-  install_php
-  ;;
-laravel)
-  echo -e "Installing PHP and Laravel...\n"
-  install_php
-  composer global require laravel/installer
-  echo -e "\nYou can now run: laravel new myproject"
-  ;;
-symfony)
-  echo -e "Installing PHP and Symfony...\n"
-  install_php
-  yay -S symfony-cli --noconfirm
-  echo -e "\nYou can now run: symfony new --webapp myproject"
-  ;;
-python)
-  echo -e "Installing Python...\n"
-  mise use --global python@latest
-  echo -e "\nInstalling uv...\n"
-  wget -qO- https://astral.sh/uv/install.sh | sh
-  ;;
-elixir)
-  echo -e "Installing Elixir...\n"
-  mise use --global erlang@latest
-  mise use --global elixir@latest
-  mise x elixir -- mix local.hex --force
-  ;;
-rust)
-  echo -e "Installing Rust...\n"
-  bash -c "$(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs)" -- -y
-  ;;
-java)
-  echo -e "Installing Java...\n"
-  mise use --global java@latest
-  ;;
-zig)
-  echo -e "Installing Zig...\n"
-  mise use --global zig@latest
-  ;;
-ocaml)
-  echo -e "Installing OCaml...\n"
-  bash -c "$(curl -fsSL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh)"
-  opam init --yes
-  eval "$(opam env)"
-  opam install ocaml-lsp-server odoc ocamlformat utop --yes
-  ;;
-dotnet)
-  echo -e "Installing .NET...\n"
-  mise use --global dotnet@latest
-  ;;
-esac
--- a/bin/omarchy-install-docker-dbs
+++ b/bin/omarchy-install-docker-dbs
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-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
--- a/bin/omarchy-install-tailscale
+++ b/bin/omarchy-install-tailscale
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-curl -fsSL https://tailscale.com/install.sh | sh
-
-echo -e "\nStarting Tailscale..."
-sudo tailscale up --accept-routes
-
-omarchy-webapp-install "Tailscale" "https://login.tailscale.com/admin/machines" https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tailscale-light.png
--- a/bin/omarchy-launch-screensaver
+++ b/bin/omarchy-launch-screensaver
@@ -1,16 +1,5 @@
 #!/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 \
-    --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
-    -e omarchy-cmd-screensaver
-done
-
-hyprctl dispatch focusmonitor $focused
+pkill -f "alacritty --class Screensaver" ||
+  alacritty --class Screensaver --title Screensaver -o 'colors.primary.background="#000000"' \
+    -e ~/.local/share/omarchy/bin/omarchy-cmd-screensaver
--- a/bin/omarchy-lock-screen
+++ b/bin/omarchy-lock-screen
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Lock the screen
-pidof hyprlock || hyprlock &
-
-# Ensure 1password is locked
-if pgrep -x "1password" >/dev/null; then
-  1password --lock &
-fi
-
-# Avoid running screensaver when locked
-pkill -f "alacritty --class Screensaver"
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -1,367 +0,0 @@
-#!/bin/bash
-
-export PATH="$HOME/.local/share/omarchy/bin:$PATH"
-
-menu() {
-  local prompt="$1"
-  local options="$2"
-  local extra="$3"
-  local preselect="$4"
-
-  read -r -a args <<<"$extra"
-
-  if [[ -n "$preselect" ]]; then
-    local index
-    index=$(echo -e "$options" | grep -nxF "$preselect" | cut -d: -f1)
-    if [[ -n "$index" ]]; then
-      args+=("-a" "$index")
-    fi
-  fi
-
-  echo -e "$options" | walker --dmenu --theme dmenu_250 -p "$prompt…" "${args[@]}"
-}
-
-terminal() {
-  alacritty --class Omarchy -e $1
-}
-
-present_terminal() {
-  alacritty --class Omarchy -e bash -c "omarchy-show-logo; eval \"$1\"; omarchy-show-done;"
-}
-
-edit_in_nvim() {
-  notify-send "Editing config file" "$1"
-  alacritty -e nvim "$1"
-}
-
-open_web() {
-  setsid chromium --new-window --app="$1" &
-}
-
-install() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm $2"
-}
-
-install_and_launch() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm $2 && setsid gtk-launch $3"
-}
-
-install_font() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
-}
-
-show_learn_menu() {
-  case $(menu "Learn" "  Keybindings\n  Omarchy\n  Hyprland\n󰣇  Arch\n  Neovim\n󱆃  Bash") in
-  *Keybindings*) omarchy-menu-keybindings ;;
-  *Omarchy*) open_web "https://manuals.omamix.org/2/the-omarchy-manual" ;;
-  *Hyprland*) open_web "https://wiki.hypr.land/" ;;
-  *Arch*) open_web "https://wiki.archlinux.org/title/Main_page" ;;
-  *Bash*) open_web "https://devhints.io/bash" ;;
-  *Neovim*) open_web "https://www.lazyvim.org/keymaps" ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_style_menu() {
-  case $(menu "Style" "󰸌  Theme\n  Font\n  Background") in
-  *Theme*) show_theme_menu ;;
-  *Font*) show_font_menu ;;
-  *Background*) omarchy-theme-bg-next ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_theme_menu() {
-  theme=$(menu "Theme" "$(omarchy-theme-list)" "" "$(omarchy-theme-current)")
-  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    show_main_menu
-  else
-    omarchy-theme-set "$theme"
-  fi
-}
-
-show_font_menu() {
-  theme=$(menu "Font" "$(omarchy-font-list)" "-w 350" "$(omarchy-font-current)")
-  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    show_main_menu
-  else
-    omarchy-font-set "$theme"
-  fi
-}
-
-show_capture_menu() {
-  case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰃉  Color") in
-  *Screenshot*) show_screenshot_menu ;;
-  *Screenrecord*) show_screenrecord_menu ;;
-  *Color*) pkill hyprpicker || hyprpicker -a ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_screenshot_menu() {
-  case $(menu "Screenshot" "  Region\n  Window\n  Display") in
-  *Region*) omarchy-cmd-screenshot ;;
-  *Window*) omarchy-cmd-screenshot window ;;
-  *Display*) omarchy-cmd-screenshot output ;;
-  *) show_capture_menu ;;
-  esac
-}
-
-show_screenrecord_menu() {
-  case $(menu "Screenrecord" "  Region\n  Display") in
-  *Region*) omarchy-cmd-screenrecord ;;
-  *Display*) omarchy-cmd-screenrecord output ;;
-  *) show_capture_menu ;;
-  esac
-}
-
-show_toggle_menu() {
-  case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar") in
-  *Screensaver*) omarchy-launch-screensaver ;;
-  *Nightlight*) omarchy-toggle-nightlight ;;
-  *Idle*) omarchy-toggle-idle ;;
-  *Bar*) pkill -SIGUSR1 waybar ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_setup_menu() {
-  local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n󰍹  Monitors"
-  [ -f ~/.config/hypr/bindings.conf ] && options="$options\n  Keybindings"
-  [ -f ~/.config/hypr/input.conf ] && options="$options\n  Input"
-  options="$options\n  Config\n󰈷  Fingerprint\n  Fido2"
-
-  case $(menu "Setup" "$options") in
-  *Audio*) alacritty --class=Wiremix -e wiremix ;;
-  *Wifi*) alacritty --class=Impala -e impala ;;
-  *Bluetooth*) blueberry ;;
-  *Power*) show_setup_power_menu ;;
-  *Monitors*) edit_in_nvim ~/.config/hypr/monitors.conf ;;
-  *Keybindings*) edit_in_nvim ~/.config/hypr/bindings.conf ;;
-  *Input*) edit_in_nvim ~/.config/hypr/input.conf ;;
-  *Config*) show_setup_config_menu ;;
-  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
-  *Fido2*) present_terminal omarchy-setup-fido2 ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_setup_power_menu() {
-  profile=$(menu "Power Profile" "$(omarchy-powerprofiles-list)" "" "$(powerprofilesctl get)")
-
-  if [[ "$profile" == "CNCLD" || -z "$profile" ]]; then
-    show_main_menu
-  else
-    powerprofilesctl set "$profile"
-  fi
-}
-
-show_setup_config_menu() {
-  case $(menu "Setup" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar\n󰞅  XCompose") in
-  *Hyprland*) edit_in_nvim ~/.config/hypr/hyprland.conf ;;
-  *Hypridle*) edit_in_nvim ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
-  *Hyprlock*) edit_in_nvim ~/.config/hypr/hyprlock.conf ;;
-  *Hyprsunset*) edit_in_nvim ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
-  *Swayosd*) edit_in_nvim ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
-  *Walker*) edit_in_nvim ~/.config/walker/config.toml && omarchy-restart-walker ;;
-  *Waybar*) edit_in_nvim ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
-  *XCompose*) edit_in_nvim ~/.XCompose && omarchy-restart-xcompose ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n  Web App\n  Service\n  Style\n󰵮  Development\n  Editor\n󱚤  AI\n  Gaming") in
-  *Package*) terminal omarchy-pkg-install ;;
-  *Web*) present_terminal omarchy-webapp-install ;;
-  *Service*) show_install_service_menu ;;
-  *Style*) show_install_style_menu ;;
-  *Development*) show_install_development_menu ;;
-  *Editor*) show_install_editor_menu ;;
-  *AI*) show_install_ai_menu ;;
-  *Gaming*) show_install_gaming_menu ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale") in
-  *Dropbox*) present_terminal omarchy-install-dropbox ;;
-  *Tailscale*) present_terminal omarchy-install-tailscale ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix") in
-  *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
-  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
-  *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
-  *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
-  *Helix*) install "Helix" "helix" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_ai_menu() {
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
-  *Claude*) install "Claude Code" "claude-code" ;;
-  *Gemini*) install "Gemini" "gemini-cli-bin" ;;
-  *Studio*) install "LM Studio" "lmstudio" ;;
-  *Ollama*) install "Ollama" "ollama" ;;
-  *Crush*) install "Crush" "crush-bin" ;;
-  *opencode*) install "opencode" "opencode-bin" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch\n󰍳  Minecraft") in
-  *Steam*) present_terminal omarchy-install-steam ;;
-  *RetroArch*) install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
-  *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_style_menu() {
-  case $(menu "Install" "󰸌  Theme\n  Background\n  Font") in
-  *Theme*) present_terminal omarchy-theme-install ;;
-  *Background*) nautilus ~/.config/omarchy/current/theme/backgrounds ;;
-  *Font*) show_install_font_menu ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_font_menu() {
-  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono" "-w 350") in
-  *Meslo*) install_font "Meslo LG Mono" "ttf-meslo-nerd" "MesloLGL Nerd Font" ;;
-  *Fira*) install_font "Fira Code" "ttf-firacode-nerd" "FiraCode Nerd Font" ;;
-  *Victor*) install_font "Victor Code" "ttf-victor-mono-nerd" "VictorMono Nerd Font" ;;
-  *Bistream*) install_font "Bistream Vera Code" "ttf-bitstream-vera-mono-nerd" "BitstromWera Nerd Font" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_development_menu() {
-  case $(menu "Install" "󰫏  Ruby on Rails\n  Docker DB\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml") in
-  *Rails*) present_terminal "omarchy-install-dev-env ruby" ;;
-  *Docker*) present_terminal omarchy-install-docker-dbs ;;
-  *JavaScript*) show_install_javascript_menu ;;
-  *Go*) present_terminal "omarchy-install-dev-env go" ;;
-  *PHP*) show_install_php_menu ;;
-  *Python*) present_terminal "omarchy-install-dev-env python" ;;
-  *Elixir*) present_terminal "omarchy-install-dev-env elixir" ;;
-  *Zig*) present_terminal "omarchy-install-dev-env zig" ;;
-  *Rust*) present_terminal "omarchy-install-dev-env rust" ;;
-  *Java*) present_terminal "omarchy-install-dev-env java" ;;
-  *NET*) present_terminal "omarchy-install-dev-env dotnet" ;;
-  *OCaml*) present_terminal "omarchy-install-dev-env ocaml" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_javascript_menu() {
-  case $(menu "Install" "  Node.js\n  Bun\n  Deno") in
-  *Node*) present_terminal "omarchy-install-dev-env node" ;;
-  *Bun*) present_terminal "omarchy-install-dev-env bun" ;;
-  *Deno*) present_terminal "omarchy-install-dev-env deno" ;;
-  *) show_install_development_menu ;;
-  esac
-}
-
-show_install_php_menu() {
-  case $(menu "Install" "  PHP\n  Laravel\n  Symfony") in
-  *PHP*) present_terminal "omarchy-install-dev-env php" ;;
-  *Laravel*) present_terminal "omarchy-install-dev-env laravel" ;;
-  *Symfony*) present_terminal "omarchy-install-dev-env symfony" ;;
-  *) show_install_development_menu ;;
-  esac
-}
-
-show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n󰸌  Theme\n󰈷  Fingerprint\n  Fido2") in
-  *Package*) terminal omarchy-pkg-remove ;;
-  *Web*) present_terminal omarchy-webapp-remove ;;
-  *Theme*) present_terminal omarchy-theme-remove ;;
-  *Fingerprint*) present_terminal "omarchy-setup-fingerprint --remove" ;;
-  *Fido2*) present_terminal "omarchy-setup-fido2 --remove" ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_update_menu() {
-  case $(menu "Update" "󰣇  Omarchy\n  Config\n󰸌  Themes\n  Process\n  Timezone") in
-  *Omarchy*) present_terminal omarchy-update ;;
-  *Config*) show_update_config_menu ;;
-  *Themes*) present_terminal omarchy-theme-update ;;
-  *Process*) show_update_process_menu ;;
-  *Timezone*) omarchy-cmd-tzupdate ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_update_process_menu() {
-  case $(menu "Restart" "  Hypridle\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
-  *Hypridle*) omarchy-restart-hypridle ;;
-  *Hyprsunset*) omarchy-restart-hyprsunset ;;
-  *Swayosd*) omarchy-restart-swayosd ;;
-  *Walker*) omarchy-restart-walker ;;
-  *Waybar*) omarchy-restart-waybar ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_update_config_menu() {
-  case $(menu "Use default config" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n󱣴  Plymouth\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
-  *Hyprland*) present_terminal omarchy-refresh-hyprland ;;
-  *Hypridle*) present_terminal omarchy-refresh-hypridle ;;
-  *Hyprlock*) present_terminal omarchy-refresh-hyprlock ;;
-  *Hyprsunset*) present_terminal omarchy-refresh-hyprsunset ;;
-  *Plymouth*) present_terminal omarchy-refresh-plymouth ;;
-  *Swayosd*) present_terminal omarchy-refresh-swayosd ;;
-  *Walker*) present_terminal omarchy-refresh-walker ;;
-  *Waybar*) present_terminal omarchy-refresh-waybar ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_system_menu() {
-  case $(menu "System" "  Lock\n󰤄  Suspend\n  Relaunch\n󰜉  Restart\n󰐥  Shutdown") in
-  *Lock*) omarchy-lock-screen ;;
-  *Suspend*) systemctl suspend ;;
-  *Relaunch*) uwsm stop ;;
-  *Restart*) systemctl reboot ;;
-  *Shutdown*) systemctl poweroff ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_main_menu() {
-  go_to_menu "$(menu "Go" "󰀻  Apps\n󰧑  Learn\n  Capture\n󰔎  Toggle\n  Style\n  Setup\n󰉉  Install\n󰭌  Remove\n  Update\n  About\n  System")"
-}
-
-go_to_menu() {
-  case "${1,,}" in
-  *apps*) walker -p "Launch…" ;;
-  *learn*) show_learn_menu ;;
-  *style*) show_style_menu ;;
-  *theme*) show_theme_menu ;;
-  *capture*) show_capture_menu ;;
-  *screenshot*) show_screenshot_menu ;;
-  *screenrecord*) show_screenrecord_menu ;;
-  *toggle*) show_toggle_menu ;;
-  *setup*) show_setup_menu ;;
-  *install*) show_install_menu ;;
-  *remove*) show_remove_menu ;;
-  *update*) show_update_menu ;;
-  *system*) show_system_menu ;;
-  *about*) gtk-launch About.desktop ;;
-  esac
-}
-
-if [[ -n "$1" ]]; then
-  go_to_menu "$1"
-else
-  show_main_menu
-fi
--- a/bin/omarchy-menu-keybindings
+++ b/bin/omarchy-menu-keybindings
@@ -3,47 +3,34 @@
 # 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,/'
-}
+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/media.conf"

-# 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() {
+# 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;

@@ -51,36 +38,27 @@ parse_bindings() {
    gsub(/^[ \t]*\+?[ \t]*/, "", key_combo);
    gsub(/[ \t]+$/, "", key_combo);

-    # Use description, if set
-    action = $3;
+    # Reconstruct the command from the remaining fields
+    action = "";
+    for (i = 3; i <= NF; i++) {
+        action = action $i (i < NF ? "," : "");
+    }

-    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
+    # 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 != "") {
        # 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
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+show_power_menu() {
+  # The first characters are invisible sort keys.
+  local menu_options="\u200B Lock
+\u200C󰤄 Suspend
+\u200D Relaunch
+\u2060󰜉 Restart
+\u2063󰐥 Shutdown"
+  local selection=$(echo -e "$menu_options" | walker --dmenu --theme dmenu_150)
+
+  case "$selection" in
+  *Lock*) hyprlock ;;
+  *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-pkg-install
+++ b/bin/omarchy-pkg-install
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-fzf_args=(
-  --multi
-  --preview 'echo "alt-p: toggle description, alt-j/k: scroll, F11: maximize"; echo; yay -Sii {1}'
-  --preview-window 'down:65%:wrap'
-  --bind 'alt-p:toggle-preview'
-  --bind 'alt-d:preview-half-page-down,alt-u:preview-half-page-up'
-  --bind 'alt-k:preview-up,alt-j:preview-down'
-)
-
-pkg_name=$(yay -Slq | fzf "${fzf_args[@]}")
-
-if [[ -n "$pkg_name" ]]; then
-  yay -Sy --noconfirm "$pkg_name"
-  sudo updatedb
-  omarchy-show-done
-fi
--- a/bin/omarchy-pkg-remove
+++ b/bin/omarchy-pkg-remove
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-fzf_args=(
-  --multi
-  --preview 'echo "alt-p: toggle description, alt-j/k: scroll, F11: maximize"; echo; yay -Qi {1}'
-  --preview-window 'down:65%:wrap'
-  --bind 'alt-p:toggle-preview'
-  --bind 'alt-d:preview-half-page-down,alt-u:preview-half-page-up'
-  --bind 'alt-k:preview-up,alt-j:preview-down'
-)
-
-pkg_name=$(yay -Qqe | fzf "${fzf_args[@]}")
-
-if [[ -n "$pkg_name" ]]; then
-  yay -Rns --noconfirm "$pkg_name"
-  sudo updatedb
-  omarchy-show-done
-fi
--- a/bin/omarchy-powerprofiles-list
+++ b/bin/omarchy-powerprofiles-list
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-powerprofilesctl list |
-  awk '/^\s*[* ]\s*[a-zA-Z0-9\-]+:$/ { gsub(/^[*[:space:]]+|:$/,""); print }' |
-  tac
--- a/bin/omarchy-refresh-config
+++ b/bin/omarchy-refresh-config
@@ -1,40 +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)"
-
-if [[ -f "$user_config_file" ]]; then
-  # 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" || true
-  fi
-else
-  # Config file did not exist already
-  cp -f "$default_config_file" "$user_config_file" 2>/dev/null
-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-hyprland
+++ b/bin/omarchy-refresh-hyprland
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-omarchy-refresh-config hypr/autostart.conf
-omarchy-refresh-config hypr/bindings.conf
-omarchy-refresh-config hypr/envs.conf
-omarchy-refresh-config hypr/input.conf
-omarchy-refresh-config hypr/hyprland.conf
--- a/bin/omarchy-refresh-hyprlock
+++ b/bin/omarchy-refresh-hyprlock
@@ -1,3 +1,11 @@
 #!/bin/bash

-omarchy-refresh-config hypr/hyprlock.conf
+# Overwrite local Hyprlock settings with the latest in Omarchy, but create a backup if it differs
+cp -f ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak 2>/dev/null
+cp -f ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/ 2>/dev/null
+
+if cmp -s ~/.config/hypr/hyprlock.conf.bak ~/.config/hypr/hyprlock.conf; then
+  rm ~/.config/hypr/hyprlock.conf.bak
+else
+  echo -e "\e[31mExisting .config/hypr/hyprlock.conf replaced with new Omarchy default, but a .bak file was made.\e[0m"
+fi
--- 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-swayosd
+++ b/bin/omarchy-refresh-swayosd
@@ -1,5 +1,13 @@
 #!/bin/bash

-omarchy-refresh-config swayosd/config.toml
-omarchy-refresh-config swayosd/style.css
-omarchy-restart-swayosd
+cp -f ~/.config/swayosd/config.toml ~/.config/swayosd/config.toml.bak 2>/dev/null
+cp -f ~/.local/share/omarchy/config/swayosd/config.toml ~/.config/swayosd/ 3>/dev/null
+
+if cmp -s ~/.config/swayosd/config.toml.bak ~/.config/swayosd/config.toml; then
+  rm ~/.config/swayosd//config.toml.bak
+else
+  echo -e "\e[31mExisting .config/swayosd/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m"
+fi
+
+pkill swayosd-server
+setsid uwsm app -- swayosd-server &>/dev/null &
--- a/bin/omarchy-refresh-walker
+++ b/bin/omarchy-refresh-walker
@@ -1,4 +1,13 @@
 #!/bin/bash

-omarchy-refresh-config walker/config.toml
-omarchy-restart-walker
+cp -f ~/.config/walker/config.toml ~/.config/walker/config.toml.bak 2>/dev/null
+cp -f ~/.local/share/omarchy/config/walker/config.toml ~/.config/walker/ 2>/dev/null
+
+if cmp -s ~/.config/walker/config.toml.bak ~/.config/walker/config.toml; then
+  rm ~/.config/walker/config.toml.bak
+else
+  echo -e "\e[31mExisting .config/walker/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m"
+fi
+
+pkill walker
+setsid uwsm app -- walker --gapplication-service &
--- a/bin/omarchy-refresh-waybar
+++ b/bin/omarchy-refresh-waybar
@@ -1,5 +1,25 @@
 #!/bin/bash

-omarchy-refresh-config waybar/config.jsonc
-omarchy-refresh-config waybar/style.css
-omarchy-restart-waybar
+# Backup existing settings
+cp -f ~/.config/waybar/config.jsonc ~/.config/waybar/config.jsonc.bak 2>/dev/null
+cp -f ~/.config/waybar/style.css ~/.config/waybar/style.css.bak 2>/dev/null
+
+# Overwrite local waybar settings with the latest in Omarchy
+cp -f ~/.local/share/omarchy/config/waybar/config.jsonc ~/.config/waybar/ 2>/dev/null
+cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
+
+# Remove identical backup files
+if cmp -s ~/.config/waybar/config.jsonc.bak ~/.config/waybar/config.jsonc; then
+  rm ~/.config/waybar/config.jsonc.bak
+else
+  echo -e "\e[31mExisting .config/waybar/config.jsonc replaced with new Omarchy default, but a .bak file was made.\e[0m"
+fi
+
+if cmp -s ~/.config/waybar/style.css.bak ~/.config/waybar/style.css; then
+  rm ~/.config/waybar/style.css.bak
+else
+  echo -e "\e[31mExisting .config/waybar/style.css replaced with new Omarchy default, but a .bak file was made.\e[0m"
+fi
+
+# Restart waybar
+pkill -SIGUSR2 waybar
--- 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-install-dropbox
+++ b/bin/omarchy-install-dropbox
--- a/bin/omarchy-setup-fido2
+++ b/bin/omarchy-setup-fido2
@@ -1,13 +1,11 @@
 #!/bin/bash

 if [[ "--remove" == "$1" ]]; then
-  echo -e "\e[32mLet's remove your Fido2 device from sudo authentication.\n\e[0m"
  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
-  echo -e "\e[32mLet's setup your Fido2 device for sudo authentication.\n\e[0m"
  yay -S --noconfirm --needed libfido2 pam-u2f

  tokens=$(fido2-token -L)
@@ -20,10 +18,6 @@ else
      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
-      if [ $? -ne 0 ]; then
-        echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
-        exit 1
-      fi
      sudo mv /tmp/fido2 /etc/fido2/fido2
    fi

--- a/bin/omarchy-setup-fingerprint
+++ b/bin/omarchy-setup-fingerprint
@@ -1,13 +1,11 @@
 #!/bin/bash

 if [[ "--remove" == "$1" ]]; then
-  echo -e "\e[32mLet's remove your fingerprint scanner from authentication.\n\e[0m"
  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
-  echo -e "\e[32mLet's setup your fingerprint scanner for authentication.\n\e[0m"
  yay -S --noconfirm --needed fprintd usbutils

  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix'; then
--- a/bin/omarchy-install-steam
+++ b/bin/omarchy-install-steam
@@ -6,4 +6,4 @@ sudo pacman -Sy

 echo "Now pick dependencies matching your graphics card"
 yay -S steam
-setsid gtk-launch steam >/dev/null 2>&1 &
+gtk-launch steam >/dev/null 2>&1 &
--- a/bin/omarchy-show-done
+++ b/bin/omarchy-show-done
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo
-gum spin --spinner "globe" --title "Done! Press any key to close..." -- bash -c 'read -n 1 -s'
--- a/bin/omarchy-show-logo
+++ b/bin/omarchy-show-logo
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-clear
-echo -e "\033[32m"
-cat <~/.local/share/omarchy/logo.txt
-echo -e "\033[0m"
-echo
--- a/bin/omarchy-state
+++ b/bin/omarchy-state
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-STATE_DIR="$HOME/.local/state/omarchy"
-mkdir -p "$STATE_DIR"
-
-COMMAND="$1"
-STATE_NAME="$2"
-
-if [[ -z "$COMMAND" ]]; then
-  echo "Usage: omarchy-state <set|clear> <state-name-or-pattern>"
-  exit 1
-fi
-
-if [[ -z "$STATE_NAME" ]]; then
-  echo "Usage: omarchy-state $COMMAND <state-name>"
-  exit 1
-fi
-
-case "$COMMAND" in
-set) touch "$STATE_DIR/$STATE_NAME" ;;
-clear) find "$STATE_DIR" -maxdepth 1 -type f -name "$STATE_NAME" -delete ;;
-esac
--- a/bin/omarchy-theme-current
+++ b/bin/omarchy-theme-current
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-basename "$(realpath "$HOME/.config/omarchy/current/theme")" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'
--- a/bin/omarchy-theme-install
+++ b/bin/omarchy-theme-install
@@ -4,16 +4,11 @@
 # Usage: omarchy-theme-install <git-repo-url>

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

+REPO_URL="$1"
 THEMES_DIR="$HOME/.config/omarchy/themes"
 THEME_NAME=$(basename "$REPO_URL" .git | sed -E 's/^omarchy-//; s/-theme$//')
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
--- a/bin/omarchy-theme-list
+++ b/bin/omarchy-theme-list
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-find ~/.config/omarchy/themes/ -mindepth 1 -maxdepth 1 \( -type d -o -type l \) | sort | while read -r path; do
-  echo "$(basename "$path" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g')"
-done
--- a/bin/omarchy-theme-menu
+++ b/bin/omarchy-theme-menu
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+THEMES_DIR="$HOME/.config/omarchy/themes/"
+CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
+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
+    filename=$(basename "$path")
+    display_name=$(echo "$filename" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g')
+
+    if [[ "$filename" == "$CURRENT_THEME_NAME" ]]; then
+      echo "<i>$display_name</i>"
+    else
+      echo "$display_name"
+    fi
+  done
+)
+
+# Show Walker menu
+selection=$(printf '%s\n' "${themes[@]}" | walker --dmenu --theme dmenu_250 2>/dev/null)
+
+# Remove any Pango markup before converting back to filename
+clean_selection=$(echo "$selection" | sed -E 's/<[^>]+>//g')
+
+# Convert to lowercase and dash-separated: "Tokyo Night" -> "tokyo-night"
+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")

-omarchy-theme-set $NEW_THEME_NAME
+"$HOME/.local/share/omarchy/bin/omarchy-theme-set" $NEW_THEME_NAME
 notify-send "Theme changed to $NEW_THEME_NAME" -t 2000
--- a/bin/omarchy-theme-remove
+++ b/bin/omarchy-theme-remove
@@ -4,37 +4,30 @@
 # Usage: omarchy-theme-remove <theme-name>

 if [ -z "$1" ]; then
-  mapfile -t extra_themes < <(find ~/.config/omarchy/themes -mindepth 1 -maxdepth 1 -type d ! -xtype l -printf '%f\n')
-
-  if [[ ${#extra_themes[@]} -gt 0 ]]; then
-    THEME_NAME=$(gum choose --header="Remove extra theme" "${extra_themes[@]}")
-  else
-    echo "No extra themes installed."
-    exit 1
-  fi
-else
-  THEME_NAME="$1"
-fi
-
-THEMES_DIR="$HOME/.config/omarchy/themes"
-CURRENT_DIR="$HOME/.config/omarchy/current"
-THEME_PATH="$THEMES_DIR/$THEME_NAME"
-
-# Ensure a theme was set
-if [ -z "$THEME_NAME" ]; then
+  echo "Usage: omarchy-theme-remove <theme-name>"
  exit 1
 fi

+THEME_NAME="$1"
+THEMES_DIR="$HOME/.config/omarchy/themes"
+BACKGROUND_DIR="$HOME/.config/omarchy/backgrounds"
+CURRENT_DIR="$HOME/.config/omarchy/current"
+
+THEME_PATH="$THEMES_DIR/$THEME_NAME"
+BACKGROUND_PATH="$BACKGROUND_DIR/$THEME_NAME"
+
 # Check if theme exists before attempting removal
 if [ ! -d "$THEME_PATH" ]; then
  echo "Error: Theme '$THEME_NAME' not found."
  exit 1
 fi

-# Move to the next theme if the current theme is the one being removed
+# Use readlink -f to resolve symlinks and get the absolute path
 if [ "$(readlink -f "$CURRENT_DIR/theme")" = "$(readlink -f "$THEME_PATH")" ]; then
-  omarchy-theme-next
+  "$HOME/.local/share/omarchy/bin/omarchy-theme-next"
 fi

-# Now remove the theme directory for THEME_NAME
+# Now remove the theme directory and backgrounds for THEME_NAME
 rm -rf "$THEME_PATH"
+rm -rf "$BACKGROUND_PATH"
+
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@@ -3,7 +3,7 @@
 # omarchy-theme-set: Set a theme, specified by its name.
 # Usage: omarchy-theme-set <theme-name>

-if [[ -z "$1" && "$1" != "CNCLD" ]]; then
+if [[ -z "$1" ]]; then
  echo "Usage: omarchy-theme-set <theme-name>" >&2
  exit 1
 fi
@@ -11,7 +11,7 @@ fi
 THEMES_DIR="$HOME/.config/omarchy/themes/"
 CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"

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

 # Check if the theme entered exists
@@ -32,22 +32,16 @@ else
  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
-omarchy-restart-waybar
-omarchy-restart-swayosd
+pkill -SIGUSR2 waybar
+pkill swayosd-server
+setsid uwsm app -- swayosd-server &>/dev/null &
 makoctl reload
 hyprctl reload

 # Set new background
-omarchy-theme-bg-next
+"$HOME/.local/share/omarchy/bin/omarchy-theme-bg-next"
--- a/bin/omarchy-theme-update
+++ b/bin/omarchy-theme-update
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 for dir in ~/.config/omarchy/themes/*/; do
-  [ -d "$dir" ] && [ ! -L "${dir%/}" ] && echo "Updating: $(basename "$dir")" && git -C "$dir" pull
-done
+    [ -d "$dir" ] && [ ! -L "${dir%/}" ] && echo "Updating: $(basename "$dir")" && git -C "$dir" pull
+done
--- a/bin/omarchy-toggle-nightlight
+++ b/bin/omarchy-toggle-nightlight
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Default temperature values
-ON_TEMP=4000
-OFF_TEMP=6000
-
-# Ensure hyprsunset is running
-if ! pgrep -x hyprsunset; then
-  setsid uwsm app -- hyprsunset &
-  sleep 1 # Give it time to register
-fi
-
-# 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,9 +1,31 @@
 #!/bin/bash

-set -e
+cd ~/.local/share/omarchy

-omarchy-update-git
-omarchy-migrate
-omarchy-update-system-pkgs
-omarchy-update-restart
-omarchy-restart-waybar # removes update-available icon
+if [[ $1 == "all" ]]; then
+  # Run all migrations since the root commit
+  migration_starting_point=$(git log --max-parents=0 --first-parent --format="%H")
+else
+  # Remember the commit we're at before upgrading in order to only run new migrations
+  migration_starting_point=$(git log -1 --format=%H)
+fi
+
+# Get the latest while trying to preserve any modifications
+git pull --autostash
+git diff --check || git reset --merge
+
+# Run any pending migrations
+for file in $(git diff --name-only --diff-filter=A $migration_starting_point.. migrations/*.sh); do
+  filename=$(basename "$file")
+  migrate_at="${filename%.sh}"
+
+  echo -e "\e[32m\nRunning migration ($migrate_at)\e[0m"
+  source $file
+done
+
+# Update system packages
+echo -e "\e[32m\nUpdate system packages\e[0m"
+yay -Syu --noconfirm
+
+# Back to where we came from
+cd - >/dev/null
--- a/bin/omarchy-update-available
+++ b/bin/omarchy-update-available
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-omarchy_path="$HOME/.local/share/omarchy"
-
-# Ensure remote is reachable
-if ! git -C "$omarchy_path" ls-remote &>/dev/null; then
-  echo "Error: Unable to reach remote repository."
-  exit 1
-fi
-
-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/bin/omarchy-update-git
+++ b/bin/omarchy-update-git
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-echo -e "\e[32mUpdate Omarchy\e[0m"
-git -C $OMARCHY_PATH pull --autostash
-git -C $OMARCHY_PATH diff --check || git -C $OMARCHY_PATH reset --merge
--- a/bin/omarchy-update-restart
+++ b/bin/omarchy-update-restart
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $2}')" ]; then
-  gum confirm "New Linux kernel requires reboot. Ready?" && omarchy-state clear re*-required && sudo reboot now
-elif [ -f "$HOME/.local/state/omarchy/reboot-required" ]; then
-  gum confirm "Updates require reboot. Ready?" && omarchy-state clear re*-required && sudo reboot now
-elif [ -f "$HOME/.local/state/omarchy/relaunch-required" ]; then
-  gum confirm "Updates require Hyprland relaunch. Ready?" && omarchy-state clear relaunch-required && uwsm stop
-fi
--- a/bin/omarchy-update-system-pkgs
+++ b/bin/omarchy-update-system-pkgs
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-echo -e "\e[32m\nUpdate system packages\e[0m"
-yay -Syu --noconfirm --ignore uwsm
-echo
--- a/bin/omarchy-version
+++ b/bin/omarchy-version
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1)
--- a/bin/omarchy-webapp-install
+++ b/bin/omarchy-webapp-install
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-if [ "$#" -ne 3 ]; then
-  echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
-  APP_NAME=$(gum input --prompt "Name> " --placeholder "My favorite web app")
-  APP_URL=$(gum input --prompt "URL> " --placeholder "https://example.com")
-  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
-else
-  APP_NAME="$1"
-  APP_URL="$2"
-  ICON_URL="$3"
-fi
-
-if [[ -z "$APP_NAME" || -z "$APP_URL" || -z "$ICON_URL" ]]; then
-  echo "You must set app name, app URL, and icon URL!"
-  exit 1
-fi
-
-ICON_DIR="$HOME/.local/share/applications/icons"
-DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
-ICON_PATH="$ICON_DIR/$APP_NAME.png"
-
-mkdir -p "$ICON_DIR"
-
-if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
-  echo "Error: Failed to download icon."
-  return 1
-fi
-
-cat >"$DESKTOP_FILE" <<EOF
-[Desktop Entry]
-Version=1.0
-Name=$APP_NAME
-Comment=$APP_NAME
-Exec=chromium --new-window --ozone-platform=wayland --app="$APP_URL" --name="$APP_NAME" --class="$APP_NAME"
-Terminal=false
-Type=Application
-Icon=$ICON_PATH
-StartupNotify=true
-EOF
-
-chmod +x "$DESKTOP_FILE"
-
-if [ "$#" -ne 3 ]; then
-  echo -e "You can now find $APP_NAME using the app launcher (SUPER + SPACE)\n"
-fi
--- a/bin/omarchy-webapp-remove
+++ b/bin/omarchy-webapp-remove
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-ICON_DIR="$HOME/.local/share/applications/icons"
-DESKTOP_DIR="$HOME/.local/share/applications/"
-
-if [ "$#" -ne 1 ]; then
-  # Find all web apps
-  while IFS= read -r -d '' file; do
-    if grep -q '^Exec=.*chromium.*--app' "$file"; then
-      WEB_APPS+=("$(basename "${file%.desktop}")")
-    fi
-  done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)
-
-  if ((${#WEB_APPS[@]})); then
-    IFS=$'\n' SORTED_WEB_APPS=($(sort <<<"${WEB_APPS[*]}"))
-    unset IFS
-    APP_NAME=$(gum choose --header "Select web app to remove..." "${SORTED_WEB_APPS[@]}")
-  else
-    echo "No web apps to remove."
-    exit 1
-  fi
-else
-  APP_NAME="$1"
-fi
-
-if [[ -z "$APP_NAME" ]]; then
-  echo "You must provide web app name."
-  exit 1
-fi
-
-rm "$DESKTOP_DIR/$APP_NAME.desktop"
-rm "$ICON_DIR/$APP_NAME.png"
-
-if [ "$#" -ne 1 ]; then
-  echo -e "Removed $APP_NAME\n"
-fi
--- a/boot.sh
+++ b/boot.sh
@@ -16,12 +16,9 @@ echo -e "\n$ansi_art\n"

 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/chromium-flags.conf
+++ b/config/chromium-flags.conf
@@ -1,3 +0,0 @@
--ozone-platform=wayland
--ozone-platform-hint=wayland
--enable-features=TouchpadOverscrollHistoryNavigation
--- a/config/fastfetch/config.jsonc
+++ b/config/fastfetch/config.jsonc
@@ -60,7 +60,7 @@
    },
    {
      "type": "os",
-      "key": "󰣇 OS",
+      "key": " OS",
      "keyColor": "yellow"
    },
    {
--- a/config/hypr/autostart.conf
+++ b/config/hypr/autostart.conf
@@ -1,2 +0,0 @@
-# Extra autostart processes
-# exec-once = uwsm app -- my-service
--- a/config/hypr/bindings.conf
+++ b/config/hypr/bindings.conf
@@ -1,29 +0,0 @@
-# Application bindings
-$terminal = uwsm app -- alacritty
-$browser = uwsm app -- 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
-
-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"
-
-# Overwrite existing bindings, like putting Omarchy Menu on Super + Space
-# unbind = SUPER, Space
-# bindd = SUPER, SPACE, Omarchy menu, exec, omarchy-menu
--- a/config/hypr/envs.conf
+++ b/config/hypr/envs.conf
@@ -1,3 +0,0 @@
-# Extra env variables
-# Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)
-# env = MY_GLOBAL_ENV,setting
--- a/config/hypr/hypridle.conf
+++ b/config/hypr/hypridle.conf
@@ -1,16 +1,10 @@
 general {
-    lock_cmd = omarchy-lock-screen                         # lock screen and 1password
-    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_unlock_cmd = omarchy-restart-waybar                 # prevent stacking of waybar when waking
+    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_unlock_cmd = pkill -SIGUSR2 waybar       # prevent stacking of waybar when waking
 }

-# FIXME: Scrensaver depends on tte being installed
-# listener {
-#     timeout = 150                                             # 2.5min
-#     on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already)
-# }
-
 listener {
    timeout = 300                      # 5min
    on-timeout = loginctl lock-session # lock screen when timeout has passed
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -1,6 +1,13 @@
 # Learn how to configure Hyprland: https://wiki.hyprland.org/Configuring/

-# Use defaults Omarchy defaults (but don't edit these directly!)
+# You're encouraged to tailor your Hyprland config in this file by adding or overwriting any settings.
+# But don't change anything that lives in ~/.local/share/omarchy, if you can help it!
+# Those files are overwritten when Omarchy is updated.
+
+# Change your personal monitor setup in here to keep the main config portable
+source = ~/.config/hypr/monitors.conf
+
+# Use defaults Omarchy defaults
 source = ~/.local/share/omarchy/default/hypr/autostart.conf
 source = ~/.local/share/omarchy/default/hypr/bindings/media.conf
 source = ~/.local/share/omarchy/default/hypr/bindings/tiling.conf
@@ -11,9 +18,64 @@ source = ~/.local/share/omarchy/default/hypr/input.conf
 source = ~/.local/share/omarchy/default/hypr/windows.conf
 source = ~/.config/omarchy/current/theme/hyprland.conf

-# Change your own setup in these files (and overwrite any settings from defaults!)
-source = ~/.config/hypr/monitors.conf
-source = ~/.config/hypr/input.conf
-source = ~/.config/hypr/bindings.conf
-source = ~/.config/hypr/envs.conf
-source = ~/.config/hypr/autostart.conf
+# Application bindings
+$terminal = uwsm app -- alacritty
+$browser = uwsm app -- chromium --new-window --ozone-platform=wayland
+$webapp = $browser --app
+
+bind = SUPER, return, exec, $terminal
+bind = SUPER, F, exec, uwsm app -- nautilus --new-window
+bind = SUPER, B, exec, $browser
+bind = SUPER, M, exec, $terminal -e spotify_player
+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, uwsm app -- signal-desktop
+bind = SUPER, O, exec, uwsm app -- obsidian -disable-gpu
+bind = SUPER, slash, exec, uwsm app -- 1password
+
+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
+
+# Extra env variables
+# Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)
+# env = MY_GLOBAL_ENV,setting
+
+# Control your input devices
+# See https://wiki.hypr.land/Configuring/Variables/#input
+input {
+  # Use multiple keyboard layouts and switch between them with Alt + Space
+  # kb_layout = us,dk
+  kb_options = compose:caps # ,grp:alt_space_toggle
+
+  # Change speed of keyboard repeat
+  repeat_rate = 40
+  repeat_delay = 600
+
+  # Increase sensitity for mouse/trackpack (default: 0)
+  # sensitivity = 0.35
+
+  touchpad {
+    # Use natural (inverse) scrolling
+    # natural_scroll = true
+
+    # Use two-finger clicks for right-click instead of lower-right corner
+    # clickfinger_behavior = true
+
+    # Control the speed of your scrolling
+    scroll_factor = 0.4
+  }
+}
+
+# Scroll faster in the terminal
+windowrule = scrolltouchpad 1.5, class:Alacritty
--- 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/input.conf
+++ b/config/hypr/input.conf
@@ -1,28 +0,0 @@
-# Control your input devices
-# See https://wiki.hypr.land/Configuring/Variables/#input
-input {
-  # Use multiple keyboard layouts and switch between them with Left Alt + Right Alt
-  # kb_layout = us,dk
-  kb_options = compose:caps # ,grp:alts_toggle
-
-  # Change speed of keyboard repeat
-  repeat_rate = 40
-  repeat_delay = 600
-
-  # Increase sensitity for mouse/trackpack (default: 0)
-  # sensitivity = 0.35
-
-  touchpad {
-    # Use natural (inverse) scrolling
-    # natural_scroll = true
-
-    # Use two-finger clicks for right-click instead of lower-right corner
-    # clickfinger_behavior = true
-
-    # Control the speed of your scrolling
-    scroll_factor = 0.4
-  }
-}
-
-# Scroll faster in the terminal
-windowrule = scrolltouchpad 1.5, class:Alacritty
--- a/config/swayosd/config.toml
+++ b/config/swayosd/config.toml
@@ -1,4 +1,4 @@
 [server]
 show_percentage = true
-max_volume = 100
+max_volume = 150
 style = "./style.css"
--- a/config/swayosd/style.css
+++ b/config/swayosd/style.css
@@ -9,7 +9,7 @@ window {
 }

 label {
-  font-family: 'CaskaydiaMono Nerd Font';
+  font-family: 'CaskaydiaMono Nerd Font', monospace;
  font-size: 11pt;

  color: @label;
--- a/config/uwsm/env
+++ b/config/uwsm/env
@@ -1,6 +0,0 @@
-export OMARCHY_PATH=$HOME/.local/share/omarchy
-export PATH=$OMARCHY_PATH/bin/:$PATH
-
-if command -v mise &> /dev/null; then
-  eval "$(mise activate bash)"
-fi
--- a/config/walker/config.toml
+++ b/config/walker/config.toml
@@ -1,29 +1,82 @@
-close_when_open = true
+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]
-run_last_response = ["ctrl e"]
+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]
-max_entries = 200
+dynamic_sub = true
+keyboard_scroll_style = "emacs"
+max_entries = 50
+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]
-launch_prefix = "uwsm app -- "
+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
@@ -31,10 +84,21 @@ 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"
@@ -45,54 +109,185 @@ 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 = ""
-min_chars = 3
+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"
-icon = ""
+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
+use_fd = false
+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 = "."
+prefix = '.'

 [builtins.runner]
-shell_config = ""
+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.translation]
+[[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
@@ -5,12 +5,10 @@
  "spacing": 0,
  "height": 26,
  "modules-left": [
-    "custom/omarchy",
    "hyprland/workspaces"
  ],
  "modules-center": [
-    "clock",
-    "custom/update"
+    "clock"
  ],
  "modules-right": [
    "group/tray-expander",
@@ -44,18 +42,6 @@
      "5": []
    }
  },
-  "custom/omarchy": {
-    "format": "",
-    "on-click": "omarchy-menu",
-    "tooltip-format": "Omarchy Menu\n\nSuper + Alt + Space"
-  },
-  "custom/update": {
-    "format": "",
-    "exec": "omarchy-update-available",
-    "on-click": "alacritty --class Omarchy --title Omarchy -e omarchy-update",
-    "tooltip-format": "Omarchy update available",
-    "interval": 3600
-  },
  "cpu": {
    "interval": 5,
    "format": "󰍛",
@@ -65,7 +51,7 @@
    "format": "{:%A %H:%M}",
    "format-alt": "{:%d %B W%V %Y}",
    "tooltip": false,
-    "on-click-right": "omarchy-cmd-tzupdate"
+    "on-click-right": "~/.local/share/omarchy/bin/omarchy-cmd-tzupdate"
  },
  "network": {
    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -7,7 +7,7 @@
  border: none;
  border-radius: 0;
  min-height: 0;
-  font-family: CaskaydiaMono Nerd Font;
+  font-family: CaskaydiaMono Nerd Font Propo;
  font-size: 12px;
 }

@@ -26,10 +26,6 @@
  min-width: 9px;
 }

-#workspaces button.empty {
-  opacity: 0.5;
-}
-
 #tray,
 #cpu,
 #battery,
@@ -37,13 +33,13 @@
 #bluetooth,
 #pulseaudio,
 #clock,
-#custom-omarchy {
+#custom-power-menu {
  min-width: 12px;
  margin: 0 7.5px;
 }

 #custom-expand-icon {
-  margin-right: 7px;
+  margin-right: 12px;
 }

 tooltip {
--- a/default/alacritty/screensaver.toml
+++ b/default/alacritty/screensaver.toml
@@ -1,11 +0,0 @@
-[colors.primary]
-background = "0x000000"
-
-[colors.cursor]
-cursor = "0x000000"
-
-[font]
-size = 18.0
-
-[window]
-opacity = 1.0
--- a/default/bash/aliases
+++ b/default/bash/aliases
@@ -33,3 +33,6 @@ n() { if [ "$#" -eq 0 ]; then nvim .; else nvim "$@"; fi; }
 alias gcm='git commit -m'
 alias gcam='git commit -a -m'
 alias gcad='git commit -a --amend'
+
+# Find packages without leaving the terminal
+alias yayf="yay -Slq | fzf --multi --preview 'yay -Sii {1}' --preview-window=down:75% | xargs -ro yay -S"
--- 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
@@ -15,38 +15,59 @@ iso2sd() {
  fi
 }

-# Format an entire drive for a single partition using ext4
-format-drive() {
-  if [ $# -ne 2 ]; then
-    echo "Usage: format-drive <device> <name>"
-    echo "Example: format-drive /dev/sda 'My Stuff'"
-    echo -e "\nAvailable drives:"
-    lsblk -d -o NAME -n | awk '{print "/dev/"$1}'
-  else
-    echo "WARNING: This will completely erase all data on $1 and label it '$2'."
-    read -rp "Are you sure you want to continue? (y/N): " confirm
-    if [[ "$confirm" =~ ^[Yy]$ ]]; then
-      sudo wipefs -a "$1"
-      sudo dd if=/dev/zero of="$1" bs=1M count=100 status=progress
-      sudo parted -s "$1" mklabel gpt
-      sudo parted -s "$1" mkpart primary ext4 1MiB 100%
-      sudo mkfs.ext4 -L "$2" "$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
-      echo "Drive $1 formatted and labeled '$2'."
-    fi
+# Create a desktop launcher for a web app
+web2app() {
+  if [ "$#" -ne 3 ]; then
+    echo "Usage: web2app <AppName> <AppURL> <IconURL> (IconURL must be in PNG -- use https://dashboardicons.com)"
+    return 1
  fi
+
+  local APP_NAME="$1"
+  local APP_URL="$2"
+  local ICON_URL="$3"
+  local ICON_DIR="$HOME/.local/share/applications/icons"
+  local DESKTOP_FILE="$HOME/.local/share/applications/${APP_NAME}.desktop"
+  local ICON_PATH="${ICON_DIR}/${APP_NAME}.png"
+
+  mkdir -p "$ICON_DIR"
+
+  if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
+    echo "Error: Failed to download icon."
+    return 1
+  fi
+
+  cat > "$DESKTOP_FILE" <<EOF
+[Desktop Entry]
+Version=1.0
+Name=$APP_NAME
+Comment=$APP_NAME
+Exec=chromium --new-window --ozone-platform=wayland --app="$APP_URL" --name="$APP_NAME" --class="$APP_NAME"
+Terminal=false
+Type=Application
+Icon=$ICON_PATH
+StartupNotify=true
+EOF
+
+  chmod +x "$DESKTOP_FILE"
 }

-# Transcode a video to a good-balance 1080p that's great for sharing online
-transcode-video-1080p() {
-  ffmpeg -i $1 -vf scale=1920:1080 -c:v libx264 -preset fast -crf 23 -c:a copy ${1%.*}-1080p.mp4
+web2app-remove() {
+  if [ "$#" -ne 1 ]; then
+    echo "Usage: web2app-remove <AppName>"
+    return 1
+  fi
+
+  local APP_NAME="$1"
+  local ICON_DIR="$HOME/.local/share/applications/icons"
+  local DESKTOP_FILE="$HOME/.local/share/applications/${APP_NAME}.desktop"
+  local ICON_PATH="${ICON_DIR}/${APP_NAME}.png"
+
+  rm "$DESKTOP_FILE"
+  rm "$ICON_PATH"
 }

-# Transcode a video to a good-balance 4K that's great for sharing online
-transcode-video-4K() {
-  ffmpeg -i $1 -c:v libx265 -preset slow -crf 24 -c:a aac -b:a 192k ${1%.*}-optimized.mp4
-}
-
-# Transcode PNG to JPG image that's great for shrinking wallpapers
-transcode-png2jpg() {
-  magick $1 -quality 95 -strip ${1%.*}.jpg
+# Ensure changes to ~/.XCompose are immediately available
+refresh-xcompose() {
+  pkill fcitx5
+  uwsm app -- fcitx5 >/dev/null 2>&1 &
 }
--- a/default/bash/shell
+++ b/default/bash/shell
@@ -10,5 +10,8 @@ if [[ ! -v BASH_COMPLETION_VERSINFO && -f /usr/share/bash-completion/bash_comple
 fi

 # Set complete path
-export PATH="./bin:$HOME/.local/bin:$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/hypr/apps.conf
+++ b/default/hypr/apps.conf
@@ -1,9 +0,0 @@
-# App-specific tweaks
-source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
-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
-source = ~/.local/share/omarchy/default/hypr/apps/1password.conf
--- a/default/hypr/apps/1password.conf
+++ b/default/hypr/apps/1password.conf
@@ -1 +0,0 @@
-windowrule = noscreenshare, class:^(1Password)$
--- 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/pip.conf
+++ b/default/hypr/apps/pip.conf
@@ -1,9 +0,0 @@
-# Picture-in-picture overlays
-windowrule = tag +pip, title:(Picture.{0,1}in.{0,1}[Pp]icture)
-windowrule = float, tag:pip
-windowrule = pin, tag:pip
-windowrule = size 600 338, tag:pip
-windowrule = keepaspectratio, tag:pip
-windowrule = noborder, tag:pip
-windowrule = opacity 1 1, tag:pip
-windowrule = move 100%-w-40 4%, tag:pip
--- 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,6 +0,0 @@
-# Float Steam, fullscreen RetroArch
-windowrule = float, class:steam
-windowrule = center, class:steam, title:Steam
-windowrule = opacity 1 1, class:steam
-windowrule = size 1100 700, class:steam, title:Steam
-windowrule = size 460 800, class:steam, title:Friends List
--- a/default/hypr/apps/system.conf
+++ b/default/hypr/apps/system.conf
@@ -1,18 +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 620 470, class:Omarchy
-windowrule = size 700 520, class:About
-
-# Float and center file pickers
-windowrule = tag +picker, class:(xdg-desktop-portal-gtk|sublime_text)
-windowrule = float, tag:picker, title:^(Open.*Files?|Save.*Files?|All Files|Save)
-windowrule = center, tag:picker, title:^(Open.*Files?|Save.*Files?|All Files|Save)
-windowrule = size 800 600, tag:picker
-
-# 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/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
@@ -2,15 +2,15 @@
 $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
+bindel = ,XF86AudioRaiseVolume, exec, $osdclient --output-volume raise
+bindel = ,XF86AudioLowerVolume, exec, $osdclient --output-volume lower
+bindel = ,XF86AudioMute, exec, $osdclient --output-volume mute-toggle
+bindel = ,XF86AudioMicMute, exec, $osdclient --input-volume mute-toggle
+bindel = ,XF86MonBrightnessUp, exec, $osdclient --brightness raise
+bindel = ,XF86MonBrightnessDown, exec, $osdclient --brightness lower

 # 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, $osdclient --playerctl play-pause
+bindl = , XF86AudioPlay, exec, $osdclient --playerctl play-pause
+bindl = , XF86AudioPrev, exec, playerctl previous
--- a/default/hypr/bindings/tiling.conf
+++ b/default/hypr/bindings/tiling.conf
@@ -1,62 +1,63 @@
 # 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,
+bind = SHIFT, F11, fullscreen, 0

-# Move focus with SUPER + 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
+# Move focus with mainMod + arrow keys
+bind = SUPER, left, movefocus, l
+bind = SUPER, right, movefocus, r
+bind = SUPER, up, movefocus, u
+bind = SUPER, down, movefocus, d

-# Switch workspaces with SUPER + [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
+# Switch workspaces with mainMod + [0-9]
+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 SUPER + SHIFT + [0-9]
-bindd = SUPER SHIFT, code:10, Move window to workspace 1, movetoworkspace, 1
-bindd = SUPER SHIFT, code:11, Move window to workspace 2, movetoworkspace, 2
-bindd = SUPER SHIFT, code:12, Move window to workspace 3, movetoworkspace, 3
-bindd = SUPER SHIFT, code:13, Move window to workspace 4, movetoworkspace, 4
-bindd = SUPER SHIFT, code:14, Move window to workspace 5, movetoworkspace, 5
-bindd = SUPER SHIFT, code:15, Move window to workspace 6, movetoworkspace, 6
-bindd = SUPER SHIFT, code:16, Move window to workspace 7, movetoworkspace, 7
-bindd = SUPER SHIFT, code:17, Move window to workspace 8, movetoworkspace, 8
-bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9
-bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+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 SUPER + 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
+# Swap active window with the one next to it with mainMod + SHIFT + arrow keys
+bind = SUPER SHIFT, left, swapwindow, l
+bind = SUPER SHIFT, right, swapwindow, r
+bind = SUPER SHIFT, up, swapwindow, u
+bind = SUPER SHIFT, 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 = ALT, Tab, cyclenext
+bind = ALT, Tab, bringactivetotop

 # 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 SUPER + scroll
-bindd = SUPER, mouse_down, Scroll active workspace forward, workspace, e+1
-bindd = SUPER, mouse_up, Scroll active workspace backward, workspace, e-1
+# Scroll through existing workspaces with mainMod + scroll
+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,38 +1,39 @@
-# Menus
-bindd = SUPER, SPACE, Launch apps, exec, walker -p "Start…"
-bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu
-bindd = SUPER, ESCAPE, Power menu, exec, omarchy-menu system
-bindd = SUPER, K, Show key bindings, exec, omarchy-menu-keybindings
+# Launching
+bind = SUPER, space, exec, walker
+bind = SUPER, K, exec, ~/.local/share/omarchy/bin/omarchy-menu-keybindings

 # Aesthetics
-bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, pkill -SIGUSR1 waybar
-bindd = SUPER CTRL, SPACE, Next background in theme, exec, omarchy-theme-bg-next
-bindd = SUPER SHIFT CTRL, SPACE, Pick new theme, exec, omarchy-menu theme
+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
+bind = SUPER, ESCAPE, exec, ~/.local/share/omarchy/bin/omarchy-menu-power

 # Toggle idling
-bindd = SUPER CTRL, I, Toggle locking on idle, exec, omarchy-toggle-idle
-
-# Toggle nightlight
-bindd = SUPER CTRL, N, Toggle nightlight, exec, 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, omarchy-cmd-apple-display-brightness -5000
-bindd = CTRL, F2, Apple Display brightness up, exec, omarchy-cmd-apple-display-brightness +5000
-bindd = SHIFT CTRL, F2, Apple Display full brightness, exec, omarchy-cmd-apple-display-brightness +60000
+bind = CTRL, F1, exec, ~/.local/share/omarchy/bin/omarchy-cmd-apple-display-brightness -5000
+bind = CTRL, F2, exec, ~/.local/share/omarchy/bin/omarchy-cmd-apple-display-brightness +5000
+bind = SHIFT CTRL, F2, exec, ~/.local/share/omarchy/bin/omarchy-cmd-apple-display-brightness +60000

 # Screenshots
-bindd = , PRINT, Screenshot of region, exec, omarchy-cmd-screenshot
-bindd = SHIFT, PRINT, Screenshot of window, exec, omarchy-cmd-screenshot window
-bindd = CTRL, PRINT, Screenshot of display, exec, omarchy-cmd-screenshot output
+bind = , PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot
+bind = SHIFT, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot window
+bind = CTRL, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot output

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

 # Color picker
-bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a
+bind = SUPER, PRINT, exec, hyprpicker -a
--- a/default/hypr/looknfeel.conf
+++ b/default/hypr/looknfeel.conf
@@ -69,6 +69,22 @@ animations {
    animation = workspaces, 0, 0, ease
 }

+# Application-sepcific animation
+layerrule = noanim,walker
+
+# Remove 1px border around hyprshot screenshots
+layerrule = noanim, selection
+
+# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
+# "Smart gaps" / "No gaps when only"
+# uncomment all if you wish to use that.
+# workspace = w[tv1], gapsout:0, gapsin:0
+# workspace = f[1], gapsout:0, gapsin:0
+# windowrule = bordersize 0, floating:0, onworkspace:w[tv1]
+# windowrule = rounding 0, floating:0, onworkspace:w[tv1]
+# windowrule = bordersize 0, floating:0, onworkspace:f[1]
+# windowrule = rounding 0, floating:0, onworkspace:f[1]
+
 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
--- a/default/hypr/windows.conf
+++ b/default/hypr/windows.conf
@@ -1,11 +1,34 @@
 # 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:^(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 590 450, 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)
+
+# Float Steam, fullscreen RetroArch
+windowrule = float, class:steam
+windowrule = center, class:steam, title:Steam
+windowrule = fullscreen, class:^(com.libretro.RetroArch)$
+
+# Fullscreen screensaver
+windowrule = fullscreen, class:Screensaver
+
+# 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|org.gnome.NautilusPreviewer)$
+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
--- a/default/plymouth/logo.png
+++ b/default/plymouth/logo.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
David Heinemeier Hansson	2616b0ad1a	Fix again	2025-07-29 19:20:12 +02:00
David Heinemeier Hansson	de7b18e8e2	Reapply "Correct package name" This reverts commit `8c2f51c08c`.	2025-07-29 19:18:01 +02:00
David Heinemeier Hansson	251a5d0263	Reapply "Swap Spotify GUI to TUI" This reverts commit `d4f6859022`.	2025-07-29 19:17:57 +02:00
				`@@ -1 +0,0 @@`
				`windowrule = noscreenshare, class:^(1Password)$`