diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index af1c81b..bffe498 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -4,6 +4,29 @@
 # execute all executable files (excluding templates and editor backups) in the
 # ~/.config/yadm/bootstrap.d directory when run.
 
+_repeat() {
+  local start=1
+  local end=${1:-80}
+  local str="${2:-=}"
+  local range=$(seq $start $end)
+  for i in $range; do echo -n "${str}"; done
+}
+
+display() {
+  local value="$1"
+  echo -n "/="
+  _repeat ${#value} "="
+  echo "=\\"
+
+  echo -n "| "
+  echo -n ${value}
+  echo " |"
+
+  echo -n "\\="
+  _repeat ${#value} "="
+  echo "=/"
+}
+
 set -eu
 
 # Directory to look for bootstrap executables in
@@ -22,11 +45,11 @@ while IFS= read -r bootstrap; do
 done < <(find -L "$BOOTSTRAP_D" -type f | sort)
 
 for bootstrap in "${bootstraps[@]}"; do
-  echo "----------------------------"
-  echo "# Executing $bootstrap"
+  display "Executing $bootstrap"
 
   if ! "$bootstrap"; then
     echo "Error: bootstrap '$bootstrap' failed" >&2
     exit 1
   fi
 done
+display "Bootstrap completed"
diff --git a/.config/yadm/bootstrap.d/install_dependencies.sh b/.config/yadm/bootstrap.d/00-Dependencies.sh
similarity index 91%
rename from .config/yadm/bootstrap.d/install_dependencies.sh
rename to .config/yadm/bootstrap.d/00-Dependencies.sh
index 89a0fdf..a6d6d85 100755
--- a/.config/yadm/bootstrap.d/install_dependencies.sh
+++ b/.config/yadm/bootstrap.d/00-Dependencies.sh
@@ -4,7 +4,7 @@ echo "Installing general apps"
 
 yay -S --needed neovim \
   network-manager-applet \
-  kitty \
+  ghostty \
   btop \
   zoxide fzf \
   superfile
diff --git a/.config/yadm/bootstrap.d/install_desktop_env.sh b/.config/yadm/bootstrap.d/10-DesktopEnv.sh
similarity index 100%
rename from .config/yadm/bootstrap.d/install_desktop_env.sh
rename to .config/yadm/bootstrap.d/10-DesktopEnv.sh
diff --git a/.config/yadm/bootstrap.d/install_fonts.sh b/.config/yadm/bootstrap.d/20-Fonts.sh
similarity index 100%
rename from .config/yadm/bootstrap.d/install_fonts.sh
rename to .config/yadm/bootstrap.d/20-Fonts.sh
diff --git a/.config/yadm/bootstrap.d/install_gtk_gruvbox.sh b/.config/yadm/bootstrap.d/20-GTKGruvbox.sh
similarity index 100%
rename from .config/yadm/bootstrap.d/install_gtk_gruvbox.sh
rename to .config/yadm/bootstrap.d/20-GTKGruvbox.sh
diff --git a/.config/yadm/bootstrap.d/install_keymap.sh b/.config/yadm/bootstrap.d/20-Keymap.sh
similarity index 100%
rename from .config/yadm/bootstrap.d/install_keymap.sh
rename to .config/yadm/bootstrap.d/20-Keymap.sh
diff --git a/.config/yadm/bootstrap.d/install_git_credentials.sh b/.config/yadm/bootstrap.d/30-Git.sh
similarity index 100%
rename from .config/yadm/bootstrap.d/install_git_credentials.sh
rename to .config/yadm/bootstrap.d/30-Git.sh
diff --git a/.config/yadm/bootstrap.d/install_thunar.sh b/.config/yadm/bootstrap.d/30-Thunar.sh
similarity index 100%
rename from .config/yadm/bootstrap.d/install_thunar.sh
rename to .config/yadm/bootstrap.d/30-Thunar.sh