diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index bca6cfe6f9..5864f842d7 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -59,6 +59,13 @@ color_classes {
       color: 255 255 255 255; }
    color_class { name: "/fg/normal/photo/base";
       color:  48  48  48 255; }
+///////////////////////////////////////////////////////////////////////////////
+   color_class { name: "/bg/normal/naviframe/top";
+      color:  32  32  32 255; }
+   color_class { name: "/fg/normal/naviframe/text/title";
+      color: 255 255 255 255; }
+   color_class { name: "/fg/normal/naviframe/top/overlap";
+      color: 255 255 255 200; }
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/fg/normal/menu/title";
       color: 255 255 255 255; }
@@ -90,6 +97,9 @@ color_classes {
       color: 255 255 255 255; }
    color_class { name: "/fg/pressed/panes/fold/arrow";
       color: 220 220 220 255; }
+///////////////////////////////////////////////////////////////////////////////
+   color_class { name: "/fg/normal/panel/arrow";
+      color: 255 255 255 255; }
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/bg/normal/access";
       color: 255 153  51  64; }
diff --git a/data/elementary/themes/edc/elm/naviframe.edc b/data/elementary/themes/edc/elm/naviframe.edc
index d67333b561..6ae6e65b0b 100644
--- a/data/elementary/themes/edc/elm/naviframe.edc
+++ b/data/elementary/themes/edc/elm/naviframe.edc
@@ -238,7 +238,7 @@ group { name: "elm/naviframe/item/basic/default";
          scale: 1;
          clip_to: "top_clip";
          description { state: "default" 0.0;
-            color: 32 32 32 255;
+            color_class: "/bg/normal/naviframe/top";
             rel1.to: "base";
             rel2.to_x: "base";
             rel2.to_y: "bottom";
@@ -254,7 +254,7 @@ group { name: "elm/naviframe/item/basic/default";
          clip_to: "clip";
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel.to: "top";
          }
       }
@@ -262,7 +262,7 @@ group { name: "elm/naviframe/item/basic/default";
          scale: 1;
          clip_to: "elements_clip";
          description { state: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/normal/naviframe/text/title";
             rel1.offset: 4 14;
             rel1.to_x: "base";
             rel1.to_y: "top";
@@ -287,7 +287,7 @@ group { name: "elm/naviframe/item/basic/default";
          scale: 1;
          clip_to: "elements_clip";
          description { state: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/naviframe/text/subtitle";
             rel1.to_x: "base";
             rel1.to_y: "top";
             rel1.relative: 0.0 1.0;
@@ -391,7 +391,7 @@ group { name: "elm/naviframe/item/basic/default";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "next" 0.0;
@@ -579,7 +579,7 @@ group { name: "elm/naviframe/item/overlap/default";
       }
       part { name: "top_clip";
          description { state: "default" 0.0;
-            color: 255 255 255 224;
+            color_class: "/fg/normal/naviframe/top/overlap";
          }
       }
    }