diff --git a/data/themes/default.edc b/data/themes/default.edc
index 170494816..cb9969d27 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -103,6 +103,10 @@ color_classes {
       name: "shelf_base";
       color: 255 255 255 255;
    }
+   color_class {
+      name: "scrollframe_base";
+      color: 255 255 255 255;
+   }
    // this seems totaly bogus, should be per module or really used as
    // an unique color for all modules!
    //    color_class {
@@ -137,11 +141,32 @@ color_classes {
       name: "fileman_base";
       color: 255 255 255 255;
    }
+   color_class {
+      name: "ilist_item_base";
+      color: 255 255 255 255;
+   }
+   color_class {
+      name: "ilist_item_odd_base";
+      color: 255 255 255 255;
+   }
+   color_class {
+      name: "ilist_item_header_base";
+      color: 255 255 255 255;
+   }
+   color_class {
+      name: "ilist_item_header_odd_base";
+      color: 255 255 255 255;
+   }
    color_class {
       name: "ilist_item";
       color: 0 0 0 255;
       color3: 0 0 0 0;
    }
+   color_class {
+      name: "ilist_item_odd";
+      color: 0 0 0 255;
+      color3: 0 0 0 0;
+   }
    color_class {
       name: "ilist_item_selected";
       color: 255 255 255 255;
@@ -153,11 +178,12 @@ color_classes {
       color3: 0 0 0 32;
    }
    color_class {
-      name: "dialog_base";
-      color: 255 255 255 255;
+      name: "ilist_item_header_odd";
+      color: 224 224 224 255;
+      color3: 0 0 0 32;
    }
    color_class {
-      name: "configure_base";
+      name: "dialog_base";
       color: 255 255 255 255;
    }
    color_class {
@@ -16781,6 +16807,7 @@ collections { /* begin the collection of edje groups that are in this file */
 	    mouse_events: 0;
 	    description {
 	       state: "default" 0.0;
+	       color_class: "ilist_item_base";
 	       image {
 		  normal: "ilist_1.png";
 		  border: 2 2 2 2;
@@ -17299,6 +17326,7 @@ collections { /* begin the collection of edje groups that are in this file */
 	    mouse_events: 0;
 	    description {
 	       state: "default" 0.0;
+	       color_class: "ilist_item_odd_base";
 	       image {
 		  normal: "ilist_2.png";
 		  border: 2 2 2 2;
@@ -17524,7 +17552,7 @@ collections { /* begin the collection of edje groups that are in this file */
 		  relative: 1.0  1.0;
 		  offset:   -5 -5;
 	       }
-	       color_class: "ilist_item";
+	       color_class: "ilist_item_odd";
 	       text {
 		  font: "Sans";
 		  size: 10;
@@ -17819,6 +17847,7 @@ collections { /* begin the collection of edje groups that are in this file */
 	    mouse_events: 0;
 	    description {
 	       state: "default" 0.0;
+	       color_class: "ilist_item_base";
 	       image {
 		  normal: "ilist_1.png";
 		  border: 2 2 2 2;
@@ -18338,6 +18367,7 @@ collections { /* begin the collection of edje groups that are in this file */
 	    mouse_events: 0;
 	    description {
 	       state: "default" 0.0;
+	       color_class: "ilist_item_odd_base";
 	       image {
 		  normal: "ilist_2.png";
 		  border: 2 2 2 2;
@@ -18563,7 +18593,7 @@ collections { /* begin the collection of edje groups that are in this file */
 		  relative: 1.0  1.0;
 		  offset:   -5 -5;
 	       }
-	       color_class: "ilist_item";
+	       color_class: "ilist_item_odd";
 	       text {
 		  font: "Sans";
 		  size: 10;
@@ -19101,7 +19131,7 @@ collections { /* begin the collection of edje groups that are in this file */
 	 part { name: "base";
 	    mouse_events:  0;
 	    description { state: "default" 0.0;
-               color_class: "configure_base";
+               color_class: "dialog_base";
 	       image.normal: "dia_grad.png";
 	       fill {
 		  smooth: 0;
@@ -20495,6 +20525,7 @@ group { name: "e/toolbar/default/base";
 	       rel1.offset: 1 1;
 	       rel2.offset: -2 -2;
 	       color: 255 255 255 255;
+	       color_class: "scrollframe_base";
 	    }
 	 }
 	 part { name: "clipper";
@@ -21197,6 +21228,7 @@ group { name: "e/toolbar/default/base";
 	    mouse_events: 0;
 	    description {
 	       state: "default" 0.0;
+	       color_class: "ilist_item_base";
 	       image {
 		  normal: "ilist_1.png";
 		  border: 2 2 2 2;
@@ -21390,6 +21422,7 @@ group { name: "e/toolbar/default/base";
 	    mouse_events: 0;
 	    description {
 	       state: "default" 0.0;
+	       color_class: "ilist_item_odd_base";
 	       image {
 		  normal: "ilist_2.png";
 		  border: 2 2 2 2;
@@ -21465,7 +21498,7 @@ group { name: "e/toolbar/default/base";
 		  relative: 1.0  1.0;
 		  offset:   -5 -5;
 	       }
-	       color_class: "ilist_item";
+	       color_class: "ilist_item_odd";
 	       text {
 		  font: "Sans";
 		  size: 10;
@@ -21610,6 +21643,7 @@ group { name: "e/toolbar/default/base";
 	    mouse_events: 0;
 	    description {
 	       state: "default" 0.0;
+	       color_class: "ilist_item_header_base";
 	       image {
 		  normal: "ilist_header_1.png";
 		  border: 2 2 2 2;
@@ -21780,6 +21814,7 @@ group { name: "e/toolbar/default/base";
 	    mouse_events: 0;
 	    description {
 	       state: "default" 0.0;
+	       color_class: "ilist_item_header_odd_base";
 	       image {
 		  normal: "ilist_header_2.png";
 		  border: 2 2 2 2;
@@ -21854,7 +21889,7 @@ group { name: "e/toolbar/default/base";
 		  relative: 1.0  1.0;
 		  offset:   -5 -5;
 	       }
-	       color_class: "ilist_item_header";
+	       color_class: "ilist_item_header_odd";
 	       text {
                   font: "Sans:style=Bold";
 		  size: 16;
@@ -21937,11 +21972,6 @@ group { name: "e/toolbar/default/base";
 
    group { name: "e/widgets/ilist/toggle_end";
       images {
-         image: "bt_sm_base1.png" COMP;
-	 image: "bt_sm_shine.png" COMP;
-	 image: "bt_sm_hilight.png" COMP;
-	 image: "ilist_1.png" COMP;
-	 image: "ilist_item_shadow.png" COMP;
 	 image: "icon_active.png" COMP;
       }
       parts {
diff --git a/src/modules/conf_colors/e_int_config_color_classes.c b/src/modules/conf_colors/e_int_config_color_classes.c
index f9342efec..23c576770 100644
--- a/src/modules/conf_colors/e_int_config_color_classes.c
+++ b/src/modules/conf_colors/e_int_config_color_classes.c
@@ -75,12 +75,10 @@ struct _CFColor_Class_Description
  */
 static const CFColor_Class_Description _color_classes_wm[] =
 {
-  CCDESC_T("about_title",         N_("About Dialog Title")),
-  CCDESC_T("about_version",       N_("About Dialog Version")),
   CCDESC_T("border_title",        N_("Border Title")),
   CCDESC_T("border_title_active", N_("Border Title Active")),
-  CCDESC_T("configure_title",     N_("Settings Dialog Title")),
   CCDESC_T("error_text",          N_("Error Text")),
+  CCDESC_S("menu_base",           N_("Menu Background Base")),
   CCDESC_T("menu_title",          N_("Menu Title")),
   CCDESC_T("menu_title_active",   N_("Menu Title Active")),
   CCDESC_T("menu_item",           N_("Menu Item")),
@@ -92,25 +90,36 @@ static const CFColor_Class_Description _color_classes_wm[] =
   CCDESC_T("winlist_item_active", N_("Winlist Item Active")),
   CCDESC_T("winlist_label",       N_("Winlist Label")),
   CCDESC_T("winlist_title",       N_("Winlist Title")),
+  CCDESC_S("dialog_base",         N_("Dialog Background Base")),
+  CCDESC_S("shelf_base",          N_("Shelf Background Base")),
+  CCDESC_S("fileman_base",        N_("File Manager Background Base")),
   {NULL, 0, NULL, COLOR_CLASS_UNKNOWN}
 };
 static const CFColor_Class_Description _color_classes_widgets[] =
 {
-  CCDESC_T("button_text",          N_("Button Text")),
-  CCDESC_T("button_text_disabled", N_("Button Text Disabled")),
-  CCDESC_T("check_text",           N_("Check Text")),
-  CCDESC_T("check_text_disabled",  N_("Check Text Disabled")),
-  CCDESC_T("entry_text",           N_("Entry Text")),
-  CCDESC_T("entry_text_disabled",  N_("Entry Text Disabled")),
-  CCDESC_T("label_text",           N_("Label Text")),
-  CCDESC_T("ilist_item",           N_("List Item Text")),
-  CCDESC_T("ilist_item_selected",  N_("List Item Text Selected")),
-  CCDESC_T("ilist_item_odd",       N_("List Item Odd Text")),
-  CCDESC_T("ilist_header",         N_("List Header")),
-  CCDESC_T("radio_text",           N_("Radio Text")),
-  CCDESC_T("radio_text_disabled",  N_("Radio Text Disabled")),
-  CCDESC_T("slider_text",          N_("Slider Text")),
-  CCDESC_T("slider_text_disabled", N_("Slider Text Disabled")),
+  CCDESC_T("button_text",            N_("Button Text")),
+  CCDESC_T("button_text_disabled",   N_("Button Text Disabled")),
+  CCDESC_T("check_text",             N_("Check Text")),
+  CCDESC_T("check_text_disabled",    N_("Check Text Disabled")),
+  CCDESC_T("entry_text",             N_("Entry Text")),
+  CCDESC_T("entry_text_disabled",    N_("Entry Text Disabled")),
+  CCDESC_T("label_text",             N_("Label Text")),
+  CCDESC_T("ilist_item_selected",    N_("List Item Text Selected")),
+  CCDESC_T("ilist_item",             N_("List Item Text (Even)")),
+  CCDESC_S("ilist_item_base",        N_("List Item Background Base (Even)")),
+  CCDESC_T("ilist_item_odd",         N_("List Item Text (Odd)")),
+  CCDESC_S("ilist_item_odd_base",    N_("List Item Background Base (Odd)")),
+  CCDESC_T("ilist_item_header",      N_("List Header Text (Even)")),
+  CCDESC_S("ilist_item_header_base", N_("List Header Background Base (Even)")),
+  CCDESC_T("ilist_item_header_odd",  N_("List Header Text (Odd)")),
+  CCDESC_S("ilist_item_header_odd_base",
+	   N_("List Header Background Base (Odd)")),
+  CCDESC_T("radio_text",             N_("Radio Text")),
+  CCDESC_T("radio_text_disabled",    N_("Radio Text Disabled")),
+  CCDESC_T("slider_text",            N_("Slider Text")),
+  CCDESC_T("slider_text_disabled",   N_("Slider Text Disabled")),
+  CCDESC_S("frame_base",             N_("Frame Background Base")),
+  CCDESC_S("scrollframe_base",       N_("Scroller Frame Background Base")),
   {NULL, 0, NULL, COLOR_CLASS_UNKNOWN}
 };
 static const CFColor_Class_Description _color_classes_modules[] =