diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 5513f0a88e..d77a0ff6a5 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -206,6 +206,25 @@ color_classes {
       color: 255 255 255 255; }
    color_class { name: "/fg/pressed/panes/fold/arrow";
       color: 220 220 220 255; }
+///////////////////////////////////////////////////////////////////////////////
+   color_class { name: "/bg/normal/calendar/day/normal";
+      color:   0   0   0   0; }
+   color_class { name: "/bg/normal/calendar/day/today";
+      color:   0   0   0  64; }
+   color_class { name: "/bg/selected/calendar/day";
+      color:  51 153 255 128; }
+   color_class { name: "/fg/normal/calendar/day/checked";
+      color:  51 153 255 255; }
+   color_class { name: "/fg/normal/calendar/day/holiday";
+      color:  51 153 255 255; }
+   color_class { name: "/fg/normal/calendar/day/today";
+      color: 255 255 255 255; }
+   color_class { name: "/fg/normal/calendar/day/disabled";
+      color:  40  40  40 255; }
+   color_class { name: "/fg/normal/calendar/day/weekend1";
+      color:  51 153 255 255; }
+   color_class { name: "/fg/normal/calendar/day/weekend2";
+      color:  51 153 255 255; }
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/fg/normal/panel/arrow";
       color: 255 255 255 255; }
@@ -843,6 +862,46 @@ color_classes {
    color_class { name: "/fg/normal/gadgets/packagekit/pkg/security";
       color: 255 153  51 255; }
 
+///////////////////////////////////////////////////////////////////////////////
+// XXX: need to find a bette way to deal with these?
+    color_class { name: "elm/code/status/default"; color: 48 48 48 255; }
+    color_class { name: "elm/code/status/current"; color: 32 32 32 255; }
+    color_class { name: "elm/code/status/ignored"; color: 36 36 36 255; }
+    color_class { name: "elm/code/status/note"; color: 160 80 17 255;  }
+    color_class { name: "elm/code/status/warning"; color: 160 80 17 255; }
+    color_class { name: "elm/code/status/error"; color: 160 32 17 255; }
+    color_class { name: "elm/code/status/fatal"; color: 160 32 17 255; }
+    color_class { name: "elm/code/status/added"; color: 36 96 36 255; }
+    color_class { name: "elm/code/status/removed"; color: 96 36 36 255; }
+    color_class { name: "elm/code/status/changed"; color: 36 36 96 255; }
+    color_class { name: "elm/code/status/passed"; color: 54 96 54 255; }
+    color_class { name: "elm/code/status/failed"; color: 96 54 54 255; }
+    color_class { name: "elm/code/status/todo"; color: 48 80 160 255; }
+
+    color_class { name: "elm/code/token/default"; color: 160 160 160 255; }
+    color_class { name: "elm/code/token/comment"; color: 255 255 255 48; }
+    color_class { name: "elm/code/token/string"; color: 255 136 119 255; }
+    color_class { name: "elm/code/token/number"; color: 170 153 34 255; }
+    color_class { name: "elm/code/token/brace"; color: 170 102 170 255; }
+    color_class { name: "elm/code/token/type"; color: 255 255 255 255; }
+    color_class { name: "elm/code/token/class"; color: 255 255 255 255; }
+    color_class { name: "elm/code/token/function"; color: 255 255 255 255; }
+    color_class { name: "elm/code/token/param"; color: 187 187 187 255; }
+    color_class { name: "elm/code/token/keyword"; color: 68 136 204 255; }
+    color_class { name: "elm/code/token/preprocessor"; color: 102 255 85 255; }
+    color_class { name: "elm/code/token/added"; color: 54 255 54 255; }
+    color_class { name: "elm/code/token/removed"; color: 255 54 54 255; }
+    color_class { name: "elm/code/token/changed"; color: 54 54 255 255; }
+    color_class { name: "elm/code/token/match"; color: 187 187 51 128; }
+
+    color_class { name: "elm/code/widget/color/selection"; color: 51 153 255 128; }
+    color_class { name: "elm/code/widget/color/gutter/bg"; color: 64 64 64 255; }
+    color_class { name: "elm/code/widget/color/gutter/fg"; color: 128 128 128 255; }
+    color_class { name: "elm/code/widget/color/gutter/scope/bg"; color: 54 54 54 255; }
+    color_class { name: "elm/code/widget/color/whitespace"; color: 96 96 96 255; }
+///////////////////////////////////////////////////////////////////////////////
+
+
 
 
 
diff --git a/data/elementary/themes/edc/elm/calendar.edc b/data/elementary/themes/edc/elm/calendar.edc
index 73bad621be..ae52678a98 100644
--- a/data/elementary/themes/edc/elm/calendar.edc
+++ b/data/elementary/themes/edc/elm/calendar.edc
@@ -1,21 +1,21 @@
 #define CIT_STYLES\
       style { name: "calendar_date_style";\
-         base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\
+         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day align=center text_class=calendar_day_text";\
       }\
       style { name: "calendar_date_holiday_style";\
-         base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_holiday";\
+         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/holiday align=center text_class=calendar_day_text_holiday";\
       }\
       style { name: "calendar_date_today_style";\
-         base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\
+         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/today align=center text_class=calendar_day_text_today";\
       }\
       style { name: "calendar_date_disabled_style";\
-         base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\
+         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/disabled align=center text_class=calendar_day_text_disabled";\
       }\
       style { name: "calendar_date_weekend1_style";\
-         base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend1";\
+         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/weekend1 align=center text_class=calendar_day_text_weekend1";\
       }\
       style { name: "calendar_date_weekend2_style";\
-         base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend2";\
+         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/weekend2 align=center text_class=calendar_day_text_weekend2";\
       }\
 
 #define CAL_SPIN(_sufix, _text, _relative)\
@@ -34,7 +34,7 @@
             max: 25 25;\
          }\
       }\
-      part { name: "right_bt"#_sufix; type: RECT;\
+      part { name: "right_bt"#_sufix; type: SPACER;\
          scale: 1;\
          description { state: "default" 0.0;\
             fixed: 1 1;\
@@ -47,7 +47,6 @@
             align: 1.0 0.5;\
             min: 25 25;\
             max: 25 25;\
-            color: 0 0 0 0;\
          }\
       }\
       part { name: "elm,calendar,button"#_sufix",left"; type: SWALLOW;\
@@ -93,7 +92,7 @@
                min: 0 1;\
                text_class: "calendar_"#_text; \
             }\
-            color: 160 160 160 255; \
+            color_class: "/fg/normal/calendar/text/title"; \
          }\
       }
 
@@ -118,7 +117,7 @@
             ellipsis: -1; \
             text_class: "calendar_weekday_text"; \
          } \
-         color: 160 160 160 255; \
+         color_class: "/fg/normal/calendar/text/day"; \
       } \
    } \
    part { name: "ch_"#_pos"_clipper"; type: RECT; \
@@ -138,17 +137,17 @@
    part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \
       description { state: "default" 0.0; \
          rel.to: "cit_"#_pos"_rect"; \
-         color: 0 0 0 0; \
+         color_class: "/bg/normal/calendar/day/normal"; \
       } \
       description { state: "today" 0.0; \
          inherit: "default" 0.0; \
-         color: 0 0 0 64; \
+         color_class: "/bg/normal/calendar/day/today"; \
       } \
    } \
    part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \
       description { state: "default" 0.0; \
          rel.to: "cit_"#_pos"_rect"; \
-         color: 51 153 255 128; \
+         color_class: "/bg/selected/calendar/day"; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -159,7 +158,7 @@
    part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \
       description { state: "default" 0.0; \
          rel.to: "cit_"#_pos"_rect"; \
-         color: 255 153 51 128; \
+         color_class: "/bg/selected/calendar/day/focused"; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -209,7 +208,7 @@
          max: 15 15; \
          align: 0.0 1.0;\
          image.normal: "i-check"; \
-         color: 53 153 255 255; \
+         color_class: "/fg/normal/calendar/day/checked"; \
          visible: 0; \
       } \
       description { state: "visible" 0.0; \
@@ -220,7 +219,7 @@
    part { name: "elm.cit_"#_pos".access"; type: RECT; repeat_events: 1; \
       description { state: "default" 0.0; \
          rel.to: "cit_"#_pos"_event"; \
-         color: 0 0 0 0; \
+         color: 0 0 0 0; /* no cc */ \
       } \
    } \
    programs { \
@@ -451,7 +450,7 @@ group { name: "elm/calendar/base/default";
             rel1.relative: 0.0 1.0;
             rel1.offset: 8 -1;
             rel2.offset: -9 -1;
-            color: 80 80 80 255;
+            color_class: "/fg/normal/separator";
             offscale;
          }
       }
diff --git a/data/elementary/themes/edc/elm/code.edc b/data/elementary/themes/edc/elm/code.edc
index b3f34a1090..bf5b6fa8f7 100644
--- a/data/elementary/themes/edc/elm/code.edc
+++ b/data/elementary/themes/edc/elm/code.edc
@@ -14,41 +14,3 @@ group { name: "elm/code/layout/default";
       }
    }
 }
-
-color_classes {
-    color_class { name: "elm/code/status/default"; color: 48 48 48 255; }
-    color_class { name: "elm/code/status/current"; color: 32 32 32 255; }
-    color_class { name: "elm/code/status/ignored"; color: 36 36 36 255; }
-    color_class { name: "elm/code/status/note"; color: 160 80 17 255;  }
-    color_class { name: "elm/code/status/warning"; color: 160 80 17 255; }
-    color_class { name: "elm/code/status/error"; color: 160 32 17 255; }
-    color_class { name: "elm/code/status/fatal"; color: 160 32 17 255; }
-    color_class { name: "elm/code/status/added"; color: 36 96 36 255; }
-    color_class { name: "elm/code/status/removed"; color: 96 36 36 255; }
-    color_class { name: "elm/code/status/changed"; color: 36 36 96 255; }
-    color_class { name: "elm/code/status/passed"; color: 54 96 54 255; }
-    color_class { name: "elm/code/status/failed"; color: 96 54 54 255; }
-    color_class { name: "elm/code/status/todo"; color: 48 80 160 255; }
-
-    color_class { name: "elm/code/token/default"; color: 160 160 160 255; }
-    color_class { name: "elm/code/token/comment"; color: 255 255 255 48; }
-    color_class { name: "elm/code/token/string"; color: 255 136 119 255; }
-    color_class { name: "elm/code/token/number"; color: 170 153 34 255; }
-    color_class { name: "elm/code/token/brace"; color: 170 102 170 255; }
-    color_class { name: "elm/code/token/type"; color: 255 255 255 255; }
-    color_class { name: "elm/code/token/class"; color: 255 255 255 255; }
-    color_class { name: "elm/code/token/function"; color: 255 255 255 255; }
-    color_class { name: "elm/code/token/param"; color: 187 187 187 255; }
-    color_class { name: "elm/code/token/keyword"; color: 68 136 204 255; }
-    color_class { name: "elm/code/token/preprocessor"; color: 102 255 85 255; }
-    color_class { name: "elm/code/token/added"; color: 54 255 54 255; }
-    color_class { name: "elm/code/token/removed"; color: 255 54 54 255; }
-    color_class { name: "elm/code/token/changed"; color: 54 54 255 255; }
-    color_class { name: "elm/code/token/match"; color: 187 187 51 128; }
-
-    color_class { name: "elm/code/widget/color/selection"; color: 51 153 255 128; }
-    color_class { name: "elm/code/widget/color/gutter/bg"; color: 64 64 64 255; }
-    color_class { name: "elm/code/widget/color/gutter/fg"; color: 128 128 128 255; }
-    color_class { name: "elm/code/widget/color/gutter/scope/bg"; color: 54 54 54 255; }
-    color_class { name: "elm/code/widget/color/whitespace"; color: 96 96 96 255; }
-}