diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
new file mode 100644
index 000000000..465e838a6
--- /dev/null
+++ b/data/themes/colorclasses.edc
@@ -0,0 +1,7 @@
+color_classes {
+   color_class {
+      name: "comp_focus-out_color";
+      color: 253 253 253 255;
+      color3: 0 0 0 0;
+   }
+}
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 9c3213e6c..6bb275446 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1,6 +1,7 @@
 #include "macros.edc"
 
 collections {
+#include "colorclasses.edc"
 // desktop in general
 #include "edc/comp.edc"
 #include "edc/background.edc"
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index aa3457629..9dcd5a599 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -224,13 +224,6 @@ group { name: "e/comp/default";
    alias: "e/comp/popup";
    images.image: "win_shadow.png" COMP;
    images.image: "win_glow.png" COMP;
-   color_classes {
-      color_class {
-         name: "comp_focus-out_color";
-         color: 253 253 253 255;
-         color3: 0 0 0 0;
-      }
-   }
    parts {
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;