diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 3c438af78b..e1e27c4953 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -380,6 +380,8 @@ color_classes {
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/fg/normal/text-heading";
       color: 255 255 255 255; }
+   color_class { name: "/fg/disabled/text-heading";
+      color: 160 160 160 255; }
    color_class { name: "/fg/normal/text-heading-sub";
       color: 255 255 255 255; }
    color_class { name: "/fg/normal/text-hilight";
@@ -388,12 +390,16 @@ color_classes {
 //      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_class { name: "/fg/normal/text-standout";
       color:  51 153 255 255; }
-   color_class { name: "/fg/disabled/text/hilight";
+   color_class { name: "/fg/disabled/text-standout";
       color:  25  76 128 255; }
-   color_class { name: "/fg/disabled/text-urgent";
+   color_class { name: "/fg/normal/text-urgent";
       color: 255  51  51 255; }
+   color_class { name: "/fg/normal/text-link";
+      color:  51 153 255 255; }
+   color_class { name: "/fg/disabled/text-link";
+      color:  96 112 128 255; }
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/bg/normal/flipselector/down";
       color:  96  96  96 255; }
diff --git a/data/elementary/themes/edc/elm/label.edc b/data/elementary/themes/edc/elm/label.edc
index 509b9bde49..e5716727ee 100644
--- a/data/elementary/themes/edc/elm/label.edc
+++ b/data/elementary/themes/edc/elm/label.edc
@@ -159,14 +159,14 @@ group { name: "elm/label/base/marker";
       style { name: "label_style2";
          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_class=/fg/normal/text/hilight text_class=tb_light";
-         tag: "b" "+ font="FNBD" color_class=/fg/normal/text/hilight text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/normal/text-standout text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/normal/text-standout text_class=tb_light";
       }
       style { name: "label_style2_disabled";
          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_class=/fg/disabled/text/hilight text_class=tb_light";
-         tag: "b" "+ font="FNBD" color_class=/fg/disabled/text/hilight text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/disabled/text-standout text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/disabled/text-standout text_class=tb_light";
       }
    }
    parts {
@@ -188,14 +188,14 @@ group { "elm/label/base/marker/left";
       style { name: "label_style3";
          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_class=/fg/normal/text/hilight text_class=tb_light";
-         tag: "b" "+ font="FNBD" color_class=/fg/normal/text/hilight text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/normal/text-standout text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/normal/text-standout text_class=tb_light";
       }
       style { name: "label_style3_disabled";
          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_class=/fg/disabled/text/hilight text_class=tb_light";
-         tag: "b" "+ font="FNBD" color_class=/fg/disabled/text/hilight text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/disabled/text-standout text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/disabled/text-standout text_class=tb_light";
       }
    }
    parts {
@@ -217,14 +217,14 @@ group { "elm/label/base/marker/right";
       style { name: "label_style4";
          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_class=/fg/normal/text/hilight text_class=tb_light";
-         tag: "b" "+ font="FNBD" color_class=/fg/normal/text/hilight text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/normal/text-standout text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/normal/text-standout text_class=tb_light";
       }
       style { name: "label_style4_disabled";
          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_class=/fg/disabled/text/hilight text_class=tb_light";
-         tag: "b" "+ font="FNBD" color_class=/fg/disabled/text/hilight text_class=tb_light";
+         tag: "hilight" "+ font="FNBD" color_class=/fg/disabled/text-standout text_class=tb_light";
+         tag: "b" "+ font="FNBD" color_class=/fg/disabled/text-standout text_class=tb_light";
       }
    }
    parts {
diff --git a/data/elementary/themes/fonts.edc b/data/elementary/themes/fonts.edc
index 06aa33c13c..1b9225bfde 100644
--- a/data/elementary/themes/fonts.edc
+++ b/data/elementary/themes/fonts.edc
@@ -49,9 +49,9 @@
 
 #define ENABLED_TEXTBLOCK_TAGS                                             \
    tag: "em" "+ font_style=Oblique";                                       \
-   tag: "hilight" "+ font_weight=Bold color=#3399ff";                      \
-   tag: "heading" "+ font_weight=Bold color=#ffffff font_size=11";         \
-   tag: "link" "+ color=#3399ff underline=on underline_color=#3399ff";     \
+   tag: "hilight" "+ font_weight=Bold color=cc:/fg/normal/text-standout";  \
+   tag: "heading" "+ font_weight=Bold color=cc:/fg/normal/text-heading font_size=11"; \
+   tag: "link" "+ color=cc:/fg/normal/text-link underline=on underline_color=cc:/fg/normal/text-link"; \
    tag: "preedit" "+ underline=on underline_color=#3399ff";                \
    tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#ffffff";  \
    tag: "title" "+ font_size=26";                                          \
@@ -83,9 +83,9 @@
 
 #define DISABLED_TEXTBLOCK_TAGS                                            \
    tag: "em" "+ font_style=Oblique";                                       \
-   tag: "hilight" "+ font_weight=Bold color=#3399ff";                      \
-   tag: "heading" "+ font_weight=Bold color=#a0a0a0 font_size=11";         \
-   tag: "link" "+ color=#607080 underline=on underline_color=#3399ff";     \
+   tag: "hilight" "+ font_weight=Bold color=cc:/fg/disabled/text-standout"; \
+   tag: "heading" "+ font_weight=Bold color=cc:/fg/disabled/text-heading font_size=11";         \
+   tag: "link" "+ color=cc:/fg/disabled/text-link underline=on underline_color=cc:/fg/disabled/text-link";     \
    tag: "preedit" "+ underline=on underline_color=#3399ff88";              \
    tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#888888";  \
    tag: "title" "+ font_size=26";                                          \