diff --git a/Xresources b/Xresources
index 6600db5..af19246 100644
--- a/Xresources
+++ b/Xresources
@@ -178,6 +178,6 @@ XCalc.ShapeStyle:                      rectangle
 *vt100.renderFont:     true
 !*vt100.borderWidth:   0
 !*vt100.internalBorder: 0
-*vt100.borderColor:    Black
-*vt100.Background:     #ffffff
-*vt100.Foreground:     #000000
+!*vt100.borderColor:    Black
+!*vt100.Background:     #ffffff
+!*vt100.Foreground:     #000000
diff --git a/vimrc b/vimrc
index 78fafb6..abb8fc2 100644
--- a/vimrc
+++ b/vimrc
@@ -2,7 +2,11 @@ syntax enable
 let g:solarized_hitrail=1
 " let g:solarized_termcolors=256
 colorscheme solarized
-set background=dark
+if has('gui_running')
+    set background=light
+else
+    set background=dark
+endif
 let load_doxygen_syntax = 1
 set autoindent
 set encoding=utf-8