diff --git a/bash/.bashrc b/bash/.bashrc
index cfd6be4..6dbc515 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -14,6 +14,7 @@ alias l='ls -lh'
 alias ll='ls -lh'
 #set -o vi
 alias p='ping'
+alias s='sudo'
 
 #golang stuff
 export GOPATH=$HOME/gopath
@@ -22,3 +23,5 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+xrdb -merge /home/jon/.colors/codeschool.dark
+
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 9cf6ff1..ec1c43d 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -36,3 +36,36 @@ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
 bind-key Tab last-window
 bind-key BTab previous-window
 
+set -g default-terminal "screen-256color"
+
+# Basic status bar colors
+set-option -g status-bg default
+set-option -g status-fg white
+
+# Left side of status bar
+set-option -g status-left-length 40
+set-option -g status-left "#[fg=colour18,bg=colour12] #S #[fg=default,bg=default] "
+
+# Window status
+set-option -g window-status-format "#[fg=colour18,bg=brightblack] #I #[fg=white,bg=black] #W "
+set-option -g window-status-current-format "#[fg=colour18,bg=colour7] #I #[fg=colour18,bg=colour4] #W "
+set-option -g window-status-separator " "
+set-option -g status-justify left
+
+# Right side of status bar
+set-option -g status-right-length 40
+set-option -g status-right " #[fg=brightwhite,bg=black] %a, %d %b %H:%M #[fg=colour18,bg=colour4] #(whoami)@#h "
+
+# Pane border
+set-option -g pane-border-bg default
+set-option -g pane-border-fg brightblack
+set-option -g pane-active-border-bg default
+set-option -g pane-active-border-fg white
+
+# Pane number indicator
+set-option -g display-panes-colour brightblack
+set-option -g display-panes-active-colour brightwhite
+
+# Clock mode
+set-option -g clock-mode-colour white
+set-option -g clock-mode-style 24
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
index 6437ad6..9a38216 160000
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87
+Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
diff --git a/vim/.vim/bundle/calendar.vim b/vim/.vim/bundle/calendar.vim
index 6d6be26..1aee272 160000
--- a/vim/.vim/bundle/calendar.vim
+++ b/vim/.vim/bundle/calendar.vim
@@ -1 +1 @@
-Subproject commit 6d6be26b2ad1870658525e2a42046429c845516c
+Subproject commit 1aee272cc37670b4f96c5d75975ae8af3bd8809e
diff --git a/vim/.vim/bundle/jedi-vim b/vim/.vim/bundle/jedi-vim
index 0c6a2b7..f07ff6a 160000
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
@@ -1 +1 @@
-Subproject commit 0c6a2b77379f994c316983ca7f59784c1c957f78
+Subproject commit f07ff6a5357c94418cec95e6f40b6ad2c580db65
diff --git a/vim/.vim/bundle/lightline-buffer b/vim/.vim/bundle/lightline-buffer
index 1c090e0..128ddaa 160000
--- a/vim/.vim/bundle/lightline-buffer
+++ b/vim/.vim/bundle/lightline-buffer
@@ -1 +1 @@
-Subproject commit 1c090e0782dbe4e5a6a8353dffcd97971c84b1ca
+Subproject commit 128ddaad4a4d57c10f224428c7f64a10e5f21ca5
diff --git a/vim/.vim/bundle/lightline.vim b/vim/.vim/bundle/lightline.vim
index b19faca..41fb97e 160000
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
@@ -1 +1 @@
-Subproject commit b19faca129f7921766c0a32a7c378dc89a61e590
+Subproject commit 41fb97e85b0386b976b39051de4f7eaa42ba6b2b
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
index 8cd17c1..6188c5e 160000
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 8cd17c1a478d8302e4782a95963abe46fc22c538
+Subproject commit 6188c5ea5f6fd44e24768ccb889aaa739808d9f3
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
index 5e1b26c..d17b98c 160000
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 5e1b26c1724448c9d870b08dc93ce71528489333
+Subproject commit d17b98cff364730af34fd853fbbe4fbbae226a3d
diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive
index 913fff1..b14434b 160000
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5
+Subproject commit b14434bae0357dd47b33f940c3a02510c44fbbe2
diff --git a/x/.Xresources b/x/.Xresources
index 2043cc1..13e9429 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,33 +1,52 @@
-*background: #151B1A
-*foreground: #8FA388
-
-*cursorColor: #9E6438
-
-*color0: #2E2B38
-*color1: #984E66
-*color2: #7A8C54
-*color3: #9E6438
-*color4: #395667
-*color5: #9D916B
-*color6: #536556
-*color7: #828181
-*color8: #474159
-*color9: #A86D56
-*color10: #9FB274
-*color11: #B29F5E
-*color12: #507A91
-*color13: #B89855
-*color14: #7E9982
-*color15: #BDBDA4
 URxvt*scrollBar:	false
-URxvt.font:     xft:xos4 Terminus:size=14:antialias=true
-URxvt.boldFont: xft:xos4 Terminus:bold:size=14:antialias=true
+URxvt.font:     xft:Terminus:size=14:antialias=true
+!URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
 URxvt*transparent: true
 URxvt*shading: 10
 
 URxvt*perl-ext-common:  default,matcher
 URxvt*matcher.button:   1
 ! URxvt*url-launcher:      /usr/bin/google-chrome
-URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
+! URxvt*url-launcher:     /home/jon/apps/firefox/firefox 
+URxvt*url-launcher:     /usr/bin/firefox
 
 ! URxvt.blurRadius: 25
+URxvt*.termName: rxvt-unicode-256color
+
+! special
+*.foreground:   #c5c8c6
+*.background:   #1d1f21
+*.cursorColor:  #c5c8c6
+
+! black
+*.color0:       #282a2e
+*.color8:       #373b41
+
+! red
+*.color1:       #a54242
+*.color9:       #cc6666
+
+! green
+*.color2:       #8c9440
+*.color10:      #b5bd68
+
+! yellow
+*.color3:       #de935f
+*.color11:      #f0c674
+
+! blue
+*.color4:       #5f819d
+*.color12:      #81a2be
+
+! magenta
+*.color5:       #85678f
+*.color13:      #b294bb
+
+! cyan
+*.color6:       #5e8d87
+*.color14:      #8abeb7
+
+! white
+*.color7:       #707880
+*.color15:      #c5c8c6
+