diff --git a/.Xresources b/.Xresources
index 6fb5fd3..4f1fc8b 100644
--- a/.Xresources
+++ b/.Xresources
@@ -3,7 +3,7 @@ Xft.antialias: 1
 Xft.rgba: rgb
 Xft.hinting: 1
 Xft.autohint: 0
-Xft.hintstyle:  hintslight
+Xft.hintstyle:  hintfull
 Xft.lcdfilter:  lcddefault
 
 
diff --git a/.bash_exports b/.bash_exports
index 1668083..ecd97c2 100644
--- a/.bash_exports
+++ b/.bash_exports
@@ -54,10 +54,11 @@ export GTEST_COLOR=1
 export CGCC_FORCE_COLOR=1
 
 ## Go
-export GOROOT=$mylib/go
-export GOPATH=$HOME/workspace
-export GOSRC=$mylib/go/src
-export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
+export GOPATH=$HOME
+# export GOROOT=$mylib/go
+# export GOPATH=$HOME/workspace
+# export GOSRC=$mylib/go/src
+# export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
 
 ## Rust
 export PATH=$mylib/rust/bin:$PATH
diff --git a/.bash_prompt b/.bash_prompt
new file mode 100644
index 0000000..23d0f6f
--- /dev/null
+++ b/.bash_prompt
@@ -0,0 +1,73 @@
+#!/bin/sh
+# Fancy prompt
+
+export GIT_PS1_SHOWDIRTYSTATE=1
+unset GIT_PS1_SHOWUPSTREAM
+export GIT_PS1_SHOWSTASHSTATE=1
+
+if [ -f "$HOME/.bash_completion" ] ; then
+    source ~/.bash_completion
+fi
+
+if [ -f "/usr/share/git/completion/git-completion.bash" ] ; then
+  source /usr/share/git/completion/git-completion.bash
+elif [ -f "/etc/bash_completion.d/git" ] ; then
+  source /etc/bash_completion.d/git
+fi
+
+if [ -f "/usr/share/git/git-prompt.sh" ] ; then
+  source /usr/share/git/git-prompt.sh
+elif [ -f "/usr/share/git/completion/git-prompt.sh" ] ; then
+  source /usr/share/git/completion/git-prompt.sh
+elif [ -f "/etc/bash_completion.d/git-prompt" ] ; then
+  source /etc/bash_completion.d/git-prompt
+fi
+
+function short_pwd {
+  echo $PWD | sed "s:${HOME}:~:" | sed "s:/\(.\)[^/]*:/\1:g" | sed "s:/[^/]*$:/$(basename $PWD):"
+}
+
+function prompt_command {
+    banner="$HOSTNAME"
+    let prompt_x=$(tput cols)-$(expr length ${banner})-3
+    tput sc
+    tput cup 0 ${prompt_x}
+    if [ "$USER" = "root" ]; then
+        echo -ne " \e[38;5;228;48;5;160m ${banner} \e[0m"
+    else
+        echo -ne " \e[38;5;195;48;5;33m ${banner} \e[0m"
+    fi
+    tput rc
+    #tmux rename-window `basename $PWD`
+    tmux rename-window $(short_pwd) 2>/dev/null
+    eval $(tmux switch-client \; show-environment -s 2>/dev/null)
+}
+
+export PROMPT_COMMAND=prompt_command
+
+#PS1_EXTRA=";38;5;22"
+PS1_EXTRA=""
+PS1_TITLE="\[\e]2;\w\a\e[0m\]"
+if [ "$SSH_TTY" ]; then
+	HOST_NAME=$(hostname -f | sed 's/.tvoli.com//')
+    PS1_PREFIX="\u@${HOST_NAME}: "
+    PS1_TITLE="\[\e]2;\u@\h : \w\a\e[0m\]"
+fi
+# Root has red inverse prompt
+PS1_ROOT="\[\e[38;5;228;48;5;196m\] ### ROOT ### "
+
+case "$TERM" in
+    putty|putty*|xterm|xterm*|screen|screen.xterm|screen-bce|rxvt|rxvt-unicode)
+    PS1="\[\e[1${PS1_EXTRA}m\]\$(__git_ps1 2>/dev/null)\$([ "\$USER" = "root" ] && echo -e \"$PS1_ROOT\") ${PS1_PREFIX}\W\\$\[\e[0m\]${PS1_TITLE} "
+    ;;
+*)
+    PS1="${PS1_PREFIX}\w\\$ "
+    ;;
+esac
+
+export PS1
+
+#export PROMPT_COMMAND='echo -ne "\033]0;${PWD}\007"'
+
+# Automatically update DISPLAY, ssh agent
+tmux_env() { $(tmux show-env 2>/dev/null | grep '^SSH_AUTH_SOCK\|DISPLAY' | xargs echo export); }
diff --git a/.vimrc b/.vimrc
index ae97989..68e05af 100644
--- a/.vimrc
+++ b/.vimrc
@@ -5,9 +5,11 @@ call vundle#begin()
 " Plugins
 Plugin 'VundleVim/Vundle.vim'
 " Plugin 'bling/vim-airline'
+Plugin 'chriskempson/base16-vim'
 Plugin 'ctrlpvim/ctrlp.vim'
 Plugin 'ervandew/supertab'
 Plugin 'itchyny/lightline.vim'
+Plugin 'NLKNguyen/papercolor-theme'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'Valloric/YouCompleteMe'
 
@@ -330,11 +332,10 @@ endif
 " \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
 " \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
-" let g:jellybeans_background_color_256 = "234"
-let g:jellybeans_background_color_256 = "0"
-let g:jellybeans_use_lowcolor_black = 1
-let g:jellybeans_overrides = {
-\ 'Comment': { 'ctermfg': 'Yellow', 'ctermbg': '', 'attr': 'italic' },
-\}
-colorscheme dln-jellybeans
+
+
+set background=light
+let g:PaperColor_Light_Override = { 'Background' : '#fefe00' }
+
+" color PaperColor
 
diff --git a/.xinitrc b/.xinitrc
index fcf0e57..18b5465 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -8,7 +8,7 @@ fi
 
 . $HOME/.bashrc
 
-xsetroot -solid \#010101
+xsetroot -solid \#579
 
 xmodmap $DOTFILES/.Xmodmap
 setxkbmap -option ctrl:nocaps,grp:switch,grp_led:scroll us,se