diff --git a/Xresources b/Xresources
index 8cf0668..fd31373 100644
--- a/Xresources
+++ b/Xresources
@@ -1,5 +1,3 @@
-! $Id$
-
 ! load color-specific resources for clients that have them
 !#ifdef COLOR
 !*customization: -color
@@ -45,10 +43,10 @@
 
 URxvt.depth:           32
 URxvt.scrollBar:       false
-URxvt.font:            xft:Droid Sans Mono-8:regular
-URxvt.boldFont:        xft:Droid Sans Mono-8:bold
-URxvt.italicfont:      xft:Droid Sans Mono-8:italic
-URxvt.bolditalicFont:  xft:Droid Sans Mono-8:bold:italic
+URxvt.font:            xft:Hack-8:regular
+URxvt.boldFont:        xft:Hack-8:bold
+URxvt.italicfont:      xft:Hack-8:italic
+URxvt.bolditalicFont:  xft:Hack-8:bold:italic
 URxvt.letterSpace:     -2
 URxvt.perl-ext-common: default,matcher,bell-command
 ! this setting assumes that the current browser is set correctly via update-alternatives
@@ -96,13 +94,13 @@ Xft.render:    true
 ! xscreensaver ---------------------------------------------------------------
 
 xscreensaver.splash: false
-!xscreensaver.Dialog.headingFont: xft:Droid Sans Mono:style=Bold:size=16
-!xscreensaver.Dialog.bodyFont:    xft:Droid Sans Mono:style=Regular:size=12
-!xscreensaver.Dialog.labelFont:   xft:Droid Sans Mono:style=Regular:size=12
-!xscreensaver.Dialog.unameFont:   xft:Droid Sans Mono:style=Regular:size=12
-!xscreensaver.Dialog.buttonFont:  xft:Droid Sans Mono:style=Bold:size=12
-!xscreensaver.Dialog.dateFont:    xft:Droid Sans Mono:style=Regular:size=12
-!xscreensaver.passwd.passwdFont:  xft:Droid Sans Mono:style=Bold:size=12
+xscreensaver.Dialog.headingFont: xft:Hack:style=Bold:size=16
+xscreensaver.Dialog.bodyFont:    xft:Hack:style=Regular:size=12
+xscreensaver.Dialog.labelFont:   xft:Hack:style=Regular:size=12
+xscreensaver.Dialog.unameFont:   xft:Hack:style=Regular:size=12
+xscreensaver.Dialog.buttonFont:  xft:Hack:style=Bold:size=12
+xscreensaver.Dialog.dateFont:    xft:Hack:style=Regular:size=12
+xscreensaver.passwd.passwdFont:  xft:Hack:style=Bold:size=12
 !use old style xfont notation, since xscreensaver is really that dumb
 !xscreensaver.Dialog.headingFont: -*-dejavu sans-bold-r-*--12-*-*-*-*-*-*-*
 !xscreensaver.Dialog.bodyFont:    -*-dejavu sans-medium-r-*-*-12-*-*-*-*-*-*-*
@@ -117,8 +115,8 @@ xscreensaver.splash: false
 
 XClock.Clock.update:     1
 XClock.Clock.analog:     false
-XClock.Clock.Foreground: S_base0
-XClock.Clock.background: S_base03
+XClock.Clock.background: S_base3
+XClock.Clock.foreground: S_base00
 
 ! xcalc ----------------------------------------------------------------------
 
@@ -170,14 +168,33 @@ XCalc.ShapeStyle:                      rectangle
 
 ! xterm ----------------------------------------------------------------------
 
-*vt100.faceName:       Droid Sans Mono
-*vt100.faceSize:       8
+*vt100.faceName:       Hack
+*vt100.faceSize:       9
 *vt100.bellIsUrgent:   true
-*vt100.reverseVideo:   true
+!*vt100.reverseVideo:   true
 *vt100.menuLocale:
 *vt100.renderFont:     true
-!*vt100.borderWidth:   0
-!*vt100.internalBorder: 0
-!*vt100.borderColor:    Black
-!*vt100.Background:     #ffffff
-!*vt100.Foreground:     #000000
+*vt100.borderWidth:   0
+*vt100.internalBorder: 0
+XTerm*backgrund: white
+XTerm*foreground: black
+UXTerm*background: S_base03
+UXTerm*foreground: S_base0
+UXTerm*fading:     40
+UXTerm*fadeColor:  S_base03
+UXTerm*color0:     S_base03
+UXTerm*color1:     S_red
+UXTerm*color2:     S_green
+UXTerm*color3:     S_yellow
+UXTerm*color4:     S_blue
+UXTerm*color5:     S_magenta
+UXTerm*color6:     S_cyan
+UXTerm*color7:     S_base1
+UXTerm*color8:     S_base03
+UXTerm*color9:     S_orange
+UXTerm*color10:    S_green
+UXTerm*color11:    S_yellow
+UXTerm*color12:    S_blue
+UXTerm*color13:    S_violet
+UXTerm*color14:    S_cyan
+UXTerm*color15:    S_base3
diff --git a/dunstrc b/dunstrc
index 3c78b95..6a17ac9 100644
--- a/dunstrc
+++ b/dunstrc
@@ -1,5 +1,5 @@
 [global]
-    font = Droid Sans Mono 8
+    font = Hack 9
 
     # Allow a small subset of html markup:
     #   <b>bold</b>
diff --git a/gvimrc b/gvimrc
index b392bd7..1d95c07 100644
--- a/gvimrc
+++ b/gvimrc
@@ -1,2 +1,3 @@
-set guifont=Source\ Code\ Pro\ 8
+set guifont=Hack\ 9
 colorscheme solarized
+set guioptions-=T  " no toolbar