diff --git a/legacy/elementary/data/themes/widgets/border.edc b/legacy/elementary/data/themes/widgets/border.edc
index 69ae98327d..35cc5e9f0a 100644
--- a/legacy/elementary/data/themes/widgets/border.edc
+++ b/legacy/elementary/data/themes/widgets/border.edc
@@ -22,8 +22,7 @@ color_classes {
    }
 }
 
-group {
-   name: "elm/border/base/default";
+group { name: "elm/border/base/default";
    data {
       item: "focus_highlight" "off";
       item: "framespace" "0 22 0 26";
diff --git a/legacy/elementary/data/themes/widgets/colorselector.edc b/legacy/elementary/data/themes/widgets/colorselector.edc
index 3a7a086e7d..da3490e5aa 100644
--- a/legacy/elementary/data/themes/widgets/colorselector.edc
+++ b/legacy/elementary/data/themes/widgets/colorselector.edc
@@ -1,6 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-group {
-   name: "elm/colorselector/palette/default";
+group { name: "elm/colorselector/palette/default";
    data.item: "horizontal_pad" "10";
    data.item: "vertical_pad" "10";
    parts {
diff --git a/legacy/elementary/data/themes/widgets/ctxpopup.edc b/legacy/elementary/data/themes/widgets/ctxpopup.edc
index ad60308c88..6eaf87658e 100644
--- a/legacy/elementary/data/themes/widgets/ctxpopup.edc
+++ b/legacy/elementary/data/themes/widgets/ctxpopup.edc
@@ -431,8 +431,7 @@ group { name: "elm/ctxpopup/arrow/default";
    }
 }
 ///////////////////////////////////////////////////////////////////////////////
-group {
-   name: "elm/ctxpopup/icon_text_style_item/default";
+group { name: "elm/ctxpopup/icon_text_style_item/default";
    alias: "elm/ctxpopup/text_style_item/default";
    alias: "elm/ctxpopup/icon_style_item/default";
    images {
diff --git a/legacy/elementary/data/themes/widgets/dayselector.edc b/legacy/elementary/data/themes/widgets/dayselector.edc
index c5f3a5165e..0dd028956c 100644
--- a/legacy/elementary/data/themes/widgets/dayselector.edc
+++ b/legacy/elementary/data/themes/widgets/dayselector.edc
@@ -52,8 +52,7 @@
       }\
    }
 
-group {
-   name: "elm/dayselector/base/default";
+group { name: "elm/dayselector/base/default";
    parts {
       part {
          name: "bg";
@@ -163,8 +162,7 @@ group {
    }
 }
 
-group {
-   name: "elm/check/base/dayselector/default";
+group { name: "elm/check/base/dayselector/default";
    images {
       image: "seg_single_normal.png" COMP;
       image: "seg_left_normal.png" COMP;
diff --git a/legacy/elementary/data/themes/widgets/multibuttonentry.edc b/legacy/elementary/data/themes/widgets/multibuttonentry.edc
index af6c358833..f2517c77a0 100644
--- a/legacy/elementary/data/themes/widgets/multibuttonentry.edc
+++ b/legacy/elementary/data/themes/widgets/multibuttonentry.edc
@@ -54,8 +54,7 @@
       }
    }
 
-   group {
-      name: "elm/multibuttonentry/guidetext/default";
+   group { name: "elm/multibuttonentry/guidetext/default";
       parts {
          part {
             name: "elm.text.bg";
@@ -88,8 +87,7 @@
       }
    }
 
-   group {
-      name: "elm/multibuttonentry/btn/default";
+   group { name: "elm/multibuttonentry/btn/default";
       data.item: "button_max_size" 130;      
       styles {
          style { name: "multibuttonentry_textblock_style";
@@ -235,8 +233,7 @@
          }
       }
    }
-   group {
-      name: "elm/label/base/extended/multibuttonentry_default";
+   group { name: "elm/label/base/extended/multibuttonentry_default";
 
       styles {
          style {
@@ -276,8 +273,7 @@
       }
    }
 
-   group {
-      name: "elm/multibuttonentry/closedbutton/default";
+   group { name: "elm/multibuttonentry/closedbutton/default";
       images {
          image: "bt_basew.png" COMP;
          image: "bt_base1.png" COMP;
@@ -350,8 +346,7 @@
       }
    }
 
-   group {
-      name: "elm/multibuttonentry/label/default";
+   group { name: "elm/multibuttonentry/label/default";
       parts {
          part {
             name: "mbe.label.bg";
diff --git a/legacy/elementary/data/themes/widgets/panel.edc b/legacy/elementary/data/themes/widgets/panel.edc
index eebcd29756..d7563397eb 100644
--- a/legacy/elementary/data/themes/widgets/panel.edc
+++ b/legacy/elementary/data/themes/widgets/panel.edc
@@ -708,8 +708,7 @@ group { name: "elm/panel/bottom/default";
    }
 }
 
-group {
-   name: "elm/panel/right/default";
+group { name: "elm/panel/right/default";
    images {
       image: "bt_base1.png" COMP;
       image: "bt_hilight.png" COMP;
diff --git a/legacy/elementary/data/themes/widgets/player.edc b/legacy/elementary/data/themes/widgets/player.edc
index d9e32b9699..2a036c9add 100644
--- a/legacy/elementary/data/themes/widgets/player.edc
+++ b/legacy/elementary/data/themes/widgets/player.edc
@@ -1,6 +1,5 @@
 #define BSZ 24
-group {
-   name: "elm/player/base/default";
+group { name: "elm/player/base/default";
    min: 20 10;
 
    parts {
diff --git a/legacy/elementary/data/themes/widgets/pointer.edc b/legacy/elementary/data/themes/widgets/pointer.edc
index 2e0437013a..c0a3cdf2e7 100644
--- a/legacy/elementary/data/themes/widgets/pointer.edc
+++ b/legacy/elementary/data/themes/widgets/pointer.edc
@@ -1,5 +1,4 @@
-   group {
-      name: "elm/pointer/base/default";
+   group { name: "elm/pointer/base/default";
       images {
          image: "pointer.png" COMP;
          image: "pointer_glow.png" COMP;
diff --git a/legacy/elementary/data/themes/widgets/video.edc b/legacy/elementary/data/themes/widgets/video.edc
index 628cbfecdf..f3a26e9544 100644
--- a/legacy/elementary/data/themes/widgets/video.edc
+++ b/legacy/elementary/data/themes/widgets/video.edc
@@ -1,5 +1,4 @@
-group {
-   name: "elm/video/base/default";
+group { name: "elm/video/base/default";
 
    parts {
       part {