diff --git a/bin/omarchy-cmd-install b/bin/omarchy-cmd-install
index 1c6d7356..df697737 100755
--- a/bin/omarchy-cmd-install
+++ b/bin/omarchy-cmd-install
@@ -2,4 +2,4 @@
 
 yay -Slq | fzf --multi --preview 'yay -Sii {1}' --preview-window=down:75% | xargs -ro yay -S --noconfirm
 
-gum spin --spinner "globe" --title "Done!" -- sleep 2
+~/.local/share/omarchy/bin/omarchy-show-done
diff --git a/bin/omarchy-cmd-uninstall b/bin/omarchy-cmd-uninstall
index 9f78c2e0..c748f591 100755
--- a/bin/omarchy-cmd-uninstall
+++ b/bin/omarchy-cmd-uninstall
@@ -2,4 +2,4 @@
 
 yay -Qqe | fzf --multi --preview 'yay -Qi {1}' --preview-window=down:75% | xargs -ro yay -Rns --noconfirm
 
-gum spin --spinner "globe" --title "Done!" -- sleep 2
+~/.local/share/omarchy/bin/omarchy-show-done
diff --git a/bin/omarchy-font-menu b/bin/omarchy-font-menu
index 7eaa9147..ce25a10a 100755
--- a/bin/omarchy-font-menu
+++ b/bin/omarchy-font-menu
@@ -13,4 +13,4 @@ if [[ -n "$font" ]]; then
   sed -i "s/family = \".*\"/family = \"$font\"/g" ~/.config/alacritty/alacritty.toml
 fi
 
-gum spin --spinner "globe" --title "Done!" -- sleep 2
+~/.local/share/omarchy/bin/omarchy-show-done
diff --git a/bin/omarchy-setup-docker-dbs b/bin/omarchy-setup-docker-dbs
index 236819ca..ead59c32 100755
--- a/bin/omarchy-setup-docker-dbs
+++ b/bin/omarchy-setup-docker-dbs
@@ -16,4 +16,4 @@ if [[ -n "$choices" ]]; then
   done
 fi
 
-gum spin --spinner "globe" --title "Done!" -- sleep 2
+~/.local/share/omarchy/bin/omarchy-show-done
diff --git a/bin/omarchy-setup-dropbox b/bin/omarchy-setup-dropbox
index 70242dc3..000e24b0 100755
--- a/bin/omarchy-setup-dropbox
+++ b/bin/omarchy-setup-dropbox
@@ -9,3 +9,5 @@ yay -S --noconfirm --needed \
 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."
+
+~/.local/share/omarchy/bin/omarchy-show-done
diff --git a/bin/omarchy-setup-fido2 b/bin/omarchy-setup-fido2
index b499ee57..6c29a282 100755
--- a/bin/omarchy-setup-fido2
+++ b/bin/omarchy-setup-fido2
@@ -33,3 +33,5 @@ else
     fi
   fi
 fi
+
+~/.local/share/omarchy/bin/omarchy-show-done
diff --git a/bin/omarchy-setup-fingerprint b/bin/omarchy-setup-fingerprint
index 123fb050..7d480b63 100755
--- a/bin/omarchy-setup-fingerprint
+++ b/bin/omarchy-setup-fingerprint
@@ -43,3 +43,5 @@ EOF
     fi
   fi
 fi
+
+~/.local/share/omarchy/bin/omarchy-show-done
diff --git a/bin/omarchy-setup-steam b/bin/omarchy-setup-steam
index 604af7e3..da99e6a9 100755
--- a/bin/omarchy-setup-steam
+++ b/bin/omarchy-setup-steam
@@ -9,3 +9,5 @@ sudo pacman -Sy
 echo "Now pick dependencies matching your graphics card"
 yay -S steam
 gtk-launch steam >/dev/null 2>&1 &
+
+~/.local/share/omarchy/bin/omarchy-show-done
diff --git a/bin/omarchy-show-done b/bin/omarchy-show-done
new file mode 100755
index 00000000..4c470d9f
--- /dev/null
+++ b/bin/omarchy-show-done
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo
+gum spin --spinner "globe" --title "Done!" -- sleep 2
diff --git a/bin/omarchy-theme-next b/bin/omarchy-theme-next
index 778b0ea3..fb42add0 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")
 
-"$HOME/.local/share/omarchy/bin/omarchy-theme-set" $NEW_THEME_NAME
+~/.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-remove b/bin/omarchy-theme-remove
index b1fe7a29..550f786e 100755
--- a/bin/omarchy-theme-remove
+++ b/bin/omarchy-theme-remove
@@ -24,10 +24,9 @@ fi
 
 # Use readlink -f to resolve symlinks and get the absolute path
 if [ "$(readlink -f "$CURRENT_DIR/theme")" = "$(readlink -f "$THEME_PATH")" ]; then
-  "$HOME/.local/share/omarchy/bin/omarchy-theme-next"
+  ~/.local/share/omarchy/bin/omarchy-theme-next
 fi
 
 # Now remove the theme directory and backgrounds for THEME_NAME
 rm -rf "$THEME_PATH"
 rm -rf "$BACKGROUND_PATH"
-
diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set
index 3f0551b2..ee60d1f2 100755
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@@ -44,11 +44,11 @@ touch "$HOME/.config/alacritty/alacritty.toml"
 
 # Restart components to apply new theme
 pkill -SIGUSR2 btop
-"$HOME/.local/share/omarchy/bin/omarchy-restart-waybar"
+~/.local/share/omarchy/bin/omarchy-restart-waybar
 pkill swayosd-server
 setsid uwsm app -- swayosd-server &>/dev/null &
 makoctl reload
 hyprctl reload
 
 # Set new background
-"$HOME/.local/share/omarchy/bin/omarchy-theme-bg-next"
+~/.local/share/omarchy/bin/omarchy-theme-bg-next
diff --git a/bin/omarchy-theme-update b/bin/omarchy-theme-update
index f6fd78fd..33c73181 100755
--- a/bin/omarchy-theme-update
+++ b/bin/omarchy-theme-update
@@ -6,5 +6,4 @@ for dir in ~/.config/omarchy/themes/*/; do
   [ -d "$dir" ] && [ ! -L "${dir%/}" ] && echo "Updating: $(basename "$dir")" && git -C "$dir" pull
 done
 
-gum spin --spinner "globe" --title "Done!" -- sleep 2
-
+~/.local/share/omarchy/bin/omarchy-show-done
diff --git a/bin/omarchy-update b/bin/omarchy-update
index 93412443..191b2e07 100755
--- a/bin/omarchy-update
+++ b/bin/omarchy-update
@@ -13,7 +13,7 @@ git -C $omarchy_path pull --autostash
 git -C $omarchy_path diff --check || git -C $omarchy_path reset --merge
 
 # Run migrations
-"$HOME/.local/share/omarchy/bin/omarchy-migrate"
+~/.local/share/omarchy/bin/omarchy-migrate
 
 # Update system packages
 echo -e "\e[32m\nUpdate system packages\e[0m"
@@ -24,4 +24,4 @@ if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $
   gum confirm "Linux kernel has been updated. Reboot?" && sudo reboot now
 fi
 
-gum spin --spinner "globe" --title "Done!" -- sleep 2
+~/.local/share/omarchy/bin/omarchy-show-done