diff --git a/tmux.conf b/tmux.conf
index 880074d..aaaf5a8 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -63,24 +63,24 @@ setw -g window-status-attr "none"
 setw -g window-status-activity-attr "none"
 setw -g window-status-format " #I:#W "
 # SOLARIZED LIGHT
-#set -g status-bg "colour7"
-#set -g message-command-fg "colour8"
-#set -g message-command-bg "colour11"
-#setw -g window-status-fg "colour14"
-#setw -g window-status-activity-bg "colour7"
-#setw -g window-status-activity-fg "colour10"
-#setw -g window-status-bg "colour7"
-#setw -g window-status-current-format "#[fg=colour8,bg=colour7][#I:#W]#[default]"
-#set -g status-left "#[fg=colour15,bg=colour11,bold] #h #[fg=colour11,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] #S #[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]#[default]"
-#set -g status-right "#[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour14] %a %e #[fg=colour11,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] %k:%M "
-# SOLARIZED DARK
-set -g status-bg "colour0"
-set -g message-command-fg "colour7"
+set -g status-bg "colour7"
+set -g message-command-fg "colour8"
 set -g message-command-bg "colour11"
-setw -g window-status-fg "colour11"
-setw -g window-status-activity-bg "colour0"
-setw -g window-status-activity-fg "colour14"
-setw -g window-status-bg "colour0"
-setw -g window-status-current-format "#[bg=colour8]#[fg=colour0][#[fg=colour15]#I:#W#[fg=colour0]]#[default]"
-set -g status-left "#[fg=colour8,bg=colour4,bold] #h #[fg=colour4,bg=colour8,nobold,nounderscore,noitalics]#[fg=colour10,bg=colour8] #S #[fg=colour8,bg=colour0,nobold,nounderscore,noitalics]#[default]"
-set -g status-right "#[fg=colour8,bg=colour0,nobold,nounderscore,noitalics]#[fg=colour10,bg=colour8] %a %e #[fg=colour4,bg=colour8,nobold,nounderscore,noitalics]#[fg=colour8,bg=colour4] %k:%M "
+setw -g window-status-fg "colour14"
+setw -g window-status-activity-bg "colour7"
+setw -g window-status-activity-fg "colour10"
+setw -g window-status-bg "colour7"
+setw -g window-status-current-format "#[fg=colour8,bg=colour7][#I:#W]#[default]"
+set -g status-left "#[fg=colour15,bg=colour11,bold] #h #[fg=colour11,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] #S #[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]#[default]"
+set -g status-right "#[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour14] %a %e #[fg=colour11,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] %k:%M "
+# SOLARIZED DARK
+#set -g status-bg "colour0"
+#set -g message-command-fg "colour7"
+#set -g message-command-bg "colour11"
+#setw -g window-status-fg "colour11"
+#setw -g window-status-activity-bg "colour0"
+#setw -g window-status-activity-fg "colour14"
+#setw -g window-status-bg "colour0"
+#setw -g window-status-current-format "#[bg=colour8]#[fg=colour0][#[fg=colour15]#I:#W#[fg=colour0]]#[default]"
+#set -g status-left "#[fg=colour8,bg=colour4,bold] #h #[fg=colour4,bg=colour8,nobold,nounderscore,noitalics]#[fg=colour10,bg=colour8] #S #[fg=colour8,bg=colour0,nobold,nounderscore,noitalics]#[default]"
+#set -g status-right "#[fg=colour8,bg=colour0,nobold,nounderscore,noitalics]#[fg=colour10,bg=colour8] %a %e #[fg=colour4,bg=colour8,nobold,nounderscore,noitalics]#[fg=colour8,bg=colour4] %k:%M "
diff --git a/vimrc b/vimrc
index 84ab08e..685933c 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,5 @@
 set nocompatible
-set background=dark
+set background=light
 set backspace=indent,eol,start
 set cursorline
 set foldmethod=marker
@@ -9,7 +9,6 @@ set ignorecase
 set incsearch
 set laststatus=2
 set nobackup
-set noexpandtab
 set ruler
 set showcmd
 set smartcase
@@ -118,7 +117,6 @@ if v:version >= 700
 
 		" lightline options
 		let g:lightline = {
-			\ 'colorscheme': 'solarized',
 			\ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" },
 			\ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" },
 			\ }
diff --git a/xresources b/xresources
index 9166da0..14e284b 100644
--- a/xresources
+++ b/xresources
@@ -32,31 +32,31 @@ URxvt.keysym.C-C:       perl:clipboard:copy
 URxvt.keysym.C-V:       perl:clipboard:paste
 ! }}}
 ! {{{ urxvt colors
-! base16 PhD by Hennig Hasemann (http://leetless.de/vim.html)
-#define base00 #061229
-#define base01 #2a3448
-#define base02 #4d5666
-#define base03 #717885
-#define base04 #9a99a3
-#define base05 #b8bbc2
-#define base06 #dbdde0
-#define base07 #ffffff
-#define base08 #d07346
-#define base09 #f0a000
-#define base0A #fbd461
-#define base0B #99bf52
-#define base0C #72b9bf
-#define base0D #5299bf
-#define base0E #9989cc
-#define base0F #b08060
+! base16 Solarized by Ethan Schoonover (http://ethanschoonover.com/solarized)
+#define base00 #002b36
+#define base01 #073642
+#define base02 #586e75
+#define base03 #657b83
+#define base04 #839496
+#define base05 #93a1a1
+#define base06 #eee8d5
+#define base07 #fdf6e3
+#define base08 #dc322f
+#define base09 #cb4b16
+#define base0A #b58900
+#define base0B #859900
+#define base0C #2aa198
+#define base0D #268bd2
+#define base0E #6c71c4
+#define base0F #d33682
 
-URxvt.foreground:   base04
-URxvt.background:   base00
-URxvt.colorBD:      base07
+!URxvt.foreground:   base04
+!URxvt.background:   base00
+!URxvt.colorBD:      base07
 
-!URxvt.foreground:   base03
-!URxvt.background:   base07
-!URxvt.colorBD:      base00
+URxvt.foreground:   base03
+URxvt.background:   base07
+URxvt.colorBD:      base00
 
 URxvt.cursorColor:  base08