diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 08bf107c31..2ab571f74c 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -63,6 +63,9 @@ color_classes {
       color:   0   0   0 255; }
    color_class { name: "/bg/selected/border/outline";
       color:  51 153 255 255; }
+///////////////////////////////////////////////////////////////////////////////
+   color_class { name: "/fg/normal/separator";
+      color:  80  80  80 255; }
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/bg/normal/entry";
       color:  48  48  48 255; }
@@ -85,18 +88,18 @@ color_classes {
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/fg/normal/text-heading";
       color: 255 255 255 255; }
-///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/fg/normal/text-heading-sub";
       color: 255 255 255 255; }
-///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/fg/normal/text-hilight";
       color: 255 255 255 255; }
-///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/fg/normal/text-overlay";
       color: 160 160 160 255; }
-///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/fg/normal/text-subtle";
       color:   0   0   0  64; }
+   color_class { name: "/fg/normal/text/hilight";
+      color:  51 153 255 255; }
+   color_class { name: "/fg/disabled/text/hilight";
+      color:  25  76 128 255; }
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/bg/normal/button";
       color:  96  96  96 255; }
diff --git a/data/elementary/themes/edc/elm/label.edc b/data/elementary/themes/edc/elm/label.edc
index 60b21ea1ed..509b9bde49 100644
--- a/data/elementary/themes/edc/elm/label.edc
+++ b/data/elementary/themes/edc/elm/label.edc
@@ -28,13 +28,13 @@ group { name: "elm/label/base/default";
    }
    styles {
       style { name: "label_style";
-         base: "font="FN" font_size=10 text_class=tb_plain align=center color=#a0a0a0";
+         base: "font="FN" font_size=10 text_class=tb_plain align=center color_class=/fg/normal/text";
          tag: "br" "\n";
          tag: "b" "+ font="FNBD" text_class=tb_light";
          ENABLED_TEXTBLOCK_TAGS
       }
       style { name: "label_style_disabled";
-         base: "font="FN" font_size=10 text_class=tb_plain align=center color=#606060";
+         base: "font="FN" font_size=10 text_class=tb_plain align=center color_class=/fg/disabled/text";
          tag: "br" "\n";
          tag: "b" "+ font="FNBD" text_class=tb_light";
          DISABLED_TEXTBLOCK_TAGS
@@ -99,13 +99,13 @@ group { name: "elm/label/base/default/left";
    }
    styles {
       style { name: "label_style_left";
-         base: "font="FN" font_size=10 text_class=tb_plain align=left color=#a0a0a0";
+         base: "font="FN" font_size=10 text_class=tb_plain align=left color_class=/fg/normal/text";
          tag: "br" "\n";
          tag: "b" "+ font="FNBD" text_class=tb_light";
          ENABLED_TEXTBLOCK_TAGS
       }
       style { name: "label_style_left_disabled";
-         base: "font="FN" font_size=10 text_class=tb_plain align=left color=#606060";
+         base: "font="FN" font_size=10 text_class=tb_plain align=left color_class=/fg/disabled/text";
          tag: "br" "\n";
          tag: "b" "+ font="FNBD" text_class=tb_light";
          DISABLED_TEXTBLOCK_TAGS
@@ -128,13 +128,13 @@ group { name: "elm/label/base/default/right";
    }
    styles {
       style { name: "label_style_right";
-         base: "font="FN" font_size=10 text_class=tb_plain align=right color=#a0a0a0";
+         base: "font="FN" font_size=10 text_class=tb_plain align=right color_class=/fg/normal/text";
          tag: "br" "\n";
          tag: "b" "+ font="FNBD" text_class=tb_light";
          ENABLED_TEXTBLOCK_TAGS
       }
       style { name: "label_style_right_disabled";
-         base: "font="FN" font_size=10 text_class=tb_plain align=right color=#606060";
+         base: "font="FN" font_size=10 text_class=tb_plain align=right color_class=/fg/disabled/text";
          tag: "br" "\n";
          tag: "b" "+ font="FNBD" text_class=tb_light";
          DISABLED_TEXTBLOCK_TAGS
@@ -157,16 +157,16 @@ group { name: "elm/label/base/marker";
    }
    styles {
       style { name: "label_style2";
-         base: "font="FNBD" font_size=10 text_class=tb_plain align=center color=#a0a0a0";
+         base: "font="FNBD" font_size=10 text_class=tb_plain align=center color_class=/fg/normal/text";
          tag: "br" "\n";
-         tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light";
-         tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/normal/text/hilight text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/normal/text/hilight text_class=tb_light";
       }
       style { name: "label_style2_disabled";
-         base: "font="FNBD" font_size=10 text_class=tb_plain align=center color=#606060";
+         base: "font="FNBD" font_size=10 text_class=tb_plain align=center color_class=/fg/disabled/text";
          tag: "br" "\n";
-         tag: "hilight" "+ font="FNBD" color=#2060a0 text_class=tb_light";
-         tag: "b" "+ font="FNBD" color=#2060a0 text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/disabled/text/hilight text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/disabled/text/hilight text_class=tb_light";
       }
    }
    parts {
@@ -186,16 +186,16 @@ group { "elm/label/base/marker/left";
    }
    styles {
       style { name: "label_style3";
-         base: "font="FNBD" font_size=10 text_class=tb_plain align=left color=#a0a0a0";
+         base: "font="FNBD" font_size=10 text_class=tb_plain align=left color_class=/fg/normal/text";
          tag: "br" "\n";
-         tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light";
-         tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/normal/text/hilight text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/normal/text/hilight text_class=tb_light";
       }
       style { name: "label_style3_disabled";
-         base: "font="FNBD" font_size=10 text_class=tb_plain align=left color=#606060";
+         base: "font="FNBD" font_size=10 text_class=tb_plain align=left color_class=/fg/disabled/text";
          tag: "br" "\n";
-         tag: "hilight" "+ font="FNBD" color=#2060a0 text_class=tb_light";
-         tag: "b" "+ font="FNBD" color=#2060a0 text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/disabled/text/hilight text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/disabled/text/hilight text_class=tb_light";
       }
    }
    parts {
@@ -215,16 +215,16 @@ group { "elm/label/base/marker/right";
    }
    styles {
       style { name: "label_style4";
-         base: "font="FNBD" font_size=10 text_class=tb_plain align=right color=#a0a0a0";
+         base: "font="FNBD" font_size=10 text_class=tb_plain align=right color_class=/fg/normal/text";
          tag: "br" "\n";
-         tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light";
-         tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/normal/text/hilight text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/normal/text/hilight text_class=tb_light";
       }
       style { name: "label_style4_disabled";
-         base: "font="FNBD" font_size=10 text_class=tb_plain align=right color=#606060";
+         base: "font="FNBD" font_size=10 text_class=tb_plain align=right color_class=/fg/disabled/text";
          tag: "br" "\n";
-         tag: "hilight" "+ font="FNBD" color=#2060a0 text_class=tb_light";
-         tag: "b" "+ font="FNBD" color=#2060a0 text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/disabled/text/hilight text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/disabled/text/hilight text_class=tb_light";
       }
    }
    parts {
diff --git a/data/elementary/themes/edc/elm/separator.edc b/data/elementary/themes/edc/elm/separator.edc
index 351688bec7..320cfaf721 100644
--- a/data/elementary/themes/edc/elm/separator.edc
+++ b/data/elementary/themes/edc/elm/separator.edc
@@ -7,7 +7,7 @@ group { name: "elm/separator/horizontal/default";
             max: 99999 1;
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
-            color: 72 72 72 255;
+            color_class: "/fg/normal/separator/horizontal";
             offscale;
          }
       }
@@ -19,6 +19,7 @@ group { name: "elm/separator/vertical/default";
       part { name: "base";
          description { state: "default" 0.0;
             max: 1 99999;
+            color_class: "/fg/normal/separator/vertical";
          }
       }
    }