diff --git a/commands/core.d/bootstrap b/commands/core.d/bootstrap
index 676e109bace0a33ee24c90fe898d69d664ffd90d..87596a0272fa1916f0df2719831a523fe303411b 100755
--- a/commands/core.d/bootstrap
+++ b/commands/core.d/bootstrap
@@ -208,7 +208,6 @@ function core_bootstrap() {
   core_parse_project_config
   core_bootstrap_git_collab
   # core_bootstrap_git_hooks
-  core_bootstrap_git_branches
   core_bootstrap_install_dependencies
   core_bootstrap_install_command
   core_bootstrap_git_lay
diff --git a/commands/core.d/bootstrap.d/arch.sh b/commands/core.d/bootstrap.d/arch.sh
index d2ba4f36fa793323ccd093509acfdf7c02b1a073..50fd028573c210f17998cabe672fce704d562d5c 100644
--- a/commands/core.d/bootstrap.d/arch.sh
+++ b/commands/core.d/bootstrap.d/arch.sh
@@ -1,6 +1,15 @@
 #!/usr/bin/env bash
 
-distro_pacman="${distro_pacman:-sudo pacman -S --noconfirm}"
+if which yaourt &>/dev/null; then
+  distro_pacman="${distro_pacman:-yaourt -S --noconfirm}"
+  distro_update_cmd="${distro_update_cmd:-yaourt -Syyuu --aur --noconfirm --devel}"
+elif which paru &>/dev/null; then
+  distro_pacman="${distro_pacman:-paru -S --noconfirm}"
+  distro_update_cmd="${distro_pacman:-paru -Syyuu --noconfirm}"
+else
+  distro_pacman="${distro_pacman:-sudo pacman -S --noconfirm}"
+  distro_update_cmd="${distro_update_cmd:-sudo pacman -Syyuu --noconfirm}"
+fi
 
 distro_packages+=(
   "python"
diff --git a/lib/system b/lib/system
index 0659078cb062650710164b634fbf550010632b64..e32baa2c0f8069b98ccb346b98a4f27295cd48fe 100755
--- a/lib/system
+++ b/lib/system
@@ -154,7 +154,7 @@ function get_completions() {
         }
       }' <<<"$help"
   )"
-  c=("${c[@]%[[:space:]]}")
+  c=(" ${c[@]%[[:space:]]} ")
 
   if [[ "${#rest[@]}" -gt 0 ]]; then
     unset "rest[-1]"