diff --git a/legacy/elementary/data/objects/test.edc b/legacy/elementary/data/objects/test.edc
index a2ad805b0b..cf855c25aa 100644
--- a/legacy/elementary/data/objects/test.edc
+++ b/legacy/elementary/data/objects/test.edc
@@ -1,10 +1,10 @@
 collections {
    group { name: "layout";
       images {
-	 image: "over.png" COMP;
-	 image: "under.png" COMP;
-	 image: "sky.jpg" LOSSY 80;
-	 image: "clo.png" LOSSY 60;
+         image: "over.png" COMP;
+         image: "under.png" COMP;
+         image: "sky.jpg" LOSSY 80;
+         image: "clo.png" LOSSY 60;
       }
       parts {
          part { name: "clip";
@@ -12,15 +12,15 @@ collections {
             description { state: "default" 0.0;
             }
          }
-	 part { name: "sky";
+         part { name: "sky";
             mouse_events: 1;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       aspect: 2.6225 2.6225;
-	       aspect_preference: NONE;
-	       image.normal: "sky.jpg";
-	    }
-	    description { state: "drift" 0.0;
+            description { state: "default" 0.0;
+               aspect: 2.6225 2.6225;
+               aspect_preference: NONE;
+               image.normal: "sky.jpg";
+            }
+            description { state: "drift" 0.0;
                inherit: "default" 0.0;
                fill {
                   origin {
@@ -28,85 +28,69 @@ collections {
                      offset: 0 0;
                   }
                }
-	    }
-	 }
-	 part { name: "under";
+            }
+         }
+         part { name: "under";
             mouse_events: 0;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       align: 0.5 0.0;
-	       aspect: 1.486068111 1.486068111;
-	       aspect_preference: HORIZONTAL;
-	       image.normal: "under.png";
-	    }
-	 }
-	 part { name: "text";
-	    type: TEXT;
+            description { state: "default" 0.0;
+               align: 0.5 0.0;
+               aspect: 1.486068111 1.486068111;
+               aspect_preference: HORIZONTAL;
+               image.normal: "under.png";
+            }
+         }
+         part { name: "text";
+            type: TEXT;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       color: 255 255 0 255;
-	       rel1 {
-		  relative: 0.3 0.02;
-	       }
-	       rel2 {
-		  relative: 0.6 0.12;
-	       }
-	       align: 0.5 0.5;
-	       text {
-		  font: "Sans:style=Bold";
-		  size: 14;
-		  min: 1 1;
-		  text: "some edje text here";
-	       }
-	    }
-	 }
-	 part { name: "element1";
-	    type: SWALLOW;
+            description { state: "default" 0.0;
+               color: 255 255 0 255;
+               rel1.relative: 0.3 0.02;
+               rel2.relative: 0.6 0.12;
+               align: 0.5 0.5;
+               text {
+                  font: "Sans:style=Bold";
+                  size: 14;
+                  min: 1 1;
+                  text: "some edje text here";
+               }
+            }
+         }
+         part { name: "element1";
+            type: SWALLOW;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       rel1 {
-		  relative: 0.2 0.2;
-	       }
-	       rel2 {
-		  relative: 0.4 0.3;
-	       }
-	    }
-	 }
-	 part { name: "element2";
-	    type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1.relative: 0.2 0.2;
+               rel2.relative: 0.4 0.3;
+            }
+         }
+         part { name: "element2";
+            type: SWALLOW;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       rel1 {
-		  relative: 0.6 0.3;
-	       }
-	       rel2 {
-		  relative: 0.9 0.5;
-	       }
-	    }
-	 }
-	 part { name: "element3";
-	    type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1.relative: 0.6 0.3;
+               rel2.relative: 0.9 0.5;
+            }
+         }
+         part { name: "element3";
+            type: SWALLOW;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       rel1 {
-		  relative: 0.1 0.7;
-	       }
-	       rel2 {
-		  relative: 0.9 0.9;
-	       }
-	    }
-	 }
-	 part { name: "over";
+            description { state: "default" 0.0;
+               rel1.relative: 0.1 0.7;
+               rel2.relative: 0.9 0.9;
+            }
+         }
+         part { name: "over";
             mouse_events: 0;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       align: 0.0 1.0;
-	       aspect: 2.238095238 2.238095238;
-	       max: 329 147;
-	       aspect_preference: HORIZONTAL;
-	       image.normal: "over.png";
-	    }
-	 }
+            description { state: "default" 0.0;
+               align: 0.0 1.0;
+               aspect: 2.238095238 2.238095238;
+               max: 329 147;
+               aspect_preference: HORIZONTAL;
+               image.normal: "over.png";
+            }
+         }
          part { name: "clo";
             mouse_events: 0;
             clip_to: "clip";
@@ -170,10 +154,10 @@ collections {
    }
    group { name: "layout2";
       images {
-	 image: "over.png" COMP;
-	 image: "under.png" COMP;
-	 image: "sky.jpg" LOSSY 80;
-	 image: "clo.png" LOSSY 60;
+         image: "over.png" COMP;
+         image: "under.png" COMP;
+         image: "sky.jpg" LOSSY 80;
+         image: "clo.png" LOSSY 60;
       }
       parts {
          part { name: "clip";
@@ -181,15 +165,15 @@ collections {
             description { state: "default" 0.0;
             }
          }
-	 part { name: "sky";
+         part { name: "sky";
             mouse_events: 0;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       aspect: 2.6225 2.6225;
-	       aspect_preference: NONE;
-	       image.normal: "sky.jpg";
-	    }
-	    description { state: "drift" 0.0;
+            description { state: "default" 0.0;
+               aspect: 2.6225 2.6225;
+               aspect_preference: NONE;
+               image.normal: "sky.jpg";
+            }
+            description { state: "drift" 0.0;
                inherit: "default" 0.0;
                fill {
                   origin {
@@ -197,85 +181,69 @@ collections {
                      offset: 0 0;
                   }
                }
-	    }
-	 }
-	 part { name: "under";
+             }
+         }
+         part { name: "under";
             mouse_events: 0;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       align: 0.5 0.0;
-	       aspect: 1.486068111 1.486068111;
-	       aspect_preference: HORIZONTAL;
-	       image.normal: "under.png";
-	    }
-	 }
-	 part { name: "text";
-	    type: TEXT;
+            description { state: "default" 0.0;
+               align: 0.5 0.0;
+               aspect: 1.486068111 1.486068111;
+               aspect_preference: HORIZONTAL;
+               image.normal: "under.png";
+            }
+         }
+         part { name: "text";
+            type: TEXT;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       color: 255 255 0 255;
-	       rel1 {
-		  relative: 0.3 0.02;
-	       }
-	       rel2 {
-		  relative: 0.6 0.12;
-	       }
-	       align: 0.5 0.5;
-	       text {
-		  font: "Sans:style=Bold";
-		  size: 14;
-		  min: 1 1;
-		  text: "some edje text here";
-	       }
-	    }
-	 }
-	 part { name: "element1";
-	    type: SWALLOW;
+            description { state: "default" 0.0;
+               color: 255 255 0 255;
+               rel1.relative: 0.3 0.02;
+               rel2.relative: 0.6 0.12;
+               align: 0.5 0.5;
+               text {
+                  font: "Sans:style=Bold";
+                  size: 14;
+                  min: 1 1;
+                  text: "some edje text here";
+               }
+            }
+         }
+         part { name: "element1";
+            type: SWALLOW;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       rel1 {
-		  relative: 0.2 0.2;
-	       }
-	       rel2 {
-		  relative: 0.4 0.3;
-	       }
-	    }
-	 }
-	 part { name: "element2";
-	    type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1.relative: 0.2 0.2;
+               rel2.relative: 0.4 0.3;
+            }
+         }
+         part { name: "element2";
+            type: SWALLOW;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       rel1 {
-		  relative: 0.6 0.3;
-	       }
-	       rel2 {
-		  relative: 0.9 0.5;
-	       }
-	    }
-	 }
-	 part { name: "element3";
-	    type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1.relative: 0.6 0.3;
+               rel2.relative: 0.9 0.5;
+            }
+         }
+         part { name: "element3";
+            type: SWALLOW;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       rel1 {
-		  relative: 0.1 0.7;
-	       }
-	       rel2 {
-		  relative: 0.9 0.9;
-	       }
-	    }
-	 }
-	 part { name: "over";
+            description { state: "default" 0.0;
+               rel1.relative: 0.1 0.7;
+               rel2.relative: 0.9 0.9;
+            }
+         }
+         part { name: "over";
             mouse_events: 0;
             clip_to: "clip";
-	    description { state: "default" 0.0;
-	       align: 0.0 1.0;
-	       aspect: 2.238095238 2.238095238;
-	       max: 329 147;
-	       aspect_preference: HORIZONTAL;
-	       image.normal: "over.png";
-	    }
-	 }
+            description { state: "default" 0.0;
+               align: 0.0 1.0;
+               aspect: 2.238095238 2.238095238;
+               max: 329 147;
+               aspect_preference: HORIZONTAL;
+               image.normal: "over.png";
+            }
+         }
          part { name: "clo";
             mouse_events: 0;
             clip_to: "clip";
@@ -576,7 +544,7 @@ collections {
 
    group { name: "bg_overlay";
       images {
-	 image: "clo.png" LOSSY 60;
+          image: "clo.png" LOSSY 60;
       }
       parts {
          part { name: "clip";
@@ -738,7 +706,7 @@ collections {
               rel2.to: "slot";
               color: 0 0 0 0;
             }
-		 }
+         }
       }
    }
    group { name: "access_color_page";