diff --git a/config.def.h b/config.def.h
index 91ab8ca..a068694 100644
--- a/config.def.h
+++ b/config.def.h
@@ -96,32 +96,24 @@ unsigned int tabspaces = 8;
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
 	/* 8 normal colors */
-	"black",
-	"red3",
-	"green3",
-	"yellow3",
-	"blue2",
-	"magenta3",
-	"cyan3",
-	"gray90",
+	[0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
+	[1] = "#cc241d", /* red     */
+	[2] = "#98971a", /* green   */
+	[3] = "#d79921", /* yellow  */
+	[4] = "#458588", /* blue    */
+	[5] = "#b16286", /* magenta */
+	[6] = "#689d6a", /* cyan    */
+	[7] = "#a89984", /* white   */
 
 	/* 8 bright colors */
-	"gray50",
-	"red",
-	"green",
-	"yellow",
-	"#5c5cff",
-	"magenta",
-	"cyan",
-	"white",
-
-	[255] = 0,
-
-	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
-	"gray90", /* default foreground colour */
-	"black", /* default background colour */
+	[8]  = "#928374", /* black   */
+	[9]  = "#fb4934", /* red     */
+	[10] = "#b8bb26", /* green   */
+	[11] = "#fabd2f", /* yellow  */
+	[12] = "#83a598", /* blue    */
+	[13] = "#d3869b", /* magenta */
+	[14] = "#8ec07c", /* cyan    */
+	[15] = "#ebdbb2", /* white   */
 };
 
 
@@ -129,9 +121,9 @@ static const char *colorname[] = {
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-unsigned int defaultfg = 258;
-unsigned int defaultbg = 259;
-unsigned int defaultcs = 256;
+unsigned int defaultfg = 15;
+unsigned int defaultbg = 0;
+unsigned int defaultcs = 15;
 static unsigned int defaultrcs = 257;
 
 /*
diff --git a/st-gruvbox-dark-0.8.5.diff b/st-gruvbox-dark-0.8.5.diff
new file mode 100644
index 0000000..9606c07
--- /dev/null
+++ b/st-gruvbox-dark-0.8.5.diff
@@ -0,0 +1,66 @@
+diff --git a/config.def.h b/config.def.h
+index 91ab8ca..a068694 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -96,32 +96,24 @@ unsigned int tabspaces = 8;
+ /* Terminal colors (16 first used in escape sequence) */
+ static const char *colorname[] = {
+ 	/* 8 normal colors */
+-	"black",
+-	"red3",
+-	"green3",
+-	"yellow3",
+-	"blue2",
+-	"magenta3",
+-	"cyan3",
+-	"gray90",
++	[0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
++	[1] = "#cc241d", /* red     */
++	[2] = "#98971a", /* green   */
++	[3] = "#d79921", /* yellow  */
++	[4] = "#458588", /* blue    */
++	[5] = "#b16286", /* magenta */
++	[6] = "#689d6a", /* cyan    */
++	[7] = "#a89984", /* white   */
+ 
+ 	/* 8 bright colors */
+-	"gray50",
+-	"red",
+-	"green",
+-	"yellow",
+-	"#5c5cff",
+-	"magenta",
+-	"cyan",
+-	"white",
+-
+-	[255] = 0,
+-
+-	/* more colors can be added after 255 to use with DefaultXX */
+-	"#cccccc",
+-	"#555555",
+-	"gray90", /* default foreground colour */
+-	"black", /* default background colour */
++	[8]  = "#928374", /* black   */
++	[9]  = "#fb4934", /* red     */
++	[10] = "#b8bb26", /* green   */
++	[11] = "#fabd2f", /* yellow  */
++	[12] = "#83a598", /* blue    */
++	[13] = "#d3869b", /* magenta */
++	[14] = "#8ec07c", /* cyan    */
++	[15] = "#ebdbb2", /* white   */
+ };
+ 
+ 
+@@ -129,9 +121,9 @@ static const char *colorname[] = {
+  * Default colors (colorname index)
+  * foreground, background, cursor, reverse cursor
+  */
+-unsigned int defaultfg = 258;
+-unsigned int defaultbg = 259;
+-unsigned int defaultcs = 256;
++unsigned int defaultfg = 15;
++unsigned int defaultbg = 0;
++unsigned int defaultcs = 15;
+ static unsigned int defaultrcs = 257;
+ 
+ /*
diff --git a/st-gruvbox-light-0.8.5.diff b/st-gruvbox-light-0.8.5.diff
new file mode 100644
index 0000000..c1f620e
--- /dev/null
+++ b/st-gruvbox-light-0.8.5.diff
@@ -0,0 +1,67 @@
+diff --git a/config.def.h b/config.def.h
+index 91ab8ca..0be90e8 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -96,42 +96,34 @@ unsigned int tabspaces = 8;
+ /* Terminal colors (16 first used in escape sequence) */
+ static const char *colorname[] = {
+ 	/* 8 normal colors */
+-	"black",
+-	"red3",
+-	"green3",
+-	"yellow3",
+-	"blue2",
+-	"magenta3",
+-	"cyan3",
+-	"gray90",
++	[0] = "#fbf1c7", /* hard contrast: #f9f5d7 / soft contrast: #f2e5bc */
++	[1] = "#cc241d", /* red     */
++	[2] = "#98971a", /* green   */
++	[3] = "#d79921", /* yellow  */
++	[4] = "#458588", /* blue    */
++	[5] = "#b16286", /* magenta */
++	[6] = "#689d6a", /* cyan    */
++	[7] = "#7c6f64", /* white   */
+ 
+ 	/* 8 bright colors */
+-	"gray50",
+-	"red",
+-	"green",
+-	"yellow",
+-	"#5c5cff",
+-	"magenta",
+-	"cyan",
+-	"white",
+-
+-	[255] = 0,
+-
+-	/* more colors can be added after 255 to use with DefaultXX */
+-	"#cccccc",
+-	"#555555",
+-	"gray90", /* default foreground colour */
+-	"black", /* default background colour */
++	[8]  = "#928374", /* black   */
++	[9]  = "#9d0006", /* red     */
++	[10] = "#79740e", /* green   */
++	[11] = "#b57614", /* yellow  */
++	[12] = "#076678", /* blue    */
++	[13] = "#8f3f71", /* magenta */
++	[14] = "#427b58", /* cyan    */
++	[15] = "#3c3836", /* white   */
+ };
+ 
+ 
+ /*
+  * Default colors (colorname index)
+- * foreground, background, cursor, reverse cursor
++ * foreground, background, cursor
+  */
+-unsigned int defaultfg = 258;
+-unsigned int defaultbg = 259;
+-unsigned int defaultcs = 256;
++unsigned int defaultfg = 15;
++unsigned int defaultbg = 0;
++unsigned int defaultcs = 15;
+ static unsigned int defaultrcs = 257;
+ 
+ /*