diff --git a/xresources b/xresources
index 657ff52..619e72e 100644
--- a/xresources
+++ b/xresources
@@ -35,97 +35,46 @@ URxvt.matcher.button:   3
 URxvt.keysym.C-C:       perl:clipboard:copy
 URxvt.keysym.C-V:       perl:clipboard:paste
 ! }}}
-! {{{ drop in Solarized colorscheme for Xresources/Xdefaults
+! {{{ base16 Twilight
+#define base00 #1e1e1e
+#define base01 #323537
+#define base02 #464b50
+#define base03 #5f5a60
+#define base04 #838184
+#define base05 #a7a7a7
+#define base06 #c3c3c3
+#define base07 #ffffff
+#define base08 #cf6a4c
+#define base09 #cda869
+#define base0A #f9ee98
+#define base0B #8f9d6a
+#define base0C #afc4db
+#define base0D #7587a6
+#define base0E #9b859d
+#define base0F #9b703f
 
-!!SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
-!!--------- ------- ---- -------  ----------- ---------- ----------- -----------
-!!base03    #002b36  8/4 brblack  234 #1c1c1c 15 -12 -12   0  43  54 193 100  21
-!!base02    #073642  0/4 black    235 #262626 20 -12 -12   7  54  66 192  90  26
-!!base01    #586e75 10/7 brgreen  240 #585858 45 -07 -07  88 110 117 194  25  46
-!!base00    #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195  23  51
-!!base0     #839496 12/6 brblue   244 #808080 60 -06 -03 131 148 150 186  13  59
-!!base1     #93a1a1 14/4 brcyan   245 #8a8a8a 65 -05 -02 147 161 161 180   9  63
-!!base2     #eee8d5  7/7 white    254 #e4e4e4 92 -00  10 238 232 213  44  11  93
-!!base3     #fdf6e3 15/7 brwhite  230 #ffffd7 97  00  10 253 246 227  44  10  99
-!!yellow    #b58900  3/3 yellow   136 #af8700 60  10  65 181 137   0  45 100  71
-!!orange    #cb4b16  9/3 brred    166 #d75f00 50  50  55 203  75  22  18  89  80
-!!red       #dc322f  1/1 red      160 #d70000 50  65  45 220  50  47   1  79  86
-!!magenta   #d33682  5/5 magenta  125 #af005f 50  65 -05 211  54 130 331  74  83
-!!violet    #6c71c4 13/5 brmagenta 61 #5f5faf 50  15 -45 108 113 196 237  45  77
-!!blue      #268bd2  4/4 blue      33 #0087ff 55 -10 -45  38 139 210 205  82  82
-!!cyan      #2aa198  6/6 cyan      37 #00afaf 60 -35 -05  42 161 152 175  74  63
-!!green     #859900  2/2 green     64 #5f8700 60 -20  65 133 153   0  68 100  60
+URxvt.foreground:   base04
+URxvt.background:   base00
+URxvt.cursorColor:  base07
+URxvt.colorBD:      base07
 
-!! common
-#define S_yellow        #b58900
-#define S_orange        #cb4b16
-#define S_red           #dc322f
-#define S_magenta       #d33682
-#define S_violet        #6c71c4
-#define S_blue          #268bd2
-#define S_cyan          #2aa198
-#define S_green         #859900
+URxvt.color0:       base01
+URxvt.color1:       base08
+URxvt.color2:       base0B
+URxvt.color3:       base0A
+URxvt.color4:       base0D
+URxvt.color5:       base0F
+URxvt.color6:       base0C
+URxvt.color7:       base06
 
-!! dark
-#define S_base03        #002b36
-#define S_base02        #073642
-#define S_base01        #586e75
-#define S_base00        #657b83
-#define S_base0         #839496
-#define S_base1         #93a1a1
-#define S_base2         #eee8d5
-#define S_base3         #fdf6e3
-
-!! light
-
-!#define S_base03        #fdf6e3
-!#define S_base02        #eee8d5
-!#define S_base01        #93a1a1
-!#define S_base00        #839496
-!#define S_base0         #657b83
-!#define S_base1         #586e75
-!#define S_base2         #073642
-!#define S_base3         #002b36
-
-URxvt.background:            S_base03
-URxvt.foreground:            S_base0
-URxvt.colorBD:               S_base3
-URxvt.fadeColor:             S_base03
-URxvt.cursorColor:           S_base3
-URxvt.pointerColorBackground:S_base01
-URxvt.pointerColorForeground:S_base1
-
-!! black dark/light
-URxvt.color0:                S_base02
-URxvt.color8:                S_base03
-
-!! red dark/light
-URxvt.color1:                S_red
-URxvt.color9:                S_orange
-
-!! green dark/light
-URxvt.color2:                S_green
-URxvt.color10:               S_base01
-
-!! yellow dark/light
-URxvt.color3:                S_yellow
-URxvt.color11:               S_base00
-
-!! blue dark/light
-URxvt.color4:                S_blue
-URxvt.color12:               S_base0
-
-!! magenta dark/light
-URxvt.color5:                S_magenta
-URxvt.color13:               S_violet
-
-!! cyan dark/light
-URxvt.color6:                S_cyan
-URxvt.color14:               S_base1
-
-!! white dark/light
-URxvt.color7:                S_base2
-URxvt.color15:               S_base3
+URxvt.color8:       base00
+URxvt.color9:       base09
+URxvt.color10:      base02
+URxvt.color11:      base03
+URxvt.color12:      base04
+URxvt.color13:      base0E
+URxvt.color14:      base05
+URxvt.color15:      base07
 ! }}}
 ! {{{ fixes for gruvbox to look awesome, requires patched urxvt package
 URxvt.color24:  #076678