Update default theme and converter.

1 files changed, 49 insertions, 56 deletions

diff --git a/include/default-theme.h b/include/default-theme.h
index c87edb6f..ef189778 100644
--- a/include/default-theme.h
+++ b/include/default-theme.h
@@ -31,9 +31,10 @@
 const char *default_theme =
     "* {"
     "    spacing:    2;"
+    "    background-color:            transparent;"
     "    background:                  #FDF6E3FF;"
     "    foreground:                  #002B36FF;"
-    "    bordercolor:                 @foreground;"
+    "    border-color:                 @foreground;"
     "    separatorcolor:              @foreground;"
     "    red:                         #DC322FFF;"
     "    blue:                        #268BD2FF;"
@@ -60,91 +61,83 @@ const char *default_theme =
     "}"
     "#window {"
     "    border:     1;"
-    "    foreground: @foreground;"
-    "    background: #00000000;"
     "    padding:    5;"
+    "    background-color: @background;"
     "}"
-    "#window.box {"
-    "    background: @background;"
-    "    foreground: @bordercolor;"
-    "}"
-    "#window.mainbox {"
+    "#mainbox {"
     "    border:  0;"
     "    padding: 0;"
     "}"
-    "#window.mainbox.message.box {"
+    "#message {"
     "    border:  1px dash 0px 0px ;"
     "    padding: 2px 0px 0px ;"
-    "    foreground: @separatorcolor;"
+    "    border-color: @separatorcolor;"
     "}"
-    "#window.mainbox.message.normal {"
-    "    foreground: @foreground;"
+    "#message normal {"
+    "    text-color: @foreground;"
     "}"
-    "#window.mainbox.listview.box {"
-    "    foreground: @separatorcolor;"
+    "#listview {"
+    "    border-color: @separatorcolor;"
     "}"
-    "#window.mainbox.listview {"
+    "#listview {"
     "    fixed-height: 0;"
     "    border:       2px dash 0px 0px ;"
     "    padding:      2px 0px 0px ;"
     "}"
-    "#window.mainbox.listview.element {"
+    "#element {"
     "    border: 0;"
     "}"
-    "#window.mainbox.listview.element.normal.normal {"
-    "    foreground: @normal-foreground;"
-    "    background: @normal-background;"
+    "#element normal.normal {"
+    "    text-color: @normal-foreground;"
+    "    background-color: @normal-background;"
     "}"
-    "#window.mainbox.listview.element.normal.urgent {"
-    "    foreground: @urgent-foreground;"
-    "    background: @urgent-background;"
+    "#element normal.urgent {"
+    "    text-color: @urgent-foreground;"
+    "    background-color: @urgent-background;"
     "}"
-    "#window.mainbox.listview.element.normal.active {"
-    "    foreground: @active-foreground;"
-    "    background: @active-background;"
+    "#element normal.active {"
+    "    text-color: @active-foreground;"
+    "    background-color: @active-background;"
     "}"
-    "#window.mainbox.listview.element.selected.normal {"
-    "    foreground: @selected-normal-foreground;"
-    "    background: @selected-normal-background;"
+    "#element selected.normal {"
+    "    text-color: @selected-normal-foreground;"
+    "    background-color: @selected-normal-background;"
     "}"
-    "#window.mainbox.listview.element.selected.urgent {"
-    "    foreground: @selected-urgent-foreground;"
-    "    background: @selected-urgent-background;"
+    "#element selected.urgent {"
+    "    text-color: @selected-urgent-foreground;"
+    "    background-color: @selected-urgent-background;"
     "}"
-    "#window.mainbox.listview.element.selected.active {"
-    "    foreground: @selected-active-foreground;"
-    "    background: @selected-active-background;"
+    "#element selected.active {"
+    "    text-color: @selected-active-foreground;"
+    "    background-color: @selected-active-background;"
     "}"
-    "#window.mainbox.listview.element.alternate.normal {"
-    "    foreground: @alternate-normal-foreground;"
-    "    background: @alternate-normal-background;"
+    "#element alternate.normal {"
+    "    text-color: @alternate-normal-foreground;"
+    "    background-color: @alternate-normal-background;"
     "}"
-    "#window.mainbox.listview.element.alternate.urgent {"
-    "    foreground: @alternate-urgent-foreground;"
-    "    background: @alternate-urgent-background;"
+    "#element alternate.urgent {"
+    "    text-color: @alternate-urgent-foreground;"
+    "    background-color: @alternate-urgent-background;"
     "}"
-    "#window.mainbox.listview.element.alternate.active {"
-    "    foreground: @alternate-active-foreground;"
-    "    background: @alternate-active-background;"
+    "#element alternate.active {"
+    "    text-color: @alternate-active-foreground;"
+    "    background-color: @alternate-active-background;"
     "}"
     "#window.mainbox.listview.scrollbar {"
-    "    border:  0; width: 4px;"
+    "    border:  0;"
+    "    width: 4px;"
     "    padding: 0;"
     "}"
-    "#window.mainbox.sidebar.box {"
-    "    border: 2px dash 0px 0px ;"
-    "    foreground: @separatorcolor;"
+    "#sidebar {"
+    "    border:       2px dash 0px 0px ;"
+    "    border-color: @separatorcolor;"
     "}"
-    "#window.mainbox.sidebar button selected {"
-    " background: @selected-normal-background;"
-    " foreground: @selected-normal-foreground;"
+    "#button selected {"
+    "    background-color: @selected-normal-background;"
+    "    text-color:       @selected-normal-foreground;"
     "}"
-    "#window.mainbox.inputbar {"
+    "#inputbar {"
     "    spacing: 0;"
-    "    text: @normal-foreground;"
-    "}"
-    "#window.mainbox.inputbar.box {"
-    "     border: 0px 0px 0px 0px;"
-    "     "
+    "    text-color:      @normal-foreground;"
     "}";
 #endif