diff --git a/bash/.bash/lib/appearance.bash b/bash/.bash/lib/appearance.bash
index b564034..9bf2602 100644
--- a/bash/.bash/lib/appearance.bash
+++ b/bash/.bash/lib/appearance.bash
@@ -9,5 +9,5 @@ export LSCOLORS='Gxfxcxdxdxegedabagacad'
 
 # Load the theme
 if [[ $BASH_THEME ]]; then
-    source "$DOTFILES/bash/themes/$BASH_THEME/$BASH_THEME.theme.bash"
+    source "$BASHFILES/themes/$BASH_THEME/$BASH_THEME.theme.bash"
 fi
diff --git a/bash/.bash/lib/helpers.bash b/bash/.bash/lib/helpers.bash
index 543513a..e5dc172 100644
--- a/bash/.bash/lib/helpers.bash
+++ b/bash/.bash/lib/helpers.bash
@@ -1,11 +1,11 @@
 # Helper function loading various enable-able files
 function _load_bash_additions() {
   subdirectory="$1"
-  if [ ! -d "${DOTFILES}/bash/${subdirectory}" ]
+  if [ ! -d "${BASHFILES}/${subdirectory}" ]
   then
     continue
   fi
-  FILES="${DOTFILES}/bash/${subdirectory}/*.bash"
+  FILES="${BASHFILES}/${subdirectory}/*.bash"
   for config_file in $FILES
   do
     if [ -e "${config_file}" ]; then
diff --git a/bash/.bash/setup.sh b/bash/.bash/setup.sh
index 2bb5209..1dbdb9d 100644
--- a/bash/.bash/setup.sh
+++ b/bash/.bash/setup.sh
@@ -13,14 +13,14 @@ fi
 export TERM=xterm-256color
 
 # add dotfiles bin
-export PATH="$PATH:$DOTFILES/bin"
+export PATH="$PATH:$BASHFILES/bin"
 
 # Load colors first so they can be use in base theme
-source "${DOTFILES}/bash/themes/colors.theme.bash"
-source "${DOTFILES}/bash/themes/base.theme.bash"
+source "${BASHFILES}/themes/colors.theme.bash"
+source "${BASHFILES}/themes/base.theme.bash"
 
 # library
-LIB="${DOTFILES}/bash/lib/*.bash"
+LIB="${BASHFILES}/lib/*.bash"
 for config_file in $LIB
 do
   source $config_file
diff --git a/bash/.bashrc b/bash/.bashrc
index 4c52b62..c82bb2e 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,5 +1,6 @@
 #
 # ~/.bashrc
 #
-export DOTFILES="/home/daniel/.dotfiles"
-[[ -s "$HOME/.bash/setup.sh" ]] && source "$HOME/.bash/setup.sh"
+export DOTFILES="${HOME}/.bash"
+export BASHFILES="${HOME}/.bash"
+[[ -s "${DOTFILES}/setup.sh" ]] && source "${DOTFILES}/setup.sh"