diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 539228f99b..010575fba2 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -693,8 +693,6 @@ color_classes {
 ///////////////////////////////////////////////////////////////////////////////
 //   color_class { name: "/bg/normal/entry";
 //      color:  48  48  48 255; }
-   color_class { name: "/bg/normal/entry/focus";
-      color:  51 153 255   0; }
 //   color_class { name: "/bg/selected/entry/focus";
 //      color:  51 153 255 255; }
    color_class { name: "/bg/selected/entry/validate-fail";
diff --git a/data/elementary/themes/edc/efl/text.edc b/data/elementary/themes/edc/efl/text.edc
index 826330ac27..a0439edf27 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -43,7 +43,7 @@ group { "efl/text/scroller";
          description { state: "default" 0.0;
             rel.to: "bg";
             rel1.relative: 0.0 1.0;
-            color_class: "/bg/normal/entry/focus";
+            color_class: "/bg/selected/entry/focus";
             color: 255 255 255 0; // no cc
             visible: 0;
             offscale;
@@ -51,7 +51,6 @@ group { "efl/text/scroller";
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             rel1.offset: 0 -3;
-            color_class: "/bg/selected/entry/focus";
             color: 255 255 255 255; // no cc
             visible: 1;
          }
@@ -222,14 +221,13 @@ group { "efl/text/single/scroller";
          description { state: "default" 0.0;
             rel.to: "bg";
             rel1.relative: 0.0 1.0;
-            color_class: "/bg/normal/entry/focus";
+            color_class: "/bg/selected/entry/focus";
             color: 255 255 255 0; // no cc
             visible: 0;
             offscale;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color_class: "/bg/selected/entry/focus";
             color: 255 255 255 255; // no cc
             rel1.offset: 0 -3;
             visible: 1;
diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc
index aac153a582..305f01ab2c 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -43,14 +43,15 @@ group { name: "elm/scroller/entry/default";
             rel.to: "bg";
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 0;
-            color_class: "/bg/normal/entry/focus";
+            color_class: "/bg/selected/entry/focus";
+            color: 255 255 255 0; // no cc
             visible: 0;
             offscale;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             rel1.offset: 0 -3;
-            color_class: "/bg/selected/entry/focus";
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
@@ -221,7 +222,7 @@ group { name: "elm/scroller/entry_single/default";
             rel.to: "bg";
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 0;
-            color_class: "/bg/normal/entry/focus";
+            color_class: "/bg/selected/entry/focus";
             color: 255 255 255 0; // no cc
             visible: 0;
             offscale;
@@ -229,7 +230,6 @@ group { name: "elm/scroller/entry_single/default";
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
             rel1.offset: 0 -3;
-            color_class: "/bg/selected/entry/focus";
             color: 255 255 255 255; // no cc
             visible: 1;
          }