diff --git a/config/files/usr/bin/distrobox-user b/config/files/usr/bin/distrobox-user
deleted file mode 100755
index 492a386..0000000
--- a/config/files/usr/bin/distrobox-user
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-set -oue pipefail
-
-# Run setup
-echo 'Running initial setup...'
-
-mkdir -p "$XDG_CONFIG_HOME/config.d"
-
-# Install oh-my-zsh
-ZSH="$XDG_CONFIG_HOME/oh-my-zsh" sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
-
-# Spaceship theme
-ZSH_CUSTOM="$XDG_CONFIG_HOME/oh-my-zsh/custom"
-git clone https://github.com/denysdovhan/spaceship-prompt.git "$ZSH_CUSTOM/themes/spaceship-prompt" --depth=1
-ln -s "$ZSH_CUSTOM/themes/spaceship-prompt/spaceship.zsh-theme" "$ZSH_CUSTOM/themes/spaceship.zsh-theme"
-sed -i 's/^ZSH_THEME="robbyrussell"/ZSH_THEME="spaceship"/' "$XDG_CONFIG_HOME/.zshrc"
-
-# nvm
-nvm_setup='[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'
-
-echo "$nvm_setup" >> "$XDG_CONFIG_HOME/.zshrc"
-
-git clone https://github.com/nvm-sh/nvm.git "$NVM_DIR"
-cd "$NVM_DIR"
-git checkout `git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1)`
-\. "$NVM_DIR/nvm.sh"
-
-nvm install 8 ; nvm install 12
-nvm install 14 ; npm install -g npm@7
-nvm install 18 ; nvm alias default 18
-
-# pyenv
-git clone https://github.com/pyenv/pyenv.git "$PYENV_ROOT"
-git clone https://github.com/pyenv/pyenv-virtualenv.git "$PYENV_ROOT/plugins/pyenv-virtualenv"
-
-echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> "$XDG_CONFIG_HOME/.zshrc"
-echo 'eval "$(pyenv init -)"' >> "$XDG_CONFIG_HOME/.zshrc"
-
-"$PYENV_ROOT/bin/pyenv" install 3.10.13; "$PYENV_ROOT/bin/pyenv" install 2.7.18
-"$PYENV_ROOT/bin/pyenv" virtualenv 2.7.18 local2
-"$PYENV_ROOT/bin/pyenv" global 3.10.13 local2
-
diff --git a/config/files/usr/etc/skel/.zshrc b/config/files/usr/etc/skel/.zshrc
index 3b4f127..feae3a3 100644
--- a/config/files/usr/etc/skel/.zshrc
+++ b/config/files/usr/etc/skel/.zshrc
@@ -1,5 +1,3 @@
-
-
 if [ -n "$CONTAINER_ID" ]; then
   # Inside of a distrobox container
   export XDG_CONFIG_HOME="$HOME/.config/contexts/$CONTAINER_ID"
@@ -9,7 +7,45 @@ if [ -n "$CONTAINER_ID" ]; then
   SETUP_DONE="$XDG_CONFIG_HOME/setup-done"
 
   if ! [ -f "$SETUP_DONE" ]; then
-    /usr/bin/distrobox-user
+    echo 'Running initial setup...'
+
+    # Install oh-my-zsh
+    git clone https://github.com/ohmyzsh/ohmyzsh.git "$XDG_CONFIG_HOME/oh-my-zsh"
+    cp $XDG_CONFIG_HOME/oh-my-zsh/templates/zshrc.zsh-template "$XDG_CONFIG_HOME/.zshrc"
+    sed -i 's/export ZSH=\$HOME\/.oh-my-zsh/export ZSH=\$XDG_CONFIG_HOME\/oh-my-zsh/' "$XDG_CONFIG_HOME/.zshrc"
+
+    # Spaceship theme
+    ZSH_CUSTOM="$XDG_CONFIG_HOME/oh-my-zsh/custom"
+    git clone https://github.com/denysdovhan/spaceship-prompt.git "$ZSH_CUSTOM/themes/spaceship-prompt" --depth=1
+    ln -s "$ZSH_CUSTOM/themes/spaceship-prompt/spaceship.zsh-theme" "$ZSH_CUSTOM/themes/spaceship.zsh-theme"
+    sed -i 's/^ZSH_THEME="robbyrussell"/ZSH_THEME="spaceship"/' "$XDG_CONFIG_HOME/.zshrc"
+
+    if [ -n "$SETUP_DEV_TOOLS" ]; then
+      # nvm
+      nvm_setup='[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+      [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion'
+
+      echo "$nvm_setup" >> "$XDG_CONFIG_HOME/.zshrc"
+
+      git clone https://github.com/nvm-sh/nvm.git "$NVM_DIR"
+      bash -c 'cd "$NVM_DIR" && git checkout `git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1)`'
+      \. "$NVM_DIR/nvm.sh"
+
+      nvm install 8 ; nvm install 12
+      nvm install 14 ; npm install -g npm@7
+      nvm install 18 ; nvm alias default 18
+
+      # pyenv
+      git clone https://github.com/pyenv/pyenv.git "$PYENV_ROOT"
+      git clone https://github.com/pyenv/pyenv-virtualenv.git "$PYENV_ROOT/plugins/pyenv-virtualenv"
+
+      echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> "$XDG_CONFIG_HOME/.zshrc"
+      echo 'eval "$(pyenv init -)"' >> "$XDG_CONFIG_HOME/.zshrc"
+
+      "$PYENV_ROOT/bin/pyenv" install 3.10.13; "$PYENV_ROOT/bin/pyenv" install 2.7.18
+      "$PYENV_ROOT/bin/pyenv" virtualenv 2.7.18 local2
+      "$PYENV_ROOT/bin/pyenv" global 3.10.13 local2
+    fi
 
     echo 1 > "$SETUP_DONE"
   fi
@@ -17,21 +53,33 @@ if [ -n "$CONTAINER_ID" ]; then
   source "$XDG_CONFIG_HOME/.zshrc"
   unset SETUP_DONE
 
-  for conf in "$XDG_CONFIG_HOME/config.d/"*.zsh; do
-    source "${conf}"
-  done
+  db_glob_pattern="$XDG_CONFIG_HOME/config.d/*.zsh"
+
+  if stat -t "$db_glob_pattern" >/dev/null 2>&1; then
+    for conf in "$db_glob_pattern"; do
+      source "${conf}"
+    done
+  fi
 else
   # localhost
   source "$HOME/.config/contexts/localhost/.zshrc"
 
-  for conf in "$HOME/.config/contexts/localhost/config.d/"*.zsh; do
+  localhost_glob_pattern="$XDG_CONFIG_HOME/config.d/*.zsh"
+
+  if stat -t "$localhost_glob_pattern" >/dev/null 2>&1; then
+    for conf in "$localhost_glob_pattern"; do
+      source "${conf}"
+    done
+    unset conf
+  fi
+fi
+
+# Load seperated config files
+global_glob_pattern="$XDG_CONFIG_HOME/config.d/*.zsh"
+
+if stat -t "$global_glob_pattern" >/dev/null 2>&1; then
+  for conf in "$global_glob_pattern"; do
     source "${conf}"
   done
   unset conf
 fi
-
-# Load seperated config files
-for conf in "$HOME/.config/contexts/config.d/"*.zsh; do
-  source "${conf}"
-done
-unset conf