diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 2ab571f74c..08456fb949 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -170,6 +170,9 @@ color_classes {
       color: 160 160 160 255; }
    color_class { name: "/bg/normal/bubble";
       color:  48  48  48 255; }
+///////////////////////////////////////////////////////////////////////////////
+   color_class { name: "/bg/normal/shelf/translucent";
+      color:  64  64  64 128; }
 
 
 
diff --git a/data/elementary/themes/edc/shelf.edc b/data/elementary/themes/edc/shelf.edc
index c97f83d068..f654d1d965 100644
--- a/data/elementary/themes/edc/shelf.edc
+++ b/data/elementary/themes/edc/shelf.edc
@@ -13,14 +13,16 @@ group { name: "e/shelf/default/base"; nomouse;
    }
    parts {
       rect { "mouse"; mouse;
-         desc { color: 0 0 0 0; }
+         desc {
+            color: 0 0 0 0; // no cc
+         }
       }
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/shelf/default";
          }
          description { state: "vert" 0.0;
-            color: 64 64 64 255;
+            inherit: "default" 0.0;
          }
       }
       spacer { "sizer";
@@ -47,12 +49,13 @@ group { name: "e/shelf/default/base"; nomouse;
          }
       }
       rect { "events"; repeat; mouse;
-         desc { color: 0 0 0 0; }
+         desc {
+            color: 0 0 0 0; // no cc
+         }
       }
       programs  {
 #define ORIENT_SATE(_ORIENT, _STATE) \
-         program { \
-            signal: "e,state,orientation,"_ORIENT; source: "e"; \
+         program { signal: "e,state,orientation,"_ORIENT; source: "e"; \
             action: STATE_SET _STATE 0.0; \
             target: "sizer"; \
          }
@@ -81,11 +84,13 @@ group { name: "e/shelf/default/inset"; nomouse;
    images.image: "shadow_circle_vert.png" COMP;
    parts {
       rect { "mouse"; mouse;
-         desc { color: 0 0 0 0; }
+         desc {
+            color: 0 0 0 0; // no cc
+         }
       }
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "clip"; type: RECT;
@@ -93,13 +98,11 @@ group { name: "e/shelf/default/inset"; nomouse;
          description { state: "default" 0.0;
             rel1.offset: 3 0;
             rel2.offset: -4 -1;
-            color: 255 255 255 255;
             offscale;
          }
          description { state: "vert" 0.0;
             rel1.offset: 0 3;
             rel2.offset: -1 -4;
-            color: 255 255 255 255;
             offscale;
          }
       }
@@ -145,12 +148,13 @@ group { name: "e/shelf/default/inset"; nomouse;
             rel2.relative: 0.0 1.0;
             image.normal: "shadow_circle_vert.png";
             min: 0 0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
+            color_class: "/shadow/normal/shelf/inset";
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
             min: 16 0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       part { name: "sh_r"; nomouse;
@@ -161,12 +165,13 @@ group { name: "e/shelf/default/inset"; nomouse;
             rel1.relative: 1.0 0.0;
             image.normal: "shadow_circle_vert.png";
             min: 0 0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
+            color_class: "/shadow/normal/shelf/inset";
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
             min: 16 0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       part { name: "sh_vert_clip"; type: RECT;
@@ -187,12 +192,13 @@ group { name: "e/shelf/default/inset"; nomouse;
             rel2.relative: 1.0 0.0;
             image.normal: "shadow_circle_horiz.png";
             min: 0 0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
+            color_class: "/shadow/normal/shelf/inset";
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
             min: 0 16;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       part { name: "sh_b"; nomouse;
@@ -203,27 +209,30 @@ group { name: "e/shelf/default/inset"; nomouse;
             rel1.relative: 0.0 1.0;
             image.normal: "shadow_circle_horiz.png";
             min: 0 0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
+            color_class: "/shadow/normal/shelf/inset";
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
             min: 0 16;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       rect { "events"; repeat; mouse;
-         desc { color: 0 0 0 0; }
+         desc {
+            color: 0 0 0 0; // no cc
+         }
       }
    }
    programs {
 #define ORIENT_SATE(_ORIENT, _STATE) \
-program { signal: "e,state,orientation,"_ORIENT; source: "e"; \
-action: STATE_SET _STATE 0.0; \
-target: "sizer"; \
-target: "clip"; \
-target: "sh_horiz_clip"; \
-target: "sh_vert_clip"; \
-}
+   program { signal: "e,state,orientation,"_ORIENT; source: "e"; \
+     action: STATE_SET _STATE 0.0; \
+     target: "sizer"; \
+     target: "clip"; \
+     target: "sh_horiz_clip"; \
+     target: "sh_vert_clip"; \
+   }
       ORIENT_SATE("top", "default")
       ORIENT_SATE("top_left", "default")
       ORIENT_SATE("top_right", "default")
@@ -294,16 +303,17 @@ group { name: "e/shelf/default/plain"; nomouse;
    alias: "e/shelf/translucent/plain";
    parts {
       rect { "mouse"; mouse;
-         desc { color: 0 0 0 0; }
+         desc {
+            color: 0 0 0 0; // no cc
+         }
       }
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            color: 255 255 255 255;
          }
       }
       spacer { "sizer";
@@ -326,7 +336,9 @@ group { name: "e/shelf/default/plain"; nomouse;
          }
       }
       rect { "events"; repeat; mouse;
-         desc { color: 0 0 0 0; }
+         desc {
+            color: 0 0 0 0; // no cc
+         }
       }
    }
 }
@@ -336,10 +348,10 @@ group { name: "e/shelf/alternate/base"; nomouse;
    parts {
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            color: 32 32 32 255;
+            color_class: "/bg/normal/shelf/alt";
          }
          description { state: "vert" 0.0;
-            color: 32 32 32 255;
+            color_class: "/bg/normal/shelf/alt";
          }
       }
    }
@@ -372,10 +384,10 @@ group { name: "e/shelf/translucent/base"; nomouse;
    parts {
       part { name: "bg";
          description { state: "default" 0.0;
-            color: 64 64 64 128;
+            color_class: "/bg/normal/shelf/translucent";
          }
          description { state: "vert" 0.0;
-            color: 64 64 64 128;
+            color_class: "/bg/normal/shelf/translucent";
          }
       }
    }