add copyright headers, adjust --version output to include copyright, and --help outpu...

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index e718eea79cc66445abe2a5d81a4e0700e693f1c1..76289a782de8b4bfbdf1e8cdb0ee2f4ff5367fee 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -1,207 +1,1121 @@
+/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+
+   theme.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "render.h"
 #include "color.h"
 #include "font.h"
 #include "mask.h"
+#include "theme.h"
+#include "icon.h"
+#include "parser/parse.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+static XrmDatabase loaddb(RrTheme *theme, char *name);
+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, RrColor **value);
+static gboolean read_mask(const RrInstance *inst,
+                          gchar *maskname, RrTheme *theme,
+                          RrPixmapMask **value);
+static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
+                                gchar *rname, RrAppearance *value,
+                                gboolean allow_trans);
+static RrPixel32* read_c_image(gint width, gint height, const guint8 *data);
+static void set_default_appearance(RrAppearance *a);
 
-/* style settings - geometry */
-int theme_bevel;
-int theme_handle_height;
-int theme_bwidth;
-int 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;
-/* style settings - fonts */
-int theme_winfont_height;
-ObFont *theme_winfont;
-gboolean theme_winfont_shadow;
-int theme_winfont_shadow_offset;
-int theme_winfont_shadow_tint;
-/* style settings - title layout */
-char *theme_title_layout;
-/* style settings - masks */
-pixmap_mask *theme_max_set_mask;
-pixmap_mask *theme_max_unset_mask;
-pixmap_mask *theme_iconify_mask;
-pixmap_mask *theme_desk_set_mask;
-pixmap_mask *theme_desk_unset_mask;
-pixmap_mask *theme_shade_set_mask;
-pixmap_mask *theme_shade_unset_mask;
-pixmap_mask *theme_close_mask;
-
-/* global appearances */
-Appearance *theme_a_focused_unpressed_max;
-Appearance *theme_a_focused_pressed_max;
-Appearance *theme_a_focused_pressed_set_max;
-Appearance *theme_a_unfocused_unpressed_max;
-Appearance *theme_a_unfocused_pressed_max;
-Appearance *theme_a_unfocused_pressed_set_max;
-Appearance *theme_a_focused_unpressed_close;
-Appearance *theme_a_focused_pressed_close;
-Appearance *theme_a_unfocused_unpressed_close;
-Appearance *theme_a_unfocused_pressed_close;
-Appearance *theme_a_focused_unpressed_desk;
-Appearance *theme_a_focused_pressed_desk;
-Appearance *theme_a_focused_pressed_set_desk;
-Appearance *theme_a_unfocused_unpressed_desk;
-Appearance *theme_a_unfocused_pressed_desk;
-Appearance *theme_a_unfocused_pressed_set_desk;
-Appearance *theme_a_focused_unpressed_shade;
-Appearance *theme_a_focused_pressed_shade;
-Appearance *theme_a_focused_pressed_set_shade;
-Appearance *theme_a_unfocused_unpressed_shade;
-Appearance *theme_a_unfocused_pressed_shade;
-Appearance *theme_a_unfocused_pressed_set_shade;
-Appearance *theme_a_focused_unpressed_iconify;
-Appearance *theme_a_focused_pressed_iconify;
-Appearance *theme_a_unfocused_unpressed_iconify;
-Appearance *theme_a_unfocused_pressed_iconify;
-Appearance *theme_a_focused_grip;
-Appearance *theme_a_unfocused_grip;
-Appearance *theme_a_focused_title;
-Appearance *theme_a_unfocused_title;
-Appearance *theme_a_focused_label;
-Appearance *theme_a_unfocused_label;
-Appearance *theme_a_icon; /* always parentrelative, so no focused/unfocused */
-Appearance *theme_a_focused_handle;
-Appearance *theme_a_unfocused_handle;
-
-Appearance *theme_app_hilite_label;
-Appearance *theme_app_unhilite_label;
-
-void theme_startup()
+RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 {
-    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 = NULL;
-    theme_winfont = 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 = appearance_new(Surface_Planar, 1);
-    theme_a_focused_pressed_max = appearance_new(Surface_Planar, 1);
-    theme_a_focused_pressed_set_max = appearance_new(Surface_Planar, 1);
-    theme_a_unfocused_unpressed_max = appearance_new(Surface_Planar, 1);
-    theme_a_unfocused_pressed_max = appearance_new(Surface_Planar, 1);
-    theme_a_unfocused_pressed_set_max = appearance_new(Surface_Planar, 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 = appearance_new(Surface_Planar, 0);
-    theme_a_unfocused_grip = appearance_new(Surface_Planar, 0);
-    theme_a_focused_title = appearance_new(Surface_Planar, 0);
-    theme_a_unfocused_title = appearance_new(Surface_Planar, 0);
-    theme_a_focused_label = appearance_new(Surface_Planar, 1);
-    theme_a_unfocused_label = appearance_new(Surface_Planar, 1);
-    theme_a_icon = appearance_new(Surface_Planar, 1);
-    theme_a_focused_handle = appearance_new(Surface_Planar, 0);
-    theme_a_unfocused_handle = appearance_new(Surface_Planar, 0);
-    theme_app_hilite_label = appearance_new(Surface_Planar, 1);
-    theme_app_unhilite_label = appearance_new(Surface_Planar, 1);
+    XrmDatabase db = NULL;
+    RrJustify winjust, mtitlejust;
+    gchar *str;
+    gchar *font_str;
+    RrTheme *theme;
+
+    theme = g_new0(RrTheme, 1);
+
+    theme->inst = inst;
+
+    theme->show_handle = TRUE;
+
+    theme->a_disabled_focused_max = RrAppearanceNew(inst, 1);
+    theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1);
+    theme->a_hover_focused_max = RrAppearanceNew(inst, 1);
+    theme->a_hover_unfocused_max = RrAppearanceNew(inst, 1);
+    theme->a_toggled_focused_max = RrAppearanceNew(inst, 1);
+    theme->a_toggled_unfocused_max = RrAppearanceNew(inst, 1);
+    theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1);
+    theme->a_focused_pressed_max = RrAppearanceNew(inst, 1);
+    theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1);
+    theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1);
+    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_normal = RrAppearanceNew(inst, 0);
+    theme->a_menu_disabled = RrAppearanceNew(inst, 0);
+    theme->a_menu_selected = RrAppearanceNew(inst, 0);
+    theme->a_menu_text_normal = RrAppearanceNew(inst, 1);
+    theme->a_menu_text_disabled = RrAppearanceNew(inst, 1);
+    theme->a_menu_text_selected = RrAppearanceNew(inst, 1);
+    theme->a_menu_bullet_normal = RrAppearanceNew(inst, 1);
+    theme->a_menu_bullet_selected = RrAppearanceNew(inst, 1);
+    theme->a_clear = RrAppearanceNew(inst, 0);
+    theme->a_clear_tex = RrAppearanceNew(inst, 1);
+
+    theme->app_hilite_bg = RrAppearanceNew(inst, 0);
+    theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
+    theme->app_hilite_fg = RrAppearanceNew(inst, 0);
+    theme->app_unhilite_fg = RrAppearanceNew(inst, 0);
+    theme->app_hilite_label = RrAppearanceNew(inst, 1);
+    theme->app_unhilite_label = RrAppearanceNew(inst, 1);
+
+    if (name) {
+       db = loaddb(theme, name);
+        if (db == NULL) {
+           g_warning("Failed to load the theme '%s'\n"
+                      "Falling back to the default: '%s'",
+                      name, DEFAULT_THEME);
+       } else
+            theme->name = g_path_get_basename(name);
+    }
+    if (db == NULL) {
+       db = loaddb(theme, DEFAULT_THEME);
+       if (db == NULL) {
+           g_warning("Failed to load the theme '%s'.", DEFAULT_THEME);
+           return NULL;
+       } else
+            theme->name = g_path_get_basename(DEFAULT_THEME);
+    }
+
+    /* load the font stuff */
+    if (!read_string(db, "window.active.label.text.font", &font_str))
+        font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50";
+
+    if (!(theme->win_font_focused = RrFontOpen(inst, font_str))) {
+        RrThemeFree(theme);
+        return NULL;
+    }
+    theme->win_font_height = RrFontHeight(theme->win_font_focused);
+
+    if (!read_string(db, "window.inactive.label.text.font", &font_str))
+        /* font_str will already be set to the last one */;
+
+    if (!(theme->win_font_unfocused = RrFontOpen(inst, font_str))) {
+        RrThemeFree(theme);
+        return NULL;
+    }
+    theme->win_font_height = MAX(theme->win_font_height,
+                                RrFontHeight(theme->win_font_unfocused));
+
+    winjust = RR_JUSTIFY_LEFT;
+    if (read_string(db, "window.label.text.justify", &str)) {
+        if (!g_ascii_strcasecmp(str, "right"))
+            winjust = RR_JUSTIFY_RIGHT;
+        else if (!g_ascii_strcasecmp(str, "center"))
+            winjust = RR_JUSTIFY_CENTER;
+    }
+
+    if (!read_string(db, "menu.title.text.font", &font_str))
+        font_str = "arial,sans:bold:pixelsize=12:shadow=y";
+
+    if (!(theme->menu_title_font = RrFontOpen(inst, font_str))) {
+        RrThemeFree(theme);
+        return NULL;
+    }
+    theme->menu_title_font_height = RrFontHeight(theme->menu_title_font);
+
+    mtitlejust = RR_JUSTIFY_LEFT;
+    if (read_string(db, "menu.title.text.justify", &str)) {
+        if (!g_ascii_strcasecmp(str, "right"))
+            mtitlejust = RR_JUSTIFY_RIGHT;
+        else if (!g_ascii_strcasecmp(str, "center"))
+            mtitlejust = RR_JUSTIFY_CENTER;
+    }
+
+    if (!read_string(db, "menu.items.font", &font_str))
+        font_str = "arial,sans:bold:pixelsize=11:shadow=y";
+
+    if (!(theme->menu_font = RrFontOpen(inst, font_str))) {
+        RrThemeFree(theme);
+        return NULL;
+    }
+    theme->menu_font_height = RrFontHeight(theme->menu_font);
+
+    /* load direct dimensions */
+    if (!read_int(db, "menu.overlap", &theme->menu_overlap) ||
+       theme->menu_overlap < 0 || theme->menu_overlap > 20)
+        theme->menu_overlap = 0;
+    if (!read_int(db, "window.handle.width", &theme->handle_height))
+        theme->handle_height = 6;
+    if (!theme->handle_height)
+        theme->show_handle = FALSE;
+    if (theme->handle_height <= 0 || theme->handle_height > 100)
+        theme->handle_height = 6;
+    if (!read_int(db, "padding.width", &theme->padding) ||
+       theme->padding < 0 || theme->padding > 100)
+        theme->padding = 3;
+    if (!read_int(db, "border.width", &theme->bwidth) ||
+       theme->bwidth < 0 || theme->bwidth > 100)
+        theme->bwidth = 1;
+    if (!read_int(db, "window.client.padding.width", &theme->cbwidth) ||
+       theme->cbwidth < 0 || theme->cbwidth > 100)
+        theme->cbwidth = theme->padding;
+
+    /* load colors */
+    if (!read_color(db, inst,
+                    "border.color", &theme->b_color))
+       theme->b_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "window.active.client.color",
+                    &theme->cb_focused_color))
+       theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.inactive.client.color",
+                    &theme->cb_unfocused_color))
+       theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.active.label.text.color",
+                    &theme->title_focused_color))
+       theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0);
+    if (!read_color(db, inst,
+                    "window.inactive.label.text.color",
+                    &theme->title_unfocused_color))
+       theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.active.button.unpressed.image.color",
+                    &theme->titlebut_focused_unpressed_color))
+       theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "window.inactive.button.unpressed.image.color",
+                    &theme->titlebut_unfocused_unpressed_color))
+       theme->titlebut_unfocused_unpressed_color =
+            RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.active.button.pressed.image.color",
+                    &theme->titlebut_focused_pressed_color))
+       theme->titlebut_focused_pressed_color =
+            RrColorNew(inst,
+                       theme->titlebut_focused_unpressed_color->r,
+                       theme->titlebut_focused_unpressed_color->g,
+                       theme->titlebut_focused_unpressed_color->b);
+    if (!read_color(db, inst,
+                    "window.inactive.button.pressed.image.color",
+                    &theme->titlebut_unfocused_pressed_color))
+       theme->titlebut_unfocused_pressed_color =
+            RrColorNew(inst,
+                       theme->titlebut_unfocused_unpressed_color->r,
+                       theme->titlebut_unfocused_unpressed_color->g,
+                       theme->titlebut_unfocused_unpressed_color->b);
+    if (!read_color(db, inst,
+                    "window.active.button.disabled.image.color",
+                    &theme->titlebut_disabled_focused_color))
+       theme->titlebut_disabled_focused_color =
+            RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.inactive.button.disabled.image.color",
+                    &theme->titlebut_disabled_unfocused_color))
+       theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "window.active.button.hover.image.color",
+                    &theme->titlebut_hover_focused_color))
+       theme->titlebut_hover_focused_color =
+            RrColorNew(inst,
+                       theme->titlebut_focused_unpressed_color->r,
+                       theme->titlebut_focused_unpressed_color->g,
+                       theme->titlebut_focused_unpressed_color->b);
+    if (!read_color(db, inst,
+                    "window.inactive.button.hover.image.color",
+                    &theme->titlebut_hover_unfocused_color))
+       theme->titlebut_hover_unfocused_color =
+            RrColorNew(inst,
+                       theme->titlebut_unfocused_unpressed_color->r,
+                       theme->titlebut_unfocused_unpressed_color->g,
+                       theme->titlebut_unfocused_unpressed_color->b);
+    if (!read_color(db, inst,
+                    "window.active.button.toggled.image.color",
+                    &theme->titlebut_toggled_focused_color))
+       theme->titlebut_toggled_focused_color =
+            RrColorNew(inst,
+                       theme->titlebut_focused_pressed_color->r,
+                       theme->titlebut_focused_pressed_color->g,
+                       theme->titlebut_focused_pressed_color->b);
+    if (!read_color(db, inst,
+                    "window.inactive.button.toggled.image.color",
+                    &theme->titlebut_toggled_unfocused_color))
+       theme->titlebut_toggled_unfocused_color =
+            RrColorNew(inst,
+                       theme->titlebut_unfocused_pressed_color->r,
+                       theme->titlebut_unfocused_pressed_color->g,
+                       theme->titlebut_unfocused_pressed_color->b);
+    if (!read_color(db, inst,
+                    "menu.title.text.color", &theme->menu_title_color))
+        theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "menu.items.text.color", &theme->menu_color))
+        theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "menu.items.disabled.text.color",
+                    &theme->menu_disabled_color))
+        theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "menu.items.active.text.color",
+                    &theme->menu_selected_color))
+        theme->menu_selected_color = RrColorNew(inst, 0, 0, 0);
+    
+    if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) {
+        if (!read_mask(inst, "max_pressed.xbm", theme,
+                       &theme->max_pressed_mask)) {
+            theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
+        } 
+        if (!read_mask(inst, "max_toggled.xbm", theme,
+                       &theme->max_toggled_mask)) {
+            theme->max_toggled_mask =
+                RrPixmapMaskCopy(theme->max_pressed_mask);
+        }
+        if (!read_mask(inst, "max_disabled.xbm", theme,
+                       &theme->max_disabled_mask)) {
+            theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
+        } 
+        if (!read_mask(inst, "max_hover.xbm", theme, &theme->max_hover_mask)) {
+            theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
+        }
+   } else {
+        {
+            guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
+            theme->max_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
+        }
+        {
+            guchar data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
+            theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
+        }
+        theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
+        theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
+        theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
+    }
+
+    if (read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) {
+        if (!read_mask(inst, "iconify_pressed.xbm", theme,
+                       &theme->iconify_pressed_mask)) {
+            theme->iconify_pressed_mask =
+                RrPixmapMaskCopy(theme->iconify_mask);
+        } 
+        if (!read_mask(inst, "iconify_disabled.xbm", theme,
+                       &theme->iconify_disabled_mask)) {
+            theme->iconify_disabled_mask =
+                RrPixmapMaskCopy(theme->iconify_mask);
+        } 
+        if (!read_mask(inst, "iconify_hover.xbm", theme,
+                       &theme->iconify_hover_mask)) {
+            theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
+        }
+    } else {
+        {
+            guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
+            theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
+        }
+        theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask);
+        theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask);
+        theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
+    }
+
+    theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH,
+                                       OB_DEFAULT_ICON_HEIGHT,
+                                       OB_DEFAULT_ICON_pixel_data);
+
+    if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) {
+        if (!read_mask(inst, "desk_pressed.xbm", theme,
+                       &theme->desk_pressed_mask)) {
+            theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+        } 
+        if (!read_mask(inst, "desk_toggled.xbm", theme,
+                       &theme->desk_toggled_mask)) {
+            theme->desk_toggled_mask =
+                RrPixmapMaskCopy(theme->desk_pressed_mask);
+        }
+        if (!read_mask(inst, "desk_disabled.xbm", theme,
+                       &theme->desk_disabled_mask)) {
+            theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+        } 
+        if (!read_mask(inst, "desk_hover.xbm", theme, 
+                       &theme->desk_hover_mask)) {
+            theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
+        }
+    } else {
+        {
+            guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
+            theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
+        }
+        {
+            guchar data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
+            theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7,
+                                                       (char*)data);
+        }
+        theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+        theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+        theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
+    }
+
+    if (read_mask(inst, "shade.xbm", theme, &theme->shade_mask)) {
+        if (!read_mask(inst, "shade_pressed.xbm", theme,
+                       &theme->shade_pressed_mask)) {
+            theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
+        } 
+        if (!read_mask(inst, "shade_toggled.xbm", theme,
+                       &theme->shade_toggled_mask)) {
+            theme->shade_toggled_mask =
+                RrPixmapMaskCopy(theme->shade_pressed_mask);
+        }
+        if (!read_mask(inst, "shade_disabled.xbm", theme,
+                       &theme->shade_disabled_mask)) {
+            theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
+        } 
+        if (!read_mask(inst, "shade_hover.xbm", theme, 
+                       &theme->shade_hover_mask)) {
+            theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
+        }
+    } else {
+        {
+            guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
+            theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
+        }
+        {
+            guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
+            theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7,
+                                                        (char*)data);
+        }
+        theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
+        theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
+        theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
+    }
+
+    if (read_mask(inst, "close.xbm", theme, &theme->close_mask)) {
+        if (!read_mask(inst, "close_pressed.xbm", theme,
+                       &theme->close_pressed_mask)) {
+            theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
+        } 
+        if (!read_mask(inst, "close_disabled.xbm", theme,
+                       &theme->close_disabled_mask)) {
+            theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
+        } 
+        if (!read_mask(inst, "close_hover.xbm", theme,
+                       &theme->close_hover_mask)) {
+            theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
+        }
+    } else {
+        {
+            guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
+            theme->close_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
+        }
+        theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
+        theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
+        theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
+    }
+
+    if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) {
+        guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 };
+        theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (char*)data);
+    }
+
+    /* read the decoration textures */
+    if (!read_appearance(db, inst,
+                         "window.active.title.bg", theme->a_focused_title,
+                         FALSE))
+       set_default_appearance(theme->a_focused_title);
+    if (!read_appearance(db, inst,
+                         "window.inactive.title.bg", theme->a_unfocused_title,
+                         FALSE))
+       set_default_appearance(theme->a_unfocused_title);
+    if (!read_appearance(db, inst,
+                         "window.active.label.bg", theme->a_focused_label,
+                         TRUE))
+       set_default_appearance(theme->a_focused_label);
+    if (!read_appearance(db, inst,
+                         "window.inactive.label.bg", theme->a_unfocused_label,
+                         TRUE))
+       set_default_appearance(theme->a_unfocused_label);
+    if (!read_appearance(db, inst,
+                         "window.active.handle.bg", theme->a_focused_handle,
+                         FALSE))
+       set_default_appearance(theme->a_focused_handle);
+    if (!read_appearance(db, inst,
+                         "window.inactive.handle.bg",theme->a_unfocused_handle,
+                         FALSE))
+       set_default_appearance(theme->a_unfocused_handle);
+    if (!read_appearance(db, inst,
+                         "window.active.grip.bg", theme->a_focused_grip,
+                         TRUE))
+       set_default_appearance(theme->a_focused_grip);
+    if (!read_appearance(db, inst,
+                         "window.inactive.grip.bg", theme->a_unfocused_grip,
+                         TRUE))
+       set_default_appearance(theme->a_unfocused_grip);
+    if (!read_appearance(db, inst,
+                         "menu.items.bg", theme->a_menu,
+                         FALSE))
+       set_default_appearance(theme->a_menu);
+    if (!read_appearance(db, inst,
+                         "menu.title.bg", theme->a_menu_title,
+                         FALSE))
+       set_default_appearance(theme->a_menu_title);
+    if (!read_appearance(db, inst,
+                         "menu.items.active.bg", theme->a_menu_selected,
+                         TRUE))
+       set_default_appearance(theme->a_menu_selected);
+
+    /* read the appearances for rendering non-decorations */
+    if (!read_appearance(db, inst,
+                         "window.active.title.bg", theme->app_hilite_bg,
+                         FALSE))
+        set_default_appearance(theme->app_hilite_bg);
+    if (!read_appearance(db, inst,
+                         "window.active.label.bg", theme->app_hilite_label,
+                         TRUE))
+        set_default_appearance(theme->app_hilite_label);
+    if (!read_appearance(db, inst,
+                         "window.active.label.bg", theme->app_hilite_fg,
+                         TRUE))
+        set_default_appearance(theme->app_hilite_fg);
+    else if (theme->app_hilite_label->surface.grad == RR_SURFACE_PARENTREL) {
+        if (!read_appearance(db, inst,
+                             "window.active.title.bg",
+                             theme->app_hilite_fg,
+                             FALSE))
+            set_default_appearance(theme->app_hilite_fg);
+    }
+    if (!read_appearance(db, inst,
+                         "window.inactive.title.bg", theme->app_unhilite_bg,
+                         FALSE))
+        set_default_appearance(theme->app_unhilite_bg);
+    if (!read_appearance(db, inst,
+                         "window.inactive.label.bg", theme->app_unhilite_label,
+                         TRUE))
+        set_default_appearance(theme->app_unhilite_label);
+    if (!read_appearance(db, inst,
+                         "window.inactive.label.bg", theme->app_unhilite_fg,
+                         TRUE))
+        set_default_appearance(theme->app_unhilite_fg);
+    else if (theme->app_unhilite_label->surface.grad == RR_SURFACE_PARENTREL) {
+        if (!read_appearance(db, inst,
+                             "window.inactive.title.bg",
+                             theme->app_unhilite_fg,
+                             FALSE))
+            set_default_appearance(theme->app_unhilite_fg);
+    }
+        
+
+    /* read buttons textures */
+    if (!read_appearance(db, inst,
+                         "window.active.button.disabled.bg",
+                        theme->a_disabled_focused_max,
+                         TRUE))
+        set_default_appearance(theme->a_disabled_focused_max);
+    if (!read_appearance(db, inst,
+                         "window.inactive.button.disabled.bg",
+                        theme->a_disabled_unfocused_max,
+                         TRUE))
+        set_default_appearance(theme->a_disabled_unfocused_max);
+    if (!read_appearance(db, inst,
+                         "window.active.button.pressed.bg",
+                        theme->a_focused_pressed_max,
+                         TRUE))
+        set_default_appearance(theme->a_focused_pressed_max);
+    if (!read_appearance(db, inst,
+                         "window.inactive.button.pressed.bg",
+                        theme->a_unfocused_pressed_max,
+                         TRUE))
+        set_default_appearance(theme->a_unfocused_pressed_max);
+    if (!read_appearance(db, inst,
+                         "window.active.button.toggled.bg",
+                        theme->a_toggled_focused_max,
+                         TRUE))
+    {
+        RrAppearanceFree(theme->a_toggled_focused_max);
+        theme->a_toggled_focused_max =
+            RrAppearanceCopy(theme->a_focused_pressed_max);
+    }
+    if (!read_appearance(db, inst,
+                         "window.inactive.button.toggled.bg",
+                        theme->a_toggled_unfocused_max,
+                         TRUE))
+    {
+        RrAppearanceFree(theme->a_toggled_unfocused_max);
+        theme->a_toggled_unfocused_max =
+            RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    }
+    if (!read_appearance(db, inst,
+                         "window.active.button.unpressed.bg",
+                        theme->a_focused_unpressed_max,
+                         TRUE))
+       set_default_appearance(theme->a_focused_unpressed_max);
+    if (!read_appearance(db, inst,
+                         "window.inactive.button.unpressed.bg",
+                        theme->a_unfocused_unpressed_max,
+                         TRUE))
+       set_default_appearance(theme->a_unfocused_unpressed_max);
+    if (!read_appearance(db, inst,
+                         "window.active.button.hover.bg",
+                        theme->a_hover_focused_max,
+                         TRUE))
+    {
+        RrAppearanceFree(theme->a_hover_focused_max);
+        theme->a_hover_focused_max =
+            RrAppearanceCopy(theme->a_focused_unpressed_max);
+    }
+    if (!read_appearance(db, inst,
+                         "window.inactive.button.hover.bg",
+                        theme->a_hover_unfocused_max,
+                         TRUE))
+    {
+        RrAppearanceFree(theme->a_hover_unfocused_max);
+        theme->a_hover_unfocused_max =
+            RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+    }
+
+    theme->a_disabled_focused_close =
+        RrAppearanceCopy(theme->a_disabled_focused_max);
+    theme->a_disabled_unfocused_close =
+        RrAppearanceCopy(theme->a_disabled_unfocused_max);
+    theme->a_hover_focused_close =
+        RrAppearanceCopy(theme->a_hover_focused_max);
+    theme->a_hover_unfocused_close =
+        RrAppearanceCopy(theme->a_hover_unfocused_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_disabled_focused_desk =
+        RrAppearanceCopy(theme->a_disabled_focused_max);
+    theme->a_disabled_unfocused_desk =
+        RrAppearanceCopy(theme->a_disabled_unfocused_max);
+    theme->a_hover_focused_desk =
+        RrAppearanceCopy(theme->a_hover_focused_max);
+    theme->a_hover_unfocused_desk =
+        RrAppearanceCopy(theme->a_hover_unfocused_max); 
+    theme->a_toggled_focused_desk =
+        RrAppearanceCopy(theme->a_toggled_focused_max);
+   theme->a_toggled_unfocused_desk =
+        RrAppearanceCopy(theme->a_toggled_unfocused_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_focused_unpressed_desk =
+        RrAppearanceCopy(theme->a_focused_unpressed_max);
+    theme->a_focused_pressed_desk =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_disabled_focused_shade =
+        RrAppearanceCopy(theme->a_disabled_focused_max);
+    theme->a_disabled_unfocused_shade =
+        RrAppearanceCopy(theme->a_disabled_unfocused_max);
+    theme->a_hover_focused_shade =
+        RrAppearanceCopy(theme->a_hover_focused_max);
+    theme->a_hover_unfocused_shade =
+        RrAppearanceCopy(theme->a_hover_unfocused_max);
+    theme->a_toggled_focused_shade =
+        RrAppearanceCopy(theme->a_toggled_focused_max);
+    theme->a_toggled_unfocused_shade =
+        RrAppearanceCopy(theme->a_toggled_unfocused_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_focused_unpressed_shade =
+        RrAppearanceCopy(theme->a_focused_unpressed_max);
+    theme->a_focused_pressed_shade =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_disabled_focused_iconify =
+        RrAppearanceCopy(theme->a_disabled_focused_max);
+    theme->a_disabled_unfocused_iconify =
+        RrAppearanceCopy(theme->a_disabled_focused_max);
+    theme->a_hover_focused_iconify =
+        RrAppearanceCopy(theme->a_hover_focused_max);
+    theme->a_hover_unfocused_iconify =
+        RrAppearanceCopy(theme->a_hover_unfocused_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_icon->surface.grad =
+        theme->a_clear->surface.grad =
+        theme->a_clear_tex->surface.grad =
+        theme->a_menu_normal->surface.grad =
+        theme->a_menu_disabled->surface.grad =
+        theme->a_menu_text_normal->surface.grad =
+        theme->a_menu_text_disabled->surface.grad =
+        theme->a_menu_text_selected->surface.grad =
+        theme->a_menu_bullet_normal->surface.grad =
+        theme->a_menu_bullet_selected->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->win_font_focused;
+    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->win_font_unfocused;
+    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->menu_title_font;
+    theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color;
+
+    theme->a_menu_text_normal->texture[0].type =
+        theme->a_menu_text_disabled->texture[0].type = 
+        theme->a_menu_text_selected->texture[0].type = RR_TEXTURE_TEXT;
+    theme->a_menu_text_normal->texture[0].data.text.justify = 
+        theme->a_menu_text_disabled->texture[0].data.text.justify = 
+        theme->a_menu_text_selected->texture[0].data.text.justify =
+        RR_JUSTIFY_LEFT;
+    theme->a_menu_text_normal->texture[0].data.text.font =
+        theme->a_menu_text_disabled->texture[0].data.text.font =
+        theme->a_menu_text_selected->texture[0].data.text.font =
+        theme->menu_font;
+    theme->a_menu_text_normal->texture[0].data.text.color = theme->menu_color;
+    theme->a_menu_text_disabled->texture[0].data.text.color =
+        theme->menu_disabled_color;
+    theme->a_menu_text_selected->texture[0].data.text.color =
+        theme->menu_selected_color;
+
+    theme->a_disabled_focused_max->texture[0].type = 
+        theme->a_disabled_unfocused_max->texture[0].type = 
+        theme->a_hover_focused_max->texture[0].type = 
+        theme->a_hover_unfocused_max->texture[0].type = 
+        theme->a_toggled_focused_max->texture[0].type = 
+        theme->a_toggled_unfocused_max->texture[0].type = 
+        theme->a_focused_unpressed_max->texture[0].type = 
+        theme->a_focused_pressed_max->texture[0].type = 
+        theme->a_unfocused_unpressed_max->texture[0].type = 
+        theme->a_unfocused_pressed_max->texture[0].type = 
+        theme->a_disabled_focused_close->texture[0].type = 
+        theme->a_disabled_unfocused_close->texture[0].type = 
+        theme->a_hover_focused_close->texture[0].type = 
+        theme->a_hover_unfocused_close->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_disabled_focused_desk->texture[0].type = 
+        theme->a_disabled_unfocused_desk->texture[0].type = 
+        theme->a_hover_focused_desk->texture[0].type = 
+        theme->a_hover_unfocused_desk->texture[0].type = 
+        theme->a_toggled_focused_desk->texture[0].type = 
+        theme->a_toggled_unfocused_desk->texture[0].type = 
+        theme->a_focused_unpressed_desk->texture[0].type = 
+        theme->a_focused_pressed_desk->texture[0].type = 
+        theme->a_unfocused_unpressed_desk->texture[0].type = 
+        theme->a_unfocused_pressed_desk->texture[0].type = 
+        theme->a_disabled_focused_shade->texture[0].type = 
+        theme->a_disabled_unfocused_shade->texture[0].type = 
+        theme->a_hover_focused_shade->texture[0].type = 
+        theme->a_hover_unfocused_shade->texture[0].type = 
+        theme->a_toggled_focused_shade->texture[0].type = 
+        theme->a_toggled_unfocused_shade->texture[0].type = 
+        theme->a_focused_unpressed_shade->texture[0].type = 
+        theme->a_focused_pressed_shade->texture[0].type = 
+        theme->a_unfocused_unpressed_shade->texture[0].type = 
+        theme->a_unfocused_pressed_shade->texture[0].type = 
+        theme->a_disabled_focused_iconify->texture[0].type = 
+        theme->a_disabled_unfocused_iconify->texture[0].type = 
+        theme->a_hover_focused_iconify->texture[0].type = 
+        theme->a_hover_unfocused_iconify->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 =
+        theme->a_menu_bullet_normal->texture[0].type =
+        theme->a_menu_bullet_selected->texture[0].type = RR_TEXTURE_MASK;
+    
+    theme->a_disabled_focused_max->texture[0].data.mask.mask = 
+        theme->a_disabled_unfocused_max->texture[0].data.mask.mask = 
+        theme->max_disabled_mask;
+    theme->a_hover_focused_max->texture[0].data.mask.mask = 
+        theme->a_hover_unfocused_max->texture[0].data.mask.mask = 
+        theme->max_hover_mask;
+    theme->a_focused_pressed_max->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_max->texture[0].data.mask.mask =
+        theme->max_pressed_mask;
+    theme->a_focused_unpressed_max->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = 
+        theme->max_mask;
+    theme->a_toggled_focused_max->texture[0].data.mask.mask = 
+        theme->a_toggled_unfocused_max->texture[0].data.mask.mask =
+        theme->max_toggled_mask;
+    theme->a_disabled_focused_close->texture[0].data.mask.mask = 
+        theme->a_disabled_unfocused_close->texture[0].data.mask.mask = 
+        theme->close_disabled_mask;
+    theme->a_hover_focused_close->texture[0].data.mask.mask = 
+        theme->a_hover_unfocused_close->texture[0].data.mask.mask = 
+        theme->close_hover_mask;
+    theme->a_focused_pressed_close->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_close->texture[0].data.mask.mask =
+        theme->close_pressed_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_disabled_focused_desk->texture[0].data.mask.mask = 
+        theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = 
+        theme->desk_disabled_mask;
+    theme->a_hover_focused_desk->texture[0].data.mask.mask = 
+        theme->a_hover_unfocused_desk->texture[0].data.mask.mask = 
+        theme->desk_hover_mask;
+    theme->a_focused_pressed_desk->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_desk->texture[0].data.mask.mask =
+        theme->desk_pressed_mask;
+    theme->a_focused_unpressed_desk->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = 
+        theme->desk_mask;
+    theme->a_toggled_focused_desk->texture[0].data.mask.mask = 
+        theme->a_toggled_unfocused_desk->texture[0].data.mask.mask =
+        theme->desk_toggled_mask;
+    theme->a_disabled_focused_shade->texture[0].data.mask.mask = 
+        theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = 
+        theme->shade_disabled_mask;
+    theme->a_hover_focused_shade->texture[0].data.mask.mask = 
+        theme->a_hover_unfocused_shade->texture[0].data.mask.mask = 
+        theme->shade_hover_mask;
+    theme->a_focused_pressed_shade->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_shade->texture[0].data.mask.mask =
+        theme->shade_pressed_mask;
+    theme->a_focused_unpressed_shade->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = 
+        theme->shade_mask;
+    theme->a_toggled_focused_shade->texture[0].data.mask.mask = 
+        theme->a_toggled_unfocused_shade->texture[0].data.mask.mask =
+        theme->shade_toggled_mask;
+    theme->a_disabled_focused_iconify->texture[0].data.mask.mask = 
+        theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = 
+        theme->iconify_disabled_mask;
+    theme->a_hover_focused_iconify->texture[0].data.mask.mask = 
+        theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = 
+        theme->iconify_hover_mask;
+    theme->a_focused_pressed_iconify->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask =
+        theme->iconify_pressed_mask;
+    theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = 
+        theme->iconify_mask;
+    theme->a_menu_bullet_normal->texture[0].data.mask.mask = 
+    theme->a_menu_bullet_selected->texture[0].data.mask.mask = 
+        theme->menu_bullet_mask;
+    theme->a_disabled_focused_max->texture[0].data.mask.color = 
+        theme->a_disabled_focused_close->texture[0].data.mask.color = 
+        theme->a_disabled_focused_desk->texture[0].data.mask.color = 
+        theme->a_disabled_focused_shade->texture[0].data.mask.color = 
+        theme->a_disabled_focused_iconify->texture[0].data.mask.color = 
+        theme->titlebut_disabled_focused_color;
+    theme->a_disabled_unfocused_max->texture[0].data.mask.color = 
+        theme->a_disabled_unfocused_close->texture[0].data.mask.color = 
+        theme->a_disabled_unfocused_desk->texture[0].data.mask.color = 
+        theme->a_disabled_unfocused_shade->texture[0].data.mask.color = 
+        theme->a_disabled_unfocused_iconify->texture[0].data.mask.color = 
+        theme->titlebut_disabled_unfocused_color;
+    theme->a_hover_focused_max->texture[0].data.mask.color = 
+        theme->a_hover_focused_close->texture[0].data.mask.color = 
+        theme->a_hover_focused_desk->texture[0].data.mask.color = 
+        theme->a_hover_focused_shade->texture[0].data.mask.color = 
+        theme->a_hover_focused_iconify->texture[0].data.mask.color = 
+        theme->titlebut_hover_focused_color;
+    theme->a_hover_unfocused_max->texture[0].data.mask.color = 
+        theme->a_hover_unfocused_close->texture[0].data.mask.color = 
+        theme->a_hover_unfocused_desk->texture[0].data.mask.color = 
+        theme->a_hover_unfocused_shade->texture[0].data.mask.color = 
+        theme->a_hover_unfocused_iconify->texture[0].data.mask.color = 
+        theme->titlebut_hover_unfocused_color;
+    theme->a_toggled_focused_max->texture[0].data.mask.color = 
+        theme->a_toggled_focused_desk->texture[0].data.mask.color = 
+        theme->a_toggled_focused_shade->texture[0].data.mask.color = 
+        theme->titlebut_toggled_focused_color;
+    theme->a_toggled_unfocused_max->texture[0].data.mask.color = 
+        theme->a_toggled_unfocused_desk->texture[0].data.mask.color = 
+        theme->a_toggled_unfocused_shade->texture[0].data.mask.color = 
+        theme->titlebut_toggled_unfocused_color;
+    theme->a_focused_unpressed_max->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_close->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_desk->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_shade->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_iconify->texture[0].data.mask.color = 
+        theme->titlebut_focused_unpressed_color;
+    theme->a_focused_pressed_max->texture[0].data.mask.color = 
+        theme->a_focused_pressed_close->texture[0].data.mask.color = 
+        theme->a_focused_pressed_desk->texture[0].data.mask.color = 
+        theme->a_focused_pressed_shade->texture[0].data.mask.color = 
+        theme->a_focused_pressed_iconify->texture[0].data.mask.color =
+        theme->titlebut_focused_pressed_color;
+    theme->a_unfocused_unpressed_max->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_close->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = 
+        theme->titlebut_unfocused_unpressed_color;
+        theme->a_unfocused_pressed_max->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_close->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_desk->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_shade->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_iconify->texture[0].data.mask.color =
+        theme->titlebut_unfocused_pressed_color;
+    theme->a_menu_bullet_normal->texture[0].data.mask.color = 
+        theme->menu_color;
+    theme->a_menu_bullet_selected->texture[0].data.mask.color = 
+        theme->menu_selected_color;
+
+    XrmDestroyDatabase(db);
+
+    {
+        gint ft, fb, fl, fr, ut, ub, ul, ur;
+
+        RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb);
+        RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub);
+        theme->label_height = theme->win_font_height + MAX(ft + fb, ut + ub);
+
+        /* this would be nice I think, since padding.width can now be 0,
+           but it breaks frame.c horribly and I don't feel like fixing that
+           right now, so if anyone complains, here is how to keep text from
+           going over the title's bevel/border with a padding.width of 0 and a
+           bevelless/borderless label
+        RrMargins(theme->a_focused_title, &fl, &ft, &fr, &fb);
+        RrMargins(theme->a_unfocused_title, &ul, &ut, &ur, &ub);
+        theme->title_height = theme->label_height +
+            MAX(MAX(theme->padding * 2, ft + fb),
+                MAX(theme->padding * 2, ut + ub));
+        */
+        theme->title_height = theme->label_height + theme->padding * 2;
+        /* this should match the above title_height given the same font size
+           for both. */
+        theme->menu_title_height = theme->menu_title_font_height +
+            theme->padding * 2;
+    }
+    theme->button_size = theme->label_height - 2;
+    theme->grip_width = theme->title_height * 1.5;
+
+    return theme;
 }
 
-void theme_shutdown()
+void RrThemeFree(RrTheme *theme)
 {
-    color_free(theme_b_color);
-    color_free(theme_cb_unfocused_color);
-    color_free(theme_cb_focused_color);
-    color_free(theme_title_unfocused_color);
-    color_free(theme_title_focused_color);
-    color_free(theme_titlebut_unfocused_color);
-    color_free(theme_titlebut_focused_color);
-
-    pixmap_mask_free(theme_max_set_mask);
-    pixmap_mask_free(theme_max_unset_mask);
-    pixmap_mask_free(theme_desk_set_mask);
-    pixmap_mask_free(theme_desk_unset_mask);
-    pixmap_mask_free(theme_shade_set_mask);
-    pixmap_mask_free(theme_shade_unset_mask);
-    pixmap_mask_free(theme_iconify_mask);
-    pixmap_mask_free(theme_close_mask);
-
-    font_close(theme_winfont);
-    g_free(theme_title_layout);
-
-    appearance_free(theme_a_focused_unpressed_max);
-    appearance_free(theme_a_focused_pressed_max);
-    appearance_free(theme_a_focused_pressed_set_max);
-    appearance_free(theme_a_unfocused_unpressed_max);
-    appearance_free(theme_a_unfocused_pressed_max);
-    appearance_free(theme_a_unfocused_pressed_set_max);
-    appearance_free(theme_a_focused_unpressed_close);
-    appearance_free(theme_a_focused_pressed_close);
-    appearance_free(theme_a_unfocused_unpressed_close);
-    appearance_free(theme_a_unfocused_pressed_close);
-    appearance_free(theme_a_focused_unpressed_desk);
-    appearance_free(theme_a_focused_pressed_desk);
-    appearance_free(theme_a_unfocused_unpressed_desk);
-    appearance_free(theme_a_unfocused_pressed_desk);
-    appearance_free(theme_a_focused_unpressed_shade);
-    appearance_free(theme_a_focused_pressed_shade);
-    appearance_free(theme_a_unfocused_unpressed_shade);
-    appearance_free(theme_a_unfocused_pressed_shade);
-    appearance_free(theme_a_focused_unpressed_iconify);
-    appearance_free(theme_a_focused_pressed_iconify);
-    appearance_free(theme_a_unfocused_unpressed_iconify);
-    appearance_free(theme_a_unfocused_pressed_iconify);
-    appearance_free(theme_a_focused_grip);
-    appearance_free(theme_a_unfocused_grip);
-    appearance_free(theme_a_focused_title);
-    appearance_free(theme_a_unfocused_title);
-    appearance_free(theme_a_focused_label);
-    appearance_free(theme_a_unfocused_label);
-    appearance_free(theme_a_icon);
-    appearance_free(theme_a_focused_handle);
-    appearance_free(theme_a_unfocused_handle);
-    appearance_free(theme_app_hilite_label);
-    appearance_free(theme_app_unhilite_label);
+    if (theme) {
+        g_free(theme->path);
+        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_disabled_focused_color);
+        RrColorFree(theme->titlebut_disabled_unfocused_color);
+        RrColorFree(theme->titlebut_hover_focused_color);
+        RrColorFree(theme->titlebut_hover_unfocused_color);
+        RrColorFree(theme->titlebut_toggled_focused_color);
+        RrColorFree(theme->titlebut_toggled_unfocused_color);
+        RrColorFree(theme->titlebut_unfocused_pressed_color);
+        RrColorFree(theme->titlebut_focused_pressed_color);
+        RrColorFree(theme->titlebut_unfocused_unpressed_color);
+        RrColorFree(theme->titlebut_focused_unpressed_color);
+        RrColorFree(theme->menu_color);
+        RrColorFree(theme->menu_title_color);
+        RrColorFree(theme->menu_disabled_color);
+        RrColorFree(theme->menu_selected_color);
+
+        g_free(theme->def_win_icon);
+
+        RrPixmapMaskFree(theme->max_mask);
+        RrPixmapMaskFree(theme->max_toggled_mask);
+        RrPixmapMaskFree(theme->max_disabled_mask);
+        RrPixmapMaskFree(theme->max_hover_mask);
+        RrPixmapMaskFree(theme->max_pressed_mask);
+        RrPixmapMaskFree(theme->desk_mask);
+        RrPixmapMaskFree(theme->desk_toggled_mask);
+        RrPixmapMaskFree(theme->desk_disabled_mask);
+        RrPixmapMaskFree(theme->desk_hover_mask);
+        RrPixmapMaskFree(theme->desk_pressed_mask);
+        RrPixmapMaskFree(theme->shade_mask);
+        RrPixmapMaskFree(theme->shade_toggled_mask);
+        RrPixmapMaskFree(theme->shade_disabled_mask);
+        RrPixmapMaskFree(theme->shade_hover_mask);
+        RrPixmapMaskFree(theme->shade_pressed_mask);
+        RrPixmapMaskFree(theme->iconify_mask);
+        RrPixmapMaskFree(theme->iconify_disabled_mask);
+        RrPixmapMaskFree(theme->iconify_hover_mask);
+        RrPixmapMaskFree(theme->iconify_pressed_mask);
+        RrPixmapMaskFree(theme->close_mask);
+        RrPixmapMaskFree(theme->close_disabled_mask);
+        RrPixmapMaskFree(theme->close_hover_mask);
+        RrPixmapMaskFree(theme->close_pressed_mask);
+        RrPixmapMaskFree(theme->menu_bullet_mask);
+
+        RrFontClose(theme->win_font_focused); 
+        RrFontClose(theme->win_font_unfocused);
+        RrFontClose(theme->menu_title_font);
+        RrFontClose(theme->menu_font);
+
+        RrAppearanceFree(theme->a_disabled_focused_max);
+        RrAppearanceFree(theme->a_disabled_unfocused_max);
+        RrAppearanceFree(theme->a_hover_focused_max);
+        RrAppearanceFree(theme->a_hover_unfocused_max);
+        RrAppearanceFree(theme->a_toggled_focused_max);
+        RrAppearanceFree(theme->a_toggled_unfocused_max);
+        RrAppearanceFree(theme->a_focused_unpressed_max);
+        RrAppearanceFree(theme->a_focused_pressed_max);
+        RrAppearanceFree(theme->a_unfocused_unpressed_max);
+        RrAppearanceFree(theme->a_unfocused_pressed_max);
+        RrAppearanceFree(theme->a_disabled_focused_close);
+        RrAppearanceFree(theme->a_disabled_unfocused_close);
+        RrAppearanceFree(theme->a_hover_focused_close);
+        RrAppearanceFree(theme->a_hover_unfocused_close);
+        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_disabled_focused_desk);
+        RrAppearanceFree(theme->a_disabled_unfocused_desk);
+        RrAppearanceFree(theme->a_hover_focused_desk);
+        RrAppearanceFree(theme->a_hover_unfocused_desk);
+        RrAppearanceFree(theme->a_toggled_focused_desk);
+        RrAppearanceFree(theme->a_toggled_unfocused_desk);
+        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_disabled_focused_shade);
+        RrAppearanceFree(theme->a_disabled_unfocused_shade);
+        RrAppearanceFree(theme->a_hover_focused_shade);
+        RrAppearanceFree(theme->a_hover_unfocused_shade);
+        RrAppearanceFree(theme->a_toggled_focused_shade);
+        RrAppearanceFree(theme->a_toggled_unfocused_shade);
+        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_disabled_focused_iconify);
+        RrAppearanceFree(theme->a_disabled_unfocused_iconify);
+        RrAppearanceFree(theme->a_hover_focused_iconify);
+        RrAppearanceFree(theme->a_hover_unfocused_iconify);
+        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_normal);
+        RrAppearanceFree(theme->a_menu_disabled);
+        RrAppearanceFree(theme->a_menu_selected);
+        RrAppearanceFree(theme->a_menu_text_normal);
+        RrAppearanceFree(theme->a_menu_text_disabled);
+        RrAppearanceFree(theme->a_menu_text_selected);
+        RrAppearanceFree(theme->a_menu_bullet_normal);
+        RrAppearanceFree(theme->a_menu_bullet_selected);
+        RrAppearanceFree(theme->a_clear);
+        RrAppearanceFree(theme->a_clear_tex);
+        RrAppearanceFree(theme->app_hilite_bg);
+        RrAppearanceFree(theme->app_unhilite_bg);
+        RrAppearanceFree(theme->app_hilite_fg);
+        RrAppearanceFree(theme->app_unhilite_fg);
+        RrAppearanceFree(theme->app_hilite_label);
+        RrAppearanceFree(theme->app_unhilite_label);
+
+        g_free(theme);
+    }
 }
 
-static XrmDatabase loaddb(char *theme)
+static XrmDatabase loaddb(RrTheme *theme, char *name)
 {
-    XrmDatabase db;
+    GSList *it;
+    XrmDatabase db = NULL;
+    gchar *s;
 
-    db = XrmGetFileDatabase(theme);
-    if (db == NULL) {
-       char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
-                                  theme, NULL);
-       db = XrmGetFileDatabase(s);
-       g_free(s);
+    if (name[0] == '/') {
+        s = g_build_filename(name, "openbox-3", "themerc", NULL);
+       if ((db = XrmGetFileDatabase(s)))
+            theme->path = g_path_get_dirname(s);
+        g_free(s);
+    } else {
+        /* XXX backwards compatibility, remove me sometime later */
+        s = g_build_filename(g_get_home_dir(), ".themes", name,
+                             "openbox-3", "themerc", NULL);
+        if ((db = XrmGetFileDatabase(s)))
+            theme->path = g_path_get_dirname(s);
+        g_free(s);
+
+        for (it = parse_xdg_data_dir_paths(); !db && it;
+             it = g_slist_next(it))
+        {
+            s = g_build_filename(it->data, "themes", name,
+                                 "openbox-3", "themerc", NULL);
+            if ((db = XrmGetFileDatabase(s)))
+                theme->path = g_path_get_dirname(s);
+            g_free(s);
+        }
     }
+
     if (db == NULL) {
-       char *s = g_build_filename(THEMEDIR, theme, NULL);
-       db = XrmGetFileDatabase(s);
-       g_free(s);
+        s = g_build_filename(name, "themerc", NULL);
+       if ((db = XrmGetFileDatabase(s)))
+            theme->path = g_path_get_dirname(s);
+        g_free(s);
     }
+
     return db;
 }
 
@@ -247,7 +1161,7 @@ static gboolean read_string(XrmDatabase db, char *rname, char **value)
   
     if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
        retvalue.addr != NULL) {
-       *value = g_strdup(retvalue.addr);
+       *value = retvalue.addr;
        ret = TRUE;
     }
 
@@ -255,7 +1169,8 @@ static gboolean read_string(XrmDatabase db, char *rname, char **value)
     return ret;
 }
 
-static gboolean read_color(XrmDatabase db, char *rname, color_rgb **value)
+static gboolean read_color(XrmDatabase db, const RrInstance *inst,
+                           gchar *rname, RrColor **value)
 {
     gboolean ret = FALSE;
     char *rclass = create_class_name(rname);
@@ -264,7 +1179,7 @@ static gboolean read_color(XrmDatabase db, char *rname, color_rgb **value)
   
     if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
        retvalue.addr != NULL) {
-       color_rgb *c = color_parse(retvalue.addr);
+       RrColor *c = RrColorParse(inst, retvalue.addr);
        if (c != NULL) {
            *value = c;
            ret = TRUE;
@@ -275,67 +1190,31 @@ static gboolean read_color(XrmDatabase db, char *rname, color_rgb **value)
     return ret;
 }
 
-static gboolean read_mask(XrmDatabase db, char *rname, char *theme,
-                          pixmap_mask **value)
+static gboolean read_mask(const RrInstance *inst,
+                          gchar *maskname, RrTheme *theme,
+                          RrPixmapMask **value)
 {
     gboolean ret = FALSE;
-    char *rclass = create_class_name(rname);
-    char *rettype;
     char *s;
-    char *button_dir;
-    XrmValue retvalue;
     int hx, hy; /* ignored */
     unsigned int w, h;
     unsigned char *b;
-  
-    if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
-        retvalue.addr != NULL) {
-
-       button_dir = g_strdup_printf("%s_buttons", theme);
-
-        s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
-                             button_dir, retvalue.addr, NULL);
-
-        if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
-            ret = TRUE;
-        else {
-            g_free(s);
-            s = g_build_filename(THEMEDIR, button_dir, retvalue.addr, NULL);
-       
-            if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) 
-                ret = TRUE;
-            else {
-                char *themename;
-
-                g_free(s);
-                themename = g_path_get_basename(theme);
-                s = g_strdup_printf("%s/%s_buttons/%s", theme,
-                                    themename, retvalue.addr);
-                g_free(themename);
-                if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) ==
-                    BitmapSuccess) 
-                    ret = TRUE;
-                else
-                    g_message("Unable to find bitmap '%s'", retvalue.addr);
-            }
-        }
 
-        if (ret) {
-            *value = pixmap_mask_new(w, h, (char*)b);
-            XFree(b);
-        }
-      
-        g_free(s);
-        g_free(button_dir);
+    s = g_build_filename(theme->path, maskname, NULL);
+    if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) {
+        ret = TRUE;
+        *value = RrPixmapMaskNew(inst, w, h, (char*)b);
+        XFree(b);
     }
+    g_free(s);
 
-    g_free(rclass);
     return ret;
 }
 
-static void parse_appearance(char *tex, SurfaceColorType *grad,
-                             ReliefType *relief, BevelType *bevel,
-                             gboolean *interlaced, gboolean *border)
+static void parse_appearance(gchar *tex, RrSurfaceColorType *grad,
+                             RrReliefType *relief, RrBevelType *bevel,
+                             gboolean *interlaced, gboolean *border,
+                             gboolean allow_trans)
 {
     char *t;
 
@@ -343,46 +1222,40 @@ static void parse_appearance(char *tex, SurfaceColorType *grad,
     for (t = tex; *t != '\0'; ++t)
        *t = g_ascii_tolower(*t);
 
-    if (strstr(tex, "parentrelative") != NULL) {
-       *grad = Background_ParentRelative;
+    if (allow_trans && strstr(tex, "parentrelative") != NULL) {
+       *grad = RR_SURFACE_PARENTREL;
     } else {
        if (strstr(tex, "gradient") != NULL) {
            if (strstr(tex, "crossdiagonal") != NULL)
-               *grad = Background_CrossDiagonal;
-           else if (strstr(tex, "rectangle") != NULL)
-               *grad = Background_Rectangle;
+               *grad = RR_SURFACE_CROSS_DIAGONAL;
            else if (strstr(tex, "pyramid") != NULL)
-               *grad = Background_Pyramid;
-           else if (strstr(tex, "pipecross") != NULL)
-               *grad = Background_PipeCross;
-           else if (strstr(tex, "elliptic") != NULL)
-               *grad = Background_Elliptic;
+               *grad = RR_SURFACE_PYRAMID;
            else if (strstr(tex, "horizontal") != NULL)
-               *grad = Background_Horizontal;
+               *grad = RR_SURFACE_HORIZONTAL;
            else if (strstr(tex, "vertical") != NULL)
-               *grad = Background_Vertical;
+               *grad = RR_SURFACE_VERTICAL;
            else
-               *grad = Background_Diagonal;
+               *grad = RR_SURFACE_DIAGONAL;
        } else {
-           *grad = Background_Solid;
+           *grad = RR_SURFACE_SOLID;
        }
 
        if (strstr(tex, "sunken") != NULL)
-           *relief = Sunken;
+           *relief = RR_RELIEF_SUNKEN;
        else if (strstr(tex, "flat") != NULL)
-           *relief = Flat;
+           *relief = RR_RELIEF_FLAT;
        else
-           *relief = Raised;
+           *relief = RR_RELIEF_RAISED;
        
        *border = FALSE;
-       if (*relief == Flat) {
+       if (*relief == RR_RELIEF_FLAT) {
            if (strstr(tex, "border") != NULL)
                *border = TRUE;
        } else {
            if (strstr(tex, "bevel2") != NULL)
-               *bevel = Bevel2;
+               *bevel = RR_BEVEL_2;
            else
-               *bevel = Bevel1;
+               *bevel = RR_BEVEL_1;
        }
 
        if (strstr(tex, "interlaced") != NULL)
@@ -393,36 +1266,46 @@ static void parse_appearance(char *tex, SurfaceColorType *grad,
 }
 
 
-static gboolean read_appearance(XrmDatabase db, char *rname, Appearance *value)
+static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
+                                gchar *rname, RrAppearance *value,
+                                gboolean allow_trans)
 {
     gboolean ret = FALSE;
-    char *rclass = create_class_name(rname), *cname, *ctoname, *bcname;
+    char *rclass = create_class_name(rname);
+    char *cname, *ctoname, *bcname, *icname;
     char *rettype;
     XrmValue retvalue;
 
     cname = g_strconcat(rname, ".color", NULL);
     ctoname = g_strconcat(rname, ".colorTo", NULL);
-    bcname = g_strconcat(rname, ".borderColor", NULL);
+    bcname = g_strconcat(rname, ".border.color", NULL);
+    icname = g_strconcat(rname, ".interlace.color", NULL);
 
     if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
        retvalue.addr != NULL) {
        parse_appearance(retvalue.addr,
-                        &value->surface.data.planar.grad,
-                        &value->surface.data.planar.relief,
-                        &value->surface.data.planar.bevel,
-                        &value->surface.data.planar.interlaced,
-                        &value->surface.data.planar.border);
-       if (!read_color(db, cname, &value->surface.data.planar.primary))
-           value->surface.data.planar.primary = color_new(0, 0, 0);
-       if (!read_color(db, ctoname, &value->surface.data.planar.secondary))
-           value->surface.data.planar.secondary = color_new(0, 0, 0);
-       if (value->surface.data.planar.border)
-           if (!read_color(db, bcname,
-                           &value->surface.data.planar.border_color))
-               value->surface.data.planar.border_color = color_new(0, 0, 0);
+                        &value->surface.grad,
+                        &value->surface.relief,
+                        &value->surface.bevel,
+                        &value->surface.interlaced,
+                        &value->surface.border,
+                         allow_trans);
+       if (!read_color(db, inst, cname, &value->surface.primary))
+           value->surface.primary = RrColorNew(inst, 0, 0, 0);
+       if (!read_color(db, inst, ctoname, &value->surface.secondary))
+           value->surface.secondary = RrColorNew(inst, 0, 0, 0);
+       if (value->surface.border)
+           if (!read_color(db, inst, bcname,
+                           &value->surface.border_color))
+               value->surface.border_color = RrColorNew(inst, 0, 0, 0);
+        if (value->surface.interlaced)
+           if (!read_color(db, inst, icname,
+                           &value->surface.interlace_color))
+               value->surface.interlace_color = RrColorNew(inst, 0, 0, 0);
        ret = TRUE;
     }
 
+    g_free(icname);
     g_free(bcname);
     g_free(ctoname);
     g_free(cname);
@@ -430,402 +1313,38 @@ static gboolean read_appearance(XrmDatabase db, char *rname, Appearance *value)
     return ret;
 }
 
-static void set_default_appearance(Appearance *a)
+static void set_default_appearance(RrAppearance *a)
 {
-    a->surface.data.planar.grad = Background_Solid;
-    a->surface.data.planar.relief = Flat;
-    a->surface.data.planar.bevel = Bevel1;
-    a->surface.data.planar.interlaced = FALSE;
-    a->surface.data.planar.border = FALSE;
-    a->surface.data.planar.primary = color_new(0, 0, 0);
-    a->surface.data.planar.secondary = color_new(0, 0, 0);
+    a->surface.grad = RR_SURFACE_SOLID;
+    a->surface.relief = RR_RELIEF_FLAT;
+    a->surface.bevel = RR_BEVEL_1;
+    a->surface.interlaced = FALSE;
+    a->surface.border = FALSE;
+    a->surface.primary = RrColorNew(a->inst, 0, 0, 0);
+    a->surface.secondary = RrColorNew(a->inst, 0, 0, 0);
 }
 
-char *theme_load(char *theme)
+/* Reads the output from gimp's C-Source file format into valid RGBA data for
+   an RrTextureRGBA. */
+static RrPixel32* read_c_image(gint width, gint height, const guint8 *data)
 {
-    XrmDatabase db = NULL;
-    char *loaded = NULL;
-    Justify winjust;
-    char *str;
-    char *winfont_str;
+    RrPixel32 *im, *p;
+    gint i;
 
-    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 */
-    winfont_str = "arial-8:bold";
-
-    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(winfont_str);
-    theme_winfont_height = font_height(theme_winfont, theme_winfont_shadow,
-                                      theme_winfont_shadow_offset);
-
-    winjust = Justify_Left;
-    if (read_string(db, "window.justify", &str)) {
-        if (!g_ascii_strcasecmp(str, "right"))
-            winjust = Justify_Right;
-        else if (!g_ascii_strcasecmp(str, "center"))
-            winjust = 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;
-
-    if (!read_color(db, "borderColor", &theme_b_color))
-       theme_b_color = color_new(0, 0, 0);
-    if (!read_color(db, "window.frame.focusColor", &theme_cb_focused_color))
-       theme_cb_focused_color = color_new(0xff, 0xff, 0xff);
-    if (!read_color(db, "window.frame.unfocusColor", &theme_cb_unfocused_color))
-       theme_cb_unfocused_color = color_new(0xff, 0xff, 0xff);
-    if (!read_color(db, "window.label.focus.textColor",
-                    &theme_title_focused_color))
-       theme_title_focused_color = color_new(0x0, 0x0, 0x0);
-    if (!read_color(db, "window.label.unfocus.textColor",
-                    &theme_title_unfocused_color))
-       theme_title_unfocused_color = color_new(0xff, 0xff, 0xff);
-    if (!read_color(db, "window.button.focus.picColor",
-                    &theme_titlebut_focused_color))
-       theme_titlebut_focused_color = color_new(0, 0, 0);
-    if (!read_color(db, "window.button.unfocus.picColor",
-                    &theme_titlebut_unfocused_color))
-       theme_titlebut_unfocused_color = color_new(0xff, 0xff, 0xff);
-
-    if (read_mask(db, "window.button.max.mask", theme, &theme_max_unset_mask)){
-        if (!read_mask(db, "window.button.max.toggled.mask", theme,
-                       &theme_max_set_mask)) {
-            theme_max_set_mask = pixmap_mask_copy(theme_max_unset_mask);
-        }
-    } else {
-        {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
-            theme_max_unset_mask = pixmap_mask_new(7, 7, data);
-        }
-        {
-            char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
-            theme_max_set_mask = pixmap_mask_new(7, 7, data);
-        }
-    }
-
-    if (!read_mask(db, "window.button.icon.mask", theme,
-                   &theme_iconify_mask)) {
-        char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
-        theme_iconify_mask = pixmap_mask_new(7, 7, data);
-    }
-
-    if (read_mask(db, "window.button.stick.mask", theme,
-                   &theme_desk_unset_mask)) {
-        if (!read_mask(db, "window.button.stick.toggled.mask", theme,
-                       &theme_desk_set_mask)) {
-            theme_desk_set_mask =
-                pixmap_mask_copy(theme_desk_unset_mask);
-        }
-    } else {
-        {
-            char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
-            theme_desk_unset_mask = pixmap_mask_new(7, 7, data);
-        }
-        {
-            char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
-            theme_desk_set_mask = pixmap_mask_new(7, 7, data);
-        }
-    }
-
-    if (read_mask(db, "window.button.shade.mask", theme,
-                   &theme_shade_unset_mask)) {
-        if (!read_mask(db, "window.button.shade.toggled.mask", theme,
-                       &theme_shade_set_mask)) {
-            theme_shade_set_mask =
-                pixmap_mask_copy(theme_shade_unset_mask);
-        }
-    } else {
-        {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
-            theme_shade_unset_mask = pixmap_mask_new(7, 7, data);
-        }
-        {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
-            theme_shade_set_mask = pixmap_mask_new(7, 7, data);
-        }
-    }
+    p = im = g_memdup(data, width * height * sizeof(RrPixel32));
 
-    if (!read_mask(db, "window.button.close.mask", theme,
-                   &theme_close_mask)) {
-        char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
-        theme_close_mask = pixmap_mask_new(7, 7, data);
-    }        
+    for (i = 0; i < width * height; ++i) {
+        guchar a = ((*p >> 24) & 0xff);
+        guchar b = ((*p >> 16) & 0xff);
+        guchar g = ((*p >>  8) & 0xff);
+        guchar r = ((*p >>  0) & 0xff);
 
-    /* read the decoration textures */
-    if (!read_appearance(db, "window.title.focus", theme_a_focused_title))
-       set_default_appearance(theme_a_focused_title);
-    if (!read_appearance(db, "window.title.unfocus", theme_a_unfocused_title))
-       set_default_appearance(theme_a_unfocused_title);
-    if (!read_appearance(db, "window.label.focus", theme_a_focused_label))
-       set_default_appearance(theme_a_focused_label);
-    if (!read_appearance(db, "window.label.unfocus", theme_a_unfocused_label))
-       set_default_appearance(theme_a_unfocused_label);
-    if (!read_appearance(db, "window.handle.focus", theme_a_focused_handle))
-       set_default_appearance(theme_a_focused_handle);
-    if (!read_appearance(db, "window.handle.unfocus", theme_a_unfocused_handle))
-       set_default_appearance(theme_a_unfocused_handle);
-    if (!read_appearance(db, "window.grip.focus", theme_a_focused_grip))
-       set_default_appearance(theme_a_focused_grip);
-    if (!read_appearance(db, "window.grip.unfocus", theme_a_unfocused_grip))
-       set_default_appearance(theme_a_unfocused_grip);
-
-    /* read the appearances for rendering non-decorations. these cannot be
-       parent-relative */
-    if (theme_a_focused_label->surface.data.planar.grad !=
-        Background_ParentRelative) {
-        if (!read_appearance(db, "window.label.focus", theme_app_hilite_label))
-            set_default_appearance(theme_app_hilite_label);
-    } else {
-        if (!read_appearance(db, "window.title.focus", theme_app_hilite_label))
-            set_default_appearance(theme_app_hilite_label);
-    }
-    if (theme_a_unfocused_label->surface.data.planar.grad !=
-        Background_ParentRelative) {
-        if (!read_appearance(db, "window.label.unfocus",
-                             theme_app_unhilite_label))
-            set_default_appearance(theme_app_unhilite_label);
-    } else {
-        if (!read_appearance(db, "window.title.unfocus",
-                             theme_app_unhilite_label))
-            set_default_appearance(theme_app_unhilite_label);
+        *p = ((r << RrDefaultRedOffset) +
+              (g << RrDefaultGreenOffset) +
+              (b << RrDefaultBlueOffset) +
+              (a << RrDefaultAlphaOffset));
+        p++;
     }
 
-    /* read buttons textures */
-    if (!read_appearance(db, "window.button.pressed.focus",
-                        theme_a_focused_pressed_max))
-       if (!read_appearance(db, "window.button.pressed",
-                             theme_a_focused_pressed_max))
-           set_default_appearance(theme_a_focused_pressed_max);
-    if (!read_appearance(db, "window.button.pressed.unfocus",
-                        theme_a_unfocused_pressed_max))
-       if (!read_appearance(db, "window.button.pressed",
-                            theme_a_unfocused_pressed_max))
-           set_default_appearance(theme_a_unfocused_pressed_max);
-    if (!read_appearance(db, "window.button.focus",
-                        theme_a_focused_unpressed_max))
-       set_default_appearance(theme_a_focused_unpressed_max);
-    if (!read_appearance(db, "window.button.unfocus",
-                        theme_a_unfocused_unpressed_max))
-       set_default_appearance(theme_a_unfocused_unpressed_max);
-
-    theme_a_unfocused_unpressed_close =
-        appearance_copy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_close =
-        appearance_copy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_close =
-        appearance_copy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_close =
-        appearance_copy(theme_a_focused_pressed_max);
-    theme_a_unfocused_unpressed_desk =
-        appearance_copy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_desk =
-        appearance_copy(theme_a_unfocused_pressed_max);
-    theme_a_unfocused_pressed_set_desk =
-        appearance_copy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_desk =
-        appearance_copy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_desk =
-        appearance_copy(theme_a_focused_pressed_max);
-    theme_a_focused_pressed_set_desk =
-        appearance_copy(theme_a_focused_pressed_max);
-    theme_a_unfocused_unpressed_shade =
-        appearance_copy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_shade =
-        appearance_copy(theme_a_unfocused_pressed_max);
-    theme_a_unfocused_pressed_set_shade =
-        appearance_copy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_shade =
-        appearance_copy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_shade =
-        appearance_copy(theme_a_focused_pressed_max);
-    theme_a_focused_pressed_set_shade =
-        appearance_copy(theme_a_focused_pressed_max);
-    theme_a_unfocused_unpressed_iconify =
-        appearance_copy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_iconify =
-        appearance_copy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_iconify =
-        appearance_copy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_iconify =
-        appearance_copy(theme_a_focused_pressed_max);
-    theme_a_unfocused_pressed_set_max =
-        appearance_copy(theme_a_unfocused_pressed_max);
-    theme_a_focused_pressed_set_max =
-        appearance_copy(theme_a_focused_pressed_max);
-
-    theme_a_icon->surface.data.planar.grad = Background_ParentRelative;
-
-    /* set up the textures */
-    theme_a_focused_label->texture[0].type = 
-        theme_app_hilite_label->texture[0].type = Text;
-    theme_a_focused_label->texture[0].data.text.justify =
-        theme_app_hilite_label->texture[0].data.text.justify = winjust;
-    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 = Text;
-    theme_a_unfocused_label->texture[0].data.text.justify =
-        theme_app_unhilite_label->texture[0].data.text.justify = winjust;
-    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_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 = Bitmask;
-    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;
+    return im;
 }