diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index 49fafd98b1..e120f71c0e 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -307,6 +307,9 @@ color_classes {
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/bg/selected/focus/hilight";
       color: 255 255 255 255; }
+///////////////////////////////////////////////////////////////////////////////
+   color_class { name: "/bg/normal/diskselector";
+      color:  48  48  48 255; }
 ///////////////////////////////////////////////////////////////////////////////
    color_class { name: "/bg/normal/entry";
       color:  48  48  48 255; }
diff --git a/data/elementary/themes/edc/elm/diskselector.edc b/data/elementary/themes/edc/elm/diskselector.edc
index 743460dc9a..1f00bef3f7 100644
--- a/data/elementary/themes/edc/elm/diskselector.edc
+++ b/data/elementary/themes/edc/elm/diskselector.edc
@@ -3,7 +3,7 @@ group { name: "elm/diskselector/base/default";
       part { name: "bg"; type: RECT;
          mouse_events: 0;
          description { state: "default" 0.0;
-            color: 48 48 48 255;
+            color_class: "/bg/normal/diskselector";
          }
       }
       part { name: "clipper"; type: RECT;
@@ -13,8 +13,14 @@ group { name: "elm/diskselector/base/default";
       }
       part { name: "elm.swallow.content"; type: SWALLOW;
          clip_to: "clipper";
+         scale;
          description { state: "default" 0.0;
             rel.to: "bg";
+//            rel1.offset: 4 4;
+//            rel2.offset: -5 -5;
+//            min: 28 28;
+            min: 80 20;
+            offscale;
          }
       }
    }
@@ -31,26 +37,28 @@ group { name: "elm/diskselector/item/default";
       part { name: "elm.swallow.icon"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 0;
+            fixed: 1 1;
             align: 0.0 0.5;
             rel1 {
                relative: 0 0;
-               offset: 1 1;
+               offset: 0 0;
             }
             rel2 {
                relative: 0 1;
-               offset: 1 -2;
+               offset: 0 -1;
             }
+            min: 20 20;
+            rel1.offset: 4 4;
+            rel2.offset: 4 -5;
+            offscale;
          }
          description { state: "show" 0.0;
             inherit: "default" 0.0;
-            min: 10 10;
+            min: 20 20;
             aspect: 1.0 1.0;
          }
          description { state: "default_small" 0.0;
             inherit: "default" 0.0;
-            rel1.relative: 0 0.2;
-            rel2.relative: 0 0.8;
             min: 10 10;
             aspect: 1.0 1.0;
          }
@@ -58,7 +66,7 @@ group { name: "elm/diskselector/item/default";
             inherit: "default" 0.0;
             rel1.relative: 0 0.2;
             rel2.relative: 0 0.8;
-            color: 255 255 255 160;
+            color: 255 255 255 160; // no cc
             min: 10 10;
             aspect: 1.0 1.0;
          }
@@ -66,7 +74,7 @@ group { name: "elm/diskselector/item/default";
             inherit: "left_side" 0.0;
             rel1.relative: 0.4 0.2;
             rel2.relative: 0.4 0.8;
-            color: 255 255 255 160;
+            color: 255 255 255 160; // no cc
             min: 10 10;
             aspect: 1.0 1.0;
          }
@@ -75,24 +83,25 @@ group { name: "elm/diskselector/item/default";
             align: 0.5 0.5;
             rel1.relative: 0 0;
             rel2.relative: 1 1;
-            min: 10 10;
+            min: 20 20;
             aspect: 1.0 1.0;
          }
       }
       part { name: "elm.text"; type: TEXT;
          scale: 1;
          description { state: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/diskselector";
             rel1.relative: 1 0.0;
             rel1.to_x: "elm.swallow.icon";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
             rel2.relative: 1.0 1.0;
             visible: 0;
-            text {
-               font: "Sans";
-               size: 10;
+            text { font: FN; size: 10;
                align: 0.5 0.5;
                min: 0 1;
             }
+            offscale;
          }
          description { state: "show" 0.0;
             inherit: "default" 0.0;
@@ -105,14 +114,14 @@ group { name: "elm/diskselector/item/default";
          }
          description { state: "left_side" 0.0;
             inherit: "default" 0.0;
-            color: 80 80 80 255;
+            color: 128 128 128 255; // no cc
             text.size: 8;
             visible: 1;
             text.align: 0.2 0.5;
          }
          description { state: "right_side" 0.0;
             inherit: "default" 0.0;
-            color: 80 80 80 255;
+            color: 128 128 128 255; // no cc
             visible: 1;
             text.size: 8;
             text.align: 0.8 0.5;
@@ -140,7 +149,7 @@ group { name: "elm/diskselector/item/default";
          repeat_events: 1;
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -238,39 +247,40 @@ group { name: "elm/diskselector/item/datetime/default";
         mouse_events: 0;
         scale: 1;
         description { state: "default" 0.0;
+           color_class: "/fg/normal/diskselector";
            min: 10 10;
            align: 0.0 0.0;
-           color: FN_COL_GREY_172;
            visible: 1;
-           text {
-              font: "Sans,Edje-Vera";
-              size: 10;
+           rel1.offset: 4 4;
+           rel2.offset: -5 -5;
+           offscale;
+           text { font: FN; size: 10;
               min: 1 1;
               ellipsis: -1;
            }
         }
         description { state: "center_sel" 0.0;
            inherit: "default" 0.0;
-           color: FN_COL_WHITE;
+           color_class: "/fg/selected/diskselector";
         }
         description { state: "left_side" 0.0;
            inherit: "default" 0.0;
-           color: FN_COL_GREY_152;
+           color: 128 128 128 255; // no cc
            text.align: 0.2 0.5;
         }
         description { state: "left_side_sel" 0.0;
            inherit: "default" 0.0;
-           color: FN_COL_WHITE;
+           color_class: "/fg/selected/diskselector";
            text.align: 0.2 0.5;
         }
         description { state: "right_side" 0.0;
            inherit: "default" 0.0;
-           color: FN_COL_GREY_152;
+           color: 128 128 128 255; // no cc
            text.align: 0.8 0.5;
         }
         description { state: "right_side_sel" 0.0;
            inherit: "default" 0.0;
-           color: FN_COL_WHITE;
+           color_class: "/fg/selected/diskselector";
            text.align: 0.8 0.5;
         }
      }
@@ -280,7 +290,7 @@ group { name: "elm/diskselector/item/datetime/default";
         ignore_flags: ON_HOLD;
         description {
            state: "default" 0.0;
-           color: 0 0 0 0;
+           color: 0 0 0 0; // no cc
         }
      }
    }