diff --git a/.gitmodules b/.gitmodules
index f3059cc..22ee6e6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,3 +37,6 @@
 [submodule "vim/bundle/vim-airline"]
 	path = vim/bundle/vim-airline
 	url = git@github.com:bling/vim-airline.git
+[submodule "vim/bundle/gruvbox"]
+	path = vim/bundle/gruvbox
+	url = git@github.com:morhetz/gruvbox.git
diff --git a/tmux.conf b/tmux.conf
index 8ce9dc2..5eef08b 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -19,29 +19,56 @@ bind -n C-M-l swap-window -t +1
 bind -n C-M-h swap-window -t -1
 bind X kill-window
 
-set -g status-bg "colour0"
-set -g message-command-fg "colour0"
+set -g status-bg "colour237"
+set -g message-command-fg "colour246"
 set -g status-justify "left"
 set -g status-left-length "100"
 set -g status "on"
-set -g pane-active-border-fg "colour4"
-set -g message-bg "colour12"
+set -g pane-active-border-fg "colour246"
+set -g message-bg "colour239"
 set -g status-right-length "100"
 set -g status-right-attr "none"
-set -g message-fg "colour0"
-set -g message-command-bg "colour12"
+set -g message-fg "colour246"
+set -g message-command-bg "colour239"
 set -g status-attr "none"
 set -g status-utf8 "on"
-set -g pane-border-fg "colour12"
+set -g pane-border-fg "colour239"
 set -g status-left-attr "none"
-setw -g window-status-fg "colour12"
+setw -g window-status-fg "colour246"
 setw -g window-status-attr "none"
-setw -g window-status-activity-bg "colour0"
+setw -g window-status-activity-bg "colour237"
 setw -g window-status-activity-attr "none"
-setw -g window-status-activity-fg "colour4"
+setw -g window-status-activity-fg "colour246"
 setw -g window-status-separator ""
-setw -g window-status-bg "colour0"
-set -g status-left "#[fg=colour8,bg=colour4,bold] #S #[fg=colour4,bg=colour0,nobold,nounderscore,noitalics]"
-set -g status-right "#[fg=colour12,bg=colour0,nobold,nounderscore,noitalics]#[fg=colour0,bg=colour12] %Y-%m-%d  %H:%M #[fg=colour4,bg=colour12,nobold,nounderscore,noitalics]#[fg=colour8,bg=colour4] #h "
-setw -g window-status-format "#[fg=colour12,bg=colour0] #I #[fg=colour12,bg=colour0] #W "
-setw -g window-status-current-format "#[fg=colour0,bg=colour12,nobold,nounderscore,noitalics]#[fg=colour0,bg=colour12] #I #[fg=colour0,bg=colour12] #W #[fg=colour12,bg=colour0,nobold,nounderscore,noitalics]"
+setw -g window-status-bg "colour237"
+set -g status-left "#[fg=colour235,bg=colour246] #S #[fg=colour246,bg=colour237,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=colour239,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour246,bg=colour239] %Y-%m-%d  %H:%M #[fg=colour246,bg=colour239,nobold,nounderscore,noitalics]#[fg=colour235,bg=colour246] #h "
+setw -g window-status-format "#[fg=colour246,bg=colour237] #I #[fg=colour246,bg=colour237] #W "
+setw -g window-status-current-format "#[fg=colour237,bg=colour239,nobold,nounderscore,noitalics]#[fg=colour246,bg=colour239] #I #[fg=colour246,bg=colour239] #W #[fg=colour239,bg=colour237,nobold,nounderscore,noitalics]"
+
+/* set -g status-bg "colour0" */
+/* set -g message-command-fg "colour0" */
+/* set -g status-justify "left" */
+/* set -g status-left-length "100" */
+/* set -g status "on" */
+/* set -g pane-active-border-fg "colour4" */
+/* set -g message-bg "colour12" */
+/* set -g status-right-length "100" */
+/* set -g status-right-attr "none" */
+/* set -g message-fg "colour0" */
+/* set -g message-command-bg "colour12" */
+/* set -g status-attr "none" */
+/* set -g status-utf8 "on" */
+/* set -g pane-border-fg "colour12" */
+/* set -g status-left-attr "none" */
+/* setw -g window-status-fg "colour12" */
+/* setw -g window-status-attr "none" */
+/* setw -g window-status-activity-bg "colour0" */
+/* setw -g window-status-activity-attr "none" */
+/* setw -g window-status-activity-fg "colour4" */
+/* setw -g window-status-separator "" */
+/* setw -g window-status-bg "colour0" */
+/* set -g status-left "#[fg=colour8,bg=colour4,bold] #S #[fg=colour4,bg=colour0,nobold,nounderscore,noitalics]" */
+/* set -g status-right "#[fg=colour12,bg=colour0,nobold,nounderscore,noitalics]#[fg=colour0,bg=colour12] %Y-%m-%d  %H:%M #[fg=colour4,bg=colour12,nobold,nounderscore,noitalics]#[fg=colour8,bg=colour4] #h " */
+/* setw -g window-status-format "#[fg=colour12,bg=colour0] #I #[fg=colour12,bg=colour0] #W " */
+/* setw -g window-status-current-format "#[fg=colour0,bg=colour12,nobold,nounderscore,noitalics]#[fg=colour0,bg=colour12] #I #[fg=colour0,bg=colour12] #W #[fg=colour12,bg=colour0,nobold,nounderscore,noitalics]" */
diff --git a/vim/bundle/gruvbox b/vim/bundle/gruvbox
new file mode 160000
index 0000000..1e2ab20
--- /dev/null
+++ b/vim/bundle/gruvbox
@@ -0,0 +1 @@
+Subproject commit 1e2ab2027cf07ff070a5ad7dea2d5d601837ee94
diff --git a/vimrc b/vimrc
index f871a7a..e955f88 100644
--- a/vimrc
+++ b/vimrc
@@ -1,7 +1,7 @@
 execute pathogen#infect()
 syntax on
 filetype plugin indent on
-colorscheme solarized
+colorscheme gruvbox
 
 set t_Co=256
 set background=dark
@@ -17,7 +17,7 @@ set expandtab
 
 let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
-let g:airline_theme='solarized'
+let g:airline_theme='gruvbox'
 let g:EclimCompletionMethod = 'omnifunc'
 let b:EclimPhpHtmlValidate = 1