diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 2870295217..2f5b482897 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -304,6 +304,37 @@ color_classes {
       color: 255 255 255 255; }
    color_class { name: "/fg/normal/gadgets/battery/text/time";
       color: 255 255 255 255; }
+///////////////////////////////////////////////////////////////////////////////
+   color_class { name: "/fg/disabled/gadgets/connman/eth/cable";
+      color: 160 160 160 128; }
+   color_class { name: "/fg/normal/gadgets/connman/eth/cable";
+      color: 160 160 160 255; }
+   color_class { name: "/fg/selected/gadgets/connman/eth/cable";
+      color:  51 153 255 255; }
+   color_class { name: "/fg/disabled/gadgets/connman/eth/connector";
+      color: 160 160 160 128; }
+   color_class { name: "/fg/normal/gadgets/connman/eth/connector";
+      color: 160 160 160 255; }
+   color_class { name: "/fg/selected/gadgets/connman/eth/connector";
+      color: 160 160 160 255; }
+   color_class { name: "/fg/disabled/gadgets/connman/wifi/connected";
+      color: 160 160 160 255; }
+   color_class { name: "/fg/normal/gadgets/connman/wifi/connected";
+      color: 160 160 160 255; }
+   color_class { name: "/fg/selected/gadgets/connman/wifi/connected";
+      color:  51 153 255 255; }
+   color_class { name: "/fg/normal/gadgets/connman/wifi/signal";
+      color: 160 160 160 255; }
+   color_class { name: "/fg/normal/gadgets/connman/bt/base";
+      color: 160 160 160 255; }
+   color_class { name: "/fg/normal/gadgets/connman/bt/signal";
+      color: 160 160 160 255; }
+   color_class { name: "/fg/normal/gadgets/connman/cell/base";
+      color: 160 160 160 255; }
+   color_class { name: "/fg/normal/gadgets/connman/cell/signal";
+      color: 160 160 160 255; }
+   color_class { name: "/fg/normal/gadgets/connman/security";
+      color: 160 160 160 255; }
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/fg/normal/gadgets/bluez/off";
       color: 160 160 160 128; }
diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc
index c9646aa5d0..e1b2f18607 100644
--- a/data/elementary/themes/edc/comp_compat.edc
+++ b/data/elementary/themes/edc/comp_compat.edc
@@ -8,12 +8,12 @@ group { name: "e/comp/border/default";
             rel1.offset: -9999 -9999;
             rel2.relative: 2.0   2.0;
             rel2.offset: 9999  9999;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
@@ -27,7 +27,18 @@ group { name: "e/comp/border/default";
             visible: 0;
          }
       }
-      WIN_SHAD("e.swallow.content", "shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
+      part { name: "focus-shadow"; type: RECT;
+         clip_to: "shadow";
+         description { state: "default" 0.0;
+            rel.to: "clipper";
+            color_class: "/shadow/normal/comp/win";
+         }
+         description { state: "focused" 0.0;
+            inherit;
+            color_class: "/shadow/selected/comp/win";
+         }
+      }
+      WIN_SHAD("e.swallow.content", "focus-shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
       part { name: "shower"; type: SPACER;
          description { state: "default" 0.0;
             rel1.relative: 0.05 0.05;
@@ -51,10 +62,11 @@ group { name: "e/comp/border/default";
          mouse_events: 0;
          description { state: "default" 0.0;
             rel.to: "clipper";
+            color_class: "/bg/normal/comp/win";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/bg/selected/comp/win";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
@@ -65,19 +77,15 @@ group { name: "e/comp/border/default";
       }
    }
    programs {
-      program {
-         signal: "e,state,shadow,on"; source: "e";
+      program { signal: "e,state,shadow,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "shadow";
       }
-      program {
-         signal: "e,state,shadow,off"; source: "e";
+      program { signal: "e,state,shadow,off"; source: "e";
          action: STATE_SET "hidden" 0.0;
          target: "shadow";
       }
-      program {
-         name: "visible_on";
-         signal: "e,state,visible,on"; source: "e";
+      program { signal: "e,state,visible,on"; source: "e";
          action: STATE_SET "visible" 0.0;
          transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
          target: "clipper";
@@ -87,9 +95,7 @@ group { name: "e/comp/border/default";
       program { name: "show2";
          action: SIGNAL_EMIT "e,action,show,done" "e";
       }
-      program {
-         name: "visible_off";
-         signal: "e,state,visible,off"; source: "e";
+      program { signal: "e,state,visible,off"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
          target: "clipper";
@@ -99,35 +105,17 @@ group { name: "e/comp/border/default";
       program { name: "hide2";
          action: SIGNAL_EMIT "e,action,hide,done" "e";
       }
-/*
-      program {
-         name: "focus_on";
-         signal: "e,state,focus,on"; source: "e";
+      program { signal: "e,state,focus,on"; source: "e";
          action: STATE_SET "focused" 0.0;
          transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
-         target: "glow";
-         target: "focus-clipper";
-         after: "focus2";
+         targets: "focus-clipper" "focus-shadow";
       }
-      program { name: "focus2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
-         target: "glow";
-      }
-      program {
-         name: "focus_off";
-         signal: "e,state,focus,off"; source: "e";
+      program { signal: "e,state,focus,off"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
-         target: "focus-clipper";
-         after: "focus_off2";
-      }
-      program {
-         name: "focus_off2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
-         target: "glow";
+         targets: "focus-clipper" "focus-shadow";
       }
+/*
       program { name: "urgent1";
          signal: "e,state,urgent,on"; source: "e";
          action: STATE_SET "focused" 0.0;
@@ -178,14 +166,12 @@ group { name: "e/comp/border/rotate";
       }
    }
    programs {
-      program { name: "focus3";
-         signal: "e,state,focus,on"; source: "e";
+      program { signal: "e,state,focus,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.content";
          transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
       }
-      program { name: "focus_off3";
-         signal: "e,state,focus,off"; source: "e";
+      program { signal: "e,state,focus,off"; source: "e";
          action: STATE_SET "focus-out" 0.0;
          target: "e.swallow.content";
          transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
@@ -238,12 +224,10 @@ group { name: "e/comp/border/none";
       }
    }
    programs {
-      program {
-         signal: "e,state,visible,on"; source: "e";
+      program { signal: "e,state,visible,on"; source: "e";
          action: SIGNAL_EMIT "e,action,show,done" "e";
       }
-      program {
-         signal: "e,state,visible,off"; source: "e";
+      program { signal: "e,state,visible,off"; source: "e";
          action: SIGNAL_EMIT "e,action,hide,done" "e";
       }
    }
@@ -299,17 +283,17 @@ group { name: "e/comp/border/fullscreen";
             rel1.offset: -9999 -9999;
             rel2.relative: 2.0   2.0;
             rel2.offset: 9999  9999;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible1" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
          description { state: "visible2" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
@@ -324,14 +308,14 @@ group { name: "e/comp/border/fullscreen";
             rel2.relative: 2.0 2.0;
             image.normal: "screen_circular_shadow.png";
             fill.smooth: 0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 1.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
@@ -373,8 +357,7 @@ group { name: "e/comp/border/fullscreen";
       }
       part { name: "fader"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             color: 255 255 255 0;
             visible: 0;
          }
diff --git a/data/elementary/themes/edc/comp_effects.edc b/data/elementary/themes/edc/comp_effects.edc
index 6384f1a7eb..c046e36658 100644
--- a/data/elementary/themes/edc/comp_effects.edc
+++ b/data/elementary/themes/edc/comp_effects.edc
@@ -280,12 +280,12 @@ group { name: "e/comp/effects/auto/zoom";
             rel1.offset: -20 -20;
             rel2.to: "mover";
             rel2.offset: 20 20;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          description { state: "hidden";
             rel1.to: "mover";
             rel2.to: "mover";
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
          }
       }
       part { name: "e.swallow.content"; clip_to: "clip";
@@ -338,11 +338,11 @@ group { name: "e/comp/effects/auto/blend";
             rel1.offset: -20 -20;
             rel2.to: "e.swallow.content";
             rel2.offset: 20 20;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          description { state: "hidden";
             inherit: "default" 0.0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
diff --git a/data/elementary/themes/edc/connman.edc b/data/elementary/themes/edc/connman.edc
index 16b5e40c87..9485de8744 100644
--- a/data/elementary/themes/edc/connman.edc
+++ b/data/elementary/themes/edc/connman.edc
@@ -41,15 +41,15 @@ group { name: "e/modules/connman/main";
             rel1.relative: (50/160) (15/160);
             rel2.relative: (110/160) (145/160);
             image.normal: "eth-base.png";
-            color: 160 160 160 128;
+            color_class: "/fg/disabled/gadgets/connman/eth/cable";
          }
          description { state: "connected" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/eth/cable";
          }
          description { state: "online" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/fg/selected/gadgets/connman/eth/cable";
          }
       }
       part { name: "eth"; mouse_events: 0;
@@ -58,15 +58,15 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "eth-base";
             image.normal: "eth-top.png";
-            color: 160 160 160 128;
+            color_class: "/fg/disabled/gadgets/connman/eth/connector";
          }
          description { state: "connected" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/eth/connector";
          }
          description { state: "online" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/selected/gadgets/connman/eth/connector";
          }
       }
 ///////////////////////
@@ -74,15 +74,15 @@ group { name: "e/modules/connman/main";
          clip_to: "clip_wifi";
          description { state: "default" 0.0;
             image.normal: "wifi-1.png";
-            color: 160 160 160 255;
+            color_class: "/fg/disabled/gadgets/connman/wifi/connected";
          }
          description { state: "connected" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/wifi/connected";
          }
          description { state: "online" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/fg/selected/gadgets/connman/wifi/connected";
          }
       }
       part { name: "wifi"; mouse_events: 0;
@@ -90,27 +90,28 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "wifi-base";
             image.normal: "wifi-1.png";
-            color: 0 0 0 0;
+            color_class: "/fg/normal/gadgets/connman/wifi/signal";
+            color: 0 0 0 0; // no cc
          }
          description { state: "default" 0.25;
             inherit: "default" 0.0;
             image.normal: "wifi-2.png";
-            color: 160 160 160 255;
+            color: 255 255 255 255; // no cc
          }
          description { state: "default" 0.5;
             inherit: "default" 0.0;
             image.normal: "wifi-3.png";
-            color: 160 160 160 255;
+            color: 255 255 255 255; // no cc
          }
          description { state: "default" 0.75;
             inherit: "default" 0.0;
             image.normal: "wifi-4.png";
-            color: 160 160 160 255;
+            color: 255 255 255 255; // no cc
          }
          description { state: "default" 1.0;
             inherit: "default" 0.0;
             image.normal: "wifi-5.png";
-            color: 160 160 160 255;
+            color: 255 255 255 255; // no cc
          }
       }
 ///////////////////////
@@ -118,7 +119,7 @@ group { name: "e/modules/connman/main";
          clip_to: "clip_bt";
          description { state: "default" 0.0;
             image.normal: "bt-base.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/bt/base";
          }
       }
       part { name: "bt_1"; mouse_events: 0;
@@ -126,12 +127,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "bt_base";
             image.normal: "bt-1.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/bt/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -144,12 +145,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "bt_base";
             image.normal: "bt-2.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/bt/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -162,7 +163,7 @@ group { name: "e/modules/connman/main";
          clip_to: "clip_cell";
          description { state: "default" 0.0;
             image.normal: "cell-base.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/cell/base";
          }
       }
       part { name: "cell_1"; mouse_events: 0;
@@ -170,12 +171,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "cell_base";
             image.normal: "cell-1.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/cell/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -188,12 +189,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "cell_base";
             image.normal: "cell-2.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/cell/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -206,12 +207,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "cell_base";
             image.normal: "cell-3.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/cell/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -224,12 +225,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "cell_base";
             image.normal: "cell-4.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/cell/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -578,25 +579,25 @@ group { name: "e/modules/connman/end";
          description { state: "default" 0.0;
             image.normal: "i-unlock";
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/security/none";
             visible: 0;
          }
          description { state: "none" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-unlock";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/security/none";
             visible: 1;
          }
          description { state: "wep" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-lock";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/security/secure/low";
             visible: 1;
          }
          description { state: "psk" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-lock-double";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/security/secure/hi";
             visible: 1;
          }
       }