diff --git a/clutter/clutter-color-static.h b/clutter/clutter-color-static.h
index f4403a8e4..028db6a4a 100644
--- a/clutter/clutter-color-static.h
+++ b/clutter/clutter-color-static.h
@@ -26,52 +26,54 @@
 #ifndef __CLUTTER_COLOR_STATIC_H__
 #define __CLUTTER_COLOR_STATIC_H__
 
-#define CLUTTER_COLOR_White             (clutter_color_get_static (CLUTTER_COLOR_WHITE))
-#define CLUTTER_COLOR_Black             (clutter_color_get_static (CLUTTER_COLOR_BLACK))
-#define CLUTTER_COLOR_Red               (clutter_color_get_static (CLUTTER_COLOR_RED))
-#define CLUTTER_COLOR_DarkRed           (clutter_color_get_static (CLUTTER_COLOR_DARK_RED))
-#define CLUTTER_COLOR_Green             (clutter_color_get_static (CLUTTER_COLOR_GREEN))
-#define CLUTTER_COLOR_DarkGreen         (clutter_color_get_static (CLUTTER_COLOR_DARK_GREEN))
-#define CLUTTER_COLOR_Blue              (clutter_color_get_static (CLUTTER_COLOR_BLUE))
-#define CLUTTER_COLOR_DarkBlue          (clutter_color_get_static (CLUTTER_COLOR_DARK_BLUE))
-#define CLUTTER_COLOR_Cyan              (clutter_color_get_static (CLUTTER_COLOR_CYAN))
-#define CLUTTER_COLOR_DarkCyan          (clutter_color_get_static (CLUTTER_COLOR_DARK_CYAN))
-#define CLUTTER_COLOR_Magenta           (clutter_color_get_static (CLUTTER_COLOR_MAGENTA))
-#define CLUTTER_COLOR_DarkMagenta       (clutter_color_get_static (CLUTTER_COLOR_DARK_MAGENTA))
-#define CLUTTER_COLOR_Yellow            (clutter_color_get_static (CLUTTER_COLOR_YELLOW))
-#define CLUTTER_COLOR_DarkYellow        (clutter_color_get_static (CLUTTER_COLOR_DARK_YELLOW))
-#define CLUTTER_COLOR_Gray              (clutter_color_get_static (CLUTTER_COLOR_GRAY))
-#define CLUTTER_COLOR_DarkGray          (clutter_color_get_static (CLUTTER_COLOR_DARK_GRAY))
-#define CLUTTER_COLOR_LightGray         (clutter_color_get_static (CLUTTER_COLOR_LIGHT_GRAY))
+#define __CLUTTER_COLOR_SYM(x)          (clutter_color_get_static (CLUTTER_COLOR_##x))
 
-#define CLUTTER_COLOR_Butter            (clutter_color_get_static (CLUTTER_COLOR_BUTTER))
-#define CLUTTER_COLOR_LightButter       (clutter_color_get_static (CLUTTER_COLOR_BUTTER_LIGHT))
-#define CLUTTER_COLOR_DarkButter        (clutter_color_get_static (CLUTTER_COLOR_BUTTER_DARK))
-#define CLUTTER_COLOR_Orange            (clutter_color_get_static (CLUTTER_COLOR_ORANGE))
-#define CLUTTER_COLOR_LightOrange       (clutter_color_get_static (CLUTTER_COLOR_ORANGE_LIGHT))
-#define CLUTTER_COLOR_DarkOrange        (clutter_color_get_static (CLUTTER_COLOR_ORANGE_DARK))
-#define CLUTTER_COLOR_Chocolate         (clutter_color_get_static (CLUTTER_COLOR_CHOCOLATE))
-#define CLUTTER_COLOR_LightChocolate    (clutter_color_get_static (CLUTTER_COLOR_CHOCOLATE_LIGHT))
-#define CLUTTER_COLOR_DarkChocolate     (clutter_color_get_static (CLUTTER_COLOR_CHOCOLATE_DARK))
-#define CLUTTER_COLOR_Chameleon         (clutter_color_get_static (CLUTTER_COLOR_CHAMELEON))
-#define CLUTTER_COLOR_LightChameleon    (clutter_color_get_static (CLUTTER_COLOR_CHAMELEON_LIGHT))
-#define CLUTTER_COLOR_DarkChameleon     (clutter_color_get_static (CLUTTER_COLOR_CHAMELEON_DARK))
-#define CLUTTER_COLOR_SkyBlue           (clutter_color_get_static (CLUTTER_COLOR_SKY_BLUE))
-#define CLUTTER_COLOR_LightSkyBlue      (clutter_color_get_static (CLUTTER_COLOR_SKY_BLUE_LIGHT))
-#define CLUTTER_COLOR_DarkSkyBlue       (clutter_color_get_static (CLUTTER_COLOR_SKY_BLUE_DARK))
-#define CLUTTER_COLOR_Plum              (clutter_color_get_static (CLUTTER_COLOR_PLUM))
-#define CLUTTER_COLOR_LightPlum         (clutter_color_get_static (CLUTTER_COLOR_PLUM_LIGHT))
-#define CLUTTER_COLOR_DarkPlum          (clutter_color_get_static (CLUTTER_COLOR_PLUM_DARK))
-#define CLUTTER_COLOR_ScarletRed        (clutter_color_get_static (CLUTTER_COLOR_SCARLET_RED))
-#define CLUTTER_COLOR_LightScarletRed   (clutter_color_get_static (CLUTTER_COLOR_SCARLET_RED_LIGHT))
-#define CLUTTER_COLOR_DarkScarletRed    (clutter_color_get_static (CLUTTER_COLOR_SCARLET_RED_DARK))
-#define CLUTTER_COLOR_Aluminium1        (clutter_color_get_static (CLUTTER_COLOR_ALUMINIUM_1))
-#define CLUTTER_COLOR_Aluminium2        (clutter_color_get_static (CLUTTER_COLOR_ALUMINIUM_2))
-#define CLUTTER_COLOR_Aluminium3        (clutter_color_get_static (CLUTTER_COLOR_ALUMINIUM_3))
-#define CLUTTER_COLOR_Aluminium4        (clutter_color_get_static (CLUTTER_COLOR_ALUMINIUM_4))
-#define CLUTTER_COLOR_Aluminium5        (clutter_color_get_static (CLUTTER_COLOR_ALUMINIUM_5))
-#define CLUTTER_COLOR_Aluminium6        (clutter_color_get_static (CLUTTER_COLOR_ALUMINIUM_6))
+#define CLUTTER_COLOR_White             (__CLUTTER_COLOR_SYM (WHITE))
+#define CLUTTER_COLOR_Black             (__CLUTTER_COLOR_SYM (BLACK))
+#define CLUTTER_COLOR_Red               (__CLUTTER_COLOR_SYM (RED))
+#define CLUTTER_COLOR_DarkRed           (__CLUTTER_COLOR_SYM (DARK_RED))
+#define CLUTTER_COLOR_Green             (__CLUTTER_COLOR_SYM (GREEN))
+#define CLUTTER_COLOR_DarkGreen         (__CLUTTER_COLOR_SYM (DARK_GREEN))
+#define CLUTTER_COLOR_Blue              (__CLUTTER_COLOR_SYM (BLUE))
+#define CLUTTER_COLOR_DarkBlue          (__CLUTTER_COLOR_SYM (DARK_BLUE))
+#define CLUTTER_COLOR_Cyan              (__CLUTTER_COLOR_SYM (CYAN))
+#define CLUTTER_COLOR_DarkCyan          (__CLUTTER_COLOR_SYM (DARK_CYAN))
+#define CLUTTER_COLOR_Magenta           (__CLUTTER_COLOR_SYM (MAGENTA))
+#define CLUTTER_COLOR_DarkMagenta       (__CLUTTER_COLOR_SYM (DARK_MAGENTA))
+#define CLUTTER_COLOR_Yellow            (__CLUTTER_COLOR_SYM (YELLOW))
+#define CLUTTER_COLOR_DarkYellow        (__CLUTTER_COLOR_SYM (DARK_YELLOW))
+#define CLUTTER_COLOR_Gray              (__CLUTTER_COLOR_SYM (GRAY))
+#define CLUTTER_COLOR_DarkGray          (__CLUTTER_COLOR_SYM (DARK_GRAY))
+#define CLUTTER_COLOR_LightGray         (__CLUTTER_COLOR_SYM (LIGHT_GRAY))
 
-#define CLUTTER_COLOR_Transparent       (clutter_color_get_static (CLUTTER_COLOR_TRANSPARENT))
+#define CLUTTER_COLOR_Butter            (__CLUTTER_COLOR_SYM (BUTTER))
+#define CLUTTER_COLOR_LightButter       (__CLUTTER_COLOR_SYM (BUTTER_LIGHT))
+#define CLUTTER_COLOR_DarkButter        (__CLUTTER_COLOR_SYM (BUTTER_DARK))
+#define CLUTTER_COLOR_Orange            (__CLUTTER_COLOR_SYM (ORANGE))
+#define CLUTTER_COLOR_LightOrange       (__CLUTTER_COLOR_SYM (ORANGE_LIGHT))
+#define CLUTTER_COLOR_DarkOrange        (__CLUTTER_COLOR_SYM (ORANGE_DARK))
+#define CLUTTER_COLOR_Chocolate         (__CLUTTER_COLOR_SYM (CHOCOLATE))
+#define CLUTTER_COLOR_LightChocolate    (__CLUTTER_COLOR_SYM (CHOCOLATE_LIGHT))
+#define CLUTTER_COLOR_DarkChocolate     (__CLUTTER_COLOR_SYM (CHOCOLATE_DARK))
+#define CLUTTER_COLOR_Chameleon         (__CLUTTER_COLOR_SYM (CHAMELEON))
+#define CLUTTER_COLOR_LightChameleon    (__CLUTTER_COLOR_SYM (CHAMELEON_LIGHT))
+#define CLUTTER_COLOR_DarkChameleon     (__CLUTTER_COLOR_SYM (CHAMELEON_DARK))
+#define CLUTTER_COLOR_SkyBlue           (__CLUTTER_COLOR_SYM (SKY_BLUE))
+#define CLUTTER_COLOR_LightSkyBlue      (__CLUTTER_COLOR_SYM (SKY_BLUE_LIGHT))
+#define CLUTTER_COLOR_DarkSkyBlue       (__CLUTTER_COLOR_SYM (SKY_BLUE_DARK))
+#define CLUTTER_COLOR_Plum              (__CLUTTER_COLOR_SYM (PLUM))
+#define CLUTTER_COLOR_LightPlum         (__CLUTTER_COLOR_SYM (PLUM_LIGHT))
+#define CLUTTER_COLOR_DarkPlum          (__CLUTTER_COLOR_SYM (PLUM_DARK))
+#define CLUTTER_COLOR_ScarletRed        (__CLUTTER_COLOR_SYM (SCARLET_RED))
+#define CLUTTER_COLOR_LightScarletRed   (__CLUTTER_COLOR_SYM (SCARLET_RED_LIGHT))
+#define CLUTTER_COLOR_DarkScarletRed    (__CLUTTER_COLOR_SYM (SCARLET_RED_DARK))
+#define CLUTTER_COLOR_Aluminium1        (__CLUTTER_COLOR_SYM (ALUMINIUM_1))
+#define CLUTTER_COLOR_Aluminium2        (__CLUTTER_COLOR_SYM (ALUMINIUM_2))
+#define CLUTTER_COLOR_Aluminium3        (__CLUTTER_COLOR_SYM (ALUMINIUM_3))
+#define CLUTTER_COLOR_Aluminium4        (__CLUTTER_COLOR_SYM (ALUMINIUM_4))
+#define CLUTTER_COLOR_Aluminium5        (__CLUTTER_COLOR_SYM (ALUMINIUM_5))
+#define CLUTTER_COLOR_Aluminium6        (__CLUTTER_COLOR_SYM (ALUMINIUM_6))
+
+#define CLUTTER_COLOR_Transparent       (__CLUTTER_COLOR_SYM (TRANSPARENT))
 
 #endif /* __CLUTTER_COLOR_STATIC_H__ */