diff --git a/applications/blueberry.desktop b/applications/blueberry.desktop
deleted file mode 100644
index 3b4d87a..0000000
--- a/applications/blueberry.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Bluetooth
-Comment=Configure Bluetooth settings
-Icon=bluetooth
-Exec=env GTK_THEME=Adwaita-dark blueberry
-Terminal=false
-Type=Application
-Categories=GTK;GNOME;Settings;HardwareSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
-StartupNotify=true
-NotShowIn=GNOME;KDE;Unity;
diff --git a/applications/org.pulseaudio.pavucontrol.desktop b/applications/org.pulseaudio.pavucontrol.desktop
deleted file mode 100644
index 16fb180..0000000
--- a/applications/org.pulseaudio.pavucontrol.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Volume Control
-Comment=Adjust the volume level
-Exec=env GTK_THEME=Adwaita-dark pavucontrol
-Icon=multimedia-volume-control
-StartupNotify=true
-Type=Application
-Categories=AudioVideo;Audio;Mixer;GTK;Settings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
-Keywords=pavucontrol;PulseAudio;Microphone;Volume;Fade;Balance;Headset;Speakers;Headphones;Audio;Mixer;Output;Input;Devices;Playback;Recording;System Sounds;Sound Card;Settings;Preferences;
diff --git a/bin/omarchy b/bin/omarchy
index bfcd3ae..4c0463f 100755
--- a/bin/omarchy
+++ b/bin/omarchy
@@ -62,8 +62,9 @@ update_menu() {
 
 theme_menu() {
   show_ascii_art
-  local menu=("Install" "Remove" "Back")
+  local menu=("Pick" "Install" "Remove" "Back")
   local commands=(
+    "omarchy-theme-menu"
     "install_theme_prompt"
     "remove_theme_prompt"
     "main_menu"
@@ -104,9 +105,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-fingerprint-setup b/bin/omarchy-fingerprint-setup
deleted file mode 100755
index 18545eb..0000000
--- a/bin/omarchy-fingerprint-setup
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-yay -S --noconfirm --needed fprintd usbutils
-
-if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix'; then
-  echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
-else
-  # Add fingerprint authentication as an option for sudo
-  if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
-    sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
-  fi
-
-  # Add fingerprint authentication as an option for hyprpolkitagent
-  if [ ! -f /etc/pam.d/polkit-1 ] || ! grep -q pam_fprintd.so /etc/pam.d/polkit-1; then
-    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
-auth      required pam_unix.so
-auth      optional pam_fprintd.so
-
-account   required pam_unix.so
-password  required pam_unix.so
-session   required pam_unix.so
-EOF
-  fi
-
-  # Enroll the first finger
-  echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
-  sudo fprintd-enroll $USER
-
-  echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
-
-  if fprintd-verify; then
-    echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
-  else
-    echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
-  fi
-fi
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 af2c1d2..c81063b 100755
--- a/bin/omarchy-refresh-waybar
+++ b/bin/omarchy-refresh-waybar
@@ -2,9 +2,10 @@
 
 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
-  pkill -SIGUSR2 waybar
+  pkill waybar
+  setsid waybar >/dev/null 2>&1 &
 fi
diff --git a/bin/omarchy-setup-fido2 b/bin/omarchy-setup-fido2
new file mode 100755
index 0000000..75b404b
--- /dev/null
+++ b/bin/omarchy-setup-fido2
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+if [[ "--remove" == "$1" ]]; then
+  yay -Rns --noconfirm libfido2 pam-u2f
+  sudo rm -rf /etc/fido2
+  sudo sed -i '\|^auth[[:space:]]\+sufficient[[:space:]]\+pam_u2f\.so[[:space:]]\+cue[[:space:]]\+authfile=/etc/fido2/fido2$|d' /etc/pam.d/sudo
+  echo -e "\e[32m\nYou've successfully removed the fido2 device setup.\e[0m"
+else
+  yay -S --noconfirm --needed libfido2 pam-u2f
+
+  tokens=$(fido2-token -L)
+
+  if [ -z "$tokens" ]; then
+    echo -e "\e[31m\nNo fido2 device detected. Plug it in, you may have to unlock it as well\e[0m"
+  else
+    # Create the pamu2fcfg file
+    if [ ! -f /etc/fido2/fido2 ]; then
+      sudo mkdir -p /etc/fido2
+      echo -e "\e[32m\nLet's setup your device by confirming on the device now.\e[0m"
+      pamu2fcfg >/tmp/fido2 # This needs to run as the user
+      sudo mv /tmp/fido2 /etc/fido2/fido2
+    fi
+
+    # Add fido2 auth as an option for sudo
+    if ! grep -q pam_u2f.so /etc/pam.d/sudo; then
+      sudo sed -i '1i auth    sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/sudo
+    fi
+
+    if ! sudo echo -e "\e[32m\nPerfect! Now you can use your fido2 device for sudo.\e[0m"; then
+      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
+    fi
+  fi
+fi
diff --git a/bin/omarchy-setup-fingerprint b/bin/omarchy-setup-fingerprint
new file mode 100755
index 0000000..2ba0b60
--- /dev/null
+++ b/bin/omarchy-setup-fingerprint
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+if [[ "--remove" == "$1" ]]; then
+  yay -Rns --noconfirm fprintd
+  sudo rm -rf /etc/pam.d/polkit-1
+  sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/sudo
+  echo -e "\e[32mYou've successfully removed the fingerprint setup.\e[0m"
+else
+  yay -S --noconfirm --needed fprintd usbutils
+
+  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix'; then
+    echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
+  else
+    # Add fingerprint authentication as an option for sudo
+    if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
+      sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
+    fi
+
+    # Add fingerprint authentication as an option for hyprpolkitagent
+    if [ ! -f /etc/pam.d/polkit-1 ] || ! grep -q pam_fprintd.so /etc/pam.d/polkit-1; then
+      sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
+auth      required pam_unix.so
+auth      optional pam_fprintd.so
+
+account   required pam_unix.so
+password  required pam_unix.so
+session   required pam_unix.so
+EOF
+    fi
+
+    # Enroll the first finger
+    echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
+    sudo fprintd-enroll $USER
+
+    echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
+
+    if fprintd-verify; then
+      echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
+    else
+      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
+    fi
+  fi
+fi
diff --git a/bin/omarchy-theme-bg-next b/bin/omarchy-theme-bg-next
index 5f344f2..39e0b77 100755
--- a/bin/omarchy-theme-bg-next
+++ b/bin/omarchy-theme-bg-next
@@ -5,33 +5,44 @@
 BACKGROUNDS_DIR="$HOME/.config/omarchy/current/backgrounds/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-BACKGROUNDS=($(find "$BACKGROUNDS_DIR" -type f | sort))
+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=""
   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-menu b/bin/omarchy-theme-menu
index 70a32c6..63c3c94 100755
--- a/bin/omarchy-theme-menu
+++ b/bin/omarchy-theme-menu
@@ -23,7 +23,7 @@ selection=$(printf '%s\n' "${themes[@]}" | wofi \
   --show dmenu \
   --allow-markup \
   --width 150 \
-  --height 300 \
+  --height 400 \
   -O alphabetical \
   --style ~/.config/wofi/select.css 2>/dev/null)
 
diff --git a/bin/omarchy-theme-next b/bin/omarchy-theme-next
index eb97d90..778b0ea 100755
--- a/bin/omarchy-theme-next
+++ b/bin/omarchy-theme-next
@@ -30,5 +30,5 @@ NEXT_INDEX=$(((INDEX + 1) % TOTAL))
 NEW_THEME=${THEMES[$NEXT_INDEX]}
 NEW_THEME_NAME=$(basename "$NEW_THEME")
 
-omarchy-theme-set $NEW_THEME_NAME
+"$HOME/.local/share/omarchy/bin/omarchy-theme-set" $NEW_THEME_NAME
 notify-send "Theme changed to $NEW_THEME_NAME" -t 2000
diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set
index 46a5c35..7bb639c 100755
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@@ -13,7 +13,12 @@ CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
 
 THEME_NAME="$1"
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
-BACKGROUND_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME"
+
+if [[ -d "$HOME/.config/omarchy/themes/$THEME_NAME/backgrounds" ]]; then
+  BACKGROUND_PATH="$HOME/.config/omarchy/themes/$THEME_NAME/backgrounds"
+else
+  BACKGROUND_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME"
+fi
 
 # Check if the theme entered exists
 if [[ ! -d "$THEME_PATH" ]]; then
@@ -25,18 +30,26 @@ fi
 ln -nsf "$BACKGROUND_PATH" "$HOME/.config/omarchy/current/backgrounds"
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 
+# Change gnome modes
+if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
+else
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
+fi
+
 # Trigger alacritty config reload
 touch "$HOME/.config/alacritty/alacritty.toml"
 
+# Trigger btop config reload
+pkill -SIGUSR2 btop
+
 # Restart components to apply new theme
-pkill -SIGUSR2 waybar
+pkill waybar
+setsid waybar >/dev/null 2>&1 &
 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
+"$HOME/.local/share/omarchy/bin/omarchy-theme-bg-next"
diff --git a/bin/omarchy-toggle-idle b/bin/omarchy-toggle-idle
index 57a8aac..ccbc012 100755
--- a/bin/omarchy-toggle-idle
+++ b/bin/omarchy-toggle-idle
@@ -1,9 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-if pgrep -x hypridle > /dev/null; then
+if pgrep -x hypridle >/dev/null; then
   pkill -x hypridle
   notify-send "Stop locking computer when idle"
 else
-  setsid hypridle &> /dev/null &
+  setsid hypridle &>/dev/null &
   notify-send "Now locking computer when idle"
 fi
diff --git a/bin/omarchy-update b/bin/omarchy-update
index 93f7287..5b2e2d2 100755
--- a/bin/omarchy-update
+++ b/bin/omarchy-update
@@ -10,8 +10,10 @@ else
   last_updated_at=$(git log -1 --format=%cd --date=unix)
 fi
 
-# Get the latest
+# Get the latest while trying to preserve any modifications
+git stash
 git pull
+git stash pop
 
 # Run any pending migrations
 for file in migrations/*.sh; do
@@ -27,5 +29,5 @@ done
 # Back to where we came from
 cd - >/dev/null
 
-echo -e "\e[32m\nUpdating system packages\e[0m"
-yay -Syu --noconfirm
+echo -e ""
+gum confirm "Update system packages too?" && yay -Syu --noconfirm
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index df35a76..0191512 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -19,20 +19,20 @@ source = ~/.local/share/omarchy/default/hypr/windows.conf
 source = ~/.config/omarchy/current/theme/hyprland.conf
 
 # Application bindings
-$terminal = alacritty
-$browser = chromium --new-window --ozone-platform=wayland
+$terminal = uwsm app -- alacritty
+$browser = uwsm app -- chromium --new-window --ozone-platform=wayland
 $webapp = $browser --app
 
 bind = SUPER, return, exec, $terminal
-bind = SUPER, F, exec, nautilus --new-window
+bind = SUPER, F, exec, uwsm app -- nautilus --new-window
 bind = SUPER, B, exec, $browser
-bind = SUPER, M, exec, spotify
+bind = SUPER, M, exec, uwsm app -- spotify
 bind = SUPER, N, exec, $terminal -e nvim
 bind = SUPER, T, exec, $terminal -e btop
 bind = SUPER, D, exec, $terminal -e lazydocker
-bind = SUPER, G, exec, signal-desktop
-bind = SUPER, O, exec, obsidian -disable-gpu
-bind = SUPER, slash, exec, 1password
+bind = SUPER, G, exec, uwsm app -- signal-desktop
+bind = SUPER, O, exec, uwsm app -- obsidian -disable-gpu
+bind = SUPER, slash, exec, uwsm app -- 1password
 
 bind = SUPER, A, exec, $webapp="https://chatgpt.com"
 bind = SUPER SHIFT, A, exec, $webapp="https://grok.com"
diff --git a/config/waybar/config b/config/waybar/config.jsonc
similarity index 96%
rename from config/waybar/config
rename to config/waybar/config.jsonc
index 47607a7..ed56d8a 100644
--- a/config/waybar/config
+++ b/config/waybar/config.jsonc
@@ -92,11 +92,11 @@
     "format-disabled": "󰂲",
     "format-connected": "",
     "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "GTK_THEME=Adwaita-dark blueberry"
+    "on-click": "blueberry"
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
+    "on-click": "pavucontrol",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
diff --git a/default/bash/aliases b/default/bash/aliases
index 5105208..84e9f97 100644
--- a/default/bash/aliases
+++ b/default/bash/aliases
@@ -15,7 +15,7 @@ zd() {
   fi
 }
 open() {
-  xdg-open "$@" >/dev/null 2>&1
+  xdg-open "$@" >/dev/null 2>&1 &
 }
 
 # Directories
diff --git a/default/hypr/autostart.conf b/default/hypr/autostart.conf
index 4643b8d..c77942b 100644
--- a/default/hypr/autostart.conf
+++ b/default/hypr/autostart.conf
@@ -1,4 +1,7 @@
-exec-once = hypridle & mako & waybar & fcitx5
-exec-once = swaybg -i ~/.config/omarchy/current/background -m fill
+exec-once = uwsm app -- hypridle
+exec-once = uwsm app -- mako
+exec-once = uwsm app -- waybar
+exec-once = uwsm app -- fcitx5
+exec-once = uwsm app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = wl-clip-persist --clipboard regular --all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'
diff --git a/default/hypr/bindings/utilities.conf b/default/hypr/bindings/utilities.conf
index e4c5f3a..6d49a93 100644
--- a/default/hypr/bindings/utilities.conf
+++ b/default/hypr/bindings/utilities.conf
@@ -1,6 +1,6 @@
 # Launching
 bind = SUPER, space, exec, pkill wofi || wofi --show drun -O alphabetical
-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
@@ -13,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/default/hypr/windows.conf b/default/hypr/windows.conf
index 828aff0..d8f0f04 100644
--- a/default/hypr/windows.conf
+++ b/default/hypr/windows.conf
@@ -22,7 +22,7 @@ windowrule = fullscreen, class:^(com.libretro.RetroArch)$
 windowrule = opacity 0.97 0.9, class:.*
 windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$
 windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube
-windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv)$
+windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
 windowrule = opacity 1 1, class:^(com.libretro.RetroArch|steam)$
 
 # Fix some dragging issues with XWayland
diff --git a/install/1-yay.sh b/install/1-yay.sh
index 4941958..df6a9cd 100644
--- a/install/1-yay.sh
+++ b/install/1-yay.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 sudo pacman -S --needed --noconfirm base-devel
 
 if ! command -v yay &>/dev/null; then
diff --git a/install/2-identification.sh b/install/2-identification.sh
index c135b29..26c07d7 100644
--- a/install/2-identification.sh
+++ b/install/2-identification.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Need gum to query for input
 yay -S --noconfirm --needed gum
 
diff --git a/install/3-terminal.sh b/install/3-terminal.sh
index d45a288..91b9e21 100644
--- a/install/3-terminal.sh
+++ b/install/3-terminal.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 yay -S --noconfirm --needed \
   wget curl unzip inetutils impala \
   fd eza fzf ripgrep zoxide bat \
diff --git a/install/4-config.sh b/install/4-config.sh
index bfa6fa4..385f333 100644
--- a/install/4-config.sh
+++ b/install/4-config.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Copy over Omarchy configs
 cp -R ~/.local/share/omarchy/config/* ~/.config/
 
diff --git a/install/asdcontrol.sh b/install/asdcontrol.sh
index 3b8548e..b74eabf 100644
--- a/install/asdcontrol.sh
+++ b/install/asdcontrol.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Install asdcontrol for controlling brightness on Apple Displays
 if [ -z "$OMARCHY_BARE" ] && ! command -v asdcontrol &>/dev/null; then
   git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol
diff --git a/install/backgrounds.sh b/install/backgrounds.sh
deleted file mode 100644
index 3c4fea0..0000000
--- a/install/backgrounds.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-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/bluetooth.sh b/install/bluetooth.sh
index 018f7ca..e7b5029 100644
--- a/install/bluetooth.sh
+++ b/install/bluetooth.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Install bluetooth controls
 yay -S --noconfirm --needed blueberry
 
diff --git a/install/desktop.sh b/install/desktop.sh
index 22bd40a..33dfd9d 100644
--- a/install/desktop.sh
+++ b/install/desktop.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 yay -S --noconfirm --needed \
   brightnessctl playerctl pamixer pavucontrol wireplumber \
   fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool wl-clip-persist \
diff --git a/install/development.sh b/install/development.sh
index 9fbf0ec..20d8957 100644
--- a/install/development.sh
+++ b/install/development.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 yay -S --noconfirm --needed \
   cargo clang llvm mise \
   imagemagick \
diff --git a/install/docker.sh b/install/docker.sh
index abb27fd..f6e95e3 100644
--- a/install/docker.sh
+++ b/install/docker.sh
@@ -1,4 +1,6 @@
-yay -S --noconfirm --needed docker docker-compose
+#!/bin/bash
+
+yay -S --noconfirm --needed docker docker-compose docker-buildx
 
 # Limit log size to avoid running out of disk
 sudo mkdir -p /etc/docker
diff --git a/install/firewall.sh b/install/firewall.sh
new file mode 100644
index 0000000..f12fe8f
--- /dev/null
+++ b/install/firewall.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+if ! command -v ufw &>/dev/null; then
+  yay -Sy --noconfirm --needed ufw ufw-docker
+
+  # Allow nothing in, everything out
+  sudo ufw default deny incoming
+  sudo ufw default allow outgoing
+
+  # Allow ports for LocalSend
+  sudo ufw allow 53317/udp
+  sudo ufw allow 53317/tcp
+
+  # Allow SSH in
+  sudo ufw allow 22/tcp
+
+  # Allow Docker containers to use DNS on host
+  sudo ufw allow in on docker0 to any port 53
+
+  # Turn on the firewall
+  sudo ufw enable
+
+  # Turn on Docker protections
+  sudo ufw-docker install
+  sudo ufw reload
+fi
diff --git a/install/fix-fkeys.sh b/install/fix-fkeys.sh
index 40b5d93..54a76cf 100644
--- a/install/fix-fkeys.sh
+++ b/install/fix-fkeys.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [[ ! -f /etc/modprobe.d/hid_apple.conf ]]; then
   echo "options hid_apple fnmode=2" | sudo tee /etc/modprobe.d/hid_apple.conf
 
diff --git a/install/fonts.sh b/install/fonts.sh
index 1b04eb5..87afc3d 100644
--- a/install/fonts.sh
+++ b/install/fonts.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ -z "$OMARCHY_BARE" ]; then
   yay -Sy --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
 else
diff --git a/install/hyprlandia.sh b/install/hyprlandia.sh
index a8c060f..a13fccc 100644
--- a/install/hyprlandia.sh
+++ b/install/hyprlandia.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 yay -S --noconfirm --needed \
   hyprland hyprshot hyprpicker hyprlock hypridle polkit-gnome hyprland-qtutils \
   wofi waybar mako swaybg \
diff --git a/install/login.sh b/install/login.sh
index 48ac5c4..55c972f 100644
--- a/install/login.sh
+++ b/install/login.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 # Hyprland launched via UWSM and login directly as user, rely on disk encryption + hyprlock for security
 yay -S --noconfirm --needed uwsm
 
diff --git a/install/mimetypes.sh b/install/mimetypes.sh
index 87486c2..ee867ab 100644
--- a/install/mimetypes.sh
+++ b/install/mimetypes.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 update-desktop-database ~/.local/share/applications
 
 # Open all images with imv
diff --git a/install/network.sh b/install/network.sh
index 66b6c63..f0b1149 100644
--- a/install/network.sh
+++ b/install/network.sh
@@ -1,6 +1,8 @@
+#!/bin/bash
+
 # Install iwd explicitly if it wasn't included in archinstall
 # This can happen if archinstall used ethernet
-if ! command -v iwd &>/dev/null; then
+if ! command -v iwctl &>/dev/null; then
   yay -S --noconfirm --needed iwd
   sudo systemctl enable --now iwd.service
 fi
diff --git a/install/nvidia.sh b/install/nvidia.sh
index 3b310b8..c78d3c2 100644
--- a/install/nvidia.sh
+++ b/install/nvidia.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # ==============================================================================
 # Hyprland NVIDIA Setup Script for Arch Linux
 # ==============================================================================
diff --git a/install/nvim.sh b/install/nvim.sh
index d1c5c85..e8e8560 100644
--- a/install/nvim.sh
+++ b/install/nvim.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if ! command -v nvim &>/dev/null; then
   yay -S --noconfirm --needed nvim luarocks tree-sitter-cli
 
diff --git a/install/plymouth.sh b/install/plymouth.sh
index fbc3245..ecc8657 100755
--- a/install/plymouth.sh
+++ b/install/plymouth.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 if ! command -v plymouth &>/dev/null; then
   yay -S --noconfirm --needed plymouth
diff --git a/install/power.sh b/install/power.sh
index 0ae0c0c..34b4852 100644
--- a/install/power.sh
+++ b/install/power.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Setting the performance profile can make a big difference. By default, most systems seem to start in balanced mode,
 # even if they're not running off a battery. So let's make sure that's changed to performance.
 yay -S --noconfirm power-profiles-daemon
@@ -5,7 +7,7 @@ yay -S --noconfirm power-profiles-daemon
 if ls /sys/class/power_supply/BAT* &>/dev/null; then
   # This computer runs on a battery
   powerprofilesctl set balanced || true
-  
+
   # Enable battery monitoring timer for low battery notifications
   systemctl --user enable --now omarchy-battery-monitor.timer || true
 else
diff --git a/install/printer.sh b/install/printer.sh
index 3c75efc..17b2d31 100644
--- a/install/printer.sh
+++ b/install/printer.sh
@@ -1,2 +1,4 @@
+#!/bin/bash
+
 sudo pacman -S --noconfirm cups cups-pdf cups-filters system-config-printer
 sudo systemctl enable --now cups.service
diff --git a/install/ruby.sh b/install/ruby.sh
index 3e10636..5ec98a2 100644
--- a/install/ruby.sh
+++ b/install/ruby.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Install Ruby using gcc-14 for compatibility
 yay -S --noconfirm --needed gcc14
 mise settings set ruby.ruby_build_opts "CC=gcc-14 CXX=g++-14"
diff --git a/install/theme.sh b/install/theme.sh
index 65184bc..b370751 100644
--- a/install/theme.sh
+++ b/install/theme.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Use dark mode for QT apps too (like kdenlive)
 sudo pacman -S --noconfirm kvantum-qt5
 
@@ -13,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/webapps.sh b/install/webapps.sh
index 21e1d13..8059419 100644
--- a/install/webapps.sh
+++ b/install/webapps.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ -z "$OMARCHY_BARE" ]; then
   source ~/.local/share/omarchy/default/bash/functions
   web2app "HEY" https://app.hey.com https://www.hey.com/assets/images/general/hey.png
diff --git a/install/xtras.sh b/install/xtras.sh
index 7c205b5..32b7920 100644
--- a/install/xtras.sh
+++ b/install/xtras.sh
@@ -1,8 +1,13 @@
+#!/bin/bash
+
 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/1751225707.sh b/migrations/1751225707.sh
index 0a62f9d..c1e8acf 100644
--- a/migrations/1751225707.sh
+++ b/migrations/1751225707.sh
@@ -1,3 +1,4 @@
 echo "Fixing persistent workspaces in waybar config"
 sed -i 's/"persistent_workspaces":/"persistent-workspaces":/' ~/.config/waybar/config
-pkill -SIGUSR2 waybar
+pkill waybar
+setsid waybar >/dev/null 2>&1 &
diff --git a/migrations/1752678932.sh b/migrations/1752678932.sh
new file mode 100644
index 0000000..2b1068d
--- /dev/null
+++ b/migrations/1752678932.sh
@@ -0,0 +1,2 @@
+echo "Install missing docker-buildx package for out-of-the-box Kamal compatibility"
+yay -S --noconfirm --needed docker-buildx
diff --git a/migrations/1752709610.sh b/migrations/1752709610.sh
new file mode 100644
index 0000000..e220d58
--- /dev/null
+++ b/migrations/1752709610.sh
@@ -0,0 +1,2 @@
+echo "Enable ufw firewall"
+source ~/.local/share/omarchy/install/firewall.sh
diff --git a/migrations/1752725616.sh b/migrations/1752725616.sh
new file mode 100644
index 0000000..5dddefe
--- /dev/null
+++ b/migrations/1752725616.sh
@@ -0,0 +1,15 @@
+echo "Make light themes possible"
+if [[ -f ~/.local/share/applications/blueberry.desktop ]]; then
+  rm -f ~/.local/share/applications/blueberry.desktop
+  rm -f ~/.local/share/applications/org.pulseaudio.pavucontrol.desktop
+  update-desktop-database ~/.local/share/applications/
+
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
+
+  omarchy-refresh-waybar
+fi
+
+if [[ ! -L "~/.config/omarchy/themes/rose-pine" ]]; then
+  ln -snf ~/.local/share/omarchy/themes/rose-pine ~/.config/omarchy/themes/
+fi
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/rose-pine/alacritty.toml b/themes/rose-pine/alacritty.toml
new file mode 100644
index 0000000..947e42d
--- /dev/null
+++ b/themes/rose-pine/alacritty.toml
@@ -0,0 +1,72 @@
+[colors.primary]
+foreground = "#575279"
+background = "#faf4ed"
+dim_foreground = "#797593"
+bright_foreground = "#575279"
+
+[colors.cursor]
+text = "#575279"
+cursor = "#cecacd"
+
+[colors.vi_mode_cursor]
+text = "#575279"
+cursor = "#cecacd"
+
+[colors.search.matches]
+foreground = "#797593"
+background = "#f2e9e1"
+
+[colors.search.focused_match]
+foreground = "#faf4ed"
+background = "#d7827e"
+
+[colors.hints.start]
+foreground = "#797593"
+background = "#fffaf3"
+
+[colors.hints.end]
+foreground = "#9893a5"
+background = "#fffaf3"
+
+[colors.line_indicator]
+foreground = "None"
+background = "None"
+
+[colors.footer_bar]
+foreground = "#575279"
+background = "#fffaf3"
+
+[colors.selection]
+text = "#575279"
+background = "#dfdad9"
+
+[colors.normal]
+black = "#f2e9e1"
+red = "#b4637a"
+green = "#286983"
+yellow = "#ea9d34"
+blue = "#56949f"
+magenta = "#907aa9"
+cyan = "#d7827e"
+white = "#575279"
+
+[colors.bright]
+black = "#9893a5"
+red = "#b4637a"
+green = "#286983"
+yellow = "#ea9d34"
+blue = "#56949f"
+magenta = "#907aa9"
+cyan = "#d7827e"
+white = "#575279"
+
+[colors.dim]
+black = "#9893a5"
+red = "#b4637a"
+green = "#286983"
+yellow = "#ea9d34"
+blue = "#56949f"
+magenta = "#907aa9"
+cyan = "#d7827e"
+white = "#575279"
+
diff --git a/themes/rose-pine/backgrounds/background.jpg b/themes/rose-pine/backgrounds/background.jpg
new file mode 100644
index 0000000..adfe242
Binary files /dev/null and b/themes/rose-pine/backgrounds/background.jpg differ
diff --git a/themes/rose-pine/btop.theme b/themes/rose-pine/btop.theme
new file mode 100644
index 0000000..a992faa
--- /dev/null
+++ b/themes/rose-pine/btop.theme
@@ -0,0 +1,119 @@
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="#faf4ed"
+# Base
+
+# Main text color
+theme[main_fg]="#575279"
+# Text
+
+# Title color for boxes
+theme[title]="#908caa"
+# Subtle
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#e0def4"
+# Text
+
+# Background color of selected item in processes box
+theme[selected_bg]="#524f67"
+# HL High
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#f6c177"
+# Gold
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#403d52"
+# HL Med
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="#9ccfd8"
+# Foam
+
+# Background color of the percentage meters
+theme[meter_bg]="#9ccfd8"
+# Foam
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="#c4a7e7"
+# Iris
+
+# Cpu box outline color
+theme[cpu_box]="#ebbcba"
+# Rose
+
+# Memory/disks box outline color
+theme[mem_box]="#31748f"
+# Pine
+
+# Net up/down box outline color
+theme[net_box]="#c4a7e7"
+# Iris
+
+# Processes box outline color
+theme[proc_box]="#eb6f92"
+# Love
+
+# Box divider line and small boxes line color
+theme[div_line]="#6e6a86"
+# Muted
+
+# Temperature graph colors
+theme[temp_start]="#ebbcba"
+# Rose
+theme[temp_mid]="#f6c177"
+# Gold
+theme[temp_end]="#eb6f92"
+# Love
+
+# CPU graph colors
+theme[cpu_start]="#f6c177"
+# Gold
+theme[cpu_mid]="#ebbcba"
+# Rose
+theme[cpu_end]="#eb6f92"
+# Love
+
+# Mem/Disk free meter
+# all love
+theme[free_start]="#eb6f92"
+theme[free_mid]="#eb6f92"
+theme[free_end]="#eb6f92"
+
+# Mem/Disk cached meter
+# all iris
+theme[cached_start]="#c4a7e7"
+theme[cached_mid]="#c4a7e7"
+theme[cached_end]="#c4a7e7"
+
+# Mem/Disk available meter
+# all pine
+theme[available_start]="#31748f"
+theme[available_mid]="#31748f"
+theme[available_end]="#31748f"
+
+# Mem/Disk used meter
+# all rose
+theme[used_start]="#ebbcba"
+theme[used_mid]="#ebbcba"
+theme[used_end]="#ebbcba"
+
+# Download graph colors
+# Pine for start, foam for the rest
+theme[download_start]="#31748f"
+theme[download_mid]="#9ccfd8"
+theme[download_end]="#9ccfd8"
+
+# Upload graph colors
+theme[upload_start]="#ebbcba"
+# Rose for start
+theme[upload_mid]="#eb6f92"
+# Love for mid and end
+theme[upload_end]="#eb6f92"
+
+# Process box color gradient for threads, mem and cpu usage
+theme[process_start]="#31748f"
+# Pine
+theme[process_mid]="#9ccfd8"
+# Foam for mid and end
+theme[process_end]="#9ccfd8"
diff --git a/themes/rose-pine/hyprland.conf b/themes/rose-pine/hyprland.conf
new file mode 100644
index 0000000..c39b9e7
--- /dev/null
+++ b/themes/rose-pine/hyprland.conf
@@ -0,0 +1,4 @@
+general {
+    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
+    col.active_border = rgb(575279)
+}
diff --git a/themes/rose-pine/hyprlock.conf b/themes/rose-pine/hyprlock.conf
new file mode 100644
index 0000000..097ff5c
--- /dev/null
+++ b/themes/rose-pine/hyprlock.conf
@@ -0,0 +1,9 @@
+$color = rgba(250, 244, 237,1.0)
+
+$inner_color = rgba(250, 244, 237,0.8)
+$outer_color = rgba(57,52,79,1.0)
+
+$font_color = rgba(57,52,79,1.0)
+
+$placeholder_color = rgba(216,222,233,0.6)
+$check_color = rgba(136, 192, 208, 1.0)
diff --git a/themes/rose-pine/light.mode b/themes/rose-pine/light.mode
new file mode 100644
index 0000000..66bb2d0
--- /dev/null
+++ b/themes/rose-pine/light.mode
@@ -0,0 +1 @@
+# This will set "prefer-light" and use "Adwaita" as the theme
diff --git a/themes/rose-pine/mako.ini b/themes/rose-pine/mako.ini
new file mode 100644
index 0000000..cab1a2e
--- /dev/null
+++ b/themes/rose-pine/mako.ini
@@ -0,0 +1,21 @@
+text-color=#575279
+border-color=#575279
+background-color=#faf4ed
+width=420
+height=110
+padding=10
+border-size=2
+font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
+max-icon-size=32
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
diff --git a/themes/rose-pine/neovim.lua b/themes/rose-pine/neovim.lua
new file mode 100644
index 0000000..591e8c7
--- /dev/null
+++ b/themes/rose-pine/neovim.lua
@@ -0,0 +1,9 @@
+return {
+	{ "rose-pine/neovim", name = "rose-pine" },
+	{
+		"LazyVim/LazyVim",
+		opts = {
+			colorscheme = "rose-pine-dawn",
+		},
+	},
+}
diff --git a/themes/rose-pine/waybar.css b/themes/rose-pine/waybar.css
new file mode 100644
index 0000000..d2e5942
--- /dev/null
+++ b/themes/rose-pine/waybar.css
@@ -0,0 +1,2 @@
+@define-color foreground #575279;
+@define-color background #faf4ed;
diff --git a/themes/rose-pine/wofi.css b/themes/rose-pine/wofi.css
new file mode 100644
index 0000000..51bf573
--- /dev/null
+++ b/themes/rose-pine/wofi.css
@@ -0,0 +1,4 @@
+@define-color	selected-text  #88C0D0;
+@define-color	text  #575279;
+@define-color	base  #faf4ed;
+@define-color	border  #575279;
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