Correct message

* Attempt to templaterize the theme specific files

* Cleanup

* Slim down

* Combine render into -set

* Pull out the dynamic template rendering again, but simpler

* Fix vars

* Variables are lowercase

* Better presentation

* Fix missing colors

* Provide stripped values too

* Fix colors for regular hex format

* Bring back explicit btop themes

They're too involved to derive from a basic color set

* Make an atomic swap of the theme directories

* No longer used by walker to cancel

* Explain why

* Remove redundant const

* Consistent const naming

* No longe have $THEMES_DIR

* Correct the blue

* Set opencode colors too

* Fix colors for readability

* Move the templates together with the others in default

* Split user themes and default themes

* Fix paths

* Look for both user themes and default themes

Plus speed things up

* Migrate to the new setup where default themes live inside omarchy

* Explicitly store the name of the current theme

* Cleanup

* No longer need omarchy-theme-next since themes are now fully rendered, not symlinks

* Get current theme name from the new theme.name file

* Look for user background images in dedicated directory

* Need yq for toml

* Need yq to parse colors.toml

* Look for backgrounds matching the new theme.name

We no longer have symlinks

* Migrate existing user backgrounds to the new proper location

* Install user backgrounds in the correct path

* Fix quoting

* Just rely on the system theme for opencode and get ready for USRSIG2 being available to live reload

* Fix template generation for rgb colors

bin/omarchy-branch-set

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if (($# == 0)); then
+  echo "Usage: omarchy-branch-set [master|dev]"
+  exit 1
+else
+  branch="$1"
+fi
+
+case "$branch" in
+  "master") git -C $OMARCHY_PATH switch master ;;
+  "dev") git -C $OMARCHY_PATH switch dev ;;
+  *) echo "Unknown branch: $branch"; exit 1; ;;
+esac

bin/omarchy-channel-set

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if (($# == 0)); then
+  echo "Usage: omarchy-channel-set [stable|edge|dev]"
+  exit 1
+else
+  channel="$1"
+fi
+
+case "$channel" in
+"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
+"edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
+"dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
+*) echo "Unknown channel: $channel"; exit 1; ;;
+esac
+
+omarchy-update -y

bin/omarchy-cmd-reboot

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+omarchy-state clear re*-required
+omarchy-hyprland-window-close-all
+sleep 1 # Allow apps like Chrome to shutdown correctly
+systemctl reboot --no-wall

bin/omarchy-cmd-screensaver

@@ -11,19 +11,23 @@ exit_screensaver() {
   exit 0
 }
 
+# Exit the screensaver on signals and input from keyboard and mouse
 trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
 
 printf '\033]11;rgb:00/00/00\007'  # Set background color to black
 
 hyprctl keyword cursor:invisible true &>/dev/null
 
+tty=$(tty 2>/dev/null)
+
 while true; do
   tte -i ~/.config/omarchy/branding/screensaver.txt \
-    --frame-rate 120 --canvas-width 0 --canvas-height 0 --anchor-canvas c --anchor-text c\
+    --frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\
-    --no-eol --no-restore-cursor random_effect &
+    --random-effect --exclude-effects dev_worm \
+    --no-eol --no-restore-cursor &
 
-  while pgrep -x tte >/dev/null; do
+  while pgrep -t "${tty#/dev/}" -x tte >/dev/null; do
-    if read -n 1 -t 3 || ! screensaver_in_focus; then
+    if read -n1 -t 1 || ! screensaver_in_focus; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-shutdown

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+omarchy-state clear re*-required
+omarchy-hyprland-window-close-all
+sleep 1 # Allow apps like Chrome to shutdown correctly
+systemctl poweroff --no-wall

bin/omarchy-debug

@@ -1,7 +1,34 @@
 #!/bin/bash
 
+NO_SUDO=false
+PRINT_ONLY=false
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --no-sudo)
+      NO_SUDO=true
+      shift
+      ;;
+    --print)
+      PRINT_ONLY=true
+      shift
+      ;;
+    *)
+      echo "Unknown option: $1"
+      echo "Usage: omarchy-debug [--no-sudo] [--print]"
+      exit 1
+      ;;
+  esac
+done
+
 LOG_FILE="/tmp/omarchy-debug.log"
 
+if [ "$NO_SUDO" = true ]; then
+  DMESG_OUTPUT="(skipped - --no-sudo flag used)"
+else
+  DMESG_OUTPUT="$(sudo dmesg)"
+fi
+
 cat > "$LOG_FILE" <<EOF
 Date: $(date)
 Hostname: $(hostname)
@@ -15,7 +42,7 @@ $(inxi -Farz)
 =========================================
 DMESG
 =========================================
-$(sudo dmesg)
+$DMESG_OUTPUT
 
 =========================================
 JOURNALCTL (CURRENT BOOT, ERRORS ONLY)
@@ -28,6 +55,11 @@ INSTALLED PACKAGES
 $({ expac -S '%n %v (%r)' $(pacman -Qqe) 2>/dev/null; comm -13 <(pacman -Sql | sort) <(pacman -Qqe | sort) | xargs -r expac -Q '%n %v (AUR)'; } | sort)
 EOF
 
+if [ "$PRINT_ONLY" = true ]; then
+  cat "$LOG_FILE"
+  exit 0
+fi
+
 OPTIONS=("View log" "Save in current directory")
 if ping -c 1 8.8.8.8 >/dev/null 2>&1; then
   OPTIONS=("Upload log" "${OPTIONS[@]}")

bin/omarchy-dev-add-migration

@@ -3,4 +3,9 @@
 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
+
+if [[ "$1" != "--no-edit" ]]; then
+  nvim $migration_file
+fi
+
+echo $migration_file

bin/omarchy-hyprland-window-pop

@@ -26,9 +26,9 @@ addr=$(echo "$active" | jq -r ".address")
 
 if [[ $pinned == "true" ]]; then
   hyprctl -q --batch \
-    dispatch pin address:$addr; \
+    "dispatch pin address:$addr;" \
-    dispatch togglefloating address:$addr; \
+    "dispatch togglefloating address:$addr;" \
-    dispatch tagwindow -pop address:$addr;
+    "dispatch tagwindow -pop address:$addr;"
 elif [[ -n $addr ]]; then
   hyprctl dispatch togglefloating address:$addr
   hyprctl dispatch resizeactive exact $width $height address:$addr
@@ -40,7 +40,7 @@ elif [[ -n $addr ]]; then
   fi
 
   hyprctl -q --batch \
-    dispatch pin address:$addr; \
+    "dispatch pin address:$addr;" \
-    dispatch alterzorder top address:$addr; \
+    "dispatch alterzorder top address:$addr;" \
-    dispatch tagwindow +pop address:$addr;
+    "dispatch tagwindow +pop address:$addr;"
 fi

bin/omarchy-install-dev-env

@@ -41,7 +41,7 @@ install_php() {
 
 install_node() {
   echo -e "Installing Node.js...\n"
-  mise use --global node@lts
+  mise use --global node
 }
 
 case "$1" in

bin/omarchy-install-docker-dbs

@@ -12,7 +12,7 @@ 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=postgres17 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:17 ;;
+    PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres18 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:18 ;;
     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 ;;
     MongoDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:27017:27017" --name mongodb -e MONGO_INITDB_ROOT_USERNAME=admin -e MONGO_INITDB_ROOT_PASSWORD=admin123 mongo:noble ;;

bin/omarchy-install-dropbox

@@ -5,4 +5,4 @@ omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-d
 
 echo "Starting Dropbox..."
 uwsm-app -- dropbox-cli start &>/dev/null &
-echo "See Dropbox icon behind   hover tray in top right and right-click for setup."
+echo "See Dropbox icon behind  hover tray in top right and right-click for setup."

bin/omarchy-install-steam

@@ -3,5 +3,5 @@
 set -e
 
 echo "Now pick dependencies matching your graphics card"
-sudo pacman -S --noconfirm steam
+sudo pacman -S steam
 setsid gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-launch-audio

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+omarchy-launch-or-focus-tui wiremix

bin/omarchy-launch-browser

@@ -3,8 +3,10 @@
 default_browser=$(xdg-settings get default-web-browser)
 browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)
 
-if [[ $browser_exec =~ (firefox|zen|librewolf) ]]; then
+if [[ $browser_exec =~ (firefox|zen|librewolf|mullvad) ]]; then
   private_flag="--private-window"
+elif [[ $browser_exec =~ edge ]]; then
+  private_flag="--inprivate"
 else
   private_flag="--incognito"
 fi

bin/omarchy-launch-editor

@@ -3,7 +3,7 @@
 omarchy-cmd-present "$EDITOR" || EDITOR=nvim
 
 case "$EDITOR" in
-nvim | vim | nano | micro | hx | helix)
+nvim | vim | nano | micro | hx | helix | fresh)
   exec omarchy-launch-tui "$EDITOR" "$@"
   ;;
 *)

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

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cmd="$*"
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
+exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; if [ \$? -ne 130 ]; then omarchy-show-done; fi"

bin/omarchy-launch-opencode

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

bin/omarchy-launch-or-focus-tui

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-APP_ID="org.omarchy.$(basename $1)"
+APP_ID="org.omarchy.$(basename "$1")"
 LAUNCH_COMMAND="omarchy-launch-tui $@"
 
 exec omarchy-launch-or-focus "$APP_ID" "$LAUNCH_COMMAND"

bin/omarchy-launch-screensaver

@@ -13,6 +13,9 @@ if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]
   exit 1
 fi
 
+# Silently quit Walker on overlay
+walker -q
+
 focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
 terminal=$(xdg-terminal-exec --print-id)
 
@@ -29,6 +32,7 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
   *ghostty*)
     hyprctl dispatch exec -- \
       ghostty --class=org.omarchy.screensaver \
+      --config-file=~/.local/share/omarchy/default/ghostty/screensaver \
       --font-size=18 \
       -e omarchy-cmd-screensaver
     ;;
@@ -36,6 +40,7 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
     hyprctl dispatch exec -- \
       kitty --class=org.omarchy.screensaver \
       --override font_size=18 \
+      --override window_padding_width=0 \
       -e omarchy-cmd-screensaver
     ;;
   *)

bin/omarchy-lock-screen

@@ -3,6 +3,9 @@
 # Lock the screen
 pidof hyprlock || hyprlock &
 
+# Set keyboard layout to default (first layout)
+hyprctl switchxkblayout all 0 > /dev/null 2>&1
+
 # Ensure 1password is locked
 if pgrep -x "1password" >/dev/null; then
   1password --lock &

bin/omarchy-menu

@@ -173,7 +173,7 @@ show_setup_menu() {
   options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
-  *Audio*) omarchy-launch-or-focus-tui wiremix ;;
+  *Audio*) omarchy-launch-audio ;;
   *Wifi*) omarchy-launch-wifi ;;
   *Bluetooth*) omarchy-launch-bluetooth ;;
   *Power*) show_setup_power_menu ;;
@@ -252,7 +252,7 @@ show_install_editor_menu() {
   case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
   *VSCode*) present_terminal omarchy-install-vscode ;;
   *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
-  *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
+  *Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch dev.zed.Zed" ;;
   *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) install "Helix" "helix" ;;
   *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
@@ -276,15 +276,16 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  case $(menu "Install" "  Dictation [AUR]\n󱚤  Claude Code\n󱚤  Copilot CLI [AUR]\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
+  *Dictation*) present_terminal "echo 'Installing Hyprwhspr from AUR...'; yay -S --noconfirm hyprwhspr && hyprwhspr setup" ;;
   *Claude*) install "Claude Code" "claude-code" ;;
+  *Copilot*) aur_install "Copilot CLI" "github-copilot-cli" ;;
   *Cursor*) install "Cursor CLI" "cursor-cli" ;;
-  *OpenAI*) install "OpenAI Codex" "openai-codex-bin" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
+  *OpenAI*) install "OpenAI Codex" "openai-codex" ;;
   *Studio*) install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
   *Crush*) install "Crush" "crush-bin" ;;
-  *opencode*) install "opencode" "opencode" ;;
   *) show_install_menu ;;
   esac
 }
@@ -302,18 +303,19 @@ show_install_gaming_menu() {
 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 ;;
+  *Background*) omarchy-theme-bg-install ;;
   *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" "--width 350") in
+  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono\n  Iosevka" "--width 350") in
   *Meslo*) install_font "Meslo LG Mono" "ttf-meslo-nerd" "MesloLGL Nerd Font" ;;
   *Fira*) install_font "Fira Code" "ttf-firacode-nerd" "FiraCode Nerd Font" ;;
   *Victor*) install_font "Victor Code" "ttf-victor-mono-nerd" "VictorMono Nerd Font" ;;
   *Bistream*) install_font "Bistream Vera Code" "ttf-bitstream-vera-mono-nerd" "BitstromWera Nerd Font" ;;
+  *Iosevka*) install_font "Iosevka" "ttf-iosevka-nerd" "Iosevka Nerd Font Mono" ;;
   *) show_install_menu ;;
   esac
 }
@@ -364,10 +366,11 @@ show_install_elixir_menu() {
 }
 
 show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
+  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
   *Package*) terminal omarchy-pkg-remove ;;
   *Web*) present_terminal omarchy-webapp-remove ;;
   *TUI*) present_terminal omarchy-tui-remove ;;
+  *Development*) show_remove_development_menu ;;
   *Theme*) present_terminal omarchy-theme-remove ;;
   *Windows*) present_terminal "omarchy-windows-vm remove" ;;
   *Fingerprint*) present_terminal "omarchy-setup-fingerprint --remove" ;;
@@ -376,9 +379,54 @@ show_remove_menu() {
   esac
 }
 
+show_remove_development_menu() {
+  case $(menu "Remove" "󰫏  Ruby on Rails\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure") in
+  *Rails*) present_terminal "omarchy-remove-dev-env ruby" ;;
+  *JavaScript*) show_remove_javascript_menu ;;
+  *Go*) present_terminal "omarchy-remove-dev-env go" ;;
+  *PHP*) show_remove_php_menu ;;
+  *Python*) present_terminal "omarchy-remove-dev-env python" ;;
+  *Elixir*) show_remove_elixir_menu ;;
+  *Zig*) present_terminal "omarchy-remove-dev-env zig" ;;
+  *Rust*) present_terminal "omarchy-remove-dev-env rust" ;;
+  *Java*) present_terminal "omarchy-remove-dev-env java" ;;
+  *NET*) present_terminal "omarchy-remove-dev-env dotnet" ;;
+  *OCaml*) present_terminal "omarchy-remove-dev-env ocaml" ;;
+  *Clojure*) present_terminal "omarchy-remove-dev-env clojure" ;;
+  *) show_remove_menu ;;
+  esac
+}
+
+show_remove_javascript_menu() {
+  case $(menu "Remove" "  Node.js\n  Bun\n  Deno") in
+  *Node*) present_terminal "omarchy-remove-dev-env node" ;;
+  *Bun*) present_terminal "omarchy-remove-dev-env bun" ;;
+  *Deno*) present_terminal "omarchy-remove-dev-env deno" ;;
+  *) show_remove_development_menu ;;
+  esac
+}
+
+show_remove_php_menu() {
+  case $(menu "Remove" "  PHP\n  Laravel\n  Symfony") in
+  *PHP*) present_terminal "omarchy-remove-dev-env php" ;;
+  *Laravel*) present_terminal "omarchy-remove-dev-env laravel" ;;
+  *Symfony*) present_terminal "omarchy-remove-dev-env symfony" ;;
+  *) show_remove_development_menu ;;
+  esac
+}
+
+show_remove_elixir_menu() {
+  case $(menu "Remove" "  Elixir\n  Phoenix") in
+  *Elixir*) present_terminal "omarchy-remove-dev-env elixir" ;;
+  *Phoenix*) present_terminal "omarchy-remove-dev-env phoenix" ;;
+  *) show_remove_development_menu ;;
+  esac
+}
+
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
+  case $(menu "Update" " Omarchy\n󰔫  Channel\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
   *Omarchy*) present_terminal omarchy-update ;;
+  *Channel*) show_update_channel_menu ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
@@ -391,6 +439,14 @@ show_update_menu() {
   esac
 }
 
+show_update_channel_menu() {
+  case $(menu "Update channel" "🟢 Stable\n🟡 Edge\n🔴 Dev") in
+  *Stable*) present_terminal "omarchy-channel-set stable" ;;
+  *Edge*) present_terminal "omarchy-channel-set edge" ;;
+  *Dev*) present_terminal "omarchy-channel-set dev" ;;
+  *) show_update_menu ;;
+  esac
+}
 show_update_process_menu() {
   case $(menu "Restart" "  Hypridle\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
   *Hypridle*) omarchy-restart-hypridle ;;
@@ -434,12 +490,11 @@ show_update_password_menu() {
 }
 
 show_system_menu() {
-  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰤄  Suspend\n󰜉  Restart\n󰐥  Shutdown") in
+  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰜉  Restart\n󰐥  Shutdown") in
   *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
-  *Suspend*) systemctl suspend ;;
+  *Restart*) omarchy-cmd-reboot ;;
-  *Restart*) omarchy-state clear re*-required && systemctl reboot --no-wall ;;
+  *Shutdown*) omarchy-cmd-shutdown ;;
-  *Shutdown*) omarchy-state clear re*-required && systemctl poweroff --no-wall ;;
   *) back_to show_main_menu ;;
   esac
 }
@@ -468,6 +523,10 @@ go_to_menu() {
   esac
 }
 
+# Allow user extensions and overrides
+USER_EXTENSIONS="$HOME/.config/omarchy/extensions/menu.sh"
+[[ -f $USER_EXTENSIONS ]] && source "$USER_EXTENSIONS"
+
 if [[ -n "$1" ]]; then
   BACK_TO_EXIT=true
   go_to_menu "$1"

bin/omarchy-menu-keybindings

@@ -212,18 +212,26 @@ prioritize_entries() {
   cut -f2-
 }
 
-monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
+output_keybindings() {
-menu_height=$((monitor_height * 40 / 100))
+  build_keymap_cache
 
-build_keymap_cache
+  {
-
-{
     dynamic_bindings
     static_bindings
-} |
+  } |
     sort -u |
     parse_keycodes |
     parse_bindings |
-  prioritize_entries |
+    prioritize_entries
-  walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
+}
+
+if [[ "$1" == "--print" || "$1" == "-p" ]]; then
+  output_keybindings
+else
+  monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
+  menu_height=$((monitor_height * 40 / 100))
+
+  output_keybindings |
+    walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
+fi
 

bin/omarchy-pkg-pinned

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-PINNED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.pinned"
-
-if [[ -f $PINNED_PACKAGES_FILE ]]; then
-  tr '\r\n' ',' <"$PINNED_PACKAGES_FILE" | sed 's/,$//'
-fi

bin/omarchy-refresh-applications

@@ -10,4 +10,8 @@ mkdir -p ~/.local/share/applications
 cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/
 cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/
 
+# Refresh the webapps
+bash $OMARCHY_PATH/install/packaging/icons.sh
+bash $OMARCHY_PATH/install/packaging/webapps.sh
+
 update-desktop-database ~/.local/share/applications

bin/omarchy-refresh-chromium

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+CONFIG_FILE="$HOME/.config/chromium-flags.conf"
+INSTALL_GOOGLE_ACCOUNTS=false
+
+# Check if google accounts were installed
+if [[ -f "$CONFIG_FILE" ]] && \
+  grep -q -- "--oauth2-client-id" "$CONFIG_FILE" && \
+  grep -q -- "--oauth2-client-secret" "$CONFIG_FILE"; then
+  INSTALL_GOOGLE_ACCOUNTS=true
+fi
+
+# Refresh the Chromium configuration
+omarchy-refresh-config chromium-flags.conf
+
+# Re-install Google accounts if previously configured
+if [[ "$INSTALL_GOOGLE_ACCOUNTS" == true ]]; then
+  omarchy-install-chromium-google-account
+fi

bin/omarchy-refresh-limine

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [[ -f /boot/EFI/linux/omarchy_linux.efi ]] && [[ -f /boot/EFI/linux/$(cat /etc/machine-id)_linux.efi ]]; then
+if [[ -f /boot/EFI/Linux/omarchy_linux.efi ]] && [[ -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi ]]; then
   echo "Cleanup extra UKI"
   sudo rm -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi
 fi

bin/omarchy-refresh-pacman

@@ -1,4 +1,22 @@
 #!/bin/bash
 
+# Take backup of existing files
+sudo cp -f /etc/pacman.conf /etc/pacman.conf.bak
+sudo cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak
+
 sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
-omarchy-refresh-pacman-mirrorlist
+
+if [[ $1 == "edge" ]]; then
+  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
+  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf
+  echo "Setting channel to edge"
+else
+  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
+  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf
+  echo "Setting channel to stable"
+fi
+
+echo
+
+# Reset all package DBs and then update
+sudo pacman -Syyu --noconfirm

bin/omarchy-refresh-pacman-mirrorlist

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [[ $1 == "edge" ]]; then
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
-else
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
-fi

bin/omarchy-refresh-pacman-opr-server

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [[ $1 == "edge" ]]; then
-  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf
-else
-  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf
-fi

bin/omarchy-refresh-walker

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# Ensure walker is set to autostart
+mkdir -p ~/.config/autostart/
+cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/
+systemctl --user daemon-reload
+
 omarchy-refresh-config walker/config.toml
 omarchy-refresh-config elephant/calc.toml
 omarchy-refresh-config elephant/desktopapplications.toml

bin/omarchy-remove-dev-env

@@ -0,0 +1,102 @@
+#!/bin/bash
+
+if [[ -z "$1" ]]; then
+  echo "Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure>" >&2
+  exit 1
+fi
+
+remove_php() {
+  sudo pacman -Rns --noconfirm php composer php-sqlite xdebug 2>/dev/null || true
+}
+
+case "$1" in
+ruby)
+  echo -e "Removing Ruby...\n"
+  mise uninstall ruby --all
+  mise rm -g ruby
+  rm -f ~/.gemrc
+  ;;
+node)
+  echo -e "Removing Node.js...\n"
+  mise uninstall node --all
+  mise rm -g node
+  ;;
+bun)
+  echo -e "Removing Bun...\n"
+  mise uninstall bun --all
+  mise rm -g bun
+  ;;
+deno)
+  echo -e "Removing Deno...\n"
+  mise uninstall deno --all
+  mise rm -g deno
+  ;;
+go)
+  echo -e "Removing Go...\n"
+  mise uninstall go --all
+  mise rm -g go
+  ;;
+php)
+  echo -e "Removing PHP...\n"
+  remove_php
+  ;;
+laravel)
+  echo -e "Removing Laravel...\n"
+  composer global remove laravel/installer 2>/dev/null || true
+  ;;
+symfony)
+  echo -e "Removing Symfony CLI...\n"
+  sudo pacman -Rns --noconfirm symfony-cli 2>/dev/null || true
+  ;;
+python)
+  echo -e "Removing Python...\n"
+  mise uninstall python --all
+  mise rm -g python
+  rm -rf ~/.local/bin/uv ~/.local/bin/uvx ~/.cargo/bin/uv 2>/dev/null || true
+  ;;
+elixir|phoenix)
+  echo -e "Removing Elixir/Erlang...\n"
+  mise uninstall elixir --all
+  mise uninstall erlang --all
+  mise rm -g elixir
+  mise rm -g erlang
+  ;;
+zig)
+  echo -e "Removing Zig...\n"
+  mise uninstall zig --all
+  mise uninstall zls --all
+  mise rm -g zig
+  mise rm -g zls
+  ;;
+rust)
+  echo -e "Removing Rust...\n"
+  rustup self uninstall -y 2>/dev/null || true
+  ;;
+java)
+  echo -e "Removing Java...\n"
+  mise uninstall java --all
+  mise rm -g java
+  ;;
+dotnet)
+  echo -e "Removing .NET...\n"
+  mise uninstall dotnet --all
+  mise rm -g dotnet
+  ;;
+ocaml)
+  echo -e "Removing OCaml...\n"
+  opam switch remove default -y 2>/dev/null || true
+  rm -rf ~/.opam 2>/dev/null || true
+  sudo rm -f /usr/local/bin/opam 2>/dev/null || true
+  ;;
+clojure)
+  echo -e "Removing Clojure...\n"
+  mise uninstall clojure --all
+  mise rm -g clojure
+  ;;
+*)
+  echo "Unknown environment: $1"
+  exit 1
+  ;;
+esac
+
+echo -e "\nDone!"

bin/omarchy-restart-walker

@@ -1,21 +1,22 @@
 #!/bin/bash
 
-pkill elephant
+restart_services() {
-pkill walker
+  if systemctl --user is-enabled elephant.service &>/dev/null; then
+    systemctl --user restart elephant.service
+  fi
+
+  if systemctl --user is-enabled app-walker@autostart.service &>/dev/null; then
+    systemctl --user restart app-walker@autostart.service
+  else
+    echo -e "\e[31mUnable to restart Walker -- RESTART MANUALLY\e[0m"
+  fi
+}
 
-# Detect if we're running as root (from pacman hook)
 if [[ $EUID -eq 0 ]]; then
-  # Get the owner of this script to determine which user to run as
   SCRIPT_OWNER=$(stat -c '%U' "$0")
   USER_UID=$(id -u "$SCRIPT_OWNER")
-
-  # Restart services as the script owner
   systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
-    bash -c "
+    bash -c "$(declare -f restart_services); restart_services"
-      systemctl --user restart elephant.service
-      setsid walker --gapplication-service &
-    "
 else
-  systemctl --user restart elephant.service
+  restart_services
-  setsid walker --gapplication-service &
 fi

bin/omarchy-theme-bg-install

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+CURRENT_THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name")
+THEME_USER_BACKGROUNDS="$HOME/.config/omarchy/backgrounds/$CURRENT_THEME_NAME"
+
+mkdir -p "$THEME_USER_BACKGROUNDS"
+nautilus "$THEME_USER_BACKGROUNDS"

bin/omarchy-theme-bg-next

@@ -2,10 +2,12 @@
 
 # Cycles through the background images available
 
-BACKGROUNDS_DIR="$HOME/.config/omarchy/current/theme/backgrounds/"
+THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name" 2>/dev/null)
+THEME_BACKGROUNDS_PATH="$HOME/.config/omarchy/current/theme/backgrounds/"
+USER_BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-mapfile -d '' -t BACKGROUNDS < <(find -L "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
+mapfile -d '' -t BACKGROUNDS < <(find -L "$USER_BACKGROUNDS_PATH" "$THEME_BACKGROUNDS_PATH" -maxdepth 1 -type f -print0 2>/dev/null | sort -z)
 TOTAL=${#BACKGROUNDS[@]}
 
 if [[ $TOTAL -eq 0 ]]; then

bin/omarchy-theme-current

@@ -1,3 +1,9 @@
 #!/bin/bash
 
-basename "$(realpath "$HOME/.config/omarchy/current/theme")" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'
+THEME_NAME_PATH="$HOME/.config/omarchy/current/theme.name"
+
+if [[ -f $THEME_NAME_PATH ]]; then
+  cat $THEME_NAME_PATH | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'
+else
+  echo "Unknown"
+fi

bin/omarchy-theme-list

@@ -1,5 +1,8 @@
 #!/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')"
+  find ~/.config/omarchy/themes/ -mindepth 1 -maxdepth 1 \( -type d -o -type l \) -printf '%f\n'
+  find "$OMARCHY_PATH/themes/" -mindepth 1 -maxdepth 1 -type d -printf '%f\n'
+} | sort -u | while read -r name; do
+  echo "$name" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'
 done

bin/omarchy-theme-next

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-THEMES_DIR="$HOME/.config/omarchy/themes/"
-CURRENT_THEME_LINK="$HOME/.config/omarchy/current/theme"
-
-THEMES=($(find "$THEMES_DIR" -mindepth 1 -maxdepth 1 | sort))
-TOTAL=${#THEMES[@]}
-
-# Get current theme from symlink
-if [[ -L "$CURRENT_THEME_LINK" ]]; then
-  CURRENT_THEME=$(realpath "$CURRENT_THEME_LINK")
-else
-  # Default to first theme if no symlink exists
-  CURRENT_THEME=$(realpath "${THEMES[0]}")
-fi
-
-# Find current theme index
-INDEX=0
-for i in "${!THEMES[@]}"; do
-  THEMES[$i]=$(realpath "${THEMES[$i]}")
-
-  if [[ "${THEMES[$i]}" == "$CURRENT_THEME" ]]; then
-    INDEX=$i
-    break
-  fi
-done
-
-# Get next theme (wrap around)
-NEXT_INDEX=$(((INDEX + 1) % TOTAL))
-NEW_THEME=${THEMES[$NEXT_INDEX]}
-NEW_THEME_NAME=$(basename "$NEW_THEME")
-
-omarchy-theme-set $NEW_THEME_NAME
-notify-send "Theme changed to $NEW_THEME_NAME" -t 2000

bin/omarchy-theme-remove

@@ -7,7 +7,7 @@ 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[@]}")
+    THEME_NAME=$(printf '%s\n' "${extra_themes[@]}" | sort | gum choose --header="Remove extra theme")
   else
     echo "No extra themes installed."
     exit 1
@@ -31,10 +31,5 @@ if [ ! -d "$THEME_PATH" ]; then
   exit 1
 fi
 
-# Move to the next theme if the current theme is the one being removed
-if [ "$(readlink -f "$CURRENT_DIR/theme")" = "$(readlink -f "$THEME_PATH")" ]; then
-  omarchy-theme-next
-fi
-
 # Now remove the theme directory for THEME_NAME
 rm -rf "$THEME_PATH"

bin/omarchy-theme-set

@@ -1,24 +1,42 @@
 #!/bin/bash
 
-if [[ -z $1 && $1 != "CNCLD" ]]; then
+if [[ -z $1 ]]; then
   echo "Usage: omarchy-theme-set <theme-name>"
   exit 1
 fi
 
-THEMES_DIR="$HOME/.config/omarchy/themes/"
+CURRENT_THEME_PATH="$HOME/.config/omarchy/current/theme"
-CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
+NEXT_THEME_PATH="$HOME/.config/omarchy/current/next-theme"
+USER_THEMES_PATH="$HOME/.config/omarchy/themes"
+OMARCHY_THEMES_PATH="$OMARCHY_PATH/themes"
 
 THEME_NAME=$(echo "$1" | sed -E 's/<[^>]+>//g' | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
-THEME_PATH="$THEMES_DIR/$THEME_NAME"
 
-# Check if the theme entered exists
+if [[ -d "$USER_THEMES_PATH/$THEME_NAME" ]]; then
-if [[ ! -d "$THEME_PATH" ]]; then
+  THEME_PATH="$USER_THEMES_PATH/$THEME_NAME"
-  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR"
+elif [[ -d "$OMARCHY_THEMES_PATH/$THEME_NAME" ]]; then
+  THEME_PATH="$OMARCHY_THEMES_PATH/$THEME_NAME"
+else
+  echo "Theme '$THEME_NAME' does not exist"
   exit 1
 fi
 
-# Update theme symlinks
+# Setup clean next theme directory (for atomic theme config swapping)
-ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
+rm -rf "$NEXT_THEME_PATH"
+mkdir -p "$NEXT_THEME_PATH"
+
+# Copy static configs
+cp -r "$THEME_PATH/"* "$NEXT_THEME_PATH/" 2>/dev/null
+
+# Generate dynamic configs
+omarchy-theme-set-templates
+
+# Swap next theme in as current
+rm -rf "$CURRENT_THEME_PATH"
+mv "$NEXT_THEME_PATH" "$CURRENT_THEME_PATH"
+
+# Store theme name for reference
+echo "$THEME_NAME" > "$HOME/.config/omarchy/current/theme.name"
 
 # Change background with theme
 omarchy-theme-bg-next
@@ -31,12 +49,14 @@ omarchy-restart-swayosd
 omarchy-restart-terminal
 hyprctl reload
 pkill -SIGUSR2 btop
+# pkill -SIGUSR2 opencode
 makoctl reload
 
-# Change gnome, browser, vscode, cursor themes
+# Change app-specific themes
 omarchy-theme-set-gnome
 omarchy-theme-set-browser
 omarchy-theme-set-vscode
+omarchy-theme-set-vscodium
 omarchy-theme-set-cursor
 omarchy-theme-set-obsidian
 

bin/omarchy-theme-set-cursor

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

bin/omarchy-theme-set-templates

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+TEMPLATES_DIR="$OMARCHY_PATH/default/themed"
+NEXT_THEME_DIR="$HOME/.config/omarchy/current/next-theme"
+COLORS_FILE="$NEXT_THEME_DIR/colors.toml"
+
+# Convert hex color to decimal RGB (e.g., "#1e1e2e" -> "30,30,46")
+hex_to_rgb() {
+  local hex="${1#\#}"
+  printf "%d,%d,%d" "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
+}
+
+# Only generate dynamic templates for themes with a colors.toml definition
+if [[ -f $COLORS_FILE ]]; then
+  # Parse TOML using yq (treating it as YAML since the flat key=value structure is compatible)
+  # We convert 'key = value' to 'key: value' to make it valid YAML, then use yq/jq to generate the replacement commands.
+  sed_script=$(mktemp)
+
+  # Generate standard and _strip substitutions
+  sed 's/=/:/' "$COLORS_FILE" | yq -r 'to_entries[] | "s|{{ \(.key) }}|\(.value)|g", "s|{{ \(.key)_strip }}|\(.value | sub("^#";""))|g"' > "$sed_script"
+
+  # Generate _rgb substitutions for hex colors
+  while IFS='=' read -r key value; do
+    key=$(echo "$key" | xargs)
+    value=$(echo "$value" | xargs | tr -d '"')
+    if [[ $value =~ ^# ]]; then
+      rgb=$(hex_to_rgb "$value")
+      echo "s|{{ ${key}_rgb }}|${rgb}|g" >> "$sed_script"
+    fi
+  done < "$COLORS_FILE"
+
+  shopt -s nullglob
+  for tpl in "$TEMPLATES_DIR"/*.tpl; do
+    filename=$(basename "$tpl" .tpl)
+    output_path="$NEXT_THEME_DIR/$filename"
+
+    # Don't overwrite configs already exists in the output directory (copied from theme specific folder)
+    if [[ ! -f $output_path ]]; then
+      sed -f "$sed_script" "$tpl" > "$output_path"
+    fi
+  done
+
+  rm "$sed_script"
+fi

bin/omarchy-theme-set-vscode

@@ -7,8 +7,6 @@
 EDITOR_CMD="${1:-code}"
 SETTINGS_PATH="${2:-$HOME/.config/Code/User/settings.json}"
 SKIP_FLAG="${3:-$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes}"
-EDITOR_NAME="${4:-VS Code}"
-
 VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json"
 
 if omarchy-cmd-present "$EDITOR_CMD" && [[ ! -f "$SKIP_FLAG" ]]; then
@@ -16,7 +14,7 @@ if omarchy-cmd-present "$EDITOR_CMD" && [[ ! -f "$SKIP_FLAG" ]]; then
     theme_name=$(jq -r '.name' "$VS_CODE_THEME")
     extension=$(jq -r '.extension' "$VS_CODE_THEME")
 
-    # Install $EDITOR_NAME theme extension
+    # Install theme extension
     if [[ -n "$extension" ]] && ! "$EDITOR_CMD" --list-extensions | grep -Fxq "$extension"; then
       "$EDITOR_CMD" --install-extension "$extension" >/dev/null
     fi
@@ -39,7 +37,7 @@ if omarchy-cmd-present "$EDITOR_CMD" && [[ ! -f "$SKIP_FLAG" ]]; then
       "s/(\"workbench.colorTheme\"[[:space:]]*:[[:space:]]*\")[^\"]*(\")/\1$theme_name\2/" \
       "$SETTINGS_PATH"
   else
-    # Remove theme from settings.json when the theme doesn't have $EDITOR_NAME support
+    # Remove theme from settings.json when the theme doesn't have editor support
     if [[ -f "$SETTINGS_PATH" ]]; then
       sed -i --follow-symlinks -E 's/\"workbench\.colorTheme\"[[:space:]]*:[^,}]*,?//' "$SETTINGS_PATH"
     fi

bin/omarchy-theme-set-vscodium

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

bin/omarchy-tui-install

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if [ "$#" -ne 4 ]; then
   echo -e "\e[32mLet's create a TUI shortcut you can start with the app launcher.\n\e[0m"
   APP_NAME=$(gum input --prompt "Name> " --placeholder "My TUI")

bin/omarchy-tui-remove

@@ -1,12 +1,14 @@
 #!/bin/bash
 
+set -e
+
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"
 
 if [ "$#" -eq 0 ]; then
   # Find all TUIs
   while IFS= read -r -d '' file; do
-    if grep -q '^Exec=.*$TERMINAL.*-e' "$file"; then
+    if grep -qE '^Exec=.*(\$TERMINAL|xdg-terminal-exec).*-e' "$file"; then
       TUIS+=("$(basename "${file%.desktop}")")
     fi
   done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)

bin/omarchy-update

@@ -4,7 +4,7 @@ set -e
 
 trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m"' ERR
 
-if omarchy-update-confirm; then
+if [[ $1 == "-y" ]] || omarchy-update-confirm; then
   omarchy-snapshot create || [ $? -eq 127 ]
   omarchy-update-git
   omarchy-update-perform

bin/omarchy-update-confirm

@@ -1,10 +1,14 @@
 #!/bin/bash
 
 gum style --border normal --border-foreground 6 --padding "1 2" \
-  "Ready to update Omarchy?" \
+  "Ready to update?" \
   "" \
   "• You cannot stop the update once you start!" \
-  "• Make sure you're connected to power or have a full battery"
+  "• Make sure you're connected to power or have a full battery" \
+  "" \
+  "What's new: https://github.com/basecamp/omarchy/releases"
+
+echo
 
 if ! gum confirm "Continue with update?"; then
   echo "Update cancelled"

bin/omarchy-update-git

@@ -5,4 +5,4 @@ set -e
 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
+git -C $OMARCHY_PATH --no-pager diff --check || git -C $OMARCHY_PATH reset --merge

bin/omarchy-update-perform

@@ -2,6 +2,10 @@
 
 set -e
 
+# Ensure screensaver/sleep doesn't set in during updates
+hyprctl dispatch tagwindow +noidle &> /dev/null || true
+
+# Perform all update steps
 omarchy-update-time
 omarchy-update-keyring
 omarchy-update-available-reset
@@ -9,3 +13,6 @@ omarchy-update-system-pkgs
 omarchy-migrate
 omarchy-hook post-update
 omarchy-update-restart
+
+# Re-enable screensaver/sleep after updates
+hyprctl dispatch tagwindow -- -noidle &> /dev/null || true

bin/omarchy-update-restart

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $2}')" ]; then
-  gum confirm "Linux kernel has been updated. Reboot?" && omarchy-state clear re*-required && sudo reboot now
+  gum confirm "Linux kernel has been updated. Reboot?" && omarchy-cmd-reboot
 
 elif [ -f "$HOME/.local/state/omarchy/reboot-required" ]; then
-  gum confirm "Updates require reboot. Ready?" && omarchy-state clear re*-required && sudo reboot now
+  gum confirm "Updates require reboot. Ready?" && omarchy-cmd-reboot
 fi
 
 for file in "$HOME"/.local/state/omarchy/restart-*-required; do

bin/omarchy-update-system-pkgs

@@ -3,7 +3,7 @@
 set -e
 
 echo -e "\e[32m\nUpdate system packages\e[0m"
-sudo pacman -Syu --noconfirm
+sudo pacman -Syyu --noconfirm
 
 # Update AUR packages if any are installed
 if pacman -Qem >/dev/null; then

bin/omarchy-update-without-idle

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# No-op now that omarchy-update-perform is responsible for idle management.
+# But this file can't be removed since it was referenced in old omarchy-update files,
+# which would fail if this file is missing.

bin/omarchy-version-channel

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if grep -q "https://stable-mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
+  mirror="stable"
+elif grep -q "https://mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
+  mirror="edge"
+else
+  mirror="unknown"
+fi
+
+if grep -q "https://pkgs.omarchy.org/stable/" /etc/pacman.conf; then
+  pkgs="stable"
+elif grep -q "https://pkgs.omarchy.org/edge/" /etc/pacman.conf; then
+  pkgs="edge"
+else
+  pkgs="unknown"
+fi
+
+if [[ $mirror == $pkgs ]]; then
+  echo $mirror
+else
+  echo "$mirror / $pkgs"
+fi

bin/omarchy-version-pkgs

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+date -d "$(grep upgraded /var/log/pacman.log | tail -1 | sed -E 's/\[([^]]+)\].*/\1/')" "+%A, %B %d %Y at %H:%M"

bin/omarchy-webapp-install

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if [ "$#" -lt 3 ]; then
   echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
   APP_NAME=$(gum input --prompt "Name> " --placeholder "My favorite web app")

bin/omarchy-webapp-remove

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"
 

bin/omarchy-windows-vm

@@ -254,6 +254,25 @@ remove_windows() {
   echo "Windows VM removal completed!"
 }
 
+wait_for_rdp_ready() {
+  local WIN_USER="$1"
+  local WIN_PASS="$2"
+  local TIMEOUT=240
+  local SECONDS=0
+
+  echo "Waiting for Windows VM to be ready..."
+
+  while ! timeout 5s xfreerdp3 /auth-only /cert:ignore /u:"$WIN_USER" /p:"$WIN_PASS" /v:127.0.0.1:3389 &>/dev/null; do
+    sleep 2
+    if [ $SECONDS -gt $TIMEOUT ]; then
+      echo "❌ Timeout waiting for RDP!"
+      echo "   The VM might still be installing Windows."
+      echo "   Check progress at: http://127.0.0.1:8006"
+      return 1
+    fi
+  done
+}
+
 launch_windows() {
   KEEP_ALIVE=false
   if [ "$1" = "--keep-alive" ] || [ "$1" = "-k" ]; then
@@ -266,6 +285,14 @@ launch_windows() {
     exit 1
   fi
 
+  # Extract credentials from compose file
+  WIN_USER=$(grep "USERNAME:" "$COMPOSE_FILE" | sed 's/.*USERNAME: "\(.*\)"/\1/')
+  WIN_PASS=$(grep "PASSWORD:" "$COMPOSE_FILE" | sed 's/.*PASSWORD: "\(.*\)"/\1/')
+
+  # Use defaults if not found
+  [ -z "$WIN_USER" ] && WIN_USER="docker"
+  [ -z "$WIN_PASS" ] && WIN_PASS="admin"
+
   # Check if container is already running
   CONTAINER_STATUS=$(docker inspect --format='{{.State.Status}}' omarchy-windows 2>/dev/null)
 
@@ -282,32 +309,12 @@ launch_windows() {
       notify-send -u critical "Windows VM" "Failed to start Windows VM"
       exit 1
     fi
+  fi
 
-    # Wait for RDP to be ready
+  if ! wait_for_rdp_ready "$WIN_USER" "$WIN_PASS"; then
-    echo "Waiting for Windows VM to be ready..."
+    notify-send -u critical "Windows VM" "Did not come alive in time."
-    WAIT_COUNT=0
-    while ! nc -z 127.0.0.1 3389 2>/dev/null; do
-      sleep 2
-      WAIT_COUNT=$((WAIT_COUNT + 1))
-      if [ $WAIT_COUNT -gt 60 ]; then  # 2 minutes timeout
-        echo "❌ Timeout waiting for RDP!"
-        echo "   The VM might still be installing Windows."
-        echo "   Check progress at: http://127.0.0.1:8006"
     exit 1
   fi
-    done
-
-    # Give it a moment more to fully initialize
-    sleep 5
-  fi
-
-  # Extract credentials from compose file
-  WIN_USER=$(grep "USERNAME:" "$COMPOSE_FILE" | sed 's/.*USERNAME: "\(.*\)"/\1/')
-  WIN_PASS=$(grep "PASSWORD:" "$COMPOSE_FILE" | sed 's/.*PASSWORD: "\(.*\)"/\1/')
-
-  # Use defaults if not found
-  [ -z "$WIN_USER" ] && WIN_USER="docker"
-  [ -z "$WIN_PASS" ] && WIN_PASS="admin"
 
   # Build the connection info
   if [ "$KEEP_ALIVE" = true ]; then

config/brave-flags.conf

@@ -1,5 +1,6 @@
 --ozone-platform=wayland
 --ozone-platform-hint=wayland
 --enable-features=TouchpadOverscrollHistoryNavigation
+--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url
 # Chromium crash workaround for Wayland color management on Hyprland - see https://github.com/hyprwm/Hyprland/issues/11957
 --disable-features=WaylandWpColorManagerV1

config/fastfetch/config.jsonc

@@ -74,6 +74,12 @@
       "keyColor": "blue",
       "text": "branch=$(omarchy-version-branch); echo \"$branch\""
     },
+    {
+      "type": "command",
+      "key": "│ ├󰔫",
+      "keyColor": "blue",
+      "text": "channel=$(omarchy-version-channel); echo \"$channel\""
+    },
     {
       "type": "kernel",
       "key": "│ ├",
@@ -122,19 +128,25 @@
     "break",
     {
       "type": "custom",
-      "format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
+      "format": "\u001b[90m┌────────────────Age / Uptime / Update───────────────┐"
     },
     {
       "type": "command",
       "key": "󱦟 OS Age",
       "keyColor": "magenta",
-      "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
+      "text": "echo $(( ($(date +%s) - $(stat -c %W /)) / 86400 )) days"
     },
     {
       "type": "uptime",
       "key": "󱫐 Uptime",
       "keyColor": "magenta"
     },
+    {
+      "type": "command",
+      "key": " Update",
+      "keyColor": "magenta",
+      "text": "updated=$(omarchy-version-pkgs); echo \"$updated\""
+    },
     {
       "type": "custom",
       "format": "\u001b[90m└────────────────────────────────────────────────────┘"

config/hypr/bindings.conf

@@ -5,7 +5,6 @@ bindd = SUPER SHIFT, B, Browser, exec, omarchy-launch-browser
 bindd = SUPER SHIFT ALT, B, Browser (private), exec, omarchy-launch-browser --private
 bindd = SUPER SHIFT, M, Music, exec, omarchy-launch-or-focus spotify
 bindd = SUPER SHIFT, N, Editor, exec, omarchy-launch-editor
-bindd = SUPER SHIFT, T, Activity, exec, omarchy-launch-tui btop
 bindd = SUPER SHIFT, D, Docker, exec, omarchy-launch-tui lazydocker
 bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus ^signal$ "uwsm-app -- signal-desktop"
 bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus ^obsidian$ "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
@@ -15,6 +14,7 @@ bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm-app -- 1password
 # If your web app url contains #, type it as ## to prevent hyprland treating it as a comment
 bindd = SUPER SHIFT, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com"
 bindd = SUPER SHIFT ALT, A, Grok, exec, omarchy-launch-webapp "https://grok.com"
+bindd = SUPER SHIFT CTRL, A, opencode, exec, omarchy-launch-opencode
 bindd = SUPER SHIFT, C, Calendar, exec, omarchy-launch-webapp "https://app.hey.com/calendar/weeks/"
 bindd = SUPER SHIFT, E, Email, exec, omarchy-launch-webapp "https://app.hey.com"
 bindd = SUPER SHIFT, Y, YouTube, exec, omarchy-launch-webapp "https://youtube.com/"

config/hypr/hypridle.conf

@@ -11,7 +11,7 @@ listener {
 }
 
 listener {
-    timeout = 300                      # 5min
+    timeout = 150                      # 5min
     on-timeout = loginctl lock-session # lock screen when timeout has passed
 }
 

config/hypr/hyprlock.conf

@@ -1,5 +1,9 @@
 source = ~/.config/omarchy/current/theme/hyprlock.conf
 
+general {
+    ignore_empty_input = true
+}
+
 background {
     monitor =
     color = $color

config/hypr/input.conf

@@ -24,12 +24,15 @@ input {
 
     # Control the speed of your scrolling
     scroll_factor = 0.4
+
+    # Left-click-and-drag with three fingers
+    # drag_3fg = 1
   }
 }
 
 # Scroll nicely in the terminal
-windowrule = scrolltouchpad 1.5, class:(Alacritty|kitty)
+windowrule = match:class (Alacritty|kitty), scroll_touchpad 1.5
-windowrule = scrolltouchpad 0.2, class:com.mitchellh.ghostty
+windowrule = match:class com.mitchellh.ghostty, scroll_touchpad 0.2
 
 # Enable touchpad gestures for changing workspaces
 # See https://wiki.hyprland.org/Configuring/Gestures/

config/hypr/xdph.conf

@@ -1,3 +1,4 @@
 screencopy {
     allow_token_by_default = true
+    custom_picker_binary = hyprland-preview-share-picker
 }

config/hyprland-preview-share-picker/config.yaml

@@ -0,0 +1,71 @@
+# paths to stylesheets on the filesystem which should be applied to the application
+#
+# relative paths are resolved relative to the location of the config file
+stylesheets: ["../omarchy/current/theme/hyprland-preview-share-picker.css"]
+# default page selected when the picker is opened
+default_page: windows
+
+window:
+  # height of the application window
+  height: 500
+  # width of the application window
+  width: 1000
+
+image:
+  # size to which the images should be internally resized to reduce the memory footprint
+  resize_size: 500
+  # target size of the longer side of the image widget
+  widget_size: 150
+
+classes:
+  # css classname of the window
+  window: window
+  # css classname of the card containing an image and a label
+  image_card: card
+  # css classname of the card containing an image and a label when the image is still being loaded
+  image_card_loading: card-loading
+  # css classname of the image inside the card
+  image: image
+  # css classname of the label inside the card
+  image_label: image-label
+  # css classname of the notebook containing all pages
+  notebook: notebook
+  # css classname of a label of the notebook
+  tab_label: tab-label
+  # css classname of a notebook page (e.g. windows container)
+  notebook_page: page
+  # css classname of the region selection button
+  region_button: region-button
+  # css classname of the button containing the session restore checkbox and label
+  restore_button: restore-button
+
+windows:
+  # minimum amount of image cards per row on the windows page
+  min_per_row: 3
+  # maximum amount of image cards per row on the windows page
+  max_per_row: 999
+  # number of clicks needed to select a window
+  clicks: 1
+  # spacing in pixels between the window cards
+  spacing: 12
+
+outputs:
+  # number of clicks needed to select an output
+  clicks: 1
+  # spacing in pixels between the outputs in the layout
+  # note: the spacing is applied from both sides (the gap is `spacing * 2`)
+  spacing: 6
+  # show the label with the output name
+  show_label: false
+  # size the output cards respectively to their scaling
+  respect_output_scaling: true
+
+region:
+  # command to run for region selection
+  # the output needs to be in the <output>@<x>,<y>,<w>,<h> (e.g. DP-3@2789,436,756,576) format
+  command: slurp -f '%o@%x,%y,%w,%h'
+
+# hide the token restore checkbox and use the default value instead
+hide_token_restore: true
+# enable debug logs by default
+debug: false

config/kitty/kitty.conf

@@ -7,9 +7,7 @@ font_size        9.0
 
 # Window
 window_padding_width 14
-window_padding_height 14
 hide_window_decorations yes
-show_window_resize_notification no
 confirm_os_window_close 0
 
 # Keybindings
@@ -17,7 +15,6 @@ map ctrl+insert copy_to_clipboard
 map shift+insert paste_from_clipboard
 
 # Allow remote access
-single_instance yes
 allow_remote_control yes
 
 # Aesthetics

config/omarchy/extensions/menu.sh

@@ -0,0 +1,17 @@
+# Overwrite parts of the omarchy-menu with user-specific submenus.
+# See $OMARCHY_PATH/bin/omarchy-menu for functions that can be overwritten.
+#
+# WARNING: Overwritten functions will obviously not be updated when Omarchy changes.
+#
+# Example adding suspend to the system menu:
+#
+# show_system_menu() {
+#   case $(menu "System" "  Lock\n󱄄  Screensaver\n󰒲  Suspend\n󰜉  Restart\n󰐥  Shutdown") in
+#   *Lock*) omarchy-lock-screen ;;
+#   *Screensaver*) omarchy-launch-screensaver force ;;
+#   *Suspend*) systemctl suspend ;;
+#   *Restart*) omarchy-cmd-reboot ;;
+#   *Shutdown*) omarchy-cmd-shutdown ;;
+#   *) back_to show_main_menu ;;
+#   esac
+# }

config/opencode/opencode.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://opencode.ai/config.json",
+  "theme": "system"
+}

config/walker/config.toml

@@ -10,12 +10,15 @@ hide_action_hints = true                                                    # gl
 [keybinds]
 quick_activate = []
 
+[columns]
+symbols = 1 # providers to be queried by default
+
 [providers]
 max_results = 256 # 256 should be enough for everyone
 default = [
   "desktopapplications",
   "websearch",
-] # providers to be queried by default
+]
 
 [[providers.prefixes]]
 prefix = "/"
@@ -40,3 +43,7 @@ provider = "websearch"
 [[providers.prefixes]]
 prefix = "$"
 provider = "clipboard"
+
+[[emergencies]]
+text = "Restart Walker"
+command = "omarchy-restart-walker"

config/waybar/config.jsonc

@@ -57,7 +57,8 @@
   "cpu": {
     "interval": 5,
     "format": "󰍛",
-    "on-click": "omarchy-launch-or-focus-tui btop"
+    "on-click": "omarchy-launch-or-focus-tui btop",
+    "on-click-right": "alacritty"
   },
   "clock": {
     "format": "{:L%A %H:%M}",
@@ -99,6 +100,7 @@
   },
   "bluetooth": {
     "format": "",
+    "format-off": "󰂲",
     "format-disabled": "󰂲",
     "format-connected": "󰂱",
     "format-no-controller": "",
@@ -107,7 +109,7 @@
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "omarchy-launch-or-focus-tui wiremix",
+    "on-click": "omarchy-launch-audio",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
@@ -126,7 +128,11 @@
   },
   "custom/expand-icon": {
     "format": "",
-    "tooltip": false
+    "tooltip": false,
+    "on-scroll-up": "",
+    "on-scroll-down": "",
+    "on-scroll-left": "",
+    "on-scroll-right": ""
   },
   "custom/screenrecording-indicator": {
     "on-click": "omarchy-cmd-screenrecord",

default/bash/aliases

@@ -31,6 +31,7 @@ alias ...='cd ../..'
 alias ....='cd ../../..'
 
 # Tools
+alias c='opencode'
 alias d='docker'
 alias r='rails'
 n() { if [ "$#" -eq 0 ]; then nvim .; else nvim "$@"; fi; }

default/elephant/omarchy_themes.lua

@@ -4,45 +4,64 @@
 Name = "omarchythemes"
 NamePretty = "Omarchy Themes"
 
+-- Check if file exists using Lua (no subprocess)
+local function file_exists(path)
+  local f = io.open(path, "r")
+  if f then
+    f:close()
+    return true
+  end
+  return false
+end
+
+-- Get first matching file from directory using ls (single call for fallback)
+local function first_image_in_dir(dir)
+  local handle = io.popen("ls -1 '" .. dir .. "' 2>/dev/null | head -n 1")
+  if handle then
+    local file = handle:read("*l")
+    handle:close()
+    if file and file ~= "" then
+      return dir .. "/" .. file
+    end
+  end
+  return nil
+end
+
 -- The main function elephant will call
 function GetEntries()
   local entries = {}
-  local theme_dir = os.getenv("HOME") .. "/.config/omarchy/themes"
+  local user_theme_dir = os.getenv("HOME") .. "/.config/omarchy/themes"
+  local omarchy_path = os.getenv("OMARCHY_PATH") or ""
+  local default_theme_dir = omarchy_path .. "/themes"
 
-  -- First, get all theme directories
+  local seen_themes = {}
-  local find_dirs_cmd = "find -L '" .. theme_dir .. "' -mindepth 1 -maxdepth 1 -type d 2>/dev/null"
 
-  local handle = io.popen(find_dirs_cmd)
+  -- Helper function to process themes from a directory
+  local function process_themes_from_dir(theme_dir)
+    -- Single find call to get all theme directories
+    local handle = io.popen("find -L '" .. theme_dir .. "' -mindepth 1 -maxdepth 1 -type d 2>/dev/null")
     if not handle then
-    return entries
+      return
     end
 
     for theme_path in handle:lines() do
       local theme_name = theme_path:match(".*/(.+)$")
 
-    if theme_name then
+      if theme_name and not seen_themes[theme_name] then
-      -- find preview image
+        seen_themes[theme_name] = true
-      local find_preview_cmd = "find -L '"
+
-        .. theme_path
+        -- Check for preview images directly (no subprocess)
-        .. "' -maxdepth 1 -type f \\( -name 'preview.png' -o -name 'preview.jpg' \\) 2>/dev/null | head -n 1"
-      local preview_handle = io.popen(find_preview_cmd)
         local preview_path = nil
+        local preview_png = theme_path .. "/preview.png"
+        local preview_jpg = theme_path .. "/preview.jpg"
 
-      if preview_handle then
+        if file_exists(preview_png) then
-        preview_path = preview_handle:read("*l")
+          preview_path = preview_png
-        preview_handle:close()
+        elseif file_exists(preview_jpg) then
-      end
+          preview_path = preview_jpg
-
+        else
-      -- If no preview found, use first image from backgrounds folder
+          -- Fallback: get first image from backgrounds (one ls call)
-      if not preview_path or preview_path == "" then
+          preview_path = first_image_in_dir(theme_path .. "/backgrounds")
-        local bg_cmd = "find -L '"
-          .. theme_path
-          .. "/backgrounds' -maxdepth 1 -type f \\( -iname '*.png' -o -iname '*.jpg' -o -iname '*.jpeg' \\) 2>/dev/null | head -n 1"
-        local bg_handle = io.popen(bg_cmd)
-        if bg_handle then
-          preview_path = bg_handle:read("*l")
-          bg_handle:close()
-        end
         end
 
         if preview_path and preview_path ~= "" then
@@ -65,6 +84,13 @@ function GetEntries()
     end
 
     handle:close()
+  end
+
+  -- Process user themes first (they take precedence)
+  process_themes_from_dir(user_theme_dir)
+  -- Then process default themes (only if not already seen)
+  process_themes_from_dir(default_theme_dir)
+
   return entries
 end
 

default/ghostty/screensaver

@@ -0,0 +1,3 @@
+window-padding-x = 0
+window-padding-y = 0
+window-padding-color = "extend-always"

default/hypr/apps/1password.conf

@@ -1,2 +1,2 @@
-windowrule = noscreenshare, class:^(1[p|P]assword)$
+windowrule = no_screen_share on, match:class ^(1[p|P]assword)$
-windowrule = tag +floating-window, class:^(1[p|P]assword)$
+windowrule = tag +floating-window, match:class ^(1[p|P]assword)$

default/hypr/apps/bitwarden.conf

@@ -1 +1,2 @@
-windowrule = noscreenshare, class:^(Bitwarden)$
+windowrule = no_screen_share on, match:class ^(Bitwarden)$
+windowrule = tag +floating-window, match:class ^(Bitwarden)$

default/hypr/apps/browser.conf

@@ -1,13 +1,13 @@
 # Browser types
-windowrule = tag +chromium-based-browser, class:((google-)?[cC]hrom(e|ium)|[bB]rave-browser|[mM]icrosoft-edge|Vivaldi-stable|helium)
+windowrule = tag +chromium-based-browser, match:class ((google-)?[cC]hrom(e|ium)|[bB]rave-browser|[mM]icrosoft-edge|Vivaldi-stable|helium)
-windowrule = tag +firefox-based-browser, class:([fF]irefox|zen|librewolf)
+windowrule = tag +firefox-based-browser, match:class ([fF]irefox|zen|librewolf)
 
 # Force chromium-based browsers into a tile to deal with --app bug
-windowrule = tile, tag:chromium-based-browser
+windowrule = tile on, match:tag chromium-based-browser
 
 # Only a subtle opacity change, but not for video sites
-windowrule = opacity 1 0.97, tag:chromium-based-browser
+windowrule = opacity 1 0.97, match:tag chromium-based-browser
-windowrule = opacity 1 0.97, tag:firefox-based-browser
+windowrule = opacity 1 0.97, match:tag firefox-based-browser
 
 # Some video sites should never have opacity applied to them
-windowrule = opacity 1.0 1.0, initialTitle:((?i)(?:[a-z0-9-]+\.)*youtube\.com_/|app\.zoom\.us_/wc/home)
+windowrule = opacity 1.0 1.0, match:initial_title ((?i)(?:[a-z0-9-]+\.)*youtube\.com_/|app\.zoom\.us_/wc/home)

default/hypr/apps/davinci-resolve.conf

@@ -1,2 +1,2 @@
 # Focus floating DaVinci Resolve dialog windows
-windowrule = stayfocused, class:.*[Rr]esolve.*, floating:1
+windowrule = stay_focused on, match:class .*[Rr]esolve.*, match:float 1

default/hypr/apps/hyprshot.conf

@@ -1,2 +1,2 @@
 # Remove 1px border around hyprshot screenshots
-layerrule = noanim, selection
+layerrule = no_anim on, match:namespace selection

default/hypr/apps/jetbrains.conf

@@ -1,22 +1,22 @@
 # Fix splash screen showing in weird places and prevent annoying focus takeovers
-windowrule = tag +jetbrains-splash, class:^(jetbrains-.*)$, title:^(splash)$, floating:1
+windowrule = tag +jetbrains-splash, match:class ^(jetbrains-.*)$, match:title ^(splash)$, match:float 1
-windowrule = center, tag:jetbrains-splash
+windowrule = center on, match:tag jetbrains-splash
-windowrule = nofocus, tag:jetbrains-splash
+windowrule = no_focus on, match:tag jetbrains-splash
-windowrule = noborder, tag:jetbrains-splash
+windowrule = border_size 0, match:tag jetbrains-splash
 
 # Center popups/find windows
-windowrule = tag +jetbrains, class:^(jetbrains-.*), title:^()$, floating:1
+windowrule = tag +jetbrains, match:class ^(jetbrains-.*), match:title ^()$, match:float 1
-windowrule = center, tag:jetbrains
+windowrule = center on, match:tag jetbrains
 
 # Enabling this makes it possible to provide input in popup dialogs (search window, new file, etc.)
-windowrule = stayfocused, tag:jetbrains
+windowrule = stay_focused on, match:tag jetbrains
-windowrule = noborder, tag:jetbrains
+windowrule = border_size 0, match:tag jetbrains
 
 # For some reason tag:jetbrains does not work for size rule
-windowrule = size >50% >50%, class:^(jetbrains-.*), title:^()$, floating:1
+windowrule = min_size (monitor_w*0.5) (monitor_h*0.5), match:class ^(jetbrains-.*), match:title ^()$, match:float 1
 
 # Disable window flicker when autocomplete or tooltips appear
-windowrule = noinitialfocus, class:^(jetbrains-.*)$, title:^(win.*)$, floating:1
+windowrule = no_initial_focus on, match:class ^(jetbrains-.*)$, match:title ^(win.*)$, match:float 1
 
 # Disable mouse focus
-windowrule = nofollowmouse, class:^(jetbrains-.*)$
+windowrule = no_follow_mouse on, match:class ^(jetbrains-.*)$

default/hypr/apps/localsend.conf

@@ -1,3 +1,3 @@
 # Float LocalSend and fzf file picker
-windowrule = float, class:(Share|localsend)
+windowrule = float on, match:class (Share|localsend)
-windowrule = center, class:(Share|localsend)
+windowrule = center on, match:class (Share|localsend)

default/hypr/apps/pip.conf

@@ -1,9 +1,9 @@
 # Picture-in-picture overlays
-windowrule = tag +pip, title:(Picture.?in.?[Pp]icture)
+windowrule = tag +pip, match:title (Picture.?in.?[Pp]icture)
-windowrule = float, tag:pip
+windowrule = float on, match:tag pip
-windowrule = pin, tag:pip
+windowrule = pin on, match:tag pip
-windowrule = size 600 338, tag:pip
+windowrule = size 600 338, match:tag pip
-windowrule = keepaspectratio, tag:pip
+windowrule = keep_aspect_ratio on, match:tag pip
-windowrule = noborder, tag:pip
+windowrule = border_size 0, match:tag pip
-windowrule = opacity 1 1, tag:pip
+windowrule = opacity 1 1, match:tag pip
-windowrule = move 100%-w-40 4%, tag:pip
+windowrule = move (monitor_w-window_w-40) (monitor_h*0.04), match:tag pip

default/hypr/apps/qemu.conf

@@ -1 +1 @@
-windowrule = opacity 1 1, class:qemu
+windowrule = opacity 1 1, match:class qemu

default/hypr/apps/retroarch.conf

@@ -1,4 +1,3 @@
-windowrule = fullscreen, class:com.libretro.RetroArch
+windowrule = fullscreen on, match:class com.libretro.RetroArch
-windowrule = opacity 1 1, class:com.libretro.RetroArch
+windowrule = opacity 1 1, match:class com.libretro.RetroArch
-windowrule = idleinhibit fullscreen, class:com.libretro.RetroArch
+windowrule = idle_inhibit fullscreen, match:class com.libretro.RetroArch
-

default/hypr/apps/steam.conf

@@ -1,7 +1,7 @@
 # Float Steam
-windowrule = float, class:steam
+windowrule = float on, match:class steam
-windowrule = center, class:steam, title:Steam
+windowrule = center on, match:class steam, match:title Steam
-windowrule = opacity 1 1, class:steam
+windowrule = opacity 1 1, match:class steam
-windowrule = size 1100 700, class:steam, title:Steam
+windowrule = size 1100 700, match:class steam, match:title Steam
-windowrule = size 460 800, class:steam, title:Friends List
+windowrule = size 460 800, match:class steam, match:title Friends List
-windowrule = idleinhibit fullscreen, class:steam
+windowrule = idle_inhibit fullscreen, match:class steam

default/hypr/apps/system.conf

@@ -1,17 +1,21 @@
 # Floating windows
-windowrule = float, tag:floating-window
+windowrule = float on, match:tag floating-window
-windowrule = center, tag:floating-window
+windowrule = center on, match:tag floating-window
-windowrule = size 875 600, tag:floating-window
+windowrule = size 875 600, match:tag floating-window
 
-windowrule = tag +floating-window, class:(org.omarchy.bluetui|org.omarchy.impala|org.omarchy.wiremix|org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float|imv|mpv)
+windowrule = tag +floating-window, match:class (org.omarchy.bluetui|org.omarchy.impala|org.omarchy.wiremix|org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.gnome.NautilusPreviewer|org.gnome.Evince|com.gabm.satty|Omarchy|About|TUI.float|imv|mpv)
-windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)
+windowrule = tag +floating-window, match:class (xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), match:title ^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)
-windowrule = float, class:org.gnome.Calculator
+windowrule = float on, match:class org.gnome.Calculator
 
 # Fullscreen screensaver
-windowrule = fullscreen, class:org.omarchy.screensaver
+windowrule = fullscreen on, match:class org.omarchy.screensaver
+windowrule = float on, match:class org.omarchy.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)$
+windowrule = opacity 1 1, match:class ^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
 
 # Popped window rounding
-windowrule = rounding 8, tag:pop
+windowrule = rounding 8, match:tag pop
+
+# Prevent idle while open
+windowrule = idle_inhibit always, match:tag noidle

default/hypr/apps/terminals.conf

@@ -1,2 +1,2 @@
 # Define terminal tag to style them uniformly
-windowrule = tag +terminal, class:(Alacritty|kitty|com.mitchellh.ghostty)
+windowrule = tag +terminal, match:class (Alacritty|kitty|com.mitchellh.ghostty)

default/hypr/apps/walker.conf

@@ -1,2 +1,2 @@
 # Application-specific animation
-layerrule = noanim, walker
+layerrule = no_anim on, match:namespace walker

default/hypr/apps/webcam-overlay.conf

@@ -1,6 +1,6 @@
 # Webcam overlay for screen recording
-windowrule = float, title:WebcamOverlay
+windowrule = float on, match:title WebcamOverlay
-windowrule = pin, title:WebcamOverlay
+windowrule = pin on, match:title WebcamOverlay
-windowrule = noinitialfocus, title:WebcamOverlay
+windowrule = no_initial_focus on, match:title WebcamOverlay
-windowrule = nodim, title:WebcamOverlay
+windowrule = no_dim on, match:title WebcamOverlay
-windowrule = move 100%-w-40 100%-w-40, title:WebcamOverlay # There's a typo in the hyprland rule so 100%-w on the height param is actually correct here
+windowrule = move (monitor_w-window_w-40) (monitor_h-window_h-40), match:title WebcamOverlay

default/hypr/bindings/tiling-v2.conf

@@ -17,7 +17,7 @@ bindd = SUPER, RIGHT, Move window focus right, movefocus, r
 bindd = SUPER, UP, Move window focus up, movefocus, u
 bindd = SUPER, DOWN, Move window focus down, movefocus, d
 
-# Switch workspaces with SUPER + [1-9]
+# Switch workspaces with SUPER + [1-9; 0]
 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
@@ -29,7 +29,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
 
-# Move active window to a workspace with SUPER + SHIFT + [1-9]
+# Move active window to a workspace with SUPER + SHIFT + [1-9; 0]
 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
@@ -41,6 +41,18 @@ 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 silently to a workspace with SUPER + SHIFT + ALT + [1-9; 0]
+bindd = SUPER SHIFT ALT, code:10, Move window silently to workspace 1, movetoworkspacesilent, 1
+bindd = SUPER SHIFT ALT, code:11, Move window silently to workspace 2, movetoworkspacesilent, 2
+bindd = SUPER SHIFT ALT, code:12, Move window silently to workspace 3, movetoworkspacesilent, 3
+bindd = SUPER SHIFT ALT, code:13, Move window silently to workspace 4, movetoworkspacesilent, 4
+bindd = SUPER SHIFT ALT, code:14, Move window silently to workspace 5, movetoworkspacesilent, 5
+bindd = SUPER SHIFT ALT, code:15, Move window silently to workspace 6, movetoworkspacesilent, 6
+bindd = SUPER SHIFT ALT, code:16, Move window silently to workspace 7, movetoworkspacesilent, 7
+bindd = SUPER SHIFT ALT, code:17, Move window silently to workspace 8, movetoworkspacesilent, 8
+bindd = SUPER SHIFT ALT, code:18, Move window silently to workspace 9, movetoworkspacesilent, 9
+bindd = SUPER SHIFT ALT, code:19, Move window silently to workspace 10, movetoworkspacesilent, 10
+
 # Control scratchpad
 bindd = SUPER, S, Toggle scratchpad, togglespecialworkspace, scratchpad
 bindd = SUPER ALT, S, Move window to scratchpad, movetoworkspacesilent, special:scratchpad
@@ -53,6 +65,8 @@ bindd = SUPER CTRL, TAB, Former workspace, workspace, previous
 # Move workspaces to other monitors
 bindd = SUPER SHIFT ALT, LEFT, Move workspace to left monitor, movecurrentworkspacetomonitor, l
 bindd = SUPER SHIFT ALT, RIGHT, Move workspace to right monitor, movecurrentworkspacetomonitor, r
+bindd = SUPER SHIFT ALT, UP, Move workspace to up monitor, movecurrentworkspacetomonitor, u
+bindd = SUPER SHIFT ALT, DOWN, Move workspace to down monitor, movecurrentworkspacetomonitor, d
 
 # 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
@@ -94,9 +108,9 @@ bindd = SUPER ALT, DOWN, Move window to group on bottom, moveintogroup, d
 bindd = SUPER ALT, TAB, Next window in group, changegroupactive, f
 bindd = SUPER ALT SHIFT, TAB, Previous window in group, changegroupactive, b
 
-# Overload lateral window navigation for grouped windows
+# Window navigation for grouped windows
-bindd = SUPER ALT, LEFT, Move grouped window focus left, changegroupactive, b
+bindd = SUPER CTRL, LEFT, Move grouped window focus left, changegroupactive, b
-bindd = SUPER ALT, RIGHT, Move grouped window focus right, changegroupactive, f
+bindd = SUPER CTRL, RIGHT, Move grouped window focus right, changegroupactive, f
 
 # Scroll through a set of grouped windows with SUPER + ALT + scroll
 bindd = SUPER ALT, mouse_down, Next window in group, changegroupactive, f

default/hypr/bindings/utilities.conf

@@ -19,6 +19,7 @@ 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"
 bindd = SUPER ALT, COMMA, Invoke last notification, exec, makoctl invoke
+bindd = SUPER SHIFT ALT, COMMA, Restore last notification, exec, makoctl restore
 
 # Toggle idling
 bindd = SUPER CTRL, I, Toggle locking on idle, exec, omarchy-toggle-idle
@@ -41,5 +42,11 @@ bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a
 bindd = SUPER CTRL, S, Share, exec, omarchy-menu share
 
 # Waybar-less information
-bindd = SUPER CTRL, T, Show time, exec, notify-send "    $(date +"%A %H:%M  —  %d %B W%V %Y")"
+bindd = SUPER CTRL ALT, T, Show time, exec, notify-send "    $(date +"%A %H:%M  —  %d %B W%V %Y")"
-bindd = SUPER CTRL, B, Show battery remaining, exec, notify-send "󰁹    Battery is at $(omarchy-battery-remaining)%"
+bindd = SUPER CTRL ALT, B, Show battery remaining, exec, notify-send "󰁹    Battery is at $(omarchy-battery-remaining)%"
+
+# Control panels
+bindd = SUPER CTRL, A, Audio controls, exec, omarchy-launch-audio
+bindd = SUPER CTRL, B, Bluetooth controls, exec, omarchy-launch-bluetooth
+bindd = SUPER CTRL, W, Wifi controls, exec, omarchy-launch-wifi
+bindd = SUPER CTRL, T, Activity, exec, omarchy-launch-tui btop

default/hypr/looknfeel.conf

@@ -123,7 +123,7 @@ misc {
     disable_splash_rendering  = true
     focus_on_activate = true
     anr_missed_pings = 3
-    new_window_takes_over_fullscreen = 1
+    on_focus_under_fullscreen = 1
 }
 
 # https://wiki.hypr.land/Configuring/Variables/#cursor

default/hypr/windows.conf

@@ -1,11 +1,12 @@
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-windowrule = suppressevent maximize, class:.*
+# Hyprland 0.53+ syntax
+windowrule = suppress_event maximize, match:class .*
 
 # Just dash of opacity by default
-windowrule = opacity 0.97 0.9, class:.*
+windowrule = opacity 0.97 0.9, match:class .*
 
 # Fix some dragging issues with XWayland
-windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+windowrule = no_focus on, match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0
 
 # App-specific tweaks
 source = ~/.local/share/omarchy/default/hypr/apps.conf

default/mako/core.ini

@@ -18,6 +18,7 @@ invisible=false
 
 [urgency=critical]
 default-timeout=0
+layer=overlay
 
 [summary~="Setup Wi-Fi"]
 on-button-left=exec sh -c 'omarchy-notification-dismiss "Setup Wi-Fi"; omarchy-launch-wifi'

default/themed/alacritty.toml.tpl

@@ -0,0 +1,47 @@
+[colors.primary]
+background = "{{ background }}"
+foreground = "{{ foreground }}"
+
+[colors.cursor]
+text = "{{ background }}"
+cursor = "{{ cursor }}"
+
+[colors.vi_mode_cursor]
+text = "{{ background }}"
+cursor = "{{ cursor }}"
+
+[colors.search.matches]
+foreground = "{{ background }}"
+background = "{{ color3 }}"
+
+[colors.search.focused_match]
+foreground = "{{ background }}"
+background = "{{ color1 }}"
+
+[colors.footer_bar]
+foreground = "{{ background }}"
+background = "{{ foreground }}"
+
+[colors.selection]
+text = "{{ selection_foreground }}"
+background = "{{ selection_background }}"
+
+[colors.normal]
+black = "{{ color0 }}"
+red = "{{ color1 }}"
+green = "{{ color2 }}"
+yellow = "{{ color3 }}"
+blue = "{{ color4 }}"
+magenta = "{{ color5 }}"
+cyan = "{{ color6 }}"
+white = "{{ color7 }}"
+
+[colors.bright]
+black = "{{ color8 }}"
+red = "{{ color9 }}"
+green = "{{ color10 }}"
+yellow = "{{ color11 }}"
+blue = "{{ color12 }}"
+magenta = "{{ color13 }}"
+cyan = "{{ color14 }}"
+white = "{{ color15 }}"

default/themed/btop.theme.tpl

@@ -0,0 +1,83 @@
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="{{ background }}"
+
+# Main text color
+theme[main_fg]="{{ foreground }}"
+
+# Title color for boxes
+theme[title]="{{ foreground }}"
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="{{ accent }}"
+
+# Background color of selected item in processes box
+theme[selected_bg]="{{ color8 }}"
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="{{ accent }}"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="{{ color8 }}"
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="{{ foreground }}"
+
+# Background color of the percentage meters
+theme[meter_bg]="{{ color8 }}"
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="{{ foreground }}"
+
+# CPU, Memory, Network, Proc box outline colors
+theme[cpu_box]="{{ color5 }}"
+theme[mem_box]="{{ color2 }}"
+theme[net_box]="{{ color1 }}"
+theme[proc_box]="{{ accent }}"
+
+# Box divider line and small boxes line color
+theme[div_line]="{{ color8 }}"
+
+# Temperature graph color (Green -> Yellow -> Red)
+theme[temp_start]="{{ color2 }}"
+theme[temp_mid]="{{ color3 }}"
+theme[temp_end]="{{ color1 }}"
+
+# CPU graph colors (Teal -> Lavender)
+theme[cpu_start]="{{ color6 }}"
+theme[cpu_mid]="{{ color4 }}"
+theme[cpu_end]="{{ color5 }}"
+
+# Mem/Disk free meter (Mauve -> Lavender -> Blue)
+theme[free_start]="{{ color5 }}"
+theme[free_mid]="{{ color4 }}"
+theme[free_end]="{{ color6 }}"
+
+# Mem/Disk cached meter (Sapphire -> Lavender)
+theme[cached_start]="{{ color4 }}"
+theme[cached_mid]="{{ color6 }}"
+theme[cached_end]="{{ color5 }}"
+
+# Mem/Disk available meter (Peach -> Red)
+theme[available_start]="{{ color3 }}"
+theme[available_mid]="{{ color1 }}"
+theme[available_end]="{{ color1 }}"
+
+# Mem/Disk used meter (Green -> Sky)
+theme[used_start]="{{ color2 }}"
+theme[used_mid]="{{ color6 }}"
+theme[used_end]="{{ color4 }}"
+
+# Download graph colors (Peach -> Red)
+theme[download_start]="{{ color3 }}"
+theme[download_mid]="{{ color1 }}"
+theme[download_end]="{{ color1 }}"
+
+# Upload graph colors (Green -> Sky)
+theme[upload_start]="{{ color2 }}"
+theme[upload_mid]="{{ color6 }}"
+theme[upload_end]="{{ color4 }}"
+
+# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
+theme[process_start]="{{ color6 }}"
+theme[process_mid]="{{ color4 }}"
+theme[process_end]="{{ color5 }}"

default/themed/ghostty.conf.tpl

@@ -0,0 +1,22 @@
+background = {{ background }}
+foreground = {{ foreground }}
+cursor-color = {{ cursor }}
+selection-background = {{ selection_background }}
+selection-foreground = {{ selection_foreground }}
+
+palette = 0={{ color0 }}
+palette = 1={{ color1 }}
+palette = 2={{ color2 }}
+palette = 3={{ color3 }}
+palette = 4={{ color4 }}
+palette = 5={{ color5 }}
+palette = 6={{ color6 }}
+palette = 7={{ color7 }}
+palette = 8={{ color8 }}
+palette = 9={{ color9 }}
+palette = 10={{ color10 }}
+palette = 11={{ color11 }}
+palette = 12={{ color12 }}
+palette = 13={{ color13 }}
+palette = 14={{ color14 }}
+palette = 15={{ color15 }}

default/themed/hyprland-preview-share-picker.css.tpl

@@ -0,0 +1,94 @@
+@define-color foreground {{ foreground }};
+@define-color background {{ background }};
+@define-color accent {{ accent }};
+@define-color muted {{ color8 }};
+@define-color card_bg {{ color0 }};
+@define-color text_dark {{ background }};
+@define-color accent_hover {{ color12 }};
+@define-color selected_tab {{ accent }};
+@define-color text {{ foreground }};
+
+* {
+  all: unset;
+  font-family: JetBrains Mono NF;
+  color: @foreground;
+  font-weight: bold;
+  font-size: 16px;
+}
+
+.window {
+  background: alpha(@background, 0.95);
+  border: solid 2px @accent;
+  margin: 4px;
+  padding: 18px;
+}
+
+tabs {
+    padding: 0.5rem 1rem;
+}
+
+tabs > tab {
+    margin-right: 1rem;
+}
+
+.tab-label {
+    color: @text;
+    transition: all 0.2s ease;
+}
+
+tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
+    text-decoration: underline currentColor;
+    color: @selected_tab;
+}
+
+tabs > tab:focus > .tab-label {
+    color: @foreground;
+}
+
+.page {
+    padding: 1rem;
+}
+
+.image-label {
+    font-size: 12px;
+    padding: 0.25rem;
+}
+
+flowboxchild > .card, button > .card {
+    transition: all 0.2s ease;
+    border: solid 2px transparent;
+    border-color: @background;
+    border-radius: 5px;
+    background-color: @card_bg;
+    padding: 5px;
+}
+
+flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
+    border: solid 2px @accent;
+}
+
+.image {
+    border-radius: 5px;
+}
+
+.region-button {
+    padding: 0.5rem 1rem;
+    border-radius: 5px;
+    background-color: @accent;
+    color: @text_dark;
+    transition: all 0.2s ease;
+}
+
+.region-button > label {
+    color: @text_dark;
+}
+
+.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
+    background-color: @accent_hover;
+    color: @text_dark;
+}
+
+.region-button:disabled {
+    background-color: @muted;
+    color: @background;
+}

default/themed/hyprland.conf.tpl

@@ -1,4 +1,4 @@
-$activeBorderColor = rgb(d3c6aa)
+$activeBorderColor = rgb({{ accent_strip }})
 
 general {
     col.active_border = $activeBorderColor