put the render theme into a struct

14 files changed, 1010 insertions, 1029 deletions

diff --git a/openbox/dock.c b/openbox/dock.c
index 3fb9c78d..3dda174d 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -32,9 +32,9 @@ void dock_startup()
                                 RrVisual(ob_rr_inst),
                                 CWOverrideRedirect | CWEventMask,
                                 &attrib);
-    dock->a_frame = RrAppearanceCopy(theme_a_unfocused_title);
-    XSetWindowBorder(ob_display, dock->frame, theme_b_color->pixel);
-    XSetWindowBorderWidth(ob_display, dock->frame, theme_bwidth);
+    dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
+    XSetWindowBorder(ob_display, dock->frame, ob_rr_theme->b_color->pixel);
+    XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth);
 
     g_hash_table_insert(window_map, &dock->frame, dock);
     stacking_add(DOCK_AS_WINDOW(dock));
@@ -182,8 +182,8 @@ void dock_configure()
     }
 
     /* used for calculating offsets */
-    dock->w += theme_bwidth * 2;
-    dock->h += theme_bwidth * 2;
+    dock->w += ob_rr_theme->bwidth * 2;
+    dock->h += ob_rr_theme->bwidth * 2;
 
     /* calculate position */
     switch (config_dock_pos) {
@@ -265,39 +265,39 @@ void dock_configure()
             break;
         case DockPos_TopLeft:
             if (config_dock_horz)
-                dock->y -= dock->h - theme_bwidth;
+                dock->y -= dock->h - ob_rr_theme->bwidth;
             else
-                dock->x -= dock->w - theme_bwidth;
+                dock->x -= dock->w - ob_rr_theme->bwidth;
             break;
         case DockPos_Top:
-            dock->y -= dock->h - theme_bwidth;
+            dock->y -= dock->h - ob_rr_theme->bwidth;
             break;
         case DockPos_TopRight:
             if (config_dock_horz)
-                dock->y -= dock->h - theme_bwidth;
+                dock->y -= dock->h - ob_rr_theme->bwidth;
             else
-                dock->x += dock->w - theme_bwidth;
+                dock->x += dock->w - ob_rr_theme->bwidth;
             break;
         case DockPos_Left:
-            dock->x -= dock->w - theme_bwidth;
+            dock->x -= dock->w - ob_rr_theme->bwidth;
             break;
         case DockPos_Right:
-            dock->x += dock->w - theme_bwidth;
+            dock->x += dock->w - ob_rr_theme->bwidth;
             break;
         case DockPos_BottomLeft:
             if (config_dock_horz)
-                dock->y += dock->h - theme_bwidth;
+                dock->y += dock->h - ob_rr_theme->bwidth;
             else
-                dock->x -= dock->w - theme_bwidth;
+                dock->x -= dock->w - ob_rr_theme->bwidth;
             break;
         case DockPos_Bottom:
-            dock->y += dock->h - theme_bwidth;
+            dock->y += dock->h - ob_rr_theme->bwidth;
             break;
         case DockPos_BottomRight:
             if (config_dock_horz)
-                dock->y += dock->h - theme_bwidth;
+                dock->y += dock->h - ob_rr_theme->bwidth;
             else
-                dock->x += dock->w - theme_bwidth;
+                dock->x += dock->w - ob_rr_theme->bwidth;
             break;
         }    
     }
@@ -346,8 +346,8 @@ void dock_configure()
     }
 
     /* not used for actually sizing shit */
-    dock->w -= theme_bwidth * 2;
-    dock->h -= theme_bwidth * 2;
+    dock->w -= ob_rr_theme->bwidth * 2;
+    dock->h -= ob_rr_theme->bwidth * 2;
 
     if (dock->w > 0 && dock->h > 0) {
         XMoveResizeWindow(ob_display, dock->frame,
@@ -359,8 +359,8 @@ void dock_configure()
         XUnmapWindow(ob_display, dock->frame);
 
     /* but they are useful outside of this function! */
-    dock->w += theme_bwidth * 2;
-    dock->h += theme_bwidth * 2;
+    dock->w += ob_rr_theme->bwidth * 2;
+    dock->h += ob_rr_theme->bwidth * 2;
 
     screen_update_struts();
 }
diff --git a/openbox/frame.c b/openbox/frame.c
index 4307c98a..65e116c8 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -74,35 +74,37 @@ Frame *frame_new()
     XMapWindow(ob_display, self->label);
 
     /* set colors/appearance/sizes for stuff that doesn't change */
-    XSetWindowBorder(ob_display, self->window, theme_b_color->pixel);
-    XSetWindowBorder(ob_display, self->label, theme_b_color->pixel);
-    XSetWindowBorder(ob_display, self->rgrip, theme_b_color->pixel);
-    XSetWindowBorder(ob_display, self->lgrip, theme_b_color->pixel);
+    XSetWindowBorder(ob_display, self->window, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, self->label, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, self->rgrip, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, self->lgrip, ob_rr_theme->b_color->pixel);
 
-    XResizeWindow(ob_display, self->max, theme_button_size, theme_button_size);
+    XResizeWindow(ob_display, self->max,
+                  ob_rr_theme->button_size, ob_rr_theme->button_size);
     XResizeWindow(ob_display, self->iconify,
-                  theme_button_size, theme_button_size);
+                  ob_rr_theme->button_size, ob_rr_theme->button_size);
     XResizeWindow(ob_display, self->icon,
-                  theme_button_size + 2, theme_button_size + 2);
+                  ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2);
     XResizeWindow(ob_display, self->close,
-                  theme_button_size, theme_button_size);
+                  ob_rr_theme->button_size, ob_rr_theme->button_size);
     XResizeWindow(ob_display, self->desk,
-                  theme_button_size, theme_button_size);
+                  ob_rr_theme->button_size, ob_rr_theme->button_size);
     XResizeWindow(ob_display, self->shade,
-                  theme_button_size, theme_button_size);
+                  ob_rr_theme->button_size, ob_rr_theme->button_size);
     XResizeWindow(ob_display, self->lgrip,
-                  theme_grip_width, theme_handle_height);
+                  ob_rr_theme->grip_width, ob_rr_theme->handle_height);
     XResizeWindow(ob_display, self->rgrip,
-                  theme_grip_width, theme_handle_height);
+                  ob_rr_theme->grip_width, ob_rr_theme->handle_height);
 
     /* set up the dynamic appearances */
-    self->a_unfocused_title = RrAppearanceCopy(theme_a_unfocused_title);
-    self->a_focused_title = RrAppearanceCopy(theme_a_focused_title);
-    self->a_unfocused_label = RrAppearanceCopy(theme_a_unfocused_label);
-    self->a_focused_label = RrAppearanceCopy(theme_a_focused_label);
-    self->a_unfocused_handle = RrAppearanceCopy(theme_a_unfocused_handle);
-    self->a_focused_handle = RrAppearanceCopy(theme_a_focused_handle);
-    self->a_icon = RrAppearanceCopy(theme_a_icon);
+    self->a_unfocused_title = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
+    self->a_focused_title = RrAppearanceCopy(ob_rr_theme->a_focused_title);
+    self->a_unfocused_label = RrAppearanceCopy(ob_rr_theme->a_unfocused_label);
+    self->a_focused_label = RrAppearanceCopy(ob_rr_theme->a_focused_label);
+    self->a_unfocused_handle =
+        RrAppearanceCopy(ob_rr_theme->a_unfocused_handle);
+    self->a_focused_handle = RrAppearanceCopy(ob_rr_theme->a_focused_handle);
+    self->a_icon = RrAppearanceCopy(ob_rr_theme->a_icon);
 
     self->max_press = self->close_press = self->desk_press = 
 	self->iconify_press = self->shade_press = FALSE;
@@ -164,19 +166,19 @@ void frame_adjust_shape(Frame *self)
 
 	num = 0;
 	if (self->client->decorations & Decor_Titlebar) {
-	    xrect[0].x = -theme_bevel;
-	    xrect[0].y = -theme_bevel;
+	    xrect[0].x = -ob_rr_theme->bevel;
+	    xrect[0].y = -ob_rr_theme->bevel;
 	    xrect[0].width = self->width + self->bwidth * 2;
-	    xrect[0].height = theme_title_height +
+	    xrect[0].height = ob_rr_theme->title_height +
 		self->bwidth * 2;
 	    ++num;
 	}
 
 	if (self->client->decorations & Decor_Handle) {
-	    xrect[1].x = -theme_bevel;
+	    xrect[1].x = -ob_rr_theme->bevel;
 	    xrect[1].y = FRAME_HANDLE_Y(self);
 	    xrect[1].width = self->width + self->bwidth * 2;
-	    xrect[1].height = theme_handle_height +
+	    xrect[1].height = ob_rr_theme->handle_height +
 		self->bwidth * 2;
 	    ++num;
 	}
@@ -192,8 +194,8 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
 {
     if (resized) {
         if (self->client->decorations & Decor_Border) {
-            self->bwidth = theme_bwidth;
-            self->cbwidth = theme_cbwidth;
+            self->bwidth = ob_rr_theme->bwidth;
+            self->cbwidth = ob_rr_theme->cbwidth;
         } else {
             self->bwidth = self->cbwidth = 0;
         }
@@ -224,8 +226,8 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
         if (self->client->decorations & Decor_Titlebar) {
             XMoveResizeWindow(ob_display, self->title,
                               -self->bwidth, -self->bwidth,
-                              self->width, theme_title_height);
-            self->innersize.top += theme_title_height + self->bwidth;
+                              self->width, ob_rr_theme->title_height);
+            self->innersize.top += ob_rr_theme->title_height + self->bwidth;
             XMapWindow(ob_display, self->title);
 
             /* layout the title bar elements */
@@ -236,20 +238,20 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
         if (self->client->decorations & Decor_Handle) {
             XMoveResizeWindow(ob_display, self->handle,
                               -self->bwidth, FRAME_HANDLE_Y(self),
-                              self->width, theme_handle_height);
+                              self->width, ob_rr_theme->handle_height);
             XMoveWindow(ob_display, self->lgrip,
                         -self->bwidth, -self->bwidth);
             XMoveWindow(ob_display, self->rgrip,
                         -self->bwidth + self->width -
-                        theme_grip_width, -self->bwidth);
-            self->innersize.bottom += theme_handle_height +
+                        ob_rr_theme->grip_width, -self->bwidth);
+            self->innersize.bottom += ob_rr_theme->handle_height +
                 self->bwidth;
             XMapWindow(ob_display, self->handle);
 
             /* XXX make a subwindow with these dimentions?
-               theme_grip_width + self->bwidth, 0,
-               self->width - (theme_grip_width + self->bwidth) * 2,
-               theme_handle_height);
+               ob_rr_theme->grip_width + self->bwidth, 0,
+               self->width - (ob_rr_theme->grip_width + self->bwidth) * 2,
+               ob_rr_theme->handle_height);
             */
         } else
             XUnmapWindow(ob_display, self->handle);
@@ -278,7 +280,7 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
     RECT_SET_SIZE(self->area,
 		  self->client->area.width +
 		  self->size.left + self->size.right,
-		  (self->client->shaded ? theme_title_height + self->bwidth*2:
+		  (self->client->shaded ? ob_rr_theme->title_height + self->bwidth*2:
                    self->client->area.height +
                    self->size.top + self->size.bottom));
 
@@ -419,32 +421,36 @@ static void layout_title(Frame *self)
     n = d = i = l = m = c = s = FALSE;
 
     /* figure out whats being shown, and the width of the label */
-    self->label_width = self->width - (theme_bevel + 1) * 2;
-    for (lc = theme_title_layout; *lc != '\0'; ++lc) {
+    self->label_width = self->width - (ob_rr_theme->bevel + 1) * 2;
+    for (lc = ob_rr_theme->title_layout; *lc != '\0'; ++lc) {
 	switch (*lc) {
 	case 'N':
 	    if (!(self->client->decorations & Decor_Icon)) break;
             if (n) { *lc = ' '; break; } /* rm duplicates */
 	    n = TRUE;
-	    self->label_width -= theme_button_size + 2 + theme_bevel + 1;
+	    self->label_width -= (ob_rr_theme->button_size + 2 +
+                                  ob_rr_theme->bevel + 1);
 	    break;
 	case 'D':
 	    if (!(self->client->decorations & Decor_AllDesktops)) break;
             if (d) { *lc = ' '; break; } /* rm duplicates */
 	    d = TRUE;
-	    self->label_width -= theme_button_size + theme_bevel + 1;
+	    self->label_width -= (ob_rr_theme->button_size +
+                                  ob_rr_theme->bevel + 1);
 	    break;
 	case 'S':
 	    if (!(self->client->decorations & Decor_Shade)) break;
             if (s) { *lc = ' '; break; } /* rm duplicates */
 	    s = TRUE;
-	    self->label_width -= theme_button_size + theme_bevel + 1;
+	    self->label_width -= (ob_rr_theme->button_size +
+                                  ob_rr_theme->bevel + 1);
 	    break;
 	case 'I':
 	    if (!(self->client->decorations & Decor_Iconify)) break;
             if (i) { *lc = ' '; break; } /* rm duplicates */
 	    i = TRUE;
-	    self->label_width -= theme_button_size + theme_bevel + 1;
+	    self->label_width -= (ob_rr_theme->button_size +
+                                  ob_rr_theme->bevel + 1);
 	    break;
 	case 'L':
             if (l) { *lc = ' '; break; } /* rm duplicates */
@@ -454,20 +460,22 @@ static void layout_title(Frame *self)
 	    if (!(self->client->decorations & Decor_Maximize)) break;
             if (m) { *lc = ' '; break; } /* rm duplicates */
 	    m = TRUE;
-	    self->label_width -= theme_button_size + theme_bevel + 1;
+	    self->label_width -= (ob_rr_theme->button_size +
+                                  ob_rr_theme->bevel + 1);
 	    break;
 	case 'C':
 	    if (!(self->client->decorations & Decor_Close)) break;
             if (c) { *lc = ' '; break; } /* rm duplicates */
 	    c = TRUE;
-	    self->label_width -= theme_button_size + theme_bevel + 1;
+	    self->label_width -= (ob_rr_theme->button_size +
+                                  ob_rr_theme->bevel + 1);
 	    break;
 	}
     }
     if (self->label_width < 1) self->label_width = 1;
 
     XResizeWindow(ob_display, self->label, self->label_width,
-                  theme_label_height);
+                  ob_rr_theme->label_height);
   
     if (!n) XUnmapWindow(ob_display, self->icon);
     if (!d) XUnmapWindow(ob_display, self->desk);
@@ -477,57 +485,57 @@ static void layout_title(Frame *self)
     if (!m) XUnmapWindow(ob_display, self->max);
     if (!c) XUnmapWindow(ob_display, self->close);
 
-    x = theme_bevel + 1;
-    for (lc = theme_title_layout; *lc != '\0'; ++lc) {
+    x = ob_rr_theme->bevel + 1;
+    for (lc = ob_rr_theme->title_layout; *lc != '\0'; ++lc) {
 	switch (*lc) {
 	case 'N':
 	    if (!n) break;
 	    self->icon_x = x;
 	    XMapWindow(ob_display, self->icon);
-	    XMoveWindow(ob_display, self->icon, x, theme_bevel);
-	    x += theme_button_size + 2 + theme_bevel + 1;
+	    XMoveWindow(ob_display, self->icon, x, ob_rr_theme->bevel);
+	    x += ob_rr_theme->button_size + 2 + ob_rr_theme->bevel + 1;
 	    break;
 	case 'D':
 	    if (!d) break;
 	    self->desk_x = x;
 	    XMapWindow(ob_display, self->desk);
-	    XMoveWindow(ob_display, self->desk, x, theme_bevel + 1);
-	    x += theme_button_size + theme_bevel + 1;
+	    XMoveWindow(ob_display, self->desk, x, ob_rr_theme->bevel + 1);
+	    x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
 	    break;
 	case 'S':
 	    if (!s) break;
 	    self->shade_x = x;
 	    XMapWindow(ob_display, self->shade);
-	    XMoveWindow(ob_display, self->shade, x, theme_bevel + 1);
-	    x += theme_button_size + theme_bevel + 1;
+	    XMoveWindow(ob_display, self->shade, x, ob_rr_theme->bevel + 1);
+	    x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
 	    break;
 	case 'I':
 	    if (!i) break;
 	    self->iconify_x = x;
 	    XMapWindow(ob_display, self->iconify);
-	    XMoveWindow(ob_display, self->iconify, x, theme_bevel + 1);
-	    x += theme_button_size + theme_bevel + 1;
+	    XMoveWindow(ob_display, self->iconify, x, ob_rr_theme->bevel + 1);
+	    x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
 	    break;
 	case 'L':
 	    if (!l) break;
 	    self->label_x = x;
 	    XMapWindow(ob_display, self->label);
-	    XMoveWindow(ob_display, self->label, x, theme_bevel);
-	    x += self->label_width + theme_bevel + 1;
+	    XMoveWindow(ob_display, self->label, x, ob_rr_theme->bevel);
+	    x += self->label_width + ob_rr_theme->bevel + 1;
 	    break;
 	case 'M':
 	    if (!m) break;
 	    self->max_x = x;
 	    XMapWindow(ob_display, self->max);
-	    XMoveWindow(ob_display, self->max, x, theme_bevel + 1);
-	    x += theme_button_size + theme_bevel + 1;
+	    XMoveWindow(ob_display, self->max, x, ob_rr_theme->bevel + 1);
+	    x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
 	    break;
 	case 'C':
 	    if (!c) break;
 	    self->close_x = x;
 	    XMapWindow(ob_display, self->close);
-	    XMoveWindow(ob_display, self->close, x, theme_bevel + 1);
-	    x += theme_button_size + theme_bevel + 1;
+	    XMoveWindow(ob_display, self->close, x, ob_rr_theme->bevel + 1);
+	    x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
 	    break;
 	}
     }
diff --git a/openbox/framerender.c b/openbox/framerender.c
index 0781c8c7..01dc75b1 100644
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -16,10 +16,10 @@ void framerender_frame(Frame *self)
 {
     if (self->focused)
         XSetWindowBorder(ob_display, self->plate,
-                         theme_cb_focused_color->pixel);
+                         ob_rr_theme->cb_focused_color->pixel);
     else
         XSetWindowBorder(ob_display, self->plate,
-                         theme_cb_unfocused_color->pixel);
+                         ob_rr_theme->cb_unfocused_color->pixel);
 
     if (self->client->decorations & Decor_Titlebar) {
         RrAppearance *t, *l, *m, *n, *i, *d, *s, *c;
@@ -30,82 +30,83 @@ void framerender_frame(Frame *self)
              self->a_focused_label : self->a_unfocused_label);
         m = (self->focused ?
              (self->client->max_vert || self->client->max_horz ?
-              theme_a_focused_pressed_set_max :
+              ob_rr_theme->a_focused_pressed_set_max :
               (self->max_press ?
-               theme_a_focused_pressed_max : theme_a_focused_unpressed_max)) :
+               ob_rr_theme->a_focused_pressed_max :
+               ob_rr_theme->a_focused_unpressed_max)) :
              (self->client->max_vert || self->client->max_horz ?
-              theme_a_unfocused_pressed_set_max :
+              ob_rr_theme->a_unfocused_pressed_set_max :
               (self->max_press ?
-               theme_a_unfocused_pressed_max :
-               theme_a_unfocused_unpressed_max)));
+               ob_rr_theme->a_unfocused_pressed_max :
+               ob_rr_theme->a_unfocused_unpressed_max)));
         n = self->a_icon;
         i = (self->focused ?
              (self->iconify_press ?
-              theme_a_focused_pressed_iconify :
-              theme_a_focused_unpressed_iconify) :
+              ob_rr_theme->a_focused_pressed_iconify :
+              ob_rr_theme->a_focused_unpressed_iconify) :
              (self->iconify_press ?
-              theme_a_unfocused_pressed_iconify :
-              theme_a_unfocused_unpressed_iconify));
+              ob_rr_theme->a_unfocused_pressed_iconify :
+              ob_rr_theme->a_unfocused_unpressed_iconify));
         d = (self->focused ?
              (self->client->desktop == DESKTOP_ALL ?
-              theme_a_focused_pressed_set_desk :
+              ob_rr_theme->a_focused_pressed_set_desk :
               (self->desk_press ?
-               theme_a_focused_pressed_desk :
-               theme_a_focused_unpressed_desk)) :
+               ob_rr_theme->a_focused_pressed_desk :
+               ob_rr_theme->a_focused_unpressed_desk)) :
              (self->client->desktop == DESKTOP_ALL ?
-              theme_a_unfocused_pressed_set_desk :
+              ob_rr_theme->a_unfocused_pressed_set_desk :
               (self->desk_press ?
-               theme_a_unfocused_pressed_desk :
-               theme_a_unfocused_unpressed_desk)));
+               ob_rr_theme->a_unfocused_pressed_desk :
+               ob_rr_theme->a_unfocused_unpressed_desk)));
         s = (self->focused ?
              (self->client->shaded ?
-              theme_a_focused_pressed_set_shade :
+              ob_rr_theme->a_focused_pressed_set_shade :
               (self->shade_press ?
-               theme_a_focused_pressed_shade :
-               theme_a_focused_unpressed_shade)) :
+               ob_rr_theme->a_focused_pressed_shade :
+               ob_rr_theme->a_focused_unpressed_shade)) :
              (self->client->shaded ?
-              theme_a_unfocused_pressed_set_shade :
+              ob_rr_theme->a_unfocused_pressed_set_shade :
               (self->shade_press ?
-               theme_a_unfocused_pressed_shade :
-               theme_a_unfocused_unpressed_shade)));
+               ob_rr_theme->a_unfocused_pressed_shade :
+               ob_rr_theme->a_unfocused_unpressed_shade)));
         c = (self->focused ?
              (self->close_press ?
-              theme_a_focused_pressed_close :
-              theme_a_focused_unpressed_close) :
+              ob_rr_theme->a_focused_pressed_close :
+              ob_rr_theme->a_focused_unpressed_close) :
              (self->close_press ?
-              theme_a_unfocused_pressed_close :
-              theme_a_unfocused_unpressed_close));
+              ob_rr_theme->a_unfocused_pressed_close :
+              ob_rr_theme->a_unfocused_unpressed_close));
 
-        RrPaint(t, self->title, self->width, theme_title_height);
+        RrPaint(t, self->title, self->width, ob_rr_theme->title_height);
 
         /* set parents for any parent relative guys */
         l->surface.parent = t;
         l->surface.parentx = self->label_x;
-        l->surface.parenty = theme_bevel;
+        l->surface.parenty = ob_rr_theme->bevel;
 
         m->surface.parent = t;
         m->surface.parentx = self->max_x;
-        m->surface.parenty = theme_bevel + 1;
+        m->surface.parenty = ob_rr_theme->bevel + 1;
 
         n->surface.parent = t;
         n->surface.parentx = self->icon_x;
-        n->surface.parenty = theme_bevel;
+        n->surface.parenty = ob_rr_theme->bevel;
 
         i->surface.parent = t;
         i->surface.parentx = self->iconify_x;
-        i->surface.parenty = theme_bevel + 1;
+        i->surface.parenty = ob_rr_theme->bevel + 1;
 
         d->surface.parent = t;
         d->surface.parentx = self->desk_x;
-        d->surface.parenty = theme_bevel + 1;
+        d->surface.parenty = ob_rr_theme->bevel + 1;
 
         s->surface.parent = t;
         s->surface.parentx = self->shade_x;
-        s->surface.parenty = theme_bevel + 1;
+        s->surface.parenty = ob_rr_theme->bevel + 1;
 
         c->surface.parent = t;
         c->surface.parentx = self->close_x;
-        c->surface.parenty = theme_bevel + 1;
+        c->surface.parenty = ob_rr_theme->bevel + 1;
 
         framerender_label(self, l);
         framerender_max(self, m);
@@ -122,10 +123,10 @@ void framerender_frame(Frame *self)
         h = (self->focused ?
              self->a_focused_handle : self->a_unfocused_handle);
 
-        RrPaint(h, self->handle, self->width, theme_handle_height);
+        RrPaint(h, self->handle, self->width, ob_rr_theme->handle_height);
 
         g = (self->focused ?
-             theme_a_focused_grip : theme_a_unfocused_grip);
+             ob_rr_theme->a_focused_grip : ob_rr_theme->a_unfocused_grip);
 
         if (g->surface.grad == RR_SURFACE_PARENTREL)
             g->surface.parent = h;
@@ -133,12 +134,14 @@ void framerender_frame(Frame *self)
         g->surface.parentx = 0;
         g->surface.parenty = 0;
 
-        RrPaint(g, self->lgrip, theme_grip_width, theme_handle_height);
+        RrPaint(g, self->lgrip,
+                ob_rr_theme->grip_width, ob_rr_theme->handle_height);
 
-        g->surface.parentx = self->width - theme_grip_width;
+        g->surface.parentx = self->width - ob_rr_theme->grip_width;
         g->surface.parenty = 0;
 
-        RrPaint(g, self->rgrip, theme_grip_width, theme_handle_height);
+        RrPaint(g, self->rgrip,
+                ob_rr_theme->grip_width, ob_rr_theme->handle_height);
     }
 }
 
@@ -147,7 +150,7 @@ static void framerender_label(Frame *self, RrAppearance *a)
     if (self->label_x < 0) return;
     /* set the texture's text! */
     a->texture[0].data.text.string = self->client->title;
-    RrPaint(a, self->label, self->label_width, theme_label_height);
+    RrPaint(a, self->label, self->label_width, ob_rr_theme->label_height);
 }
 
 static void framerender_icon(Frame *self, RrAppearance *a)
@@ -156,7 +159,8 @@ static void framerender_icon(Frame *self, RrAppearance *a)
 
     if (self->client->nicons) {
         Icon *icon = client_icon(self->client,
-                                 theme_button_size + 2, theme_button_size + 2);
+                                 ob_rr_theme->button_size + 2,
+                                 ob_rr_theme->button_size + 2);
         a->texture[0].type = RR_TEXTURE_RGBA;
         a->texture[0].data.rgba.width = icon->width;
         a->texture[0].data.rgba.height = icon->height;
@@ -164,35 +168,39 @@ static void framerender_icon(Frame *self, RrAppearance *a)
     } else
         a->texture[0].type = RR_TEXTURE_NONE;
 
-    RrPaint(a, self->icon, theme_button_size + 2, theme_button_size + 2);
+    RrPaint(a, self->icon,
+            ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2);
 }
 
 static void framerender_max(Frame *self, RrAppearance *a)
 {
     if (self->max_x < 0) return;
-    RrPaint(a, self->max, theme_button_size, theme_button_size);
+    RrPaint(a, self->max, ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
 static void framerender_iconify(Frame *self, RrAppearance *a)
 {
     if (self->iconify_x < 0) return;
-    RrPaint(a, self->iconify, theme_button_size, theme_button_size);
+    RrPaint(a, self->iconify,
+            ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
 static void framerender_desk(Frame *self, RrAppearance *a)
 {
     if (self->desk_x < 0) return;
-    RrPaint(a, self->desk, theme_button_size, theme_button_size);
+    RrPaint(a, self->desk, ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
 static void framerender_shade(Frame *self, RrAppearance *a)
 {
     if (self->shade_x < 0) return;
-    RrPaint(a, self->shade, theme_button_size, theme_button_size);
+    RrPaint(a, self->shade,
+            ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
 static void framerender_close(Frame *self, RrAppearance *a)
 {
     if (self->close_x < 0) return;
-    RrPaint(a, self->close, theme_button_size, theme_button_size);
+    RrPaint(a, self->close,
+            ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
diff --git a/openbox/menu.c b/openbox/menu.c
index 86291768..8e2a8583 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -164,17 +164,17 @@ Menu *menu_new_full(char *label, char *name, Menu *parent,
     self->title = createWindow(self->frame, CWEventMask, &attrib);
     self->items = createWindow(self->frame, 0, &attrib);
 
-    XSetWindowBorderWidth(ob_display, self->frame, theme_bwidth);
-    XSetWindowBackground(ob_display, self->frame, theme_b_color->pixel);
-    XSetWindowBorderWidth(ob_display, self->title, theme_bwidth);
-    XSetWindowBorder(ob_display, self->frame, theme_b_color->pixel);
-    XSetWindowBorder(ob_display, self->title, theme_b_color->pixel);
+    XSetWindowBorderWidth(ob_display, self->frame, ob_rr_theme->bwidth);
+    XSetWindowBackground(ob_display, self->frame, ob_rr_theme->b_color->pixel);
+    XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth);
+    XSetWindowBorder(ob_display, self->frame, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
 
     XMapWindow(ob_display, self->title);
     XMapWindow(ob_display, self->items);
 
-    self->a_title = RrAppearanceCopy(theme_a_menu_title);
-    self->a_items = RrAppearanceCopy(theme_a_menu);
+    self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
+    self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
 
     g_hash_table_insert(window_map, &self->frame, self);
     g_hash_table_insert(window_map, &self->title, self);
@@ -234,9 +234,9 @@ void menu_add_entry(Menu *menu, MenuEntry *entry)
     attrib.event_mask = ENTRY_EVENTMASK;
     entry->item = createWindow(menu->items, CWEventMask, &attrib);
     XMapWindow(ob_display, entry->item);
-    entry->a_item = RrAppearanceCopy(theme_a_menu_item);
-    entry->a_disabled = RrAppearanceCopy(theme_a_menu_disabled);
-    entry->a_hilite = RrAppearanceCopy(theme_a_menu_hilite);
+    entry->a_item = RrAppearanceCopy(ob_rr_theme->a_menu_item);
+    entry->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled);
+    entry->a_hilite = RrAppearanceCopy(ob_rr_theme->a_menu_hilite);
 
     menu->invalid = TRUE;
 
@@ -363,14 +363,14 @@ void menu_control_mouseover(MenuEntry *self, gboolean enter) {
 	    /* TODO: I don't understand why these bevels should be here.
 	       Something must be wrong in the width calculation */
 	    x = self->parent->location.x + self->parent->size.width + 
-		theme_bevel;
+		ob_rr_theme->bevel;
 
 	    /* need to get the width. is this bad?*/
 	    menu_render(self->submenu);
 
 	    if (self->submenu->size.width + x > screen_physical_size.width)
 		x = self->parent->location.x - self->submenu->size.width - 
-		    theme_bevel;
+		    ob_rr_theme->bevel;
 	    
 	    menu_show_full(self->submenu, x,
 			   self->parent->location.y + self->y,
diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index 55819cd4..2ca1c773 100644
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -30,8 +30,8 @@ void menu_render_full(Menu *self) {
     if (self->label) {
 	self->a_title->texture[0].data.text.string = self->label;
 	RrMinsize(self->a_title, &self->title_min_w, &self->title_h);
-	self->title_min_w += theme_bevel * 2;
-	self->title_h += theme_bevel * 2;
+	self->title_min_w += ob_rr_theme->bevel * 2;
+	self->title_h += ob_rr_theme->bevel * 2;
 	self->size.width = MAX(self->size.width, self->title_min_w);
     }
 
@@ -53,22 +53,23 @@ void menu_render_full(Menu *self) {
         self->item_h = MAX(self->item_h, h);
         self->size.width = MAX(self->size.width, e->min_w);
 
-        e->min_w += theme_bevel * 2;
+        e->min_w += ob_rr_theme->bevel * 2;
         ++nitems;
     }
-    self->bullet_w = self->item_h + theme_bevel;
-    self->size.width += 2 * self->bullet_w + 2 * theme_bevel;
-    self->item_h += theme_bevel * 2;
+    self->bullet_w = self->item_h + ob_rr_theme->bevel;
+    self->size.width += 2 * self->bullet_w + 2 * ob_rr_theme->bevel;
+    self->item_h += ob_rr_theme->bevel * 2;
     items_h = self->item_h * MAX(nitems, 1);
 
     XResizeWindow(ob_display, self->frame, self->size.width,
 		  MAX(self->title_h + items_h, 1));
     if (self->label)
-	XMoveResizeWindow(ob_display, self->title, -theme_bwidth,
-			  -theme_bwidth, self->size.width, self->title_h);
+	XMoveResizeWindow(ob_display, self->title, -ob_rr_theme->bwidth,
+			  -ob_rr_theme->bwidth,
+                          self->size.width, self->title_h);
 
     XMoveResizeWindow(ob_display, self->items, 0, 
-		      self->title_h + theme_bwidth, self->size.width, 
+		      self->title_h + ob_rr_theme->bwidth, self->size.width, 
 		      items_h);
 
     if (self->label)
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 4b1ee6ea..287d4ec0 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -61,7 +61,7 @@ void moveresize_startup()
 
     /* a GC to invert stuff */
     gcv.function = GXxor;
-    gcv.line_width = theme_bwidth;
+    gcv.line_width = ob_rr_theme->bwidth;
     gcv.foreground = (WhitePixel(ob_display, ob_screen) ^
                       BlackPixel(ob_display, ob_screen));
     opaque_gc = XCreateGC(ob_display, opaque_window.win,
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 6cde2c0e..d63c67b8 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -20,7 +20,6 @@
 #include "gettext.h"
 #include "parser/parse.h"
 #include "render/render.h"
-#include "render/font.h"
 #include "render/theme.h"
 
 #ifdef HAVE_FCNTL_H
@@ -46,6 +45,7 @@
 #include <X11/cursorfont.h>
 
 RrInstance *ob_rr_inst = NULL;
+RrTheme    *ob_rr_theme = NULL;
 Display    *ob_display = NULL;
 int         ob_screen;
 Window      ob_root;
@@ -66,7 +66,6 @@ int main(int argc, char **argv)
     struct sigaction action;
     sigset_t sigset;
     char *path;
-    char *theme;
     xmlDocPtr doc;
     xmlNodePtr node;
 
@@ -178,7 +177,6 @@ int main(int argc, char **argv)
            in this group */
 	timer_startup();
 	font_startup();
-        theme_startup(ob_rr_inst);
 	event_startup();
         grab_startup();
         plugin_startup();
@@ -194,9 +192,11 @@ int main(int argc, char **argv)
         parse_shutdown();
 
         /* load the theme specified in the rc file */
-        theme = theme_load(config_theme);
-        g_free(theme);
-        if (!theme) return 1;
+        ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
+        if (ob_rr_theme == NULL) {
+            g_critical("Unable to load a theme.");
+            exit(1);
+        }
 
         window_startup();
         menu_startup();
@@ -234,13 +234,13 @@ int main(int argc, char **argv)
         window_shutdown();
         grab_shutdown();
 	event_shutdown();
-        theme_shutdown();
 	timer_shutdown();
         config_shutdown();
     }
 
     dispatch_shutdown();
 
+    RrThemeFree(ob_rr_theme);
     RrInstanceFree(ob_rr_inst);
     XCloseDisplay(ob_display);
 
diff --git a/openbox/openbox.h b/openbox/openbox.h
index eec3fd7c..7723035e 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -2,6 +2,7 @@
 #define __openbox_h
 
 #include "render/render.h"
+#include "render/theme.h"
 
 #ifdef USE_LIBSN
 #  define SN_API_NOT_YET_FROZEN
@@ -12,6 +13,7 @@
 #include <X11/Xlib.h>
 
 extern RrInstance *ob_rr_inst;
+extern RrTheme    *ob_rr_theme;
 
 /*! The X display */
 extern Display *ob_display; 
diff --git a/openbox/popup.c b/openbox/popup.c
index 2e65570e..fa003ec8 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -74,16 +74,16 @@ void popup_size_to_string(Popup *self, char *text)
     int iconw;
 
     if (!self->a_text)
-        self->a_text = RrAppearanceCopy(theme_app_hilite_label);
+        self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
 
     self->a_text->texture[0].data.text.string = text;
     RrMinsize(self->a_text, &textw, &texth);
-    textw += theme_bevel * 2;
-    texth += theme_bevel * 2;
+    textw += ob_rr_theme->bevel * 2;
+    texth += ob_rr_theme->bevel * 2;
 
-    self->h = texth + theme_bevel * 2;
+    self->h = texth + ob_rr_theme->bevel * 2;
     iconw = (self->hasicon ? texth : 0);
-    self->w = textw + iconw + theme_bevel * (self->hasicon ? 3 : 2);
+    self->w = textw + iconw + ob_rr_theme->bevel * (self->hasicon ? 3 : 2);
 }
 
 void popup_show(Popup *self, char *text, Icon *icon)
@@ -101,8 +101,8 @@ void popup_show(Popup *self, char *text, Icon *icon)
                                  InputOutput, RrVisual(ob_rr_inst),
                                  CWOverrideRedirect, &attrib);
 
-        XSetWindowBorderWidth(ob_display, self->bg, theme_bwidth);
-        XSetWindowBorder(ob_display, self->bg, theme_b_color->pixel);
+        XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->bwidth);
+        XSetWindowBorder(ob_display, self->bg, ob_rr_theme->b_color->pixel);
 
         self->text = XCreateWindow(ob_display, self->bg,
                                    0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
@@ -116,12 +116,12 @@ void popup_show(Popup *self, char *text, Icon *icon)
         XMapWindow(ob_display, self->text);
         XMapWindow(ob_display, self->icon);
 
-        self->a_bg = RrAppearanceCopy(theme_app_hilite_bg);
+        self->a_bg = RrAppearanceCopy(ob_rr_theme->app_hilite_bg);
         if (self->hasicon)
-            self->a_icon = RrAppearanceCopy(theme_app_icon);
+            self->a_icon = RrAppearanceCopy(ob_rr_theme->app_icon);
     }
     if (!self->a_text)
-        self->a_text = RrAppearanceCopy(theme_app_hilite_label);
+        self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
 
     /* set up the textures */
     self->a_text->texture[0].data.text.string = text;
@@ -137,22 +137,22 @@ void popup_show(Popup *self, char *text, Icon *icon)
 
     /* measure the shit out */
     RrMinsize(self->a_text, &textw, &texth);
-    textw += theme_bevel * 2;
-    texth += theme_bevel * 2;
+    textw += ob_rr_theme->bevel * 2;
+    texth += ob_rr_theme->bevel * 2;
 
     /* set the sizes up and reget the text sizes from the calculated
        outer sizes */
     if (self->h) {
         h = self->h;
-        texth = h - (theme_bevel * 2);
+        texth = h - (ob_rr_theme->bevel * 2);
     } else
-        h = texth + theme_bevel * 2;
+        h = texth + ob_rr_theme->bevel * 2;
     iconw = (self->hasicon ? texth : 0);
     if (self->w) {
         w = self->w;
-        textw = w - (iconw + theme_bevel * (self->hasicon ? 3 : 2));
+        textw = w - (iconw + ob_rr_theme->bevel * (self->hasicon ? 3 : 2));
     } else
-        w = textw + iconw + theme_bevel * (self->hasicon ? 3 : 2);
+        w = textw + iconw + ob_rr_theme->bevel * (self->hasicon ? 3 : 2);
     /* sanity checks to avoid crashes! */
     if (w < 1) w = 1;
     if (h < 1) h = 1;
@@ -194,19 +194,20 @@ void popup_show(Popup *self, char *text, Icon *icon)
 
     self->a_text->surface.parent = self->a_bg;
     self->a_text->surface.parentx = iconw +
-        theme_bevel * (self->hasicon ? 2 : 1);
-    self->a_text->surface.parenty = theme_bevel;
+        ob_rr_theme->bevel * (self->hasicon ? 2 : 1);
+    self->a_text->surface.parenty = ob_rr_theme->bevel;
     XMoveResizeWindow(ob_display, self->text,
-                      iconw + theme_bevel * (self->hasicon ? 2 : 1),
-                      theme_bevel, textw, texth);
+                      iconw + ob_rr_theme->bevel * (self->hasicon ? 2 : 1),
+                      ob_rr_theme->bevel, textw, texth);
 
     if (self->hasicon) {
         if (iconw < 1) iconw = 1; /* sanity check for crashes */
         self->a_icon->surface.parent = self->a_bg;
-        self->a_icon->surface.parentx = theme_bevel;
-        self->a_icon->surface.parenty = theme_bevel;
+        self->a_icon->surface.parentx = ob_rr_theme->bevel;
+        self->a_icon->surface.parenty = ob_rr_theme->bevel;
         XMoveResizeWindow(ob_display, self->icon,
-                          theme_bevel, theme_bevel, iconw, texth);
+                          ob_rr_theme->bevel, ob_rr_theme->bevel,
+                          iconw, texth);
     }
 
     RrPaint(self->a_bg, self->bg, w, h);
diff --git a/plugins/menu/client_menu.c b/plugins/menu/client_menu.c
index fb15c1be..7e15f3f9 100644
--- a/plugins/menu/client_menu.c
+++ b/plugins/menu/client_menu.c
@@ -48,13 +48,13 @@ void client_menu_show(Menu *self, int x, int y, Client *client)
     g_assert(client);
     
     newy = MAX(client->frame->area.y + client->frame->size.top, y);
-    newy -= theme_bwidth;
+    newy -= ob_rr_theme->bwidth;
     
     POINT_SET(self->location, 
 	      MIN(x, screen_physical_size.width - self->size.width -
-                  theme_bwidth * 2), 
+                  ob_rr_theme->bwidth * 2), 
 	      MIN(newy, screen_physical_size.height - self->size.height -
-                  theme_bwidth * 2));
+                  ob_rr_theme->bwidth * 2));
     XMoveWindow(ob_display, self->frame, self->location.x, self->location.y);
 
     if (!self->shown) {
diff --git a/render/font.c b/render/font.c
index 785b22fc..64f1da16 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,6 +1,5 @@
 #include "font.h"
 #include "theme.h"
-#include "kernel/openbox.h"
 #include "kernel/geom.h"
 #include "kernel/gettext.h"
 #define _(str) gettext(str)
@@ -35,18 +34,19 @@ static void measure_height(RrFont *f)
     XGlyphInfo info;
 
     /* measure an elipses */
-    XftTextExtentsUtf8(ob_display, f->xftfont,
+    XftTextExtentsUtf8(RrDisplay(f->inst), f->xftfont,
                        (FcChar8*)ELIPSES, strlen(ELIPSES), &info);
     f->elipses_length = (signed) info.xOff;
 }
 
-RrFont *font_open(char *fontstring)
+RrFont *font_open(const RrInstance *inst, char *fontstring)
 {
     RrFont *out;
     XftFont *xf;
     
-    if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
+    if ((xf = XftFontOpenName(RrDisplay(inst), RrScreen(inst), fontstring))) {
         out = g_new(RrFont, 1);
+        out->inst = inst;
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -54,8 +54,9 @@ RrFont *font_open(char *fontstring)
     g_warning(_("Unable to load font: %s\n"), fontstring);
     g_warning(_("Trying fallback font: %s\n"), "sans");
 
-    if ((xf = XftFontOpenName(ob_display, ob_screen, "sans"))) {
+    if ((xf = XftFontOpenName(RrDisplay(inst), RrScreen(inst), "sans"))) {
         out = g_new(RrFont, 1);
+        out->inst = inst;
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -69,7 +70,7 @@ RrFont *font_open(char *fontstring)
 void font_close(RrFont *f)
 {
     if (f) {
-        XftFontClose(ob_display, f->xftfont);
+        XftFontClose(RrDisplay(f->inst), f->xftfont);
         g_free(f);
     }
 }
@@ -79,7 +80,7 @@ void font_measure_full(RrFont *f, char *str, int shadow, int offset,
 {
     XGlyphInfo info;
 
-    XftTextExtentsUtf8(ob_display, f->xftfont,
+    XftTextExtentsUtf8(RrDisplay(f->inst), f->xftfont,
                        (FcChar8*)str, strlen(str), &info);
 
     *x = (signed) info.xOff + (shadow ? ABS(offset) : 0);
@@ -115,7 +116,7 @@ void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
     /* center vertically */
     y = area->y +
         (area->height - font_height(t->font, t->shadow, t->offset)) / 2;
-    w = area->width - theme_bevel * 2;
+    w = area->width;
     h = area->height;
 
     text = g_string_new(t->string);
@@ -140,10 +141,10 @@ void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
 
     switch (t->justify) {
     case RR_JUSTIFY_LEFT:
-        x = area->x + theme_bevel;
+        x = area->x;
         break;
     case RR_JUSTIFY_RIGHT:
-        x = area->x + (w - mw) - theme_bevel;
+        x = area->x + (w - mw);
         break;
     case RR_JUSTIFY_CENTER:
         x = area->x + (w - mw) / 2;
@@ -158,13 +159,15 @@ void font_draw(XftDraw *d, RrTextureText *t, Rect *area)
             c.color.green = 0;
             c.color.blue = 0;
             c.color.alpha = 0xffff * t->tint / 100; /* transparent shadow */
-            c.pixel = BlackPixel(ob_display, ob_screen);
+            c.pixel = BlackPixel(RrDisplay(t->font->inst),
+                                 RrScreen(t->font->inst));
         } else {
             c.color.red = 0xffff * -t->tint / 100;
             c.color.green = 0xffff * -t->tint / 100;
             c.color.blue = 0xffff * -t->tint / 100;
             c.color.alpha = 0xffff * -t->tint / 100; /* transparent shadow */
-            c.pixel = WhitePixel(ob_display, ob_screen);
+            c.pixel = WhitePixel(RrDisplay(t->font->inst),
+                                 RrScreen(t->font->inst));
         }  
         XftDrawStringUtf8(d, &c, t->font->xftfont, x + t->offset,
                           t->font->xftfont->ascent + y + t->offset,
diff --git a/render/font.h b/render/font.h
index 393ac88e..7b483d89 100644
--- a/render/font.h
+++ b/render/font.h
@@ -6,12 +6,13 @@
 #include "kernel/geom.h"
 
 struct _RrFont {
+    const RrInstance *inst;
     XftFont *xftfont;
     gint elipses_length;
 };
 
 void font_startup(void);
-RrFont *font_open(char *fontstring);
+RrFont *font_open(const RrInstance *inst, char *fontstring);
 void font_close(RrFont *f);
 int font_measure_string(RrFont *f, char *str, int shadow, int offset);
 int font_height(RrFont *f, int shadow, int offset);
diff --git a/render/theme.c b/render/theme.c
index d2456672..991dfd1c 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -2,240 +2,699 @@
 #include "color.h"
 #include "font.h"
 #include "mask.h"
+#include "theme.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
-/* style settings - geometry */
-gint theme_bevel;
-gint theme_handle_height;
-gint theme_bwidth;
-gint theme_cbwidth;
-/* style settings - colors */
-color_rgb *theme_b_color;
-color_rgb *theme_cb_focused_color;
-color_rgb *theme_cb_unfocused_color;
-color_rgb *theme_title_focused_color;
-color_rgb *theme_title_unfocused_color;
-color_rgb *theme_titlebut_focused_color;
-color_rgb *theme_titlebut_unfocused_color;
-color_rgb *theme_menu_title_color;
-color_rgb *theme_menu_color;
-color_rgb *theme_menu_disabled_color;
-color_rgb *theme_menu_hilite_color;
-/* style settings - fonts */
-gint theme_winfont_height;
-RrFont *theme_winfont;
-gboolean theme_winfont_shadow;
-gint theme_winfont_shadow_offset;
-gint theme_winfont_shadow_tint;
-gint theme_mtitlefont_height;
-RrFont *theme_mtitlefont;
-gboolean theme_mtitlefont_shadow;
-gint theme_mtitlefont_shadow_offset;
-gint theme_mtitlefont_shadow_tint;
-gint theme_mfont_height;
-RrFont *theme_mfont;
-gboolean theme_mfont_shadow;
-gint theme_mfont_shadow_offset;
-gint theme_mfont_shadow_tint;
-/* style settings - title layout */
-gchar *theme_title_layout;
-/* style settings - masks */
-RrPixmapMask *theme_max_set_mask;
-RrPixmapMask *theme_max_unset_mask;
-RrPixmapMask *theme_iconify_mask;
-RrPixmapMask *theme_desk_set_mask;
-RrPixmapMask *theme_desk_unset_mask;
-RrPixmapMask *theme_shade_set_mask;
-RrPixmapMask *theme_shade_unset_mask;
-RrPixmapMask *theme_close_mask;
-
-/* global appearances */
-RrAppearance *theme_a_focused_unpressed_max;
-RrAppearance *theme_a_focused_pressed_max;
-RrAppearance *theme_a_focused_pressed_set_max;
-RrAppearance *theme_a_unfocused_unpressed_max;
-RrAppearance *theme_a_unfocused_pressed_max;
-RrAppearance *theme_a_unfocused_pressed_set_max;
-RrAppearance *theme_a_focused_unpressed_close;
-RrAppearance *theme_a_focused_pressed_close;
-RrAppearance *theme_a_unfocused_unpressed_close;
-RrAppearance *theme_a_unfocused_pressed_close;
-RrAppearance *theme_a_focused_unpressed_desk;
-RrAppearance *theme_a_focused_pressed_desk;
-RrAppearance *theme_a_focused_pressed_set_desk;
-RrAppearance *theme_a_unfocused_unpressed_desk;
-RrAppearance *theme_a_unfocused_pressed_desk;
-RrAppearance *theme_a_unfocused_pressed_set_desk;
-RrAppearance *theme_a_focused_unpressed_shade;
-RrAppearance *theme_a_focused_pressed_shade;
-RrAppearance *theme_a_focused_pressed_set_shade;
-RrAppearance *theme_a_unfocused_unpressed_shade;
-RrAppearance *theme_a_unfocused_pressed_shade;
-RrAppearance *theme_a_unfocused_pressed_set_shade;
-RrAppearance *theme_a_focused_unpressed_iconify;
-RrAppearance *theme_a_focused_pressed_iconify;
-RrAppearance *theme_a_unfocused_unpressed_iconify;
-RrAppearance *theme_a_unfocused_pressed_iconify;
-RrAppearance *theme_a_focused_grip;
-RrAppearance *theme_a_unfocused_grip;
-RrAppearance *theme_a_focused_title;
-RrAppearance *theme_a_unfocused_title;
-RrAppearance *theme_a_focused_label;
-RrAppearance *theme_a_unfocused_label;
-RrAppearance *theme_a_icon; /* always parentrelative, so no focused/unfocused */
-RrAppearance *theme_a_focused_handle;
-RrAppearance *theme_a_unfocused_handle;
-RrAppearance *theme_a_menu_title;
-RrAppearance *theme_a_menu;
-RrAppearance *theme_a_menu_item;
-RrAppearance *theme_a_menu_disabled;
-RrAppearance *theme_a_menu_hilite;
-
-RrAppearance *theme_app_hilite_bg;
-RrAppearance *theme_app_unhilite_bg;
-RrAppearance *theme_app_hilite_label;
-RrAppearance *theme_app_unhilite_label;
-RrAppearance *theme_app_icon;
-
-static const RrInstance *theme_inst = NULL;
-
-void theme_startup(const RrInstance *inst)
+static XrmDatabase loaddb(char *theme);
+static gboolean read_int(XrmDatabase db, char *rname, int *value);
+static gboolean read_string(XrmDatabase db, char *rname, char **value);
+static gboolean read_color(XrmDatabase db, const RrInstance *inst,
+                           gchar *rname, color_rgb **value);
+static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
+                          gchar *rname, gchar *theme,
+                          RrPixmapMask **value);
+static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
+                                gchar *rname, RrAppearance *value);
+static void set_default_appearance(RrAppearance *a);
+
+RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 {
-    theme_inst = inst;
-
-    theme_b_color = theme_cb_unfocused_color = theme_cb_focused_color = 
-        theme_title_unfocused_color = theme_title_focused_color = 
-        theme_titlebut_unfocused_color = theme_titlebut_focused_color = 
-        theme_menu_color = theme_menu_title_color = theme_menu_disabled_color =
-        theme_menu_hilite_color = NULL;
-    theme_winfont = theme_mtitlefont = theme_mfont = NULL;
-    theme_title_layout = NULL;
-    theme_max_set_mask = theme_max_unset_mask = NULL;
-    theme_desk_set_mask = theme_desk_unset_mask = NULL;
-    theme_shade_set_mask = theme_shade_unset_mask = NULL;
-    theme_iconify_mask = theme_close_mask = NULL;
-
-    theme_a_focused_unpressed_max = RrAppearanceNew(inst, 1);
-    theme_a_focused_pressed_max = RrAppearanceNew(inst, 1);
-    theme_a_focused_pressed_set_max = RrAppearanceNew(inst, 1);
-    theme_a_unfocused_unpressed_max = RrAppearanceNew(inst, 1);
-    theme_a_unfocused_pressed_max = RrAppearanceNew(inst, 1);
-    theme_a_unfocused_pressed_set_max = RrAppearanceNew(inst, 1);
-    theme_a_focused_unpressed_close = NULL;
-    theme_a_focused_pressed_close = NULL;
-    theme_a_unfocused_unpressed_close = NULL;
-    theme_a_unfocused_pressed_close = NULL;
-    theme_a_focused_unpressed_desk = NULL;
-    theme_a_focused_pressed_desk = NULL;
-    theme_a_focused_pressed_set_desk = NULL;
-    theme_a_unfocused_unpressed_desk = NULL;
-    theme_a_unfocused_pressed_desk = NULL;
-    theme_a_unfocused_pressed_set_desk = NULL;
-    theme_a_focused_unpressed_shade = NULL;
-    theme_a_focused_pressed_shade = NULL;
-    theme_a_focused_pressed_set_shade = NULL;
-    theme_a_unfocused_unpressed_shade = NULL;
-    theme_a_unfocused_pressed_shade = NULL;
-    theme_a_unfocused_pressed_set_shade = NULL;
-    theme_a_focused_unpressed_iconify = NULL;
-    theme_a_focused_pressed_iconify = NULL;
-    theme_a_unfocused_unpressed_iconify = NULL;
-    theme_a_unfocused_pressed_iconify = NULL;
-    theme_a_focused_grip = RrAppearanceNew(inst, 0);
-    theme_a_unfocused_grip = RrAppearanceNew(inst, 0);
-    theme_a_focused_title = RrAppearanceNew(inst, 0);
-    theme_a_unfocused_title = RrAppearanceNew(inst, 0);
-    theme_a_focused_label = RrAppearanceNew(inst, 1);
-    theme_a_unfocused_label = RrAppearanceNew(inst, 1);
-    theme_a_icon = RrAppearanceNew(inst, 1);
-    theme_a_focused_handle = RrAppearanceNew(inst, 0);
-    theme_a_unfocused_handle = RrAppearanceNew(inst, 0);
-    theme_a_menu = RrAppearanceNew(inst, 0);
-    theme_a_menu_title = RrAppearanceNew(inst, 1);
-    theme_a_menu_item = RrAppearanceNew(inst, 1);
-    theme_a_menu_disabled = RrAppearanceNew(inst, 1);
-    theme_a_menu_hilite = RrAppearanceNew(inst, 1);
-
-    theme_app_hilite_bg = RrAppearanceNew(inst, 0);
-    theme_app_unhilite_bg = RrAppearanceNew(inst, 0);
-    theme_app_hilite_label = RrAppearanceNew(inst, 1);
-    theme_app_unhilite_label = RrAppearanceNew(inst, 1);
-    theme_app_icon = RrAppearanceNew(inst, 1);
+    XrmDatabase db = NULL;
+    RrJustify winjust, mtitlejust, mjust;
+    gchar *str;
+    gchar *font_str;
+    RrTheme *theme;
+
+    theme = g_new(RrTheme, 1);
+
+    theme->inst = inst;
+
+    theme->b_color = theme->cb_unfocused_color = theme->cb_focused_color = 
+        theme->title_unfocused_color = theme->title_focused_color = 
+        theme->titlebut_unfocused_color = theme->titlebut_focused_color = 
+        theme->menu_color = theme->menu_title_color =
+        theme->menu_disabled_color = theme->menu_hilite_color = NULL;
+    theme->winfont = theme->mtitlefont = theme->mfont = NULL;
+    theme->title_layout = NULL;
+    theme->max_set_mask = theme->max_unset_mask = NULL;
+    theme->desk_set_mask = theme->desk_unset_mask = NULL;
+    theme->shade_set_mask = theme->shade_unset_mask = NULL;
+    theme->iconify_mask = theme->close_mask = NULL;
+
+    theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1);
+    theme->a_focused_pressed_max = RrAppearanceNew(inst, 1);
+    theme->a_focused_pressed_set_max = RrAppearanceNew(inst, 1);
+    theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1);
+    theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1);
+    theme->a_unfocused_pressed_set_max = RrAppearanceNew(inst, 1);
+    theme->a_focused_unpressed_close = NULL;
+    theme->a_focused_pressed_close = NULL;
+    theme->a_unfocused_unpressed_close = NULL;
+    theme->a_unfocused_pressed_close = NULL;
+    theme->a_focused_unpressed_desk = NULL;
+    theme->a_focused_pressed_desk = NULL;
+    theme->a_focused_pressed_set_desk = NULL;
+    theme->a_unfocused_unpressed_desk = NULL;
+    theme->a_unfocused_pressed_desk = NULL;
+    theme->a_unfocused_pressed_set_desk = NULL;
+    theme->a_focused_unpressed_shade = NULL;
+    theme->a_focused_pressed_shade = NULL;
+    theme->a_focused_pressed_set_shade = NULL;
+    theme->a_unfocused_unpressed_shade = NULL;
+    theme->a_unfocused_pressed_shade = NULL;
+    theme->a_unfocused_pressed_set_shade = NULL;
+    theme->a_focused_unpressed_iconify = NULL;
+    theme->a_focused_pressed_iconify = NULL;
+    theme->a_unfocused_unpressed_iconify = NULL;
+    theme->a_unfocused_pressed_iconify = NULL;
+    theme->a_focused_grip = RrAppearanceNew(inst, 0);
+    theme->a_unfocused_grip = RrAppearanceNew(inst, 0);
+    theme->a_focused_title = RrAppearanceNew(inst, 0);
+    theme->a_unfocused_title = RrAppearanceNew(inst, 0);
+    theme->a_focused_label = RrAppearanceNew(inst, 1);
+    theme->a_unfocused_label = RrAppearanceNew(inst, 1);
+    theme->a_icon = RrAppearanceNew(inst, 1);
+    theme->a_focused_handle = RrAppearanceNew(inst, 0);
+    theme->a_unfocused_handle = RrAppearanceNew(inst, 0);
+    theme->a_menu = RrAppearanceNew(inst, 0);
+    theme->a_menu_title = RrAppearanceNew(inst, 1);
+    theme->a_menu_item = RrAppearanceNew(inst, 1);
+    theme->a_menu_disabled = RrAppearanceNew(inst, 1);
+    theme->a_menu_hilite = RrAppearanceNew(inst, 1);
+
+    theme->app_hilite_bg = RrAppearanceNew(inst, 0);
+    theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
+    theme->app_hilite_label = RrAppearanceNew(inst, 1);
+    theme->app_unhilite_label = RrAppearanceNew(inst, 1);
+    theme->app_icon = RrAppearanceNew(inst, 1);
+
+    if (name) {
+	db = loaddb(name);
+        if (db == NULL) {
+	    g_warning("Failed to load the theme '%s'", name);
+	    g_message("Falling back to the default: '%s'", DEFAULT_THEME);
+	} else
+            theme->name = g_strdup(name);
+    }
+    if (db == NULL) {
+	db = loaddb(DEFAULT_THEME);
+	if (db == NULL) {
+	    g_warning("Failed to load the theme '%s'.", DEFAULT_THEME);
+	    return NULL;
+	} else
+            theme->name = g_strdup(DEFAULT_THEME);
+    }
+
+    /* load the font stuff */
+    font_str = "arial:bold:pixelsize=10";
+
+    theme->winfont_shadow = FALSE;
+    if (read_string(db, "window.xft.flags", &str)) {
+        if (g_strrstr(str, "shadow"))
+            theme->winfont_shadow = TRUE;
+        g_free(str);
+    }
+ 
+    if (!read_int(db, "window.xft.shadow.offset",
+                  &theme->winfont_shadow_offset))
+        theme->winfont_shadow_offset = 1;
+    if (!read_int(db, "window.xft.shadow.tint",
+                  &theme->winfont_shadow_tint) ||
+        theme->winfont_shadow_tint < 100 || theme->winfont_shadow_tint > 100)
+        theme->winfont_shadow_tint = 25;
+
+    theme->winfont = font_open(inst, font_str);
+    theme->winfont_height = font_height(theme->winfont, theme->winfont_shadow,
+                                       theme->winfont_shadow_offset);
+
+    winjust = RR_JUSTIFY_LEFT;
+    if (read_string(db, "window.justify", &str)) {
+        if (!g_ascii_strcasecmp(str, "right"))
+            winjust = RR_JUSTIFY_RIGHT;
+        else if (!g_ascii_strcasecmp(str, "center"))
+            winjust = RR_JUSTIFY_CENTER;
+        g_free(str);
+    }
+
+    font_str = "arial-10:bold";
+
+    theme->mtitlefont_shadow = FALSE;
+    if (read_string(db, "menu.title.xft.flags", &str)) {
+        if (g_strrstr(str, "shadow"))
+            theme->mtitlefont_shadow = TRUE;
+        g_free(str);
+    }
+ 
+    if (!read_int(db, "menu.title.xft.shadow.offset",
+                  &theme->mtitlefont_shadow_offset))
+        theme->mtitlefont_shadow_offset = 1;
+    if (!read_int(db, "menu.title.xft.shadow.tint",
+                  &theme->mtitlefont_shadow_tint) ||
+        theme->mtitlefont_shadow_tint < 100 ||
+        theme->mtitlefont_shadow_tint > 100)
+        theme->mtitlefont_shadow_tint = 25;
+
+    theme->mtitlefont = font_open(inst, font_str);
+    theme->mtitlefont_height = font_height(theme->mtitlefont,
+                                          theme->mtitlefont_shadow,
+                                          theme->mtitlefont_shadow_offset);
 
+    mtitlejust = RR_JUSTIFY_LEFT;
+    if (read_string(db, "menu.title.justify", &str)) {
+        if (!g_ascii_strcasecmp(str, "right"))
+            mtitlejust = RR_JUSTIFY_RIGHT;
+        else if (!g_ascii_strcasecmp(str, "center"))
+            mtitlejust = RR_JUSTIFY_CENTER;
+        g_free(str);
+    }
+
+    font_str = "arial-8";
+
+    theme->mfont_shadow = FALSE;
+    if (read_string(db, "menu.frame.xft.flags", &str)) {
+        if (g_strrstr(str, "shadow"))
+            theme->mfont_shadow = TRUE;
+        g_free(str);
+    }
+ 
+    if (!read_int(db, "menu.frame.xft.shadow.offset",
+                  &theme->mfont_shadow_offset))
+        theme->mfont_shadow_offset = 1;
+    if (!read_int(db, "menu.frame.xft.shadow.tint",
+                  &theme->mfont_shadow_tint) ||
+        theme->mfont_shadow_tint < 100 ||
+        theme->mfont_shadow_tint > 100)
+        theme->mfont_shadow_tint = 25;
+
+    theme->mfont = font_open(inst, font_str);
+    theme->mfont_height = font_height(theme->mfont, theme->mfont_shadow,
+                                     theme->mfont_shadow_offset);
+
+    mjust = RR_JUSTIFY_LEFT;
+    if (read_string(db, "menu.frame.justify", &str)) {
+        if (!g_ascii_strcasecmp(str, "right"))
+            mjust = RR_JUSTIFY_RIGHT;
+        else if (!g_ascii_strcasecmp(str, "center"))
+            mjust = RR_JUSTIFY_CENTER;
+        g_free(str);
+    }
+
+    /* load the title layout */
+    theme->title_layout = g_strdup("NLIMC");
+
+    if (!read_int(db, "handleWidth", &theme->handle_height) ||
+	theme->handle_height < 0 || theme->handle_height > 100)
+        theme->handle_height = 6;
+    if (!read_int(db, "bevelWidth", &theme->bevel) ||
+	theme->bevel <= 0 || theme->bevel > 100) theme->bevel = 3;
+    if (!read_int(db, "borderWidth", &theme->bwidth) ||
+	theme->bwidth < 0 || theme->bwidth > 100) theme->bwidth = 1;
+    if (!read_int(db, "frameWidth", &theme->cbwidth) ||
+	theme->cbwidth < 0 || theme->cbwidth > 100)
+        theme->cbwidth = theme->bevel;
+
+    /* load colors */
+    if (!read_color(db, inst,
+                    "borderColor", &theme->b_color))
+	theme->b_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "window.frame.focusColor", &theme->cb_focused_color))
+	theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.frame.unfocusColor",&theme->cb_unfocused_color))
+	theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.label.focus.textColor",
+                    &theme->title_focused_color))
+	theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0);
+    if (!read_color(db, inst,
+                    "window.label.unfocus.textColor",
+                    &theme->title_unfocused_color))
+	theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.button.focus.picColor",
+                    &theme->titlebut_focused_color))
+	theme->titlebut_focused_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "window.button.unfocus.picColor",
+                    &theme->titlebut_unfocused_color))
+	theme->titlebut_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "menu.title.textColor", &theme->menu_title_color))
+        theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "menu.frame.textColor", &theme->menu_color))
+        theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "menu.frame.disableColor", &theme->menu_disabled_color))
+        theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "menu.hilite.textColor", &theme->menu_hilite_color))
+        theme->menu_hilite_color = RrColorNew(inst, 0, 0, 0);
+
+    if (read_mask(db, inst,
+                  "window.button.max.mask", name, &theme->max_unset_mask)){
+        if (!read_mask(db, inst,
+                       "window.button.max.toggled.mask", name,
+                       &theme->max_set_mask)) {
+            theme->max_set_mask = RrPixmapMaskCopy(theme->max_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
+            theme->max_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+        {
+            char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
+            theme->max_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+    }
+
+    if (!read_mask(db, inst,
+                   "window.button.icon.mask", name,
+                   &theme->iconify_mask)) {
+        char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
+        theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data);
+    }
+
+    if (read_mask(db, inst,
+                  "window.button.stick.mask", name,
+                   &theme->desk_unset_mask)) {
+        if (!read_mask(db, inst, "window.button.stick.toggled.mask", name,
+                       &theme->desk_set_mask)) {
+            theme->desk_set_mask =
+                RrPixmapMaskCopy(theme->desk_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
+            theme->desk_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+        {
+            char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
+            theme->desk_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+    }
+
+    if (read_mask(db, inst, "window.button.shade.mask", name,
+                   &theme->shade_unset_mask)) {
+        if (!read_mask(db, inst, "window.button.shade.toggled.mask", name,
+                       &theme->shade_set_mask)) {
+            theme->shade_set_mask =
+                RrPixmapMaskCopy(theme->shade_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
+            theme->shade_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
+            theme->shade_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+        }
+    }
+
+    if (!read_mask(db, inst, "window.button.close.mask", name,
+                   &theme->close_mask)) {
+        char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
+        theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data);
+    }        
+
+    /* read the decoration textures */
+    if (!read_appearance(db, inst,
+                         "window.title.focus", theme->a_focused_title))
+	set_default_appearance(theme->a_focused_title);
+    if (!read_appearance(db, inst,
+                         "window.title.unfocus", theme->a_unfocused_title))
+	set_default_appearance(theme->a_unfocused_title);
+    if (!read_appearance(db, inst,
+                         "window.label.focus", theme->a_focused_label))
+	set_default_appearance(theme->a_focused_label);
+    if (!read_appearance(db, inst,
+                         "window.label.unfocus", theme->a_unfocused_label))
+	set_default_appearance(theme->a_unfocused_label);
+    if (!read_appearance(db, inst,
+                         "window.handle.focus", theme->a_focused_handle))
+	set_default_appearance(theme->a_focused_handle);
+    if (!read_appearance(db, inst,
+                         "window.handle.unfocus",theme->a_unfocused_handle))
+	set_default_appearance(theme->a_unfocused_handle);
+    if (!read_appearance(db, inst,
+                         "window.grip.focus", theme->a_focused_grip))
+	set_default_appearance(theme->a_focused_grip);
+    if (!read_appearance(db, inst,
+                         "window.grip.unfocus", theme->a_unfocused_grip))
+	set_default_appearance(theme->a_unfocused_grip);
+    if (!read_appearance(db, inst,
+                         "menu.frame", theme->a_menu))
+	set_default_appearance(theme->a_menu);
+    if (!read_appearance(db, inst,
+                         "menu.title", theme->a_menu_title))
+	set_default_appearance(theme->a_menu_title);
+    if (!read_appearance(db, inst,
+                         "menu.hilite", theme->a_menu_hilite))
+	set_default_appearance(theme->a_menu_hilite);
+
+    /* read the appearances for rendering non-decorations */
+    if (!read_appearance(db, inst,
+                         "window.title.focus", theme->app_hilite_bg))
+        set_default_appearance(theme->app_hilite_bg);
+    if (!read_appearance(db, inst,
+                         "window.label.focus", theme->app_hilite_label))
+        set_default_appearance(theme->app_hilite_label);
+    if (!read_appearance(db, inst,
+                         "window.title.unfocus", theme->app_unhilite_bg))
+        set_default_appearance(theme->app_unhilite_bg);
+    if (!read_appearance(db, inst,
+                         "window.label.unfocus", theme->app_unhilite_label))
+        set_default_appearance(theme->app_unhilite_label);
+
+    /* read buttons textures */
+    if (!read_appearance(db, inst,
+                         "window.button.pressed.focus",
+			 theme->a_focused_pressed_max))
+	if (!read_appearance(db, inst,
+                             "window.button.pressed",
+                             theme->a_focused_pressed_max))
+	    set_default_appearance(theme->a_focused_pressed_max);
+    if (!read_appearance(db, inst,
+                         "window.button.pressed.unfocus",
+			 theme->a_unfocused_pressed_max))
+	if (!read_appearance(db, inst,
+                             "window.button.pressed",
+			     theme->a_unfocused_pressed_max))
+	    set_default_appearance(theme->a_unfocused_pressed_max);
+    if (!read_appearance(db, inst,
+                         "window.button.focus",
+			 theme->a_focused_unpressed_max))
+	set_default_appearance(theme->a_focused_unpressed_max);
+    if (!read_appearance(db, inst,
+                         "window.button.unfocus",
+			 theme->a_unfocused_unpressed_max))
+	set_default_appearance(theme->a_unfocused_unpressed_max);
+
+    theme->a_unfocused_unpressed_close =
+        RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+    theme->a_unfocused_pressed_close =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_focused_unpressed_close =
+        RrAppearanceCopy(theme->a_focused_unpressed_max);
+    theme->a_focused_pressed_close =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_unfocused_unpressed_desk =
+        RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+    theme->a_unfocused_pressed_desk =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_unfocused_pressed_set_desk =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_focused_unpressed_desk =
+        RrAppearanceCopy(theme->a_focused_unpressed_max);
+    theme->a_focused_pressed_desk =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_focused_pressed_set_desk =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_unfocused_unpressed_shade =
+        RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+    theme->a_unfocused_pressed_shade =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_unfocused_pressed_set_shade =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_focused_unpressed_shade =
+        RrAppearanceCopy(theme->a_focused_unpressed_max);
+    theme->a_focused_pressed_shade =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_focused_pressed_set_shade =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_unfocused_unpressed_iconify =
+        RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+    theme->a_unfocused_pressed_iconify =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_focused_unpressed_iconify =
+        RrAppearanceCopy(theme->a_focused_unpressed_max);
+    theme->a_focused_pressed_iconify =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+    theme->a_unfocused_pressed_set_max =
+        RrAppearanceCopy(theme->a_unfocused_pressed_max);
+    theme->a_focused_pressed_set_max =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
+
+    theme->a_icon->surface.grad = RR_SURFACE_PARENTREL;
+
+    /* set up the textures */
+    theme->a_focused_label->texture[0].type = 
+        theme->app_hilite_label->texture[0].type = RR_TEXTURE_TEXT;
+    theme->a_focused_label->texture[0].data.text.justify = winjust;
+    theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
+    theme->a_focused_label->texture[0].data.text.font =
+        theme->app_hilite_label->texture[0].data.text.font = theme->winfont;
+    theme->a_focused_label->texture[0].data.text.shadow =
+        theme->app_hilite_label->texture[0].data.text.shadow =
+        theme->winfont_shadow;
+    theme->a_focused_label->texture[0].data.text.offset =
+        theme->app_hilite_label->texture[0].data.text.offset =
+        theme->winfont_shadow_offset;
+    theme->a_focused_label->texture[0].data.text.tint =
+        theme->app_hilite_label->texture[0].data.text.tint =
+        theme->winfont_shadow_tint;
+    theme->a_focused_label->texture[0].data.text.color =
+        theme->app_hilite_label->texture[0].data.text.color =
+        theme->title_focused_color;
+
+    theme->a_unfocused_label->texture[0].type =
+        theme->app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT;
+    theme->a_unfocused_label->texture[0].data.text.justify = winjust;
+    theme->app_unhilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
+    theme->a_unfocused_label->texture[0].data.text.font =
+        theme->app_unhilite_label->texture[0].data.text.font = theme->winfont;
+    theme->a_unfocused_label->texture[0].data.text.shadow =
+        theme->app_unhilite_label->texture[0].data.text.shadow =
+        theme->winfont_shadow;
+    theme->a_unfocused_label->texture[0].data.text.offset =
+        theme->app_unhilite_label->texture[0].data.text.offset =
+        theme->winfont_shadow_offset;
+    theme->a_unfocused_label->texture[0].data.text.tint =
+        theme->app_unhilite_label->texture[0].data.text.tint =
+        theme->winfont_shadow_tint;
+    theme->a_unfocused_label->texture[0].data.text.color =
+        theme->app_unhilite_label->texture[0].data.text.color =
+        theme->title_unfocused_color;
+
+    theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT;
+    theme->a_menu_title->texture[0].data.text.justify = mtitlejust;
+    theme->a_menu_title->texture[0].data.text.font = theme->mtitlefont;
+    theme->a_menu_title->texture[0].data.text.shadow = theme->mtitlefont_shadow;
+    theme->a_menu_title->texture[0].data.text.offset =
+        theme->mtitlefont_shadow_offset;
+    theme->a_menu_title->texture[0].data.text.tint =
+        theme->mtitlefont_shadow_tint;
+    theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color;
+
+    theme->a_menu_item->surface.grad = 
+        theme->a_menu_disabled->surface.grad =
+        theme->app_icon->surface.grad = RR_SURFACE_PARENTREL;
+
+    theme->a_menu_item->texture[0].type =
+        theme->a_menu_disabled->texture[0].type = 
+        theme->a_menu_hilite->texture[0].type = RR_TEXTURE_TEXT;
+    theme->a_menu_item->texture[0].data.text.justify = 
+        theme->a_menu_disabled->texture[0].data.text.justify = 
+        theme->a_menu_hilite->texture[0].data.text.justify = mjust;
+    theme->a_menu_item->texture[0].data.text.font =
+        theme->a_menu_disabled->texture[0].data.text.font =
+        theme->a_menu_hilite->texture[0].data.text.font = theme->mfont;
+    theme->a_menu_item->texture[0].data.text.shadow = 
+        theme->a_menu_disabled->texture[0].data.text.shadow = 
+        theme->a_menu_hilite->texture[0].data.text.shadow =
+        theme->mfont_shadow;
+    theme->a_menu_item->texture[0].data.text.offset =
+        theme->a_menu_disabled->texture[0].data.text.offset = 
+        theme->a_menu_hilite->texture[0].data.text.offset = 
+        theme->mfont_shadow_offset;
+    theme->a_menu_item->texture[0].data.text.tint =
+        theme->a_menu_disabled->texture[0].data.text.tint =
+        theme->a_menu_hilite->texture[0].data.text.tint =
+        theme->mfont_shadow_tint;
+    theme->a_menu_item->texture[0].data.text.color = theme->menu_color;
+    theme->a_menu_disabled->texture[0].data.text.color =
+        theme->menu_disabled_color;
+    theme->a_menu_hilite->texture[0].data.text.color =
+        theme->menu_hilite_color;
+
+    theme->a_focused_unpressed_max->texture[0].type = 
+        theme->a_focused_pressed_max->texture[0].type = 
+        theme->a_focused_pressed_set_max->texture[0].type =  
+        theme->a_unfocused_unpressed_max->texture[0].type = 
+        theme->a_unfocused_pressed_max->texture[0].type = 
+        theme->a_unfocused_pressed_set_max->texture[0].type = 
+        theme->a_focused_unpressed_close->texture[0].type = 
+        theme->a_focused_pressed_close->texture[0].type = 
+        theme->a_unfocused_unpressed_close->texture[0].type = 
+        theme->a_unfocused_pressed_close->texture[0].type = 
+        theme->a_focused_unpressed_desk->texture[0].type = 
+        theme->a_focused_pressed_desk->texture[0].type = 
+        theme->a_focused_pressed_set_desk->texture[0].type = 
+        theme->a_unfocused_unpressed_desk->texture[0].type = 
+        theme->a_unfocused_pressed_desk->texture[0].type = 
+        theme->a_unfocused_pressed_set_desk->texture[0].type = 
+        theme->a_focused_unpressed_shade->texture[0].type = 
+        theme->a_focused_pressed_shade->texture[0].type = 
+        theme->a_focused_pressed_set_shade->texture[0].type = 
+        theme->a_unfocused_unpressed_shade->texture[0].type = 
+        theme->a_unfocused_pressed_shade->texture[0].type = 
+        theme->a_unfocused_pressed_set_shade->texture[0].type = 
+        theme->a_focused_unpressed_iconify->texture[0].type = 
+        theme->a_focused_pressed_iconify->texture[0].type = 
+        theme->a_unfocused_unpressed_iconify->texture[0].type = 
+        theme->a_unfocused_pressed_iconify->texture[0].type = RR_TEXTURE_MASK;
+    theme->a_focused_unpressed_max->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = 
+        theme->a_focused_pressed_max->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_max->texture[0].data.mask.mask =
+        theme->max_unset_mask;
+    theme->a_focused_pressed_set_max->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_set_max->texture[0].data.mask.mask =
+        theme->max_set_mask;
+    theme->a_focused_pressed_close->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_close->texture[0].data.mask.mask =
+        theme->a_focused_unpressed_close->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_close->texture[0].data.mask.mask =
+        theme->close_mask;
+    theme->a_focused_unpressed_desk->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = 
+        theme->a_focused_pressed_desk->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_desk->texture[0].data.mask.mask =
+        theme->desk_unset_mask;
+    theme->a_focused_pressed_set_desk->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_set_desk->texture[0].data.mask.mask =
+        theme->desk_set_mask;
+    theme->a_focused_unpressed_shade->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = 
+        theme->a_focused_pressed_shade->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_shade->texture[0].data.mask.mask =
+        theme->shade_unset_mask;
+    theme->a_focused_pressed_set_shade->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_set_shade->texture[0].data.mask.mask =
+        theme->shade_set_mask;
+    theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = 
+        theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = 
+        theme->a_focused_pressed_iconify->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask =
+        theme->iconify_mask;
+    theme->a_focused_unpressed_max->texture[0].data.mask.color = 
+        theme->a_focused_pressed_max->texture[0].data.mask.color = 
+        theme->a_focused_pressed_set_max->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_close->texture[0].data.mask.color = 
+        theme->a_focused_pressed_close->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_desk->texture[0].data.mask.color = 
+        theme->a_focused_pressed_desk->texture[0].data.mask.color = 
+        theme->a_focused_pressed_set_desk->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_shade->texture[0].data.mask.color = 
+        theme->a_focused_pressed_shade->texture[0].data.mask.color = 
+        theme->a_focused_pressed_set_shade->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_iconify->texture[0].data.mask.color = 
+        theme->a_focused_pressed_iconify->texture[0].data.mask.color =
+        theme->titlebut_focused_color;
+    theme->a_unfocused_unpressed_max->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_max->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_set_max->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_close->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_close->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_desk->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_set_desk->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_shade->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_set_shade->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = 
+        theme->a_unfocused_pressed_iconify->texture[0].data.mask.color =
+        theme->titlebut_unfocused_color;
+
+    XrmDestroyDatabase(db);
+
+    theme->label_height = theme->winfont_height;
+    theme->title_height = theme->label_height + theme->bevel * 2;
+    theme->button_size = theme->label_height - 2;
+    theme->grip_width = theme->button_size * 2;
+
+    return theme;
 }
 
-void theme_shutdown()
+void RrThemeFree(RrTheme *theme)
 {
-    RrColorFree(theme_b_color);
-    RrColorFree(theme_cb_unfocused_color);
-    RrColorFree(theme_cb_focused_color);
-    RrColorFree(theme_title_unfocused_color);
-    RrColorFree(theme_title_focused_color);
-    RrColorFree(theme_titlebut_unfocused_color);
-    RrColorFree(theme_titlebut_focused_color);
-    RrColorFree(theme_menu_color);
-    RrColorFree(theme_menu_title_color);
-    RrColorFree(theme_menu_disabled_color);
-    RrColorFree(theme_menu_hilite_color);
-
-    RrPixmapMaskFree(theme_max_set_mask);
-    RrPixmapMaskFree(theme_max_unset_mask);
-    RrPixmapMaskFree(theme_desk_set_mask);
-    RrPixmapMaskFree(theme_desk_unset_mask);
-    RrPixmapMaskFree(theme_shade_set_mask);
-    RrPixmapMaskFree(theme_shade_unset_mask);
-    RrPixmapMaskFree(theme_iconify_mask);
-    RrPixmapMaskFree(theme_close_mask);
-
-    font_close(theme_winfont);
-    font_close(theme_mtitlefont);
-    font_close(theme_mfont);
-
-    g_free(theme_title_layout);
-
-    RrAppearanceFree(theme_a_focused_unpressed_max);
-    RrAppearanceFree(theme_a_focused_pressed_max);
-    RrAppearanceFree(theme_a_focused_pressed_set_max);
-    RrAppearanceFree(theme_a_unfocused_unpressed_max);
-    RrAppearanceFree(theme_a_unfocused_pressed_max);
-    RrAppearanceFree(theme_a_unfocused_pressed_set_max);
-    RrAppearanceFree(theme_a_focused_unpressed_close);
-    RrAppearanceFree(theme_a_focused_pressed_close);
-    RrAppearanceFree(theme_a_unfocused_unpressed_close);
-    RrAppearanceFree(theme_a_unfocused_pressed_close);
-    RrAppearanceFree(theme_a_focused_unpressed_desk);
-    RrAppearanceFree(theme_a_focused_pressed_desk);
-    RrAppearanceFree(theme_a_unfocused_unpressed_desk);
-    RrAppearanceFree(theme_a_unfocused_pressed_desk);
-    RrAppearanceFree(theme_a_focused_unpressed_shade);
-    RrAppearanceFree(theme_a_focused_pressed_shade);
-    RrAppearanceFree(theme_a_unfocused_unpressed_shade);
-    RrAppearanceFree(theme_a_unfocused_pressed_shade);
-    RrAppearanceFree(theme_a_focused_unpressed_iconify);
-    RrAppearanceFree(theme_a_focused_pressed_iconify);
-    RrAppearanceFree(theme_a_unfocused_unpressed_iconify);
-    RrAppearanceFree(theme_a_unfocused_pressed_iconify);
-    RrAppearanceFree(theme_a_focused_grip);
-    RrAppearanceFree(theme_a_unfocused_grip);
-    RrAppearanceFree(theme_a_focused_title);
-    RrAppearanceFree(theme_a_unfocused_title);
-    RrAppearanceFree(theme_a_focused_label);
-    RrAppearanceFree(theme_a_unfocused_label);
-    RrAppearanceFree(theme_a_icon);
-    RrAppearanceFree(theme_a_focused_handle);
-    RrAppearanceFree(theme_a_unfocused_handle);
-    RrAppearanceFree(theme_a_menu);
-    RrAppearanceFree(theme_a_menu_title);
-    RrAppearanceFree(theme_a_menu_item);
-    RrAppearanceFree(theme_a_menu_disabled);
-    RrAppearanceFree(theme_a_menu_hilite);
-    RrAppearanceFree(theme_app_hilite_bg);
-    RrAppearanceFree(theme_app_unhilite_bg);
-    RrAppearanceFree(theme_app_hilite_label);
-    RrAppearanceFree(theme_app_unhilite_label);
-    RrAppearanceFree(theme_app_icon);
+    if (theme) {
+        g_free(theme->name);
+
+        RrColorFree(theme->b_color);
+        RrColorFree(theme->cb_unfocused_color);
+        RrColorFree(theme->cb_focused_color);
+        RrColorFree(theme->title_unfocused_color);
+        RrColorFree(theme->title_focused_color);
+        RrColorFree(theme->titlebut_unfocused_color);
+        RrColorFree(theme->titlebut_focused_color);
+        RrColorFree(theme->menu_color);
+        RrColorFree(theme->menu_title_color);
+        RrColorFree(theme->menu_disabled_color);
+        RrColorFree(theme->menu_hilite_color);
+
+        RrPixmapMaskFree(theme->max_set_mask);
+        RrPixmapMaskFree(theme->max_unset_mask);
+        RrPixmapMaskFree(theme->desk_set_mask);
+        RrPixmapMaskFree(theme->desk_unset_mask);
+        RrPixmapMaskFree(theme->shade_set_mask);
+        RrPixmapMaskFree(theme->shade_unset_mask);
+        RrPixmapMaskFree(theme->iconify_mask);
+        RrPixmapMaskFree(theme->close_mask);
+
+        font_close(theme->winfont);
+        font_close(theme->mtitlefont);
+        font_close(theme->mfont);
+
+        g_free(theme->title_layout);
+
+        RrAppearanceFree(theme->a_focused_unpressed_max);
+        RrAppearanceFree(theme->a_focused_pressed_max);
+        RrAppearanceFree(theme->a_focused_pressed_set_max);
+        RrAppearanceFree(theme->a_unfocused_unpressed_max);
+        RrAppearanceFree(theme->a_unfocused_pressed_max);
+        RrAppearanceFree(theme->a_unfocused_pressed_set_max);
+        RrAppearanceFree(theme->a_focused_unpressed_close);
+        RrAppearanceFree(theme->a_focused_pressed_close);
+        RrAppearanceFree(theme->a_unfocused_unpressed_close);
+        RrAppearanceFree(theme->a_unfocused_pressed_close);
+        RrAppearanceFree(theme->a_focused_unpressed_desk);
+        RrAppearanceFree(theme->a_focused_pressed_desk);
+        RrAppearanceFree(theme->a_unfocused_unpressed_desk);
+        RrAppearanceFree(theme->a_unfocused_pressed_desk);
+        RrAppearanceFree(theme->a_focused_unpressed_shade);
+        RrAppearanceFree(theme->a_focused_pressed_shade);
+        RrAppearanceFree(theme->a_unfocused_unpressed_shade);
+        RrAppearanceFree(theme->a_unfocused_pressed_shade);
+        RrAppearanceFree(theme->a_focused_unpressed_iconify);
+        RrAppearanceFree(theme->a_focused_pressed_iconify);
+        RrAppearanceFree(theme->a_unfocused_unpressed_iconify);
+        RrAppearanceFree(theme->a_unfocused_pressed_iconify);
+        RrAppearanceFree(theme->a_focused_grip);
+        RrAppearanceFree(theme->a_unfocused_grip);
+        RrAppearanceFree(theme->a_focused_title);
+        RrAppearanceFree(theme->a_unfocused_title);
+        RrAppearanceFree(theme->a_focused_label);
+        RrAppearanceFree(theme->a_unfocused_label);
+        RrAppearanceFree(theme->a_icon);
+        RrAppearanceFree(theme->a_focused_handle);
+        RrAppearanceFree(theme->a_unfocused_handle);
+        RrAppearanceFree(theme->a_menu);
+        RrAppearanceFree(theme->a_menu_title);
+        RrAppearanceFree(theme->a_menu_item);
+        RrAppearanceFree(theme->a_menu_disabled);
+        RrAppearanceFree(theme->a_menu_hilite);
+        RrAppearanceFree(theme->app_hilite_bg);
+        RrAppearanceFree(theme->app_unhilite_bg);
+        RrAppearanceFree(theme->app_hilite_label);
+        RrAppearanceFree(theme->app_unhilite_label);
+        RrAppearanceFree(theme->app_icon);
+    }
 }
 
 static XrmDatabase loaddb(char *theme)
@@ -329,7 +788,7 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst,
 }
 
 static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
-                           gchar *rname, gchar *theme,
+                          gchar *rname, gchar *theme,
                           RrPixmapMask **value)
 {
     gboolean ret = FALSE;
@@ -495,535 +954,3 @@ static void set_default_appearance(RrAppearance *a)
     a->surface.primary = RrColorNew(a->inst, 0, 0, 0);
     a->surface.secondary = RrColorNew(a->inst, 0, 0, 0);
 }
-
-gchar *theme_load(gchar *theme)
-{
-    XrmDatabase db = NULL;
-    gchar *loaded = NULL;
-    RrJustify winjust, mtitlejust, mjust;
-    gchar *str;
-    gchar *font_str;
-    const RrInstance *inst = theme_inst;
-
-    if (theme) {
-	db = loaddb(theme);
-        if (db == NULL) {
-	    g_warning("Failed to load the theme '%s'", theme);
-	    g_message("Falling back to the default: '%s'", DEFAULT_THEME);
-	} else
-            loaded = g_strdup(theme);
-    }
-    if (db == NULL) {
-	db = loaddb(DEFAULT_THEME);
-	if (db == NULL) {
-	    g_warning("Failed to load the theme '%s'.", DEFAULT_THEME);
-	    return NULL;
-	} else
-            loaded = g_strdup(DEFAULT_THEME);
-    }
-
-    /* load the font stuff */
-    font_str = "arial:bold:pixelsize=10";
-
-    theme_winfont_shadow = FALSE;
-    if (read_string(db, "window.xft.flags", &str)) {
-        if (g_strrstr(str, "shadow"))
-            theme_winfont_shadow = TRUE;
-        g_free(str);
-    }
- 
-    if (!read_int(db, "window.xft.shadow.offset",
-                  &theme_winfont_shadow_offset))
-        theme_winfont_shadow_offset = 1;
-    if (!read_int(db, "window.xft.shadow.tint",
-                  &theme_winfont_shadow_tint) ||
-        theme_winfont_shadow_tint < 100 || theme_winfont_shadow_tint > 100)
-        theme_winfont_shadow_tint = 25;
-
-    theme_winfont = font_open(font_str);
-    theme_winfont_height = font_height(theme_winfont, theme_winfont_shadow,
-                                       theme_winfont_shadow_offset);
-
-    winjust = RR_JUSTIFY_LEFT;
-    if (read_string(db, "window.justify", &str)) {
-        if (!g_ascii_strcasecmp(str, "right"))
-            winjust = RR_JUSTIFY_RIGHT;
-        else if (!g_ascii_strcasecmp(str, "center"))
-            winjust = RR_JUSTIFY_CENTER;
-        g_free(str);
-    }
-
-    font_str = "arial-10:bold";
-
-    theme_mtitlefont_shadow = FALSE;
-    if (read_string(db, "menu.title.xft.flags", &str)) {
-        if (g_strrstr(str, "shadow"))
-            theme_mtitlefont_shadow = TRUE;
-        g_free(str);
-    }
- 
-    if (!read_int(db, "menu.title.xft.shadow.offset",
-                  &theme_mtitlefont_shadow_offset))
-        theme_mtitlefont_shadow_offset = 1;
-    if (!read_int(db, "menu.title.xft.shadow.tint",
-                  &theme_mtitlefont_shadow_tint) ||
-        theme_mtitlefont_shadow_tint < 100 ||
-        theme_mtitlefont_shadow_tint > 100)
-        theme_mtitlefont_shadow_tint = 25;
-
-    theme_mtitlefont = font_open(font_str);
-    theme_mtitlefont_height = font_height(theme_mtitlefont,
-                                          theme_mtitlefont_shadow,
-                                          theme_mtitlefont_shadow_offset);
-
-    mtitlejust = RR_JUSTIFY_LEFT;
-    if (read_string(db, "menu.title.justify", &str)) {
-        if (!g_ascii_strcasecmp(str, "right"))
-            mtitlejust = RR_JUSTIFY_RIGHT;
-        else if (!g_ascii_strcasecmp(str, "center"))
-            mtitlejust = RR_JUSTIFY_CENTER;
-        g_free(str);
-    }
-
-    font_str = "arial-8";
-
-    theme_mfont_shadow = FALSE;
-    if (read_string(db, "menu.frame.xft.flags", &str)) {
-        if (g_strrstr(str, "shadow"))
-            theme_mfont_shadow = TRUE;
-        g_free(str);
-    }
- 
-    if (!read_int(db, "menu.frame.xft.shadow.offset",
-                  &theme_mfont_shadow_offset))
-        theme_mfont_shadow_offset = 1;
-    if (!read_int(db, "menu.frame.xft.shadow.tint",
-                  &theme_mfont_shadow_tint) ||
-        theme_mfont_shadow_tint < 100 ||
-        theme_mfont_shadow_tint > 100)
-        theme_mfont_shadow_tint = 25;
-
-    theme_mfont = font_open(font_str);
-    theme_mfont_height = font_height(theme_mfont, theme_mfont_shadow,
-                                     theme_mfont_shadow_offset);
-
-    mjust = RR_JUSTIFY_LEFT;
-    if (read_string(db, "menu.frame.justify", &str)) {
-        if (!g_ascii_strcasecmp(str, "right"))
-            mjust = RR_JUSTIFY_RIGHT;
-        else if (!g_ascii_strcasecmp(str, "center"))
-            mjust = RR_JUSTIFY_CENTER;
-        g_free(str);
-    }
-
-    /* load the title layout */
-    theme_title_layout = g_strdup("NLIMC");
-
-    if (!read_int(db, "handleWidth", &theme_handle_height) ||
-	theme_handle_height < 0 || theme_handle_height > 100)
-        theme_handle_height = 6;
-    if (!read_int(db, "bevelWidth", &theme_bevel) ||
-	theme_bevel <= 0 || theme_bevel > 100) theme_bevel = 3;
-    if (!read_int(db, "borderWidth", &theme_bwidth) ||
-	theme_bwidth < 0 || theme_bwidth > 100) theme_bwidth = 1;
-    if (!read_int(db, "frameWidth", &theme_cbwidth) ||
-	theme_cbwidth < 0 || theme_cbwidth > 100) theme_cbwidth = theme_bevel;
-
-    /* load colors */
-    if (!read_color(db, inst,
-                    "borderColor", &theme_b_color))
-	theme_b_color = RrColorNew(inst, 0, 0, 0);
-    if (!read_color(db, inst,
-                    "window.frame.focusColor", &theme_cb_focused_color))
-	theme_cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
-    if (!read_color(db, inst,
-                    "window.frame.unfocusColor",&theme_cb_unfocused_color))
-	theme_cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
-    if (!read_color(db, inst,
-                    "window.label.focus.textColor",
-                    &theme_title_focused_color))
-	theme_title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0);
-    if (!read_color(db, inst,
-                    "window.label.unfocus.textColor",
-                    &theme_title_unfocused_color))
-	theme_title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
-    if (!read_color(db, inst,
-                    "window.button.focus.picColor",
-                    &theme_titlebut_focused_color))
-	theme_titlebut_focused_color = RrColorNew(inst, 0, 0, 0);
-    if (!read_color(db, inst,
-                    "window.button.unfocus.picColor",
-                    &theme_titlebut_unfocused_color))
-	theme_titlebut_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
-    if (!read_color(db, inst,
-                    "menu.title.textColor", &theme_menu_title_color))
-        theme_menu_title_color = RrColorNew(inst, 0, 0, 0);
-    if (!read_color(db, inst,
-                    "menu.frame.textColor", &theme_menu_color))
-        theme_menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
-    if (!read_color(db, inst,
-                    "menu.frame.disableColor", &theme_menu_disabled_color))
-        theme_menu_disabled_color = RrColorNew(inst, 0, 0, 0);
-    if (!read_color(db, inst,
-                    "menu.hilite.textColor", &theme_menu_hilite_color))
-        theme_menu_hilite_color = RrColorNew(inst, 0, 0, 0);
-
-    if (read_mask(db, inst,
-                  "window.button.max.mask", theme, &theme_max_unset_mask)){
-        if (!read_mask(db, inst,
-                       "window.button.max.toggled.mask", theme,
-                       &theme_max_set_mask)) {
-            theme_max_set_mask = RrPixmapMaskCopy(theme_max_unset_mask);
-        }
-    } else {
-        {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
-            theme_max_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-        {
-            char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
-            theme_max_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-    }
-
-    if (!read_mask(db, inst,
-                   "window.button.icon.mask", theme,
-                   &theme_iconify_mask)) {
-        char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
-        theme_iconify_mask = RrPixmapMaskNew(inst, 7, 7, data);
-    }
-
-    if (read_mask(db, inst,
-                  "window.button.stick.mask", theme,
-                   &theme_desk_unset_mask)) {
-        if (!read_mask(db, inst, "window.button.stick.toggled.mask", theme,
-                       &theme_desk_set_mask)) {
-            theme_desk_set_mask =
-                RrPixmapMaskCopy(theme_desk_unset_mask);
-        }
-    } else {
-        {
-            char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
-            theme_desk_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-        {
-            char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
-            theme_desk_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-    }
-
-    if (read_mask(db, inst, "window.button.shade.mask", theme,
-                   &theme_shade_unset_mask)) {
-        if (!read_mask(db, inst, "window.button.shade.toggled.mask", theme,
-                       &theme_shade_set_mask)) {
-            theme_shade_set_mask =
-                RrPixmapMaskCopy(theme_shade_unset_mask);
-        }
-    } else {
-        {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
-            theme_shade_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-        {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
-            theme_shade_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
-        }
-    }
-
-    if (!read_mask(db, inst, "window.button.close.mask", theme,
-                   &theme_close_mask)) {
-        char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
-        theme_close_mask = RrPixmapMaskNew(inst, 7, 7, data);
-    }        
-
-    /* read the decoration textures */
-    if (!read_appearance(db, inst,
-                         "window.title.focus", theme_a_focused_title))
-	set_default_appearance(theme_a_focused_title);
-    if (!read_appearance(db, inst,
-                         "window.title.unfocus", theme_a_unfocused_title))
-	set_default_appearance(theme_a_unfocused_title);
-    if (!read_appearance(db, inst,
-                         "window.label.focus", theme_a_focused_label))
-	set_default_appearance(theme_a_focused_label);
-    if (!read_appearance(db, inst,
-                         "window.label.unfocus", theme_a_unfocused_label))
-	set_default_appearance(theme_a_unfocused_label);
-    if (!read_appearance(db, inst,
-                         "window.handle.focus", theme_a_focused_handle))
-	set_default_appearance(theme_a_focused_handle);
-    if (!read_appearance(db, inst,
-                         "window.handle.unfocus",theme_a_unfocused_handle))
-	set_default_appearance(theme_a_unfocused_handle);
-    if (!read_appearance(db, inst,
-                         "window.grip.focus", theme_a_focused_grip))
-	set_default_appearance(theme_a_focused_grip);
-    if (!read_appearance(db, inst,
-                         "window.grip.unfocus", theme_a_unfocused_grip))
-	set_default_appearance(theme_a_unfocused_grip);
-    if (!read_appearance(db, inst,
-                         "menu.frame", theme_a_menu))
-	set_default_appearance(theme_a_menu);
-    if (!read_appearance(db, inst,
-                         "menu.title", theme_a_menu_title))
-	set_default_appearance(theme_a_menu_title);
-    if (!read_appearance(db, inst,
-                         "menu.hilite", theme_a_menu_hilite))
-	set_default_appearance(theme_a_menu_hilite);
-
-    /* read the appearances for rendering non-decorations */
-    if (!read_appearance(db, inst,
-                         "window.title.focus", theme_app_hilite_bg))
-        set_default_appearance(theme_app_hilite_bg);
-    if (!read_appearance(db, inst,
-                         "window.label.focus", theme_app_hilite_label))
-        set_default_appearance(theme_app_hilite_label);
-    if (!read_appearance(db, inst,
-                         "window.title.unfocus", theme_app_unhilite_bg))
-        set_default_appearance(theme_app_unhilite_bg);
-    if (!read_appearance(db, inst,
-                         "window.label.unfocus", theme_app_unhilite_label))
-        set_default_appearance(theme_app_unhilite_label);
-
-    /* read buttons textures */
-    if (!read_appearance(db, inst,
-                         "window.button.pressed.focus",
-			 theme_a_focused_pressed_max))
-	if (!read_appearance(db, inst,
-                             "window.button.pressed",
-                             theme_a_focused_pressed_max))
-	    set_default_appearance(theme_a_focused_pressed_max);
-    if (!read_appearance(db, inst,
-                         "window.button.pressed.unfocus",
-			 theme_a_unfocused_pressed_max))
-	if (!read_appearance(db, inst,
-                             "window.button.pressed",
-			     theme_a_unfocused_pressed_max))
-	    set_default_appearance(theme_a_unfocused_pressed_max);
-    if (!read_appearance(db, inst,
-                         "window.button.focus",
-			 theme_a_focused_unpressed_max))
-	set_default_appearance(theme_a_focused_unpressed_max);
-    if (!read_appearance(db, inst,
-                         "window.button.unfocus",
-			 theme_a_unfocused_unpressed_max))
-	set_default_appearance(theme_a_unfocused_unpressed_max);
-
-    theme_a_unfocused_unpressed_close =
-        RrAppearanceCopy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_close =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_close =
-        RrAppearanceCopy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_close =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_unfocused_unpressed_desk =
-        RrAppearanceCopy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_desk =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_unfocused_pressed_set_desk =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_desk =
-        RrAppearanceCopy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_desk =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_focused_pressed_set_desk =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_unfocused_unpressed_shade =
-        RrAppearanceCopy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_shade =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_unfocused_pressed_set_shade =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_shade =
-        RrAppearanceCopy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_shade =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_focused_pressed_set_shade =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_unfocused_unpressed_iconify =
-        RrAppearanceCopy(theme_a_unfocused_unpressed_max);
-    theme_a_unfocused_pressed_iconify =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_focused_unpressed_iconify =
-        RrAppearanceCopy(theme_a_focused_unpressed_max);
-    theme_a_focused_pressed_iconify =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-    theme_a_unfocused_pressed_set_max =
-        RrAppearanceCopy(theme_a_unfocused_pressed_max);
-    theme_a_focused_pressed_set_max =
-        RrAppearanceCopy(theme_a_focused_pressed_max);
-
-    theme_a_icon->surface.grad = RR_SURFACE_PARENTREL;
-
-    /* set up the textures */
-    theme_a_focused_label->texture[0].type = 
-        theme_app_hilite_label->texture[0].type = RR_TEXTURE_TEXT;
-    theme_a_focused_label->texture[0].data.text.justify = winjust;
-    theme_app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
-    theme_a_focused_label->texture[0].data.text.font =
-        theme_app_hilite_label->texture[0].data.text.font = theme_winfont;
-    theme_a_focused_label->texture[0].data.text.shadow =
-        theme_app_hilite_label->texture[0].data.text.shadow =
-        theme_winfont_shadow;
-    theme_a_focused_label->texture[0].data.text.offset =
-        theme_app_hilite_label->texture[0].data.text.offset =
-        theme_winfont_shadow_offset;
-    theme_a_focused_label->texture[0].data.text.tint =
-        theme_app_hilite_label->texture[0].data.text.tint =
-        theme_winfont_shadow_tint;
-    theme_a_focused_label->texture[0].data.text.color =
-        theme_app_hilite_label->texture[0].data.text.color =
-        theme_title_focused_color;
-
-    theme_a_unfocused_label->texture[0].type =
-        theme_app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT;
-    theme_a_unfocused_label->texture[0].data.text.justify = winjust;
-    theme_app_unhilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
-    theme_a_unfocused_label->texture[0].data.text.font =
-        theme_app_unhilite_label->texture[0].data.text.font = theme_winfont;
-    theme_a_unfocused_label->texture[0].data.text.shadow =
-        theme_app_unhilite_label->texture[0].data.text.shadow =
-        theme_winfont_shadow;
-    theme_a_unfocused_label->texture[0].data.text.offset =
-        theme_app_unhilite_label->texture[0].data.text.offset =
-        theme_winfont_shadow_offset;
-    theme_a_unfocused_label->texture[0].data.text.tint =
-        theme_app_unhilite_label->texture[0].data.text.tint =
-        theme_winfont_shadow_tint;
-    theme_a_unfocused_label->texture[0].data.text.color =
-        theme_app_unhilite_label->texture[0].data.text.color =
-        theme_title_unfocused_color;
-
-    theme_a_menu_title->texture[0].type = RR_TEXTURE_TEXT;
-    theme_a_menu_title->texture[0].data.text.justify = mtitlejust;
-    theme_a_menu_title->texture[0].data.text.font = theme_mtitlefont;
-    theme_a_menu_title->texture[0].data.text.shadow = theme_mtitlefont_shadow;
-    theme_a_menu_title->texture[0].data.text.offset =
-        theme_mtitlefont_shadow_offset;
-    theme_a_menu_title->texture[0].data.text.tint =
-        theme_mtitlefont_shadow_tint;
-    theme_a_menu_title->texture[0].data.text.color = theme_menu_title_color;
-
-    theme_a_menu_item->surface.grad = 
-        theme_a_menu_disabled->surface.grad =
-        theme_app_icon->surface.grad = RR_SURFACE_PARENTREL;
-
-    theme_a_menu_item->texture[0].type =
-        theme_a_menu_disabled->texture[0].type = 
-        theme_a_menu_hilite->texture[0].type = RR_TEXTURE_TEXT;
-    theme_a_menu_item->texture[0].data.text.justify = 
-        theme_a_menu_disabled->texture[0].data.text.justify = 
-        theme_a_menu_hilite->texture[0].data.text.justify = mjust;
-    theme_a_menu_item->texture[0].data.text.font =
-        theme_a_menu_disabled->texture[0].data.text.font =
-        theme_a_menu_hilite->texture[0].data.text.font = theme_mfont;
-    theme_a_menu_item->texture[0].data.text.shadow = 
-        theme_a_menu_disabled->texture[0].data.text.shadow = 
-        theme_a_menu_hilite->texture[0].data.text.shadow = theme_mfont_shadow;
-    theme_a_menu_item->texture[0].data.text.offset =
-        theme_a_menu_disabled->texture[0].data.text.offset = 
-        theme_a_menu_hilite->texture[0].data.text.offset = 
-        theme_mfont_shadow_offset;
-    theme_a_menu_item->texture[0].data.text.tint =
-        theme_a_menu_disabled->texture[0].data.text.tint =
-        theme_a_menu_hilite->texture[0].data.text.tint =
-        theme_mfont_shadow_tint;
-    theme_a_menu_item->texture[0].data.text.color = theme_menu_color;
-    theme_a_menu_disabled->texture[0].data.text.color =
-        theme_menu_disabled_color;
-    theme_a_menu_hilite->texture[0].data.text.color =  theme_menu_hilite_color;
-
-    theme_a_focused_unpressed_max->texture[0].type = 
-        theme_a_focused_pressed_max->texture[0].type = 
-        theme_a_focused_pressed_set_max->texture[0].type =  
-        theme_a_unfocused_unpressed_max->texture[0].type = 
-        theme_a_unfocused_pressed_max->texture[0].type = 
-        theme_a_unfocused_pressed_set_max->texture[0].type = 
-        theme_a_focused_unpressed_close->texture[0].type = 
-        theme_a_focused_pressed_close->texture[0].type = 
-        theme_a_unfocused_unpressed_close->texture[0].type = 
-        theme_a_unfocused_pressed_close->texture[0].type = 
-        theme_a_focused_unpressed_desk->texture[0].type = 
-        theme_a_focused_pressed_desk->texture[0].type = 
-        theme_a_focused_pressed_set_desk->texture[0].type = 
-        theme_a_unfocused_unpressed_desk->texture[0].type = 
-        theme_a_unfocused_pressed_desk->texture[0].type = 
-        theme_a_unfocused_pressed_set_desk->texture[0].type = 
-        theme_a_focused_unpressed_shade->texture[0].type = 
-        theme_a_focused_pressed_shade->texture[0].type = 
-        theme_a_focused_pressed_set_shade->texture[0].type = 
-        theme_a_unfocused_unpressed_shade->texture[0].type = 
-        theme_a_unfocused_pressed_shade->texture[0].type = 
-        theme_a_unfocused_pressed_set_shade->texture[0].type = 
-        theme_a_focused_unpressed_iconify->texture[0].type = 
-        theme_a_focused_pressed_iconify->texture[0].type = 
-        theme_a_unfocused_unpressed_iconify->texture[0].type = 
-        theme_a_unfocused_pressed_iconify->texture[0].type = RR_TEXTURE_MASK;
-    theme_a_focused_unpressed_max->texture[0].data.mask.mask = 
-        theme_a_unfocused_unpressed_max->texture[0].data.mask.mask = 
-        theme_a_focused_pressed_max->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_max->texture[0].data.mask.mask =
-        theme_max_unset_mask;
-    theme_a_focused_pressed_set_max->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_set_max->texture[0].data.mask.mask =
-        theme_max_set_mask;
-    theme_a_focused_pressed_close->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_close->texture[0].data.mask.mask =
-        theme_a_focused_unpressed_close->texture[0].data.mask.mask = 
-        theme_a_unfocused_unpressed_close->texture[0].data.mask.mask =
-        theme_close_mask;
-    theme_a_focused_unpressed_desk->texture[0].data.mask.mask = 
-        theme_a_unfocused_unpressed_desk->texture[0].data.mask.mask = 
-        theme_a_focused_pressed_desk->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_desk->texture[0].data.mask.mask =
-        theme_desk_unset_mask;
-    theme_a_focused_pressed_set_desk->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_set_desk->texture[0].data.mask.mask =
-        theme_desk_set_mask;
-    theme_a_focused_unpressed_shade->texture[0].data.mask.mask = 
-        theme_a_unfocused_unpressed_shade->texture[0].data.mask.mask = 
-        theme_a_focused_pressed_shade->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_shade->texture[0].data.mask.mask =
-        theme_shade_unset_mask;
-    theme_a_focused_pressed_set_shade->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_set_shade->texture[0].data.mask.mask =
-        theme_shade_set_mask;
-    theme_a_focused_unpressed_iconify->texture[0].data.mask.mask = 
-        theme_a_unfocused_unpressed_iconify->texture[0].data.mask.mask = 
-        theme_a_focused_pressed_iconify->texture[0].data.mask.mask = 
-        theme_a_unfocused_pressed_iconify->texture[0].data.mask.mask =
-        theme_iconify_mask;
-    theme_a_focused_unpressed_max->texture[0].data.mask.color = 
-        theme_a_focused_pressed_max->texture[0].data.mask.color = 
-        theme_a_focused_pressed_set_max->texture[0].data.mask.color = 
-        theme_a_focused_unpressed_close->texture[0].data.mask.color = 
-        theme_a_focused_pressed_close->texture[0].data.mask.color = 
-        theme_a_focused_unpressed_desk->texture[0].data.mask.color = 
-        theme_a_focused_pressed_desk->texture[0].data.mask.color = 
-        theme_a_focused_pressed_set_desk->texture[0].data.mask.color = 
-        theme_a_focused_unpressed_shade->texture[0].data.mask.color = 
-        theme_a_focused_pressed_shade->texture[0].data.mask.color = 
-        theme_a_focused_pressed_set_shade->texture[0].data.mask.color = 
-        theme_a_focused_unpressed_iconify->texture[0].data.mask.color = 
-        theme_a_focused_pressed_iconify->texture[0].data.mask.color =
-        theme_titlebut_focused_color;
-    theme_a_unfocused_unpressed_max->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_max->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_set_max->texture[0].data.mask.color = 
-        theme_a_unfocused_unpressed_close->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_close->texture[0].data.mask.color = 
-        theme_a_unfocused_unpressed_desk->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_desk->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_set_desk->texture[0].data.mask.color = 
-        theme_a_unfocused_unpressed_shade->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_shade->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_set_shade->texture[0].data.mask.color = 
-        theme_a_unfocused_unpressed_iconify->texture[0].data.mask.color = 
-        theme_a_unfocused_pressed_iconify->texture[0].data.mask.color =
-        theme_titlebut_unfocused_color;
-
-    XrmDestroyDatabase(db);
-
-    return loaded;
-}
diff --git a/render/theme.h b/render/theme.h
index 6ffcd24b..a60d5cac 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -6,87 +6,117 @@
 #include "font.h"
 #include "mask.h"
 
-extern gint theme_bevel;
-extern gint theme_handle_height;
-extern gint theme_bwidth;
-extern gint theme_cbwidth;
+typedef struct _RrTheme RrTheme;
 
-#define theme_label_height (theme_winfont_height)
-#define theme_title_height (theme_label_height + theme_bevel * 2)
-#define theme_button_size  (theme_label_height - 2)
-#define theme_grip_width   (theme_button_size * 2)
+struct _RrTheme {
+    gchar *name;
 
-extern color_rgb *theme_b_color;
-extern color_rgb *theme_cb_focused_color;
-extern color_rgb *theme_cb_unfocused_color;
-extern color_rgb *theme_title_focused_color;
-extern color_rgb *theme_title_unfocused_color;
-extern color_rgb *theme_titlebut_focused_color;
-extern color_rgb *theme_titlebut_unfocused_color;
+    const RrInstance *inst;
 
-extern gint theme_winfont_height;
-extern RrFont *theme_winfont;
-extern gchar *theme_title_layout;
+    /* style settings - geometry */
+    gint bevel;
+    gint handle_height;
+    gint bwidth;
+    gint cbwidth;
+    gint label_height;
+    gint title_height;
+    gint button_size;
+    gint grip_width;
 
-extern RrPixmapMask *theme_max_set_mask;
-extern RrPixmapMask *theme_max_unset_mask;
-extern RrPixmapMask *theme_iconify_mask;
-extern RrPixmapMask *theme_desk_set_mask;
-extern RrPixmapMask *theme_desk_unset_mask;
-extern RrPixmapMask *theme_shade_set_mask;
-extern RrPixmapMask *theme_shade_unset_mask;
-extern RrPixmapMask *theme_close_mask;
+    /* style settings - colors */
+    color_rgb *b_color;
+    color_rgb *cb_focused_color;
+    color_rgb *cb_unfocused_color;
+    color_rgb *title_focused_color;
+    color_rgb *title_unfocused_color;
+    color_rgb *titlebut_focused_color;
+    color_rgb *titlebut_unfocused_color;
+    color_rgb *menu_title_color;
+    color_rgb *menu_color;
+    color_rgb *menu_disabled_color;
+    color_rgb *menu_hilite_color;
 
-extern RrAppearance *theme_a_focused_unpressed_max;
-extern RrAppearance *theme_a_focused_pressed_max;
-extern RrAppearance *theme_a_focused_pressed_set_max;
-extern RrAppearance *theme_a_unfocused_unpressed_max;
-extern RrAppearance *theme_a_unfocused_pressed_max;
-extern RrAppearance *theme_a_unfocused_pressed_set_max;
-extern RrAppearance *theme_a_focused_unpressed_close;
-extern RrAppearance *theme_a_focused_pressed_close;
-extern RrAppearance *theme_a_unfocused_unpressed_close;
-extern RrAppearance *theme_a_unfocused_pressed_close;
-extern RrAppearance *theme_a_focused_unpressed_desk;
-extern RrAppearance *theme_a_focused_pressed_desk;
-extern RrAppearance *theme_a_focused_pressed_set_desk;
-extern RrAppearance *theme_a_unfocused_unpressed_desk;
-extern RrAppearance *theme_a_unfocused_pressed_desk;
-extern RrAppearance *theme_a_unfocused_pressed_set_desk;
-extern RrAppearance *theme_a_focused_unpressed_shade;
-extern RrAppearance *theme_a_focused_pressed_shade;
-extern RrAppearance *theme_a_focused_pressed_set_shade;
-extern RrAppearance *theme_a_unfocused_unpressed_shade;
-extern RrAppearance *theme_a_unfocused_pressed_shade;
-extern RrAppearance *theme_a_unfocused_pressed_set_shade;
-extern RrAppearance *theme_a_focused_unpressed_iconify;
-extern RrAppearance *theme_a_focused_pressed_iconify;
-extern RrAppearance *theme_a_unfocused_unpressed_iconify;
-extern RrAppearance *theme_a_unfocused_pressed_iconify;
-extern RrAppearance *theme_a_focused_grip;
-extern RrAppearance *theme_a_unfocused_grip;
-extern RrAppearance *theme_a_focused_title;
-extern RrAppearance *theme_a_unfocused_title;
-extern RrAppearance *theme_a_focused_label;
-extern RrAppearance *theme_a_unfocused_label;
-extern RrAppearance *theme_a_icon;
-extern RrAppearance *theme_a_focused_handle;
-extern RrAppearance *theme_a_unfocused_handle;
-extern RrAppearance *theme_a_menu_title;
-extern RrAppearance *theme_a_menu;
-extern RrAppearance *theme_a_menu_item;
-extern RrAppearance *theme_a_menu_disabled;
-extern RrAppearance *theme_a_menu_hilite;
+    /* style settings - fonts */
+    gint winfont_height;
+    RrFont *winfont;
+    gboolean winfont_shadow;
+    gint winfont_shadow_offset;
+    gint winfont_shadow_tint;
+    gint mtitlefont_height;
+    RrFont *mtitlefont;
+    gboolean mtitlefont_shadow;
+    gint mtitlefont_shadow_offset;
+    gint mtitlefont_shadow_tint;
+    gint mfont_height;
+    RrFont *mfont;
+    gboolean mfont_shadow;
+    gint mfont_shadow_offset;
+    gint mfont_shadow_tint;
 
-extern RrAppearance *theme_app_hilite_bg;
-extern RrAppearance *theme_app_unhilite_bg;
-extern RrAppearance *theme_app_hilite_label;
-extern RrAppearance *theme_app_unhilite_label;
-extern RrAppearance *theme_app_icon;
+    /* style settings - title layout */
+    gchar *title_layout;
 
-void theme_startup(const RrInstance *inst);
-void theme_shutdown();
+    /* style settings - masks */
+    RrPixmapMask *max_set_mask;
+    RrPixmapMask *max_unset_mask;
+    RrPixmapMask *iconify_mask;
+    RrPixmapMask *desk_set_mask;
+    RrPixmapMask *desk_unset_mask;
+    RrPixmapMask *shade_set_mask;
+    RrPixmapMask *shade_unset_mask;
+    RrPixmapMask *close_mask;
 
-gchar *theme_load(gchar *theme);
+    /* global appearances */
+    RrAppearance *a_focused_unpressed_max;
+    RrAppearance *a_focused_pressed_max;
+    RrAppearance *a_focused_pressed_set_max;
+    RrAppearance *a_unfocused_unpressed_max;
+    RrAppearance *a_unfocused_pressed_max;
+    RrAppearance *a_unfocused_pressed_set_max;
+    RrAppearance *a_focused_unpressed_close;
+    RrAppearance *a_focused_pressed_close;
+    RrAppearance *a_unfocused_unpressed_close;
+    RrAppearance *a_unfocused_pressed_close;
+    RrAppearance *a_focused_unpressed_desk;
+    RrAppearance *a_focused_pressed_desk;
+    RrAppearance *a_focused_pressed_set_desk;
+    RrAppearance *a_unfocused_unpressed_desk;
+    RrAppearance *a_unfocused_pressed_desk;
+    RrAppearance *a_unfocused_pressed_set_desk;
+    RrAppearance *a_focused_unpressed_shade;
+    RrAppearance *a_focused_pressed_shade;
+    RrAppearance *a_focused_pressed_set_shade;
+    RrAppearance *a_unfocused_unpressed_shade;
+    RrAppearance *a_unfocused_pressed_shade;
+    RrAppearance *a_unfocused_pressed_set_shade;
+    RrAppearance *a_focused_unpressed_iconify;
+    RrAppearance *a_focused_pressed_iconify;
+    RrAppearance *a_unfocused_unpressed_iconify;
+    RrAppearance *a_unfocused_pressed_iconify;
+    RrAppearance *a_focused_grip;
+    RrAppearance *a_unfocused_grip;
+    RrAppearance *a_focused_title;
+    RrAppearance *a_unfocused_title;
+    RrAppearance *a_focused_label;
+    RrAppearance *a_unfocused_label;
+    /* always parentrelative, so no focused/unfocused */
+    RrAppearance *a_icon;
+    RrAppearance *a_focused_handle;
+    RrAppearance *a_unfocused_handle;
+    RrAppearance *a_menu_title;
+    RrAppearance *a_menu;
+    RrAppearance *a_menu_item;
+    RrAppearance *a_menu_disabled;
+    RrAppearance *a_menu_hilite;
+
+    RrAppearance *app_hilite_bg;
+    RrAppearance *app_unhilite_bg;
+    RrAppearance *app_hilite_label;
+    RrAppearance *app_unhilite_label;
+    RrAppearance *app_icon;
+};
+
+RrTheme *RrThemeNew(const RrInstance *inst, gchar *theme);
+void RrThemeFree(RrTheme *theme);
 
 #endif