diff --git a/include/default-theme.h b/include/default-theme.h
index f26540f2..d913828b 100644
--- a/include/default-theme.h
+++ b/include/default-theme.h
@@ -5,13 +5,40 @@ const char *default_theme =
     "* {"
     "    spacing:    2;"
     "    background: #FFFDF6E3;"
+    "    foreground: #FF002B36;"
+    "    bordercolor: @foreground;"
+    "    red:        #FFDC322F;"
+    "    blue:       #FF268BD2;"
+    "    lightbg:    #FFEEE8D5;"
+    "    lightfg:    #FF586875;"
+    "    normal-foreground:           @foreground;"
+    "    normal-background:           @background;"
+    "    urgent-foreground:           @red;"
+    "    urgent-background:           @background;"
+    "    active-foreground:           @blue;"
+    "    active-background:           @background;"
+    "    selected-normal-foreground:  @lightbg;"
+    "    selected-normal-background:  @lightfg;"
+    "    selected-urgent-foreground:  @background;"
+    "    selected-urgent-background:  @red;"
+    "    selected-active-foreground:  @background;"
+    "    selected-active-background:  @blue;"
+    "    alternate-normal-foreground: @foreground;"
+    "    alternate-normal-background: @lightbg;"
+    "    alternate-urgent-foreground: @red;"
+    "    alternate-urgent-background: @lightbg;"
+    "    alternate-active-foreground: @blue;"
+    "    alternate-active-background: @lightbg;"
     "}"
     "#window {"
     "    border:     1;"
-    "    foreground: #FF002B36;"
+    "    foreground: @foreground;"
     "    padding:    5;"
     "    background: @background;"
     "}"
+    "#window.box {"
+    "    foreground: @bordercolor;"
+    "}"
     "#window.mainbox {"
     "    border:  0;"
     "    padding: 0;"
@@ -21,7 +48,7 @@ const char *default_theme =
     "    padding: 2px 0px 0px ;"
     "}"
     "#window.mainbox.message.normal {"
-    "    foreground: #FF002B36;"
+    "    foreground: @foreground;"
     "}"
     "#window.mainbox.listview {"
     "    fixed-height: 0;"
@@ -33,40 +60,40 @@ const char *default_theme =
     "    border: 0;"
     "}"
     "#window.mainbox.listview.element.normal.normal {"
-    "    foreground: #FF002B36;"
-    "    background: #FFFDF6E3;"
+    "    foreground: @normal-foreground;"
+    "    background: @normal-background;"
     "}"
     "#window.mainbox.listview.element.normal.urgent {"
-    "    foreground: #FFDC322F;"
-    "    background: #FFFDF6E3;"
+    "    foreground: @urgent-foreground;"
+    "    background: @urgent-background;"
     "}"
     "#window.mainbox.listview.element.normal.active {"
-    "    foreground: #FF268BD2;"
-    "    background: #FFFDF6E3;"
+    "    foreground: @active-foreground;"
+    "    background: @active-background;"
     "}"
     "#window.mainbox.listview.element.selected.normal {"
-    "    foreground: #FFEEE8D5;"
-    "    background: #FF586E75;"
+    "    foreground: @selected-normal-foreground;"
+    "    background: @selected-normal-background;"
     "}"
     "#window.mainbox.listview.element.selected.urgent {"
-    "    foreground: #FFFDF6E3;"
-    "    background: #FFDC322F;"
+    "    foreground: @selected-urgent-foreground;"
+    "    background: @selected-urgent-background;"
     "}"
     "#window.mainbox.listview.element.selected.active {"
-    "    foreground: #FFFDF6E3;"
-    "    background: #FF268BD2;"
+    "    foreground: @selected-active-foreground;"
+    "    background: @selected-active-background;"
     "}"
     "#window.mainbox.listview.element.alternate.normal {"
-    "    foreground: #FF002B36;"
-    "    background: #FFEEE8D5;"
+    "    foreground: @alternate-normal-foreground;"
+    "    background: @alternate-normal-background;"
     "}"
     "#window.mainbox.listview.element.alternate.urgent {"
-    "    foreground: #FFDC322F;"
-    "    background: #FFEEE8D5;"
+    "    foreground: @alternate-urgent-foreground;"
+    "    background: @alternate-urgent-background;"
     "}"
     "#window.mainbox.listview.element.alternate.active {"
-    "    foreground: #FF268BD2;"
-    "    background: #FFEEE8D5;"
+    "    foreground: @alternate-active-foreground;"
+    "    background: @alternate-active-background;"
     "}"
     "#window.mainbox.listview.scrollbar {"
     "    border:  0;"
@@ -81,7 +108,7 @@ const char *default_theme =
     "#window.mainbox.inputbar.box {"
     "}"
     "#window.mainbox.inputbar.normal {"
-    "    foreground: #FF002B36;"
+    "    foreground: @foreground;"
     "    background: @background;"
     "}";
 #endif