diff --git a/os/linux/arch/bootstrap-test.fish b/os/linux/arch/bootstrap-test.fish
index cf6a56d..dc9e519 100755
--- a/os/linux/arch/bootstrap-test.fish
+++ b/os/linux/arch/bootstrap-test.fish
@@ -10,4 +10,4 @@ docker pull archlinux -q || begin
 	exit 1
 end
 
-docker run -it --rm -v $DOTFILES_PATH:/dotfiles:ro archlinux sh -c "/dotfiles/os/linux/arch/provision.sh"
+docker run -it --rm -v $DOTFILES_PATH:/dotfiles:ro archlinux sh -c "/dotfiles/os/linux/arch/provision.sh && fish"
diff --git a/os/linux/arch/provision.d/10-install-yay.bash b/os/linux/arch/provision.d/10-install-yay.bash
index e6faacb..877deb6 100755
--- a/os/linux/arch/provision.d/10-install-yay.bash
+++ b/os/linux/arch/provision.d/10-install-yay.bash
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-echo $USER
+echo "Installing yay as $(whoami)"
 REPOSITORY_PATH="/tmp/provisioning"
 sudo pacman -S --needed --noconfirm git base-devel
 mkdir -p "$REPOSITORY_PATH"
 rm -rf "$REPOSITORY_PATH/yay"
-git clone https://aur.archlinux.org/yay.git "$REPOSITORY_PATH/yay"
-cd "$REPOSITORY_PATH/yay"
+git clone https://aur.archlinux.org/yay-bin.git "$REPOSITORY_PATH/yay"
+cd "$REPOSITORY_PATH/yay" || exit 1
 makepkg --noconfirm -si
-yay -S --noconfirm yay
+yay -S --noconfirm yay-bin
 rm -rf "$REPOSITORY_PATH/yay"
diff --git a/os/linux/arch/provision.d/20-install-packages.bash b/os/linux/arch/provision.d/20-install-packages.bash
index e1be3f0..8c0a415 100755
--- a/os/linux/arch/provision.d/20-install-packages.bash
+++ b/os/linux/arch/provision.d/20-install-packages.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if egrep -q '^\[multilib\]$' /etc/pacman.conf; then
+if grep -E -q '^\[multilib\]$' /etc/pacman.conf; then
 	echo "Multilib Repository Already Enabled!"
 else
 	echo "Enabling Multilib Repository (with sudo)..."
diff --git a/os/linux/arch/provision.d/50-install-tmux-plugins.bash b/os/linux/arch/provision.d/50-install-tmux-plugins.bash
index 4d24d6b..bd8d519 100755
--- a/os/linux/arch/provision.d/50-install-tmux-plugins.bash
+++ b/os/linux/arch/provision.d/50-install-tmux-plugins.bash
@@ -1,14 +1,19 @@
 #!/usr/bin/env bash
 
+XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+
 mkdir -p "$XDG_CONFIG_HOME/systemd/user"
 
 [ ! -d "$XDG_CONFIG_HOME/tmux/plugins/tpm" ] && \
 	git clone https://github.com/tmux-plugins/tpm "$XDG_CONFIG_HOME/tmux/plugins/tpm"
 
-tmux source-file "$HOME/.tmux.conf"
+echo "Reloading tmux config..."
+tmux source-file "$HOME/.tmux.conf" &>/dev/null
 
-bash "$XDG_CONFIG_HOME/tmux/plugins/tpm/bindings/clean_plugins"
-bash "$XDG_CONFIG_HOME/tmux/plugins/tpm/bindings/install_plugins"
-bash "$XDG_CONFIG_HOME/tmux/plugins/tpm/bindings/update_plugins"
+echo "Installing tmux plugins..."
+bash "$XDG_CONFIG_HOME/tmux/plugins/tpm/bindings/clean_plugins" &>/dev/null
+bash "$XDG_CONFIG_HOME/tmux/plugins/tpm/bindings/install_plugins" &>/dev/null
+bash "$XDG_CONFIG_HOME/tmux/plugins/tpm/bindings/update_plugins" &>/dev/null
 
-tmux source-file "$HOME/.tmux.conf"
+echo "Finalizing tmux plugin installation..."
+tmux source-file "$HOME/.tmux.conf" &>/dev/null
diff --git a/os/linux/arch/provision.d/60-AS_ROOT-vt-colors.bash b/os/linux/arch/provision.d/60-AS_ROOT-vt-colors.bash
index 33c5108..573348f 100755
--- a/os/linux/arch/provision.d/60-AS_ROOT-vt-colors.bash
+++ b/os/linux/arch/provision.d/60-AS_ROOT-vt-colors.bash
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+test -d /boot/loader/entries || { echo "no known bootloader"; exit 1; }
+
 inject_red="vt.default_red=0x11,0xf9,0xa6,0xf4,0x66,0xae,0xa1,0xf8,0x75,0xf9,0xa6,0xf4,0x66,0xae,0xa1,0xf9"
 inject_green="vt.default_grn=0x11,0x26,0xe2,0xbf,0xd9,0x81,0xef,0xf8,0x71,0x26,0xe2,0xbf,0xd9,0x81,0xef,0xf8"
 inject_blue="vt.default_blu=0x11,0x72,0x2e,0x75,0xef,0xff,0xe4,0xf2,0x5e,0x72,0x2e,0x75,0xef,0xff,0xe4,0xf5"