diff --git a/Makefile b/Makefile
index 2174811..68c1afa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 LN_FLAGS = -sfnv
 MKDIR_FLAGS = -pv
 
-home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap bash_profile oh-my-zsh
+home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap oh-my-zsh bashrc
 
 config_copy = 
 
@@ -12,7 +12,10 @@ all:
 
 local_install: aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap termite dircolors-solarized oh-my-zsh
 
-remote_install: bash_profile vim vimrc dircolors-solarized zshrc aliases oh-my-zsh
+remote_install: vim vimrc dircolors-solarized zshrc aliases oh-my-zsh
+
+noroot_install: bashrc
+
 
 .PHONY: $(home_symlinks)
 $(home_symlinks):
diff --git a/bash_profile b/bash_profile
deleted file mode 100644
index af3ea90..0000000
--- a/bash_profile
+++ /dev/null
@@ -1,22 +0,0 @@
-#if [[ "$SSH_CONNECTION" != "" && "$MY_SSH_CONNECTION" != "yes" ]]; then
-#    	/bin/zsh
-#fi
-#export SHELL=/bin/zsh
-#exec /bin/zsh -l
-
-if [[ -z $TMUX ]]; then
-    if [ -e /usr/share/terminfo/r/rxvt-256color ]; then # may be xterm-256 depending on your distro
-        export TERM='rxvt-256color'
-    else
-        export TERM='rxvt'
-    fi
-else
-    if [ -e /usr/share/terminfo/s/screen.xterm-256color ]; then
-        export TERM='screen-256color'
-    else
-        export TERM='screen'
-    fi
-fi
-
-export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 13)\]\h \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]"
-export PATH=$HOME/.local/bin:$PATH
diff --git a/bashrc b/bashrc
new file mode 100644
index 0000000..b2863a5
--- /dev/null
+++ b/bashrc
@@ -0,0 +1,5 @@
+export SHELL=/bin/zsh
+if [[ "$SSH_CONNECTION" != "" && "$MY_SSH_CONNECTION" != "yes" ]]; then
+    	/bin/zsh
+fi
+exec /bin/zsh -l
diff --git a/zshrc b/zshrc
index 58ff536..9d914ab 100644
--- a/zshrc
+++ b/zshrc
@@ -1,5 +1,23 @@
 ### ZSH Config
 
+## Set term for proper colors
+if [[ -z $TMUX ]]; then
+    if [ -e /usr/share/terminfo/x/xterm-256color ]; then # may be xterm-256 depending on your distro
+        export TERM='xterm-256color'
+    else
+        export TERM='xterm'
+    fi
+else
+    if [ -e /usr/share/terminfo/s/screen.xterm-256color ]; then
+        export TERM='screen-256color'
+    else
+        export TERM='screen'
+    fi
+fi
+
+## For local binaries (vim 8)
+export PATH=$HOME/.local/bin:$PATH
+
 ## Path to your oh-my-zsh installation.
 export ZSH=$HOME/.oh-my-zsh