diff --git a/.Xdefaults b/.Xdefaults
old mode 100755
new mode 100644
index fe98a11..a8faee6
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -1,43 +1,97 @@
-Urxvt*font: xft:Terminus:pixelsize=14
-
-!! Solarized color scheme
-
-*background:            #002b36
-*foreground:            #657b83
-*fading:                40
-*fadeColor:             #002b36
-*cursorColor:           #93a1a1
-*pointerColorBackground:#586e75
-*pointerColorForeground:#93a1a1
-
+!-------------------------------------------------------------------------------
+! Xft settings
+!-------------------------------------------------------------------------------
+ 
+Xft.dpi:                    96
+Xft.antialias:              false
+Xft.rgba:                   rgb
+Xft.hinting:                true
+Xft.hintstyle:              hintslight
+ 
+!-------------------------------------------------------------------------------
+! URxvt settings
+! Colours lifted from Solarized (http://ethanschoonover.com/solarized)
+! More info at:
+! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod
+!-------------------------------------------------------------------------------
+ 
+URxvt.depth:                32
+URxvt.geometry:             90x30
+URxvt.transparent:          false
+URxvt.fading:               0
+! URxvt.urgentOnBell:         true
+! URxvt.visualBell:           true
+URxvt.loginShell:           true
+URxvt.saveLines:            50
+URxvt.internalBorder:       3
+URxvt.lineSpace:            0
+ 
+! Fonts
+URxvt.allow_bold:           false
+/* URxvt.font:                 -*-terminus-medium-r-normal-*-12-120-72-72-c-60-iso8859-1 */
+!URxvt*font: xft:Monospace:pixelsize=14
+!URxvt*boldFont: xft:Monospace:pixelsize=14
+URxvt*font: xft:Inconsolata:pixelsize=16
+URxvt*boldFont: xft:Inconsolata:pixelsize=16
+ 
+! Fix font space
+URxvt*letterSpace: -1
+ 
+! Scrollbar
+URxvt.scrollStyle:          rxvt
+URxvt.scrollBar:            false
+ 
+! Perl extensions
+URxvt.perl-ext-common:      default,matcher
+URxvt.matcher.button:       1
+URxvt.urlLauncher:          firefox
+ 
+! Cursor
+URxvt.cursorBlink:          true
+URxvt.cursorColor:          #657b83
+URxvt.cursorUnderline:      false
+ 
+! Pointer
+URxvt.pointerBlank:         true
+ 
+!!Source http://github.com/altercation/solarized
+ 
+*background: #002b36
+*foreground: #657b83
+!!*fading: 40
+*fadeColor: #002b36
+*cursorColor: #93a1a1
+*pointerColorBackground: #586e75
+*pointerColorForeground: #93a1a1
+ 
 !! black dark/light
-*color0:                #073642
-*color8:                #002b36
-
+*color0: #073642
+*color8: #002b36
+ 
 !! red dark/light
-*color1:                #dc322f
-*color9:                #cb4b16
-
+*color1: #dc322f
+*color9: #cb4b16
+ 
 !! green dark/light
-*color2:                #859900
-*color10:               #586e75
-
+*color2: #859900
+*color10: #586e75
+ 
 !! yellow dark/light
-*color3:                #b58900
-*color11:               #657b83
-
+*color3: #b58900
+*color11: #657b83
+ 
 !! blue dark/light
-*color4:                #268bd2
-*color12:               #839496
-
+*color4: #268bd2
+*color12: #839496
+ 
 !! magenta dark/light
-*color5:                #d33682
-*color13:               #6c71c4
-
+*color5: #d33682
+*color13: #6c71c4
+ 
 !! cyan dark/light
-*color6:                #2aa198
-*color14:               #93a1a1
-
+*color6: #2aa198
+*color14: #93a1a1
+ 
 !! white dark/light
-*color7:                #eee8d5
-*color15:               #fdf6e3
+*color7: #eee8d5
+*color15: #fdf6e3
diff --git a/.vimrc b/.vimrc
index c796f57..3a56695 100644
--- a/.vimrc
+++ b/.vimrc
@@ -3,6 +3,7 @@ filetype on
 set background=dark
 set showcmd
 set hlsearch
+let g:solarized_termcolors=256
 colorscheme solarized ".vim/colors/solarized.vim 
 
 " Jump to last position in file when reopening
@@ -10,5 +11,12 @@ if has("autocmd")
  au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
 endif
 
+" Switch between light/dark backgrounds
+" F12 toggles between light and dark backgrounds
+map <silent> <F12> :if &background == "light"<CR>
+      \set background=dark<CR>
+      \else<CR>
+      \set background=light<CR>
+      \endif<CR>
 set t_Co=256