@@ -7,7 +7,7 @@ 
 XColor *pseudo_colors;
 int pseudo_bpc;
 
-void color_allocate_gc(color_rgb *in)
+void color_allocate_gc(RrColor *in)
 {
     XGCValues gcv;
 
@@ -18,7 +18,7 @@ RrRootWindow(in->inst),
                        GCForeground | GCCapStyle, &gcv);
 }
 
-color_rgb *RrColorParse(const RrInstance *inst, gchar *colorname)
+RrColor *RrColorParse(const RrInstance *inst, gchar *colorname)
 {
     XColor xcol;
 
@@ -36,16 +36,16 @@ }
     return RrColorNew(inst, xcol.red >> 8, xcol.green >> 8, xcol.blue >> 8);
 }
 
-color_rgb *RrColorNew(const RrInstance *inst, gint r, gint g, gint b)
+RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b)
 {
     /* this should be replaced with something far cooler */
-    color_rgb *out = NULL;
+    RrColor *out = NULL;
     XColor xcol;
     xcol.red = (r << 8) | r;
     xcol.green = (g << 8) | g;
     xcol.blue = (b << 8) | b;
     if (XAllocColor(RrDisplay(inst), RrColormap(inst), &xcol)) {
-        out = g_new(color_rgb, 1);
+        out = g_new(RrColor, 1);
         out->inst = inst;
         out->r = xcol.red >> 8;
         out->g = xcol.green >> 8;
@@ -58,7 +58,7 @@ }
 
 /*XXX same color could be pointed to twice, this might have to be a refcount*/
 
-void RrColorFree(color_rgb *c)
+void RrColorFree(RrColor *c)
 {
     if (c) {
         if (c->gc) XFreeGC(RrDisplay(c->inst), c->gc);

@@ -31,7 +31,7 @@ unsigned long pixel;
     GC gc;
 };
 
-void color_allocate_gc(color_rgb *in);
+void color_allocate_gc(RrColor *in);
 XColor *pickColor(const RrInstance *inst, gint r, gint g, gint b);
 void reduce_depth(const RrInstance *inst, pixel32 *data, XImage *im);
 void increase_depth(const RrInstance *inst, pixel32 *data, XImage *im);

@@ -16,7 +16,7 @@ typedef struct _RrTextureRGBA      RrTextureRGBA;
 typedef struct _RrTextureText      RrTextureText;
 typedef struct _RrPixmapMask       RrPixmapMask;
 typedef struct _RrInstance         RrInstance;
-typedef struct _RrColor            color_rgb; /* XXX ugly */
+typedef struct _RrColor            RrColor;
 
 typedef guint32 pixel32; /* XXX prefix */
 typedef guint16 pixel16;
@@ -62,11 +62,11 @@ struct _RrSurface {
     RrSurfaceColorType grad;
     RrReliefType relief;
     RrBevelType bevel;
-    color_rgb *primary;
-    color_rgb *secondary;
-    color_rgb *border_color;
-    color_rgb *bevel_dark; 
-    color_rgb *bevel_light;
+    RrColor *primary;
+    RrColor *secondary;
+    RrColor *border_color;
+    RrColor *bevel_dark; 
+    RrColor *bevel_light;
     gboolean interlaced;
     gboolean border;
     RrAppearance *parent;
@@ -81,7 +81,7 @@ RrJustify justify;
     gint shadow;
     gchar tint;
     guchar offset;
-    color_rgb *color;
+    RrColor *color;
     gchar *string;
 };
 
@@ -94,7 +94,7 @@ gchar *data;
 };
 
 struct _RrTextureMask {
-    color_rgb *color;
+    RrColor *color;
     RrPixmapMask *mask;
 };
 
@@ -153,9 +153,9 @@ gint     RrBlueMask     (const RrInstance *inst);
 guint    RrPseudoBPC    (const RrInstance *inst);
 XColor*  RrPseudoColors (const RrInstance *inst);
 
-color_rgb *RrColorNew   (const RrInstance *inst, gint r, gint g, gint b);
-color_rgb *RrColorParse (const RrInstance *inst, gchar *colorname);
-void       RrColorFree  (color_rgb *in);
+RrColor *RrColorNew   (const RrInstance *inst, gint r, gint g, gint b);
+RrColor *RrColorParse (const RrInstance *inst, gchar *colorname);
+void     RrColorFree  (RrColor *in);
 
 RrAppearance *RrAppearanceNew  (const RrInstance *inst, gint numtex);
 RrAppearance *RrAppearanceCopy (RrAppearance *a);

@@ -11,7 +11,7 @@ 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);
+                           gchar *rname, RrColor **value);
 static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
                           gchar *rname, gchar *theme,
                           RrPixmapMask **value);
@@ -767,7 +767,7 @@ return ret;
 }
 
 static gboolean read_color(XrmDatabase db, const RrInstance *inst,
-                           gchar *rname, color_rgb **value)
+                           gchar *rname, RrColor **value)
 {
     gboolean ret = FALSE;
     char *rclass = create_class_name(rname);
@@ -776,7 +776,7 @@ XrmValue retvalue;
   
     if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
 	retvalue.addr != NULL) {
-	color_rgb *c = RrColorParse(inst, retvalue.addr);
+	RrColor *c = RrColorParse(inst, retvalue.addr);
 	if (c != NULL) {
 	    *value = c;
 	    ret = TRUE;

@@ -24,17 +24,17 @@ gint button_size;
     gint grip_width;
 
     /* 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;
+    RrColor *b_color;
+    RrColor *cb_focused_color;
+    RrColor *cb_unfocused_color;
+    RrColor *title_focused_color;
+    RrColor *title_unfocused_color;
+    RrColor *titlebut_focused_color;
+    RrColor *titlebut_unfocused_color;
+    RrColor *menu_title_color;
+    RrColor *menu_color;
+    RrColor *menu_disabled_color;
+    RrColor *menu_hilite_color;
 
     /* style settings - fonts */
     gint winfont_height;