diff --git a/char.h b/char.h
index 743e5b0..1a73fce 100644
--- a/char.h
+++ b/char.h
@@ -13,3 +13,27 @@ static char ascii_printable[] = {
 	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
 	"`abcdefghijklmnopqrstuvwxyz{|}~" 
 };
+
+static char *colorname[]      = {
+	col_1, /* black */
+	col_2, /* red3 */
+	col_3, /* green3 */
+	col_4, /* yellow3 */
+	col_5, /* blue2 */
+	col_6, /* magenta3 */
+	col_7, /* cyan3 */
+	col_8, /* gray90 */
+	col_9, /* gray50 */
+	col_10, /* red */
+	col_11, /* green */
+	col_12, /* yellow */
+	col_13, /* #5c5cff */
+    col_14, /* magenta */
+	col_15, /* cyan */
+	col_16, /* white */
+	[255] = 0,
+	"#cccccc",
+	"#555555",
+	"#c0c5ce",
+	"#696969",
+};
diff --git a/options.h b/options.h
index 71be6fd..18d0b25 100644
--- a/options.h
+++ b/options.h
@@ -111,33 +111,27 @@ static char *url_opener             = "xdg-open"; /* Open the URL in this char *
 static int clickeditalic            = 1; /* Should clicked links show up as italic (1) or not (0) */
 static int clickedunderline         = 1; /* Should clicked links show up underlined (1) or not (0) */
 
-/* Color options */
-static const char *colorname[]      = {
-    /* Normal colors */
-	"#5c5c5c", /* black */
-	"#e57373", /* red3 */
-	"#02982e", /* green3 */
-	"#fac863", /* yellow3 */
-	"#6699cc", /* blue2 */
-	"#a36ac7", /* magenta3 */
-	"#5fb3b3", /* cyan3 */
-	"#c0c5ce", /* gray90 */
+/* Color options
+ * Regular colors (1-8)
+ */
+#define col_1   "#5c5c5c" /* regular color 1 */
+#define col_2   "#e57373" /* regular color 2 */
+#define col_3   "#02982e" /* regular color 3 */
+#define col_4   "#fac863" /* regular color 4 */
+#define col_5   "#6699cc" /* regular color 5 */
+#define col_6   "#a36ac7" /* regular color 6 */
+#define col_7   "#5fb3b3" /* regular color 7 */
+#define col_8   "#c0c5ce" /* regular color 8 */
 
-	/* Bright colors */
-	"#00ffaa", /* gray50 */
-	"#e57373", /* red */
-	"#a6bc69", /* green */
-	"#fac863", /* yellow */
-	"#6699cc", /* #5c5cff */
-    "#c594c5", /* magenta */
-	"#5fb3b3", /* cyan */
-	"#ffffff", /* white */
-	[255] = 0,
-	"#cccccc",
-	"#555555",
-	"#c0c5ce",
-	"#696969",
-};
+/* Bright colors (9-16) */
+#define col_9   "#00ffaa" /* bright color 1 */
+#define col_10  "#e57373" /* bright color 2 */
+#define col_11  "#a6bc69" /* bright color 3 */
+#define col_12  "#6699cc" /* bright color 4 */
+#define col_13  "#c594c5" /* bright color 5 */
+#define col_14  "#ffffff" /* bright color 6 */
+#define col_15  "#cccccc" /* bright color 7 */
+#define col_16  "#555555" /* bright color 8 */
 
 /* Default foreground/background colors */
 unsigned int defaultfg             = 258; /* Default foreground (text) color */
diff --git a/x.c b/x.c
index f9199b5..a0dfd7e 100644
--- a/x.c
+++ b/x.c
@@ -92,10 +92,10 @@ static void ttysend(const Arg *);
 
 #include "options.h" /* include user configuration */
 #include "char.h" /* include misc chars */
+#include "xresources.h" /* include .xresources/xrdb options */
 #include "keybinds.h" /* include keybinds */
 #include "mouse.h" /* include mouse binds */
 #include "mapped.h" /* include list of mapped keys */
-#include "xresources.h" /* include .xresources/xrdb options */
 #include "array.h" /* include key array */
 
 /* XEMBED messages */
diff --git a/xresources.h b/xresources.h
index 7598b9e..2f6f39b 100644
--- a/xresources.h
+++ b/xresources.h
@@ -36,4 +36,3 @@ ResourcePref resources[] = {
 		{ "cwscale",      FLOAT,   &cwscale },
 		{ "chscale",      FLOAT,   &chscale },
 };
-