diff --git a/install-headless.sh b/install-headless.sh
index f34554fe..7bf28a1b 100644
--- a/install-headless.sh
+++ b/install-headless.sh
@@ -13,10 +13,10 @@ sudo apt install -y curl git jq unzip
 
 # Run installers
 for script in ~/.local/share/omakub/install/cfg-*.sh; do source $script; done
-for script in ~/.local/share/omakub/install/app*-*.sh; do source $script; done
 for script in ~/.local/share/omakub/install/dev-*.sh; do source $script; done
-for script in ~/.local/share/omakub/install/set-cfg-*.sh; do source $script; done
+for script in ~/.local/share/omakub/install/app*-*.sh; do source $script; done
 #for script in ~/.local/share/omakub/install/gui-*.sh; do source $script; done
+for script in ~/.local/share/omakub/install/set-cfg-*.sh; do source $script; done
 #for script in ~/.local/share/omakub/install/set-gui-*.sh; do source $script; done
 
 # Revert to normal idle settings
diff --git a/install/cfg-shell.sh b/install/cfg-shell.sh
index 32c6eb8e..afc770ea 100644
--- a/install/cfg-shell.sh
+++ b/install/cfg-shell.sh
@@ -1,6 +1,5 @@
 [ -f "~/.bashrc" ] && mv ~/.bashrc ~/.bashrc.bak
 cp ~/.local/share/omakub/configs/bashrc ~/.bashrc
-source ~/.local/share/omakub/defaults/bash/shell
 
 [ -f "~/.inputrc" ] && mv ~/.inputrc ~/.inputrc.bak
 cp ~/.local/share/omakub/configs/inputrc ~/.inputrc
diff --git a/install/set-cfg-shell.sh b/install/set-cfg-shell.sh
new file mode 100644
index 00000000..b9225c68
--- /dev/null
+++ b/install/set-cfg-shell.sh
@@ -0,0 +1 @@
+source ~/.local/share/omakub/defaults/bash/shell