diff --git a/Xresources b/Xresources
index 1d45f84..35a8446 100644
--- a/Xresources
+++ b/Xresources
@@ -1,57 +1,108 @@
-! terminal colors -------------------------------------------------------------
-*background:    #282828
-*foreground:    #ebdbb2
-*color0:        #282828
-*color8:        #928374
-*color1:        #cc241d
-*color9:        #fb4934
-*color2:        #98971a
-*color10:       #b8bb26
-*color3:        #d79921
-*color11:       #fabd2f
-*color4:        #458588
-*color12:       #83a598
-*color5:        #b16286
-*color13:       #d3869b
-*color6:        #689d6a
-*color14:       #8ec07c
-*color7:        #a89984
-*color15:       #ebdbb2
+! font settings --------------------------------------------------------------
+Xft.autohint: true
+Xft.antialias: true
+Xft.hinting: true
+Xft.hintstyle: hintslight
+!Xft.dpi: 96
+Xft.rgba: rgb
+Xft.lcdfilter: lcddefault
 
-! Xcursor ---------------------------------------------------------------------
-Xcursor.theme:  Vanilla-DMZ-AA
-Xcursor.size:   18
+! xscreensaver ---------------------------------------------------------------
 
-! Xft setttings ---------------------------------------------------------------
-Xft.dpi:        96
-Xft.antialias:  true
-Xft.rgba:       rgb
-Xft.hinting:    true
-Xft.hintstyle:  hintslight
+!font settings
+xscreensaver.Dialog.headingFont:        -*-fixed-medium-r-*-*-14-*-*-*-*-*-*-*
+xscreensaver.Dialog.bodyFont:           -*-fixed-medium-r-*-*-14-*-*-*-*-*-*-*
+xscreensaver.Dialog.labelFont:          -*-fixed-medium-r-*-*-14-*-*-*-*-*-*-*
+xscreensaver.Dialog.unameFont:          -*-fixed-medium-r-*-*-14-*-*-*-*-*-*-*
+xscreensaver.Dialog.buttonFont:         -*-fixed-medium-r-*-*-14-*-*-*-*-*-*-*
+xscreensaver.Dialog.dateFont:           -*-fixed-medium-r-*-*-12-*-*-*-*-*-*-*
+xscreensaver.passwd.passwdFont:         -*-fixed-medium-r-*-*-14-*-*-*-*-*-*-*
+!general dialog box (affects main hostname, username, password text)
+xscreensaver.Dialog.foreground:         #101010
+xscreensaver.Dialog.background:         #D8D8D8
+xscreensaver.Dialog.topShadowColor:     #D8D8D8
+xscreensaver.Dialog.bottomShadowColor:  #D8D8D8
+xscreensaver.Dialog.Button.foreground:  #101010
+xscreensaver.Dialog.Button.background:  #E5E5E5
+!username/password input box and date text colour
+xscreensaver.Dialog.text.foreground:    #101010
+xscreensaver.Dialog.text.background:    #E5E5E5
+xscreensaver.Dialog.internalBorderWidth:24
+xscreensaver.Dialog.borderWidth:        0
+xscreensaver.Dialog.shadowThickness:    2
+!timeout bar (background is actually determined by Dialog.text.background)
+xscreensaver.passwd.thermometer.foreground:  #101010
+xscreensaver.passwd.thermometer.background:  #2E2E2E
+xscreensaver.passwd.thermometer.width:       8
 
-! xterm ----------------------------------------------------------------------
-xterm*termName:             xterm-256color
-xterm*locale:               true
-xterm*metaSendsEscape:      true
-xterm*faceName:             Hermit:style=Medium:size=11
-xterm*dymanicColors:        true
-xtem*utf8:                  2
-xterm*eightBitInput:        true
-xterm*saveLines:            4096
-xterm*scrollKey:            true
-xterm*scrollTtyOutput:      false
-xterm*scrollBar:            true
-xterm*rightScrollBar:       true
-xterm*jumpScroll:           true
-xterm*multiScroll:          true
-xterm*fastScroll:           true
-xterm*toolBar:              false
-xterm*VT100.translations: #override <Btn1Up>: select-end(PRIMARY, CLIPBOARD, CUT_BUFFER0)
+! urxvt -------------------------------------------
 
-! xpdf ------------------------------------------------------------------------
-xpdf*enableFreetype:        yes
-xpdf*antialias:             yes
-xpdf*foreground:            black:
-xpdf*background:            white
-xpdf*urlCommand:            /usr/bin/iceweasel %s
+URxvt.font: xft:Hermit:size=12
+URxvt.boldFont: xft:Hermit:size=12
+URxvt.letterSpace: 0
+! Add fallback fonts as laid out in `man 1 urxvt` under "font:" in the RESOURCES section
 
+! Window size and position
+!URxvt*geometry: 60x22+50+100
+! Window size, let the Window Manager position it
+URxvt.geometry: 80x28
+
+URxvt.scrollstyle: plain
+URxvt.scrollBar: true
+URxvt.scrollBar_right: true
+URxvt.iconFile: /usr/share/icons/Faenza-Bunsen-common/apps/48/utilities-terminal.png
+
+! Grey theming
+!URxvt*background: #cecece
+!URxvt*foreground: #101010
+! Terminator Crunchbang colours
+URxvt.background: [85]#2e3436
+URxvt.foreground: #d8d8d8
+
+! scrollback buffer lines - 65535 is max (64 is default)
+URxvt.saveLines:16384
+
+! True Transparency, opacity percentage set in square brackets before URxvt.background colour
+URxvt.depth: 32
+
+! Clickble URLs
+URxvt.perl-ext-common: default,matcher
+URxvt.url-launcher: /usr/bin/google-chrome-unstable
+URxvt.matcher.button: 3
+
+! special
+*.foreground:   #5c6370
+*.background:   #1e2127
+*.cursorColor:  #5c6370
+
+! black
+*.color0:       #1e2127
+*.color8:       #5c6370
+
+! red
+*.color1:       #e06c75
+*.color9:       #e06c75
+
+! green
+*.color2:       #98c379
+*.color10:      #98c379
+
+! yellow
+*.color3:       #d19a66
+*.color11:      #d19a66
+
+! blue
+*.color4:       #61afef
+*.color12:      #61afef
+
+! magenta
+*.color5:       #c678dd
+*.color13:      #c678dd
+
+! cyan
+*.color6:       #56b6c2
+*.color14:      #56b6c2
+
+! white
+*.color7:       #abb2bf
+*.color15:      #ffffff