diff --git a/bin/omarchy b/bin/omarchy
index bfcd3ae..e1218f7 100755
--- a/bin/omarchy
+++ b/bin/omarchy
@@ -104,9 +104,12 @@ remove_theme_prompt() {
 
 setup_menu() {
   show_ascii_art
-  local menu=("Fingerprint sensor" "Back")
+  local menu=("Add fingerprint sensor" "Remove fingerprint sensor" "Add Fido2 device" "Remove Fido2 device" "Back")
   local commands=(
-    "omarchy-fingerprint-setup"
+    "omarchy-setup-fingerprint"
+    "omarchy-setup-fingerprint --remove"
+    "omarchy-setup-fido2"
+    "omarchy-setup-fido2 --remove"
     "main_menu"
   )
   local choice
diff --git a/bin/omarchy-dev-config-link b/bin/omarchy-dev-config-link
index c2dc8f0..b6152a5 100755
--- a/bin/omarchy-dev-config-link
+++ b/bin/omarchy-dev-config-link
@@ -4,5 +4,5 @@
 ln -nsf ~/.local/share/omarchy/config/hypr/hyprland.conf ~/.config/hypr/
 ln -nsf ~/.local/share/omarchy/config/hypr/hypridle.conf ~/.config/hypr/
 ln -nsf ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/
-ln -nsf ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/
+ln -nsf ~/.local/share/omarchy/config/waybar/config.jsonc ~/.config/waybar/
 ln -nsf ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/
diff --git a/bin/omarchy-show-keybindings b/bin/omarchy-menu-keybindings
similarity index 100%
rename from bin/omarchy-show-keybindings
rename to bin/omarchy-menu-keybindings
diff --git a/bin/omarchy-power-menu b/bin/omarchy-menu-power
similarity index 100%
rename from bin/omarchy-power-menu
rename to bin/omarchy-menu-power
diff --git a/bin/omarchy-refresh-waybar b/bin/omarchy-refresh-waybar
index 7a54140..c81063b 100755
--- a/bin/omarchy-refresh-waybar
+++ b/bin/omarchy-refresh-waybar
@@ -2,7 +2,7 @@
 
 if gum confirm "Refresh Waybar config? This will replace your current settings with Omarchy defaults."; then
   # Overwrite local waybar settings with the latest in Omarchy
-  cp -f ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/ 2>/dev/null
+  cp -f ~/.local/share/omarchy/config/waybar/config.jsonc ~/.config/waybar/ 2>/dev/null
   cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
 
   # Restart waybar
diff --git a/bin/omarchy-fido2-setup b/bin/omarchy-setup-fido2
similarity index 100%
rename from bin/omarchy-fido2-setup
rename to bin/omarchy-setup-fido2
diff --git a/bin/omarchy-fingerprint-setup b/bin/omarchy-setup-fingerprint
similarity index 100%
rename from bin/omarchy-fingerprint-setup
rename to bin/omarchy-setup-fingerprint
diff --git a/bin/omarchy-theme-bg-next b/bin/omarchy-theme-bg-next
index cec7c31..fa99ccf 100755
--- a/bin/omarchy-theme-bg-next
+++ b/bin/omarchy-theme-bg-next
@@ -8,30 +8,41 @@ CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
 TOTAL=${#BACKGROUNDS[@]}
 
-# Get current background from symlink
-if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
-  CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
+if [[ $TOTAL -eq 0 ]]; then
+  notify-send "No background was found for theme" -t 2000
+  pkill -x swaybg
+  setsid swaybg --color '#000000' >/dev/null 2>&2 &
 else
-  # Default to first background if no symlink exists
-  CURRENT_BACKGROUND="${BACKGROUNDS[0]}"
-fi
-
-# Find current background index
-INDEX=0
-for i in "${!BACKGROUNDS[@]}"; do
-  if [[ "${BACKGROUNDS[$i]}" == "$CURRENT_BACKGROUND" ]]; then
-    INDEX=$i
-    break
+  # Get current background from symlink
+  if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
+    CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
+  else
+    # Default to first background if no symlink exists
+    CURRENT_BACKGROUND="${BACKGROUNDS[0]}"
   fi
-done
 
-# Get next background (wrap around)
-NEXT_INDEX=$(((INDEX + 1) % TOTAL))
-NEW_BACKGROUND="${BACKGROUNDS[$NEXT_INDEX]}"
+  # Find current background index
+  INDEX=-1
+  for i in "${!BACKGROUNDS[@]}"; do
+    if [[ "${BACKGROUNDS[$i]}" == "$CURRENT_BACKGROUND" ]]; then
+      INDEX=$i
+      break
+    fi
+  done
 
-# Set new background symlink
-ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
+  # Get next background (wrap around)
+  if [[ $INDEX -eq -1 ]]; then
+    # Use the first background when no match was found
+    NEW_BACKGROUND="${BACKGROUNDS[0]}"
+  else
+    NEXT_INDEX=$(((INDEX + 1) % TOTAL))
+    NEW_BACKGROUND="${BACKGROUNDS[$NEXT_INDEX]}"
+  fi
 
-# Relaunch swaybg
-pkill -x swaybg
-setsid swaybg -i "$NEW_BACKGROUND" -m fill >/dev/null 2>&2 &
+  # Set new background symlink
+  ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
+
+  # Relaunch swaybg
+  pkill -x swaybg
+  setsid swaybg -i "$NEW_BACKGROUND" -m fill >/dev/null 2>&2 &
+fi
diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set
index 06160b9..5cdb80a 100755
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@@ -49,9 +49,4 @@ makoctl reload
 hyprctl reload
 
 # Set new background
-first_bg=$(find "$HOME/.config/omarchy/current/backgrounds/" -type f | head -n 1)
-if [[ -n "$first_bg" ]]; then
-  ln -nsf "$first_bg" "$HOME/.config/omarchy/current/background"
-  pkill -x swaybg
-  setsid swaybg -i "$HOME/.config/omarchy/current/background" -m fill >/dev/null &
-fi
+omarchy-theme-bg-next
diff --git a/config/waybar/config b/config/waybar/config.jsonc
similarity index 100%
rename from config/waybar/config
rename to config/waybar/config.jsonc
diff --git a/default/hypr/bindings/utilities.conf b/default/hypr/bindings/utilities.conf
index e000760..6d49a93 100644
--- a/default/hypr/bindings/utilities.conf
+++ b/default/hypr/bindings/utilities.conf
@@ -1,7 +1,6 @@
 # Launching
 bind = SUPER, space, exec, pkill wofi || wofi --show drun -O alphabetical
-# bind = SUPER, space, exec, pkill wofi || uwsm app -- "$(wofi --show drun -O alphabetical --define=drun-print_desktop_file=true | sed -E "s/(\.desktop) /\1:/")"
-bind = SUPER, K, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-show-keybindings
+bind = SUPER, K, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-menu-keybindings
 
 # Aesthetics
 bind = SUPER SHIFT, SPACE, exec, pkill -SIGUSR1 waybar
@@ -14,7 +13,7 @@ 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, pkill wofi || ~/.local/share/omarchy/bin/omarchy-power-menu
+bind = SUPER, ESCAPE, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-menu-power
 
 # Toggle idling
 bind = SUPER CTRL, I, exec, ~/.local/share/omarchy/bin/omarchy-toggle-idle
diff --git a/install/backgrounds.sh b/install/backgrounds.sh
deleted file mode 100644
index 135c7dc..0000000
--- a/install/backgrounds.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-BACKGROUNDS_DIR=~/.config/omarchy/backgrounds/
-
-download_background_image() {
-  local url="$1"
-  local path="$2"
-  gum spin --title "Downloading $url as $path..." -- curl -sL -o "$BACKGROUNDS_DIR/$path" "$url"
-}
-
-for t in ~/.local/share/omarchy/themes/*; do source "$t/backgrounds.sh"; done
diff --git a/install/theme.sh b/install/theme.sh
index cad2666..b370751 100644
--- a/install/theme.sh
+++ b/install/theme.sh
@@ -15,13 +15,13 @@ for f in ~/.local/share/omarchy/themes/*; do ln -s "$f" ~/.config/omarchy/themes
 # Set initial theme
 mkdir -p ~/.config/omarchy/current
 ln -snf ~/.config/omarchy/themes/tokyo-night ~/.config/omarchy/current/theme
-source ~/.local/share/omarchy/themes/tokyo-night/backgrounds.sh
-ln -snf ~/.config/omarchy/backgrounds/tokyo-night ~/.config/omarchy/current/backgrounds
-ln -snf ~/.config/omarchy/current/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg ~/.config/omarchy/current/background
+ln -snf ~/.config/omarchy/current/theme/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg ~/.config/omarchy/current/background
 
 # Set specific app links for current theme
 ln -snf ~/.config/omarchy/current/theme/neovim.lua ~/.config/nvim/lua/plugins/theme.lua
+
 mkdir -p ~/.config/btop/themes
 ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme
+
 mkdir -p ~/.config/mako
 ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config
diff --git a/install/xtras.sh b/install/xtras.sh
index 77eeb87..32b7920 100644
--- a/install/xtras.sh
+++ b/install/xtras.sh
@@ -4,7 +4,10 @@ if [ -z "$OMARCHY_BARE" ]; then
   yay -S --noconfirm --needed \
     gnome-calculator gnome-keyring signal-desktop \
     obsidian-bin libreoffice obs-studio kdenlive \
-    pinta xournalpp localsend-bin
+    xournalpp localsend-bin
+
+  yay -S --noconfirm --needed pinta ||
+    echo -e "\e[31mFailed to install Pinta. Continuing without!\e[0m"
 
   yay -S --noconfirm --needed typora ||
     echo -e "\e[31mFailed to install Typora. Continuing without!\e[0m"
diff --git a/migrations/1752793122.sh b/migrations/1752793122.sh
new file mode 100644
index 0000000..fad0646
--- /dev/null
+++ b/migrations/1752793122.sh
@@ -0,0 +1,4 @@
+echo "Rename waybar config file for syntax highlighting"
+if [[ -f ~/.config/waybar/config ]]; then
+  mv ~/.config/waybar/config ~/.config/waybar/config.jsonc
+fi
diff --git a/themes/catppuccin/backgrounds.sh b/themes/catppuccin/backgrounds.sh
deleted file mode 100644
index 8f9dc00..0000000
--- a/themes/catppuccin/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/catppuccin"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/catppuccin/background.png" "catppuccin/1-catppuccin.png"
diff --git a/themes/catppuccin/backgrounds/1-catppuccin.png b/themes/catppuccin/backgrounds/1-catppuccin.png
new file mode 100644
index 0000000..5fbcebc
Binary files /dev/null and b/themes/catppuccin/backgrounds/1-catppuccin.png differ
diff --git a/themes/everforest/backgrounds.sh b/themes/everforest/backgrounds.sh
deleted file mode 100644
index ace1914..0000000
--- a/themes/everforest/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/everforest"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/everforest/background.jpg" "everforest/1-everforest.jpg"
diff --git a/themes/everforest/backgrounds/1-everforest.jpg b/themes/everforest/backgrounds/1-everforest.jpg
new file mode 100644
index 0000000..6d75259
Binary files /dev/null and b/themes/everforest/backgrounds/1-everforest.jpg differ
diff --git a/themes/gruvbox/backgrounds.sh b/themes/gruvbox/backgrounds.sh
deleted file mode 100644
index 7fbb0dd..0000000
--- a/themes/gruvbox/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/gruvbox"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/gruvbox/background.jpg" "gruvbox/1-grubox.jpg"
diff --git a/themes/gruvbox/backgrounds/1-grubox.jpg b/themes/gruvbox/backgrounds/1-grubox.jpg
new file mode 100644
index 0000000..fd31869
Binary files /dev/null and b/themes/gruvbox/backgrounds/1-grubox.jpg differ
diff --git a/themes/kanagawa/backgrounds.sh b/themes/kanagawa/backgrounds.sh
deleted file mode 100644
index 9ce2920..0000000
--- a/themes/kanagawa/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/kanagawa"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/kanagawa/background.jpg" "kanagawa/1-kanagawa.jpg"
diff --git a/themes/kanagawa/backgrounds/1-kanagawa.jpg b/themes/kanagawa/backgrounds/1-kanagawa.jpg
new file mode 100644
index 0000000..197c48d
Binary files /dev/null and b/themes/kanagawa/backgrounds/1-kanagawa.jpg differ
diff --git a/themes/matte-black/backgrounds.sh b/themes/matte-black/backgrounds.sh
deleted file mode 100644
index 4c0c8d8..0000000
--- a/themes/matte-black/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/matte-black"
-download_background_image "https://raw.githubusercontent.com/tahayvr/omarchy-matte-black/refs/heads/main/images/1-matte-black.jpg" "matte-black/1-matte-black.jpg"
diff --git a/themes/matte-black/backgrounds/1-matte-black.jpg b/themes/matte-black/backgrounds/1-matte-black.jpg
new file mode 100644
index 0000000..2afb1bc
Binary files /dev/null and b/themes/matte-black/backgrounds/1-matte-black.jpg differ
diff --git a/themes/nord/backgrounds.sh b/themes/nord/backgrounds.sh
deleted file mode 100644
index b78e084..0000000
--- a/themes/nord/backgrounds.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/nord"
-download_background_image "https://github.com/basecamp/omakub/raw/refs/heads/master/themes/nord/background.png" "nord/1-nord.png"
diff --git a/themes/nord/backgrounds/1-nord.png b/themes/nord/backgrounds/1-nord.png
new file mode 100644
index 0000000..56dbc1d
Binary files /dev/null and b/themes/nord/backgrounds/1-nord.png differ
diff --git a/themes/tokyo-night/backgrounds.sh b/themes/tokyo-night/backgrounds.sh
deleted file mode 100644
index bccbaa3..0000000
--- a/themes/tokyo-night/backgrounds.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir -p "$BACKGROUNDS_DIR/tokyo-night"
-download_background_image "https://images.unsplash.com/photo-1651870364199-fc5f9f46ac85" "tokyo-night/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg"
-download_background_image "https://images.unsplash.com/photo-1620207418302-439b387441b0" "tokyo-night/2-Milad-Fakurian-Abstract-Purple-Blue.jpg"
diff --git a/themes/tokyo-night/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg b/themes/tokyo-night/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg
new file mode 100644
index 0000000..2767138
Binary files /dev/null and b/themes/tokyo-night/backgrounds/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg differ
diff --git a/themes/tokyo-night/backgrounds/2--Milad-Fakurian-Abstract-Purple-Blue.jpg b/themes/tokyo-night/backgrounds/2--Milad-Fakurian-Abstract-Purple-Blue.jpg
new file mode 100644
index 0000000..b9663ff
Binary files /dev/null and b/themes/tokyo-night/backgrounds/2--Milad-Fakurian-Abstract-Purple-Blue.jpg differ