put the render theme into a struct

4 files changed, 806 insertions, 845 deletions

diff --git a/render/font.c b/render/font.c
index 785b22fc..64f1da16 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,6 +1,5 @@
 #include "font.h"
 #include "theme.h"
-#include "kernel/openbox.h"
 #include "kernel/geom.h"
 #include "kernel/gettext.h"
 #define _(str) gettext(str)
@@ -35,18 +34,19 @@ static void measure_height(RrFont *f)
     XGlyphInfo info;
 
     /* measure an elipses */
-    XftTextExtentsUtf8(ob_display, f->xftfont,
+    XftTextExtentsUtf8(RrDisplay(f->inst), f->xftfont,
                        (FcChar8*)ELIPSES, strlen(ELIPSES), &info);
     f->elipses_length = (signed) info.xOff;
 }
 
-RrFont *font_open(char *fontstring)
+RrFont *font_open(const RrInstance *inst, char *fontstring)
 {
     RrFont *out;
     XftFont *xf;
     
-    if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
+    if ((xf = XftFontOpenName(RrDisplay(inst), RrScreen(inst), fontstring))) {
         out = g_new(RrFont, 1);
+        out->inst = inst;
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -54,8 +54,9 @@ RrFont *font_open(char *fontstring)
     g_warning(_("Unable to load font: %s\n"), fontstring);
     g_warning(_("Trying fallback font: %s\n"), "sans");
 
-    if ((xf = XftFontOpenName(ob_display, ob_screen, "sans"))) {
+    if ((xf = XftFontOpenName(RrDisplay(inst), RrScreen(inst), "sans"))) {
         out = g_new(RrFont, 1);
+        out->inst = inst;
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -69,7 +70,7 @@ RrFont *font_open(char *fontstring)
 void font_close(RrFont *f)
 {
     if (f) {
-        XftFontClose(ob_display, f->xftfont);
+        XftFontClose(RrDisplay(f->inst), f->xftfont);
         g_free(f);
     }
 }
@@ -79,7 +80,7 @@ void font_measure_full(RrFont *f, char *str, int shadow, int offset,
 {
     XGlyphInfo info;
 
-    XftTextExtentsUtf8(ob_display, f->xftfont,
+    XftTextExtentsUtf8(RrDisplay(f->inst), f->xftfont,
                        (FcChar8*)str, strlen(str), &info);
 
     *x = (signed) info.xOff + (shadow ? ABS(offset) : 0);
@@ -115,7 +116,7 @@ void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
     /* center vertically */
     y = area->y +
         (area->height - font_height(t->font, t->shadow, t->offset)) / 2;
-    w = area->width - theme_bevel * 2;
+    w = area->width;
     h = area->height;
 
     text = g_string_new(t->string);
@@ -140,10 +141,10 @@ void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
 
     switch (t->justify) {
     case RR_JUSTIFY_LEFT:
-        x = area->x + theme_bevel;
+        x = area->x;
         break;
     case RR_JUSTIFY_RIGHT:
-        x = area->x + (w - mw) - theme_bevel;
+        x = area->x + (w - mw);
         break;
     case RR_JUSTIFY_CENTER:
         x = area->x + (w - mw) / 2;
@@ -158,13 +159,15 @@ void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
             c.color.green = 0;
             c.color.blue = 0;
             c.color.alpha = 0xffff * t->tint / 100; /* transparent shadow */
-            c.pixel = BlackPixel(ob_display, ob_screen);
+            c.pixel = BlackPixel(RrDisplay(t->font->inst),
+                                 RrScreen(t->font->inst));
         } else {
             c.color.red = 0xffff * -t->tint / 100;
             c.color.green = 0xffff * -t->tint / 100;
             c.color.blue = 0xffff * -t->tint / 100;
             c.color.alpha = 0xffff * -t->tint / 100; /* transparent shadow */
-            c.pixel = WhitePixel(ob_display, ob_screen);
+            c.pixel = WhitePixel(RrDisplay(t->font->inst),
+                                 RrScreen(t->font->inst));
         }  
         XftDrawStringUtf8(d, &c, t->font->xftfont, x + t->offset,
                           t->font->xftfont->ascent + y + t->offset,
diff --git a/render/font.h b/render/font.h
index 393ac88e..7b483d89 100644
--- a/render/font.h
+++ b/render/font.h
@@ -6,12 +6,13 @@
 #include "kernel/geom.h"
 
 struct _RrFont {
+    const RrInstance *inst;
     XftFont *xftfont;
     gint elipses_length;
 };
 
 void font_startup(void);
-RrFont *font_open(char *fontstring);
+RrFont *font_open(const RrInstance *inst, char *fontstring);
 void font_close(RrFont *f);
 int font_measure_string(RrFont *f, char *str, int shadow, int offset);
 int font_height(RrFont *f, int shadow, int offset);
diff --git a/render/theme.c b/render/theme.c
index d2456672..991dfd1c 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -2,240 +2,699 @@
 #include "color.h"
 #include "font.h"
 #include "mask.h"
+#include "theme.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
-/* style settings - geometry */
-gint theme_bevel;
-gint theme_handle_height;
-gint theme_bwidth;
-gint theme_cbwidth;
-/* style settings - colors */
-color_rgb *theme_b_color;
-color_rgb *theme_cb_focused_color;
-color_rgb *theme_cb_unfocused_color;
-color_rgb *theme_title_focused_color;
-color_rgb *theme_title_unfocused_color;
-color_rgb *theme_titlebut_focused_color;
-color_rgb *theme_titlebut_unfocused_color;
-color_rgb *theme_menu_title_color;
-color_rgb *theme_menu_color;
-color_rgb *theme_menu_disabled_color;
-color_rgb *theme_menu_hilite_color;
-/* style settings - fonts */
-gint theme_winfont_height;
-RrFont *theme_winfont;
-gboolean theme_winfont_shadow;
-gint theme_winfont_shadow_offset;
-gint theme_winfont_shadow_tint;
-gint theme_mtitlefont_height;
-RrFont *theme_mtitlefont;
-gboolean theme_mtitlefont_shadow;
-gint theme_mtitlefont_shadow_offset;
-gint theme_mtitlefont_shadow_tint;
-gint theme_mfont_height;
-RrFont *theme_mfont;
-gboolean theme_mfont_shadow;
-gint theme_mfont_shadow_offset;
-gint theme_mfont_shadow_tint;
-/* style settings - title layout */
-gchar *theme_title_layout;
-/* style settings - masks */
-RrPixmapMask *theme_max_set_mask;
-RrPixmapMask *theme_max_unset_mask;
-RrPixmapMask *theme_iconify_mask;
-RrPixmapMask *theme_desk_set_mask;
-RrPixmapMask *theme_desk_unset_mask;
-RrPixmapMask *theme_shade_set_mask;
-RrPixmapMask *theme_shade_unset_mask;
-RrPixmapMask *theme_close_mask;
-
-/* global appearances */
-RrAppearance *theme_a_focused_unpressed_max;
-RrAppearance *theme_a_focused_pressed_max;
-RrAppearance *theme_a_focused_pressed_set_max;
-RrAppearance *theme_a_unfocused_unpressed_max;
-RrAppearance *theme_a_unfocused_pressed_max;
-RrAppearance *theme_a_unfocused_pressed_set_max;
-RrAppearance *theme_a_focused_unpressed_close;
-RrAppearance *theme_a_focused_pressed_close;
-RrAppearance *theme_a_unfocused_unpressed_close;
-RrAppearance *theme_a_unfocused_pressed_close;
-RrAppearance *theme_a_focused_unpressed_desk;
-RrAppearance *theme_a_focused_pressed_desk;
-RrAppearance *theme_a_focused_pressed_set_desk;
-RrAppearance *theme_a_unfocused_unpressed_desk;
-RrAppearance *theme_a_unfocused_pressed_desk;
-RrAppearance *theme_a_unfocused_pressed_set_desk;
-RrAppearance *theme_a_focused_unpressed_shade;
-RrAppearance *theme_a_focused_pressed_shade;
-RrAppearance *theme_a_focused_pressed_set_shade;
-RrAppearance *theme_a_unfocused_unpressed_shade;
-RrAppearance *theme_a_unfocused_pressed_shade;
-RrAppearance *theme_a_unfocused_pressed_set_shade;
-RrAppearance *theme_a_focused_unpressed_iconify;
-RrAppearance *theme_a_focused_pressed_iconify;
-RrAppearance *theme_a_unfocused_unpressed_iconify;
-RrAppearance *theme_a_unfocused_pressed_iconify;
-RrAppearance *theme_a_focused_grip;
-RrAppearance *theme_a_unfocused_grip;
-RrAppearance *theme_a_focused_title;
-RrAppearance *theme_a_unfocused_title;
-RrAppearance *theme_a_focused_label;
-RrAppearance *theme_a_unfocused_label;
-RrAppearance *theme_a_icon; /* always parentrelative, so no focused/unfocused */
-RrAppearance *theme_a_focused_handle;
-RrAppearance *theme_a_unfocused_handle;
-RrAppearance *theme_a_menu_title;
-RrAppearance *theme_a_menu;
-RrAppearance *theme_a_menu_item;
-RrAppearance *theme_a_menu_disabled;
-RrAppearance *theme_a_menu_hilite;
-
-RrAppearance *theme_app_hilite_bg;
-RrAppearance *theme_app_unhilite_bg;
-RrAppearance *theme_app_hilite_label;
-RrAppearance *theme_app_unhilite_label;
-RrAppearance *theme_app_icon;
-
-static const RrInstance *theme_inst = NULL;
-
-void theme_startup(const RrInstance *inst)
+static XrmDatabase loaddb(char *theme);
+static gboolean read_int(XrmDatabase db, char *rname, int *value);
+static gboolean read_string(XrmDatabase db, char *rname, char **value);
+static gboolean read_color(XrmDatabase db, const RrInstance *inst,
+                           gchar *rname, color_rgb **value);
+static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
+                          gchar *rname, gchar *theme,
+                          RrPixmapMask **value);
+static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
+                                gchar *rname, RrAppearance *value);
+static void set_default_appearance(RrAppearance *a);
+
+RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 {
-    theme_inst = inst;
-
-    theme_b_color = theme_cb_unfocused_color = theme_cb_focused_color = 
-        theme_title_unfocused_color = theme_title_focused_color = 
-        theme_titlebut_unfocused_color = theme_titlebut_focused_color = 
-        theme_menu_color = theme_menu_title_color = theme_menu_disabled_color =
-        theme_menu_hilite_color = NULL;
-    theme_winfont = theme_mtitlefont = theme_mfont = NULL;
-    theme_title_layout = NULL;
-    theme_max_set_mask = theme_max_unset_mask = NULL;
-    theme_desk_set_mask = theme_desk_unset_mask = NULL;
-    theme_shade_set_mask = theme_shade_unset_mask = NULL;
-    theme_iconify_mask = theme_close_mask = NULL;
-
-    theme_a_focused_unpressed_max = RrAppearanceNew(inst, 1);
-    theme_a_focused_pressed_max = RrAppearanceNew(inst, 1);
-    theme_a_focused_pressed_set_max = RrAppearanceNew(inst, 1);
-    theme_a_unfocused_unpressed_max = RrAppearanceNew(inst, 1);
-    theme_a_unfocused_pressed_max = RrAppearanceNew(inst, 1);
-    theme_a_unfocused_pressed_set_max = RrAppearanceNew(inst, 1);
-    theme_a_focused_unpressed_close = NULL;
-    theme_a_focused_pressed_close = NULL;
-    theme_a_unfocused_unpressed_close = NULL;
-    theme_a_unfocused_pressed_close = NULL;
-    theme_a_focused_unpressed_desk = NULL;
-    theme_a_focused_pressed_desk = NULL;
-    theme_a_focused_pressed_set_desk = NULL;
-    theme_a_unfocused_unpressed_desk = NULL;
-    theme_a_unfocused_pressed_desk = NULL;
-    theme_a_unfocused_pressed_set_desk = NULL;
-    theme_a_focused_unpressed_shade = NULL;
-    theme_a_focused_pressed_shade = NULL;
-    theme_a_focused_pressed_set_shade = NULL;
-    theme_a_unfocused_unpressed_shade = NULL;
-    theme_a_unfocused_pressed_shade = NULL;
-    theme_a_unfocused_pressed_set_shade = NULL;
-    theme_a_focused_unpressed_iconify = NULL;
-    theme_a_focused_pressed_iconify = NULL;
-    theme_a_unfocused_unpressed_iconify = NULL;
-    theme_a_unfocused_pressed_iconify = NULL;
-    theme_a_focused_grip = RrAppearanceNew(inst, 0);
-    theme_a_unfocused_grip = RrAppearanceNew(inst, 0);
-    theme_a_focused_title = RrAppearanceNew(inst, 0);
-    theme_a_unfocused_title = RrAppearanceNew(inst, 0);
-    theme_a_focused_label = RrAppearanceNew(inst, 1);
-    theme_a_unfocused_label = RrAppearanceNew(inst, 1);
-    theme_a_icon = RrAppearanceNew(inst, 1);
-    theme_a_focused_handle = RrAppearanceNew(inst, 0);
-    theme_a_unfocused_handle = RrAppearanceNew(inst, 0);
-    theme_a_menu = RrAppearanceNew(inst, 0);
-    theme_a_menu_title = RrAppearanceNew(inst, 1);
-    theme_a_menu_item = RrAppearanceNew(inst, 1);
-    theme_a_menu_disabled = RrAppearanceNew(inst, 1);
-    theme_a_menu_hilite = RrAppearanceNew(inst, 1);
-
-    theme_app_hilite_bg = RrAppearanceNew(inst, 0);
-    theme_app_unhilite_bg = RrAppearanceNew(inst, 0);
-    theme_app_hilite_label = RrAppearanceNew(inst, 1);
-    theme_app_unhilite_label = RrAppearanceNew(inst, 1);
-    theme_app_icon = RrAppearanceNew(inst, 1);
+    XrmDatabase db = NULL;
+    RrJustify winjust, mtitlejust, mjust;
+    gchar *str;
+    gchar *font_str;
+    RrTheme *theme;
+
+    theme = g_new(RrTheme, 1);
+
+    theme->inst = inst;
+
+    theme->b_color = theme->cb_unfocused_color = theme->cb_focused_color = 
+        theme->title_unfocused_color = theme->title_focused_color = 
+        theme->titlebut_unfocused_color = theme->titlebut_focused_color = 
+        theme->menu_color = theme->menu_title_color =
+        theme->menu_disabled_color = theme->menu_hilite_color = NULL;
+    theme->winfont = theme->mtitlefont = theme->mfont = NULL;
+    theme->title_layout = NULL;
+    theme->max_set_mask = theme->max_unset_mask = NULL;
+    theme->desk_set_mask = theme->desk_unset_mask = NULL;
+    theme->shade_set_mask = theme->shade_unset_mask = NULL;
+    theme->iconify_mask = theme->close_mask = NULL;
+
+    theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1);
+    theme->a_focused_pressed_max = RrAppearanceNew(inst, 1);
+    theme->a_focused_pressed_set_max = RrAppearanceNew(inst, 1);
+    theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1);
+    theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1);
+    theme->a_unfocused_pressed_set_max = RrAppearanceNew(inst, 1);
+    theme->a_focused_unpressed_close = NULL;
+    theme->a_focused_pressed_close = NULL;
+    theme->a_unfocused_unpressed_close = NULL;
+    theme->a_unfocused_pressed_close = NULL;
+    theme->a_focused_unpressed_desk = NULL;
+    theme->a_focused_pressed_desk = NULL;
+    theme->a_focused_pressed_set_desk = NULL;
+    theme->a_unfocused_unpressed_desk = NULL;
+    theme->a_unfocused_pressed_desk = NULL;
+    theme->a_unfocused_pressed_set_desk = NULL;
+    theme->a_focused_unpressed_shade = NULL;
+    theme->a_focused_pressed_shade = NULL;
+    theme->a_focused_pressed_set_shade = NULL;
+    theme->a_unfocused_unpressed_shade = NULL;
+    theme->a_unfocused_pressed_shade = NULL;
+    theme->a_unfocused_pressed_set_shade = NULL;
+    theme->a_focused_unpressed_iconify = NULL;
+    theme->a_focused_pressed_iconify = NULL;
+    theme->a_unfocused_unpressed_iconify = NULL;
+    theme->a_unfocused_pressed_iconify = NULL;
+    theme->a_focused_grip = RrAppearanceNew(inst, 0);
+    theme->a_unfocused_grip = RrAppearanceNew(inst, 0);
+    theme->a_focused_title = RrAppearanceNew(inst, 0);
+    theme->a_unfocused_title = RrAppearanceNew(inst, 0);
+    theme->a_focused_label = RrAppearanceNew(inst, 1);
+    theme->a_unfocused_label = RrAppearanceNew(inst, 1);
+    theme->a_icon = RrAppearanceNew(inst, 1);
+    theme->a_focused_handle = RrAppearanceNew(inst, 0);
+    theme->a_unfocused_handle = RrAppearanceNew(inst, 0);
+    theme->a_menu = RrAppearanceNew(inst, 0);
+    theme->a_menu_title = RrAppearanceNew(inst, 1);
+    theme->a_menu_item = RrAppearanceNew(inst, 1);
+    theme->a_menu_disabled = RrAppearanceNew(inst, 1);
+    theme->a_menu_hilite = RrAppearanceNew(inst, 1);
+
+    theme->app_hilite_bg = RrAppearanceNew(inst, 0);
+    theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
+    theme->app_hilite_label = RrAppearanceNew(inst, 1);
+    theme->app_unhilite_label = RrAppearanceNew(inst, 1);
+    theme->app_icon = RrAppearanceNew(inst, 1);
+
+    if (name) {
+	db = loaddb(name);
+        if (db == NULL) {
+	    g_warning("Failed to load the theme '%s'", name);
+	    g_message("Falling back to the default: '%s'", DEFAULT_THEME);
+	} else
+            theme->name = g_strdup(name);
+    }
+    if (db == NULL) {
+	db = loaddb(DEFAULT_THEME);
+	if (db == NULL) {
+	    g_warning("Failed to load the theme '%s'.", DEFAULT_THEME);
+	    return NULL;
+	} else
+            theme->name = g_strdup(DEFAULT_THEME);
+    }
+
+    /* load the font stuff */
+    font_str = "arial:bold:pixelsize=10";
+
+    theme->winfont_shadow = FALSE;
+    if (read_string(db, "window.xft.flags", &str)) {
+        if (g_strrstr(str, "shadow"))
+            theme->winfont_shadow = TRUE;
+        g_free(str);
+    }
+ 
+    if (!read_int(db, "window.xft.shadow.offset",
+                  &theme->winfont_shadow_offset))
+        theme->winfont_shadow_offset = 1;
+    if (!read_int(db, "window.xft.shadow.tint",
+                  &theme->winfont_shadow_tint) ||
+        theme->winfont_shadow_tint < 100 || theme->winfont_shadow_tint > 100)
+        theme->winfont_shadow_tint = 25;
+
+    theme->winfont = font_open(inst, font_str);
+    theme->winfont_height = font_height(theme->winfont, theme->winfont_shadow,
+                                       theme->winfont_shadow_offset);
+
+    winjust = RR_JUSTIFY_LEFT;
+    if (read_string(db, "window.justify", &str)) {
+        if (!g_ascii_strcasecmp(str, "right"))
+            winjust = RR_JUSTIFY_RIGHT;
+        else if (!g_ascii_strcasecmp(str, "center"))
+            winjust = RR_JUSTIFY_CENTER;
+        g_free(str);
+    }
+
+    font_str = "arial-10:bold";
+
+    theme->mtitlefont_shadow = FALSE;
+    if (read_string(db, "menu.title.xft.flags", &str)) {
+        if (g_strrstr(str, "shadow"))
+            theme->mtitlefont_shadow = TRUE;
+        g_free(str);
+    }
+ 
+    if (!read_int(db, "menu.title.xft.shadow.offset",
+                  &theme->mtitlefont_shadow_offset))
+        theme->mtitlefont_shadow_offset = 1;
+    if (!read_int(db, "menu.title.xft.shadow.tint",
+                  &theme->mtitlefont_shadow_tint) ||
+        theme->mtitlefont_shadow_tint < 100 ||
+        theme->mtitlefont_shadow_tint > 100)
+        theme->mtitlefont_shadow_tint = 25;
+
+    theme->mtitlefont = font_open(inst, font_str);
+    theme->mtitlefont_height = font_height(theme->mtitlefont,
+                                          theme->mtitlefont_shadow,
+                                          theme->mtitlefont_shadow_offset);
 
+    mtitlejust = RR_JUSTIFY_LEFT;
+    if (read_string(db, "menu.title.justify", &str)) {
+        if (!g_ascii_strcasecmp(str, "right"))
+            mtitlejust = RR_JUSTIFY_RIGHT;
+        else if (!g_ascii_strcasecmp(str, "center"))
+            mtitlejust = RR_JUSTIFY_CENTER;
+        g_free(str);
+    }
+
+    font_str = "arial-8";
+
+    theme->mfont_shadow = FALSE;
+    if (read_string(db, "menu.frame.xft.flags", &str)) {
+        if (g_strrstr(str, "shadow"))
+            theme->mfont_shadow = TRUE;
+        g_free(str);
+    }
+ 
+    if (!read_int(db, "menu.frame.xft.shadow.offset",
+                  &theme->mfont_shadow_offset))
+        theme->mfont_shadow_offset = 1;
+    if (!read_int(db, "menu.frame.xft.shadow.tint",
+                  &theme->mfont_shadow_tint) ||
+        theme->mfont_shadow_tint < 100 ||
+        theme->mfont_shadow_tint > 100)
+        theme->mfont_shadow_tint = 25;
+
+    theme->mfont = font_open(inst, font_str);
+    theme->mfont_height = font_height(theme->mfont, theme->mfont_shadow,
+                                     theme->mfont_shadow_offset);
+
+    mjust = RR_JUSTIFY_LEFT;
+    if (read_string(db, "menu.frame.justify", &str)) {
+        if (!g_ascii_strcasecmp(str, "right"))
+            mjust = RR_JUSTIFY_RIGHT;
+        else if (!g_ascii_strcasecmp(str, "center"))
+            mjust = RR_JUSTIFY_CENTER;
+        g_free(str);
+    }
+
+    /* load the title layout */
+    theme->title_layout = g_strdup("NLIMC");
+
+    if (!read_int(db, "handleWidth", &theme->handle_height) ||
+	theme->handle_height < 0 || theme->handle_height > 100)
+        theme->handle_height = 6;
+    if (!read_int(db, "bevelWidth", &theme->bevel) ||
+	theme->bevel <= 0 || theme->bevel > 100) theme->bevel = 3;
+    if (!read_int(db, "borderWidth", &theme->bwidth) ||
+	theme->bwidth < 0 || theme->bwidth > 100) theme->bwidth = 1;
+    if (!read_int(db, "frameWidth", &theme->cbwidth) ||
+	theme->cbwidth < 0 || theme->cbwidth > 100)
+        theme->cbwidth = theme->bevel;
+
+    /* load colors */
+    if (!read_color(db, inst,
+                    "borderColor", &theme->b_color))
+	theme->b_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "window.frame.focusColor", &theme->cb_focused_color))
+	theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.frame.unfocusColor",&theme->cb_unfocused_color))
+	theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.label.focus.textColor",
+                    &theme->title_focused_color))
+	theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0);
+    if (!read_color(db, inst,
+                    "window.label.unfocus.textColor",
+                    &theme->title_unfocused_color))
+	theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.button.focus.picColor",
+                    &theme->titlebut_focused_color))
+	theme->titlebut_focused_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "window.button.unfocus.picColor",
+                    &theme->titlebut_unfocused_color))
+	theme->titlebut_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "menu.title.textColor", &theme->menu_title_color))
+        theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "menu.frame.textColor", &theme->menu_color))
+        theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "menu.frame.disableColor", &theme->menu_disabled_color))
+        theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "menu.hilite.textColor", &theme->menu_hilite_color))
+        theme->menu_hilite_color = RrColorNew(inst, 0, 0, 0);
+
+    if (read_mask(db, inst,
+                  "window.button.max.mask", name, &theme->max_unset_mask)){
+        if (!read_mask(db, inst,
+                       "window.button.max.toggled.mask", name,
+                       &theme->max_set_mask)) {
+            theme->max_set_mask = RrPixmapMaskCopy(theme->max_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
+            theme->max_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+        {
+            char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
+            theme->max_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+    }
+
+    if (!read_mask(db, inst,
+                   "window.button.icon.mask", name,
+                   &theme->iconify_mask)) {
+        char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
+        theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data);
+    }
+
+    if (read_mask(db, inst,
+                  "window.button.stick.mask", name,
+                   &theme->desk_unset_mask)) {
+        if (!read_mask(db, inst, "window.button.stick.toggled.mask", name,
+                       &theme->desk_set_mask)) {
+            theme->desk_set_mask =
+                RrPixmapMaskCopy(theme->desk_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
+            theme->desk_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+        {
+            char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
+            theme->desk_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+    }
+
+    if (read_mask(db, inst, "window.button.shade.mask", name,
+                   &theme->shade_unset_mask)) {
+        if (!read_mask(db, inst, "window.button.shade.toggled.mask", name,
+                       &theme->shade_set_mask)) {
+            theme->shade_set_mask =
+                RrPixmapMaskCopy(theme->shade_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
+            theme->shade_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
+            theme->shade_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+    }
+
+    if (!read_mask(db, inst, "window.button.close.mask", name,
+                   &theme->close_mask)) {
+        char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
+        theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data);
+    }        
+
+    /* read the decoration textures */
+    if (!read_appearance(db, inst,
+                         "window.title.focus", theme->a_focused_title))
+	set_default_appearance(theme->a_focused_title);
+    if (!read_appearance(db, inst,
+                         "window.title.unfocus", theme->a_unfocused_title))
+	set_default_appearance(theme->a_unfocused_title);
+    if (!read_appearance(db, inst,
+                         "window.label.focus", theme->a_focused_label))
+	set_default_appearance(theme->a_focused_label);
+    if (!read_appearance(db, inst,
+                         "window.label.unfocus", theme->a_unfocused_label))
+	set_default_appearance(theme->a_unfocused_label);
+    if (!read_appearance(db, inst,
+                         "window.handle.focus", theme->a_focused_handle))
+	set_default_appearance(theme->a_focused_handle);
+    if (!read_appearance(db, inst,
+                         "window.handle.unfocus",theme->a_unfocused_handle))
+	set_default_appearance(theme->a_unfocused_handle);
+    if (!read_appearance(db, inst,
+                         "window.grip.focus", theme->a_focused_grip))
+	set_default_appearance(theme->a_focused_grip);
+    if (!read_appearance(db, inst,
+                         "window.grip.unfocus", theme->a_unfocused_grip))
+	set_default_appearance(theme->a_unfocused_grip);
+    if (!read_appearance(db, inst,
+                         "menu.frame", theme->a_menu))
+	set_default_appearance(theme->a_menu);
+    if (!read_appearance(db, inst,
+                         "menu.title", theme->a_menu_title))
+	set_default_appearance(theme->a_menu_title);
+    if (!read_appearance(db, inst,
+                         "menu.hilite", theme->a_menu_hilite))
+	set_default_appearance(theme->a_menu_hilite);
+
+    /* read the appearances for rendering non-decorations */
+    if (!read_appearance(db, inst,
+                         "window.title.focus", theme->app_hilite_bg))
+        set_default_appearance(theme->app_hilite_bg);
+    if (!read_appearance(db, inst,
+                         "window.label.focus", theme->app_hilite_label))
+        set_default_appearance(theme->app_hilite_label);
+    if (!read_appearance(db, inst,
+                         "window.title.unfocus", theme->app_unhilite_bg))
+        set_default_appearance(theme->app_unhilite_bg);
+    if (!read_appearance(db, inst,
+                         "window.label.unfocus", theme->app_unhilite_label))
+        set_default_appearance(theme->app_unhilite_label);
+
+    /* read buttons textures */
+    if (!read_appearance(db, inst,
+                         "window.button.pressed.focus",
+			 theme->a_focused_pressed_max))
+	if (!read_appearance(db, inst,
+                             "window.button.pressed",
+                             theme->a_focused_pressed_max))
+	    set_default_appearance(theme->a_focused_pressed_max);
+    if (!read_appearance(db, inst,
+                         "window.button.pressed.unfocus",
+			 theme->a_unfocused_pressed_max))
+	if (!read_appearance(db, inst,
+                             "window.button.pressed",
+			     theme->a_unfocused_pressed_max))
+	    set_default_appearance(theme->a_unfocused_pressed_max);
+    if (!read_appearance(db, inst,
+                         "window.button.focus",
+			 theme->a_focused_unpressed_max))
+	set_default_appearance(theme->a_focused_unpressed_max);
+    if (!read_appearance(db, inst,
+                         "window.button.unfocus",
+			 theme->a_unfocused_unpressed_max))
+	set_default_appearance(theme->a_unfocused_unpressed_max);
+
+    theme->a_unfocused_unpressed_close =
+        RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+    theme->a_unfocused_pressed_close =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_focused_unpressed_close =
+        RrAppearanceCopy(theme->a_focused_unpressed_max);
+    theme->a_focused_pressed_close =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_unfocused_unpressed_desk =
+        RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+    theme->a_unfocused_pressed_desk =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_unfocused_pressed_set_desk =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_focused_unpressed_desk =
+        RrAppearanceCopy(theme->a_focused_unpressed_max);
+    theme->a_focused_pressed_desk =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_focused_pressed_set_desk =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_unfocused_unpressed_shade =
+        RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+    theme->a_unfocused_pressed_shade =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_unfocused_pressed_set_shade =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_focused_unpressed_shade =
+        RrAppearanceCopy(theme->a_focused_unpressed_max);
+    theme->a_focused_pressed_shade =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_focused_pressed_set_shade =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_unfocused_unpressed_iconify =
+        RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+    theme->a_unfocused_pressed_iconify =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_focused_unpressed_iconify =
+        RrAppearanceCopy(theme->a_focused_unpressed_max);
+    theme->a_focused_pressed_iconify =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_unfocused_pressed_set_max =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_focused_pressed_set_max =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+
+    theme->a_icon->surface.grad = RR_SURFACE_PARENTREL;
+
+    /* set up the textures */
+    theme->a_focused_label->texture[0].type = 
+        theme->app_hilite_label->texture[0].type = RR_TEXTURE_TEXT;
+    theme->a_focused_label->texture[0].data.text.justify = winjust;
+    theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
+    theme->a_focused_label->texture[0].data.text.font =
+        theme->app_hilite_label->texture[0].data.text.font = theme->winfont;
+    theme->a_focused_label->texture[0].data.text.shadow =
+        theme->app_hilite_label->texture[0].data.text.shadow =
+        theme->winfont_shadow;
+    theme->a_focused_label->texture[0].data.text.offset =
+        theme->app_hilite_label->texture[0].data.text.offset =
+        theme->winfont_shadow_offset;
+    theme->a_focused_label->texture[0].data.text.tint =
+        theme->app_hilite_label->texture[0].data.text.tint =
+        theme->winfont_shadow_tint;
+    theme->a_focused_label->texture[0].data.text.color =
+        theme->app_hilite_label->texture[0].data.text.color =
+        theme->title_focused_color;
+
+    theme->a_unfocused_label->texture[0].type =
+        theme->app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT;
+    theme->a_unfocused_label->texture[0].data.text.justify = winjust;
+    theme->app_unhilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
+    theme->a_unfocused_label->texture[0].data.text.font =
+        theme->app_unhilite_label->texture[0].data.text.font = theme->winfont;
+    theme->a_unfocused_label->texture[0].data.text.shadow =
+        theme->app_unhilite_label->texture[0].data.text.shadow =
+        theme->winfont_shadow;
+    theme->a_unfocused_label->texture[0].data.text.offset =
+        theme->app_unhilite_label->texture[0].data.text.offset =
+        theme->winfont_shadow_offset;
+    theme->a_unfocused_label->texture[0].data.text.tint =
+        theme->app_unhilite_label->texture[0].data.text.tint =
+        theme->winfont_shadow_tint;
+    theme->a_unfocused_label->texture[0].data.text.color =
+        theme->app_unhilite_label->texture[0].data.text.color =
+        theme->title_unfocused_color;
+
+    theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT;
+    theme->a_menu_title->texture[0].data.text.justify = mtitlejust;
+    theme->a_menu_title->texture[0].data.text.font = theme->mtitlefont;
+    theme->a_menu_title->texture[0].data.text.shadow = theme->mtitlefont_shadow;
+    theme->a_menu_title->texture[0].data.text.offset =
+        theme->mtitlefont_shadow_offset;
+    theme->a_menu_title->texture[0].data.text.tint =
+        theme->mtitlefont_shadow_tint;
+    theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color;
+
+    theme->a_menu_item->surface.grad = 
+        theme->a_menu_disabled->surface.grad =
+        theme->app_icon->surface.grad = RR_SURFACE_PARENTREL;
+
+    theme->a_menu_item->texture[0].type =
+        theme->a_menu_disabled->texture[0].type = 
+        theme->a_menu_hilite->texture[0].type = RR_TEXTURE_TEXT;
+    theme->a_menu_item->texture[0].data.text.justify = 
+        theme->a_menu_disabled->texture[0].data.text.justify = 
+        theme->a_menu_hilite->texture[0].data.text.justify = mjust;
+    theme->a_menu_item->texture[0].data.text.font =
+        theme->a_menu_disabled->texture[0].data.text.font =
+        theme->a_menu_hilite->texture[0].data.text.font = theme->mfont;
+    theme->a_menu_item->texture[0].data.text.shadow = 
+        theme->a_menu_disabled->texture[0].data.text.shadow = 
+        theme->a_menu_hilite->texture[0].data.text.shadow =
+        theme->mfont_shadow;
+    theme->a_menu_item->texture[0].data.text.offset =
+        theme->a_menu_disabled->texture[0].data.text.offset = 
+        theme->a_menu_hilite->texture[0].data.text.offset = 
+        theme->mfont_shadow_offset;
+    theme->a_menu_item->texture[0].data.text.tint =
+        theme->a_menu_disabled->texture[0].data.text.tint =
+        theme->a_menu_hilite->texture[0].data.text.tint =
+        theme->mfont_shadow_tint;
+    theme->a_menu_item->texture[0].data.text.color = theme->menu_color;
+    theme->a_menu_disabled->texture[0].data.text.color =
+        theme->menu_disabled_color;
+    theme->a_menu_hilite->texture[0].data.text.color =
+        theme->menu_hilite_color;
+
+    theme->a_focused_unpressed_max->texture[0].type = 
+        theme->a_focused_pressed_max->texture[0].type = 
+        theme->a_focused_pressed_set_max->texture[0].type =  
+        theme->a_unfocused_unpressed_max->texture[0].type = 
+        theme->a_unfocused_pressed_max->texture[0].type = 
+        theme->a_unfocused_pressed_set_max->texture[0].type = 
+        theme->a_focused_unpressed_close->texture[0].type = 
+        theme->a_focused_pressed_close->texture[0].type = 
+        theme->a_unfocused_unpressed_close->texture[0].type = 
+        theme->a_unfocused_pressed_close->texture[0].type = 
+        theme->a_focused_unpressed_desk->texture[0].type = 
+        theme->a_focused_pressed_desk->texture[0].type = 
+        theme->a_focused_pressed_set_desk->texture[0].type = 
+        theme->a_unfocused_unpressed_desk->texture[0].type = 
+        theme->a_unfocused_pressed_desk->texture[0].type = 
+        theme->a_unfocused_pressed_set_desk->texture[0].type = 
+        theme->a_focused_unpressed_shade->texture[0].type = 
+        theme->a_focused_pressed_shade->texture[0].type = 
+        theme->a_focused_pressed_set_shade->texture[0].type = 
+        theme->a_unfocused_unpressed_shade->texture[0].type = 
+        theme->a_unfocused_pressed_shade->texture[0].type = 
+        theme->a_unfocused_pressed_set_shade->texture[0].type = 
+        theme->a_focused_unpressed_iconify->texture[0].type = 
+        theme->a_focused_pressed_iconify->texture[0].type = 
+        theme->a_unfocused_unpressed_iconify->texture[0].type = 
+        theme->a_unfocused_pressed_iconify->texture[0].type = RR_TEXTURE_MASK;
+    theme->a_focused_unpressed_max->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = 
+        theme->a_focused_pressed_max->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_max->texture[0].data.mask.mask =
+        theme->max_unset_mask;
+    theme->a_focused_pressed_set_max->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_set_max->texture[0].data.mask.mask =
+        theme->max_set_mask;
+    theme->a_focused_pressed_close->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_close->texture[0].data.mask.mask =
+        theme->a_focused_unpressed_close->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_close->texture[0].data.mask.mask =
+        theme->close_mask;
+    theme->a_focused_unpressed_desk->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = 
+        theme->a_focused_pressed_desk->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_desk->texture[0].data.mask.mask =
+        theme->desk_unset_mask;
+    theme->a_focused_pressed_set_desk->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_set_desk->texture[0].data.mask.mask =
+        theme->desk_set_mask;
+    theme->a_focused_unpressed_shade->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = 
+        theme->a_focused_pressed_shade->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_shade->texture[0].data.mask.mask =
+        theme->shade_unset_mask;
+    theme->a_focused_pressed_set_shade->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_set_shade->texture[0].data.mask.mask =
+        theme->shade_set_mask;
+    theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = 
+        theme->a_focused_pressed_iconify->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask =
+        theme->iconify_mask;
+    theme->a_focused_unpressed_max->texture[0].data.mask.color = 
+        theme->a_focused_pressed_max->texture[0].data.mask.color = 
+        theme->a_focused_pressed_set_max->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_close->texture[0].data.mask.color = 
+        theme->a_focused_pressed_close->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_desk->texture[0].data.mask.color = 
+        theme->a_focused_pressed_desk->texture[0].data.mask.color = 
+        theme->a_focused_pressed_set_desk->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_shade->texture[0].data.mask.color = 
+        theme->a_focused_pressed_shade->texture[0].data.mask.color = 
+        theme->a_focused_pressed_set_shade->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_iconify->texture[0].data.mask.color = 
+        theme->a_focused_pressed_iconify->texture[0].data.mask.color =
+        theme->titlebut_focused_color;
+    theme->a_unfocused_unpressed_max->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_max->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_set_max->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_close->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_close->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_desk->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_set_desk->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_shade->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_set_shade->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_iconify->texture[0].data.mask.color =
+        theme->titlebut_unfocused_color;
+
+    XrmDestroyDatabase(db);
+
+    theme->label_height = theme->winfont_height;
+    theme->title_height = theme->label_height + theme->bevel * 2;
+    theme->button_size = theme->label_height - 2;
+    theme->grip_width = theme->button_size * 2;
+
+    return theme;
 }
 
-void theme_shutdown()
+void RrThemeFree(RrTheme *theme)
 {
-    RrColorFree(theme_b_color);
-    RrColorFree(theme_cb_unfocused_color);
-    RrColorFree(theme_cb_focused_color);
-    RrColorFree(theme_title_unfocused_color);
-    RrColorFree(theme_title_focused_color);
-    RrColorFree(theme_titlebut_unfocused_color);
-    RrColorFree(theme_titlebut_focused_color);
-    RrColorFree(theme_menu_color);
-    RrColorFree(theme_menu_title_color);
-    RrColorFree(theme_menu_disabled_color);
-    RrColorFree(theme_menu_hilite_color);
-
-    RrPixmapMaskFree(theme_max_set_mask);
-    RrPixmapMaskFree(theme_max_unset_mask);
-    RrPixmapMaskFree(theme_desk_set_mask);
-    RrPixmapMaskFree(theme_desk_unset_mask);
-    RrPixmapMaskFree(theme_shade_set_mask);
-    RrPixmapMaskFree(theme_shade_unset_mask);
-    RrPixmapMaskFree(theme_iconify_mask);
-    RrPixmapMaskFree(theme_close_mask);
-
-    font_close(theme_winfont);
-    font_close(theme_mtitlefont);
-    font_close(theme_mfont);
-
-    g_free(theme_title_layout);
-
-    RrAppearanceFree(theme_a_focused_unpressed_max);
-    RrAppearanceFree(theme_a_focused_pressed_max);
-    RrAppearanceFree(theme_a_focused_pressed_set_max);
-    RrAppearanceFree(theme_a_unfocused_unpressed_max);
-    RrAppearanceFree(theme_a_unfocused_pressed_max);
-    RrAppearanceFree(theme_a_unfocused_pressed_set_max);
-    RrAppearanceFree(theme_a_focused_unpressed_close);
-    RrAppearanceFree(theme_a_focused_pressed_close);
-    RrAppearanceFree(theme_a_unfocused_unpressed_close);
-    RrAppearanceFree(theme_a_unfocused_pressed_close);
-    RrAppearanceFree(theme_a_focused_unpressed_desk);
-    RrAppearanceFree(theme_a_focused_pressed_desk);
-    RrAppearanceFree(theme_a_unfocused_unpressed_desk);
-    RrAppearanceFree(theme_a_unfocused_pressed_desk);
-    RrAppearanceFree(theme_a_focused_unpressed_shade);
-    RrAppearanceFree(theme_a_focused_pressed_shade);
-    RrAppearanceFree(theme_a_unfocused_unpressed_shade);
-    RrAppearanceFree(theme_a_unfocused_pressed_shade);
-    RrAppearanceFree(theme_a_focused_unpressed_iconify);
-    RrAppearanceFree(theme_a_focused_pressed_iconify);
-    RrAppearanceFree(theme_a_unfocused_unpressed_iconify);
-    RrAppearanceFree(theme_a_unfocused_pressed_iconify);
-    RrAppearanceFree(theme_a_focused_grip);
-    RrAppearanceFree(theme_a_unfocused_grip);
-    RrAppearanceFree(theme_a_focused_title);
-    RrAppearanceFree(theme_a_unfocused_title);
-    RrAppearanceFree(theme_a_focused_label);
-    RrAppearanceFree(theme_a_unfocused_label);
-    RrAppearanceFree(theme_a_icon);
-    RrAppearanceFree(theme_a_focused_handle);
-    RrAppearanceFree(theme_a_unfocused_handle);
-    RrAppearanceFree(theme_a_menu);
-    RrAppearanceFree(theme_a_menu_title);
-    RrAppearanceFree(theme_a_menu_item);
-    RrAppearanceFree(theme_a_menu_disabled);
-    RrAppearanceFree(theme_a_menu_hilite);
-    RrAppearanceFree(theme_app_hilite_bg);
-    RrAppearanceFree(theme_app_unhilite_bg);
-    RrAppearanceFree(theme_app_hilite_label);
-    RrAppearanceFree(theme_app_unhilite_label);
-    RrAppearanceFree(theme_app_icon);
+    if (theme) {
+        g_free(theme->name);
+
+        RrColorFree(theme->b_color);
+        RrColorFree(theme->cb_unfocused_color);
+        RrColorFree(theme->cb_focused_color);
+        RrColorFree(theme->title_unfocused_color);
+        RrColorFree(theme->title_focused_color);
+        RrColorFree(theme->titlebut_unfocused_color);
+        RrColorFree(theme->titlebut_focused_color);
+        RrColorFree(theme->menu_color);
+        RrColorFree(theme->menu_title_color);
+        RrColorFree(theme->menu_disabled_color);
+        RrColorFree(theme->menu_hilite_color);
+
+        RrPixmapMaskFree(theme->max_set_mask);
+        RrPixmapMaskFree(theme->max_unset_mask);
+        RrPixmapMaskFree(theme->desk_set_mask);
+        RrPixmapMaskFree(theme->desk_unset_mask);
+        RrPixmapMaskFree(theme->shade_set_mask);
+        RrPixmapMaskFree(theme->shade_unset_mask);
+        RrPixmapMaskFree(theme->iconify_mask);
+        RrPixmapMaskFree(theme->close_mask);
+
+        font_close(theme->winfont);
+        font_close(theme->mtitlefont);
+        font_close(theme->mfont);
+
+        g_free(theme->title_layout);
+
+        RrAppearanceFree(theme->a_focused_unpressed_max);
+        RrAppearanceFree(theme->a_focused_pressed_max);
+        RrAppearanceFree(theme->a_focused_pressed_set_max);
+        RrAppearanceFree(theme->a_unfocused_unpressed_max);
+        RrAppearanceFree(theme->a_unfocused_pressed_max);
+        RrAppearanceFree(theme->a_unfocused_pressed_set_max);
+        RrAppearanceFree(theme->a_focused_unpressed_close);
+        RrAppearanceFree(theme->a_focused_pressed_close);
+        RrAppearanceFree(theme->a_unfocused_unpressed_close);
+        RrAppearanceFree(theme->a_unfocused_pressed_close);
+        RrAppearanceFree(theme->a_focused_unpressed_desk);
+        RrAppearanceFree(theme->a_focused_pressed_desk);
+        RrAppearanceFree(theme->a_unfocused_unpressed_desk);
+        RrAppearanceFree(theme->a_unfocused_pressed_desk);
+        RrAppearanceFree(theme->a_focused_unpressed_shade);
+        RrAppearanceFree(theme->a_focused_pressed_shade);
+        RrAppearanceFree(theme->a_unfocused_unpressed_shade);
+        RrAppearanceFree(theme->a_unfocused_pressed_shade);
+        RrAppearanceFree(theme->a_focused_unpressed_iconify);
+        RrAppearanceFree(theme->a_focused_pressed_iconify);
+        RrAppearanceFree(theme->a_unfocused_unpressed_iconify);
+        RrAppearanceFree(theme->a_unfocused_pressed_iconify);
+        RrAppearanceFree(theme->a_focused_grip);
+        RrAppearanceFree(theme->a_unfocused_grip);
+        RrAppearanceFree(theme->a_focused_title);
+        RrAppearanceFree(theme->a_unfocused_title);
+        RrAppearanceFree(theme->a_focused_label);
+        RrAppearanceFree(theme->a_unfocused_label);
+        RrAppearanceFree(theme->a_icon);
+        RrAppearanceFree(theme->a_focused_handle);
+        RrAppearanceFree(theme->a_unfocused_handle);
+        RrAppearanceFree(theme->a_menu);
+        RrAppearanceFree(theme->a_menu_title);
+        RrAppearanceFree(theme->a_menu_item);
+        RrAppearanceFree(theme->a_menu_disabled);
+        RrAppearanceFree(theme->a_menu_hilite);
+        RrAppearanceFree(theme->app_hilite_bg);
+        RrAppearanceFree(theme->app_unhilite_bg);
+        RrAppearanceFree(theme->app_hilite_label);
+        RrAppearanceFree(theme->app_unhilite_label);
+        RrAppearanceFree(theme->app_icon);
+    }
 }
 
 static XrmDatabase loaddb(char *theme)
@@ -329,7 +788,7 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst,
 }
 
 static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
-                           gchar *rname, gchar *theme,
+                          gchar *rname, gchar *theme,
                           RrPixmapMask **value)
 {
     gboolean ret = FALSE;
@@ -495,535 +954,3 @@ static void set_default_appearance(RrAppearance *a)
     a->surface.primary = RrColorNew(a->inst, 0, 0, 0);
     a->surface.secondary = RrColorNew(a->inst, 0, 0, 0);
 }
-
-gchar *theme_load(gchar *theme)
-{
-    XrmDatabase db = NULL;
-    gchar *loaded = NULL;
-    RrJustify winjust, mtitlejust, mjust;
-    gchar *str;
-    gchar *font_str;
-    const RrInstance *inst = theme_inst;
-
-    if (theme) {
-	db = loaddb(theme);
-        if (db == NULL) {
-	    g_warning("Failed to load the theme '%s'", theme);
-	    g_message("Falling back to the default: '%s'", DEFAULT_THEME);
-	} else
-            loaded = g_strdup(theme);
-    }
-    if (db == NULL) {
-	db = loaddb(DEFAULT_THEME);
-	if (db == NULL) {
-	    g_warning("Failed to load the theme '%s'.", DEFAULT_THEME);
-	    return NULL;
-	} else
-            loaded = g_strdup(DEFAULT_THEME);
-    }
-
-    /* load the font stuff */
-    font_str = "arial:bold:pixelsize=10";
-
-    theme_winfont_shadow = FALSE;
-    if (read_string(db, "window.xft.flags", &str)) {
-        if (g_strrstr(str, "shadow"))
-            theme_winfont_shadow = TRUE;
-        g_free(str);
-    }
- 
-    if (!read_int(db, "window.xft.shadow.offset",
-                  &theme_winfont_shadow_offset))
-        theme_winfont_shadow_offset = 1;
-    if (!read_int(db, "window.xft.shadow.tint",
-                  &theme_winfont_shadow_tint) ||
-        theme_winfont_shadow_tint < 100 || theme_winfont_shadow_tint > 100)
-        theme_winfont_shadow_tint = 25;
-
-    theme_winfont = font_open(font_str);
-    theme_winfont_height = font_height(theme_winfont, theme_winfont_shadow,
-                                       theme_winfont_shadow_offset);
-
-    winjust = RR_JUSTIFY_LEFT;
-    if (read_string(db, "window.justify", &str)) {
-        if (!g_ascii_strcasecmp(str, "right"))
-            winjust = RR_JUSTIFY_RIGHT;
-        else if (!g_ascii_strcasecmp(str, "center"))
-            winjust = RR_JUSTIFY_CENTER;
-        g_free(str);
-    }
-
-    font_str = "arial-10:bold";
-
-    theme_mtitlefont_shadow = FALSE;
-    if (read_string(db, "menu.title.xft.flags", &str)) {
-        if (g_strrstr(str, "shadow"))
-            theme_mtitlefont_shadow = TRUE;
-        g_free(str);
-    }
- 
-    if (!read_int(db, "menu.title.xft.shadow.offset",
-                  &theme_mtitlefont_shadow_offset))
-        theme_mtitlefont_shadow_offset = 1;
-    if (!read_int(db, "menu.title.xft.shadow.tint",
-                  &theme_mtitlefont_shadow_tint) ||
-        theme_mtitlefont_shadow_tint < 100 ||
-        theme_mtitlefont_shadow_tint > 100)
-        theme_mtitlefont_shadow_tint = 25;
-
-    theme_mtitlefont = font_open(font_str);
-    theme_mtitlefont_height = font_height(theme_mtitlefont,
-                                          theme_mtitlefont_shadow,
-                                          theme_mtitlefont_shadow_offset);
-
-    mtitlejust = RR_JUSTIFY_LEFT;
-    if (read_string(db, "menu.title.justify", &str)) {
-        if (!g_ascii_strcasecmp(str, "right"))
-            mtitlejust = RR_JUSTIFY_RIGHT;
-        else if (!g_ascii_strcasecmp(str, "center"))
-            mtitlejust = RR_JUSTIFY_CENTER;
-        g_free(str);
-    }
-
-    font_str = "arial-8";
-
-    theme_mfont_shadow = FALSE;
-    if (read_string(db, "menu.frame.xft.flags", &str)) {
-        if (g_strrstr(str, "shadow"))
-            theme_mfont_shadow = TRUE;
-        g_free(str);
-    }
- 
-    if (!read_int(db, "menu.frame.xft.shadow.offset",
-                  &theme_mfont_shadow_offset))
-        theme_mfont_shadow_offset = 1;
-    if (!read_int(db, "menu.frame.xft.shadow.tint",
-                  &theme_mfont_shadow_tint) ||
-        theme_mfont_shadow_tint < 100 ||
-        theme_mfont_shadow_tint > 100)
-        theme_mfont_shadow_tint = 25;
-
-    theme_mfont = font_open(font_str);
-    theme_mfont_height = font_height(theme_mfont, theme_mfont_shadow,
-                                     theme_mfont_shadow_offset);
-
-    mjust = RR_JUSTIFY_LEFT;
-    if (read_string(db, "menu.frame.justify", &str)) {
-        if (!g_ascii_strcasecmp(str, "right"))
-            mjust = RR_JUSTIFY_RIGHT;
-        else if (!g_ascii_strcasecmp(str, "center"))
-            mjust = RR_JUSTIFY_CENTER;
-        g_free(str);
-    }
-
-    /* load the title layout */
-    theme_title_layout = g_strdup("NLIMC");
-
-    if (!read_int(db, "handleWidth", &theme_handle_height) ||
-	theme_handle_height < 0 || theme_handle_height > 100)
-        theme_handle_height = 6;
-    if (!read_int(db, "bevelWidth", &theme_bevel) ||
-	theme_bevel <= 0 || theme_bevel > 100) theme_bevel = 3;
-    if (!read_int(db, "borderWidth", &theme_bwidth) ||
-	theme_bwidth < 0 || theme_bwidth > 100) theme_bwidth = 1;
-    if (!read_int(db, "frameWidth", &theme_cbwidth) ||
-	theme_cbwidth < 0 || theme_cbwidth > 100) theme_cbwidth = theme_bevel;
-
-    /* load colors */
-    if (!read_color(db, inst,
-                    "borderColor", &theme_b_color))
-	theme_b_color = RrColorNew(inst, 0, 0, 0);
-    if (!read_color(db, inst,
-                    "window.frame.focusColor", &theme_cb_focused_color))
-	theme_cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
-    if (!read_color(db, inst,
-                    "window.frame.unfocusColor",&theme_cb_unfocused_color))
-	theme_cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
-    if (!read_color(db, inst,
-                    "window.label.focus.textColor",
-                    &theme_title_focused_color))
-	theme_title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0);
-    if (!read_color(db, inst,
-                    "window.label.unfocus.textColor",
-                    &theme_title_unfocused_color))
-	theme_title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
-    if (!read_color(db, inst,
-                    "window.button.focus.picColor",
-                    &theme_titlebut_focused_color))
-	theme_titlebut_focused_color = RrColorNew(inst, 0, 0, 0);
-    if (!read_color(db, inst,
-                    "window.button.unfocus.picColor",
-                    &theme_titlebut_unfocused_color))
-	theme_titlebut_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
-    if (!read_color(db, inst,
-                    "menu.title.textColor", &theme_menu_title_color))
-        theme_menu_title_color = RrColorNew(inst, 0, 0, 0);
-    if (!read_color(db, inst,
-                    "menu.frame.textColor", &theme_menu_color))
-        theme_menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
-    if (!read_color(db, inst,
-                    "menu.frame.disableColor", &theme_menu_disabled_color))
-        theme_menu_disabled_color = RrColorNew(inst, 0, 0, 0);
-    if (!read_color(db, inst,
-                    "menu.hilite.textColor", &theme_menu_hilite_color))
-        theme_menu_hilite_color = RrColorNew(inst, 0, 0, 0);
-
-    if (read_mask(db, inst,
-                  "window.button.max.mask", theme, &theme_max_unset_mask)){
-        if (!read_mask(db, inst,
-                       "window.button.max.toggled.mask", theme,
-                       &theme_max_set_mask)) {
-            theme_max_set_mask = RrPixmapMaskCopy(theme_max_unset_mask);
-        }
-    } else {
-        {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
-            theme_max_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-        {
-            char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
-            theme_max_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-    }
-
-    if (!read_mask(db, inst,
-                   "window.button.icon.mask", theme,
-                   &theme_iconify_mask)) {
-        char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
-        theme_iconify_mask = RrPixmapMaskNew(inst, 7, 7, data);
-    }
-
-    if (read_mask(db, inst,
-                  "window.button.stick.mask", theme,
-                   &theme_desk_unset_mask)) {
-        if (!read_mask(db, inst, "window.button.stick.toggled.mask", theme,
-                       &theme_desk_set_mask)) {
-            theme_desk_set_mask =
-                RrPixmapMaskCopy(theme_desk_unset_mask);
-        }
-    } else {
-        {
-            char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
-            theme_desk_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-        {
-            char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
-            theme_desk_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-    }
-
-    if (read_mask(db, inst, "window.button.shade.mask", theme,
-                   &theme_shade_unset_mask)) {
-        if (!read_mask(db, inst, "window.button.shade.toggled.mask", theme,
-                       &theme_shade_set_mask)) {
-            theme_shade_set_mask =
-                RrPixmapMaskCopy(theme_shade_unset_mask);
-        }
-    } else {
-        {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
-            theme_shade_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-        {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
-            theme_shade_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-    }
-
-    if (!read_mask(db, inst, "window.button.close.mask", theme,
-                   &theme_close_mask)) {
-        char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
-        theme_close_mask = RrPixmapMaskNew(inst, 7, 7, data);
-    }        
-
-    /* read the decoration textures */
-    if (!read_appearance(db, inst,
-                         "window.title.focus", theme_a_focused_title))
-	set_default_appearance(theme_a_focused_title);
-    if (!read_appearance(db, inst,
-                         "window.title.unfocus", theme_a_unfocused_title))
-	set_default_appearance(theme_a_unfocused_title);
-    if (!read_appearance(db, inst,
-                         "window.label.focus", theme_a_focused_label))
-	set_default_appearance(theme_a_focused_label);
-    if (!read_appearance(db, inst,
-                         "window.label.unfocus", theme_a_unfocused_label))
-	set_default_appearance(theme_a_unfocused_label);
-    if (!read_appearance(db, inst,
-                         "window.handle.focus", theme_a_focused_handle))
-	set_default_appearance(theme_a_focused_handle);
-    if (!read_appearance(db, inst,
-                         "window.handle.unfocus",theme_a_unfocused_handle))
-	set_default_appearance(theme_a_unfocused_handle);
-    if (!read_appearance(db, inst,
-                         "window.grip.focus", theme_a_focused_grip))
-	set_default_appearance(theme_a_focused_grip);
-    if (!read_appearance(db, inst,
-                         "window.grip.unfocus", theme_a_unfocused_grip))
-	set_default_appearance(theme_a_unfocused_grip);
-    if (!read_appearance(db, inst,
-                         "menu.frame", theme_a_menu))
-	set_default_appearance(theme_a_menu);
-    if (!read_appearance(db, inst,
-                         "menu.title", theme_a_menu_title))
-	set_default_appearance(theme_a_menu_title);
-    if (!read_appearance(db, inst,
-                         "menu.hilite", theme_a_menu_hilite))
-	set_default_appearance(theme_a_menu_hilite);
-
-    /* read the appearances for rendering non-decorations */
-    if (!read_appearance(db, inst,
-                         "window.title.focus", theme_app_hilite_bg))
-        set_default_appearance(theme_app_hilite_bg);
-    if (!read_appearance(db, inst,
-                         "window.label.focus", theme_app_hilite_label))
-        set_default_appearance(theme_app_hilite_label);
-    if (!read_appearance(db, inst,
-                         "window.title.unfocus", theme_app_unhilite_bg))
-        set_default_appearance(theme_app_unhilite_bg);
-    if (!read_appearance(db, inst,
-                         "window.label.unfocus", theme_app_unhilite_label))
-        set_default_appearance(theme_app_unhilite_label);
-
-    /* read buttons textures */
-    if (!read_appearance(db, inst,
-                         "window.button.pressed.focus",
-			 theme_a_focused_pressed_max))
-	if (!read_appearance(db, inst,
-                             "window.button.pressed",
-                             theme_a_focused_pressed_max))
-	    set_default_appearance(theme_a_focused_pressed_max);
-    if (!read_appearance(db, inst,
-                         "window.button.pressed.unfocus",
-			 theme_a_unfocused_pressed_max))
-	if (!read_appearance(db, inst,
-                             "window.button.pressed",
-			     theme_a_unfocused_pressed_max))
-	    set_default_appearance(theme_a_unfocused_pressed_max);
-    if (!read_appearance(db, inst,
-                         "window.button.focus",
-			 theme_a_focused_unpressed_max))
-	set_default_appearance(theme_a_focused_unpressed_max);
-    if (!read_appearance(db, inst,
-                         "window.button.unfocus",
-			 theme_a_unfocused_unpressed_max))
-	set_default_appearance(theme_a_unfocused_unpressed_max);
-
-    theme_a_unfocused_unpressed_close =
-        RrAppearanceCopy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_close =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_close =
-        RrAppearanceCopy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_close =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_unfocused_unpressed_desk =
-        RrAppearanceCopy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_desk =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_unfocused_pressed_set_desk =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_desk =
-        RrAppearanceCopy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_desk =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_focused_pressed_set_desk =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_unfocused_unpressed_shade =
-        RrAppearanceCopy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_shade =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_unfocused_pressed_set_shade =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_shade =
-        RrAppearanceCopy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_shade =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_focused_pressed_set_shade =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_unfocused_unpressed_iconify =
-        RrAppearanceCopy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_iconify =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_iconify =
-        RrAppearanceCopy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_iconify =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_unfocused_pressed_set_max =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_focused_pressed_set_max =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-
-    theme_a_icon->surface.grad = RR_SURFACE_PARENTREL;
-
-    /* set up the textures */
-    theme_a_focused_label->texture[0].type = 
-        theme_app_hilite_label->texture[0].type = RR_TEXTURE_TEXT;
-    theme_a_focused_label->texture[0].data.text.justify = winjust;
-    theme_app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
-    theme_a_focused_label->texture[0].data.text.font =
-        theme_app_hilite_label->texture[0].data.text.font = theme_winfont;
-    theme_a_focused_label->texture[0].data.text.shadow =
-        theme_app_hilite_label->texture[0].data.text.shadow =
-        theme_winfont_shadow;
-    theme_a_focused_label->texture[0].data.text.offset =
-        theme_app_hilite_label->texture[0].data.text.offset =
-        theme_winfont_shadow_offset;
-    theme_a_focused_label->texture[0].data.text.tint =
-        theme_app_hilite_label->texture[0].data.text.tint =
-        theme_winfont_shadow_tint;
-    theme_a_focused_label->texture[0].data.text.color =
-        theme_app_hilite_label->texture[0].data.text.color =
-        theme_title_focused_color;
-
-    theme_a_unfocused_label->texture[0].type =
-        theme_app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT;
-    theme_a_unfocused_label->texture[0].data.text.justify = winjust;
-    theme_app_unhilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
-    theme_a_unfocused_label->texture[0].data.text.font =
-        theme_app_unhilite_label->texture[0].data.text.font = theme_winfont;
-    theme_a_unfocused_label->texture[0].data.text.shadow =
-        theme_app_unhilite_label->texture[0].data.text.shadow =
-        theme_winfont_shadow;
-    theme_a_unfocused_label->texture[0].data.text.offset =
-        theme_app_unhilite_label->texture[0].data.text.offset =
-        theme_winfont_shadow_offset;
-    theme_a_unfocused_label->texture[0].data.text.tint =
-        theme_app_unhilite_label->texture[0].data.text.tint =
-        theme_winfont_shadow_tint;
-    theme_a_unfocused_label->texture[0].data.text.color =
-        theme_app_unhilite_label->texture[0].data.text.color =
-        theme_title_unfocused_color;
-
-    theme_a_menu_title->texture[0].type = RR_TEXTURE_TEXT;
-    theme_a_menu_title->texture[0].data.text.justify = mtitlejust;
-    theme_a_menu_title->texture[0].data.text.font = theme_mtitlefont;
-    theme_a_menu_title->texture[0].data.text.shadow = theme_mtitlefont_shadow;
-    theme_a_menu_title->texture[0].data.text.offset =
-        theme_mtitlefont_shadow_offset;
-    theme_a_menu_title->texture[0].data.text.tint =
-        theme_mtitlefont_shadow_tint;
-    theme_a_menu_title->texture[0].data.text.color = theme_menu_title_color;
-
-    theme_a_menu_item->surface.grad = 
-        theme_a_menu_disabled->surface.grad =
-        theme_app_icon->surface.grad = RR_SURFACE_PARENTREL;
-
-    theme_a_menu_item->texture[0].type =
-        theme_a_menu_disabled->texture[0].type = 
-        theme_a_menu_hilite->texture[0].type = RR_TEXTURE_TEXT;
-    theme_a_menu_item->texture[0].data.text.justify = 
-        theme_a_menu_disabled->texture[0].data.text.justify = 
-        theme_a_menu_hilite->texture[0].data.text.justify = mjust;
-    theme_a_menu_item->texture[0].data.text.font =
-        theme_a_menu_disabled->texture[0].data.text.font =
-        theme_a_menu_hilite->texture[0].data.text.font = theme_mfont;
-    theme_a_menu_item->texture[0].data.text.shadow = 
-        theme_a_menu_disabled->texture[0].data.text.shadow = 
-        theme_a_menu_hilite->texture[0].data.text.shadow = theme_mfont_shadow;
-    theme_a_menu_item->texture[0].data.text.offset =
-        theme_a_menu_disabled->texture[0].data.text.offset = 
-        theme_a_menu_hilite->texture[0].data.text.offset = 
-        theme_mfont_shadow_offset;
-    theme_a_menu_item->texture[0].data.text.tint =
-        theme_a_menu_disabled->texture[0].data.text.tint =
-        theme_a_menu_hilite->texture[0].data.text.tint =
-        theme_mfont_shadow_tint;
-    theme_a_menu_item->texture[0].data.text.color = theme_menu_color;
-    theme_a_menu_disabled->texture[0].data.text.color =
-        theme_menu_disabled_color;
-    theme_a_menu_hilite->texture[0].data.text.color =  theme_menu_hilite_color;
-
-    theme_a_focused_unpressed_max->texture[0].type = 
-        theme_a_focused_pressed_max->texture[0].type = 
-        theme_a_focused_pressed_set_max->texture[0].type =  
-        theme_a_unfocused_unpressed_max->texture[0].type = 
-        theme_a_unfocused_pressed_max->texture[0].type = 
-        theme_a_unfocused_pressed_set_max->texture[0].type = 
-        theme_a_focused_unpressed_close->texture[0].type = 
-        theme_a_focused_pressed_close->texture[0].type = 
-        theme_a_unfocused_unpressed_close->texture[0].type = 
-        theme_a_unfocused_pressed_close->texture[0].type = 
-        theme_a_focused_unpressed_desk->texture[0].type = 
-        theme_a_focused_pressed_desk->texture[0].type = 
-        theme_a_focused_pressed_set_desk->texture[0].type = 
-        theme_a_unfocused_unpressed_desk->texture[0].type = 
-        theme_a_unfocused_pressed_desk->texture[0].type = 
-        theme_a_unfocused_pressed_set_desk->texture[0].type = 
-        theme_a_focused_unpressed_shade->texture[0].type = 
-        theme_a_focused_pressed_shade->texture[0].type = 
-        theme_a_focused_pressed_set_shade->texture[0].type = 
-        theme_a_unfocused_unpressed_shade->texture[0].type = 
-        theme_a_unfocused_pressed_shade->texture[0].type = 
-        theme_a_unfocused_pressed_set_shade->texture[0].type = 
-        theme_a_focused_unpressed_iconify->texture[0].type = 
-        theme_a_focused_pressed_iconify->texture[0].type = 
-        theme_a_unfocused_unpressed_iconify->texture[0].type = 
-        theme_a_unfocused_pressed_iconify->texture[0].type = RR_TEXTURE_MASK;
-    theme_a_focused_unpressed_max->texture[0].data.mask.mask = 
-        theme_a_unfocused_unpressed_max->texture[0].data.mask.mask = 
-        theme_a_focused_pressed_max->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_max->texture[0].data.mask.mask =
-        theme_max_unset_mask;
-    theme_a_focused_pressed_set_max->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_set_max->texture[0].data.mask.mask =
-        theme_max_set_mask;
-    theme_a_focused_pressed_close->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_close->texture[0].data.mask.mask =
-        theme_a_focused_unpressed_close->texture[0].data.mask.mask = 
-        theme_a_unfocused_unpressed_close->texture[0].data.mask.mask =
-        theme_close_mask;
-    theme_a_focused_unpressed_desk->texture[0].data.mask.mask = 
-        theme_a_unfocused_unpressed_desk->texture[0].data.mask.mask = 
-        theme_a_focused_pressed_desk->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_desk->texture[0].data.mask.mask =
-        theme_desk_unset_mask;
-    theme_a_focused_pressed_set_desk->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_set_desk->texture[0].data.mask.mask =
-        theme_desk_set_mask;
-    theme_a_focused_unpressed_shade->texture[0].data.mask.mask = 
-        theme_a_unfocused_unpressed_shade->texture[0].data.mask.mask = 
-        theme_a_focused_pressed_shade->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_shade->texture[0].data.mask.mask =
-        theme_shade_unset_mask;
-    theme_a_focused_pressed_set_shade->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_set_shade->texture[0].data.mask.mask =
-        theme_shade_set_mask;
-    theme_a_focused_unpressed_iconify->texture[0].data.mask.mask = 
-        theme_a_unfocused_unpressed_iconify->texture[0].data.mask.mask = 
-        theme_a_focused_pressed_iconify->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_iconify->texture[0].data.mask.mask =
-        theme_iconify_mask;
-    theme_a_focused_unpressed_max->texture[0].data.mask.color = 
-        theme_a_focused_pressed_max->texture[0].data.mask.color = 
-        theme_a_focused_pressed_set_max->texture[0].data.mask.color = 
-        theme_a_focused_unpressed_close->texture[0].data.mask.color = 
-        theme_a_focused_pressed_close->texture[0].data.mask.color = 
-        theme_a_focused_unpressed_desk->texture[0].data.mask.color = 
-        theme_a_focused_pressed_desk->texture[0].data.mask.color = 
-        theme_a_focused_pressed_set_desk->texture[0].data.mask.color = 
-        theme_a_focused_unpressed_shade->texture[0].data.mask.color = 
-        theme_a_focused_pressed_shade->texture[0].data.mask.color = 
-        theme_a_focused_pressed_set_shade->texture[0].data.mask.color = 
-        theme_a_focused_unpressed_iconify->texture[0].data.mask.color = 
-        theme_a_focused_pressed_iconify->texture[0].data.mask.color =
-        theme_titlebut_focused_color;
-    theme_a_unfocused_unpressed_max->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_max->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_set_max->texture[0].data.mask.color = 
-        theme_a_unfocused_unpressed_close->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_close->texture[0].data.mask.color = 
-        theme_a_unfocused_unpressed_desk->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_desk->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_set_desk->texture[0].data.mask.color = 
-        theme_a_unfocused_unpressed_shade->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_shade->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_set_shade->texture[0].data.mask.color = 
-        theme_a_unfocused_unpressed_iconify->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_iconify->texture[0].data.mask.color =
-        theme_titlebut_unfocused_color;
-
-    XrmDestroyDatabase(db);
-
-    return loaded;
-}
diff --git a/render/theme.h b/render/theme.h
index 6ffcd24b..a60d5cac 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -6,87 +6,117 @@
 #include "font.h"
 #include "mask.h"
 
-extern gint theme_bevel;
-extern gint theme_handle_height;
-extern gint theme_bwidth;
-extern gint theme_cbwidth;
+typedef struct _RrTheme RrTheme;
 
-#define theme_label_height (theme_winfont_height)
-#define theme_title_height (theme_label_height + theme_bevel * 2)
-#define theme_button_size  (theme_label_height - 2)
-#define theme_grip_width   (theme_button_size * 2)
+struct _RrTheme {
+    gchar *name;
 
-extern color_rgb *theme_b_color;
-extern color_rgb *theme_cb_focused_color;
-extern color_rgb *theme_cb_unfocused_color;
-extern color_rgb *theme_title_focused_color;
-extern color_rgb *theme_title_unfocused_color;
-extern color_rgb *theme_titlebut_focused_color;
-extern color_rgb *theme_titlebut_unfocused_color;
+    const RrInstance *inst;
 
-extern gint theme_winfont_height;
-extern RrFont *theme_winfont;
-extern gchar *theme_title_layout;
+    /* style settings - geometry */
+    gint bevel;
+    gint handle_height;
+    gint bwidth;
+    gint cbwidth;
+    gint label_height;
+    gint title_height;
+    gint button_size;
+    gint grip_width;
 
-extern RrPixmapMask *theme_max_set_mask;
-extern RrPixmapMask *theme_max_unset_mask;
-extern RrPixmapMask *theme_iconify_mask;
-extern RrPixmapMask *theme_desk_set_mask;
-extern RrPixmapMask *theme_desk_unset_mask;
-extern RrPixmapMask *theme_shade_set_mask;
-extern RrPixmapMask *theme_shade_unset_mask;
-extern RrPixmapMask *theme_close_mask;
+    /* style settings - colors */
+    color_rgb *b_color;
+    color_rgb *cb_focused_color;
+    color_rgb *cb_unfocused_color;
+    color_rgb *title_focused_color;
+    color_rgb *title_unfocused_color;
+    color_rgb *titlebut_focused_color;
+    color_rgb *titlebut_unfocused_color;
+    color_rgb *menu_title_color;
+    color_rgb *menu_color;
+    color_rgb *menu_disabled_color;
+    color_rgb *menu_hilite_color;
 
-extern RrAppearance *theme_a_focused_unpressed_max;
-extern RrAppearance *theme_a_focused_pressed_max;
-extern RrAppearance *theme_a_focused_pressed_set_max;
-extern RrAppearance *theme_a_unfocused_unpressed_max;
-extern RrAppearance *theme_a_unfocused_pressed_max;
-extern RrAppearance *theme_a_unfocused_pressed_set_max;
-extern RrAppearance *theme_a_focused_unpressed_close;
-extern RrAppearance *theme_a_focused_pressed_close;
-extern RrAppearance *theme_a_unfocused_unpressed_close;
-extern RrAppearance *theme_a_unfocused_pressed_close;
-extern RrAppearance *theme_a_focused_unpressed_desk;
-extern RrAppearance *theme_a_focused_pressed_desk;
-extern RrAppearance *theme_a_focused_pressed_set_desk;
-extern RrAppearance *theme_a_unfocused_unpressed_desk;
-extern RrAppearance *theme_a_unfocused_pressed_desk;
-extern RrAppearance *theme_a_unfocused_pressed_set_desk;
-extern RrAppearance *theme_a_focused_unpressed_shade;
-extern RrAppearance *theme_a_focused_pressed_shade;
-extern RrAppearance *theme_a_focused_pressed_set_shade;
-extern RrAppearance *theme_a_unfocused_unpressed_shade;
-extern RrAppearance *theme_a_unfocused_pressed_shade;
-extern RrAppearance *theme_a_unfocused_pressed_set_shade;
-extern RrAppearance *theme_a_focused_unpressed_iconify;
-extern RrAppearance *theme_a_focused_pressed_iconify;
-extern RrAppearance *theme_a_unfocused_unpressed_iconify;
-extern RrAppearance *theme_a_unfocused_pressed_iconify;
-extern RrAppearance *theme_a_focused_grip;
-extern RrAppearance *theme_a_unfocused_grip;
-extern RrAppearance *theme_a_focused_title;
-extern RrAppearance *theme_a_unfocused_title;
-extern RrAppearance *theme_a_focused_label;
-extern RrAppearance *theme_a_unfocused_label;
-extern RrAppearance *theme_a_icon;
-extern RrAppearance *theme_a_focused_handle;
-extern RrAppearance *theme_a_unfocused_handle;
-extern RrAppearance *theme_a_menu_title;
-extern RrAppearance *theme_a_menu;
-extern RrAppearance *theme_a_menu_item;
-extern RrAppearance *theme_a_menu_disabled;
-extern RrAppearance *theme_a_menu_hilite;
+    /* style settings - fonts */
+    gint winfont_height;
+    RrFont *winfont;
+    gboolean winfont_shadow;
+    gint winfont_shadow_offset;
+    gint winfont_shadow_tint;
+    gint mtitlefont_height;
+    RrFont *mtitlefont;
+    gboolean mtitlefont_shadow;
+    gint mtitlefont_shadow_offset;
+    gint mtitlefont_shadow_tint;
+    gint mfont_height;
+    RrFont *mfont;
+    gboolean mfont_shadow;
+    gint mfont_shadow_offset;
+    gint mfont_shadow_tint;
 
-extern RrAppearance *theme_app_hilite_bg;
-extern RrAppearance *theme_app_unhilite_bg;
-extern RrAppearance *theme_app_hilite_label;
-extern RrAppearance *theme_app_unhilite_label;
-extern RrAppearance *theme_app_icon;
+    /* style settings - title layout */
+    gchar *title_layout;
 
-void theme_startup(const RrInstance *inst);
-void theme_shutdown();
+    /* style settings - masks */
+    RrPixmapMask *max_set_mask;
+    RrPixmapMask *max_unset_mask;
+    RrPixmapMask *iconify_mask;
+    RrPixmapMask *desk_set_mask;
+    RrPixmapMask *desk_unset_mask;
+    RrPixmapMask *shade_set_mask;
+    RrPixmapMask *shade_unset_mask;
+    RrPixmapMask *close_mask;
 
-gchar *theme_load(gchar *theme);
+    /* global appearances */
+    RrAppearance *a_focused_unpressed_max;
+    RrAppearance *a_focused_pressed_max;
+    RrAppearance *a_focused_pressed_set_max;
+    RrAppearance *a_unfocused_unpressed_max;
+    RrAppearance *a_unfocused_pressed_max;
+    RrAppearance *a_unfocused_pressed_set_max;
+    RrAppearance *a_focused_unpressed_close;
+    RrAppearance *a_focused_pressed_close;
+    RrAppearance *a_unfocused_unpressed_close;
+    RrAppearance *a_unfocused_pressed_close;
+    RrAppearance *a_focused_unpressed_desk;
+    RrAppearance *a_focused_pressed_desk;
+    RrAppearance *a_focused_pressed_set_desk;
+    RrAppearance *a_unfocused_unpressed_desk;
+    RrAppearance *a_unfocused_pressed_desk;
+    RrAppearance *a_unfocused_pressed_set_desk;
+    RrAppearance *a_focused_unpressed_shade;
+    RrAppearance *a_focused_pressed_shade;
+    RrAppearance *a_focused_pressed_set_shade;
+    RrAppearance *a_unfocused_unpressed_shade;
+    RrAppearance *a_unfocused_pressed_shade;
+    RrAppearance *a_unfocused_pressed_set_shade;
+    RrAppearance *a_focused_unpressed_iconify;
+    RrAppearance *a_focused_pressed_iconify;
+    RrAppearance *a_unfocused_unpressed_iconify;
+    RrAppearance *a_unfocused_pressed_iconify;
+    RrAppearance *a_focused_grip;
+    RrAppearance *a_unfocused_grip;
+    RrAppearance *a_focused_title;
+    RrAppearance *a_unfocused_title;
+    RrAppearance *a_focused_label;
+    RrAppearance *a_unfocused_label;
+    /* always parentrelative, so no focused/unfocused */
+    RrAppearance *a_icon;
+    RrAppearance *a_focused_handle;
+    RrAppearance *a_unfocused_handle;
+    RrAppearance *a_menu_title;
+    RrAppearance *a_menu;
+    RrAppearance *a_menu_item;
+    RrAppearance *a_menu_disabled;
+    RrAppearance *a_menu_hilite;
+
+    RrAppearance *app_hilite_bg;
+    RrAppearance *app_unhilite_bg;
+    RrAppearance *app_hilite_label;
+    RrAppearance *app_unhilite_label;
+    RrAppearance *app_icon;
+};
+
+RrTheme *RrThemeNew(const RrInstance *inst, gchar *theme);
+void RrThemeFree(RrTheme *theme);
 
 #endif