diff --git a/data/color/color.src b/data/color/color.src
index 96c92e5..83bc549 100644
--- a/data/color/color.src
+++ b/data/color/color.src
@@ -34,7 +34,9 @@ group "syntax_color_group" struct {
             value "key" string: "description";
             value "key" string: "desc";
             value "key" string: "dragable";
+            value "key" string: "external";
             value "key" string: "fill";
+            value "key" string: "gradient";
             value "key" string: "group";
             value "key" string: "images";
             value "key" string: "image ";
@@ -162,7 +164,6 @@ group "syntax_color_group" struct {
             value "key" string: "BOTH";
             value "key" string: "BOTTOM";
             value "key" string: "BOUNCE";
-            value "key" string: "BOX";
             value "key" string: "CUBIC_BEZIER";
             value "key" string: "COMP";
             value "key" string: "CURRENT";
@@ -172,15 +173,11 @@ group "syntax_color_group" struct {
             value "key" string: "DIVISOR_INTERP";
             value "key" string: "EDITABLE";
             value "key" string: "EXPLICIT";
-            value "key" string: "EXTERNAL";
             value "key" string: "FAR_SHADOW";
             value "key" string: "FAR_SOFT_SHADOW";
             value "key" string: "FOCUS_SET";
             value "key" string: "GLOW";
-            value "key" string: "GRADIENT";
-            value "key" string: "GROUP";
             value "key" string: "HORIZONTAL";
-            value "key" string: "IMAGE";
             value "key" string: "LINEAR";
             value "key" string: "LOSSY";
             value "key" string: "MSG_FLOAT_SET";
@@ -204,9 +201,7 @@ group "syntax_color_group" struct {
             value "key" string: "PLAIN";
             value "key" string: "PLAY_SAMPLE";
             value "key" string: "PROGRAM";
-            value "key" string: "PROXY";
             value "key" string: "RAW";
-            value "key" string: "RECT";
             value "key" string: "SHADOW";
             value "key" string: "SIGNAL_EMIT";
             value "key" string: "SINUSOIDAL_FACTOR";
@@ -214,13 +209,8 @@ group "syntax_color_group" struct {
             value "key" string: "SOFT_OUTLINE";
             value "key" string: "SOFT_SHADOW";
             value "key" string: "SOLID";
-            value "key" string: "SPACER";
             value "key" string: "SPRING";
             value "key" string: "STATE_SET";
-            value "key" string: "SWALLOW";
-            value "key" string: "TABLE";
-            value "key" string: "TEXTBLOCK";
-            value "key" string: "TEXT";
             value "key" string: "USER";
             value "key" string: "VERTICAL";
          }
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index 0e05ea1..8c4ef86 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -125,12 +125,13 @@ end:
 static void
 cur_state_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED)
 {
-#define PART_SYNTAX_CNT 9
+#define PART_SYNTAX_CNT 13
 
    const char *GROUP = "group";
    const char *PARTS = "parts";
    const char *PART[PART_SYNTAX_CNT] = { "part", "image", "textblock",
-        "swallow", "rect", "group", "spacer", "proxy", "text" };
+        "swallow", "rect", "group", "spacer", "proxy", "text", "gradient",
+        "box", "table", "external" };
    const char *DESC[2] = { "desc", "description" };
    const int DESC_LEN[2] = { 4, 11 };
 
@@ -352,29 +353,6 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED)
 
    //FIXME: construct from the configuration file.
 
-   //Type: Constant
-   Eina_Array *types = eina_array_new(12);
-   eina_array_push(types, eina_stringshare_add("RECT"));
-   eina_array_push(types, eina_stringshare_add("TEXT"));
-   eina_array_push(types, eina_stringshare_add("IMAGE"));
-   eina_array_push(types, eina_stringshare_add("SWALLOW"));
-   eina_array_push(types, eina_stringshare_add("TEXTBLOCK"));
-   eina_array_push(types, eina_stringshare_add("GRADIENT"));
-   eina_array_push(types, eina_stringshare_add("GROUP"));
-   eina_array_push(types, eina_stringshare_add("BOX"));
-   eina_array_push(types, eina_stringshare_add("TABLE"));
-   eina_array_push(types, eina_stringshare_add("EXTERNAL"));
-   eina_array_push(types, eina_stringshare_add("PROXY"));
-   eina_array_push(types, eina_stringshare_add("SPACER"));
-
-   memset(&attr, 0x00, sizeof(parser_attr));
-   attr.keyword = eina_stringshare_add("type");
-   attr.value.strs = types;
-   attr.value.type = ATTR_VALUE_CONSTANT;
-   attr.value.prepend_str = ATTR_PREPEND_COLON;
-   attr.value.append_str = ATTR_APPEND_SEMICOLON;
-   eina_inarray_push(td->attrs, &attr);
-
    Eina_Array *comps = eina_array_new(4);
    eina_array_push(comps, eina_stringshare_add("RAW"));
    eina_array_push(comps, eina_stringshare_add("USER"));