diff --git a/assets/default/dotfiles/bash_profile b/assets/default/dotfiles/bash_profile
index 2a0b8b2..5cf99fb 100644
--- a/assets/default/dotfiles/bash_profile
+++ b/assets/default/dotfiles/bash_profile
@@ -2,12 +2,13 @@
 IS_BASH_PROFILE_LOADED=true
 # If bashrc hasn't been loaded, load it
 if [ -z "$IS_BASHRC_LOADED" ] ; then
-    source $HOME/.bashrc
+    # shellcheck source=bashrc
+    source "$HOME/.bashrc"
 fi
 
 # Some stuff is OS Dependent
 DET_OS="unknown"
-UNAME_STR=`uname`
+UNAME_STR=$(uname)
 
 if [[ "$UNAME_STR" == "Darwin" ]]; then
     DET_OS="mac"
@@ -19,17 +20,17 @@ fi
 if [[ "$DET_OS" == "mac" ]]; then
     # Bash Completion
     if [ -f /opt/local/etc/profile.d/bash_completion.sh ]; then
-        . /opt/local/etc/profile.d/bash_completion.sh
+        source /opt/local/etc/profile.d/bash_completion.sh
     fi
     if [ -f /opt/local/share/bash-completion/completions/git-flow ]; then
-        . /opt/local/share/bash-completion/completions/git-flow
+        source /opt/local/share/bash-completion/completions/git-flow
     fi
 fi
 
 # Set prompt to include some useful information
 function ps_git_branch {
     ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-    echo " ("${ref#refs/heads/}")"
+    echo " (${ref#refs/heads/})"
 }
 
 function ps_atf_target {
@@ -38,13 +39,13 @@ function ps_atf_target {
 }
 
 function ps_force_target {
-    `git config force.use 2> /dev/null` || return
+    test "true" = "$( git config force.use 2> /dev/null )" || return
     org=$(force-target 2> /dev/null) || return
     echo " [$org]"
 }
 
 function ps_host_name {
-    [ -z $TMUX ] || return && echo '\h '
+    [ -z "$TMUX" ] || return && echo '\h '
 }
 
 function ps_virtual_env {
@@ -54,7 +55,7 @@ function ps_virtual_env {
 }
 
 # Alias for colors
-RED="\[\033[0;31m\]"
+# RED="\[\033[0;31m\]"
 YELLOW="\[\033[0;33m\]"
 GREEN="\[\033[0;32m\]"
 ENDCOLOR="\[\e[0m\]"
@@ -70,7 +71,7 @@ export CLICOLOR=1
 export LSCOLORS=ExFxCxDxBxegedabagacad
 
 # Vim colors
-[ -n "$VIM_COLOR" ] || export VIM_COLOR=$(eval $HOME/bin/get_vim_colorscheme.sh) || export VIM_COLOR='wombat256mod'
+[ -n "$VIM_COLOR" ] || export VIM_COLOR="$(eval "$HOME/bin/get_vim_colorscheme.sh")" || export VIM_COLOR='wombat256mod'
 
 export FZF_DEFAULT_COMMAND='ag -g ""'
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND \$dir"
diff --git a/assets/default/dotfiles/bashrc b/assets/default/dotfiles/bashrc
index c1ec86c..ab658d0 100644
--- a/assets/default/dotfiles/bashrc
+++ b/assets/default/dotfiles/bashrc
@@ -1,5 +1,5 @@
 DET_OS="unknown"
-UNAME_STR=`uname`
+UNAME_STR="$(uname)"
 
 # Some settings are mac specific
 if [[ "$UNAME_STR" == "Darwin" ]]; then
@@ -9,8 +9,9 @@ elif [[ "$UNAME_STR" == "Linux" ]]; then
 fi
 
 # Source bash alaias
-if [ -f ~/.bash_alias ]; then
-    . ~/.bash_alias
+if [ -f "$HOME/.bash_alias" ]; then
+    # shellcheck source=bash_alias
+    source "$HOME/.bash_alias"
 fi
 
 # Common paths for me
@@ -32,9 +33,10 @@ elif [[ "$DET_OS" == "mac" ]]; then
     # Fix Python path on OSX to avoid considering System extras over newer versions
     # Local
     export PATH=$HOME/Library/Python/3.7/bin:$HOME/Library/Python/2.7/bin:$PATH
-    export PYTHONPATH=$HOME/Library/Python/2.7/lib/python/site-packages:$PYTHONPATH
+    # Python path is causing other issues
+    # export PYTHONPATH=$HOME/Library/Python/2.7/lib/python/site-packages:$PYTHONPATH
     # MacPorts and system
-    export PYTHONPATH=/opt/local/Library/Frameworks/Python.framework/Versions/Current/lib/python2.7/site-packages:/Library/Python/2.7/site-packages:$PYTHONPATH
+    # export PYTHONPATH=/opt/local/Library/Frameworks/Python.framework/Versions/Current/lib/python2.7/site-packages:/Library/Python/2.7/site-packages:$PYTHONPATH
 fi
 
 # Android paths
@@ -62,6 +64,7 @@ if type rbenv &> /dev/null; then
     eval "$(rbenv init -)"
 elif [ -d "$HOME/.rvm" ]; then
     export PATH="$PATH:$HOME/.rvm/bin"
+    # shellcheck source=/dev/null
     [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
 fi
 
@@ -69,17 +72,18 @@ fi
 if type npm &> /dev/null ; then
     # This seems to fail in some cases
     npm_path=$(npm bin -g 2> /dev/null)
-    if [ -d "$npm_path" ] && echo $PATH | grep -qv "$npm_path"; then
-        export PATH=$npm_path:$PATH
+    if [ -d "$npm_path" ] && echo "$PATH" | grep -qv "$npm_path"; then
+        export PATH=$PATH:$npm_path
     fi
 fi
 
 # Increase memory sizes for java using Ant
-ANT_OPTS="-Xmx2048m -Xms512m"
+export ANT_OPTS="-Xmx2048m -Xms512m"
 
 # Set file as having been loaded to avoid looping
 IS_BASHRC_LOADED=true
 # If an interactive shell and .bash_profile hasn't been loaded, load it
 if [ -n "$PS1" ] && [ -z "$IS_BASH_PROFILE_LOADED" ] ; then
-    source $HOME/.bash_profile
+    # shellcheck source=bash_profile
+    source "$HOME/.bash_profile"
 fi
diff --git a/assets/default/fish/init/paths.fish b/assets/default/fish/init/paths.fish
index f196b12..936702e 100644
--- a/assets/default/fish/init/paths.fish
+++ b/assets/default/fish/init/paths.fish
@@ -22,7 +22,7 @@ else if [ $det_os = "mac" ]
     # Fix Python path on OSX to avoid considering System extras over newer versions
     # Local
     set -gx PATH $HOME/Library/Python/3.7/bin $HOME/Library/Python/2.7/bin $PATH
-    set -gx PYTHONPATH $HOME/Library/Python/2.7/lib/python/site-packages:$PYTHONPATH
+    # set -gx PYTHONPATH $HOME/Library/Python/2.7/lib/python/site-packages:$PYTHONPATH
     # Macports
     set -gx PATH $PATH /opt/local/Library/Frameworks/Python.framework/Versions/Current/bin
     # set -gx PYTHONPATH /opt/local/Library/Frameworks/Python.framework/Versions/Current/lib $PYTHONPATH