edje: reformat bin/ c files

a lot of this was unreadable due to mixed tabs/spaces or just random
formatting

18 files changed, 6446 insertions, 6103 deletions

diff --git a/src/bin/edje/edje_cc.c b/src/bin/edje/edje_cc.c
index 428eacba0b..52d2e28af1 100644
--- a/src/bin/edje/edje_cc.c
+++ b/src/bin/edje/edje_cc.c
@@ -16,7 +16,7 @@
 int _edje_cc_log_dom = -1;
 static void main_help(void);
 
-Eina_Prefix  *pfx = NULL;
+Eina_Prefix *pfx = NULL;
 Eina_List *snd_dirs = NULL;
 Eina_List *mo_dirs = NULL;
 Eina_List *vibration_dirs = NULL;
@@ -25,29 +25,29 @@ Eina_List *model_dirs = NULL;
 Eina_List *fnt_dirs = NULL;
 Eina_List *data_dirs = NULL;
 Eina_List *defines = NULL;
-char      *file_in = NULL;
-char      *tmp_dir = NULL;
-char      *file_out = NULL;
-char      *watchfile = NULL;
-char      *depfile = NULL;
-char      *authors = NULL;
-char      *license = NULL;
+char *file_in = NULL;
+char *tmp_dir = NULL;
+char *file_out = NULL;
+char *watchfile = NULL;
+char *depfile = NULL;
+char *authors = NULL;
+char *license = NULL;
 Eina_List *licenses = NULL;
 
 static const char *progname = NULL;
 
-int        no_lossy = 0;
-int        no_comp = 0;
-int        no_raw = 0;
-int        no_save = 0;
-int        min_quality = 0;
-int        max_quality = 100;
-int        compress_mode = EET_COMPRESSION_HI;
-int        threads = 0;
-int        annotate = 0;
-int        no_etc1 = 0;
-int        no_etc2 = 0;
-int        beta = 0;
+int no_lossy = 0;
+int no_comp = 0;
+int no_raw = 0;
+int no_save = 0;
+int min_quality = 0;
+int max_quality = 100;
+int compress_mode = EET_COMPRESSION_HI;
+int threads = 0;
+int annotate = 0;
+int no_etc1 = 0;
+int no_etc2 = 0;
+int beta = 0;
 
 unsigned int max_open_files;
 
@@ -70,16 +70,19 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
         switch (level)
           {
            case EINA_LOG_LEVEL_CRITICAL:
-              prefix = "Critical. ";
-              break;
+             prefix = "Critical. ";
+             break;
+
            case EINA_LOG_LEVEL_ERR:
-              prefix = "Error. ";
-              break;
+             prefix = "Error. ";
+             break;
+
            case EINA_LOG_LEVEL_WARN:
-              prefix = "Warning. ";
-              break;
+             prefix = "Warning. ";
+             break;
+
            default:
-              prefix = "";
+             prefix = "";
           }
         fprintf(stderr, "%s: %s", progname, prefix);
         eina_log_console_color_set(stderr, EINA_COLOR_RESET);
@@ -127,7 +130,7 @@ main_help(void)
       "-threads                 Compile the edje file using multiple parallel threads (by default)\n"
       "-nothreads               Compile the edje file using only the main loop\n"
       "-V [--version]           show program version\n"
-      ,progname);
+     , progname);
 }
 
 int
@@ -147,11 +150,11 @@ main(int argc, char **argv)
      return -1;
 
    _edje_cc_log_dom = eina_log_domain_register
-     ("edje_cc", EDJE_CC_DEFAULT_LOG_COLOR);
+       ("edje_cc", EDJE_CC_DEFAULT_LOG_COLOR);
    if (_edje_cc_log_dom < 0)
      {
-       EINA_LOG_ERR("Enable to create a log domain.");
-       exit(-1);
+        EINA_LOG_ERR("Enable to create a log domain.");
+        exit(-1);
      }
    if (!eina_log_domain_level_check(_edje_cc_log_dom, EINA_LOG_LEVEL_WARN))
      eina_log_domain_level_set("edje_cc", EINA_LOG_LEVEL_WARN);
@@ -170,27 +173,27 @@ main(int argc, char **argv)
 
    for (i = 1; i < argc; i++)
      {
-	if (!strcmp(argv[i], "-h"))
-	  {
-	     main_help();
-	     exit(0);
-	  }
-	else if ((!strcmp(argv[i], "-V")) || (!strcmp(argv[i], "--version")))
-	  {
-	     printf("Version: %s\n", PACKAGE_VERSION);
-	     exit(0);
-	  }
-	else if (!strcmp(argv[i], "-v"))
-	  {
-	     eina_log_domain_level_set("edje_cc", EINA_LOG_LEVEL_INFO);
-	  }
-	else if (!strcmp(argv[i], "-no-lossy"))
-	  {
-	     no_lossy = 1;
-	  }
-	else if (!strcmp(argv[i], "-no-comp"))
-	  {
-	     no_comp = 1;
+        if (!strcmp(argv[i], "-h"))
+          {
+             main_help();
+             exit(0);
+          }
+        else if ((!strcmp(argv[i], "-V")) || (!strcmp(argv[i], "--version")))
+          {
+             printf("Version: %s\n", PACKAGE_VERSION);
+             exit(0);
+          }
+        else if (!strcmp(argv[i], "-v"))
+          {
+             eina_log_domain_level_set("edje_cc", EINA_LOG_LEVEL_INFO);
+          }
+        else if (!strcmp(argv[i], "-no-lossy"))
+          {
+             no_lossy = 1;
+          }
+        else if (!strcmp(argv[i], "-no-comp"))
+          {
+             no_comp = 1;
           }
         else if (!strcmp(argv[i], "-no-raw"))
           {
@@ -204,25 +207,25 @@ main(int argc, char **argv)
           {
              no_etc2 = 1;
           }
-	else if (!strcmp(argv[i], "-no-save"))
-	  {
-	     no_save = 1;
-	  }
-	else if ((!strcmp(argv[i], "-id") || !strcmp(argv[i], "--image_dir")) && (i < (argc - 1)))
-	  {
-	     i++;
-	     img_dirs = eina_list_append(img_dirs, argv[i]);
-	  }
-	else if ((!strcmp(argv[i], "-mod") || !strcmp(argv[i], "--model_dir")) && (i < (argc - 1)))
-	  {
-	     i++;
-	     model_dirs = eina_list_append(model_dirs, argv[i]);
-	  }
-	else if ((!strcmp(argv[i], "-fd") || !strcmp(argv[i], "--font_dir")) && (i < (argc - 1)))
-	  {
-	     i++;
-	     fnt_dirs = eina_list_append(fnt_dirs, argv[i]);
-	  }
+        else if (!strcmp(argv[i], "-no-save"))
+          {
+             no_save = 1;
+          }
+        else if ((!strcmp(argv[i], "-id") || !strcmp(argv[i], "--image_dir")) && (i < (argc - 1)))
+          {
+             i++;
+             img_dirs = eina_list_append(img_dirs, argv[i]);
+          }
+        else if ((!strcmp(argv[i], "-mod") || !strcmp(argv[i], "--model_dir")) && (i < (argc - 1)))
+          {
+             i++;
+             model_dirs = eina_list_append(model_dirs, argv[i]);
+          }
+        else if ((!strcmp(argv[i], "-fd") || !strcmp(argv[i], "--font_dir")) && (i < (argc - 1)))
+          {
+             i++;
+             fnt_dirs = eina_list_append(fnt_dirs, argv[i]);
+          }
         else if ((!strcmp(argv[i], "-sd") || !strcmp(argv[i], "--sound_dir")) && (i < (argc - 1)))
           {
              i++;
@@ -243,12 +246,12 @@ main(int argc, char **argv)
              i++;
              data_dirs = eina_list_append(data_dirs, argv[i]);
           }
-	else if ((!strcmp(argv[i], "-td") || !strcmp(argv[i], "--tmp_dir")) && (i < (argc - 1)))
-	  {
-	     i++;
+        else if ((!strcmp(argv[i], "-td") || !strcmp(argv[i], "--tmp_dir")) && (i < (argc - 1)))
+          {
+             i++;
              if (!tmp_dir)
                tmp_dir = argv[i];
-	  }
+          }
         else if ((!strcmp(argv[i], "-l") || !strcmp(argv[i], "--license")) && (i < (argc - 1)))
           {
              i++;
@@ -263,88 +266,88 @@ main(int argc, char **argv)
              if (!authors)
                authors = argv[i];
           }
-	else if ((!strcmp(argv[i], "-min-quality")) && (i < (argc - 1)))
-	  {
-	     i++;
-	     min_quality = atoi(argv[i]);
-	     if (min_quality < 0) min_quality = 0;
-	     if (min_quality > 100) min_quality = 100;
-	  }
-	else if ((!strcmp(argv[i], "-max-quality")) && (i < (argc - 1)))
-	  {
-	     i++;
-	     max_quality = atoi(argv[i]);
-	     if (max_quality < 0) max_quality = 0;
-	     if (max_quality > 100) max_quality = 100;
-	  }
-	else if (!strcmp(argv[i], "-fastcomp"))
-	  {
+        else if ((!strcmp(argv[i], "-min-quality")) && (i < (argc - 1)))
+          {
+             i++;
+             min_quality = atoi(argv[i]);
+             if (min_quality < 0) min_quality = 0;
+             if (min_quality > 100) min_quality = 100;
+          }
+        else if ((!strcmp(argv[i], "-max-quality")) && (i < (argc - 1)))
+          {
+             i++;
+             max_quality = atoi(argv[i]);
+             if (max_quality < 0) max_quality = 0;
+             if (max_quality > 100) max_quality = 100;
+          }
+        else if (!strcmp(argv[i], "-fastcomp"))
+          {
              compress_mode = EET_COMPRESSION_SUPERFAST;
-	  }
-	else if (!strcmp(argv[i], "-fastdecomp"))
-	  {
+          }
+        else if (!strcmp(argv[i], "-fastdecomp"))
+          {
              compress_mode = EET_COMPRESSION_VERYFAST;
-	  }
-	else if (!strcmp(argv[i], "-threads"))
-	  {
+          }
+        else if (!strcmp(argv[i], "-threads"))
+          {
              threads = 1;
-	  }
-	else if (!strcmp(argv[i], "-nothreads"))
-	  {
+          }
+        else if (!strcmp(argv[i], "-nothreads"))
+          {
              threads = 0;
-	  }
-	else if (!strncmp(argv[i], "-D", 2))
-	  {
-	     defines = eina_list_append(defines, mem_strdup(argv[i]));
-	  }
-	else if ((!strcmp(argv[i], "-o")) && (i < (argc - 1)))
-	  {
-	     i++;
-	     file_out = argv[i];
-	  }
-	else if ((!strcmp(argv[i], "-w")) && (i < (argc - 1)))
-	  {
+          }
+        else if (!strncmp(argv[i], "-D", 2))
+          {
+             defines = eina_list_append(defines, mem_strdup(argv[i]));
+          }
+        else if ((!strcmp(argv[i], "-o")) && (i < (argc - 1)))
+          {
+             i++;
+             file_out = argv[i];
+          }
+        else if ((!strcmp(argv[i], "-w")) && (i < (argc - 1)))
+          {
              i++;
              watchfile = argv[i];
              unlink(watchfile);
-	  }
-	else if (!strcmp(argv[i], "-annotate"))
-	  {
+          }
+        else if (!strcmp(argv[i], "-annotate"))
+          {
              annotate = 1;
           }
-	else if ((!strcmp(argv[i], "-deps")) && (i < (argc - 1)))
-	  {
-	     i++;
-	     depfile = argv[i];
-	     unlink(depfile);
-	  }
+        else if ((!strcmp(argv[i], "-deps")) && (i < (argc - 1)))
+          {
+             i++;
+             depfile = argv[i];
+             unlink(depfile);
+          }
         else if (!strcmp(argv[i], "-beta"))
           {
              beta = 1;
           }
-	else if (!file_in)
-	  file_in = argv[i];
-	else if (!file_out)
-	  file_out = argv[i];
+        else if (!file_in)
+          file_in = argv[i];
+        else if (!file_out)
+          file_out = argv[i];
      }
 
    if (!file_in)
      {
-	ERR("no input file specified.");
-	main_help();
-	exit(-1);
+        ERR("no input file specified.");
+        main_help();
+        exit(-1);
      }
 
-   pfx = eina_prefix_new(argv[0],            /* argv[0] value (optional) */
-                         main,               /* an optional symbol to check path of */
-                         "EDJE",             /* env var prefix to use (XXX_PREFIX, XXX_BIN_DIR etc. */
-                         "edje",             /* dir to add after "share" (PREFIX/share/DIRNAME) */
+   pfx = eina_prefix_new(argv[0], /* argv[0] value (optional) */
+                         main, /* an optional symbol to check path of */
+                         "EDJE", /* env var prefix to use (XXX_PREFIX, XXX_BIN_DIR etc. */
+                         "edje", /* dir to add after "share" (PREFIX/share/DIRNAME) */
                          "include/edje.inc", /* a magic file to check for in PREFIX/share/DIRNAME for success */
                          PACKAGE_BIN_DIR,    /* package bin dir @ compile time */
                          PACKAGE_LIB_DIR,    /* package lib dir @ compile time */
                          PACKAGE_DATA_DIR,   /* package data dir @ compile time */
                          PACKAGE_DATA_DIR    /* if locale needed  use LOCALE_DIR */
-                        );
+                         );
 
    /* check whether file_in exists */
 #ifdef HAVE_REALPATH
@@ -353,41 +356,41 @@ main(int argc, char **argv)
    if (stat(file_in, &st) || !S_ISREG(st.st_mode))
 #endif
      {
-	ERR("file not found: %s.", file_in);
-	main_help();
-	exit(-1);
+        ERR("file not found: %s.", file_in);
+        main_help();
+        exit(-1);
      }
 
    if (!file_out)
-      {
-         char *suffix;
-
-         if ((suffix = strstr(file_in,".edc")) && (suffix[4] == 0))
-            {
-               file_out = strdup(file_in);
-               if (file_out)
-                  {
-                     suffix = strstr(file_out,".edc");
-                     strcpy(suffix,".edj");
-                  }
-            }
-      }
+     {
+        char *suffix;
+
+        if ((suffix = strstr(file_in, ".edc")) && (suffix[4] == 0))
+          {
+             file_out = strdup(file_in);
+             if (file_out)
+               {
+                  suffix = strstr(file_out, ".edc");
+                  strcpy(suffix, ".edj");
+               }
+          }
+     }
    if (!file_out)
      {
-	ERR("no output file specified.");
-	main_help();
-	exit(-1);
+        ERR("no output file specified.");
+        main_help();
+        exit(-1);
      }
 
 #ifdef HAVE_REALPATH
-   if (realpath(file_out, rpath2) && !strcmp (rpath, rpath2))
+   if (realpath(file_out, rpath2) && !strcmp(rpath, rpath2))
 #else
-   if (!strcmp (file_in, file_out))
+   if (!strcmp(file_in, file_out))
 #endif
      {
-	ERR("input file equals output file.");
-	main_help();
-	exit(-1);
+        ERR("input file equals output file.");
+        main_help();
+        exit(-1);
      }
 
    using_file(file_in, 'E');
@@ -401,10 +404,10 @@ main(int argc, char **argv)
    edje_file->version = EDJE_FILE_VERSION;
    edje_file->minor = EDJE_FILE_MINOR;
    edje_file->feature_ver = 1; /* increment this every time we add a field
-				* or feature to the edje file format that
-				* does not load nicely as a NULL or 0 value
-				* and needs a special fallback initialization
-				*/
+                                * or feature to the edje file format that
+                                * does not load nicely as a NULL or 0 value
+                                * and needs a special fallback initialization
+                                */
    /* efl_version is used for specify efl's version
     * which was used for developing a edje file.
     * It is useful if Edje(or other EFL libs) need to keep
@@ -441,10 +444,11 @@ main(int argc, char **argv)
 
    eina_prefix_free(pfx);
    pfx = NULL;
-   
+
    edje_shutdown();
    eina_log_domain_unregister(_edje_cc_log_dom);
    eina_shutdown();
 
    return 0;
 }
+
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 1c5cfcd88f..6786104269 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -7,24 +7,24 @@
     this means that missing one or changing the order most certainly cause
     formatting errors.
 
-    \@block
+   \@block
         block name
-    \@context
+   \@context
         code sample of the block
-    \@description
+   \@description
         the block's description
-    \@since X.X
-    \@endblock
+   \@since X.X
+   \@endblock
 
-    \@property
+   \@property
         property name
-    \@parameters
+   \@parameters
         property's parameter list
-    \@effect
+   \@effect
         the property description (lol)
-    \@since X.X
-    \@endproperty
-*/
+   \@since X.X
+   \@endproperty
+ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -174,856 +174,883 @@ Eina_List *po_files;
 
 static Eina_Hash *desc_hash = NULL;
 
-struct _Edje_Cc_Handlers_Hierarchy_Info
-{  /* Struct that keeps globals value to impl hierarchy */
+struct _Edje_Cc_Handlers_Hierarchy_Info /* Struct that keeps globals value to impl hierarchy */
+{
    Edje_Part_Collection_Directory_Entry *current_de;
-   Edje_Part *current_part;
-   Edje_Pack_Element *current_item;
-   Edje_Part_Description_Common *current_desc;
-   Edje_Part_Description_Common *parent_desc;
-   Edje_Program *current_program;
-   Edje_Part *ep;
+   Edje_Part                            *current_part;
+   Edje_Pack_Element                    *current_item;
+   Edje_Part_Description_Common         *current_desc;
+   Edje_Part_Description_Common         *parent_desc;
+   Edje_Program                         *current_program;
+   Edje_Part                            *ep;
 };
 typedef struct _Edje_Cc_Handlers_Hierarchy_Info Edje_Cc_Handlers_Hierarchy_Info;
 
 static Eina_Array *part_hierarchy = NULL; /* stack parts,support nested parts */
-static void edje_cc_handlers_hierarchy_set(Edje_Part *src);
+static void       edje_cc_handlers_hierarchy_set(Edje_Part *src);
 static Edje_Part *edje_cc_handlers_hierarchy_parent_get(void);
-static void edje_cc_handlers_hierarchy_push(Edje_Part *ep, Edje_Part *cp);
-static void edje_cc_handlers_hierarchy_rename(Edje_Part *old, Edje_Part *new);
-static void edje_cc_handlers_hierarchy_pop(void);
-
-static void _program_target_add(char *name);
-static void _program_after(const char *name);
-static void _program_free(Edje_Program *pr);
-static Eina_Bool _program_remove(const char *name, Edje_Program **pgrms, unsigned int count);
-
-static void * _part_free(Edje_Part_Collection *pc, Edje_Part *ep);
-
-static void check_has_anchors(void);
-
-static void st_efl_version(void);
-static void st_externals_external(void);
-
-static void st_images_image(void);
-static void ob_images_set(void);
-static void st_images_set_name(void);
-static void ob_images_set_image(void);
-static void st_images_set_image_image(void);
-static void st_images_set_image_size(void);
-static void st_images_set_image_border(void);
-static void st_images_set_image_border_scale_by(void);
-
-static void st_models_model(void);
-
-static void st_fonts_font(void);
-
-static void st_data_item(void);
-static void st_data_file(void);
-
-static void ob_styles_style(void);
-static void st_styles_style_name(void);
-static void st_styles_style_base(void);
-static void st_styles_style_tag(void);
-
-static void ob_color_tree(void);
-
-static void ob_color_class(void);
-static void st_color_class_name(void);
-static void st_color_class_color(void);
-static void st_color_class_color2(void);
-static void st_color_class_color3(void);
-static void st_color_class_desc(void);
-
-static void ob_text_class(void);
-static void st_text_class_name(void);
-static void st_text_class_font(void);
-static void st_text_class_size(void);
-
-static void ob_size_class(void);
-static void st_size_class_name(void);
-static void st_size_class_min(void);
-static void st_size_class_max(void);
-
-static void ob_filters_filter(void);
-static void ob_filters_filter_script(void);
-static void st_filters_filter_file(void);
-static void st_filters_filter_name(void);
-
-static void ob_collections(void);
-static void st_collections_base_scale(void);
-
-static void ob_collections_group(void);
-static void st_collections_group_name(void);
-static void st_collections_group_inherit_only(void);
-static void st_collections_group_inherit(void);
-static void st_collections_group_program_source(void);
-static void st_collections_group_part_remove(void);
-static void st_collections_group_program_remove(void);
-static void st_collections_group_lua_script_only(void);
-static void st_collections_group_script_recursion(void);
-static void st_collections_group_alias(void);
-static void st_collections_group_min(void);
-static void st_collections_group_max(void);
-static void st_collections_group_scene_size(void);
-static void st_collections_group_broadcast_signal(void);
-static void st_collections_group_data_item(void);
-static void st_collections_group_orientation(void);
-static void st_collections_group_mouse_events(void);
-static void st_collections_group_use_custom_seat_names(void);
-static void st_collections_group_inherit_script(void);
-
-static void st_collections_group_limits_vertical(void);
-static void st_collections_group_limits_horizontal(void);
-
-static void ob_collections_group_script(void);
-static void ob_collections_group_lua_script(void);
-
-static void st_collections_group_parts_alias(void);
+static void       edje_cc_handlers_hierarchy_push(Edje_Part *ep, Edje_Part *cp);
+static void       edje_cc_handlers_hierarchy_rename(Edje_Part *old, Edje_Part *new);
+static void       edje_cc_handlers_hierarchy_pop(void);
+
+static void       _program_target_add(char *name);
+static void       _program_after(const char *name);
+static void       _program_free(Edje_Program *pr);
+static Eina_Bool  _program_remove(const char *name, Edje_Program **pgrms, unsigned int count);
+
+static void      *_part_free(Edje_Part_Collection *pc, Edje_Part *ep);
+
+static void       check_has_anchors(void);
+
+static void       st_efl_version(void);
+static void       st_externals_external(void);
+
+static void       st_images_image(void);
+static void       ob_images_set(void);
+static void       st_images_set_name(void);
+static void       ob_images_set_image(void);
+static void       st_images_set_image_image(void);
+static void       st_images_set_image_size(void);
+static void       st_images_set_image_border(void);
+static void       st_images_set_image_border_scale_by(void);
+
+static void       st_models_model(void);
+
+static void       st_fonts_font(void);
+
+static void       st_data_item(void);
+static void       st_data_file(void);
+
+static void       ob_styles_style(void);
+static void       st_styles_style_name(void);
+static void       st_styles_style_base(void);
+static void       st_styles_style_tag(void);
+
+static void       ob_color_tree(void);
+
+static void       ob_color_class(void);
+static void       st_color_class_name(void);
+static void       st_color_class_color(void);
+static void       st_color_class_color2(void);
+static void       st_color_class_color3(void);
+static void       st_color_class_desc(void);
+
+static void       ob_text_class(void);
+static void       st_text_class_name(void);
+static void       st_text_class_font(void);
+static void       st_text_class_size(void);
+
+static void       ob_size_class(void);
+static void       st_size_class_name(void);
+static void       st_size_class_min(void);
+static void       st_size_class_max(void);
+
+static void       ob_filters_filter(void);
+static void       ob_filters_filter_script(void);
+static void       st_filters_filter_file(void);
+static void       st_filters_filter_name(void);
+
+static void       ob_collections(void);
+static void       st_collections_base_scale(void);
+
+static void       ob_collections_group(void);
+static void       st_collections_group_name(void);
+static void       st_collections_group_inherit_only(void);
+static void       st_collections_group_inherit(void);
+static void       st_collections_group_program_source(void);
+static void       st_collections_group_part_remove(void);
+static void       st_collections_group_program_remove(void);
+static void       st_collections_group_lua_script_only(void);
+static void       st_collections_group_script_recursion(void);
+static void       st_collections_group_alias(void);
+static void       st_collections_group_min(void);
+static void       st_collections_group_max(void);
+static void       st_collections_group_scene_size(void);
+static void       st_collections_group_broadcast_signal(void);
+static void       st_collections_group_data_item(void);
+static void       st_collections_group_orientation(void);
+static void       st_collections_group_mouse_events(void);
+static void       st_collections_group_use_custom_seat_names(void);
+static void       st_collections_group_inherit_script(void);
+
+static void       st_collections_group_limits_vertical(void);
+static void       st_collections_group_limits_horizontal(void);
+
+static void       ob_collections_group_script(void);
+static void       ob_collections_group_lua_script(void);
+
+static void       st_collections_group_parts_alias(void);
 
 static Edje_Part *edje_cc_handlers_part_make(int);
-static void ob_collections_group_parts_part(void);
-static void st_collections_group_parts_part_name(void);
-static void st_collections_group_parts_part_inherit(void);
-static void st_collections_group_parts_part_type(void);
+static void       ob_collections_group_parts_part(void);
+static void       st_collections_group_parts_part_name(void);
+static void       st_collections_group_parts_part_inherit(void);
+static void       st_collections_group_parts_part_type(void);
 #ifdef HAVE_EPHYSICS
-static void st_collections_group_parts_part_physics_body(void);
+static void       st_collections_group_parts_part_physics_body(void);
 #endif
-static void st_collections_group_parts_part_insert_before(void);
-static void st_collections_group_parts_part_insert_after(void);
-static void st_collections_group_parts_part_effect(void);
-static void st_collections_group_parts_part_mouse_events(void);
-static void st_collections_group_parts_part_anti_alias(void);
-static void st_collections_group_parts_part_repeat_events(void);
-static void st_collections_group_parts_part_ignore_flags(void);
-static void st_collections_group_parts_part_mask_flags(void);
-static void st_collections_group_parts_part_scale(void);
-static void st_collections_group_parts_part_pointer_mode(void);
-static void st_collections_group_parts_part_precise_is_inside(void);
-static void st_collections_group_parts_part_use_alternate_font_metrics(void);
-static void st_collections_group_parts_part_clip_to_id(void);
-static void st_collections_group_parts_part_render(void);
-static void st_collections_group_parts_part_no_render(void);
-static void st_collections_group_parts_part_required(void);
-static void st_collections_group_parts_part_norequired(void);
-static void st_collections_group_parts_part_source(void);
-static void st_collections_group_parts_part_source2(void);
-static void st_collections_group_parts_part_source3(void);
-static void st_collections_group_parts_part_source4(void);
-static void st_collections_group_parts_part_source5(void);
-static void st_collections_group_parts_part_source6(void);
-static void st_collections_group_parts_part_entry_mode(void);
-static void st_collections_group_parts_part_select_mode(void);
-static void st_collections_group_parts_part_cursor_mode(void);
-static void st_collections_group_parts_part_multiline(void);
-static void st_collections_group_parts_part_access(void);
-static void st_collections_group_parts_part_dragable_x(void);
-static void st_collections_group_parts_part_dragable_y(void);
-static void st_collections_group_parts_part_dragable_confine(void);
-static void st_collections_group_parts_part_dragable_threshold(void);
-static void st_collections_group_parts_part_dragable_events(void);
-static void st_collections_group_parts_part_allowed_seats(void);
+static void       st_collections_group_parts_part_insert_before(void);
+static void       st_collections_group_parts_part_insert_after(void);
+static void       st_collections_group_parts_part_effect(void);
+static void       st_collections_group_parts_part_mouse_events(void);
+static void       st_collections_group_parts_part_anti_alias(void);
+static void       st_collections_group_parts_part_repeat_events(void);
+static void       st_collections_group_parts_part_ignore_flags(void);
+static void       st_collections_group_parts_part_mask_flags(void);
+static void       st_collections_group_parts_part_scale(void);
+static void       st_collections_group_parts_part_pointer_mode(void);
+static void       st_collections_group_parts_part_precise_is_inside(void);
+static void       st_collections_group_parts_part_use_alternate_font_metrics(void);
+static void       st_collections_group_parts_part_clip_to_id(void);
+static void       st_collections_group_parts_part_render(void);
+static void       st_collections_group_parts_part_no_render(void);
+static void       st_collections_group_parts_part_required(void);
+static void       st_collections_group_parts_part_norequired(void);
+static void       st_collections_group_parts_part_source(void);
+static void       st_collections_group_parts_part_source2(void);
+static void       st_collections_group_parts_part_source3(void);
+static void       st_collections_group_parts_part_source4(void);
+static void       st_collections_group_parts_part_source5(void);
+static void       st_collections_group_parts_part_source6(void);
+static void       st_collections_group_parts_part_entry_mode(void);
+static void       st_collections_group_parts_part_select_mode(void);
+static void       st_collections_group_parts_part_cursor_mode(void);
+static void       st_collections_group_parts_part_multiline(void);
+static void       st_collections_group_parts_part_access(void);
+static void       st_collections_group_parts_part_dragable_x(void);
+static void       st_collections_group_parts_part_dragable_y(void);
+static void       st_collections_group_parts_part_dragable_confine(void);
+static void       st_collections_group_parts_part_dragable_threshold(void);
+static void       st_collections_group_parts_part_dragable_events(void);
+static void       st_collections_group_parts_part_allowed_seats(void);
 
 /* box and table items share these */
-static void ob_collections_group_parts_part_box_items_item(void);
-static void st_collections_group_parts_part_box_items_item_type(void);
-static void st_collections_group_parts_part_box_items_item_name(void);
-static void st_collections_group_parts_part_box_items_item_source(void);
-static void st_collections_group_parts_part_box_items_item_min(void);
-static void st_collections_group_parts_part_box_items_item_spread(void);
-static void st_collections_group_parts_part_box_items_item_prefer(void);
-static void st_collections_group_parts_part_box_items_item_max(void);
-static void st_collections_group_parts_part_box_items_item_padding(void);
-static void st_collections_group_parts_part_box_items_item_align(void);
-static void st_collections_group_parts_part_box_items_item_weight(void);
-static void st_collections_group_parts_part_box_items_item_aspect(void);
-static void st_collections_group_parts_part_box_items_item_aspect_mode(void);
-static void st_collections_group_parts_part_box_items_item_options(void);
+static void       ob_collections_group_parts_part_box_items_item(void);
+static void       st_collections_group_parts_part_box_items_item_type(void);
+static void       st_collections_group_parts_part_box_items_item_name(void);
+static void       st_collections_group_parts_part_box_items_item_source(void);
+static void       st_collections_group_parts_part_box_items_item_min(void);
+static void       st_collections_group_parts_part_box_items_item_spread(void);
+static void       st_collections_group_parts_part_box_items_item_prefer(void);
+static void       st_collections_group_parts_part_box_items_item_max(void);
+static void       st_collections_group_parts_part_box_items_item_padding(void);
+static void       st_collections_group_parts_part_box_items_item_align(void);
+static void       st_collections_group_parts_part_box_items_item_weight(void);
+static void       st_collections_group_parts_part_box_items_item_aspect(void);
+static void       st_collections_group_parts_part_box_items_item_aspect_mode(void);
+static void       st_collections_group_parts_part_box_items_item_options(void);
 /* but these are only for table */
-static void st_collections_group_parts_part_table_items_item_position(void);
-static void st_collections_group_parts_part_table_items_item_span(void);
-
-static void ob_collections_group_parts_part_description(void);
-static void ob_collections_group_parts_part_desc(void);
-static void st_collections_group_parts_part_description_inherit(void);
-static void ob_collections_group_parts_part_description_link(void);
-static void st_collections_group_parts_part_description_link_base(void);
-static void st_collections_group_parts_part_description_source(void);
-static void st_collections_group_parts_part_description_state(void);
-static void st_collections_group_parts_part_description_visible(void);
-static void st_collections_group_parts_part_description_no_render(void);
-static void st_collections_group_parts_part_description_limit(void);
-static void st_collections_group_parts_part_description_align(void);
-static void st_collections_group_parts_part_description_fixed(void);
-static void st_collections_group_parts_part_description_min(void);
-static void st_collections_group_parts_part_description_minmul(void);
-static void st_collections_group_parts_part_description_max(void);
-static void st_collections_group_parts_part_description_step(void);
-static void st_collections_group_parts_part_description_aspect(void);
-static void st_collections_group_parts_part_description_aspect_preference(void);
-static void st_collections_group_parts_part_description_rel_to(void);
-static void st_collections_group_parts_part_description_rel_to_x(void);
-static void st_collections_group_parts_part_description_rel_to_y(void);
-static void st_collections_group_parts_part_description_rel1_relative(void);
-static void st_collections_group_parts_part_description_rel1_offset(void);
-static void st_collections_group_parts_part_description_rel1_to_set(const char *name);
-static void st_collections_group_parts_part_description_rel1_to(void);
-static void st_collections_group_parts_part_description_rel1_to_x(void);
-static void st_collections_group_parts_part_description_rel1_to_y(void);
-static void st_collections_group_parts_part_description_rel2_relative(void);
-static void st_collections_group_parts_part_description_rel2_offset(void);
-static void st_collections_group_parts_part_description_rel2_to_set(const char *name);
-static void st_collections_group_parts_part_description_rel2_to(void);
-static void st_collections_group_parts_part_description_rel2_to_x(void);
-static void st_collections_group_parts_part_description_rel2_to_y(void);
-static void st_collections_group_parts_part_description_anchors_top(void);
-static void st_collections_group_parts_part_description_anchors_bottom(void);
-static void st_collections_group_parts_part_description_anchors_left(void);
-static void st_collections_group_parts_part_description_anchors_right(void);
-static void st_collections_group_parts_part_description_anchors_vertical_center(void);
-static void st_collections_group_parts_part_description_anchors_horizontal_center(void);
-static void st_collections_group_parts_part_description_anchors_fill(void);
-static void st_collections_group_parts_part_description_anchors_margin(void);
-static void st_collections_group_parts_part_description_clip_to_id(void);
-static void st_collections_group_parts_part_description_size_class(void);
-static void st_collections_group_parts_part_description_image_normal(void);
-static void st_collections_group_parts_part_description_image_tween(void);
-static void st_collections_group_parts_part_description_image_border(void);
-static void st_collections_group_parts_part_description_image_middle(void);
-static void st_collections_group_parts_part_description_image_border_scale(void);
-static void st_collections_group_parts_part_description_image_border_scale_by(void);
-static void st_collections_group_parts_part_description_image_scale_hint(void);
-static void st_collections_group_parts_part_description_fill_smooth(void);
-static void st_collections_group_parts_part_description_fill_origin_relative(void);
-static void st_collections_group_parts_part_description_fill_origin_offset(void);
-static void st_collections_group_parts_part_description_fill_size_relative(void);
-static void st_collections_group_parts_part_description_fill_size_offset(void);
-static void st_collections_group_parts_part_description_fill_type(void);
-static void st_collections_group_parts_part_description_color_class(void);
-static void st_collections_group_parts_part_description_color(void);
-static void st_collections_group_parts_part_description_color2(void);
-static void st_collections_group_parts_part_description_color3(void);
-static void st_collections_group_parts_part_description_text_text(void);
-static void st_collections_group_parts_part_description_text_domain(void);
-static void st_collections_group_parts_part_description_text_text_class(void);
-static void st_collections_group_parts_part_description_text_font(void);
-static void st_collections_group_parts_part_description_text_style(void);
-static void st_collections_group_parts_part_description_text_repch(void);
-static void st_collections_group_parts_part_description_text_size(void);
-static void st_collections_group_parts_part_description_text_size_range(void);
-static void st_collections_group_parts_part_description_text_fit(void);
-static void st_collections_group_parts_part_description_text_min(void);
-static void st_collections_group_parts_part_description_text_max(void);
-static void st_collections_group_parts_part_description_text_align(void);
-static void st_collections_group_parts_part_description_text_source(void);
-static void st_collections_group_parts_part_description_text_text_source(void);
-static void st_collections_group_parts_part_description_text_ellipsis(void);
-static void st_collections_group_parts_part_description_box_layout(void);
-static void st_collections_group_parts_part_description_box_align(void);
-static void st_collections_group_parts_part_description_box_padding(void);
-static void st_collections_group_parts_part_description_box_min(void);
-static void st_collections_group_parts_part_description_table_homogeneous(void);
-static void st_collections_group_parts_part_description_table_align(void);
-static void st_collections_group_parts_part_description_table_padding(void);
-static void st_collections_group_parts_part_description_table_min(void);
-static void st_collections_group_parts_part_description_proxy_source_visible(void);
-static void st_collections_group_parts_part_description_proxy_source_clip(void);
-static void st_collections_group_parts_part_description_position_point(void);
-static void st_collections_group_parts_part_description_position_space(void);
-static void st_collections_group_parts_part_description_camera_properties(void);
-static void st_collections_group_parts_part_description_properties_ambient(void);
-static void st_collections_group_parts_part_description_properties_diffuse(void);
-static void st_collections_group_parts_part_description_properties_specular(void);
-static void st_collections_group_parts_part_description_properties_material(void);
-static void st_collections_group_parts_part_description_properties_normal(void);
-static void st_collections_group_parts_part_description_properties_shininess(void);
-static void st_collections_group_parts_part_description_properties_shade(void);
-static void st_collections_group_parts_part_description_orientation_angle_axis(void);
-static void st_collections_group_parts_part_description_orientation_look1(void);
-static void st_collections_group_parts_part_description_orientation_look2(void);
-static void st_collections_group_parts_part_description_orientation_look_to(void);
-static void st_collections_group_parts_part_description_orientation_angle_axis(void);
-static void st_collections_group_parts_part_description_orientation_quaternion(void);
-static void st_collections_group_parts_part_description_scale(void);
-static void st_collections_group_parts_part_description_offset_scale(void);
-static void st_collections_group_parts_part_description_mesh_primitive(void);
-static void ob_collections_group_parts_part_description_texture(void);
-static void st_collections_group_parts_part_description_texture_image(void);
-static void st_collections_group_parts_part_description_texture_wrap1(void);
-static void st_collections_group_parts_part_description_texture_wrap2(void);
-static void st_collections_group_parts_part_description_texture_filter1(void);
-static void st_collections_group_parts_part_description_texture_filter2(void);
-static void st_collections_group_parts_part_description_mesh_assembly(void);
-static void st_collections_group_parts_part_description_mesh_geometry(void);
-static void st_collections_group_parts_part_description_mesh_frame(void);
-static void st_collections_group_parts_part_description_filter_code(void);
-static void st_collections_group_parts_part_description_filter_source(void);
-static void st_collections_group_parts_part_description_filter_data(void);
+static void       st_collections_group_parts_part_table_items_item_position(void);
+static void       st_collections_group_parts_part_table_items_item_span(void);
+
+static void       ob_collections_group_parts_part_description(void);
+static void       ob_collections_group_parts_part_desc(void);
+static void       st_collections_group_parts_part_description_inherit(void);
+static void       ob_collections_group_parts_part_description_link(void);
+static void       st_collections_group_parts_part_description_link_base(void);
+static void       st_collections_group_parts_part_description_source(void);
+static void       st_collections_group_parts_part_description_state(void);
+static void       st_collections_group_parts_part_description_visible(void);
+static void       st_collections_group_parts_part_description_no_render(void);
+static void       st_collections_group_parts_part_description_limit(void);
+static void       st_collections_group_parts_part_description_align(void);
+static void       st_collections_group_parts_part_description_fixed(void);
+static void       st_collections_group_parts_part_description_min(void);
+static void       st_collections_group_parts_part_description_minmul(void);
+static void       st_collections_group_parts_part_description_max(void);
+static void       st_collections_group_parts_part_description_step(void);
+static void       st_collections_group_parts_part_description_aspect(void);
+static void       st_collections_group_parts_part_description_aspect_preference(void);
+static void       st_collections_group_parts_part_description_rel_to(void);
+static void       st_collections_group_parts_part_description_rel_to_x(void);
+static void       st_collections_group_parts_part_description_rel_to_y(void);
+static void       st_collections_group_parts_part_description_rel1_relative(void);
+static void       st_collections_group_parts_part_description_rel1_offset(void);
+static void       st_collections_group_parts_part_description_rel1_to_set(const char *name);
+static void       st_collections_group_parts_part_description_rel1_to(void);
+static void       st_collections_group_parts_part_description_rel1_to_x(void);
+static void       st_collections_group_parts_part_description_rel1_to_y(void);
+static void       st_collections_group_parts_part_description_rel2_relative(void);
+static void       st_collections_group_parts_part_description_rel2_offset(void);
+static void       st_collections_group_parts_part_description_rel2_to_set(const char *name);
+static void       st_collections_group_parts_part_description_rel2_to(void);
+static void       st_collections_group_parts_part_description_rel2_to_x(void);
+static void       st_collections_group_parts_part_description_rel2_to_y(void);
+static void       st_collections_group_parts_part_description_anchors_top(void);
+static void       st_collections_group_parts_part_description_anchors_bottom(void);
+static void       st_collections_group_parts_part_description_anchors_left(void);
+static void       st_collections_group_parts_part_description_anchors_right(void);
+static void       st_collections_group_parts_part_description_anchors_vertical_center(void);
+static void       st_collections_group_parts_part_description_anchors_horizontal_center(void);
+static void       st_collections_group_parts_part_description_anchors_fill(void);
+static void       st_collections_group_parts_part_description_anchors_margin(void);
+static void       st_collections_group_parts_part_description_clip_to_id(void);
+static void       st_collections_group_parts_part_description_size_class(void);
+static void       st_collections_group_parts_part_description_image_normal(void);
+static void       st_collections_group_parts_part_description_image_tween(void);
+static void       st_collections_group_parts_part_description_image_border(void);
+static void       st_collections_group_parts_part_description_image_middle(void);
+static void       st_collections_group_parts_part_description_image_border_scale(void);
+static void       st_collections_group_parts_part_description_image_border_scale_by(void);
+static void       st_collections_group_parts_part_description_image_scale_hint(void);
+static void       st_collections_group_parts_part_description_fill_smooth(void);
+static void       st_collections_group_parts_part_description_fill_origin_relative(void);
+static void       st_collections_group_parts_part_description_fill_origin_offset(void);
+static void       st_collections_group_parts_part_description_fill_size_relative(void);
+static void       st_collections_group_parts_part_description_fill_size_offset(void);
+static void       st_collections_group_parts_part_description_fill_type(void);
+static void       st_collections_group_parts_part_description_color_class(void);
+static void       st_collections_group_parts_part_description_color(void);
+static void       st_collections_group_parts_part_description_color2(void);
+static void       st_collections_group_parts_part_description_color3(void);
+static void       st_collections_group_parts_part_description_text_text(void);
+static void       st_collections_group_parts_part_description_text_domain(void);
+static void       st_collections_group_parts_part_description_text_text_class(void);
+static void       st_collections_group_parts_part_description_text_font(void);
+static void       st_collections_group_parts_part_description_text_style(void);
+static void       st_collections_group_parts_part_description_text_repch(void);
+static void       st_collections_group_parts_part_description_text_size(void);
+static void       st_collections_group_parts_part_description_text_size_range(void);
+static void       st_collections_group_parts_part_description_text_fit(void);
+static void       st_collections_group_parts_part_description_text_min(void);
+static void       st_collections_group_parts_part_description_text_max(void);
+static void       st_collections_group_parts_part_description_text_align(void);
+static void       st_collections_group_parts_part_description_text_source(void);
+static void       st_collections_group_parts_part_description_text_text_source(void);
+static void       st_collections_group_parts_part_description_text_ellipsis(void);
+static void       st_collections_group_parts_part_description_box_layout(void);
+static void       st_collections_group_parts_part_description_box_align(void);
+static void       st_collections_group_parts_part_description_box_padding(void);
+static void       st_collections_group_parts_part_description_box_min(void);
+static void       st_collections_group_parts_part_description_table_homogeneous(void);
+static void       st_collections_group_parts_part_description_table_align(void);
+static void       st_collections_group_parts_part_description_table_padding(void);
+static void       st_collections_group_parts_part_description_table_min(void);
+static void       st_collections_group_parts_part_description_proxy_source_visible(void);
+static void       st_collections_group_parts_part_description_proxy_source_clip(void);
+static void       st_collections_group_parts_part_description_position_point(void);
+static void       st_collections_group_parts_part_description_position_space(void);
+static void       st_collections_group_parts_part_description_camera_properties(void);
+static void       st_collections_group_parts_part_description_properties_ambient(void);
+static void       st_collections_group_parts_part_description_properties_diffuse(void);
+static void       st_collections_group_parts_part_description_properties_specular(void);
+static void       st_collections_group_parts_part_description_properties_material(void);
+static void       st_collections_group_parts_part_description_properties_normal(void);
+static void       st_collections_group_parts_part_description_properties_shininess(void);
+static void       st_collections_group_parts_part_description_properties_shade(void);
+static void       st_collections_group_parts_part_description_orientation_angle_axis(void);
+static void       st_collections_group_parts_part_description_orientation_look1(void);
+static void       st_collections_group_parts_part_description_orientation_look2(void);
+static void       st_collections_group_parts_part_description_orientation_look_to(void);
+static void       st_collections_group_parts_part_description_orientation_angle_axis(void);
+static void       st_collections_group_parts_part_description_orientation_quaternion(void);
+static void       st_collections_group_parts_part_description_scale(void);
+static void       st_collections_group_parts_part_description_offset_scale(void);
+static void       st_collections_group_parts_part_description_mesh_primitive(void);
+static void       ob_collections_group_parts_part_description_texture(void);
+static void       st_collections_group_parts_part_description_texture_image(void);
+static void       st_collections_group_parts_part_description_texture_wrap1(void);
+static void       st_collections_group_parts_part_description_texture_wrap2(void);
+static void       st_collections_group_parts_part_description_texture_filter1(void);
+static void       st_collections_group_parts_part_description_texture_filter2(void);
+static void       st_collections_group_parts_part_description_mesh_assembly(void);
+static void       st_collections_group_parts_part_description_mesh_geometry(void);
+static void       st_collections_group_parts_part_description_mesh_frame(void);
+static void       st_collections_group_parts_part_description_filter_code(void);
+static void       st_collections_group_parts_part_description_filter_source(void);
+static void       st_collections_group_parts_part_description_filter_data(void);
 
 #ifdef HAVE_EPHYSICS
-static void st_collections_group_parts_part_description_physics_mass(void);
-static void st_collections_group_parts_part_description_physics_restitution(void);
-static void st_collections_group_parts_part_description_physics_friction(void);
-static void st_collections_group_parts_part_description_physics_damping(void);
-static void st_collections_group_parts_part_description_physics_sleep(void);
-static void st_collections_group_parts_part_description_physics_material(void);
-static void st_collections_group_parts_part_description_physics_density(void);
-static void st_collections_group_parts_part_description_physics_hardness(void);
-static void st_collections_group_parts_part_description_physics_ignore_part_pos(void);
-static void st_collections_group_parts_part_description_physics_light_on(void);
-static void st_collections_group_parts_part_description_physics_z(void);
-static void st_collections_group_parts_part_description_physics_depth(void);
-static void st_collections_group_parts_part_description_physics_movement_freedom_linear(void);
-static void st_collections_group_parts_part_description_physics_movement_freedom_angular(void);
-static void st_collections_group_parts_part_description_physics_backface_cull(void);
-static void st_collections_group_parts_part_description_physics_face(void);
-static void st_collections_group_parts_part_description_physics_face_type(void);
-static void st_collections_group_parts_part_description_physics_face_source(void);
+static void       st_collections_group_parts_part_description_physics_mass(void);
+static void       st_collections_group_parts_part_description_physics_restitution(void);
+static void       st_collections_group_parts_part_description_physics_friction(void);
+static void       st_collections_group_parts_part_description_physics_damping(void);
+static void       st_collections_group_parts_part_description_physics_sleep(void);
+static void       st_collections_group_parts_part_description_physics_material(void);
+static void       st_collections_group_parts_part_description_physics_density(void);
+static void       st_collections_group_parts_part_description_physics_hardness(void);
+static void       st_collections_group_parts_part_description_physics_ignore_part_pos(void);
+static void       st_collections_group_parts_part_description_physics_light_on(void);
+static void       st_collections_group_parts_part_description_physics_z(void);
+static void       st_collections_group_parts_part_description_physics_depth(void);
+static void       st_collections_group_parts_part_description_physics_movement_freedom_linear(void);
+static void       st_collections_group_parts_part_description_physics_movement_freedom_angular(void);
+static void       st_collections_group_parts_part_description_physics_backface_cull(void);
+static void       st_collections_group_parts_part_description_physics_face(void);
+static void       st_collections_group_parts_part_description_physics_face_type(void);
+static void       st_collections_group_parts_part_description_physics_face_source(void);
 #endif
-static void st_collections_group_parts_part_description_map_perspective(void);
-static void st_collections_group_parts_part_description_map_light(void);
-static void st_collections_group_parts_part_description_map_rotation_center(void);
-static void st_collections_group_parts_part_description_map_rotation_x(void);
-static void st_collections_group_parts_part_description_map_rotation_y(void);
-static void st_collections_group_parts_part_description_map_rotation_z(void);
-static void st_collections_group_parts_part_description_map_on(void);
-static void st_collections_group_parts_part_description_map_smooth(void);
-static void st_collections_group_parts_part_description_map_alpha(void);
-static void st_collections_group_parts_part_description_map_backface_cull(void);
-static void st_collections_group_parts_part_description_map_perspective_on(void);
-static void st_collections_group_parts_part_description_map_color(void);
-static void st_collections_group_parts_part_description_map_zoom_x(void);
-static void st_collections_group_parts_part_description_map_zoom_y(void);
-static void st_collections_group_parts_part_description_perspective_zplane(void);
-static void st_collections_group_parts_part_description_perspective_focal(void);
-static void st_collections_group_parts_part_api(void);
+static void       st_collections_group_parts_part_description_map_perspective(void);
+static void       st_collections_group_parts_part_description_map_light(void);
+static void       st_collections_group_parts_part_description_map_rotation_center(void);
+static void       st_collections_group_parts_part_description_map_rotation_x(void);
+static void       st_collections_group_parts_part_description_map_rotation_y(void);
+static void       st_collections_group_parts_part_description_map_rotation_z(void);
+static void       st_collections_group_parts_part_description_map_on(void);
+static void       st_collections_group_parts_part_description_map_smooth(void);
+static void       st_collections_group_parts_part_description_map_alpha(void);
+static void       st_collections_group_parts_part_description_map_backface_cull(void);
+static void       st_collections_group_parts_part_description_map_perspective_on(void);
+static void       st_collections_group_parts_part_description_map_color(void);
+static void       st_collections_group_parts_part_description_map_zoom_x(void);
+static void       st_collections_group_parts_part_description_map_zoom_y(void);
+static void       st_collections_group_parts_part_description_perspective_zplane(void);
+static void       st_collections_group_parts_part_description_perspective_focal(void);
+static void       st_collections_group_parts_part_api(void);
 
 /* external part parameters */
-static void st_collections_group_parts_part_description_params_int(void);
-static void st_collections_group_parts_part_description_params_double(void);
-static void st_collections_group_parts_part_description_params_string(void);
-static void st_collections_group_parts_part_description_params_bool(void);
-static void st_collections_group_parts_part_description_params_choice(void);
-static void st_collections_group_parts_part_description_params_smart(void);
-
-static void ob_collections_group_programs_program(void);
-static void st_collections_group_programs_program_name(void);
-static void st_collections_group_programs_program_signal(void);
-static void st_collections_group_programs_program_source(void);
-static void st_collections_group_programs_program_filter(void);
-static void st_collections_group_programs_program_in(void);
-static void st_collections_group_programs_program_action(void);
-static void st_collections_group_programs_program_transition(void);
-static void st_collections_group_programs_program_target(void);
-static void st_collections_group_programs_program_targets(void);
-static void st_collections_group_programs_program_target_groups(void);
-static void st_collections_group_programs_program_after(void);
-static void st_collections_group_programs_program_api(void);
-static void st_collections_group_target_group(void);
-
-static void ob_collections_group_programs_program_sequence(void);
-
-static void ob_collections_group_programs_program_script(void);
-static void st_collections_group_sound_sample_name(void);
-static void st_collections_group_sound_sample_source(void);
-static void st_collections_group_sound_tone(void);
-static void st_collections_group_vibration_sample_name(void);
-static void st_collections_group_vibration_sample_source(void);
-
-static void st_collections_group_translation_file_locale(void);
-static void st_collections_group_translation_file_source(void);
+static void       st_collections_group_parts_part_description_params_int(void);
+static void       st_collections_group_parts_part_description_params_double(void);
+static void       st_collections_group_parts_part_description_params_string(void);
+static void       st_collections_group_parts_part_description_params_bool(void);
+static void       st_collections_group_parts_part_description_params_choice(void);
+static void       st_collections_group_parts_part_description_params_smart(void);
+
+static void       ob_collections_group_programs_program(void);
+static void       st_collections_group_programs_program_name(void);
+static void       st_collections_group_programs_program_signal(void);
+static void       st_collections_group_programs_program_source(void);
+static void       st_collections_group_programs_program_filter(void);
+static void       st_collections_group_programs_program_in(void);
+static void       st_collections_group_programs_program_action(void);
+static void       st_collections_group_programs_program_transition(void);
+static void       st_collections_group_programs_program_target(void);
+static void       st_collections_group_programs_program_targets(void);
+static void       st_collections_group_programs_program_target_groups(void);
+static void       st_collections_group_programs_program_after(void);
+static void       st_collections_group_programs_program_api(void);
+static void       st_collections_group_target_group(void);
+
+static void       ob_collections_group_programs_program_sequence(void);
+
+static void       ob_collections_group_programs_program_script(void);
+static void       st_collections_group_sound_sample_name(void);
+static void       st_collections_group_sound_sample_source(void);
+static void       st_collections_group_sound_tone(void);
+static void       st_collections_group_vibration_sample_name(void);
+static void       st_collections_group_vibration_sample_source(void);
+
+static void       st_collections_group_translation_file_locale(void);
+static void       st_collections_group_translation_file_source(void);
 #ifdef HAVE_EPHYSICS
-static void st_collections_group_physics_world_gravity(void);
-static void st_collections_group_physics_world_rate(void);
-static void st_collections_group_physics_world_z(void);
-static void st_collections_group_physics_world_depth(void);
+static void       st_collections_group_physics_world_gravity(void);
+static void       st_collections_group_physics_world_rate(void);
+static void       st_collections_group_physics_world_z(void);
+static void       st_collections_group_physics_world_depth(void);
 #endif
 
 /* short */
-static void st_collections_group_parts_part_noscale(void);
-static void st_collections_group_parts_part_precise(void);
-static void st_collections_group_parts_part_noprecise(void);
-static void st_collections_group_parts_part_mouse(void);
-static void st_collections_group_parts_part_nomouse(void);
-static void st_collections_group_parts_part_repeat(void);
-static void st_collections_group_parts_part_norepeat(void);
-static void st_collections_group_parts_part_description_vis(void);
-static void st_collections_group_parts_part_description_hid(void);
-static void ob_collections_group_parts_part_short(void);
-
-static void st_collections_group_mouse(void);
-static void st_collections_group_nomouse(void);
-static void st_collections_group_broadcast(void);
-static void st_collections_group_nobroadcast(void);
-static void st_collections_group_noinherit_script(void);
-
-static void st_images_vector(void);
-static void _handle_vector_image(void);
+static void       st_collections_group_parts_part_noscale(void);
+static void       st_collections_group_parts_part_precise(void);
+static void       st_collections_group_parts_part_noprecise(void);
+static void       st_collections_group_parts_part_mouse(void);
+static void       st_collections_group_parts_part_nomouse(void);
+static void       st_collections_group_parts_part_repeat(void);
+static void       st_collections_group_parts_part_norepeat(void);
+static void       st_collections_group_parts_part_description_vis(void);
+static void       st_collections_group_parts_part_description_hid(void);
+static void       ob_collections_group_parts_part_short(void);
+
+static void       st_collections_group_mouse(void);
+static void       st_collections_group_nomouse(void);
+static void       st_collections_group_broadcast(void);
+static void       st_collections_group_nobroadcast(void);
+static void       st_collections_group_noinherit_script(void);
+
+static void       st_images_vector(void);
+static void       _handle_vector_image(void);
 
 /*****/
 
 #define STRDUP(x) eina_strdup(x)
 
-#define IMAGE_STATEMENTS(PREFIX) \
-     {PREFIX"images.image", st_images_image}, \
-     {PREFIX"images.vector", st_images_vector}, \
-     {PREFIX"images.set.name", st_images_set_name}, \
-     {PREFIX"images.set.image.image", st_images_set_image_image}, \
-     {PREFIX"images.set.image.size", st_images_set_image_size}, \
-     {PREFIX"images.set.image.border", st_images_set_image_border}, \
-     {PREFIX"images.set.image.scale_by", st_images_set_image_border_scale_by},
-
-#define IMAGE_SET_STATEMENTS(PREFIX) \
-     {PREFIX".image", st_images_image}, /* dup */ \
-     {PREFIX".set.name", st_images_set_name}, /* dup */ \
-     {PREFIX".set.image.image", st_images_set_image_image}, /* dup */ \
-     {PREFIX".set.image.size", st_images_set_image_size}, /* dup */ \
-     {PREFIX".set.image.border", st_images_set_image_border}, /* dup */ \
-     {PREFIX".set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
-
-#define FONT_STYLE_CC_STATEMENTS(PREFIX) \
-     {PREFIX"fonts.font", st_fonts_font}, /* dup */ \
-     {PREFIX"styles.style.name", st_styles_style_name}, /* dup */ \
-     {PREFIX"styles.style.base", st_styles_style_base}, /* dup */ \
-     {PREFIX"styles.style.tag", st_styles_style_tag}, /* dup */ \
-     {PREFIX"color_classes.color_class.name", st_color_class_name}, /* dup */ \
-     {PREFIX"color_classes.color_class.color", st_color_class_color}, /* dup */ \
-     {PREFIX"color_classes.color_class.color2", st_color_class_color2}, /* dup */ \
-     {PREFIX"color_classes.color_class.color3", st_color_class_color3}, /* dup */ \
-     {PREFIX"color_classes.color_class.description", st_color_class_desc}, /* dup */ \
-     {PREFIX"color_classes.color_class.desc", st_color_class_desc}, /* dup */
-
-#define TEXT_CLASS_STATEMENTS(PREFIX) \
-     {PREFIX"text_classes.text_class.name", st_text_class_name}, /* dup */ \
-     {PREFIX"text_classes.text_class.font", st_text_class_font}, /* dup */ \
-     {PREFIX"text_classes.text_class.size", st_text_class_size}, /* dup */
-
-#define SIZE_CLASS_STATEMENTS(PREFIX) \
-     {PREFIX"size_classes.size_class.name", st_size_class_name}, /* dup */ \
-     {PREFIX"size_classes.size_class.min", st_size_class_min}, /* dup */ \
-     {PREFIX"size_classes.size_class.max", st_size_class_max}, /* dup */
-
-#define PROGRAM_SEQUENCE(PREFIX, NAME, FN) \
-     {PREFIX".program."NAME, FN}, /* dup */ \
-     {PREFIX".program.sequence."NAME, FN}, /* dup */
-
-
-#define PROGRAM_BASE(PREFIX) \
-     PROGRAM_SEQUENCE(PREFIX, "name", st_collections_group_programs_program_name) \
-     PROGRAM_SEQUENCE(PREFIX, "signal", st_collections_group_programs_program_signal) \
-     PROGRAM_SEQUENCE(PREFIX, "source", st_collections_group_programs_program_source) \
-     PROGRAM_SEQUENCE(PREFIX, "in", st_collections_group_programs_program_in) \
-     PROGRAM_SEQUENCE(PREFIX, "action", st_collections_group_programs_program_action) \
-     PROGRAM_SEQUENCE(PREFIX, "transition", st_collections_group_programs_program_transition) \
-     PROGRAM_SEQUENCE(PREFIX, "target", st_collections_group_programs_program_target) \
-     PROGRAM_SEQUENCE(PREFIX, "target_groups", st_collections_group_programs_program_target_groups) \
-     PROGRAM_SEQUENCE(PREFIX, "groups", st_collections_group_programs_program_target_groups) \
-     PROGRAM_SEQUENCE(PREFIX, "targets", st_collections_group_programs_program_targets) \
-     PROGRAM_SEQUENCE(PREFIX, "after", st_collections_group_programs_program_after) \
-     PROGRAM_SEQUENCE(PREFIX, "api", st_collections_group_programs_program_api) \
-     PROGRAM_SEQUENCE(PREFIX, "filter", st_collections_group_programs_program_filter)
-
-#define PROGRAM_STATEMENTS(PREFIX) \
-     IMAGE_SET_STATEMENTS(PREFIX".programs") \
-     IMAGE_STATEMENTS(PREFIX".programs.") \
-     IMAGE_SET_STATEMENTS(PREFIX".programs") \
-     {PREFIX".programs.font", st_fonts_font}, /* dup */ \
-     {PREFIX".programs.fonts.font", st_fonts_font}, /* dup */ \
-     PROGRAM_BASE(PREFIX) \
-     PROGRAM_BASE(PREFIX".programs")
-
-#define SET_LOOK1(Type, type_node)                                              \
-    Edje_Part_Description_##Type *ed;                                           \
-   ed = (Edje_Part_Description_##Type*) current_desc;                           \
-                                                                                \
-   if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT) \
-     {                                                                          \
-        ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(0));        \
-        ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(1));        \
-        ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(2));        \
-        ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT; \
-     }
-
-#define SET_LOOK2(Type, type_node)                                              \
-    Edje_Part_Description_##Type *ed;                                           \
-   ed = (Edje_Part_Description_##Type*) current_desc;                           \
-                                                                                \
-   if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT) \
-     {                                                                          \
-        ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(0));        \
-        ed->type_node.orientation.data[4] = FROM_DOUBLE(parse_float(1));        \
-        ed->type_node.orientation.data[5] = FROM_DOUBLE(parse_float(2));        \
-        ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT; \
-     }
+#define IMAGE_STATEMENTS(PREFIX)                                  \
+  {PREFIX "images.image", st_images_image},                       \
+  {PREFIX "images.vector", st_images_vector},                     \
+  {PREFIX "images.set.name", st_images_set_name},                 \
+  {PREFIX "images.set.image.image", st_images_set_image_image},   \
+  {PREFIX "images.set.image.size", st_images_set_image_size},     \
+  {PREFIX "images.set.image.border", st_images_set_image_border}, \
+  {PREFIX "images.set.image.scale_by", st_images_set_image_border_scale_by},
+
+#define IMAGE_SET_STATEMENTS(PREFIX)                                    \
+  {PREFIX ".image", st_images_image},   /* dup */                       \
+  {PREFIX ".set.name", st_images_set_name},   /* dup */                 \
+  {PREFIX ".set.image.image", st_images_set_image_image},   /* dup */   \
+  {PREFIX ".set.image.size", st_images_set_image_size},   /* dup */     \
+  {PREFIX ".set.image.border", st_images_set_image_border},   /* dup */ \
+  {PREFIX ".set.image.scale_by", st_images_set_image_border_scale_by},   /* dup */
+
+#define FONT_STYLE_CC_STATEMENTS(PREFIX)                                             \
+  {PREFIX "fonts.font", st_fonts_font},   /* dup */                                  \
+  {PREFIX "styles.style.name", st_styles_style_name},   /* dup */                    \
+  {PREFIX "styles.style.base", st_styles_style_base},   /* dup */                    \
+  {PREFIX "styles.style.tag", st_styles_style_tag},   /* dup */                      \
+  {PREFIX "color_classes.color_class.name", st_color_class_name},   /* dup */        \
+  {PREFIX "color_classes.color_class.color", st_color_class_color},   /* dup */      \
+  {PREFIX "color_classes.color_class.color2", st_color_class_color2},   /* dup */    \
+  {PREFIX "color_classes.color_class.color3", st_color_class_color3},   /* dup */    \
+  {PREFIX "color_classes.color_class.description", st_color_class_desc},   /* dup */ \
+  {PREFIX "color_classes.color_class.desc", st_color_class_desc},   /* dup */
+
+#define TEXT_CLASS_STATEMENTS(PREFIX)                                      \
+  {PREFIX "text_classes.text_class.name", st_text_class_name},   /* dup */ \
+  {PREFIX "text_classes.text_class.font", st_text_class_font},   /* dup */ \
+  {PREFIX "text_classes.text_class.size", st_text_class_size},   /* dup */
+
+#define SIZE_CLASS_STATEMENTS(PREFIX)                                      \
+  {PREFIX "size_classes.size_class.name", st_size_class_name},   /* dup */ \
+  {PREFIX "size_classes.size_class.min", st_size_class_min},   /* dup */   \
+  {PREFIX "size_classes.size_class.max", st_size_class_max},   /* dup */
+
+#define PROGRAM_SEQUENCE(PREFIX, NAME, FN)  \
+  {PREFIX ".program."NAME, FN},   /* dup */ \
+  {PREFIX ".program.sequence."NAME, FN},   /* dup */
+
+#define PROGRAM_BASE(PREFIX)                                                                     \
+  PROGRAM_SEQUENCE(PREFIX, "name", st_collections_group_programs_program_name)                   \
+  PROGRAM_SEQUENCE(PREFIX, "signal", st_collections_group_programs_program_signal)               \
+  PROGRAM_SEQUENCE(PREFIX, "source", st_collections_group_programs_program_source)               \
+  PROGRAM_SEQUENCE(PREFIX, "in", st_collections_group_programs_program_in)                       \
+  PROGRAM_SEQUENCE(PREFIX, "action", st_collections_group_programs_program_action)               \
+  PROGRAM_SEQUENCE(PREFIX, "transition", st_collections_group_programs_program_transition)       \
+  PROGRAM_SEQUENCE(PREFIX, "target", st_collections_group_programs_program_target)               \
+  PROGRAM_SEQUENCE(PREFIX, "target_groups", st_collections_group_programs_program_target_groups) \
+  PROGRAM_SEQUENCE(PREFIX, "groups", st_collections_group_programs_program_target_groups)        \
+  PROGRAM_SEQUENCE(PREFIX, "targets", st_collections_group_programs_program_targets)             \
+  PROGRAM_SEQUENCE(PREFIX, "after", st_collections_group_programs_program_after)                 \
+  PROGRAM_SEQUENCE(PREFIX, "api", st_collections_group_programs_program_api)                     \
+  PROGRAM_SEQUENCE(PREFIX, "filter", st_collections_group_programs_program_filter)
+
+#define PROGRAM_STATEMENTS(PREFIX)                            \
+  IMAGE_SET_STATEMENTS(PREFIX ".programs")                    \
+  IMAGE_STATEMENTS(PREFIX ".programs.")                       \
+  IMAGE_SET_STATEMENTS(PREFIX ".programs")                    \
+  {PREFIX ".programs.font", st_fonts_font},   /* dup */       \
+  {PREFIX ".programs.fonts.font", st_fonts_font},   /* dup */ \
+  PROGRAM_BASE(PREFIX)                                        \
+  PROGRAM_BASE(PREFIX ".programs")
+
+#define SET_LOOK1(Type, type_node)                                                   \
+  Edje_Part_Description_##Type * ed;                                                 \
+  ed = (Edje_Part_Description_##Type *)current_desc;                                 \
+                                                                                     \
+  if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT) \
+    {                                                                                \
+       ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(0));              \
+       ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(1));              \
+       ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(2));              \
+       ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT; \
+    }
+
+#define SET_LOOK2(Type, type_node)                                                   \
+  Edje_Part_Description_##Type * ed;                                                 \
+  ed = (Edje_Part_Description_##Type *)current_desc;                                 \
+                                                                                     \
+  if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT) \
+    {                                                                                \
+       ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(0));              \
+       ed->type_node.orientation.data[4] = FROM_DOUBLE(parse_float(1));              \
+       ed->type_node.orientation.data[5] = FROM_DOUBLE(parse_float(2));              \
+       ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_AT; \
+    }
 
 #define SET_LOOK_TO(list, Type, type_node)                                           \
-   Edje_Part_Description_##Type *ed;                                                 \
-   char *name;                                                                       \
+  Edje_Part_Description_##Type * ed;                                                 \
+  char *name;                                                                        \
                                                                                      \
-   ed = (Edje_Part_Description_##Type*) current_desc;                                \
+  ed = (Edje_Part_Description_##Type *)current_desc;                                 \
                                                                                      \
-   if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_TO)      \
-     {                                                                               \
-        name = parse_str(0);                                                         \
-        data_queue_part_lookup(list, name, &(ed->type_node.orientation.look_to));    \
-        free(name);                                                                  \
-        ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_TO;      \
-     }
-
-#define SET_ANGLE_AXIS(Type, type_node)                                            \
-    Edje_Part_Description_##Type *ed;                                              \
-   ed = (Edje_Part_Description_##Type*) current_desc;                              \
-                                                                                   \
-   if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_ANGLE_AXIS) \
-     {                                                                             \
-        ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(0));           \
-        ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(1));           \
-        ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(2));           \
-        ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(3));           \
-        ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_ANGLE_AXIS; \
-     }
-
-#define SET_QUATERNION(Type, type_node)                                            \
-    Edje_Part_Description_##Type *ed;                                              \
-   ed = (Edje_Part_Description_##Type*) current_desc;                              \
-                                                                                   \
-   if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_QUATERNION) \
-     {                                                                             \
-        ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(0));           \
-        ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(1));           \
-        ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(2));           \
-        ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(3));           \
-        ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_QUATERNION; \
-     }
-
-#define FILTERS_STATEMENTS(PREFIX) \
-     {PREFIX"filters.filter.file", st_filters_filter_file}, \
-     {PREFIX"filters.filter.name", st_filters_filter_name},
+  if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_TO) \
+    {                                                                                \
+       name = parse_str(0);                                                          \
+       data_queue_part_lookup(list, name, &(ed->type_node.orientation.look_to));     \
+       free(name);                                                                   \
+       ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_LOOK_TO; \
+    }
+
+#define SET_ANGLE_AXIS(Type, type_node)                                                 \
+  Edje_Part_Description_##Type * ed;                                                    \
+  ed = (Edje_Part_Description_##Type *)current_desc;                                    \
+                                                                                        \
+  if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_ANGLE_AXIS) \
+    {                                                                                   \
+       ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(0));                 \
+       ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(1));                 \
+       ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(2));                 \
+       ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(3));                 \
+       ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_ANGLE_AXIS; \
+    }
+
+#define SET_QUATERNION(Type, type_node)                                                 \
+  Edje_Part_Description_##Type * ed;                                                    \
+  ed = (Edje_Part_Description_##Type *)current_desc;                                    \
+                                                                                        \
+  if (ed->type_node.orientation.type <= EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_QUATERNION) \
+    {                                                                                   \
+       ed->type_node.orientation.data[1] = FROM_DOUBLE(parse_float(0));                 \
+       ed->type_node.orientation.data[2] = FROM_DOUBLE(parse_float(1));                 \
+       ed->type_node.orientation.data[3] = FROM_DOUBLE(parse_float(2));                 \
+       ed->type_node.orientation.data[0] = FROM_DOUBLE(parse_float(3));                 \
+       ed->type_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_QUATERNION; \
+    }
+
+#define FILTERS_STATEMENTS(PREFIX)                        \
+  {PREFIX "filters.filter.file", st_filters_filter_file}, \
+  {PREFIX "filters.filter.name", st_filters_filter_name},
 
 New_Statement_Handler statement_handlers[] =
 {
-     {"efl_version", st_efl_version},
-     {"externals.external", st_externals_external},
-     IMAGE_STATEMENTS("")
-     FONT_STYLE_CC_STATEMENTS("")
-     TEXT_CLASS_STATEMENTS("")
-     SIZE_CLASS_STATEMENTS("")
-     {"data.item", st_data_item},
-     {"data.file", st_data_file},
-     FILTERS_STATEMENTS("")
-     {"collections.externals.external", st_externals_external}, /* dup */
-     IMAGE_STATEMENTS("collections.")
-     IMAGE_SET_STATEMENTS("collections")
-     {"collections.font", st_fonts_font}, /* dup */
-     FONT_STYLE_CC_STATEMENTS("collections.")
-     TEXT_CLASS_STATEMENTS("collections.")
-     SIZE_CLASS_STATEMENTS("collections.")
-     {"collections.base_scale", st_collections_base_scale},
-     {"collections.translation.file.locale", st_collections_group_translation_file_locale},
-     {"collections.translation.file.source", st_collections_group_translation_file_source},
-     {"collections.group.translation.file.locale", st_collections_group_translation_file_locale},
-     {"collections.group.translation.file.source", st_collections_group_translation_file_source},
-
-     {"collections.sounds.sample.name", st_collections_group_sound_sample_name},
-     {"collections.sounds.sample.source", st_collections_group_sound_sample_source},
-     {"collections.group.sounds.sample.name", st_collections_group_sound_sample_name}, /* dup */
-     {"collections.group.sounds.sample.source", st_collections_group_sound_sample_source}, /* dup */
-     {"collections.sounds.tone", st_collections_group_sound_tone},
-     {"collections.group.sounds.tone", st_collections_group_sound_tone}, /* dup */
-     {"collections.vibrations.sample.name", st_collections_group_vibration_sample_name},
-     {"collections.vibrations.sample.source", st_collections_group_vibration_sample_source},
-     FILTERS_STATEMENTS("collections.") /* dup */
-     {"collections.group.vibrations.sample.name", st_collections_group_vibration_sample_name}, /* dup */
-     {"collections.group.vibrations.sample.source", st_collections_group_vibration_sample_source}, /* dup */
-     {"collections.group.name", st_collections_group_name},
-     {"collections.group.program_source", st_collections_group_program_source},
-     {"collections.group.inherit", st_collections_group_inherit},
-     {"collections.group.inherit_only", st_collections_group_inherit_only},
-     {"collections.group.use_custom_seat_names", st_collections_group_use_custom_seat_names},
-     {"collections.group.target_group", st_collections_group_target_group}, /* dup */
-     {"collections.group.part_remove", st_collections_group_part_remove},
-     {"collections.group.program_remove", st_collections_group_program_remove},
-     {"collections.group.lua_script_only", st_collections_group_lua_script_only},
-     {"collections.group.script_recursion", st_collections_group_script_recursion},
-     {"collections.group.alias", st_collections_group_alias},
-     {"collections.group.min", st_collections_group_min},
-     {"collections.group.max", st_collections_group_max},
-     {"collections.group.scene_size", st_collections_group_scene_size},
-     {"collections.group.broadcast_signal", st_collections_group_broadcast_signal},
-     {"collections.group.orientation", st_collections_group_orientation},
-     {"collections.group.mouse_events", st_collections_group_mouse_events},
-     {"collections.group.inherit_script", st_collections_group_inherit_script},
-     {"collections.group.data.item", st_collections_group_data_item},
-     {"collections.group.limits.horizontal", st_collections_group_limits_horizontal},
-     {"collections.group.limits.vertical", st_collections_group_limits_vertical},
-     {"collections.group.externals.external", st_externals_external}, /* dup */
-     {"collections.group.programs.target_group", st_collections_group_target_group}, /* dup */
-     IMAGE_SET_STATEMENTS("collections.group")
-     IMAGE_STATEMENTS("collections.group.")
-     {"collections.group.models.model", st_models_model},
-     {"collections.group.font", st_fonts_font}, /* dup */
-     FONT_STYLE_CC_STATEMENTS("collections.group.")
-     TEXT_CLASS_STATEMENTS("collections.group.")
-     SIZE_CLASS_STATEMENTS("collections.group.")
-     {"collections.group.parts.alias", st_collections_group_parts_alias },
-     IMAGE_SET_STATEMENTS("collections.group.parts")
-     IMAGE_STATEMENTS("collections.group.parts.")
-     {"collections.group.parts.font", st_fonts_font}, /* dup */
-     FONT_STYLE_CC_STATEMENTS("collections.group.parts.")
-     TEXT_CLASS_STATEMENTS("collections.group.parts.")
-     SIZE_CLASS_STATEMENTS("collections.group.parts.")
-     {"collections.group.parts.target_group", st_collections_group_target_group}, /* dup */
-     {"collections.group.parts.part.name", st_collections_group_parts_part_name},
-     {"collections.group.parts.part.target_group", st_collections_group_target_group}, /* dup */
-     {"collections.group.parts.part.inherit", st_collections_group_parts_part_inherit},
-     {"collections.group.parts.part.api", st_collections_group_parts_part_api},
-     {"collections.group.parts.part.type", st_collections_group_parts_part_type},
+   {"efl_version", st_efl_version},
+   {"externals.external", st_externals_external},
+   IMAGE_STATEMENTS("")
+   FONT_STYLE_CC_STATEMENTS("")
+   TEXT_CLASS_STATEMENTS("")
+   SIZE_CLASS_STATEMENTS("")
+   {
+      "data.item", st_data_item
+   },
+   {"data.file", st_data_file},
+   FILTERS_STATEMENTS("")
+   {
+      "collections.externals.external", st_externals_external
+   },                                                           /* dup */
+   IMAGE_STATEMENTS("collections.")
+   IMAGE_SET_STATEMENTS("collections")
+   {
+      "collections.font", st_fonts_font
+   },                                     /* dup */
+   FONT_STYLE_CC_STATEMENTS("collections.")
+   TEXT_CLASS_STATEMENTS("collections.")
+   SIZE_CLASS_STATEMENTS("collections.")
+   {
+      "collections.base_scale", st_collections_base_scale
+   },
+   {"collections.translation.file.locale", st_collections_group_translation_file_locale},
+   {"collections.translation.file.source", st_collections_group_translation_file_source},
+   {"collections.group.translation.file.locale", st_collections_group_translation_file_locale},
+   {"collections.group.translation.file.source", st_collections_group_translation_file_source},
+
+   {"collections.sounds.sample.name", st_collections_group_sound_sample_name},
+   {"collections.sounds.sample.source", st_collections_group_sound_sample_source},
+   {"collections.group.sounds.sample.name", st_collections_group_sound_sample_name},   /* dup */
+   {"collections.group.sounds.sample.source", st_collections_group_sound_sample_source},   /* dup */
+   {"collections.sounds.tone", st_collections_group_sound_tone},
+   {"collections.group.sounds.tone", st_collections_group_sound_tone},   /* dup */
+   {"collections.vibrations.sample.name", st_collections_group_vibration_sample_name},
+   {"collections.vibrations.sample.source", st_collections_group_vibration_sample_source},
+   FILTERS_STATEMENTS("collections.")   /* dup */
+   {
+      "collections.group.vibrations.sample.name", st_collections_group_vibration_sample_name
+   },                                                                                          /* dup */
+   {"collections.group.vibrations.sample.source", st_collections_group_vibration_sample_source},   /* dup */
+   {"collections.group.name", st_collections_group_name},
+   {"collections.group.program_source", st_collections_group_program_source},
+   {"collections.group.inherit", st_collections_group_inherit},
+   {"collections.group.inherit_only", st_collections_group_inherit_only},
+   {"collections.group.use_custom_seat_names", st_collections_group_use_custom_seat_names},
+   {"collections.group.target_group", st_collections_group_target_group},   /* dup */
+   {"collections.group.part_remove", st_collections_group_part_remove},
+   {"collections.group.program_remove", st_collections_group_program_remove},
+   {"collections.group.lua_script_only", st_collections_group_lua_script_only},
+   {"collections.group.script_recursion", st_collections_group_script_recursion},
+   {"collections.group.alias", st_collections_group_alias},
+   {"collections.group.min", st_collections_group_min},
+   {"collections.group.max", st_collections_group_max},
+   {"collections.group.scene_size", st_collections_group_scene_size},
+   {"collections.group.broadcast_signal", st_collections_group_broadcast_signal},
+   {"collections.group.orientation", st_collections_group_orientation},
+   {"collections.group.mouse_events", st_collections_group_mouse_events},
+   {"collections.group.inherit_script", st_collections_group_inherit_script},
+   {"collections.group.data.item", st_collections_group_data_item},
+   {"collections.group.limits.horizontal", st_collections_group_limits_horizontal},
+   {"collections.group.limits.vertical", st_collections_group_limits_vertical},
+   {"collections.group.externals.external", st_externals_external},   /* dup */
+   {"collections.group.programs.target_group", st_collections_group_target_group},   /* dup */
+   IMAGE_SET_STATEMENTS("collections.group")
+   IMAGE_STATEMENTS("collections.group.")
+   {
+      "collections.group.models.model", st_models_model
+   },
+   {"collections.group.font", st_fonts_font},   /* dup */
+   FONT_STYLE_CC_STATEMENTS("collections.group.")
+   TEXT_CLASS_STATEMENTS("collections.group.")
+   SIZE_CLASS_STATEMENTS("collections.group.")
+   {
+      "collections.group.parts.alias", st_collections_group_parts_alias
+   },
+   IMAGE_SET_STATEMENTS("collections.group.parts")
+   IMAGE_STATEMENTS("collections.group.parts.")
+   {
+      "collections.group.parts.font", st_fonts_font
+   },                                                 /* dup */
+   FONT_STYLE_CC_STATEMENTS("collections.group.parts.")
+   TEXT_CLASS_STATEMENTS("collections.group.parts.")
+   SIZE_CLASS_STATEMENTS("collections.group.parts.")
+   {
+      "collections.group.parts.target_group", st_collections_group_target_group
+   },                                                                             /* dup */
+   {"collections.group.parts.part.name", st_collections_group_parts_part_name},
+   {"collections.group.parts.part.target_group", st_collections_group_target_group},   /* dup */
+   {"collections.group.parts.part.inherit", st_collections_group_parts_part_inherit},
+   {"collections.group.parts.part.api", st_collections_group_parts_part_api},
+   {"collections.group.parts.part.type", st_collections_group_parts_part_type},
 #ifdef HAVE_EPHYSICS
-     {"collections.group.parts.part.physics_body", st_collections_group_parts_part_physics_body},
+   {"collections.group.parts.part.physics_body", st_collections_group_parts_part_physics_body},
 #endif
-     {"collections.group.parts.part.insert_before", st_collections_group_parts_part_insert_before},
-     {"collections.group.parts.part.insert_after", st_collections_group_parts_part_insert_after},
-     {"collections.group.parts.part.effect", st_collections_group_parts_part_effect},
-     {"collections.group.parts.part.mouse_events", st_collections_group_parts_part_mouse_events},
-     {"collections.group.parts.part.anti_alias", st_collections_group_parts_part_anti_alias},
-     {"collections.group.parts.part.repeat_events", st_collections_group_parts_part_repeat_events},
-     {"collections.group.parts.part.ignore_flags", st_collections_group_parts_part_ignore_flags},
-     {"collections.group.parts.part.mask_flags", st_collections_group_parts_part_mask_flags},
-     {"collections.group.parts.part.scale", st_collections_group_parts_part_scale},
-     {"collections.group.parts.part.pointer_mode", st_collections_group_parts_part_pointer_mode},
-     {"collections.group.parts.part.precise_is_inside", st_collections_group_parts_part_precise_is_inside},
-     {"collections.group.parts.part.use_alternate_font_metrics", st_collections_group_parts_part_use_alternate_font_metrics},
-     {"collections.group.parts.part.clip_to", st_collections_group_parts_part_clip_to_id},
-     {"collections.group.parts.part.no_render", st_collections_group_parts_part_no_render},
-     {"collections.group.parts.part.required", st_collections_group_parts_part_required},
-     {"collections.group.parts.part.source", st_collections_group_parts_part_source},
-     {"collections.group.parts.part.source2", st_collections_group_parts_part_source2},
-     {"collections.group.parts.part.source3", st_collections_group_parts_part_source3},
-     {"collections.group.parts.part.source4", st_collections_group_parts_part_source4},
-     {"collections.group.parts.part.source5", st_collections_group_parts_part_source5},
-     {"collections.group.parts.part.source6", st_collections_group_parts_part_source6},
-     {"collections.group.parts.part.dragable.x", st_collections_group_parts_part_dragable_x},
-     {"collections.group.parts.part.dragable.y", st_collections_group_parts_part_dragable_y},
-     {"collections.group.parts.part.dragable.confine", st_collections_group_parts_part_dragable_confine},
-     {"collections.group.parts.part.dragable.threshold", st_collections_group_parts_part_dragable_threshold},
-     {"collections.group.parts.part.dragable.events", st_collections_group_parts_part_dragable_events},
-     {"collections.group.parts.part.entry_mode", st_collections_group_parts_part_entry_mode},
-     {"collections.group.parts.part.select_mode", st_collections_group_parts_part_select_mode},
-     {"collections.group.parts.part.cursor_mode", st_collections_group_parts_part_cursor_mode},
-     {"collections.group.parts.part.multiline", st_collections_group_parts_part_multiline},
-     {"collections.group.parts.part.access", st_collections_group_parts_part_access},
-     {"collections.group.parts.part.allowed_seats", st_collections_group_parts_part_allowed_seats},
-     IMAGE_SET_STATEMENTS("collections.group.parts.part")
-     IMAGE_STATEMENTS("collections.group.parts.part.")
-     {"collections.group.parts.part.font", st_fonts_font}, /* dup */
-     FONT_STYLE_CC_STATEMENTS("collections.group.parts.part.")
-     TEXT_CLASS_STATEMENTS("collections.group.parts.part.")
-     SIZE_CLASS_STATEMENTS("collections.group.parts.part.")
-     {"collections.group.parts.part.box.items.item.type", st_collections_group_parts_part_box_items_item_type},
-     {"collections.group.parts.part.box.items.item.name", st_collections_group_parts_part_box_items_item_name},
-     {"collections.group.parts.part.box.items.item.source", st_collections_group_parts_part_box_items_item_source},
-     {"collections.group.parts.part.box.items.item.min", st_collections_group_parts_part_box_items_item_min},
-     {"collections.group.parts.part.box.items.item.spread", st_collections_group_parts_part_box_items_item_spread},
-     {"collections.group.parts.part.box.items.item.prefer", st_collections_group_parts_part_box_items_item_prefer},
-     {"collections.group.parts.part.box.items.item.max", st_collections_group_parts_part_box_items_item_max},
-     {"collections.group.parts.part.box.items.item.padding", st_collections_group_parts_part_box_items_item_padding},
-     {"collections.group.parts.part.box.items.item.align", st_collections_group_parts_part_box_items_item_align},
-     {"collections.group.parts.part.box.items.item.weight", st_collections_group_parts_part_box_items_item_weight},
-     {"collections.group.parts.part.box.items.item.aspect", st_collections_group_parts_part_box_items_item_aspect},
-     {"collections.group.parts.part.box.items.item.aspect_mode", st_collections_group_parts_part_box_items_item_aspect_mode},
-     {"collections.group.parts.part.box.items.item.options", st_collections_group_parts_part_box_items_item_options},
-     {"collections.group.parts.part.table.items.item.type", st_collections_group_parts_part_box_items_item_type}, /* dup */
-     {"collections.group.parts.part.table.items.item.name", st_collections_group_parts_part_box_items_item_name}, /* dup */
-     {"collections.group.parts.part.table.items.item.source", st_collections_group_parts_part_box_items_item_source}, /* dup */
-     {"collections.group.parts.part.table.items.item.min", st_collections_group_parts_part_box_items_item_min}, /* dup */
-     {"collections.group.parts.part.table.items.item.spread", st_collections_group_parts_part_box_items_item_spread}, /* dup */
-     {"collections.group.parts.part.table.items.item.prefer", st_collections_group_parts_part_box_items_item_prefer}, /* dup */
-     {"collections.group.parts.part.table.items.item.max", st_collections_group_parts_part_box_items_item_max}, /* dup */
-     {"collections.group.parts.part.table.items.item.padding", st_collections_group_parts_part_box_items_item_padding}, /* dup */
-     {"collections.group.parts.part.table.items.item.align", st_collections_group_parts_part_box_items_item_align}, /* dup */
-     {"collections.group.parts.part.table.items.item.weight", st_collections_group_parts_part_box_items_item_weight}, /* dup */
-     {"collections.group.parts.part.table.items.item.aspect", st_collections_group_parts_part_box_items_item_aspect}, /* dup */
-     {"collections.group.parts.part.table.items.item.aspect_mode", st_collections_group_parts_part_box_items_item_aspect_mode}, /* dup */
-     {"collections.group.parts.part.table.items.item.options", st_collections_group_parts_part_box_items_item_options}, /* dup */
-     {"collections.group.parts.part.table.items.item.position", st_collections_group_parts_part_table_items_item_position},
-     {"collections.group.parts.part.table.items.item.span", st_collections_group_parts_part_table_items_item_span},
-     {"collections.group.parts.part.description.target_group", st_collections_group_target_group}, /* dup */
-     {"collections.group.parts.part.description.inherit", st_collections_group_parts_part_description_inherit},
-     {"collections.group.parts.part.description.link.base", st_collections_group_parts_part_description_link_base},
-     {"collections.group.parts.part.description.link.transition", st_collections_group_programs_program_transition},
-     {"collections.group.parts.part.description.link.after", st_collections_group_programs_program_after},
-     {"collections.group.parts.part.description.link.in", st_collections_group_programs_program_in},
-     {"collections.group.parts.part.description.source", st_collections_group_parts_part_description_source},
-     {"collections.group.parts.part.description.state", st_collections_group_parts_part_description_state},
-     {"collections.group.parts.part.description.visible", st_collections_group_parts_part_description_visible},
-     {"collections.group.parts.part.description.limit", st_collections_group_parts_part_description_limit},
-     {"collections.group.parts.part.description.no_render", st_collections_group_parts_part_description_no_render},
-     {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align},
-     {"collections.group.parts.part.description.fixed", st_collections_group_parts_part_description_fixed},
-     {"collections.group.parts.part.description.min", st_collections_group_parts_part_description_min},
-     {"collections.group.parts.part.description.minmul", st_collections_group_parts_part_description_minmul},
-     {"collections.group.parts.part.description.max", st_collections_group_parts_part_description_max},
-     {"collections.group.parts.part.description.step", st_collections_group_parts_part_description_step},
-     {"collections.group.parts.part.description.aspect", st_collections_group_parts_part_description_aspect},
-     {"collections.group.parts.part.description.aspect_preference", st_collections_group_parts_part_description_aspect_preference},
-     {"collections.group.parts.part.description.rel.to", st_collections_group_parts_part_description_rel_to},
-     {"collections.group.parts.part.description.rel.to_x", st_collections_group_parts_part_description_rel_to_x},
-     {"collections.group.parts.part.description.rel.to_y", st_collections_group_parts_part_description_rel_to_y},
-     {"collections.group.parts.part.description.rel1.relative", st_collections_group_parts_part_description_rel1_relative},
-     {"collections.group.parts.part.description.rel1.offset", st_collections_group_parts_part_description_rel1_offset},
-     {"collections.group.parts.part.description.rel1.to", st_collections_group_parts_part_description_rel1_to},
-     {"collections.group.parts.part.description.rel1.to_x", st_collections_group_parts_part_description_rel1_to_x},
-     {"collections.group.parts.part.description.rel1.to_y", st_collections_group_parts_part_description_rel1_to_y},
-     {"collections.group.parts.part.description.rel2.relative", st_collections_group_parts_part_description_rel2_relative},
-     {"collections.group.parts.part.description.rel2.offset", st_collections_group_parts_part_description_rel2_offset},
-     {"collections.group.parts.part.description.rel2.to", st_collections_group_parts_part_description_rel2_to},
-     {"collections.group.parts.part.description.rel2.to_x", st_collections_group_parts_part_description_rel2_to_x},
-     {"collections.group.parts.part.description.rel2.to_y", st_collections_group_parts_part_description_rel2_to_y},
-     {"collections.group.parts.part.description.offset_scale", st_collections_group_parts_part_description_offset_scale},
-     {"collections.group.parts.part.description.anchors.top", st_collections_group_parts_part_description_anchors_top},
-     {"collections.group.parts.part.description.anchors.bottom", st_collections_group_parts_part_description_anchors_bottom},
-     {"collections.group.parts.part.description.anchors.left", st_collections_group_parts_part_description_anchors_left},
-     {"collections.group.parts.part.description.anchors.right", st_collections_group_parts_part_description_anchors_right},
-     {"collections.group.parts.part.description.anchors.vertical_center", st_collections_group_parts_part_description_anchors_vertical_center},
-     {"collections.group.parts.part.description.anchors.horizontal_center", st_collections_group_parts_part_description_anchors_horizontal_center},
-     {"collections.group.parts.part.description.anchors.fill", st_collections_group_parts_part_description_anchors_fill},
-     {"collections.group.parts.part.description.anchors.margin", st_collections_group_parts_part_description_anchors_margin},
-     {"collections.group.parts.part.description.clip_to", st_collections_group_parts_part_description_clip_to_id},
-     {"collections.group.parts.part.description.size_class", st_collections_group_parts_part_description_size_class},
-     {"collections.group.parts.part.description.image.normal", st_collections_group_parts_part_description_image_normal},
-     {"collections.group.parts.part.description.image.tween", st_collections_group_parts_part_description_image_tween},
-     IMAGE_SET_STATEMENTS("collections.group.parts.part.description.image")
-     IMAGE_STATEMENTS("collections.group.parts.part.description.image.")
-     {"collections.group.parts.part.description.image.border", st_collections_group_parts_part_description_image_border},
-     {"collections.group.parts.part.description.image.middle", st_collections_group_parts_part_description_image_middle},
-     {"collections.group.parts.part.description.image.border_scale", st_collections_group_parts_part_description_image_border_scale},
-     {"collections.group.parts.part.description.image.border_scale_by", st_collections_group_parts_part_description_image_border_scale_by},
-     {"collections.group.parts.part.description.image.scale_hint", st_collections_group_parts_part_description_image_scale_hint},
-     {"collections.group.parts.part.description.fill.smooth", st_collections_group_parts_part_description_fill_smooth},
-     {"collections.group.parts.part.description.fill.origin.relative", st_collections_group_parts_part_description_fill_origin_relative},
-     {"collections.group.parts.part.description.fill.origin.offset", st_collections_group_parts_part_description_fill_origin_offset},
-     {"collections.group.parts.part.description.fill.size.relative", st_collections_group_parts_part_description_fill_size_relative},
-     {"collections.group.parts.part.description.fill.size.offset", st_collections_group_parts_part_description_fill_size_offset},
-     {"collections.group.parts.part.description.fill.type", st_collections_group_parts_part_description_fill_type},
-     {"collections.group.parts.part.description.color_class", st_collections_group_parts_part_description_color_class},
-     {"collections.group.parts.part.description.color", st_collections_group_parts_part_description_color},
-     {"collections.group.parts.part.description.color2", st_collections_group_parts_part_description_color2},
-     {"collections.group.parts.part.description.color3", st_collections_group_parts_part_description_color3},
-     {"collections.group.parts.part.description.text.text", st_collections_group_parts_part_description_text_text},
-     {"collections.group.parts.part.description.text.domain", st_collections_group_parts_part_description_text_domain},
-     {"collections.group.parts.part.description.text.text_class", st_collections_group_parts_part_description_text_text_class},
-     {"collections.group.parts.part.description.text.font", st_collections_group_parts_part_description_text_font},
-     {"collections.group.parts.part.description.text.style", st_collections_group_parts_part_description_text_style},
-     {"collections.group.parts.part.description.text.repch", st_collections_group_parts_part_description_text_repch},
-     {"collections.group.parts.part.description.text.size", st_collections_group_parts_part_description_text_size},
-     {"collections.group.parts.part.description.text.size_range", st_collections_group_parts_part_description_text_size_range},
-     {"collections.group.parts.part.description.text.fit", st_collections_group_parts_part_description_text_fit},
-     {"collections.group.parts.part.description.text.min", st_collections_group_parts_part_description_text_min},
-     {"collections.group.parts.part.description.text.max", st_collections_group_parts_part_description_text_max},
-     {"collections.group.parts.part.description.text.align", st_collections_group_parts_part_description_text_align},
-     {"collections.group.parts.part.description.text.source", st_collections_group_parts_part_description_text_source},
-     {"collections.group.parts.part.description.text.text_source", st_collections_group_parts_part_description_text_text_source},
-     {"collections.group.parts.part.description.text.font", st_fonts_font}, /* dup */
-     {"collections.group.parts.part.description.text.fonts.font", st_fonts_font}, /* dup */
-     {"collections.group.parts.part.description.text.elipsis", st_collections_group_parts_part_description_text_ellipsis},
-     {"collections.group.parts.part.description.text.ellipsis", st_collections_group_parts_part_description_text_ellipsis},
-     {"collections.group.parts.part.description.text.filter", st_collections_group_parts_part_description_filter_code}, /* dup */
-     {"collections.group.parts.part.description.box.layout", st_collections_group_parts_part_description_box_layout},
-     {"collections.group.parts.part.description.box.align", st_collections_group_parts_part_description_box_align},
-     {"collections.group.parts.part.description.box.padding", st_collections_group_parts_part_description_box_padding},
-     {"collections.group.parts.part.description.box.min", st_collections_group_parts_part_description_box_min},
-     {"collections.group.parts.part.description.table.homogeneous", st_collections_group_parts_part_description_table_homogeneous},
-     {"collections.group.parts.part.description.table.align", st_collections_group_parts_part_description_table_align},
-     {"collections.group.parts.part.description.table.padding", st_collections_group_parts_part_description_table_padding},
-     {"collections.group.parts.part.description.table.min", st_collections_group_parts_part_description_table_min},
-     {"collections.group.parts.part.description.proxy.source_visible", st_collections_group_parts_part_description_proxy_source_visible},
-     {"collections.group.parts.part.description.proxy.source_clip", st_collections_group_parts_part_description_proxy_source_clip},
-     {"collections.group.parts.part.description.position.point", st_collections_group_parts_part_description_position_point},
-     {"collections.group.parts.part.description.position.space", st_collections_group_parts_part_description_position_space},
-     {"collections.group.parts.part.description.properties.perspective", st_collections_group_parts_part_description_camera_properties},
-     {"collections.group.parts.part.description.properties.ambient", st_collections_group_parts_part_description_properties_ambient},
-     {"collections.group.parts.part.description.properties.diffuse", st_collections_group_parts_part_description_properties_diffuse},
-     {"collections.group.parts.part.description.properties.specular", st_collections_group_parts_part_description_properties_specular},
-     {"collections.group.parts.part.description.properties.material", st_collections_group_parts_part_description_properties_material},
-     {"collections.group.parts.part.description.properties.normal", st_collections_group_parts_part_description_properties_normal},
-     {"collections.group.parts.part.description.properties.shininess", st_collections_group_parts_part_description_properties_shininess},
-     {"collections.group.parts.part.description.properties.shade", st_collections_group_parts_part_description_properties_shade},
-     {"collections.group.parts.part.description.mesh.primitive", st_collections_group_parts_part_description_mesh_primitive},
-     {"collections.group.parts.part.description.orientation.look1", st_collections_group_parts_part_description_orientation_look1},
-     {"collections.group.parts.part.description.orientation.look2", st_collections_group_parts_part_description_orientation_look2},
-     {"collections.group.parts.part.description.orientation.look_to", st_collections_group_parts_part_description_orientation_look_to},
-     {"collections.group.parts.part.description.orientation.angle_axis", st_collections_group_parts_part_description_orientation_angle_axis},
-     {"collections.group.parts.part.description.orientation.quaternion", st_collections_group_parts_part_description_orientation_quaternion},
-     {"collections.group.parts.part.description.scale", st_collections_group_parts_part_description_scale},
-     {"collections.group.parts.part.description.texture.image", st_collections_group_parts_part_description_texture_image},
-     {"collections.group.parts.part.description.texture.wrap1", st_collections_group_parts_part_description_texture_wrap1},
-     {"collections.group.parts.part.description.texture.wrap2", st_collections_group_parts_part_description_texture_wrap2},
-     {"collections.group.parts.part.description.texture.filter1", st_collections_group_parts_part_description_texture_filter1},
-     {"collections.group.parts.part.description.texture.filter2", st_collections_group_parts_part_description_texture_filter2},
-     {"collections.group.parts.part.description.mesh.assembly", st_collections_group_parts_part_description_mesh_assembly},
-     {"collections.group.parts.part.description.mesh.geometry", st_collections_group_parts_part_description_mesh_geometry},
-     {"collections.group.parts.part.description.mesh.frame", st_collections_group_parts_part_description_mesh_frame},
-     {"collections.group.parts.part.description.filter.code", st_collections_group_parts_part_description_filter_code},
-     {"collections.group.parts.part.description.filter.source", st_collections_group_parts_part_description_filter_source},
-     {"collections.group.parts.part.description.filter.data", st_collections_group_parts_part_description_filter_data},
+   {"collections.group.parts.part.insert_before", st_collections_group_parts_part_insert_before},
+   {"collections.group.parts.part.insert_after", st_collections_group_parts_part_insert_after},
+   {"collections.group.parts.part.effect", st_collections_group_parts_part_effect},
+   {"collections.group.parts.part.mouse_events", st_collections_group_parts_part_mouse_events},
+   {"collections.group.parts.part.anti_alias", st_collections_group_parts_part_anti_alias},
+   {"collections.group.parts.part.repeat_events", st_collections_group_parts_part_repeat_events},
+   {"collections.group.parts.part.ignore_flags", st_collections_group_parts_part_ignore_flags},
+   {"collections.group.parts.part.mask_flags", st_collections_group_parts_part_mask_flags},
+   {"collections.group.parts.part.scale", st_collections_group_parts_part_scale},
+   {"collections.group.parts.part.pointer_mode", st_collections_group_parts_part_pointer_mode},
+   {"collections.group.parts.part.precise_is_inside", st_collections_group_parts_part_precise_is_inside},
+   {"collections.group.parts.part.use_alternate_font_metrics", st_collections_group_parts_part_use_alternate_font_metrics},
+   {"collections.group.parts.part.clip_to", st_collections_group_parts_part_clip_to_id},
+   {"collections.group.parts.part.no_render", st_collections_group_parts_part_no_render},
+   {"collections.group.parts.part.required", st_collections_group_parts_part_required},
+   {"collections.group.parts.part.source", st_collections_group_parts_part_source},
+   {"collections.group.parts.part.source2", st_collections_group_parts_part_source2},
+   {"collections.group.parts.part.source3", st_collections_group_parts_part_source3},
+   {"collections.group.parts.part.source4", st_collections_group_parts_part_source4},
+   {"collections.group.parts.part.source5", st_collections_group_parts_part_source5},
+   {"collections.group.parts.part.source6", st_collections_group_parts_part_source6},
+   {"collections.group.parts.part.dragable.x", st_collections_group_parts_part_dragable_x},
+   {"collections.group.parts.part.dragable.y", st_collections_group_parts_part_dragable_y},
+   {"collections.group.parts.part.dragable.confine", st_collections_group_parts_part_dragable_confine},
+   {"collections.group.parts.part.dragable.threshold", st_collections_group_parts_part_dragable_threshold},
+   {"collections.group.parts.part.dragable.events", st_collections_group_parts_part_dragable_events},
+   {"collections.group.parts.part.entry_mode", st_collections_group_parts_part_entry_mode},
+   {"collections.group.parts.part.select_mode", st_collections_group_parts_part_select_mode},
+   {"collections.group.parts.part.cursor_mode", st_collections_group_parts_part_cursor_mode},
+   {"collections.group.parts.part.multiline", st_collections_group_parts_part_multiline},
+   {"collections.group.parts.part.access", st_collections_group_parts_part_access},
+   {"collections.group.parts.part.allowed_seats", st_collections_group_parts_part_allowed_seats},
+   IMAGE_SET_STATEMENTS("collections.group.parts.part")
+   IMAGE_STATEMENTS("collections.group.parts.part.")
+   {
+      "collections.group.parts.part.font", st_fonts_font
+   },                                                      /* dup */
+   FONT_STYLE_CC_STATEMENTS("collections.group.parts.part.")
+   TEXT_CLASS_STATEMENTS("collections.group.parts.part.")
+   SIZE_CLASS_STATEMENTS("collections.group.parts.part.")
+   {
+      "collections.group.parts.part.box.items.item.type", st_collections_group_parts_part_box_items_item_type
+   },
+   {"collections.group.parts.part.box.items.item.name", st_collections_group_parts_part_box_items_item_name},
+   {"collections.group.parts.part.box.items.item.source", st_collections_group_parts_part_box_items_item_source},
+   {"collections.group.parts.part.box.items.item.min", st_collections_group_parts_part_box_items_item_min},
+   {"collections.group.parts.part.box.items.item.spread", st_collections_group_parts_part_box_items_item_spread},
+   {"collections.group.parts.part.box.items.item.prefer", st_collections_group_parts_part_box_items_item_prefer},
+   {"collections.group.parts.part.box.items.item.max", st_collections_group_parts_part_box_items_item_max},
+   {"collections.group.parts.part.box.items.item.padding", st_collections_group_parts_part_box_items_item_padding},
+   {"collections.group.parts.part.box.items.item.align", st_collections_group_parts_part_box_items_item_align},
+   {"collections.group.parts.part.box.items.item.weight", st_collections_group_parts_part_box_items_item_weight},
+   {"collections.group.parts.part.box.items.item.aspect", st_collections_group_parts_part_box_items_item_aspect},
+   {"collections.group.parts.part.box.items.item.aspect_mode", st_collections_group_parts_part_box_items_item_aspect_mode},
+   {"collections.group.parts.part.box.items.item.options", st_collections_group_parts_part_box_items_item_options},
+   {"collections.group.parts.part.table.items.item.type", st_collections_group_parts_part_box_items_item_type},   /* dup */
+   {"collections.group.parts.part.table.items.item.name", st_collections_group_parts_part_box_items_item_name},   /* dup */
+   {"collections.group.parts.part.table.items.item.source", st_collections_group_parts_part_box_items_item_source},   /* dup */
+   {"collections.group.parts.part.table.items.item.min", st_collections_group_parts_part_box_items_item_min},   /* dup */
+   {"collections.group.parts.part.table.items.item.spread", st_collections_group_parts_part_box_items_item_spread},   /* dup */
+   {"collections.group.parts.part.table.items.item.prefer", st_collections_group_parts_part_box_items_item_prefer},   /* dup */
+   {"collections.group.parts.part.table.items.item.max", st_collections_group_parts_part_box_items_item_max},   /* dup */
+   {"collections.group.parts.part.table.items.item.padding", st_collections_group_parts_part_box_items_item_padding},   /* dup */
+   {"collections.group.parts.part.table.items.item.align", st_collections_group_parts_part_box_items_item_align},   /* dup */
+   {"collections.group.parts.part.table.items.item.weight", st_collections_group_parts_part_box_items_item_weight},   /* dup */
+   {"collections.group.parts.part.table.items.item.aspect", st_collections_group_parts_part_box_items_item_aspect},   /* dup */
+   {"collections.group.parts.part.table.items.item.aspect_mode", st_collections_group_parts_part_box_items_item_aspect_mode},   /* dup */
+   {"collections.group.parts.part.table.items.item.options", st_collections_group_parts_part_box_items_item_options},   /* dup */
+   {"collections.group.parts.part.table.items.item.position", st_collections_group_parts_part_table_items_item_position},
+   {"collections.group.parts.part.table.items.item.span", st_collections_group_parts_part_table_items_item_span},
+   {"collections.group.parts.part.description.target_group", st_collections_group_target_group},   /* dup */
+   {"collections.group.parts.part.description.inherit", st_collections_group_parts_part_description_inherit},
+   {"collections.group.parts.part.description.link.base", st_collections_group_parts_part_description_link_base},
+   {"collections.group.parts.part.description.link.transition", st_collections_group_programs_program_transition},
+   {"collections.group.parts.part.description.link.after", st_collections_group_programs_program_after},
+   {"collections.group.parts.part.description.link.in", st_collections_group_programs_program_in},
+   {"collections.group.parts.part.description.source", st_collections_group_parts_part_description_source},
+   {"collections.group.parts.part.description.state", st_collections_group_parts_part_description_state},
+   {"collections.group.parts.part.description.visible", st_collections_group_parts_part_description_visible},
+   {"collections.group.parts.part.description.limit", st_collections_group_parts_part_description_limit},
+   {"collections.group.parts.part.description.no_render", st_collections_group_parts_part_description_no_render},
+   {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align},
+   {"collections.group.parts.part.description.fixed", st_collections_group_parts_part_description_fixed},
+   {"collections.group.parts.part.description.min", st_collections_group_parts_part_description_min},
+   {"collections.group.parts.part.description.minmul", st_collections_group_parts_part_description_minmul},
+   {"collections.group.parts.part.description.max", st_collections_group_parts_part_description_max},
+   {"collections.group.parts.part.description.step", st_collections_group_parts_part_description_step},
+   {"collections.group.parts.part.description.aspect", st_collections_group_parts_part_description_aspect},
+   {"collections.group.parts.part.description.aspect_preference", st_collections_group_parts_part_description_aspect_preference},
+   {"collections.group.parts.part.description.rel.to", st_collections_group_parts_part_description_rel_to},
+   {"collections.group.parts.part.description.rel.to_x", st_collections_group_parts_part_description_rel_to_x},
+   {"collections.group.parts.part.description.rel.to_y", st_collections_group_parts_part_description_rel_to_y},
+   {"collections.group.parts.part.description.rel1.relative", st_collections_group_parts_part_description_rel1_relative},
+   {"collections.group.parts.part.description.rel1.offset", st_collections_group_parts_part_description_rel1_offset},
+   {"collections.group.parts.part.description.rel1.to", st_collections_group_parts_part_description_rel1_to},
+   {"collections.group.parts.part.description.rel1.to_x", st_collections_group_parts_part_description_rel1_to_x},
+   {"collections.group.parts.part.description.rel1.to_y", st_collections_group_parts_part_description_rel1_to_y},
+   {"collections.group.parts.part.description.rel2.relative", st_collections_group_parts_part_description_rel2_relative},
+   {"collections.group.parts.part.description.rel2.offset", st_collections_group_parts_part_description_rel2_offset},
+   {"collections.group.parts.part.description.rel2.to", st_collections_group_parts_part_description_rel2_to},
+   {"collections.group.parts.part.description.rel2.to_x", st_collections_group_parts_part_description_rel2_to_x},
+   {"collections.group.parts.part.description.rel2.to_y", st_collections_group_parts_part_description_rel2_to_y},
+   {"collections.group.parts.part.description.offset_scale", st_collections_group_parts_part_description_offset_scale},
+   {"collections.group.parts.part.description.anchors.top", st_collections_group_parts_part_description_anchors_top},
+   {"collections.group.parts.part.description.anchors.bottom", st_collections_group_parts_part_description_anchors_bottom},
+   {"collections.group.parts.part.description.anchors.left", st_collections_group_parts_part_description_anchors_left},
+   {"collections.group.parts.part.description.anchors.right", st_collections_group_parts_part_description_anchors_right},
+   {"collections.group.parts.part.description.anchors.vertical_center", st_collections_group_parts_part_description_anchors_vertical_center},
+   {"collections.group.parts.part.description.anchors.horizontal_center", st_collections_group_parts_part_description_anchors_horizontal_center},
+   {"collections.group.parts.part.description.anchors.fill", st_collections_group_parts_part_description_anchors_fill},
+   {"collections.group.parts.part.description.anchors.margin", st_collections_group_parts_part_description_anchors_margin},
+   {"collections.group.parts.part.description.clip_to", st_collections_group_parts_part_description_clip_to_id},
+   {"collections.group.parts.part.description.size_class", st_collections_group_parts_part_description_size_class},
+   {"collections.group.parts.part.description.image.normal", st_collections_group_parts_part_description_image_normal},
+   {"collections.group.parts.part.description.image.tween", st_collections_group_parts_part_description_image_tween},
+   IMAGE_SET_STATEMENTS("collections.group.parts.part.description.image")
+   IMAGE_STATEMENTS("collections.group.parts.part.description.image.")
+   {
+      "collections.group.parts.part.description.image.border", st_collections_group_parts_part_description_image_border
+   },
+   {"collections.group.parts.part.description.image.middle", st_collections_group_parts_part_description_image_middle},
+   {"collections.group.parts.part.description.image.border_scale", st_collections_group_parts_part_description_image_border_scale},
+   {"collections.group.parts.part.description.image.border_scale_by", st_collections_group_parts_part_description_image_border_scale_by},
+   {"collections.group.parts.part.description.image.scale_hint", st_collections_group_parts_part_description_image_scale_hint},
+   {"collections.group.parts.part.description.fill.smooth", st_collections_group_parts_part_description_fill_smooth},
+   {"collections.group.parts.part.description.fill.origin.relative", st_collections_group_parts_part_description_fill_origin_relative},
+   {"collections.group.parts.part.description.fill.origin.offset", st_collections_group_parts_part_description_fill_origin_offset},
+   {"collections.group.parts.part.description.fill.size.relative", st_collections_group_parts_part_description_fill_size_relative},
+   {"collections.group.parts.part.description.fill.size.offset", st_collections_group_parts_part_description_fill_size_offset},
+   {"collections.group.parts.part.description.fill.type", st_collections_group_parts_part_description_fill_type},
+   {"collections.group.parts.part.description.color_class", st_collections_group_parts_part_description_color_class},
+   {"collections.group.parts.part.description.color", st_collections_group_parts_part_description_color},
+   {"collections.group.parts.part.description.color2", st_collections_group_parts_part_description_color2},
+   {"collections.group.parts.part.description.color3", st_collections_group_parts_part_description_color3},
+   {"collections.group.parts.part.description.text.text", st_collections_group_parts_part_description_text_text},
+   {"collections.group.parts.part.description.text.domain", st_collections_group_parts_part_description_text_domain},
+   {"collections.group.parts.part.description.text.text_class", st_collections_group_parts_part_description_text_text_class},
+   {"collections.group.parts.part.description.text.font", st_collections_group_parts_part_description_text_font},
+   {"collections.group.parts.part.description.text.style", st_collections_group_parts_part_description_text_style},
+   {"collections.group.parts.part.description.text.repch", st_collections_group_parts_part_description_text_repch},
+   {"collections.group.parts.part.description.text.size", st_collections_group_parts_part_description_text_size},
+   {"collections.group.parts.part.description.text.size_range", st_collections_group_parts_part_description_text_size_range},
+   {"collections.group.parts.part.description.text.fit", st_collections_group_parts_part_description_text_fit},
+   {"collections.group.parts.part.description.text.min", st_collections_group_parts_part_description_text_min},
+   {"collections.group.parts.part.description.text.max", st_collections_group_parts_part_description_text_max},
+   {"collections.group.parts.part.description.text.align", st_collections_group_parts_part_description_text_align},
+   {"collections.group.parts.part.description.text.source", st_collections_group_parts_part_description_text_source},
+   {"collections.group.parts.part.description.text.text_source", st_collections_group_parts_part_description_text_text_source},
+   {"collections.group.parts.part.description.text.font", st_fonts_font},   /* dup */
+   {"collections.group.parts.part.description.text.fonts.font", st_fonts_font},   /* dup */
+   {"collections.group.parts.part.description.text.elipsis", st_collections_group_parts_part_description_text_ellipsis},
+   {"collections.group.parts.part.description.text.ellipsis", st_collections_group_parts_part_description_text_ellipsis},
+   {"collections.group.parts.part.description.text.filter", st_collections_group_parts_part_description_filter_code},   /* dup */
+   {"collections.group.parts.part.description.box.layout", st_collections_group_parts_part_description_box_layout},
+   {"collections.group.parts.part.description.box.align", st_collections_group_parts_part_description_box_align},
+   {"collections.group.parts.part.description.box.padding", st_collections_group_parts_part_description_box_padding},
+   {"collections.group.parts.part.description.box.min", st_collections_group_parts_part_description_box_min},
+   {"collections.group.parts.part.description.table.homogeneous", st_collections_group_parts_part_description_table_homogeneous},
+   {"collections.group.parts.part.description.table.align", st_collections_group_parts_part_description_table_align},
+   {"collections.group.parts.part.description.table.padding", st_collections_group_parts_part_description_table_padding},
+   {"collections.group.parts.part.description.table.min", st_collections_group_parts_part_description_table_min},
+   {"collections.group.parts.part.description.proxy.source_visible", st_collections_group_parts_part_description_proxy_source_visible},
+   {"collections.group.parts.part.description.proxy.source_clip", st_collections_group_parts_part_description_proxy_source_clip},
+   {"collections.group.parts.part.description.position.point", st_collections_group_parts_part_description_position_point},
+   {"collections.group.parts.part.description.position.space", st_collections_group_parts_part_description_position_space},
+   {"collections.group.parts.part.description.properties.perspective", st_collections_group_parts_part_description_camera_properties},
+   {"collections.group.parts.part.description.properties.ambient", st_collections_group_parts_part_description_properties_ambient},
+   {"collections.group.parts.part.description.properties.diffuse", st_collections_group_parts_part_description_properties_diffuse},
+   {"collections.group.parts.part.description.properties.specular", st_collections_group_parts_part_description_properties_specular},
+   {"collections.group.parts.part.description.properties.material", st_collections_group_parts_part_description_properties_material},
+   {"collections.group.parts.part.description.properties.normal", st_collections_group_parts_part_description_properties_normal},
+   {"collections.group.parts.part.description.properties.shininess", st_collections_group_parts_part_description_properties_shininess},
+   {"collections.group.parts.part.description.properties.shade", st_collections_group_parts_part_description_properties_shade},
+   {"collections.group.parts.part.description.mesh.primitive", st_collections_group_parts_part_description_mesh_primitive},
+   {"collections.group.parts.part.description.orientation.look1", st_collections_group_parts_part_description_orientation_look1},
+   {"collections.group.parts.part.description.orientation.look2", st_collections_group_parts_part_description_orientation_look2},
+   {"collections.group.parts.part.description.orientation.look_to", st_collections_group_parts_part_description_orientation_look_to},
+   {"collections.group.parts.part.description.orientation.angle_axis", st_collections_group_parts_part_description_orientation_angle_axis},
+   {"collections.group.parts.part.description.orientation.quaternion", st_collections_group_parts_part_description_orientation_quaternion},
+   {"collections.group.parts.part.description.scale", st_collections_group_parts_part_description_scale},
+   {"collections.group.parts.part.description.texture.image", st_collections_group_parts_part_description_texture_image},
+   {"collections.group.parts.part.description.texture.wrap1", st_collections_group_parts_part_description_texture_wrap1},
+   {"collections.group.parts.part.description.texture.wrap2", st_collections_group_parts_part_description_texture_wrap2},
+   {"collections.group.parts.part.description.texture.filter1", st_collections_group_parts_part_description_texture_filter1},
+   {"collections.group.parts.part.description.texture.filter2", st_collections_group_parts_part_description_texture_filter2},
+   {"collections.group.parts.part.description.mesh.assembly", st_collections_group_parts_part_description_mesh_assembly},
+   {"collections.group.parts.part.description.mesh.geometry", st_collections_group_parts_part_description_mesh_geometry},
+   {"collections.group.parts.part.description.mesh.frame", st_collections_group_parts_part_description_mesh_frame},
+   {"collections.group.parts.part.description.filter.code", st_collections_group_parts_part_description_filter_code},
+   {"collections.group.parts.part.description.filter.source", st_collections_group_parts_part_description_filter_source},
+   {"collections.group.parts.part.description.filter.data", st_collections_group_parts_part_description_filter_data},
 
 #ifdef HAVE_EPHYSICS
-     {"collections.group.parts.part.description.physics.mass", st_collections_group_parts_part_description_physics_mass},
-     {"collections.group.parts.part.description.physics.restitution", st_collections_group_parts_part_description_physics_restitution},
-     {"collections.group.parts.part.description.physics.friction", st_collections_group_parts_part_description_physics_friction},
-     {"collections.group.parts.part.description.physics.damping", st_collections_group_parts_part_description_physics_damping},
-     {"collections.group.parts.part.description.physics.sleep", st_collections_group_parts_part_description_physics_sleep},
-     {"collections.group.parts.part.description.physics.material", st_collections_group_parts_part_description_physics_material},
-     {"collections.group.parts.part.description.physics.density", st_collections_group_parts_part_description_physics_density},
-     {"collections.group.parts.part.description.physics.hardness", st_collections_group_parts_part_description_physics_hardness},
-     {"collections.group.parts.part.description.physics.movement_freedom.linear", st_collections_group_parts_part_description_physics_movement_freedom_linear},
-     {"collections.group.parts.part.description.physics.movement_freedom.angular", st_collections_group_parts_part_description_physics_movement_freedom_angular},
-     {"collections.group.parts.part.description.physics.ignore_part_pos", st_collections_group_parts_part_description_physics_ignore_part_pos},
-     {"collections.group.parts.part.description.physics.light_on", st_collections_group_parts_part_description_physics_light_on},
-     {"collections.group.parts.part.description.physics.z", st_collections_group_parts_part_description_physics_z},
-     {"collections.group.parts.part.description.physics.depth", st_collections_group_parts_part_description_physics_depth},
-     {"collections.group.parts.part.description.physics.backface_cull", st_collections_group_parts_part_description_physics_backface_cull},
-     {"collections.group.parts.part.description.physics.faces.face.type", st_collections_group_parts_part_description_physics_face_type},
-     {"collections.group.parts.part.description.physics.faces.face.source", st_collections_group_parts_part_description_physics_face_source},
+   {"collections.group.parts.part.description.physics.mass", st_collections_group_parts_part_description_physics_mass},
+   {"collections.group.parts.part.description.physics.restitution", st_collections_group_parts_part_description_physics_restitution},
+   {"collections.group.parts.part.description.physics.friction", st_collections_group_parts_part_description_physics_friction},
+   {"collections.group.parts.part.description.physics.damping", st_collections_group_parts_part_description_physics_damping},
+   {"collections.group.parts.part.description.physics.sleep", st_collections_group_parts_part_description_physics_sleep},
+   {"collections.group.parts.part.description.physics.material", st_collections_group_parts_part_description_physics_material},
+   {"collections.group.parts.part.description.physics.density", st_collections_group_parts_part_description_physics_density},
+   {"collections.group.parts.part.description.physics.hardness", st_collections_group_parts_part_description_physics_hardness},
+   {"collections.group.parts.part.description.physics.movement_freedom.linear", st_collections_group_parts_part_description_physics_movement_freedom_linear},
+   {"collections.group.parts.part.description.physics.movement_freedom.angular", st_collections_group_parts_part_description_physics_movement_freedom_angular},
+   {"collections.group.parts.part.description.physics.ignore_part_pos", st_collections_group_parts_part_description_physics_ignore_part_pos},
+   {"collections.group.parts.part.description.physics.light_on", st_collections_group_parts_part_description_physics_light_on},
+   {"collections.group.parts.part.description.physics.z", st_collections_group_parts_part_description_physics_z},
+   {"collections.group.parts.part.description.physics.depth", st_collections_group_parts_part_description_physics_depth},
+   {"collections.group.parts.part.description.physics.backface_cull", st_collections_group_parts_part_description_physics_backface_cull},
+   {"collections.group.parts.part.description.physics.faces.face.type", st_collections_group_parts_part_description_physics_face_type},
+   {"collections.group.parts.part.description.physics.faces.face.source", st_collections_group_parts_part_description_physics_face_source},
 #endif
-     {"collections.group.parts.part.description.map.perspective", st_collections_group_parts_part_description_map_perspective},
-     {"collections.group.parts.part.description.map.light", st_collections_group_parts_part_description_map_light},
-     {"collections.group.parts.part.description.map.rotation.center", st_collections_group_parts_part_description_map_rotation_center},
-     {"collections.group.parts.part.description.map.rotation.x", st_collections_group_parts_part_description_map_rotation_x},
-     {"collections.group.parts.part.description.map.rotation.y", st_collections_group_parts_part_description_map_rotation_y},
-     {"collections.group.parts.part.description.map.rotation.z", st_collections_group_parts_part_description_map_rotation_z},
-     {"collections.group.parts.part.description.map.on", st_collections_group_parts_part_description_map_on},
-     {"collections.group.parts.part.description.map.smooth", st_collections_group_parts_part_description_map_smooth},
-     {"collections.group.parts.part.description.map.alpha", st_collections_group_parts_part_description_map_alpha},
-     {"collections.group.parts.part.description.map.backface_cull", st_collections_group_parts_part_description_map_backface_cull},
-     {"collections.group.parts.part.description.map.perspective_on", st_collections_group_parts_part_description_map_perspective_on},
-     {"collections.group.parts.part.description.map.color", st_collections_group_parts_part_description_map_color},
-     {"collections.group.parts.part.description.map.zoom.x", st_collections_group_parts_part_description_map_zoom_x},
-     {"collections.group.parts.part.description.map.zoom.y", st_collections_group_parts_part_description_map_zoom_y},
-     {"collections.group.parts.part.description.perspective.zplane", st_collections_group_parts_part_description_perspective_zplane},
-     {"collections.group.parts.part.description.perspective.focal", st_collections_group_parts_part_description_perspective_focal},
-     {"collections.group.parts.part.description.params.int", st_collections_group_parts_part_description_params_int},
-     {"collections.group.parts.part.description.params.double", st_collections_group_parts_part_description_params_double},
-     {"collections.group.parts.part.description.params.string", st_collections_group_parts_part_description_params_string},
-     {"collections.group.parts.part.description.params.bool", st_collections_group_parts_part_description_params_bool},
-     {"collections.group.parts.part.description.params.choice", st_collections_group_parts_part_description_params_choice},
-     {"collections.group.parts.part.description.params.*", st_collections_group_parts_part_description_params_smart},
-     IMAGE_STATEMENTS("collections.group.parts.part.description.")
-     {"collections.group.parts.part.description.font", st_fonts_font}, /* dup */
-     FONT_STYLE_CC_STATEMENTS("collections.group.parts.part.description.")
-     TEXT_CLASS_STATEMENTS("collections.group.parts.part.description.")
-     SIZE_CLASS_STATEMENTS("collections.group.parts.part.description.")
+   {"collections.group.parts.part.description.map.perspective", st_collections_group_parts_part_description_map_perspective},
+   {"collections.group.parts.part.description.map.light", st_collections_group_parts_part_description_map_light},
+   {"collections.group.parts.part.description.map.rotation.center", st_collections_group_parts_part_description_map_rotation_center},
+   {"collections.group.parts.part.description.map.rotation.x", st_collections_group_parts_part_description_map_rotation_x},
+   {"collections.group.parts.part.description.map.rotation.y", st_collections_group_parts_part_description_map_rotation_y},
+   {"collections.group.parts.part.description.map.rotation.z", st_collections_group_parts_part_description_map_rotation_z},
+   {"collections.group.parts.part.description.map.on", st_collections_group_parts_part_description_map_on},
+   {"collections.group.parts.part.description.map.smooth", st_collections_group_parts_part_description_map_smooth},
+   {"collections.group.parts.part.description.map.alpha", st_collections_group_parts_part_description_map_alpha},
+   {"collections.group.parts.part.description.map.backface_cull", st_collections_group_parts_part_description_map_backface_cull},
+   {"collections.group.parts.part.description.map.perspective_on", st_collections_group_parts_part_description_map_perspective_on},
+   {"collections.group.parts.part.description.map.color", st_collections_group_parts_part_description_map_color},
+   {"collections.group.parts.part.description.map.zoom.x", st_collections_group_parts_part_description_map_zoom_x},
+   {"collections.group.parts.part.description.map.zoom.y", st_collections_group_parts_part_description_map_zoom_y},
+   {"collections.group.parts.part.description.perspective.zplane", st_collections_group_parts_part_description_perspective_zplane},
+   {"collections.group.parts.part.description.perspective.focal", st_collections_group_parts_part_description_perspective_focal},
+   {"collections.group.parts.part.description.params.int", st_collections_group_parts_part_description_params_int},
+   {"collections.group.parts.part.description.params.double", st_collections_group_parts_part_description_params_double},
+   {"collections.group.parts.part.description.params.string", st_collections_group_parts_part_description_params_string},
+   {"collections.group.parts.part.description.params.bool", st_collections_group_parts_part_description_params_bool},
+   {"collections.group.parts.part.description.params.choice", st_collections_group_parts_part_description_params_choice},
+   {"collections.group.parts.part.description.params.*", st_collections_group_parts_part_description_params_smart},
+   IMAGE_STATEMENTS("collections.group.parts.part.description.")
+   {
+      "collections.group.parts.part.description.font", st_fonts_font
+   },                                                                  /* dup */
+   FONT_STYLE_CC_STATEMENTS("collections.group.parts.part.description.")
+   TEXT_CLASS_STATEMENTS("collections.group.parts.part.description.")
+   SIZE_CLASS_STATEMENTS("collections.group.parts.part.description.")
 #ifdef HAVE_EPHYSICS
-     {"collections.group.physics.world.gravity", st_collections_group_physics_world_gravity},
-     {"collections.group.physics.world.rate", st_collections_group_physics_world_rate},
-     {"collections.group.physics.world.z", st_collections_group_physics_world_z},
-     {"collections.group.physics.world.depth", st_collections_group_physics_world_depth},
+   {
+      "collections.group.physics.world.gravity", st_collections_group_physics_world_gravity
+   },
+   {"collections.group.physics.world.rate", st_collections_group_physics_world_rate},
+   {"collections.group.physics.world.z", st_collections_group_physics_world_z},
+   {"collections.group.physics.world.depth", st_collections_group_physics_world_depth},
 #endif
-     FILTERS_STATEMENTS("collections.group.") /* dup */
-     PROGRAM_STATEMENTS("collections.group.parts.part.description")
-     PROGRAM_STATEMENTS("collections.group.parts.part")
-     PROGRAM_STATEMENTS("collections.group.parts")
-     PROGRAM_STATEMENTS("collections.group")
+   FILTERS_STATEMENTS("collections.group.")   /* dup */
+   PROGRAM_STATEMENTS("collections.group.parts.part.description")
+   PROGRAM_STATEMENTS("collections.group.parts.part")
+   PROGRAM_STATEMENTS("collections.group.parts")
+   PROGRAM_STATEMENTS("collections.group")
 };
 
 /** @edcsection{lazedc,
@@ -1088,7 +1115,7 @@ New_Statement_Handler statement_handlers[] =
         if a block name is the same as an existing EDC keyword.
     @since 1.10
     @endblock
-*/
+ */
 
 /** @edcsubsection{lazedc_synonyms,
  *                 LazEDC Synonyms} */
@@ -1123,19 +1150,18 @@ New_Statement_Handler statement_handlers[] =
         These statements on the left are identical to their original keywords on the right.
     @since 1.10
     @endblock
-*/
-
+ */
 
 New_Statement_Handler statement_handlers_short[] =
 {
-     {"collections.group.parts.part.before", st_collections_group_parts_part_insert_before},
-     {"collections.group.parts.part.after", st_collections_group_parts_part_insert_after},
-     {"collections.group.parts.part.ignore", st_collections_group_parts_part_ignore_flags},
-     {"collections.group.parts.part.mask", st_collections_group_parts_part_mask_flags},
-     {"collections.group.parts.part.pointer", st_collections_group_parts_part_pointer_mode},
-     {"collections.group.parts.part.alt_font", st_collections_group_parts_part_use_alternate_font_metrics},
-     {"collections.group.parts.part.clip", st_collections_group_parts_part_clip_to_id},
-     {"collections.group.parts.part.description.clip", st_collections_group_parts_part_description_clip_to_id},
+   {"collections.group.parts.part.before", st_collections_group_parts_part_insert_before},
+   {"collections.group.parts.part.after", st_collections_group_parts_part_insert_after},
+   {"collections.group.parts.part.ignore", st_collections_group_parts_part_ignore_flags},
+   {"collections.group.parts.part.mask", st_collections_group_parts_part_mask_flags},
+   {"collections.group.parts.part.pointer", st_collections_group_parts_part_pointer_mode},
+   {"collections.group.parts.part.alt_font", st_collections_group_parts_part_use_alternate_font_metrics},
+   {"collections.group.parts.part.clip", st_collections_group_parts_part_clip_to_id},
+   {"collections.group.parts.part.description.clip", st_collections_group_parts_part_description_clip_to_id},
 };
 
 /** @edcsubsection{lazedc_shorthand,
@@ -1181,31 +1207,31 @@ New_Statement_Handler statement_handlers_short[] =
         but they are shorter.
     @since 1.10
     @endblock
-*/
+ */
 New_Statement_Handler statement_handlers_short_single[] =
 {
-     {"collections.group.parts.part.mouse", st_collections_group_parts_part_mouse},
-     {"collections.group.parts.part.nomouse", st_collections_group_parts_part_nomouse},
-     {"collections.group.parts.part.repeat", st_collections_group_parts_part_repeat},
-     {"collections.group.parts.part.norepeat", st_collections_group_parts_part_norepeat},
-     {"collections.group.parts.part.precise", st_collections_group_parts_part_precise},
-     {"collections.group.parts.part.noprecise", st_collections_group_parts_part_noprecise},
-     {"collections.group.parts.part.scale", st_collections_group_parts_part_scale},
-     {"collections.group.parts.part.noscale", st_collections_group_parts_part_noscale},
-     {"collections.group.parts.part.render", st_collections_group_parts_part_render},
-     {"collections.group.parts.part.norender", st_collections_group_parts_part_no_render},
-     {"collections.group.parts.part.required", st_collections_group_parts_part_required},
-     {"collections.group.parts.part.norequired", st_collections_group_parts_part_norequired},
-     {"collections.group.parts.part.description.vis", st_collections_group_parts_part_description_vis},
-     {"collections.group.parts.part.description.hid", st_collections_group_parts_part_description_hid},
-     {"collections.group.parts.part.description.offscale", st_collections_group_parts_part_description_offset_scale},
-     {"collections.group.mouse", st_collections_group_mouse},
-     {"collections.group.nomouse", st_collections_group_nomouse},
-     {"collections.group.broadcast", st_collections_group_broadcast},
-     {"collections.group.nobroadcast", st_collections_group_nobroadcast},
-     {"collections.group.inherit_script", st_collections_group_inherit_script},
-     {"collections.group.noinherit_script", st_collections_group_noinherit_script},
-     {"collections.group.parts.part.description.inherit", st_collections_group_parts_part_description_inherit},
+   {"collections.group.parts.part.mouse", st_collections_group_parts_part_mouse},
+   {"collections.group.parts.part.nomouse", st_collections_group_parts_part_nomouse},
+   {"collections.group.parts.part.repeat", st_collections_group_parts_part_repeat},
+   {"collections.group.parts.part.norepeat", st_collections_group_parts_part_norepeat},
+   {"collections.group.parts.part.precise", st_collections_group_parts_part_precise},
+   {"collections.group.parts.part.noprecise", st_collections_group_parts_part_noprecise},
+   {"collections.group.parts.part.scale", st_collections_group_parts_part_scale},
+   {"collections.group.parts.part.noscale", st_collections_group_parts_part_noscale},
+   {"collections.group.parts.part.render", st_collections_group_parts_part_render},
+   {"collections.group.parts.part.norender", st_collections_group_parts_part_no_render},
+   {"collections.group.parts.part.required", st_collections_group_parts_part_required},
+   {"collections.group.parts.part.norequired", st_collections_group_parts_part_norequired},
+   {"collections.group.parts.part.description.vis", st_collections_group_parts_part_description_vis},
+   {"collections.group.parts.part.description.hid", st_collections_group_parts_part_description_hid},
+   {"collections.group.parts.part.description.offscale", st_collections_group_parts_part_description_offset_scale},
+   {"collections.group.mouse", st_collections_group_mouse},
+   {"collections.group.nomouse", st_collections_group_nomouse},
+   {"collections.group.broadcast", st_collections_group_broadcast},
+   {"collections.group.nobroadcast", st_collections_group_nobroadcast},
+   {"collections.group.inherit_script", st_collections_group_inherit_script},
+   {"collections.group.noinherit_script", st_collections_group_noinherit_script},
+   {"collections.group.parts.part.description.inherit", st_collections_group_parts_part_description_inherit},
 };
 
 /** @edcsubsection{lazedc_external_params,
@@ -1241,7 +1267,7 @@ New_Statement_Handler statement_handlers_short_single[] =
        String without quotes except for 'true' or 'false' is considered as a choice.
     @since 1.18
     @endblock
-*/
+ */
 static Edje_External_Param_Type
 _parse_external_param_type(char *token)
 {
@@ -1306,7 +1332,7 @@ st_collections_group_parts_part_description_params_smart(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_External*) current_desc;
+   ed = (Edje_Part_Description_External *)current_desc;
 
    last = eina_list_last_data_get(stack);
    if (!strncmp(last, "params.", strlen("params.")))
@@ -1341,25 +1367,29 @@ st_collections_group_parts_part_description_params_smart(void)
    switch (param->type)
      {
       case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-         if (!strcmp(token, "true"))
-           param->i = 1;
-         else if (!strcmp(token, "false"))
-           param->i = 0;
-         break;
+        if (!strcmp(token, "true"))
+          param->i = 1;
+        else if (!strcmp(token, "false"))
+          param->i = 0;
+        break;
+
       case EDJE_EXTERNAL_PARAM_TYPE_INT:
-         param->i = parse_int(0);
-         break;
+        param->i = parse_int(0);
+        break;
+
       case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-         param->d = parse_float(0);
-         break;
+        param->d = parse_float(0);
+        break;
+
       case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
       case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-         param->s = parse_str(0);
-         break;
+        param->s = parse_str(0);
+        break;
+
       default:
-         ERR("parse error %s:%i. Invalid param type.",
-             file_in, line - 1);
-         break;
+        ERR("parse error %s:%i. Invalid param type.",
+            file_in, line - 1);
+        break;
      }
 
    if (!found)
@@ -1368,196 +1398,196 @@ st_collections_group_parts_part_description_params_smart(void)
    free(token);
 }
 
-#define PROGRAM_OBJECTS(PREFIX) \
-     {PREFIX".program", ob_collections_group_programs_program}, /* dup */ \
-     {PREFIX".program.script", ob_collections_group_programs_program_script}, /* dup */ \
-     {PREFIX".program.sequence.script", ob_collections_group_programs_program_script}, /* dup */ \
-     {PREFIX".program.sequence", ob_collections_group_programs_program_sequence}, /* dup */ \
-     {PREFIX".programs", NULL}, /* dup */ \
-     {PREFIX".programs.set", ob_images_set}, /* dup */ \
-     {PREFIX".programs.set.image", ob_images_set_image}, /* dup */ \
-     {PREFIX".programs.images", NULL}, /* dup */ \
-     {PREFIX".programs.images.set", ob_images_set}, /* dup */ \
-     {PREFIX".programs.images.set.image", ob_images_set_image}, /* dup */ \
-     {PREFIX".programs.fonts", NULL}, /* dup */ \
-     {PREFIX".programs.program", ob_collections_group_programs_program}, /* dup */ \
-     {PREFIX".programs.program.script", ob_collections_group_programs_program_script}, /* dup */ \
-     {PREFIX".programs.program.sequence", ob_collections_group_programs_program_sequence}, /* dup */ \
-     {PREFIX".programs.program.sequence.script", ob_collections_group_programs_program_script}, /* dup */ \
-     {PREFIX".programs.script", ob_collections_group_script}, /* dup */ \
-     {PREFIX".script", ob_collections_group_script}, /* dup */
+#define PROGRAM_OBJECTS(PREFIX)                                                                           \
+  {PREFIX ".program", ob_collections_group_programs_program},   /* dup */                                 \
+  {PREFIX ".program.script", ob_collections_group_programs_program_script},   /* dup */                   \
+  {PREFIX ".program.sequence.script", ob_collections_group_programs_program_script},   /* dup */          \
+  {PREFIX ".program.sequence", ob_collections_group_programs_program_sequence},   /* dup */               \
+  {PREFIX ".programs", NULL},   /* dup */                                                                 \
+  {PREFIX ".programs.set", ob_images_set},   /* dup */                                                    \
+  {PREFIX ".programs.set.image", ob_images_set_image},   /* dup */                                        \
+  {PREFIX ".programs.images", NULL},   /* dup */                                                          \
+  {PREFIX ".programs.images.set", ob_images_set},   /* dup */                                             \
+  {PREFIX ".programs.images.set.image", ob_images_set_image},   /* dup */                                 \
+  {PREFIX ".programs.fonts", NULL},   /* dup */                                                           \
+  {PREFIX ".programs.program", ob_collections_group_programs_program},   /* dup */                        \
+  {PREFIX ".programs.program.script", ob_collections_group_programs_program_script},   /* dup */          \
+  {PREFIX ".programs.program.sequence", ob_collections_group_programs_program_sequence},   /* dup */      \
+  {PREFIX ".programs.program.sequence.script", ob_collections_group_programs_program_script},   /* dup */ \
+  {PREFIX ".programs.script", ob_collections_group_script},   /* dup */                                   \
+  {PREFIX ".script", ob_collections_group_script},   /* dup */
 
 New_Object_Handler object_handlers[] =
 {
-     {"externals", NULL},
-     {"images", NULL},
-     {"images.set", ob_images_set},
-     {"images.set.image", ob_images_set_image},
-     {"fonts", NULL},
-     {"data", NULL},
-     {"styles", NULL},
-     {"styles.style", ob_styles_style},
-     {"color_tree", ob_color_tree},
-     {"color_classes", NULL},
-     {"color_classes.color_class", ob_color_class},
-     {"text_classes", NULL},
-     {"text_classes.text_class", ob_text_class},
-     {"size_classes", NULL},
-     {"size_classes.size_class", ob_size_class},
-     {"spectra", NULL},
-     {"filters", NULL},
-     {"filters.filter", ob_filters_filter},
-     {"filters.filter.script", ob_filters_filter_script},
-     {"collections", ob_collections},
-     {"collections.externals", NULL}, /* dup */
-     {"collections.set", ob_images_set}, /* dup */
-     {"collections.set.image", ob_images_set_image}, /* dup */
-     {"collections.images", NULL}, /* dup */
-     {"collections.images.set", ob_images_set}, /* dup */
-     {"collections.images.set.image", ob_images_set_image}, /* dup */
-     {"collections.fonts", NULL}, /* dup */
-     {"collections.styles", NULL}, /* dup */
-     {"collections.styles.style", ob_styles_style}, /* dup */
-     {"collections.color_tree", ob_color_tree}, /* dup */
-     {"collections.color_classes", NULL}, /* dup */
-     {"collections.color_classes.color_class", ob_color_class}, /* dup */
-     {"collections.text_classes", NULL},
-     {"collections.text_classes.text_class", ob_text_class}, /* dup */
-     {"collections.size_classes", NULL}, /* dup */
-     {"collections.size_classes.size_class", ob_size_class}, /* dup */
-     {"collections.sounds", NULL},
-     {"collections.group.sounds", NULL}, /* dup */
-     {"collections.sounds.sample", NULL},
-     {"collections.translation", NULL},
-     {"collections.translation.file", NULL},
-     {"collections.group.translation", NULL},/*dup*/
-     {"collections.group.translation.file", NULL},/*dup*/
-     {"collections.group.sounds.sample", NULL}, /* dup */
-     {"collections.vibrations", NULL},
-     {"collections.group.vibrations", NULL}, /* dup */
-     {"collections.vibrations.sample", NULL},
-     {"collections.filters", NULL},
-     {"collections.filters.filter", ob_filters_filter}, /* dup */
-     {"collections.filters.filter.script", ob_filters_filter_script}, /* dup */
-     {"collections.group.vibrations.sample", NULL}, /* dup */
-     {"collections.group", ob_collections_group},
-     {"collections.group.data", NULL},
-     {"collections.group.limits", NULL},
-     {"collections.group.script", ob_collections_group_script},
-     {"collections.group.lua_script", ob_collections_group_lua_script},
-     {"collections.group.externals", NULL}, /* dup */
-     {"collections.group.set", ob_images_set}, /* dup */
-     {"collections.group.set.image", ob_images_set_image}, /* dup */
-     {"collections.group.images", NULL}, /* dup */
-     {"collections.group.models", NULL}, /* dup */
-     {"collections.group.images.set", ob_images_set}, /* dup */
-     {"collections.group.images.set.image", ob_images_set_image}, /* dup */
-     {"collections.group.fonts", NULL}, /* dup */
-     {"collections.group.styles", NULL}, /* dup */
-     {"collections.group.styles.style", ob_styles_style}, /* dup */
-     {"collections.group.color_tree", ob_color_tree}, /* dup */
-     {"collections.group.color_classes", NULL}, /* dup */
-     {"collections.group.color_classes.color_class", ob_color_class}, /* dup */
-     {"collections.group.text_classes", NULL},
-     {"collections.group.text_classes.text_class", ob_text_class}, /* dup */
-     {"collections.group.size_classes", NULL}, /* dup */
-     {"collections.group.size_classes.size_class", ob_size_class}, /* dup */
-     {"collections.group.filters", NULL},
-     {"collections.group.filters.filter", ob_filters_filter}, /* dup */
-     {"collections.group.filters.filter.script", ob_filters_filter_script}, /* dup */
-     {"collections.group.parts", NULL},
-     {"collections.group.parts.set", ob_images_set}, /* dup */
-     {"collections.group.parts.set.image", ob_images_set_image}, /* dup */
-     {"collections.group.parts.images", NULL}, /* dup */
-     {"collections.group.parts.images.set", ob_images_set}, /* dup */
-     {"collections.group.parts.images.set.image", ob_images_set_image}, /* dup */
-     {"collections.group.parts.fonts", NULL}, /* dup */
-     {"collections.group.parts.styles", NULL}, /* dup */
-     {"collections.group.parts.styles.style", ob_styles_style}, /* dup */
-     {"collections.group.parts.color_classes", NULL}, /* dup */
-     {"collections.group.parts.color_classes.color_class", ob_color_class}, /* dup */
-     {"collections.group.parts.text_classes", NULL},
-     {"collections.group.parts.text_classes.text_class", ob_text_class}, /* dup */
-     {"collections.group.parts.size_classes", NULL}, /* dup */
-     {"collections.group.parts.size_classes.size_class", ob_size_class}, /* dup */
-     {"collections.group.parts.part", ob_collections_group_parts_part},
-     {"collections.group.parts.part.dragable", NULL},
-     {"collections.group.parts.part.set", ob_images_set}, /* dup */
-     {"collections.group.parts.part.set.image", ob_images_set_image}, /* dup */
-     {"collections.group.parts.part.images", NULL}, /* dup */
-     {"collections.group.parts.part.images.set", ob_images_set}, /* dup */
-     {"collections.group.parts.part.images.set.image", ob_images_set_image}, /* dup */
-     {"collections.group.parts.part.fonts", NULL}, /* dup */
-     {"collections.group.parts.part.styles", NULL}, /* dup */
-     {"collections.group.parts.part.styles.style", ob_styles_style}, /* dup */
-     {"collections.group.parts.part.color_classes", NULL}, /* dup */
-     {"collections.group.parts.part.color_classes.color_class", ob_color_class}, /* dup */
-     {"collections.group.parts.part.text_classes", NULL},
-     {"collections.group.parts.part.text_classes.text_class", ob_text_class}, /* dup */
-     {"collections.group.parts.part.size_classes", NULL}, /* dup */
-     {"collections.group.parts.part.size_classes.size_class", ob_size_class}, /* dup */
-     {"collections.group.parts.part.box", NULL},
-     {"collections.group.parts.part.box.items", NULL},
-     {"collections.group.parts.part.box.items.item", ob_collections_group_parts_part_box_items_item},
-     {"collections.group.parts.part.table", NULL},
-     {"collections.group.parts.part.table.items", NULL},
-     {"collections.group.parts.part.table.items.item", ob_collections_group_parts_part_box_items_item}, /* dup */
-     {"collections.group.parts.part.description", ob_collections_group_parts_part_description},
-     {"collections.group.parts.part.description.link", ob_collections_group_parts_part_description_link},
-     {"collections.group.parts.part.description.rel1", NULL},
-     {"collections.group.parts.part.description.rel2", NULL},
-     {"collections.group.parts.part.description.anchors", NULL},
-     {"collections.group.parts.part.description.image", NULL}, /* dup */
-     {"collections.group.parts.part.description.image.set", ob_images_set}, /* dup */
-     {"collections.group.parts.part.description.image.set.image", ob_images_set_image}, /* dup */
-     {"collections.group.parts.part.description.image.images", NULL}, /* dup */
-     {"collections.group.parts.part.description.image.images.set", ob_images_set}, /* dup */
-     {"collections.group.parts.part.description.image.images.set.image", ob_images_set_image}, /* dup */
-     {"collections.group.parts.part.description.fill", NULL},
-     {"collections.group.parts.part.description.fill.origin", NULL},
-     {"collections.group.parts.part.description.fill.size", NULL},
-     {"collections.group.parts.part.description.text", NULL},
-     {"collections.group.parts.part.description.text.fonts", NULL}, /* dup */
-     {"collections.group.parts.part.description.images", NULL}, /* dup */
-     {"collections.group.parts.part.description.images.set", ob_images_set}, /* dup */
-     {"collections.group.parts.part.description.images.set.image", ob_images_set_image}, /* dup */
-     {"collections.group.parts.part.description.fonts", NULL}, /* dup */
-     {"collections.group.parts.part.description.styles", NULL}, /* dup */
-     {"collections.group.parts.part.description.styles.style", ob_styles_style}, /* dup */
-     {"collections.group.parts.part.description.box", NULL},
-     {"collections.group.parts.part.description.table", NULL},
-     {"collections.group.parts.part.description.position", NULL},
-     {"collections.group.parts.part.description.properties", NULL},
-     {"collections.group.parts.part.description.orientation", NULL},
-     {"collections.group.parts.part.description.texture", ob_collections_group_parts_part_description_texture},
-     {"collections.group.parts.part.description.mesh", NULL},
-     {"collections.group.parts.part.description.filter", NULL},
-     {"collections.group.parts.part.description.proxy", NULL},
+   {"externals", NULL},
+   {"images", NULL},
+   {"images.set", ob_images_set},
+   {"images.set.image", ob_images_set_image},
+   {"fonts", NULL},
+   {"data", NULL},
+   {"styles", NULL},
+   {"styles.style", ob_styles_style},
+   {"color_tree", ob_color_tree},
+   {"color_classes", NULL},
+   {"color_classes.color_class", ob_color_class},
+   {"text_classes", NULL},
+   {"text_classes.text_class", ob_text_class},
+   {"size_classes", NULL},
+   {"size_classes.size_class", ob_size_class},
+   {"spectra", NULL},
+   {"filters", NULL},
+   {"filters.filter", ob_filters_filter},
+   {"filters.filter.script", ob_filters_filter_script},
+   {"collections", ob_collections},
+   {"collections.externals", NULL},   /* dup */
+   {"collections.set", ob_images_set},   /* dup */
+   {"collections.set.image", ob_images_set_image},   /* dup */
+   {"collections.images", NULL},   /* dup */
+   {"collections.images.set", ob_images_set},   /* dup */
+   {"collections.images.set.image", ob_images_set_image},   /* dup */
+   {"collections.fonts", NULL},   /* dup */
+   {"collections.styles", NULL},   /* dup */
+   {"collections.styles.style", ob_styles_style},   /* dup */
+   {"collections.color_tree", ob_color_tree},   /* dup */
+   {"collections.color_classes", NULL},   /* dup */
+   {"collections.color_classes.color_class", ob_color_class},   /* dup */
+   {"collections.text_classes", NULL},
+   {"collections.text_classes.text_class", ob_text_class},   /* dup */
+   {"collections.size_classes", NULL},   /* dup */
+   {"collections.size_classes.size_class", ob_size_class},   /* dup */
+   {"collections.sounds", NULL},
+   {"collections.group.sounds", NULL},   /* dup */
+   {"collections.sounds.sample", NULL},
+   {"collections.translation", NULL},
+   {"collections.translation.file", NULL},
+   {"collections.group.translation", NULL},  /*dup*/
+   {"collections.group.translation.file", NULL},  /*dup*/
+   {"collections.group.sounds.sample", NULL},   /* dup */
+   {"collections.vibrations", NULL},
+   {"collections.group.vibrations", NULL},   /* dup */
+   {"collections.vibrations.sample", NULL},
+   {"collections.filters", NULL},
+   {"collections.filters.filter", ob_filters_filter},   /* dup */
+   {"collections.filters.filter.script", ob_filters_filter_script},   /* dup */
+   {"collections.group.vibrations.sample", NULL},   /* dup */
+   {"collections.group", ob_collections_group},
+   {"collections.group.data", NULL},
+   {"collections.group.limits", NULL},
+   {"collections.group.script", ob_collections_group_script},
+   {"collections.group.lua_script", ob_collections_group_lua_script},
+   {"collections.group.externals", NULL},   /* dup */
+   {"collections.group.set", ob_images_set},   /* dup */
+   {"collections.group.set.image", ob_images_set_image},   /* dup */
+   {"collections.group.images", NULL},   /* dup */
+   {"collections.group.models", NULL},   /* dup */
+   {"collections.group.images.set", ob_images_set},   /* dup */
+   {"collections.group.images.set.image", ob_images_set_image},   /* dup */
+   {"collections.group.fonts", NULL},   /* dup */
+   {"collections.group.styles", NULL},   /* dup */
+   {"collections.group.styles.style", ob_styles_style},   /* dup */
+   {"collections.group.color_tree", ob_color_tree},   /* dup */
+   {"collections.group.color_classes", NULL},   /* dup */
+   {"collections.group.color_classes.color_class", ob_color_class},   /* dup */
+   {"collections.group.text_classes", NULL},
+   {"collections.group.text_classes.text_class", ob_text_class},   /* dup */
+   {"collections.group.size_classes", NULL},   /* dup */
+   {"collections.group.size_classes.size_class", ob_size_class},   /* dup */
+   {"collections.group.filters", NULL},
+   {"collections.group.filters.filter", ob_filters_filter},   /* dup */
+   {"collections.group.filters.filter.script", ob_filters_filter_script},   /* dup */
+   {"collections.group.parts", NULL},
+   {"collections.group.parts.set", ob_images_set},   /* dup */
+   {"collections.group.parts.set.image", ob_images_set_image},   /* dup */
+   {"collections.group.parts.images", NULL},   /* dup */
+   {"collections.group.parts.images.set", ob_images_set},   /* dup */
+   {"collections.group.parts.images.set.image", ob_images_set_image},   /* dup */
+   {"collections.group.parts.fonts", NULL},   /* dup */
+   {"collections.group.parts.styles", NULL},   /* dup */
+   {"collections.group.parts.styles.style", ob_styles_style},   /* dup */
+   {"collections.group.parts.color_classes", NULL},   /* dup */
+   {"collections.group.parts.color_classes.color_class", ob_color_class},   /* dup */
+   {"collections.group.parts.text_classes", NULL},
+   {"collections.group.parts.text_classes.text_class", ob_text_class},   /* dup */
+   {"collections.group.parts.size_classes", NULL},   /* dup */
+   {"collections.group.parts.size_classes.size_class", ob_size_class},   /* dup */
+   {"collections.group.parts.part", ob_collections_group_parts_part},
+   {"collections.group.parts.part.dragable", NULL},
+   {"collections.group.parts.part.set", ob_images_set},   /* dup */
+   {"collections.group.parts.part.set.image", ob_images_set_image},   /* dup */
+   {"collections.group.parts.part.images", NULL},   /* dup */
+   {"collections.group.parts.part.images.set", ob_images_set},   /* dup */
+   {"collections.group.parts.part.images.set.image", ob_images_set_image},   /* dup */
+   {"collections.group.parts.part.fonts", NULL},   /* dup */
+   {"collections.group.parts.part.styles", NULL},   /* dup */
+   {"collections.group.parts.part.styles.style", ob_styles_style},   /* dup */
+   {"collections.group.parts.part.color_classes", NULL},   /* dup */
+   {"collections.group.parts.part.color_classes.color_class", ob_color_class},   /* dup */
+   {"collections.group.parts.part.text_classes", NULL},
+   {"collections.group.parts.part.text_classes.text_class", ob_text_class},   /* dup */
+   {"collections.group.parts.part.size_classes", NULL},   /* dup */
+   {"collections.group.parts.part.size_classes.size_class", ob_size_class},   /* dup */
+   {"collections.group.parts.part.box", NULL},
+   {"collections.group.parts.part.box.items", NULL},
+   {"collections.group.parts.part.box.items.item", ob_collections_group_parts_part_box_items_item},
+   {"collections.group.parts.part.table", NULL},
+   {"collections.group.parts.part.table.items", NULL},
+   {"collections.group.parts.part.table.items.item", ob_collections_group_parts_part_box_items_item},   /* dup */
+   {"collections.group.parts.part.description", ob_collections_group_parts_part_description},
+   {"collections.group.parts.part.description.link", ob_collections_group_parts_part_description_link},
+   {"collections.group.parts.part.description.rel1", NULL},
+   {"collections.group.parts.part.description.rel2", NULL},
+   {"collections.group.parts.part.description.anchors", NULL},
+   {"collections.group.parts.part.description.image", NULL},   /* dup */
+   {"collections.group.parts.part.description.image.set", ob_images_set},   /* dup */
+   {"collections.group.parts.part.description.image.set.image", ob_images_set_image},   /* dup */
+   {"collections.group.parts.part.description.image.images", NULL},   /* dup */
+   {"collections.group.parts.part.description.image.images.set", ob_images_set},   /* dup */
+   {"collections.group.parts.part.description.image.images.set.image", ob_images_set_image},   /* dup */
+   {"collections.group.parts.part.description.fill", NULL},
+   {"collections.group.parts.part.description.fill.origin", NULL},
+   {"collections.group.parts.part.description.fill.size", NULL},
+   {"collections.group.parts.part.description.text", NULL},
+   {"collections.group.parts.part.description.text.fonts", NULL},   /* dup */
+   {"collections.group.parts.part.description.images", NULL},   /* dup */
+   {"collections.group.parts.part.description.images.set", ob_images_set},   /* dup */
+   {"collections.group.parts.part.description.images.set.image", ob_images_set_image},   /* dup */
+   {"collections.group.parts.part.description.fonts", NULL},   /* dup */
+   {"collections.group.parts.part.description.styles", NULL},   /* dup */
+   {"collections.group.parts.part.description.styles.style", ob_styles_style},   /* dup */
+   {"collections.group.parts.part.description.box", NULL},
+   {"collections.group.parts.part.description.table", NULL},
+   {"collections.group.parts.part.description.position", NULL},
+   {"collections.group.parts.part.description.properties", NULL},
+   {"collections.group.parts.part.description.orientation", NULL},
+   {"collections.group.parts.part.description.texture", ob_collections_group_parts_part_description_texture},
+   {"collections.group.parts.part.description.mesh", NULL},
+   {"collections.group.parts.part.description.filter", NULL},
+   {"collections.group.parts.part.description.proxy", NULL},
 #ifdef HAVE_EPHYSICS
-     {"collections.group.parts.part.description.physics", NULL},
-     {"collections.group.parts.part.description.physics.movement_freedom", NULL},
-     {"collections.group.parts.part.description.physics.faces", NULL},
-     {"collections.group.parts.part.description.physics.faces.face", st_collections_group_parts_part_description_physics_face},
+   {"collections.group.parts.part.description.physics", NULL},
+   {"collections.group.parts.part.description.physics.movement_freedom", NULL},
+   {"collections.group.parts.part.description.physics.faces", NULL},
+   {"collections.group.parts.part.description.physics.faces.face", st_collections_group_parts_part_description_physics_face},
 #endif
-     {"collections.group.parts.part.description.map", NULL},
-     {"collections.group.parts.part.description.map.rotation", NULL},
-     {"collections.group.parts.part.description.map.zoom", NULL},
-     {"collections.group.parts.part.description.perspective", NULL},
-     {"collections.group.parts.part.description.params", NULL},
-     {"collections.group.parts.part.description.color_classes", NULL}, /* dup */
-     {"collections.group.parts.part.description.color_classes.color_class", ob_color_class}, /* dup */
-     {"collections.group.parts.part.description.text_classes", NULL}, /* dup */
-     {"collections.group.parts.part.description.text_classes.text_class", ob_text_class}, /* dup */
-     {"collections.group.parts.part.description.size_classes", NULL}, /* dup */
-     {"collections.group.parts.part.description.size_classes.size_class", ob_size_class}, /* dup */
+   {"collections.group.parts.part.description.map", NULL},
+   {"collections.group.parts.part.description.map.rotation", NULL},
+   {"collections.group.parts.part.description.map.zoom", NULL},
+   {"collections.group.parts.part.description.perspective", NULL},
+   {"collections.group.parts.part.description.params", NULL},
+   {"collections.group.parts.part.description.color_classes", NULL},   /* dup */
+   {"collections.group.parts.part.description.color_classes.color_class", ob_color_class},   /* dup */
+   {"collections.group.parts.part.description.text_classes", NULL},   /* dup */
+   {"collections.group.parts.part.description.text_classes.text_class", ob_text_class},   /* dup */
+   {"collections.group.parts.part.description.size_classes", NULL},   /* dup */
+   {"collections.group.parts.part.description.size_classes.size_class", ob_size_class},   /* dup */
 #ifdef HAVE_EPHYSICS
-     {"collections.group.physics", NULL},
-     {"collections.group.physics.world", NULL},
+   {"collections.group.physics", NULL},
+   {"collections.group.physics.world", NULL},
 #endif
-     PROGRAM_OBJECTS("collections.group.parts.part.description")
-     PROGRAM_OBJECTS("collections.group.parts.part")
-     PROGRAM_OBJECTS("collections.group.parts")
-     PROGRAM_OBJECTS("collections.group")
+   PROGRAM_OBJECTS("collections.group.parts.part.description")
+   PROGRAM_OBJECTS("collections.group.parts.part")
+   PROGRAM_OBJECTS("collections.group.parts")
+   PROGRAM_OBJECTS("collections.group")
 };
 
 /** @edcsubsection{lazedc_blocks,
@@ -1591,45 +1621,45 @@ New_Object_Handler object_handlers[] =
     @description
         Lowercase part types can be specified as blocks with the same effect as part { type: TYPE; }
         The "description" block can also be shortened to "desc".
-        
+
     @since 1.10
     @endblock
-*/
+ */
 New_Object_Handler object_handlers_short[] =
 {
-     {"collections.group.parts.rect", ob_collections_group_parts_part_short},
-     {"collections.group.parts.text", ob_collections_group_parts_part_short},
-     {"collections.group.parts.image", ob_collections_group_parts_part_short},
-     {"collections.group.parts.swallow", ob_collections_group_parts_part_short},
-     {"collections.group.parts.textblock", ob_collections_group_parts_part_short},
-     {"collections.group.parts.group", ob_collections_group_parts_part_short},
-     {"collections.group.parts.box", ob_collections_group_parts_part_short},
-     {"collections.group.parts.table", ob_collections_group_parts_part_short},
-     {"collections.group.parts.external", ob_collections_group_parts_part_short},
-     {"collections.group.parts.proxy", ob_collections_group_parts_part_short},
-     {"collections.group.parts.spacer", ob_collections_group_parts_part_short},
-     {"collections.group.parts.snapshot", ob_collections_group_parts_part_short},
-     {"collections.group.parts.part.desc", ob_collections_group_parts_part_desc},
-     {"collections.group.parts.vector", ob_collections_group_parts_part_short},
+   {"collections.group.parts.rect", ob_collections_group_parts_part_short},
+   {"collections.group.parts.text", ob_collections_group_parts_part_short},
+   {"collections.group.parts.image", ob_collections_group_parts_part_short},
+   {"collections.group.parts.swallow", ob_collections_group_parts_part_short},
+   {"collections.group.parts.textblock", ob_collections_group_parts_part_short},
+   {"collections.group.parts.group", ob_collections_group_parts_part_short},
+   {"collections.group.parts.box", ob_collections_group_parts_part_short},
+   {"collections.group.parts.table", ob_collections_group_parts_part_short},
+   {"collections.group.parts.external", ob_collections_group_parts_part_short},
+   {"collections.group.parts.proxy", ob_collections_group_parts_part_short},
+   {"collections.group.parts.spacer", ob_collections_group_parts_part_short},
+   {"collections.group.parts.snapshot", ob_collections_group_parts_part_short},
+   {"collections.group.parts.part.desc", ob_collections_group_parts_part_desc},
+   {"collections.group.parts.vector", ob_collections_group_parts_part_short},
 };
 
 New_Nested_Handler nested_handlers[] = {
-     {"collections.group.parts", "part", NULL, edje_cc_handlers_hierarchy_pop }
+   {"collections.group.parts", "part", NULL, edje_cc_handlers_hierarchy_pop }
 };
 
 New_Nested_Handler nested_handlers_short[] = {
-     {"collections.group.parts", "rect", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "text", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "image", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "swallow", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "textblock", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "group", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "box", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "table", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "external", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "proxy", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "spacer", NULL, edje_cc_handlers_hierarchy_pop },
-     {"collections.group.parts", "vector", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "rect", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "text", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "image", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "swallow", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "textblock", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "group", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "box", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "table", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "external", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "proxy", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "spacer", NULL, edje_cc_handlers_hierarchy_pop },
+   {"collections.group.parts", "vector", NULL, edje_cc_handlers_hierarchy_pop },
 };
 
 /*****/
@@ -1714,12 +1744,12 @@ part_description_image_cleanup(Edje_Part *ep)
    if (ep->type != EDJE_PART_TYPE_IMAGE)
      return;
 
-   ed = (Edje_Part_Description_Image*) ep->default_desc;
+   ed = (Edje_Part_Description_Image *)ep->default_desc;
    _edje_part_description_image_remove(ed);
 
    for (j = 0; j < ep->other.desc_count; j++)
      {
-        ed = (Edje_Part_Description_Image*) ep->other.desc[j];
+        ed = (Edje_Part_Description_Image *)ep->other.desc[j];
         _edje_part_description_image_remove(ed);
      }
 }
@@ -1735,265 +1765,276 @@ _edje_part_description_alloc(unsigned char type, const char *collection, const c
       case EDJE_PART_TYPE_RECTANGLE:
       case EDJE_PART_TYPE_SWALLOW:
       case EDJE_PART_TYPE_GROUP:
-	 result = mem_alloc(SZ(Edje_Part_Description_Common));
-	 break;
+        result = mem_alloc(SZ(Edje_Part_Description_Common));
+        break;
+
       case EDJE_PART_TYPE_TEXT:
       case EDJE_PART_TYPE_TEXTBLOCK:
-	{
-	   Edje_Part_Description_Text *ed;
-
-	   ed = mem_alloc(SZ(Edje_Part_Description_Text));
-
-	   ed->text.color3.r = 0;
-	   ed->text.color3.g = 0;
-	   ed->text.color3.b = 0;
-	   ed->text.color3.a = 128;
-	   ed->text.align.x = FROM_DOUBLE(0.5);
-	   ed->text.align.y = FROM_DOUBLE(0.5);
-	   ed->text.id_source = -1;
-	   ed->text.id_text_source = -1;
-
-	   result = &ed->common;
-	   break;
-	}
+      {
+         Edje_Part_Description_Text *ed;
+
+         ed = mem_alloc(SZ(Edje_Part_Description_Text));
+
+         ed->text.color3.r = 0;
+         ed->text.color3.g = 0;
+         ed->text.color3.b = 0;
+         ed->text.color3.a = 128;
+         ed->text.align.x = FROM_DOUBLE(0.5);
+         ed->text.align.y = FROM_DOUBLE(0.5);
+         ed->text.id_source = -1;
+         ed->text.id_text_source = -1;
+
+         result = &ed->common;
+         break;
+      }
+
       case EDJE_PART_TYPE_IMAGE:
-	{
-	   Edje_Part_Description_Image *ed;
+      {
+         Edje_Part_Description_Image *ed;
 
-	   ed = mem_alloc(SZ(Edje_Part_Description_Image));
+         ed = mem_alloc(SZ(Edje_Part_Description_Image));
 
-	   ed->image.id = -1;
+         ed->image.id = -1;
 
-           _edje_part_description_fill(&ed->image.fill);
+         _edje_part_description_fill(&ed->image.fill);
+
+         result = &ed->common;
+         break;
+      }
 
-	   result = &ed->common;
-	   break;
-        }
       case EDJE_PART_TYPE_SNAPSHOT:
-        {
-           Edje_Part_Description_Snapshot *ed;
+      {
+         Edje_Part_Description_Snapshot *ed;
 
-           ed = mem_alloc(SZ(Edje_Part_Description_Snapshot));
+         ed = mem_alloc(SZ(Edje_Part_Description_Snapshot));
+
+         result = &ed->common;
+         break;
+      }
 
-           result = &ed->common;
-           break;
-        }
       case EDJE_PART_TYPE_PROXY:
-        {
-           Edje_Part_Description_Proxy *ed;
+      {
+         Edje_Part_Description_Proxy *ed;
 
-           ed = mem_alloc(SZ(Edje_Part_Description_Proxy));
+         ed = mem_alloc(SZ(Edje_Part_Description_Proxy));
 
-           ed->proxy.id = -1;
-           ed->proxy.source_visible = EINA_TRUE;
-           ed->proxy.source_clip = EINA_TRUE;
-           _edje_part_description_fill(&ed->proxy.fill);
+         ed->proxy.id = -1;
+         ed->proxy.source_visible = EINA_TRUE;
+         ed->proxy.source_clip = EINA_TRUE;
+         _edje_part_description_fill(&ed->proxy.fill);
+
+         result = &ed->common;
+         break;
+      }
 
-           result = &ed->common;
-           break;
-        }
       case EDJE_PART_TYPE_BOX:
-	{
-	   Edje_Part_Description_Box *ed;
+      {
+         Edje_Part_Description_Box *ed;
 
-	   ed = mem_alloc(SZ(Edje_Part_Description_Box));
+         ed = mem_alloc(SZ(Edje_Part_Description_Box));
 
-	   ed->box.layout = NULL;
-	   ed->box.alt_layout = NULL;
-	   ed->box.align.x = FROM_DOUBLE(0.5);
-	   ed->box.align.y = FROM_DOUBLE(0.5);
-	   ed->box.padding.x = 0;
-	   ed->box.padding.y = 0;
+         ed->box.layout = NULL;
+         ed->box.alt_layout = NULL;
+         ed->box.align.x = FROM_DOUBLE(0.5);
+         ed->box.align.y = FROM_DOUBLE(0.5);
+         ed->box.padding.x = 0;
+         ed->box.padding.y = 0;
+
+         result = &ed->common;
+         break;
+      }
 
-	   result = &ed->common;
-	   break;
-	}
       case EDJE_PART_TYPE_TABLE:
-	{
-	   Edje_Part_Description_Table *ed;
+      {
+         Edje_Part_Description_Table *ed;
+
+         ed = mem_alloc(SZ(Edje_Part_Description_Table));
 
-	   ed = mem_alloc(SZ(Edje_Part_Description_Table));
+         ed->table.homogeneous = EDJE_OBJECT_TABLE_HOMOGENEOUS_NONE;
+         ed->table.align.x = FROM_DOUBLE(0.5);
+         ed->table.align.y = FROM_DOUBLE(0.5);
+         ed->table.padding.x = 0;
+         ed->table.padding.y = 0;
 
-	   ed->table.homogeneous = EDJE_OBJECT_TABLE_HOMOGENEOUS_NONE;
-	   ed->table.align.x = FROM_DOUBLE(0.5);
-	   ed->table.align.y = FROM_DOUBLE(0.5);
-	   ed->table.padding.x = 0;
-	   ed->table.padding.y = 0;
+         result = &ed->common;
+         break;
+      }
 
-	   result = &ed->common;
-	   break;
-	}
       case EDJE_PART_TYPE_EXTERNAL:
-	{
-	   Edje_Part_Description_External *ed;
+      {
+         Edje_Part_Description_External *ed;
 
-	   ed = mem_alloc(SZ(Edje_Part_Description_External));
+         ed = mem_alloc(SZ(Edje_Part_Description_External));
 
-	   ed->external_params = NULL;
+         ed->external_params = NULL;
+
+         result = &ed->common;
+         break;
+      }
 
-	   result = &ed->common;
-	   break;
-	}
       case EDJE_PART_TYPE_MESH_NODE:
-        {
-           Edje_Part_Description_Mesh_Node *ed;
-
-           ed = mem_alloc(SZ(Edje_Part_Description_Mesh_Node));
-
-           ed->mesh_node.mesh.id = -1;
-           ed->mesh_node.mesh.primitive = 0;
-           ed->mesh_node.mesh.assembly = 1;
-           ed->mesh_node.mesh.frame = 0;
-
-           ed->mesh_node.texture.id = -1;
-           ed->mesh_node.texture.wrap1 = 0;
-           ed->mesh_node.texture.wrap2 = 0;
-           ed->mesh_node.texture.filter1 = 0;
-           ed->mesh_node.texture.filter2 = 0;
-
-           ed->mesh_node.properties.shade = EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR;
-           ed->mesh_node.properties.ambient.r = 50;
-           ed->mesh_node.properties.ambient.g = 50;
-           ed->mesh_node.properties.ambient.b = 50;
-           ed->mesh_node.properties.ambient.a = 255;
-           ed->mesh_node.properties.diffuse.r = 255;
-           ed->mesh_node.properties.diffuse.g = 255;
-           ed->mesh_node.properties.diffuse.b = 255;
-           ed->mesh_node.properties.diffuse.a = 255;
-           ed->mesh_node.properties.specular.r = 255;
-           ed->mesh_node.properties.specular.g = 255;
-           ed->mesh_node.properties.specular.b = 255;
-           ed->mesh_node.properties.specular.a = 255;
-
-           ed->mesh_node.properties.material_attrib = 1;
-           ed->mesh_node.properties.normal = 1;
-           ed->mesh_node.properties.shininess = 50;
-
-           ed->mesh_node.aabb1.relative.x = -1.0;
-           ed->mesh_node.aabb1.relative.y = -1.0;
-           ed->mesh_node.aabb1.relative.z = -1.0;
-           ed->mesh_node.aabb1.offset.x = 0;
-           ed->mesh_node.aabb1.offset.y = 0;
-           ed->mesh_node.aabb1.offset.z = 0;
-           ed->mesh_node.aabb1.rel_to = -1;
-           ed->mesh_node.aabb2.relative.x = 1.0;
-           ed->mesh_node.aabb2.relative.y = 1.0;
-           ed->mesh_node.aabb2.relative.z = 1.0;
-           ed->mesh_node.aabb2.offset.x = 0;
-           ed->mesh_node.aabb2.offset.y = 0;
-           ed->mesh_node.aabb2.offset.z = 0;
-           ed->mesh_node.aabb2.rel_to = -1;
-
-           ed->mesh_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_NONE;
-           /* x1 is angle for angle_axis and cosine of half angle for quternion,
-              x2, x3, x4 define axis for angle_axis and quaternion,
-              x1, x2, x3 are coordinates of point to look at for look_at,
-              x4, x5, x6 define a vector that indicates the angle at which
-              the subject is looking at the target for look_at and look_to */
-           ed->mesh_node.orientation.data[0] = 1.0;
-           ed->mesh_node.orientation.data[1] = 0.0;
-           ed->mesh_node.orientation.data[2] = 0.0;
-           ed->mesh_node.orientation.data[3] = 0.0;
-           ed->mesh_node.orientation.data[4] = 1.0;
-           ed->mesh_node.orientation.data[5] = 0.0;
-           ed->mesh_node.orientation.look_to = -1;
-
-           ed->mesh_node.scale_3d.x = 1.0;
-           ed->mesh_node.scale_3d.y = 1.0;
-           ed->mesh_node.scale_3d.z = 1.0;
-
-           ed->mesh_node.position.point.x = 0.0;
-           ed->mesh_node.position.point.y = 0.0;
-           ed->mesh_node.position.point.z = 0.0;
-           ed->mesh_node.position.space = EVAS_CANVAS3D_SPACE_PARENT;
-
-           result = &ed->common;
-           break;
-        }
+      {
+         Edje_Part_Description_Mesh_Node *ed;
+
+         ed = mem_alloc(SZ(Edje_Part_Description_Mesh_Node));
+
+         ed->mesh_node.mesh.id = -1;
+         ed->mesh_node.mesh.primitive = 0;
+         ed->mesh_node.mesh.assembly = 1;
+         ed->mesh_node.mesh.frame = 0;
+
+         ed->mesh_node.texture.id = -1;
+         ed->mesh_node.texture.wrap1 = 0;
+         ed->mesh_node.texture.wrap2 = 0;
+         ed->mesh_node.texture.filter1 = 0;
+         ed->mesh_node.texture.filter2 = 0;
+
+         ed->mesh_node.properties.shade = EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR;
+         ed->mesh_node.properties.ambient.r = 50;
+         ed->mesh_node.properties.ambient.g = 50;
+         ed->mesh_node.properties.ambient.b = 50;
+         ed->mesh_node.properties.ambient.a = 255;
+         ed->mesh_node.properties.diffuse.r = 255;
+         ed->mesh_node.properties.diffuse.g = 255;
+         ed->mesh_node.properties.diffuse.b = 255;
+         ed->mesh_node.properties.diffuse.a = 255;
+         ed->mesh_node.properties.specular.r = 255;
+         ed->mesh_node.properties.specular.g = 255;
+         ed->mesh_node.properties.specular.b = 255;
+         ed->mesh_node.properties.specular.a = 255;
+
+         ed->mesh_node.properties.material_attrib = 1;
+         ed->mesh_node.properties.normal = 1;
+         ed->mesh_node.properties.shininess = 50;
+
+         ed->mesh_node.aabb1.relative.x = -1.0;
+         ed->mesh_node.aabb1.relative.y = -1.0;
+         ed->mesh_node.aabb1.relative.z = -1.0;
+         ed->mesh_node.aabb1.offset.x = 0;
+         ed->mesh_node.aabb1.offset.y = 0;
+         ed->mesh_node.aabb1.offset.z = 0;
+         ed->mesh_node.aabb1.rel_to = -1;
+         ed->mesh_node.aabb2.relative.x = 1.0;
+         ed->mesh_node.aabb2.relative.y = 1.0;
+         ed->mesh_node.aabb2.relative.z = 1.0;
+         ed->mesh_node.aabb2.offset.x = 0;
+         ed->mesh_node.aabb2.offset.y = 0;
+         ed->mesh_node.aabb2.offset.z = 0;
+         ed->mesh_node.aabb2.rel_to = -1;
+
+         ed->mesh_node.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_NONE;
+         /* x1 is angle for angle_axis and cosine of half angle for quternion,
+            x2, x3, x4 define axis for angle_axis and quaternion,
+            x1, x2, x3 are coordinates of point to look at for look_at,
+            x4, x5, x6 define a vector that indicates the angle at which
+            the subject is looking at the target for look_at and look_to */
+         ed->mesh_node.orientation.data[0] = 1.0;
+         ed->mesh_node.orientation.data[1] = 0.0;
+         ed->mesh_node.orientation.data[2] = 0.0;
+         ed->mesh_node.orientation.data[3] = 0.0;
+         ed->mesh_node.orientation.data[4] = 1.0;
+         ed->mesh_node.orientation.data[5] = 0.0;
+         ed->mesh_node.orientation.look_to = -1;
+
+         ed->mesh_node.scale_3d.x = 1.0;
+         ed->mesh_node.scale_3d.y = 1.0;
+         ed->mesh_node.scale_3d.z = 1.0;
+
+         ed->mesh_node.position.point.x = 0.0;
+         ed->mesh_node.position.point.y = 0.0;
+         ed->mesh_node.position.point.z = 0.0;
+         ed->mesh_node.position.space = EVAS_CANVAS3D_SPACE_PARENT;
+
+         result = &ed->common;
+         break;
+      }
+
       case EDJE_PART_TYPE_LIGHT:
-        {
-           Edje_Part_Description_Light *ed;
-
-           ed = mem_alloc(SZ(Edje_Part_Description_Light));
-
-           ed->light.properties.ambient.r = 50;
-           ed->light.properties.ambient.g = 50;
-           ed->light.properties.ambient.b = 50;
-           ed->light.properties.ambient.a = 255;
-           ed->light.properties.diffuse.r = 255;
-           ed->light.properties.diffuse.g = 255;
-           ed->light.properties.diffuse.b = 255;
-           ed->light.properties.diffuse.a = 255;
-           ed->light.properties.specular.r = 255;
-           ed->light.properties.specular.g = 255;
-           ed->light.properties.specular.b = 255;
-           ed->light.properties.specular.a = 255;
-
-           ed->light.position.point.x = 0.0;
-           ed->light.position.point.y = 0.0;
-           ed->light.position.point.z = 1.0;
-           ed->light.position.space = EVAS_CANVAS3D_SPACE_PARENT;
-
-           ed->light.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_NONE;
-           /* x1 is angle for angle_axis and cosine of half angle for quternion,
-              x2, x3, x4 define axis for angle_axis and quaternion,
-              x1, x2, x3 are coordinates of point to look at for look_at,
-              x4, x5, x6 define a vector that indicates the angle at which
-              the subject is looking at the target for look_at and look_to */
-           ed->light.orientation.data[0] = 1.0;
-           ed->light.orientation.data[1] = 0.0;
-           ed->light.orientation.data[2] = 0.0;
-           ed->light.orientation.data[3] = 0.0;
-           ed->light.orientation.data[4] = 1.0;
-           ed->light.orientation.data[5] = 0.0;
-           ed->light.orientation.look_to = -1;
-
-           result = &ed->common;
-           break;
-        }
+      {
+         Edje_Part_Description_Light *ed;
+
+         ed = mem_alloc(SZ(Edje_Part_Description_Light));
+
+         ed->light.properties.ambient.r = 50;
+         ed->light.properties.ambient.g = 50;
+         ed->light.properties.ambient.b = 50;
+         ed->light.properties.ambient.a = 255;
+         ed->light.properties.diffuse.r = 255;
+         ed->light.properties.diffuse.g = 255;
+         ed->light.properties.diffuse.b = 255;
+         ed->light.properties.diffuse.a = 255;
+         ed->light.properties.specular.r = 255;
+         ed->light.properties.specular.g = 255;
+         ed->light.properties.specular.b = 255;
+         ed->light.properties.specular.a = 255;
+
+         ed->light.position.point.x = 0.0;
+         ed->light.position.point.y = 0.0;
+         ed->light.position.point.z = 1.0;
+         ed->light.position.space = EVAS_CANVAS3D_SPACE_PARENT;
+
+         ed->light.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_NONE;
+         /* x1 is angle for angle_axis and cosine of half angle for quternion,
+            x2, x3, x4 define axis for angle_axis and quaternion,
+            x1, x2, x3 are coordinates of point to look at for look_at,
+            x4, x5, x6 define a vector that indicates the angle at which
+            the subject is looking at the target for look_at and look_to */
+         ed->light.orientation.data[0] = 1.0;
+         ed->light.orientation.data[1] = 0.0;
+         ed->light.orientation.data[2] = 0.0;
+         ed->light.orientation.data[3] = 0.0;
+         ed->light.orientation.data[4] = 1.0;
+         ed->light.orientation.data[5] = 0.0;
+         ed->light.orientation.look_to = -1;
+
+         result = &ed->common;
+         break;
+      }
+
       case EDJE_PART_TYPE_CAMERA:
-        {
-           Edje_Part_Description_Camera *ed;
-
-           ed = mem_alloc(SZ(Edje_Part_Description_Camera));
-
-           ed->camera.camera.fovy = 60.0;
-           ed->camera.camera.aspect = 1.0;
-           ed->camera.camera.frustum_near = 2.0;
-           ed->camera.camera.frustum_far = 50.0;
-
-           ed->camera.position.point.x = 0.0;
-           ed->camera.position.point.y = 0.0;
-           ed->camera.position.point.z = 5.0;
-
-           ed->camera.position.space = EVAS_CANVAS3D_SPACE_PARENT;
-
-           ed->camera.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_NONE;
-           /* x1 is angle for angle_axis and cosine of half angle for quternion,
-              x2, x3, x4 define axis for angle_axis and quaternion,
-              x1, x2, x3 are coordinates of point to look at for look_at,
-              x4, x5, x6 define a vector that indicates the angle at which
-              the subject is looking at the target for look_at and look_to */
-           ed->camera.orientation.data[0] = 1.0;
-           ed->camera.orientation.data[1] = 0.0;
-           ed->camera.orientation.data[2] = 0.0;
-           ed->camera.orientation.data[3] = 0.0;
-           ed->camera.orientation.data[4] = 1.0;
-           ed->camera.orientation.data[5] = 0.0;
-           ed->camera.orientation.look_to = -1;
-
-           result = &ed->common;
-           break;
-        }
+      {
+         Edje_Part_Description_Camera *ed;
+
+         ed = mem_alloc(SZ(Edje_Part_Description_Camera));
+
+         ed->camera.camera.fovy = 60.0;
+         ed->camera.camera.aspect = 1.0;
+         ed->camera.camera.frustum_near = 2.0;
+         ed->camera.camera.frustum_far = 50.0;
+
+         ed->camera.position.point.x = 0.0;
+         ed->camera.position.point.y = 0.0;
+         ed->camera.position.point.z = 5.0;
+
+         ed->camera.position.space = EVAS_CANVAS3D_SPACE_PARENT;
+
+         ed->camera.orientation.type = EVAS_CANVAS3D_NODE_ORIENTATION_TYPE_NONE;
+         /* x1 is angle for angle_axis and cosine of half angle for quternion,
+            x2, x3, x4 define axis for angle_axis and quaternion,
+            x1, x2, x3 are coordinates of point to look at for look_at,
+            x4, x5, x6 define a vector that indicates the angle at which
+            the subject is looking at the target for look_at and look_to */
+         ed->camera.orientation.data[0] = 1.0;
+         ed->camera.orientation.data[1] = 0.0;
+         ed->camera.orientation.data[2] = 0.0;
+         ed->camera.orientation.data[3] = 0.0;
+         ed->camera.orientation.data[4] = 1.0;
+         ed->camera.orientation.data[5] = 0.0;
+         ed->camera.orientation.look_to = -1;
+
+         result = &ed->common;
+         break;
+      }
+
       case EDJE_PART_TYPE_VECTOR:
-        {
-           Edje_Part_Description_Vector *ed;
+      {
+         Edje_Part_Description_Vector *ed;
 
-           ed = mem_alloc(SZ(Edje_Part_Description_Vector));
+         ed = mem_alloc(SZ(Edje_Part_Description_Vector));
 
-           result = &ed->common;
-           break;
-        }
+         result = &ed->common;
+         break;
+      }
      }
 
    if (!result)
@@ -2033,7 +2074,7 @@ _edje_program_check(const char *name, Edje_Program *me, Edje_Program **pgrms, un
    for (i = 0; i < count; ++i)
      if (pgrms[i]->name)
        if (pgrms[i] != me && (!strcmp(name, pgrms[i]->name)))
-	 {
+         {
             epp = (Edje_Program_Parser *)pgrms[i];
             if (!epp->can_override)
               {
@@ -2050,7 +2091,7 @@ _edje_program_check(const char *name, Edje_Program *me, Edje_Program **pgrms, un
                  epp->can_override = EINA_FALSE;
                  return;
               }
-	 }
+         }
 }
 
 static void
@@ -2098,10 +2139,10 @@ _edje_program_copy(Edje_Program *ep, Edje_Program *ep2)
 
    EINA_LIST_FOREACH(ep2->targets, l, et2)
      {
-        name = (char*) (et2 + 1);
+        name = (char *)(et2 + 1);
         et = mem_alloc(SZ(Edje_Program_Target) + strlen(name) + 1);
         ep->targets = eina_list_append(ep->targets, et);
-        copy = (char*) (et + 1);
+        copy = (char *)(et + 1);
 
         memcpy(copy, name, strlen(name) + 1);
 
@@ -2119,6 +2160,7 @@ _edje_program_copy(Edje_Program *ep, Edje_Program *ep2)
              else
                data_queue_copied_part_lookup(pc, &(et2->id), &(et->id));
              break;
+
            case EDJE_ACTION_TYPE_ACTION_STOP:
            case EDJE_ACTION_TYPE_SCRIPT:
              if (current_group_inherit)
@@ -2126,6 +2168,7 @@ _edje_program_copy(Edje_Program *ep, Edje_Program *ep2)
              else
                data_queue_copied_program_lookup(pc, &(et2->id), &(et->id));
              break;
+
            default:
              ERR("parse error %s:%i. target may only be used after action",
                  file_in, line - 1);
@@ -2135,10 +2178,10 @@ _edje_program_copy(Edje_Program *ep, Edje_Program *ep2)
 
    EINA_LIST_FOREACH(ep2->after, l, pa2)
      {
-        name = (char*) (pa2 + 1);
+        name = (char *)(pa2 + 1);
         pa = mem_alloc(SZ(Edje_Program_After) + strlen(name) + 1);
         ep->after = eina_list_append(ep->after, pa);
-        copy = (char*) (pa + 1);
+        copy = (char *)(pa + 1);
         memcpy(copy, name, strlen(name) + 1);
         if (!data_queue_copied_program_lookup(pc, &(pa2->id), &(pa->id)))
           data_queue_program_lookup(pc, copy, &(pa->id));
@@ -2217,39 +2260,39 @@ st_externals_external(void)
 
    ex = mem_alloc(SZ(External));
    ex->name = parse_str(0);
-     {
-	Eina_List *l;
-	External *lex;
+   {
+      Eina_List *l;
+      External *lex;
 
-	EINA_LIST_FOREACH(externals, l, lex)
-	  {
-	     if (!strcmp(lex->name, ex->name))
-	       {
-		  free(ex->name);
-		  free(ex);
-		  return;
-	       }
-	  }
-     }
+      EINA_LIST_FOREACH(externals, l, lex)
+        {
+           if (!strcmp(lex->name, ex->name))
+             {
+                free(ex->name);
+                free(ex);
+                return;
+             }
+        }
+   }
    externals = eina_list_append(externals, ex);
 
    if (edje_file->external_dir)
      {
         Edje_External_Directory_Entry *entries;
-        
-	edje_file->external_dir->entries_count++;
+
+        edje_file->external_dir->entries_count++;
         entries = realloc(edje_file->external_dir->entries,
                           sizeof (Edje_External_Directory_Entry) * edje_file->external_dir->entries_count);
         if (!entries)
           {
-	     ERR("not enough memory");
+             ERR("not enough memory");
              exit(-1);
           }
-	edje_file->external_dir->entries = entries;
-	memset(edje_file->external_dir->entries + edje_file->external_dir->entries_count - 1,
-	       0, sizeof (Edje_External_Directory_Entry));
+        edje_file->external_dir->entries = entries;
+        memset(edje_file->external_dir->entries + edje_file->external_dir->entries_count - 1,
+               0, sizeof (Edje_External_Directory_Entry));
 
-	edje_file->external_dir->entries[edje_file->external_dir->entries_count - 1].entry = mem_strdup(ex->name);
+        edje_file->external_dir->entries[edje_file->external_dir->entries_count - 1].entry = mem_strdup(ex->name);
      }
 }
 
@@ -2321,8 +2364,8 @@ st_images_image(void)
    for (i = 0; i < edje_file->image_dir->entries_count; ++i)
      if (!strcmp(edje_file->image_dir->entries[i].entry, tmp))
        {
-	  free((char*) tmp);
-	  return;
+          free((char *)tmp);
+          return;
        }
 
    edje_file->image_dir->entries_count++;
@@ -2335,7 +2378,7 @@ st_images_image(void)
      }
    edje_file->image_dir->entries = img;
    memset(edje_file->image_dir->entries + edje_file->image_dir->entries_count - 1,
-	  0, sizeof (Edje_Image_Directory_Entry));
+          0, sizeof (Edje_Image_Directory_Entry));
 
    img = edje_file->image_dir->entries + edje_file->image_dir->entries_count - 1;
 
@@ -2348,16 +2391,16 @@ st_images_image(void)
                   "LOSSY_ETC1", 3,
                   "LOSSY_ETC2", 4,
                   "USER", 5,
-		  NULL);
+                  NULL);
    if (v == 0)
      {
-	img->source_type = EDJE_IMAGE_SOURCE_TYPE_INLINE_PERFECT;
-	img->source_param = 0;
+        img->source_type = EDJE_IMAGE_SOURCE_TYPE_INLINE_PERFECT;
+        img->source_param = 0;
      }
    else if (v == 1)
      {
-	img->source_type = EDJE_IMAGE_SOURCE_TYPE_INLINE_PERFECT;
-	img->source_param = 1;
+        img->source_type = EDJE_IMAGE_SOURCE_TYPE_INLINE_PERFECT;
+        img->source_param = 1;
      }
    else if (v == 2)
      {
@@ -2376,12 +2419,12 @@ st_images_image(void)
      }
    else if (v == 5)
      {
-	img->source_type = EDJE_IMAGE_SOURCE_TYPE_USER;
-	img->source_param = 0;
+        img->source_type = EDJE_IMAGE_SOURCE_TYPE_USER;
+        img->source_param = 0;
      }
    if ((img->source_type < EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY) ||
        (img->source_type > EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2))
-	check_arg_count(2);
+     check_arg_count(2);
    else
      {
         if (check_range_arg_count(2, 3) > 2)
@@ -2391,7 +2434,6 @@ st_images_image(void)
      }
 }
 
-
 static void
 _handle_vector_image(void)
 {
@@ -2399,7 +2441,7 @@ _handle_vector_image(void)
    unsigned int i = 0;
    char *name;
 
-   ed = (Edje_Part_Description_Vector*) current_desc;
+   ed = (Edje_Part_Description_Vector *)current_desc;
 
    name = parse_str(0);
 
@@ -2464,13 +2506,13 @@ st_images_vector(void)
    for (i = 0; i < edje_file->image_dir->vectors_count; ++i)
      if (!strcmp(edje_file->image_dir->vectors[i].entry, tmp))
        {
-          free((char*) tmp);
+          free((char *)tmp);
           return;
        }
 
    edje_file->image_dir->vectors_count++;
    vector = realloc(edje_file->image_dir->vectors,
-                 sizeof (Edje_Vector_Directory_Entry) * edje_file->image_dir->vectors_count);
+                    sizeof (Edje_Vector_Directory_Entry) * edje_file->image_dir->vectors_count);
    if (!vector)
      {
         ERR("No enough memory.");
@@ -2478,7 +2520,7 @@ st_images_vector(void)
      }
    edje_file->image_dir->vectors = vector;
    memset(edje_file->image_dir->vectors + edje_file->image_dir->vectors_count - 1,
-    0, sizeof (Edje_Vector_Directory_Entry));
+          0, sizeof (Edje_Vector_Directory_Entry));
 
    vector = edje_file->image_dir->vectors + edje_file->image_dir->vectors_count - 1;
 
@@ -2486,7 +2528,6 @@ st_images_vector(void)
    vector->id = edje_file->image_dir->vectors_count - 1;
 }
 
-
 /**
    @edcsubsection{toplevel_models,model}
  */
@@ -2533,7 +2574,7 @@ st_models_model(void)
    for (i = 0; i < edje_file->model_dir->entries_count; ++i)
      if (!strcmp(edje_file->model_dir->entries[i].entry, tmp))
        {
-          free((char*) tmp);
+          free((char *)tmp);
           return;
        }
 
@@ -2585,7 +2626,7 @@ static void
 ob_images_set(void)
 {
    Edje_Image_Directory_Set *sets;
-   
+
    if (!edje_file->image_dir)
      edje_file->image_dir = mem_alloc(SZ(Edje_Image_Directory));
 
@@ -2599,8 +2640,8 @@ ob_images_set(void)
      }
    edje_file->image_dir->sets = sets;
    memset(edje_file->image_dir->sets + edje_file->image_dir->sets_count - 1,
-	  0, sizeof (Edje_Image_Directory_Set));
-   
+          0, sizeof (Edje_Image_Directory_Set));
+
    edje_file->image_dir->sets[edje_file->image_dir->sets_count - 1].id = edje_file->image_dir->sets_count - 1;
 }
 
@@ -2614,7 +2655,7 @@ ob_images_set(void)
     @effect
         Define the name that refer to this image description.
     @endproperty
-*/
+ */
 static void
 st_images_set_name(void)
 {
@@ -2649,7 +2690,7 @@ st_images_set_name(void)
         The "image" block inside a "set" block define the characteristic of an image.
         Every block will describe one image and the size rule to use it.
     @endblock
-**/
+ **/
 static void
 ob_images_set_image(void)
 {
@@ -2683,7 +2724,7 @@ ob_images_set_image(void)
 
         Defaults: compression level for lossy methods is 90.
     @endproperty
-**/
+ **/
 static void
 st_images_set_image_image(void)
 {
@@ -2702,8 +2743,8 @@ st_images_set_image_image(void)
    for (i = 0; i < edje_file->image_dir->entries_count; ++i)
      if (!strcmp(edje_file->image_dir->entries[i].entry, entry->name))
        {
-	 entry->id = i;
-	 return;
+          entry->id = i;
+          return;
        }
 }
 
@@ -2719,7 +2760,7 @@ st_images_set_image_image(void)
 
         Defaults: 0 0 0 0
     @endproperty
-*/
+ */
 static void
 st_images_set_image_size(void)
 {
@@ -2737,11 +2778,11 @@ st_images_set_image_size(void)
    if (entry->size.min.w > entry->size.max.w
        || entry->size.min.h > entry->size.max.h)
      {
-       ERR("parse error %s:%i. Image min and max size are not in the right order ([%i, %i] < [%i, %i])",
-	   file_in, line - 1,
-	   entry->size.min.w, entry->size.min.h,
-	   entry->size.max.w, entry->size.max.h);
-       exit(-1);
+        ERR("parse error %s:%i. Image min and max size are not in the right order ([%i, %i] < [%i, %i])",
+            file_in, line - 1,
+            entry->size.min.w, entry->size.min.h,
+            entry->size.max.w, entry->size.max.h);
+        exit(-1);
      }
 }
 
@@ -2759,7 +2800,7 @@ st_images_set_image_size(void)
         Defaults: 0 0 0 0
     @since 1.8
     @endproperty
-*/
+ */
 static void
 st_images_set_image_border(void)
 {
@@ -2796,7 +2837,7 @@ st_images_set_image_border(void)
         Defaults: 0.0
     @since 1.8
     @endproperty
-*/
+ */
 static void
 st_images_set_image_border_scale_by(void)
 {
@@ -2811,7 +2852,7 @@ st_images_set_image_border_scale_by(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Image*) current_desc;
+   ed = (Edje_Part_Description_Image *)current_desc;
 
    ed->image.border.scale_by = FROM_DOUBLE(parse_float_range(0, 0.0, 999999999.0));
 }
@@ -2861,10 +2902,10 @@ st_fonts_font(void)
 
    if (eina_hash_find(edje_file->fonts, fn->name))
      {
-	free(fn->file);
-	free(fn->name);
-	free(fn);
-	return;
+        free(fn->file);
+        free(fn->name);
+        free(fn);
+        return;
      }
 
    eina_hash_direct_add(edje_file->fonts, fn->name, fn);
@@ -2968,7 +3009,7 @@ st_data_file(void)
              snprintf(path, sizeof(path), "%s/%s", dir, filename);
              fd = open(path, O_RDONLY | O_BINARY, S_IRUSR | S_IWUSR);
              if (fd >= 0)
-                break;
+               break;
           }
 
         if (fd < 0)
@@ -2982,7 +3023,7 @@ st_data_file(void)
    if (fstat(fd, &buf))
      {
         ERR("%s:%i when stating file \"%s\": \"%s\"",
-	    file_in, line, filename, strerror(errno));
+            file_in, line, filename, strerror(errno));
         exit(-1);
      }
 
@@ -2990,7 +3031,7 @@ st_data_file(void)
    if (data == MAP_FAILED)
      {
         ERR("%s:%i when mapping file \"%s\": \"%s\"",
-	    file_in, line, filename, strerror(errno));
+            file_in, line, filename, strerror(errno));
         exit(-1);
      }
 
@@ -3005,7 +3046,7 @@ st_data_file(void)
    value = malloc(sizeof (char) * buf.st_size + 1);
    snprintf(value, buf.st_size + 1, "%s", data);
 
-   munmap((void*)data, buf.st_size);
+   munmap((void *)data, buf.st_size);
    close(fd);
 
    es->str = value;
@@ -3043,7 +3084,7 @@ st_data_file(void)
         Each node block begins with the name of color class and enclosed with braces.
         Node block can be placed within another node block.
     @endblock
-*/
+ */
 static void
 ob_color_tree(void)
 {
@@ -3084,7 +3125,7 @@ ob_color_tree(void)
         group of colors to be used in the theme, the application can use that
         name to alter the color values at runtime.
     @endblock
-*/
+ */
 static void
 ob_color_class(void)
 {
@@ -3137,7 +3178,7 @@ _color_class_name(char *name)
         Sets the name for the color class, used as reference by both the theme
         and the application.
     @endproperty
-*/
+ */
 static void
 st_color_class_name(void)
 {
@@ -3148,12 +3189,12 @@ st_color_class_name(void)
    cc->name = parse_str(0);
    EINA_LIST_FOREACH(edje_file->color_classes, l, tcc)
      {
-	if ((cc != tcc) && (!strcmp(cc->name, tcc->name)))
-	  {
-	     ERR("parse error %s:%i. There is already a color class named \"%s\"",
-		 file_in, line - 1, cc->name);
-	     exit(-1);
-	  }
+        if ((cc != tcc) && (!strcmp(cc->name, tcc->name)))
+          {
+             ERR("parse error %s:%i. There is already a color class named \"%s\"",
+                 file_in, line - 1, cc->name);
+             exit(-1);
+          }
      }
 }
 
@@ -3167,23 +3208,25 @@ parse_color(unsigned int first_arg, void *base)
    switch (get_arg_count() - first_arg)
      {
       case 1:
-         str = parse_str(first_arg);
-         convert_color_code(str, &r, &g, &b, &a);
-         color->r = r;
-         color->g = g;
-         color->b = b;
-         color->a = a;
-         break;
+        str = parse_str(first_arg);
+        convert_color_code(str, &r, &g, &b, &a);
+        color->r = r;
+        color->g = g;
+        color->b = b;
+        color->a = a;
+        break;
+
       case 4:
-         color->r = parse_int_range(first_arg + 0, 0, 255);
-         color->g = parse_int_range(first_arg + 1, 0, 255);
-         color->b = parse_int_range(first_arg + 2, 0, 255);
-         color->a = parse_int_range(first_arg + 3, 0, 255);
-         break;
+        color->r = parse_int_range(first_arg + 0, 0, 255);
+        color->g = parse_int_range(first_arg + 1, 0, 255);
+        color->b = parse_int_range(first_arg + 2, 0, 255);
+        color->a = parse_int_range(first_arg + 3, 0, 255);
+        break;
+
       default:
-         ERR("%s:%i. color code should be a string or a set of 4 integers.",
-             file_in, line - 1);
-         exit(-1);
+        ERR("%s:%i. color code should be a string or a set of 4 integers.",
+            file_in, line - 1);
+        exit(-1);
      }
 }
 
@@ -3207,7 +3250,7 @@ parse_color(unsigned int first_arg, void *base)
 
         Defaults: 255 255 255 255
     @endproperty
-*/
+ */
 static void
 st_color_class_color(void)
 {
@@ -3238,7 +3281,7 @@ st_color_class_color(void)
 
         Defaults: 255 255 255 255
     @endproperty
-*/
+ */
 static void
 st_color_class_color2(void)
 {
@@ -3269,7 +3312,7 @@ st_color_class_color2(void)
 
         Defaults: 255 255 255 255
     @endproperty
-*/
+ */
 static void
 st_color_class_color3(void)
 {
@@ -3290,7 +3333,7 @@ st_color_class_color3(void)
         Provides a descriptive name for the effect of the color class
         @since 1.14
     @endproperty
-*/
+ */
 static void
 st_color_class_desc(void)
 {
@@ -3325,7 +3368,7 @@ st_color_class_desc(void)
         "style" block is used to create style \<tags\> for advanced TEXTBLOCK
         formatting.
     @endblock
-*/
+ */
 static void
 ob_styles_style(void)
 {
@@ -3349,7 +3392,7 @@ _style_name(char *name)
         if (stl->name && tstl->name && (stl != tstl) && (!strcmp(stl->name, tstl->name)))
           {
              ERR("parse error %s:%i. There is already a style named \"%s\"",
-          file_in, line - 1, stl->name);
+                 file_in, line - 1, stl->name);
              exit(-1);
           }
      }
@@ -3364,7 +3407,7 @@ _style_name(char *name)
     @effect
         The name of  the style to be used as reference later in the theme.
     @endproperty
-*/
+ */
 static void
 st_styles_style_name(void)
 {
@@ -3381,7 +3424,7 @@ st_styles_style_name(void)
         The default style properties that will be applied to the complete
         text.
     @endproperty
-*/
+ */
 static void
 st_styles_style_base(void)
 {
@@ -3413,7 +3456,7 @@ st_styles_style_base(void)
         If the second part (\</bold\>) is also defined, a '-' should be prepended to it's style properties.
         This only applies to paired tags; Single tags, like \<tab\>, must not include a starting '+'.
     @endproperty
-*/
+ */
 static void
 st_styles_style_tag(void)
 {
@@ -3449,7 +3492,7 @@ st_styles_style_tag(void)
         group of font and size to be used in the theme, the application can
         use that name to alter the font and its size at runtime.
     @endblock
-*/
+ */
 static void
 ob_text_class(void)
 {
@@ -3492,7 +3535,7 @@ _text_class_name(char *name)
         Sets the name for the text class, used as reference by both the theme
         and the application.
     @endproperty
-*/
+ */
 static void
 st_text_class_name(void)
 {
@@ -3522,7 +3565,7 @@ st_text_class_name(void)
     @effect
         Sets the font family for the text class.
     @endproperty
-*/
+ */
 static void
 st_text_class_font(void)
 {
@@ -3546,7 +3589,7 @@ st_text_class_font(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_text_class_size(void)
 {
@@ -3580,7 +3623,7 @@ st_text_class_size(void)
         group of size to be used in the theme, the application can use that
         name to alter the min and max size values at runtime.
     @endblock
-*/
+ */
 static void
 ob_size_class(void)
 {
@@ -3625,7 +3668,7 @@ _size_class_name(char *name)
         Sets the name for the size class, used as reference by both the theme
         and the application.
     @endproperty
-*/
+ */
 static void
 st_size_class_name(void)
 {
@@ -3656,7 +3699,7 @@ st_size_class_name(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_size_class_min(void)
 {
@@ -3680,7 +3723,7 @@ st_size_class_min(void)
 
         Defaults: -1 -1
     @endproperty
-*/
+ */
 static void
 st_size_class_max(void)
 {
@@ -3717,7 +3760,7 @@ st_size_class_max(void)
         names. The "sounds" block comprises of all sound definitions. The "vibrations"
         block compriese all vibration definitions.
     @endblock
-*/
+ */
 static void
 ob_collections(void)
 {
@@ -3745,7 +3788,7 @@ ob_collections(void)
         Defaults: 1.0
     @since 1.11
     @endproperty
-*/
+ */
 static void
 st_collections_base_scale(void)
 {
@@ -3777,7 +3820,7 @@ st_collections_base_scale(void)
     @description
         The "sounds" block contains a list of one or more sound sample and tones items.
     @endblock
-*/
+ */
 
 /**
     @page edcref
@@ -3799,14 +3842,14 @@ st_collections_group_sound_tone(void)
    int value;
 
    check_arg_count(2);
-   
+
    if (!edje_file->sound_dir)
      edje_file->sound_dir = mem_alloc(SZ(Edje_Sound_Directory));
-   
+
    tmp = parse_str(0);
    /* Audible range 20 to 20KHz */
    value = parse_int_range(1, 20, 20000);
-   
+
    /* Check for Tone duplication */
    for (i = 0; i < edje_file->sound_dir->tones_count; i++)
      {
@@ -3825,7 +3868,7 @@ st_collections_group_sound_tone(void)
      }
    edje_file->sound_dir->tones_count++;
    tone = realloc(edje_file->sound_dir->tones,
-                  sizeof (Edje_Sound_Tone) * 
+                  sizeof (Edje_Sound_Tone) *
                   edje_file->sound_dir->tones_count);
    if (!tone)
      {
@@ -3833,10 +3876,10 @@ st_collections_group_sound_tone(void)
         exit(-1);
      }
    edje_file->sound_dir->tones = tone;
-   
+
    tone = edje_file->sound_dir->tones + edje_file->sound_dir->tones_count - 1;
    memset(tone, 0, sizeof (Edje_Sound_Tone));
-   
+
    tone->name = tmp;
    tone->value = value;
    tone->id = edje_file->sound_dir->tones_count - 1;
@@ -3886,12 +3929,12 @@ st_collections_group_sound_sample_name(void)
    Edje_Sound_Sample *sample;
    const char *tmp;
    unsigned int i;
-   
+
    if (!edje_file->sound_dir)
      edje_file->sound_dir = mem_alloc(SZ(Edje_Sound_Directory));
-   
+
    tmp = parse_str(0);
-   
+
    for (i = 0; i < edje_file->sound_dir->samples_count; i++)
      {
         if (!strcmp(edje_file->sound_dir->samples[i].name, tmp))
@@ -3900,10 +3943,10 @@ st_collections_group_sound_sample_name(void)
              return;
           }
      }
-   
+
    edje_file->sound_dir->samples_count++;
    sample = realloc(edje_file->sound_dir->samples,
-                    sizeof(Edje_Sound_Sample) * 
+                    sizeof(Edje_Sound_Sample) *
                     edje_file->sound_dir->samples_count);
    if (!sample)
      {
@@ -3916,7 +3959,7 @@ st_collections_group_sound_sample_name(void)
      edje_file->sound_dir->samples +
      edje_file->sound_dir->samples_count - 1;
    memset(sample, 0, sizeof (Edje_Sound_Sample));
-   
+
    sample->name = tmp;
    sample->id = edje_file->sound_dir->samples_count - 1;
    sample->compression = parse_enum(1,
@@ -3925,7 +3968,7 @@ st_collections_group_sound_sample_name(void)
                                     "LOSSY", EDJE_SOUND_SOURCE_TYPE_INLINE_LOSSY,
                                     "AS_IS", EDJE_SOUND_SOURCE_TYPE_INLINE_AS_IS,
                                     NULL);
-   
+
    if (sample->compression == EDJE_SOUND_SOURCE_TYPE_INLINE_LOSSY)
      {
         sample->quality = parse_float_range(2, 45.0, 1000.0);
@@ -3933,7 +3976,6 @@ st_collections_group_sound_sample_name(void)
      }
    else
      check_arg_count(2);
-
 }
 
 /**
@@ -3958,15 +4000,14 @@ st_collections_group_sound_sample_source(void)
         ERR("Invalid sound sample source definition.");
         exit(-1);
      }
-   
-   sample = 
+
+   sample =
      edje_file->sound_dir->samples +
      edje_file->sound_dir->samples_count - 1;
    sample->snd_src = parse_str(0);
    check_arg_count(1);
 }
 
-
 /** @edcsubsection{collections_vibrations,
  *                 Vibrations} */
 
@@ -3985,7 +4026,7 @@ st_collections_group_sound_sample_source(void)
         The "vibrations" block contains a list of one or more vibration sample.
     @since 1.10
     @endblock
-*/
+ */
 
 /** @edcsubsection{collections_vibrations_sample,
  *                 Vibrations.Sample} */
@@ -4112,7 +4153,7 @@ st_collections_group_vibration_sample_source(void)
     @property
         name
     @parameters
-        [locale name] 
+        [locale name]
     @effect
         Used to include each po or mo file. The full path to the directory holding
         the po or mo file can be defined later with edje_cc's "-md" option.
@@ -4130,7 +4171,7 @@ st_collections_group_translation_file_locale(void)
    check_arg_count(1);
 
    if (!edje_file->mo_dir)
-      edje_file->mo_dir = mem_alloc(SZ(Edje_Mo_Directory));
+     edje_file->mo_dir = mem_alloc(SZ(Edje_Mo_Directory));
 
    tmp = parse_str(0);
 
@@ -4223,13 +4264,13 @@ _link_combine(void)
                   if (fabs(ell->ed->state.value - el->ed->state.value) > DBL_EPSILON) continue;
                   if ((!!ell->ed->state.name) != (!!el->ed->state.name))
                     {
-                      if (((!!ell->ed->state.name) && strcmp(ell->ed->state.name, "default")) ||
-                         ((!!el->ed->state.name) && strcmp(el->ed->state.name, "default")))
-                           continue;
+                       if (((!!ell->ed->state.name) && strcmp(ell->ed->state.name, "default")) ||
+                           ((!!el->ed->state.name) && strcmp(el->ed->state.name, "default")))
+                         continue;
                     }
                   else if (ell->ed->state.name && strcmp(ell->ed->state.name, el->ed->state.name))
                     continue;
-                  eina_list_move_list(&combine, (Eina_List**)&tup->data, l);
+                  eina_list_move_list(&combine, (Eina_List **)&tup->data, l);
                }
              current_program = el->pr;
              if (!el->epp->common.name)
@@ -4285,7 +4326,7 @@ _link_combine(void)
         A "group" block contains the list of parts and programs that compose a
         given Edje Object.
     @endblock
-*/
+ */
 static void
 ob_collections_group(void)
 {
@@ -4391,7 +4432,7 @@ double_named_group:
         Only a single name statement is valid for group, use alias instead if
         you want to give additional names.
     @endproperty
-*/
+ */
 static void
 st_collections_group_name(void)
 {
@@ -4452,53 +4493,68 @@ _parts_count_update(unsigned int type, int inc)
    switch (type)
      {
       case EDJE_PART_TYPE_RECTANGLE:
-         current_de->count.RECTANGLE += inc;
-         break;
+        current_de->count.RECTANGLE += inc;
+        break;
+
       case EDJE_PART_TYPE_TEXT:
-         current_de->count.TEXT += inc;
-         break;
+        current_de->count.TEXT += inc;
+        break;
+
       case EDJE_PART_TYPE_IMAGE:
-         current_de->count.IMAGE += inc;
-         break;
+        current_de->count.IMAGE += inc;
+        break;
+
       case EDJE_PART_TYPE_SWALLOW:
-         current_de->count.SWALLOW += inc;
-         break;
+        current_de->count.SWALLOW += inc;
+        break;
+
       case EDJE_PART_TYPE_TEXTBLOCK:
-         current_de->count.TEXTBLOCK += inc;
-         break;
+        current_de->count.TEXTBLOCK += inc;
+        break;
+
       case EDJE_PART_TYPE_GROUP:
-         current_de->count.GROUP += inc;
-         break;
+        current_de->count.GROUP += inc;
+        break;
+
       case EDJE_PART_TYPE_BOX:
-         current_de->count.BOX += inc;
-         break;
+        current_de->count.BOX += inc;
+        break;
+
       case EDJE_PART_TYPE_TABLE:
-         current_de->count.TABLE += inc;
-         break;
+        current_de->count.TABLE += inc;
+        break;
+
       case EDJE_PART_TYPE_EXTERNAL:
-         current_de->count.EXTERNAL += inc;
-         break;
+        current_de->count.EXTERNAL += inc;
+        break;
+
       case EDJE_PART_TYPE_PROXY:
-         current_de->count.PROXY += inc;
-         break;
+        current_de->count.PROXY += inc;
+        break;
+
       case EDJE_PART_TYPE_MESH_NODE:
-         current_de->count.MESH_NODE += inc;
-         break;
+        current_de->count.MESH_NODE += inc;
+        break;
+
       case EDJE_PART_TYPE_LIGHT:
-         current_de->count.LIGHT += inc;
-         break;
+        current_de->count.LIGHT += inc;
+        break;
+
       case EDJE_PART_TYPE_CAMERA:
-         current_de->count.CAMERA += inc;
-         break;
+        current_de->count.CAMERA += inc;
+        break;
+
       case EDJE_PART_TYPE_SPACER:
-         current_de->count.SPACER += inc;
-         break;
+        current_de->count.SPACER += inc;
+        break;
+
       case EDJE_PART_TYPE_SNAPSHOT:
-         current_de->count.SNAPSHOT += inc;
-         break;
+        current_de->count.SNAPSHOT += inc;
+        break;
+
       case EDJE_PART_TYPE_VECTOR:
-         current_de->count.VECTOR += inc;
-         break;
+        current_de->count.VECTOR += inc;
+        break;
      }
    current_de->count.part += inc;
 }
@@ -4591,7 +4647,7 @@ _part_copy(Edje_Part *ep, Edje_Part *ep2)
    epp->reorder.insert_after = STRDUP(epp2->reorder.insert_after);
    epp->can_override = EINA_TRUE;
 
-   for (j = 0 ; j < ep2->items_count ; j++)
+   for (j = 0; j < ep2->items_count; j++)
      {
         ob_collections_group_parts_part_box_items_item();
         item = ep->items[j];
@@ -4637,14 +4693,14 @@ _part_copy(Edje_Part *ep, Edje_Part *ep2)
    ob_collections_group_parts_part_description();
    ed = ep->default_desc;
    parent_desc = ed2 = ep2->default_desc;
-   free((void*)ed->state.name);
+   free((void *)ed->state.name);
    ed->state.name = STRDUP(ed2->state.name);
    ed->state.value = ed2->state.value;
    st_collections_group_parts_part_description_inherit();
    parent_desc = NULL;
 
    // copy other description
-   for (j = 0 ; j < ep2->other.desc_count ; j++)
+   for (j = 0; j < ep2->other.desc_count; j++)
      {
         ob_collections_group_parts_part_description();
         ed = ep->other.desc[j];
@@ -4671,7 +4727,7 @@ _part_copy(Edje_Part *ep, Edje_Part *ep2)
         Defaults: 0
     @since 1.10
     @endproperty
-*/
+ */
 static void
 st_collections_group_inherit_only(void)
 {
@@ -4710,7 +4766,7 @@ st_collections_group_inherit_only(void)
         Defaults: 0
     @since 1.19
     @endproperty
-*/
+ */
 static void
 st_collections_group_use_custom_seat_names(void)
 {
@@ -4733,7 +4789,7 @@ st_collections_group_use_custom_seat_names(void)
         parts is not allowed.
     @since 1.10
     @endproperty
-*/
+ */
 static void
 st_collections_group_part_remove(void)
 {
@@ -4805,7 +4861,7 @@ st_collections_group_part_remove(void)
         This will break program sequences if a program in the middle of the sequence is removed.
     @since 1.10
     @endproperty
-*/
+ */
 static void
 st_collections_group_program_remove(void)
 {
@@ -4850,7 +4906,6 @@ st_collections_group_program_remove(void)
      }
 }
 
-
 /**
     @page edcref
     @property
@@ -4864,7 +4919,7 @@ st_collections_group_program_remove(void)
         group added as targets.
     @since 1.10
     @endproperty
-*/
+ */
 static void
 st_collections_group_target_group(void)
 {
@@ -4882,14 +4937,14 @@ st_collections_group_target_group(void)
      if (!strcmp(tg->name, name))
        {
           ERR("parse error %s:%i. There is already a target_group with the name '%s'",
-                     file_in, line - 1, name);
+              file_in, line - 1, name);
           exit(-1);
        }
    tg = malloc(sizeof(Edje_Target_Group));
    pc->target_groups = eina_list_append(pc->target_groups, tg);
    tg->name = name;
    argc = get_arg_count();
-   tg->targets = calloc(argc, sizeof(char*));
+   tg->targets = calloc(argc, sizeof(char *));
 
    for (n = 1; n < argc; n++)
      tg->targets[n - 1] = parse_str(n);
@@ -4912,7 +4967,7 @@ st_collections_group_target_group(void)
         allowed.
     @since 1.10
     @endproperty
-*/
+ */
 static void
 st_collections_group_inherit(void)
 {
@@ -4975,7 +5030,7 @@ st_collections_group_inherit(void)
 
         memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
         eina_hash_foreach(pc2->data,
-                     _edje_data_item_list_foreach, &fdata);
+                          _edje_data_item_list_foreach, &fdata);
 
         if (!pc->data) pc->data = eina_hash_string_small_new(free);
         EINA_LIST_FREE(fdata.list, key)
@@ -4991,7 +5046,7 @@ st_collections_group_inherit(void)
 
         memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
         eina_hash_foreach(pc2->alias,
-                     _edje_data_item_list_foreach, &fdata);
+                          _edje_data_item_list_foreach, &fdata);
         if (!pc->alias) pc->alias = eina_hash_string_small_new(free);
         EINA_LIST_FREE(fdata.list, key)
           {
@@ -5117,7 +5172,7 @@ st_collections_group_inherit(void)
      }
 
    offset = pc->parts_count;
-   for (i = 0 ; i < pc2->parts_count ; i++)
+   for (i = 0; i < pc2->parts_count; i++)
      {
         // copy the part
         edje_cc_handlers_part_make(-1);
@@ -5127,27 +5182,27 @@ st_collections_group_inherit(void)
      }
 
    //copy programs
-   for (j = 0 ; j < pc2->programs.fnmatch_count ; j++)
+   for (j = 0; j < pc2->programs.fnmatch_count; j++)
      {
         ob_collections_group_programs_program();
         _edje_program_copy(current_program, pc2->programs.fnmatch[j]);
      }
-   for (j = 0 ; j < pc2->programs.strcmp_count ; j++)
+   for (j = 0; j < pc2->programs.strcmp_count; j++)
      {
         ob_collections_group_programs_program();
         _edje_program_copy(current_program, pc2->programs.strcmp[j]);
      }
-   for (j = 0 ; j < pc2->programs.strncmp_count ; j++)
+   for (j = 0; j < pc2->programs.strncmp_count; j++)
      {
         ob_collections_group_programs_program();
         _edje_program_copy(current_program, pc2->programs.strncmp[j]);
      }
-   for (j = 0 ; j < pc2->programs.strrncmp_count ; j++)
+   for (j = 0; j < pc2->programs.strrncmp_count; j++)
      {
         ob_collections_group_programs_program();
         _edje_program_copy(current_program, pc2->programs.strrncmp[j]);
      }
-   for (j = 0 ; j < pc2->programs.nocmp_count ; j++)
+   for (j = 0; j < pc2->programs.nocmp_count; j++)
      {
         ob_collections_group_programs_program();
         _edje_program_copy(current_program, pc2->programs.nocmp[j]);
@@ -5209,7 +5264,7 @@ st_collections_group_inherit(void)
 
         Defaults: off
     @endproperty
-*/
+ */
 static void
 st_collections_group_lua_script_only(void)
 {
@@ -5237,7 +5292,7 @@ st_collections_group_lua_script_only(void)
         Defaults: 0
     @since 1.10
     @endproperty
-*/
+ */
 static void
 st_collections_group_script_recursion(void)
 {
@@ -5259,7 +5314,7 @@ st_collections_group_script_recursion(void)
         Additional name to serve as identifier. Defining multiple aliases is
         supported.
     @endproperty
-*/
+ */
 static void
 st_collections_group_alias(void)
 {
@@ -5303,7 +5358,7 @@ st_collections_group_alias(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_min(void)
 {
@@ -5328,7 +5383,7 @@ st_collections_group_min(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_max(void)
 {
@@ -5352,7 +5407,7 @@ st_collections_group_max(void)
 
         Defaults: 0.0 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_scene_size(void)
 {
@@ -5377,7 +5432,7 @@ st_collections_group_scene_size(void)
        Defaults: true
    @since 1.1
    @endproperty
-*/
+ */
 static void
 st_collections_group_broadcast_signal(void)
 {
@@ -5426,7 +5481,7 @@ st_collections_group_nobroadcast(void)
 
         Defaults: AUTO
     @endproperty
-*/
+ */
 static void
 st_collections_group_orientation(void)
 {
@@ -5436,10 +5491,10 @@ st_collections_group_orientation(void)
 
    pc = eina_list_data_get(eina_list_last(edje_collections));
    pc->prop.orientation = parse_enum(0,
-         "AUTO", EDJE_ORIENTATION_AUTO,
-         "LTR", EDJE_ORIENTATION_LTR,
-         "RTL", EDJE_ORIENTATION_RTL,
-         NULL);
+                                     "AUTO", EDJE_ORIENTATION_AUTO,
+                                     "LTR", EDJE_ORIENTATION_LTR,
+                                     "RTL", EDJE_ORIENTATION_RTL,
+                                     NULL);
 }
 
 /**
@@ -5556,7 +5611,6 @@ _script_flush(void)
    eina_list_free(pcp->base_codes);
 }
 
-
 /**
     @page edcref
     @property
@@ -5613,7 +5667,7 @@ st_collections_group_program_source(void)
         "description" block, it will be executed once at load time, in the
         load order.
     @endblock
-*/
+ */
 static void
 ob_collections_group_script(void)
 {
@@ -5624,15 +5678,15 @@ ob_collections_group_script(void)
    if (!is_verbatim()) track_verbatim(1);
    else
      {
-	char *s;
+        char *s;
 
-	s = get_verbatim();
-	if (s)
-	  {
-	     cd->l1 = get_verbatim_line1();
-	     cd->l2 = get_verbatim_line2();
-	     if (cd->shared)
-	       {
+        s = get_verbatim();
+        if (s)
+          {
+             cd->l1 = get_verbatim_line1();
+             cd->l2 = get_verbatim_line2();
+             if (cd->shared)
+               {
                   if (script_is_replaceable)
                     {
                        free(cd->shared);
@@ -5645,12 +5699,12 @@ ob_collections_group_script(void)
                            file_in, line - 1);
                        exit(-1);
                     }
-	       }
-	     cd->shared = s;
+               }
+             cd->shared = s;
              cd->original = strdup(s);
-	     cd->is_lua = 0;
-	     set_verbatim(NULL, 0, 0);
-	  }
+             cd->is_lua = 0;
+             set_verbatim(NULL, 0, 0);
+          }
      }
 }
 
@@ -5664,23 +5718,23 @@ ob_collections_group_lua_script(void)
    if (!is_verbatim()) track_verbatim(1);
    else
      {
-	char *s;
+        char *s;
 
-	s = get_verbatim();
-	if (s)
-	  {
-	     cd->l1 = get_verbatim_line1();
-	     cd->l2 = get_verbatim_line2();
-	     if (cd->shared)
-	       {
-		  ERR("parse error %s:%i. There is already an existing script section for the group",
-		      file_in, line - 1);
-		  exit(-1);
-	       }
-	     cd->shared = s;
-	     cd->is_lua = 1;
-	     set_verbatim(NULL, 0, 0);
-	  }
+        s = get_verbatim();
+        if (s)
+          {
+             cd->l1 = get_verbatim_line1();
+             cd->l2 = get_verbatim_line2();
+             if (cd->shared)
+               {
+                  ERR("parse error %s:%i. There is already an existing script section for the group",
+                      file_in, line - 1);
+                  exit(-1);
+               }
+             cd->shared = s;
+             cd->is_lua = 1;
+             set_verbatim(NULL, 0, 0);
+          }
      }
 }
 
@@ -5711,7 +5765,7 @@ ob_collections_group_lua_script(void)
         Defines a new parameter, the value will be the string specified next to
         it.
     @endproperty
-*/
+ */
 
 static void
 st_collections_group_data_item(void)
@@ -5804,7 +5858,7 @@ st_collections_group_data_item(void)
         Includes an external file to define a new Lua script used for filtering.
         The file must be in the data path passed to edje_cc (-dd argument).
     @endproperty
-*/
+ */
 
 static Edje_Gfx_Filter *current_filter = NULL;
 
@@ -5982,7 +6036,7 @@ st_filters_filter_file(void)
         exit(-1);
      }
 
-   current_filter->script = (char*)eina_memdup((unsigned char*)script, sz, 1);
+   current_filter->script = (char *)eina_memdup((unsigned char *)script, sz, 1);
    eina_file_map_free(f, script);
    eina_file_close(f);
 
@@ -6044,7 +6098,7 @@ st_filters_filter_name(void)
         it pass below that limit.
         This limit will be applied on the y absis and is expressed in pixels.
     @endproperty
-*/
+ */
 static void
 st_collections_group_limits_vertical(void)
 {
@@ -6056,14 +6110,14 @@ st_collections_group_limits_vertical(void)
    pc = eina_list_data_get(eina_list_last(edje_collections));
    pc->limits.vertical_count++;
    elp = realloc(pc->limits.vertical,
-                pc->limits.vertical_count * sizeof (Edje_Limit *));
+                 pc->limits.vertical_count * sizeof (Edje_Limit *));
    if (!elp)
      {
         ERR("Not enough memory.");
         exit(-1);
      }
    pc->limits.vertical = elp;
-   
+
    el = mem_alloc(SZ(Edje_Limit));
    if (!el)
      {
@@ -6089,7 +6143,7 @@ st_collections_group_limits_vertical(void)
         it pass below that limit.
         This limit will be applied on the x axis and is expressed in pixels.
     @endproperty
-*/
+ */
 static void
 st_collections_group_limits_horizontal(void)
 {
@@ -6146,7 +6200,7 @@ st_collections_group_limits_horizontal(void)
         "real_part_path" in the "somegroup" group.
     @endproperty
     @endblock
-*/
+ */
 static void
 st_collections_group_parts_alias(void)
 {
@@ -6204,68 +6258,68 @@ st_collections_group_parts_alias(void)
         theme, for example, a part can represent a line in a border or a label
         on a button.
     @endblock
-*/
+ */
 static Edje_Part *
 edje_cc_handlers_part_make(int id)
 {  /* Doing ob_collections_group_parts_part() job, without hierarchy */
-   Edje_Part_Collection *pc;
-   Edje_Part_Collection_Parser *pcp;
-   Edje_Part *ep;
-   Edje_Part_Parser *epp;
-
-   ep = mem_alloc(SZ(Edje_Part_Parser));
-
-   pc = eina_list_data_get(eina_list_last(edje_collections));
-   if (id < 0)
-     {
-        pc->parts_count++;
-        pc->parts = realloc(pc->parts, pc->parts_count * sizeof (Edje_Part *));
-        if (!pc->parts)
-          {
-             ERR("Not enough memory.");
-             exit(-1);
-          }
-        id = pc->parts_count - 1;
-     }
-
-   current_part = pc->parts[id] = ep;
-   pcp = (Edje_Part_Collection_Parser *)pc;
-
-   ep->id = id;
-   ep->type = EDJE_PART_TYPE_IMAGE;
-   ep->mouse_events = pcp->default_mouse_events;
-   ep->anti_alias = 1;
-   ep->repeat_events = 0;
-   ep->ignore_flags = EVAS_EVENT_FLAG_NONE;
-   ep->mask_flags = EVAS_EVENT_FLAG_NONE;
-   ep->scale = 0;
-   ep->pointer_mode = EVAS_OBJECT_POINTER_MODE_AUTOGRAB;
-   ep->precise_is_inside = 0;
-   ep->use_alternate_font_metrics = 0;
-   ep->access = 0;
-   ep->clip_to_id = -1;
-   ep->no_render = 0;
-   ep->required = 0;
-   ep->dragable.confine_id = -1;
-   ep->dragable.threshold_id = -1;
-   ep->dragable.event_id = -1;
-   ep->items = NULL;
-   ep->nested_children_count = 0;
-
-   ep->allowed_seats = NULL;
-   ep->allowed_seats_count = 0;
-
-   epp = (Edje_Part_Parser *)ep;
-   epp->reorder.insert_before = NULL;
-   epp->reorder.insert_after = NULL;
-   epp->reorder.before = NULL;
-   epp->reorder.after = NULL;
-   epp->reorder.linked_prev = 0;
-   epp->reorder.linked_next = 0;
-   epp->reorder.done = EINA_FALSE;
-   epp->can_override = EINA_FALSE;
+  Edje_Part_Collection *pc;
+  Edje_Part_Collection_Parser *pcp;
+  Edje_Part *ep;
+  Edje_Part_Parser *epp;
+
+  ep = mem_alloc(SZ(Edje_Part_Parser));
+
+  pc = eina_list_data_get(eina_list_last(edje_collections));
+  if (id < 0)
+    {
+       pc->parts_count++;
+       pc->parts = realloc(pc->parts, pc->parts_count * sizeof (Edje_Part *));
+       if (!pc->parts)
+         {
+            ERR("Not enough memory.");
+            exit(-1);
+         }
+       id = pc->parts_count - 1;
+    }
 
-   return ep;
+  current_part = pc->parts[id] = ep;
+  pcp = (Edje_Part_Collection_Parser *)pc;
+
+  ep->id = id;
+  ep->type = EDJE_PART_TYPE_IMAGE;
+  ep->mouse_events = pcp->default_mouse_events;
+  ep->anti_alias = 1;
+  ep->repeat_events = 0;
+  ep->ignore_flags = EVAS_EVENT_FLAG_NONE;
+  ep->mask_flags = EVAS_EVENT_FLAG_NONE;
+  ep->scale = 0;
+  ep->pointer_mode = EVAS_OBJECT_POINTER_MODE_AUTOGRAB;
+  ep->precise_is_inside = 0;
+  ep->use_alternate_font_metrics = 0;
+  ep->access = 0;
+  ep->clip_to_id = -1;
+  ep->no_render = 0;
+  ep->required = 0;
+  ep->dragable.confine_id = -1;
+  ep->dragable.threshold_id = -1;
+  ep->dragable.event_id = -1;
+  ep->items = NULL;
+  ep->nested_children_count = 0;
+
+  ep->allowed_seats = NULL;
+  ep->allowed_seats_count = 0;
+
+  epp = (Edje_Part_Parser *)ep;
+  epp->reorder.insert_before = NULL;
+  epp->reorder.insert_after = NULL;
+  epp->reorder.before = NULL;
+  epp->reorder.after = NULL;
+  epp->reorder.linked_prev = 0;
+  epp->reorder.linked_next = 0;
+  epp->reorder.done = EINA_FALSE;
+  epp->can_override = EINA_FALSE;
+
+  return ep;
 }
 
 static void *
@@ -6292,34 +6346,37 @@ _part_desc_free(Edje_Part_Collection *pc,
       case EDJE_PART_TYPE_RECTANGLE:
       case EDJE_PART_TYPE_SWALLOW:
       case EDJE_PART_TYPE_GROUP:
-         /* Nothing todo, this part only have a common description. */
-         break;
+        /* Nothing todo, this part only have a common description. */
+        break;
+
       case EDJE_PART_TYPE_BOX:
       case EDJE_PART_TYPE_TABLE:
       case EDJE_PART_TYPE_IMAGE:
       case EDJE_PART_TYPE_SNAPSHOT:
       case EDJE_PART_TYPE_VECTOR:
-         /* Nothing todo here */
-         break;
+        /* Nothing todo here */
+        break;
+
       case EDJE_PART_TYPE_TEXT:
       case EDJE_PART_TYPE_TEXTBLOCK:
-        {
-           Edje_Part_Description_Text *ted = (Edje_Part_Description_Text*) ed;
+      {
+         Edje_Part_Description_Text *ted = (Edje_Part_Description_Text *)ed;
+
+         part_lookup_del(pc, &(ted->text.id_source));
+         part_lookup_del(pc, &(ted->text.id_text_source));
+         break;
+      }
 
-           part_lookup_del(pc, &(ted->text.id_source));
-           part_lookup_del(pc, &(ted->text.id_text_source));
-           break;
-        }
       case EDJE_PART_TYPE_PROXY:
-        {
-           Edje_Part_Description_Proxy *ped = (Edje_Part_Description_Proxy*) ed;
+      {
+         Edje_Part_Description_Proxy *ped = (Edje_Part_Description_Proxy *)ed;
 
-           part_lookup_del(pc, &(ped->proxy.id));
-           break;
-        }
+         part_lookup_del(pc, &(ped->proxy.id));
+         break;
+      }
      }
 
-   free((void*)ed->state.name);
+   free((void *)ed->state.name);
    free(ed);
    return NULL;
 }
@@ -6396,7 +6453,7 @@ _part_create(void)
    edje_cc_handlers_hierarchy_push(ep, cp);
 
    prnt = edje_cc_handlers_hierarchy_parent_get();
-   if (prnt)  /* This is the child of parent in stack */
+   if (prnt) /* This is the child of parent in stack */
      prnt->nested_children_count++;
 }
 
@@ -6406,21 +6463,21 @@ ob_collections_group_parts_part_short(void)
    unsigned int type;
 
    type = parse_enum(-1,
-                  "none", EDJE_PART_TYPE_NONE,
-                  "rect", EDJE_PART_TYPE_RECTANGLE,
-                  "text", EDJE_PART_TYPE_TEXT,
-                  "image", EDJE_PART_TYPE_IMAGE,
-                  "swallow", EDJE_PART_TYPE_SWALLOW,
-                  "textblock", EDJE_PART_TYPE_TEXTBLOCK,
-                  "group", EDJE_PART_TYPE_GROUP,
-                  "box", EDJE_PART_TYPE_BOX,
-                  "table", EDJE_PART_TYPE_TABLE,
-                  "external", EDJE_PART_TYPE_EXTERNAL,
-                  "proxy", EDJE_PART_TYPE_PROXY,
-                  "spacer", EDJE_PART_TYPE_SPACER,
-                  "snapshot", EDJE_PART_TYPE_SNAPSHOT,
-                  "vector", EDJE_PART_TYPE_VECTOR,
-                  NULL);
+                     "none", EDJE_PART_TYPE_NONE,
+                     "rect", EDJE_PART_TYPE_RECTANGLE,
+                     "text", EDJE_PART_TYPE_TEXT,
+                     "image", EDJE_PART_TYPE_IMAGE,
+                     "swallow", EDJE_PART_TYPE_SWALLOW,
+                     "textblock", EDJE_PART_TYPE_TEXTBLOCK,
+                     "group", EDJE_PART_TYPE_GROUP,
+                     "box", EDJE_PART_TYPE_BOX,
+                     "table", EDJE_PART_TYPE_TABLE,
+                     "external", EDJE_PART_TYPE_EXTERNAL,
+                     "proxy", EDJE_PART_TYPE_PROXY,
+                     "spacer", EDJE_PART_TYPE_SPACER,
+                     "snapshot", EDJE_PART_TYPE_SNAPSHOT,
+                     "vector", EDJE_PART_TYPE_VECTOR,
+                     NULL);
 
    stack_replace_quick("part");
    _part_create();
@@ -6436,7 +6493,7 @@ ob_collections_group_parts_part(void)
 static void *
 _part_free(Edje_Part_Collection *pc, Edje_Part *ep)
 {
-   Edje_Part_Parser *epp = (Edje_Part_Parser*)ep;
+   Edje_Part_Parser *epp = (Edje_Part_Parser *)ep;
    unsigned int j;
 
    part_lookup_del(pc, &(ep->clip_to_id));
@@ -6445,33 +6502,33 @@ _part_free(Edje_Part_Collection *pc, Edje_Part *ep)
    part_lookup_del(pc, &(ep->dragable.event_id));
 
    _part_desc_free(pc, ep, ep->default_desc);
-   for (j = 0 ; j < ep->other.desc_count ; j++)
+   for (j = 0; j < ep->other.desc_count; j++)
      _part_desc_free(pc, ep, ep->other.desc[j]);
 
-   for (j = 0 ; j < ep->items_count ; j++)
+   for (j = 0; j < ep->items_count; j++)
      free(ep->items[j]);
    free(ep->items);
 
-   for (j = 0 ; j < ep->allowed_seats_count; j++)
+   for (j = 0; j < ep->allowed_seats_count; j++)
      {
-        free((void*)(ep->allowed_seats[j]->name));
+        free((void *)(ep->allowed_seats[j]->name));
         free(ep->allowed_seats[j]);
      }
    free(ep->allowed_seats);
 
-   free((void*)ep->name);
-   free((void*)ep->source);
-   free((void*)ep->source2);
-   free((void*)ep->source3);
-   free((void*)ep->source4);
-   free((void*)ep->source5);
-   free((void*)ep->source6);
+   free((void *)ep->name);
+   free((void *)ep->source);
+   free((void *)ep->source2);
+   free((void *)ep->source3);
+   free((void *)ep->source4);
+   free((void *)ep->source5);
+   free((void *)ep->source6);
 
-   free((void*)epp->reorder.insert_before);
-   free((void*)epp->reorder.insert_after);
+   free((void *)epp->reorder.insert_before);
+   free((void *)epp->reorder.insert_after);
 
-   free((void*)ep->api.name);
-   free((void*)ep->api.description);
+   free((void *)ep->api.name);
+   free((void *)ep->api.description);
 
    free(ep->other.desc);
    free(ep);
@@ -6491,7 +6548,7 @@ _part_free(Edje_Part_Collection *pc, Edje_Part *ep)
         allowed.
     @since 1.10
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_inherit(void)
 {
@@ -6520,7 +6577,7 @@ st_collections_group_parts_part_inherit(void)
         current_part = _part_free(pc, current_part);
         edje_cc_handlers_part_make(id);
         _part_copy(current_part, pc->parts[i]);
-        free((void*)current_part->name);
+        free((void *)current_part->name);
         current_part->name = pname;
         free(name);
         return;
@@ -6540,23 +6597,23 @@ _program_free(Edje_Program *pr)
 
    pc = eina_list_last_data_get(edje_collections);
 
-   free((void*)pr->name);
-   free((void*)pr->signal);
-   free((void*)pr->source);
-   free((void*)pr->filter.part);
-   free((void*)pr->filter.state);
-   free((void*)pr->seat);
-   free((void*)pr->state);
-   free((void*)pr->state2);
-   free((void*)pr->sample_name);
-   free((void*)pr->tone_name);
+   free((void *)pr->name);
+   free((void *)pr->signal);
+   free((void *)pr->source);
+   free((void *)pr->filter.part);
+   free((void *)pr->filter.state);
+   free((void *)pr->seat);
+   free((void *)pr->state);
+   free((void *)pr->state2);
+   free((void *)pr->sample_name);
+   free((void *)pr->tone_name);
    EINA_LIST_FREE(pr->targets, prt)
      {
         part_lookup_del(pc, &prt->id);
         free(prt);
      }
    EINA_LIST_FREE(pr->after, pa)
-      free(pa);
+     free(pa);
    free(pr);
 }
 
@@ -6597,7 +6654,6 @@ _program_remove(const char *name, Edje_Program **pgrms, unsigned int count)
    return EINA_FALSE;
 }
 
-
 static Eina_Bool
 _part_name_check(void)
 {
@@ -6611,30 +6667,30 @@ _part_name_check(void)
 
    for (i = 0; i < (pc->parts_count - 1); i++)
      {  /* Compare name only if did NOT updated ep from hircy pop */
-        if ((ep != pc->parts[i]) &&
-              (pc->parts[i]->name &&
-               (!strcmp(pc->parts[i]->name, ep->name))))
-          {
-             Edje_Part_Parser *epp;
+       if ((ep != pc->parts[i]) &&
+           (pc->parts[i]->name &&
+            (!strcmp(pc->parts[i]->name, ep->name))))
+         {
+            Edje_Part_Parser *epp;
 
-             epp = (Edje_Part_Parser *)pc->parts[i];
-             if (!epp->can_override)
-               {
-                  ERR("parse error %s:%i. There is already a part of the name %s",
-                      file_in, line - 1, ep->name);
-                  exit(-1);
-               }
-             else
-               {
-                  pc->parts_count--;
-                  pc->parts = realloc(pc->parts, pc->parts_count * sizeof (Edje_Part *));
-                  current_part = pc->parts[i];
-                  edje_cc_handlers_hierarchy_rename(ep, current_part);
-                  free(ep);
-                  epp->can_override = EINA_FALSE;
-                  break;
-               }
-          }
+            epp = (Edje_Part_Parser *)pc->parts[i];
+            if (!epp->can_override)
+              {
+                 ERR("parse error %s:%i. There is already a part of the name %s",
+                     file_in, line - 1, ep->name);
+                 exit(-1);
+              }
+            else
+              {
+                 pc->parts_count--;
+                 pc->parts = realloc(pc->parts, pc->parts_count * sizeof (Edje_Part *));
+                 current_part = pc->parts[i];
+                 edje_cc_handlers_hierarchy_rename(ep, current_part);
+                 free(ep);
+                 epp->can_override = EINA_FALSE;
+                 break;
+              }
+         }
      }
    return EINA_TRUE;
 }
@@ -6650,7 +6706,7 @@ _part_name_check(void)
         positioning system, by programs and in some cases by the application.
         It must be unique within the group.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_name(void)
 {
@@ -6690,7 +6746,7 @@ st_collections_group_parts_part_name(void)
 
          Defaults: IMAGE
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_type(void)
 {
@@ -6768,7 +6824,7 @@ st_collections_group_parts_part_type(void)
         Defaults: NONE
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_physics_body(void)
@@ -6803,6 +6859,7 @@ st_collections_group_parts_part_physics_body(void)
         pc->physics_enabled = 1;
      }
 }
+
 #endif
 
 /**
@@ -6835,7 +6892,7 @@ st_collections_group_parts_part_physics_body(void)
         You must define parent part name before adding nested parts.
     @since 1.7
     @endproperty
-*/
+ */
 
 /**
     @page edcref
@@ -6849,7 +6906,7 @@ st_collections_group_parts_part_physics_body(void)
         more than one by insert_before.
     @since 1.1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_insert_before(void)
 {
@@ -6873,7 +6930,7 @@ st_collections_group_parts_part_insert_before(void)
         more than one by insert_after.
     @since 1.1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_insert_after(void)
 {
@@ -6898,7 +6955,7 @@ st_collections_group_parts_part_insert_after(void)
 
         Defaults: group.mouse_events
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_mouse_events(void)
 {
@@ -6932,7 +6989,7 @@ st_collections_group_parts_part_nomouse(void)
 
         Defaults: 1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_anti_alias(void)
 {
@@ -6952,7 +7009,7 @@ st_collections_group_parts_part_anti_alias(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_repeat_events(void)
 {
@@ -6994,16 +7051,16 @@ st_collections_group_parts_part_norepeat(void)
 
         Defaults: NONE
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_ignore_flags(void)
 {
    check_min_arg_count(1);
 
    current_part->ignore_flags = parse_flags(0,
-				  "NONE", EVAS_EVENT_FLAG_NONE,
-				  "ON_HOLD", EVAS_EVENT_FLAG_ON_HOLD,
-				  NULL);
+                                            "NONE", EVAS_EVENT_FLAG_NONE,
+                                            "ON_HOLD", EVAS_EVENT_FLAG_ON_HOLD,
+                                            NULL);
 }
 
 /**
@@ -7021,16 +7078,16 @@ st_collections_group_parts_part_ignore_flags(void)
 
         Defaults: NONE
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_mask_flags(void)
 {
    check_min_arg_count(1);
 
    current_part->mask_flags = parse_flags(0,
-				  "NONE", EVAS_EVENT_FLAG_NONE,
-				  "ON_HOLD", EVAS_EVENT_FLAG_ON_HOLD,
-				  NULL);
+                                          "NONE", EVAS_EVENT_FLAG_NONE,
+                                          "ON_HOLD", EVAS_EVENT_FLAG_ON_HOLD,
+                                          NULL);
 }
 
 /**
@@ -7051,7 +7108,7 @@ st_collections_group_parts_part_mask_flags(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_scale(void)
 {
@@ -7084,16 +7141,16 @@ st_collections_group_parts_part_noscale(void)
 
         Defaults: AUTOGRAB
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_pointer_mode(void)
 {
    check_arg_count(1);
 
    current_part->pointer_mode = parse_enum(0,
-				 "AUTOGRAB", EVAS_OBJECT_POINTER_MODE_AUTOGRAB,
-				 "NOGRAB", EVAS_OBJECT_POINTER_MODE_NOGRAB,
-				 NULL);
+                                           "AUTOGRAB", EVAS_OBJECT_POINTER_MODE_AUTOGRAB,
+                                           "NOGRAB", EVAS_OBJECT_POINTER_MODE_NOGRAB,
+                                           NULL);
 }
 
 /**
@@ -7108,7 +7165,7 @@ st_collections_group_parts_part_pointer_mode(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_precise_is_inside(void)
 {
@@ -7146,7 +7203,7 @@ st_collections_group_parts_part_noprecise(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_use_alternate_font_metrics(void)
 {
@@ -7166,7 +7223,7 @@ st_collections_group_parts_part_use_alternate_font_metrics(void)
         container. Overflowing content will not be displayed. Note that
         the part being clipped to can only be a rectangle part.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_clip_to_id(void)
 {
@@ -7175,13 +7232,13 @@ st_collections_group_parts_part_clip_to_id(void)
    check_arg_count(1);
 
    pc = eina_list_data_get(eina_list_last(edje_collections));
-     {
-        char *name;
+   {
+      char *name;
 
-        name = parse_str(0);
-        data_queue_part_lookup(pc, name, &(current_part->clip_to_id));
-        free(name);
-     }
+      name = parse_str(0);
+      data_queue_part_lookup(pc, name, &(current_part->clip_to_id));
+      free(name);
+   }
 }
 
 /**
@@ -7200,7 +7257,7 @@ st_collections_group_parts_part_clip_to_id(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_no_render(void)
 {
@@ -7229,7 +7286,7 @@ st_collections_group_parts_part_render(void)
         Defaults: 0
     @since 1.18
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_required(void)
 {
@@ -7252,13 +7309,13 @@ st_collections_group_parts_part_norequired(void)
     @parameters
         [another group's name]
     @effect
-        Only available to GROUP or TEXTBLOCK parts. Swallows the specified 
+        Only available to GROUP or TEXTBLOCK parts. Swallows the specified
         group into the part's container if a GROUP. If TEXTBLOCK it is used
         for the group to be loaded and used for selection display UNDER the
         selected text. source2 is used for on top of the selected text, if
         source2 is specified.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_source(void)
 {
@@ -7276,11 +7333,11 @@ st_collections_group_parts_part_source(void)
     @parameters
         [another group's name]
     @effect
-        Only available to TEXTBLOCK parts. It is used for the group to be 
+        Only available to TEXTBLOCK parts. It is used for the group to be
         loaded and used for selection display OVER the selected text. source
         is used for under of the selected text, if source is specified.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_source2(void)
 {
@@ -7298,11 +7355,11 @@ st_collections_group_parts_part_source2(void)
     @parameters
         [another group's name]
     @effect
-        Only available to TEXTBLOCK parts. It is used for the group to be 
+        Only available to TEXTBLOCK parts. It is used for the group to be
         loaded and used for cursor display UNDER the cursor position. source4
         is used for over the cursor text, if source4 is specified.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_source3(void)
 {
@@ -7320,11 +7377,11 @@ st_collections_group_parts_part_source3(void)
     @parameters
         [another group's name]
     @effect
-        Only available to TEXTBLOCK parts. It is used for the group to be 
+        Only available to TEXTBLOCK parts. It is used for the group to be
         loaded and used for cursor display OVER the cursor position. source3
         is used for under the cursor text, if source4 is specified.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_source4(void)
 {
@@ -7342,11 +7399,11 @@ st_collections_group_parts_part_source4(void)
     @parameters
         [another group's name]
     @effect
-        Only available to TEXTBLOCK parts. It is used for the group to be 
+        Only available to TEXTBLOCK parts. It is used for the group to be
         loaded and used for anchors display UNDER the anchor position. source6
         is used for over the anchors text, if source6 is specified.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_source5(void)
 {
@@ -7364,11 +7421,11 @@ st_collections_group_parts_part_source5(void)
     @parameters
         [another group's name]
     @effect
-        Only available to TEXTBLOCK parts. It is used for the group to be 
+        Only available to TEXTBLOCK parts. It is used for the group to be
         loaded and used for anchor display OVER the anchor position. source5
         is used for under the anchor text, if source6 is specified.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_source6(void)
 {
@@ -7412,39 +7469,39 @@ st_collections_group_parts_part_source6(void)
 
         Defaults: PLAIN
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_effect(void)
 {
    check_min_arg_count(1);
 
    current_part->effect = parse_enum(0,
-               "NONE", EDJE_TEXT_EFFECT_NONE,
-               "PLAIN", EDJE_TEXT_EFFECT_PLAIN,
-               "OUTLINE", EDJE_TEXT_EFFECT_OUTLINE,
-               "SOFT_OUTLINE", EDJE_TEXT_EFFECT_SOFT_OUTLINE,
-               "SHADOW", EDJE_TEXT_EFFECT_SHADOW,
-               "SOFT_SHADOW", EDJE_TEXT_EFFECT_SOFT_SHADOW,
-               "OUTLINE_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SHADOW,
-               "OUTLINE_SOFT_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW,
-               "FAR_SHADOW", EDJE_TEXT_EFFECT_FAR_SHADOW,
-               "FAR_SOFT_SHADOW", EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW,
-               "GLOW", EDJE_TEXT_EFFECT_GLOW,
-               NULL);
+                                     "NONE", EDJE_TEXT_EFFECT_NONE,
+                                     "PLAIN", EDJE_TEXT_EFFECT_PLAIN,
+                                     "OUTLINE", EDJE_TEXT_EFFECT_OUTLINE,
+                                     "SOFT_OUTLINE", EDJE_TEXT_EFFECT_SOFT_OUTLINE,
+                                     "SHADOW", EDJE_TEXT_EFFECT_SHADOW,
+                                     "SOFT_SHADOW", EDJE_TEXT_EFFECT_SOFT_SHADOW,
+                                     "OUTLINE_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SHADOW,
+                                     "OUTLINE_SOFT_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW,
+                                     "FAR_SHADOW", EDJE_TEXT_EFFECT_FAR_SHADOW,
+                                     "FAR_SOFT_SHADOW", EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW,
+                                     "GLOW", EDJE_TEXT_EFFECT_GLOW,
+                                     NULL);
    if (get_arg_count() >= 2)
      {
         unsigned char shadow;
-        
+
         shadow = parse_enum(1,
-               "BOTTOM_RIGHT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_BOTTOM_RIGHT,
-               "BOTTOM", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_BOTTOM,
-               "BOTTOM_LEFT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_BOTTOM_LEFT,
-               "LEFT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_LEFT,
-               "TOP_LEFT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_TOP_LEFT,
-               "TOP", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_TOP,
-               "TOP_RIGHT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_TOP_RIGHT,
-               "RIGHT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_RIGHT,
-               NULL);
+                            "BOTTOM_RIGHT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_BOTTOM_RIGHT,
+                            "BOTTOM", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_BOTTOM,
+                            "BOTTOM_LEFT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_BOTTOM_LEFT,
+                            "LEFT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_LEFT,
+                            "TOP_LEFT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_TOP_LEFT,
+                            "TOP", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_TOP,
+                            "TOP_RIGHT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_TOP_RIGHT,
+                            "RIGHT", EDJE_TEXT_EFFECT_SHADOW_DIRECTION_RIGHT,
+                            NULL);
         EDJE_TEXT_EFFECT_SHADOW_DIRECTION_SET(current_part->effect, shadow);
      }
 }
@@ -7470,18 +7527,18 @@ st_collections_group_parts_part_effect(void)
 
         Defaults: NONE
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_entry_mode(void)
 {
    check_arg_count(1);
 
    current_part->entry_mode = parse_enum(0,
-			       "NONE", EDJE_ENTRY_EDIT_MODE_NONE,
-			       "PLAIN", EDJE_ENTRY_EDIT_MODE_SELECTABLE,
-			       "EDITABLE", EDJE_ENTRY_EDIT_MODE_EDITABLE,
-			       "PASSWORD", EDJE_ENTRY_EDIT_MODE_PASSWORD,
-			       NULL);
+                                         "NONE", EDJE_ENTRY_EDIT_MODE_NONE,
+                                         "PLAIN", EDJE_ENTRY_EDIT_MODE_SELECTABLE,
+                                         "EDITABLE", EDJE_ENTRY_EDIT_MODE_EDITABLE,
+                                         "PASSWORD", EDJE_ENTRY_EDIT_MODE_PASSWORD,
+                                         NULL);
 }
 
 /**
@@ -7498,16 +7555,16 @@ st_collections_group_parts_part_entry_mode(void)
         controlling the edje object has to explicitly begin and end selection
         modes, and the selection itself is draggable at both ends.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_select_mode(void)
 {
    check_arg_count(1);
 
    current_part->select_mode = parse_enum(0,
-                                "DEFAULT", EDJE_ENTRY_SELECTION_MODE_DEFAULT,
-                                "EXPLICIT", EDJE_ENTRY_SELECTION_MODE_EXPLICIT,
-                                NULL);
+                                          "DEFAULT", EDJE_ENTRY_SELECTION_MODE_DEFAULT,
+                                          "EXPLICIT", EDJE_ENTRY_SELECTION_MODE_EXPLICIT,
+                                          NULL);
 }
 
 /**
@@ -7524,16 +7581,16 @@ st_collections_group_parts_part_select_mode(void)
 
         Defaults: UNDER
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_cursor_mode(void)
 {
    check_arg_count(1);
 
    current_part->cursor_mode = parse_enum(0,
-                                "UNDER", EDJE_ENTRY_CURSOR_MODE_UNDER,
-                                "BEFORE", EDJE_ENTRY_CURSOR_MODE_BEFORE,
-                                NULL);
+                                          "UNDER", EDJE_ENTRY_CURSOR_MODE_UNDER,
+                                          "BEFORE", EDJE_ENTRY_CURSOR_MODE_BEFORE,
+                                          NULL);
 }
 
 /**
@@ -7548,7 +7605,7 @@ st_collections_group_parts_part_cursor_mode(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_multiline(void)
 {
@@ -7560,7 +7617,7 @@ st_collections_group_parts_part_multiline(void)
 /**
     @page edcref
     @property
-        access 
+        access
     @parameters
         [1 or 0]
     @effect
@@ -7568,7 +7625,7 @@ st_collections_group_parts_part_multiline(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_access(void)
 {
@@ -7620,7 +7677,7 @@ st_collections_group_parts_part_access(void)
 
         Defaults: 0 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_dragable_x(void)
 {
@@ -7648,7 +7705,7 @@ st_collections_group_parts_part_dragable_x(void)
 
         Defaults: 0 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_dragable_y(void)
 {
@@ -7670,7 +7727,7 @@ st_collections_group_parts_part_dragable_y(void)
         container. When you use confine don't forget to set a min size for the
         part, or the draggie will not show up.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_dragable_confine(void)
 {
@@ -7679,13 +7736,13 @@ st_collections_group_parts_part_dragable_confine(void)
    check_arg_count(1);
 
    pc = eina_list_data_get(eina_list_last(edje_collections));
-     {
-	char *name;
+   {
+      char *name;
 
-	name = parse_str(0);
-	data_queue_part_lookup(pc, name, &(current_part->dragable.confine_id));
-	free(name);
-     }
+      name = parse_str(0);
+      data_queue_part_lookup(pc, name, &(current_part->dragable.confine_id));
+      free(name);
+   }
 }
 
 /**
@@ -7698,7 +7755,7 @@ st_collections_group_parts_part_dragable_confine(void)
         When set, the movement of the dragged part can only start when it get
         moved enough to be outside of the threshold part.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_dragable_threshold(void)
 {
@@ -7707,13 +7764,13 @@ st_collections_group_parts_part_dragable_threshold(void)
    check_arg_count(1);
 
    pc = eina_list_data_get(eina_list_last(edje_collections));
-     {
-	char *name;
+   {
+      char *name;
 
-	name = parse_str(0);
-	data_queue_part_lookup(pc, name, &(current_part->dragable.threshold_id));
-	free(name);
-     }
+      name = parse_str(0);
+      data_queue_part_lookup(pc, name, &(current_part->dragable.threshold_id));
+      free(name);
+   }
 }
 
 /**
@@ -7726,7 +7783,7 @@ st_collections_group_parts_part_dragable_threshold(void)
         It causes the part to forward the drag events to another part, thus
         ignoring them for itself.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_dragable_events(void)
 {
@@ -7735,13 +7792,13 @@ st_collections_group_parts_part_dragable_events(void)
    check_arg_count(1);
 
    pc = eina_list_data_get(eina_list_last(edje_collections));
-     {
-	char *name;
+   {
+      char *name;
 
-	name = parse_str(0);
-	data_queue_part_lookup(pc, name, &(current_part->dragable.event_id));
-	free(name);
-     }
+      name = parse_str(0);
+      data_queue_part_lookup(pc, name, &(current_part->dragable.event_id));
+      free(name);
+   }
 }
 
 /**
@@ -7761,7 +7818,7 @@ st_collections_group_parts_part_dragable_events(void)
         Also it won't be able to focus this part.
     @since 1.19
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_allowed_seats(void)
 {
@@ -7826,8 +7883,9 @@ st_collections_group_parts_part_allowed_seats(void)
         as elements of the box. These can be mixed with external objects set
         by the application through the edje_object_part_box_* API.
     @endblock
-*/
-static void ob_collections_group_parts_part_box_items_item(void)
+ */
+static void
+ob_collections_group_parts_part_box_items_item(void)
 {
    Edje_Part *ep;
    Edje_Pack_Element *item;
@@ -7843,7 +7901,7 @@ static void ob_collections_group_parts_part_box_items_item(void)
      }
 
    ep->items_count++;
-   ep->items = realloc(ep->items, sizeof (Edje_Pack_Element*) * ep->items_count);
+   ep->items = realloc(ep->items, sizeof (Edje_Pack_Element *) * ep->items_count);
    if (!ep->items)
      {
         ERR("Not enough memory.");
@@ -7883,12 +7941,12 @@ static void ob_collections_group_parts_part_box_items_item(void)
    pitem->can_override = EINA_FALSE;
 }
 
-#define CURRENT_ITEM_CHECK						\
-  if (!current_item)							\
-    {									\
-       ERR("parse error %s:%i. Item not defined at this stage.",        \
-           file_in, line - 1);                                          \
-      exit(-1);								\
+#define CURRENT_ITEM_CHECK                                       \
+  if (!current_item)                                             \
+    {                                                            \
+       ERR("parse error %s:%i. Item not defined at this stage.", \
+           file_in, line - 1);                                   \
+       exit(-1);                                                 \
     }
 
 /**
@@ -7902,28 +7960,29 @@ static void ob_collections_group_parts_part_box_items_item(void)
         Supported types are:
         @li GROUP
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_type(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_type(void)
 {
    CURRENT_ITEM_CHECK;
 
    check_arg_count(1);
 
-     {
-	char *s;
+   {
+      char *s;
 
-	s = parse_str(0);
-	if (strcmp(s, "GROUP"))
-	  {
-             ERR("parse error %s:%i. token %s not one of: GROUP.",
-                 file_in, line - 1, s);
-	     free(s);
-	     exit(-1);
-	  }
-	free(s);
-	/* FIXME: handle the enum, once everything else is supported */
-	current_item->type = EDJE_PART_TYPE_GROUP;
-     }
+      s = parse_str(0);
+      if (strcmp(s, "GROUP"))
+        {
+           ERR("parse error %s:%i. token %s not one of: GROUP.",
+               file_in, line - 1, s);
+           free(s);
+           exit(-1);
+        }
+      free(s);
+      /* FIXME: handle the enum, once everything else is supported */
+      current_item->type = EDJE_PART_TYPE_GROUP;
+   }
 }
 
 /**
@@ -7935,8 +7994,9 @@ static void st_collections_group_parts_part_box_items_item_type(void)
     @effect
         Sets the name of the object via evas_object_name_set().
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_name(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_name(void)
 {
    Edje_Part *ep;
    Edje_Pack_Element *item;
@@ -7951,32 +8011,32 @@ static void st_collections_group_parts_part_box_items_item_name(void)
 
    item->name = parse_str(0);
 
-     {
-        unsigned int i;
+   {
+      unsigned int i;
 
-        for (i = 0; i < ep->items_count - 1; ++i)
-          {
-             if (ep->items[i]->name && (!strcmp(ep->items[i]->name, item->name)))
-               {
-                  pitem = (Edje_Pack_Element_Parser *)ep->items[i];
-                  if (!pitem->can_override)
-                    {
-                       ERR("parse error %s:%i. There is already a item of the name %s",
-                           file_in, line - 1, item->name);
-                       exit(-1);
-                    }
-                  else
-                    {
-                       free(item);
-                       ep->items_count--;
-                       ep->items = realloc(ep->items, ep->items_count * sizeof (Edje_Pack_Element *));
-                       current_item = ep->items[i];
-                       pitem->can_override = EINA_FALSE;
-                       break;
-                    }
-               }
-          }
-     }
+      for (i = 0; i < ep->items_count - 1; ++i)
+        {
+           if (ep->items[i]->name && (!strcmp(ep->items[i]->name, item->name)))
+             {
+                pitem = (Edje_Pack_Element_Parser *)ep->items[i];
+                if (!pitem->can_override)
+                  {
+                     ERR("parse error %s:%i. There is already a item of the name %s",
+                         file_in, line - 1, item->name);
+                     exit(-1);
+                  }
+                else
+                  {
+                     free(item);
+                     ep->items_count--;
+                     ep->items = realloc(ep->items, ep->items_count * sizeof (Edje_Pack_Element *));
+                     current_item = ep->items[i];
+                     pitem->can_override = EINA_FALSE;
+                     break;
+                  }
+             }
+        }
+   }
 }
 
 /**
@@ -7988,8 +8048,9 @@ static void st_collections_group_parts_part_box_items_item_name(void)
     @effect
         Sets the group this object will be made from.
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_source(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_source(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8010,8 +8071,9 @@ static void st_collections_group_parts_part_box_items_item_source(void)
 
         Defaults: 0 0
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_min(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_min(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8033,8 +8095,9 @@ static void st_collections_group_parts_part_box_items_item_min(void)
 
        Defaults: 1 1
    @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_spread(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_spread(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8055,8 +8118,9 @@ static void st_collections_group_parts_part_box_items_item_spread(void)
 
         Defaults: 0 0
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_prefer(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_prefer(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8065,6 +8129,7 @@ static void st_collections_group_parts_part_box_items_item_prefer(void)
    current_item->prefer.w = parse_int_range(0, 0, 0x7ffffff);
    current_item->prefer.h = parse_int_range(1, 0, 0x7ffffff);
 }
+
 /**
     @page edcref
     @property
@@ -8076,8 +8141,9 @@ static void st_collections_group_parts_part_box_items_item_prefer(void)
 
         Defaults: -1 -1
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_max(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_max(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8098,8 +8164,9 @@ static void st_collections_group_parts_part_box_items_item_max(void)
 
         Defaults: 0 0 0 0
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_padding(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_padding(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8122,8 +8189,9 @@ static void st_collections_group_parts_part_box_items_item_padding(void)
 
         Defaults: 0.5
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_align(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_align(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8144,8 +8212,9 @@ static void st_collections_group_parts_part_box_items_item_align(void)
 
         Defaults: 0.0 0.0
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_weight(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_weight(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8166,8 +8235,9 @@ static void st_collections_group_parts_part_box_items_item_weight(void)
 
         Defaults: 0 0
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_aspect(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_aspect(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8193,20 +8263,21 @@ static void st_collections_group_parts_part_box_items_item_aspect(void)
 
         Defaults: NONE
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_aspect_mode(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_aspect_mode(void)
 {
    CURRENT_ITEM_CHECK;
 
    check_arg_count(1);
 
    current_item->aspect.mode = parse_enum(0,
-				  "NONE", EDJE_ASPECT_CONTROL_NONE,
-				  "NEITHER", EDJE_ASPECT_CONTROL_NEITHER,
-				  "HORIZONTAL", EDJE_ASPECT_CONTROL_HORIZONTAL,
-				  "VERTICAL", EDJE_ASPECT_CONTROL_VERTICAL,
-				  "BOTH", EDJE_ASPECT_CONTROL_BOTH,
-				  NULL);
+                                          "NONE", EDJE_ASPECT_CONTROL_NONE,
+                                          "NEITHER", EDJE_ASPECT_CONTROL_NEITHER,
+                                          "HORIZONTAL", EDJE_ASPECT_CONTROL_HORIZONTAL,
+                                          "VERTICAL", EDJE_ASPECT_CONTROL_VERTICAL,
+                                          "BOTH", EDJE_ASPECT_CONTROL_BOTH,
+                                          NULL);
 }
 
 /**
@@ -8218,8 +8289,9 @@ static void st_collections_group_parts_part_box_items_item_aspect_mode(void)
     @effect
         Sets extra options for the object. Unused for now.
     @endproperty
-*/
-static void st_collections_group_parts_part_box_items_item_options(void)
+ */
+static void
+st_collections_group_parts_part_box_items_item_options(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8238,8 +8310,9 @@ static void st_collections_group_parts_part_box_items_item_options(void)
         Sets the position this item will have in the table.
         This is required for parts of type TABLE.
     @endproperty
-*/
-static void st_collections_group_parts_part_table_items_item_position(void)
+ */
+static void
+st_collections_group_parts_part_table_items_item_position(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8267,8 +8340,9 @@ static void st_collections_group_parts_part_table_items_item_position(void)
 
         Defaults: 1 1
     @endproperty
-*/
-static void st_collections_group_parts_part_table_items_item_span(void)
+ */
+static void
+st_collections_group_parts_part_table_items_item_span(void)
 {
    CURRENT_ITEM_CHECK;
 
@@ -8347,96 +8421,96 @@ _copied_map_colors_get(Edje_Part_Description_Common *parent)
         used to define style and layout properties of a part in a given
         "state".
     @endblock
-*/
+ */
 static void
 ob_collections_group_parts_part_description(void)
 {  /* Allocate and set desc, set relative part hierarchy if needed */
-   Edje_Part_Collection *pc;
-   Edje_Part *ep;
-   Edje_Part_Description_Common *ed;
-
-   pc = eina_list_data_get(eina_list_last(edje_collections));
-   ep = current_part;
-
-   ed = _edje_part_description_alloc(ep->type, pc->part, ep->name);
-   eina_hash_add(desc_hash, &ed, ep);
-
-   ed->rel1.id_x = -1;
-   ed->rel1.id_y = -1;
-   ed->rel2.id_x = -1;
-   ed->rel2.id_y = -1;
-   ed->clip_to_id = -1;
-
-   if (!ep->default_desc)
-     {
-        current_desc = ep->default_desc = ed;
-        ed->state.name = strdup("default");
+  Edje_Part_Collection *pc;
+  Edje_Part *ep;
+  Edje_Part_Description_Common *ed;
+
+  pc = eina_list_data_get(eina_list_last(edje_collections));
+  ep = current_part;
+
+  ed = _edje_part_description_alloc(ep->type, pc->part, ep->name);
+  eina_hash_add(desc_hash, &ed, ep);
+
+  ed->rel1.id_x = -1;
+  ed->rel1.id_y = -1;
+  ed->rel2.id_x = -1;
+  ed->rel2.id_y = -1;
+  ed->clip_to_id = -1;
+
+  if (!ep->default_desc)
+    {
+       current_desc = ep->default_desc = ed;
+       ed->state.name = strdup("default");
+
+       {     /* Get the ptr of the part above current part in hierarchy */
+         Edje_Part *node = edje_cc_handlers_hierarchy_parent_get();
+         if (node) /* Make relative according to part hierarchy */
+           edje_cc_handlers_hierarchy_set(node);
+       }
+    }
+  else
+    {
+       ep->other.desc_count++;
+       ep->other.desc = realloc(ep->other.desc,
+                                sizeof (Edje_Part_Description_Common *) * ep->other.desc_count);
+       current_desc = ep->other.desc[ep->other.desc_count - 1] = ed;
+    }
 
-          {  /* Get the ptr of the part above current part in hierarchy */
-             Edje_Part *node = edje_cc_handlers_hierarchy_parent_get();
-             if (node)  /* Make relative according to part hierarchy */
-               edje_cc_handlers_hierarchy_set(node);
-          }
-     }
-   else
-     {
-        ep->other.desc_count++;
-        ep->other.desc = realloc(ep->other.desc,
-                                 sizeof (Edje_Part_Description_Common*) * ep->other.desc_count);
-        current_desc = ep->other.desc[ep->other.desc_count - 1] = ed;
-     }
-
-   ed->visible = 1;
-   ed->limit = 0;
-   ed->no_render = 0;
-   ed->align.x = FROM_DOUBLE(0.5);
-   ed->align.y = FROM_DOUBLE(0.5);
-   ed->min.w = 0;
-   ed->min.h = 0;
-   ed->fixed.w = 0;
-   ed->fixed.h = 0;
-   ed->max.w = -1;
-   ed->max.h = -1;
-   ed->size_class = NULL;
-   ed->rel1.relative_x = FROM_DOUBLE(0.0);
-   ed->rel1.relative_y = FROM_DOUBLE(0.0);
-   ed->rel1.offset_x = 0;
-   ed->rel1.offset_y = 0;
-   ed->rel2.relative_x = FROM_DOUBLE(1.0);
-   ed->rel2.relative_y = FROM_DOUBLE(1.0);
-   ed->rel2.offset_x = -1;
-   ed->rel2.offset_y = -1;
-   ed->color_class = NULL;
-   ed->color.r = 255;
-   ed->color.g = 255;
-   ed->color.b = 255;
-   ed->color.a = 255;
-   ed->color2.r = 0;
-   ed->color2.g = 0;
-   ed->color2.b = 0;
-   ed->color2.a = 255;
-   ed->map.id_persp = -1;
-   ed->map.id_light = -1;
-   ed->map.rot.id_center = -1;
-   ed->map.rot.x = FROM_DOUBLE(0.0);
-   ed->map.rot.y = FROM_DOUBLE(0.0);
-   ed->map.rot.z = FROM_DOUBLE(0.0);
-   ed->map.on = 0;
-   ed->map.smooth = 1;
-   ed->map.alpha = 1;
-   ed->map.backcull = 0;
-   ed->map.persp_on = 0;
-   ed->map.colors = NULL;
-   ed->map.zoom.x = FROM_DOUBLE(1.0);
-   ed->map.zoom.y = FROM_DOUBLE(1.0);
-   ed->persp.zplane = 0;
-   ed->persp.focal = 1000;
-   ed->minmul.have = 1;
-   ed->minmul.w = FROM_DOUBLE(1.0);
-   ed->minmul.h = FROM_DOUBLE(1.0);
-   ed->align_3d.x = FROM_DOUBLE(0.5);
-   ed->align_3d.y = FROM_DOUBLE(0.5);
-   ed->align_3d.z = FROM_DOUBLE(0.5);
+  ed->visible = 1;
+  ed->limit = 0;
+  ed->no_render = 0;
+  ed->align.x = FROM_DOUBLE(0.5);
+  ed->align.y = FROM_DOUBLE(0.5);
+  ed->min.w = 0;
+  ed->min.h = 0;
+  ed->fixed.w = 0;
+  ed->fixed.h = 0;
+  ed->max.w = -1;
+  ed->max.h = -1;
+  ed->size_class = NULL;
+  ed->rel1.relative_x = FROM_DOUBLE(0.0);
+  ed->rel1.relative_y = FROM_DOUBLE(0.0);
+  ed->rel1.offset_x = 0;
+  ed->rel1.offset_y = 0;
+  ed->rel2.relative_x = FROM_DOUBLE(1.0);
+  ed->rel2.relative_y = FROM_DOUBLE(1.0);
+  ed->rel2.offset_x = -1;
+  ed->rel2.offset_y = -1;
+  ed->color_class = NULL;
+  ed->color.r = 255;
+  ed->color.g = 255;
+  ed->color.b = 255;
+  ed->color.a = 255;
+  ed->color2.r = 0;
+  ed->color2.g = 0;
+  ed->color2.b = 0;
+  ed->color2.a = 255;
+  ed->map.id_persp = -1;
+  ed->map.id_light = -1;
+  ed->map.rot.id_center = -1;
+  ed->map.rot.x = FROM_DOUBLE(0.0);
+  ed->map.rot.y = FROM_DOUBLE(0.0);
+  ed->map.rot.z = FROM_DOUBLE(0.0);
+  ed->map.on = 0;
+  ed->map.smooth = 1;
+  ed->map.alpha = 1;
+  ed->map.backcull = 0;
+  ed->map.persp_on = 0;
+  ed->map.colors = NULL;
+  ed->map.zoom.x = FROM_DOUBLE(1.0);
+  ed->map.zoom.y = FROM_DOUBLE(1.0);
+  ed->persp.zplane = 0;
+  ed->persp.focal = 1000;
+  ed->minmul.have = 1;
+  ed->minmul.w = FROM_DOUBLE(1.0);
+  ed->minmul.h = FROM_DOUBLE(1.0);
+  ed->align_3d.x = FROM_DOUBLE(0.5);
+  ed->align_3d.y = FROM_DOUBLE(0.5);
+  ed->align_3d.z = FROM_DOUBLE(0.5);
 }
 
 static void
@@ -8459,7 +8533,7 @@ ob_collections_group_parts_part_desc(void)
         simple state changes. Note: inheritance in Edje is single level only.
         @since 1.14 omitting both the description name and index will inherit the default 0.0 description.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_inherit(void)
 {
@@ -8495,19 +8569,22 @@ st_collections_group_parts_part_description_inherit(void)
            case 0:
              parent_name = strdup("default");
              break;
+
            case 2:
              parent_val = parse_float_range(1, 0.0, 1.0);
              EINA_FALLTHROUGH;
+
            case 1:
              parent_name = parse_str(0);
              break;
+
            default:
              ERR("parse error %s:%i. too many parameters",
                  file_in, line - 1);
              exit(-1);
           }
 
-        if (!strcmp (parent_name, "default") && parent_val == 0.0)
+        if (!strcmp(parent_name, "default") && parent_val == 0.0)
           parent = ep->default_desc;
         else
           {
@@ -8525,9 +8602,8 @@ st_collections_group_parts_part_description_inherit(void)
                {
                   d = ep->other.desc[i];
 
-                  if (!strcmp (d->state.name, parent_name))
+                  if (!strcmp(d->state.name, parent_name))
                     {
-
                        double dst;
 
                        dst = ABS(d->state.value - parent_val);
@@ -8539,8 +8615,8 @@ st_collections_group_parts_part_description_inherit(void)
                     }
                }
 
-	     if (min_dst)
-	       {
+             if (min_dst)
+               {
                   WRN("%s:%i: couldn't find an exact match in part '%s' when looking for '%s' %lf. Falling back to nearest one '%s' %lf.",
                       file_in, line - 1, ep->name, parent_name, parent_val, parent ? parent->state.name : NULL, parent ? parent->state.value : 0);
                }
@@ -8598,162 +8674,173 @@ st_collections_group_parts_part_description_inherit(void)
       case EDJE_PART_TYPE_RECTANGLE:
       case EDJE_PART_TYPE_SWALLOW:
       case EDJE_PART_TYPE_GROUP:
-         /* Nothing todo, this part only have a common description. */
-         break;
+        /* Nothing todo, this part only have a common description. */
+        break;
+
       case EDJE_PART_TYPE_TEXT:
       case EDJE_PART_TYPE_TEXTBLOCK:
-           {
-              Edje_Part_Description_Text *ted = (Edje_Part_Description_Text*) ed;
-              Edje_Part_Description_Text *tparent = (Edje_Part_Description_Text*) parent;
+      {
+         Edje_Part_Description_Text *ted = (Edje_Part_Description_Text *)ed;
+         Edje_Part_Description_Text *tparent = (Edje_Part_Description_Text *)parent;
 
-              ted->text = tparent->text;
+         ted->text = tparent->text;
 
-              ted->text.text.str = STRDUP(ted->text.text.str);
-              ted->text.domain = STRDUP(ted->text.domain);
-              ted->text.text_class = STRDUP(ted->text.text_class);
-              ted->text.font.str = STRDUP(ted->text.font.str);
+         ted->text.text.str = STRDUP(ted->text.text.str);
+         ted->text.domain = STRDUP(ted->text.domain);
+         ted->text.text_class = STRDUP(ted->text.text_class);
+         ted->text.font.str = STRDUP(ted->text.font.str);
 
-              _filter_copy(&ted->filter, &tparent->filter);
-              data_queue_copied_part_nest_lookup(pc, &(tparent->text.id_source), &(ted->text.id_source), &ted->text.id_source_part);
-              data_queue_copied_part_nest_lookup(pc, &(tparent->text.id_text_source), &(ted->text.id_text_source), &ted->text.id_text_source_part);
+         _filter_copy(&ted->filter, &tparent->filter);
+         data_queue_copied_part_nest_lookup(pc, &(tparent->text.id_source), &(ted->text.id_source), &ted->text.id_source_part);
+         data_queue_copied_part_nest_lookup(pc, &(tparent->text.id_text_source), &(ted->text.id_text_source), &ted->text.id_text_source_part);
+
+         break;
+      }
 
-              break;
-           }
       case EDJE_PART_TYPE_IMAGE:
-           {
-              Edje_Part_Description_Image *ied = (Edje_Part_Description_Image *) ed;
-              Edje_Part_Description_Image *iparent = (Edje_Part_Description_Image *) parent;
-              unsigned int i;
+      {
+         Edje_Part_Description_Image *ied = (Edje_Part_Description_Image *)ed;
+         Edje_Part_Description_Image *iparent = (Edje_Part_Description_Image *)parent;
+         unsigned int i;
 
-              ied->image = iparent->image;
+         ied->image = iparent->image;
 
-              data_queue_image_remove(&ied->image.id, &ied->image.set);
-              data_queue_copied_image_lookup(&iparent->image.id, &ied->image.id, &ied->image.set);
+         data_queue_image_remove(&ied->image.id, &ied->image.set);
+         data_queue_copied_image_lookup(&iparent->image.id, &ied->image.id, &ied->image.set);
 
-              ied->image.tweens = calloc(iparent->image.tweens_count,
-                                         sizeof (Edje_Part_Image_Id*));
-              for (i = 0; i < iparent->image.tweens_count; i++)
-                {
-                   Edje_Part_Image_Id *iid_new;
+         ied->image.tweens = calloc(iparent->image.tweens_count,
+                                    sizeof (Edje_Part_Image_Id *));
+         for (i = 0; i < iparent->image.tweens_count; i++)
+           {
+              Edje_Part_Image_Id *iid_new;
 
-                   iid = iparent->image.tweens[i];
+              iid = iparent->image.tweens[i];
 
-                   iid_new = mem_alloc(SZ(Edje_Part_Image_Id));
-                   data_queue_image_remove(&ied->image.id, &ied->image.set);
-                   data_queue_copied_image_lookup(&(iid->id), &(iid_new->id), &(iid_new->set));
-                   ied->image.tweens[i] = iid_new;
-                }
+              iid_new = mem_alloc(SZ(Edje_Part_Image_Id));
+              data_queue_image_remove(&ied->image.id, &ied->image.set);
+              data_queue_copied_image_lookup(&(iid->id), &(iid_new->id), &(iid_new->set));
+              ied->image.tweens[i] = iid_new;
+           }
 
-              _filter_copy(&ied->filter, &iparent->filter);
+         _filter_copy(&ied->filter, &iparent->filter);
+
+         break;
+      }
 
-              break;
-           }
       case EDJE_PART_TYPE_SNAPSHOT:
-           {
-              Edje_Part_Description_Snapshot *sed = (Edje_Part_Description_Snapshot*) ed;
-              Edje_Part_Description_Snapshot *sparent = (Edje_Part_Description_Snapshot*) parent;
+      {
+         Edje_Part_Description_Snapshot *sed = (Edje_Part_Description_Snapshot *)ed;
+         Edje_Part_Description_Snapshot *sparent = (Edje_Part_Description_Snapshot *)parent;
 
-              _filter_copy(&sed->filter, &sparent->filter);
+         _filter_copy(&sed->filter, &sparent->filter);
+
+         break;
+      }
 
-              break;
-           }
       case EDJE_PART_TYPE_PROXY:
-           {
-              Edje_Part_Description_Proxy *ped = (Edje_Part_Description_Proxy*) ed;
-              Edje_Part_Description_Proxy *pparent = (Edje_Part_Description_Proxy*) parent;
+      {
+         Edje_Part_Description_Proxy *ped = (Edje_Part_Description_Proxy *)ed;
+         Edje_Part_Description_Proxy *pparent = (Edje_Part_Description_Proxy *)parent;
 
-              data_queue_copied_part_lookup(pc, &(pparent->proxy.id), &(ped->proxy.id));
-              ped->proxy.source_clip = pparent->proxy.source_clip;
-              ped->proxy.source_visible = pparent->proxy.source_visible;
-              _filter_copy(&ped->filter, &pparent->filter);
+         data_queue_copied_part_lookup(pc, &(pparent->proxy.id), &(ped->proxy.id));
+         ped->proxy.source_clip = pparent->proxy.source_clip;
+         ped->proxy.source_visible = pparent->proxy.source_visible;
+         _filter_copy(&ped->filter, &pparent->filter);
+
+         break;
+      }
 
-              break;
-           }
       case EDJE_PART_TYPE_BOX:
-           {
-              Edje_Part_Description_Box *bed = (Edje_Part_Description_Box *) ed;
-              Edje_Part_Description_Box *bparent = (Edje_Part_Description_Box *) parent;
+      {
+         Edje_Part_Description_Box *bed = (Edje_Part_Description_Box *)ed;
+         Edje_Part_Description_Box *bparent = (Edje_Part_Description_Box *)parent;
 
-              bed->box = bparent->box;
+         bed->box = bparent->box;
+
+         break;
+      }
 
-              break;
-           }
       case EDJE_PART_TYPE_TABLE:
-           {
-              Edje_Part_Description_Table *ted = (Edje_Part_Description_Table *) ed;
-              Edje_Part_Description_Table *tparent = (Edje_Part_Description_Table *) parent;
+      {
+         Edje_Part_Description_Table *ted = (Edje_Part_Description_Table *)ed;
+         Edje_Part_Description_Table *tparent = (Edje_Part_Description_Table *)parent;
 
-              ted->table = tparent->table;
+         ted->table = tparent->table;
+
+         break;
+      }
 
-              break;
-           }
       case EDJE_PART_TYPE_EXTERNAL:
+      {
+         Edje_Part_Description_External *eed = (Edje_Part_Description_External *)ed;
+         Edje_Part_Description_External *eparent = (Edje_Part_Description_External *)parent;
+
+         if (eparent->external_params)
            {
-              Edje_Part_Description_External *eed = (Edje_Part_Description_External *) ed;
-              Edje_Part_Description_External *eparent = (Edje_Part_Description_External *) parent;
+              Eina_List *l;
+              Edje_External_Param *param, *new_param;
 
-              if (eparent->external_params)
+              eed->external_params = NULL;
+              EINA_LIST_FOREACH(eparent->external_params, l, param)
                 {
-                   Eina_List *l;
-                   Edje_External_Param *param, *new_param;
-
-                   eed->external_params = NULL;
-                   EINA_LIST_FOREACH(eparent->external_params, l, param)
-                     {
-                        new_param = mem_alloc(SZ(Edje_External_Param));
-                        *new_param = *param;
-                        eed->external_params = eina_list_append(eed->external_params, new_param);
-                     }
+                   new_param = mem_alloc(SZ(Edje_External_Param));
+                   *new_param = *param;
+                   eed->external_params = eina_list_append(eed->external_params, new_param);
                 }
-              break;
            }
+         break;
+      }
+
       case EDJE_PART_TYPE_CAMERA:
-           {
-              Edje_Part_Description_Camera *ced = (Edje_Part_Description_Camera *) ed;
-              Edje_Part_Description_Camera *cparent = (Edje_Part_Description_Camera *) parent;
+      {
+         Edje_Part_Description_Camera *ced = (Edje_Part_Description_Camera *)ed;
+         Edje_Part_Description_Camera *cparent = (Edje_Part_Description_Camera *)parent;
 
-              ced->camera = cparent->camera;
+         ced->camera = cparent->camera;
 
-              data_queue_copied_part_lookup(pc, &(cparent->camera.orientation.look_to), &(ced->camera.orientation.look_to));
+         data_queue_copied_part_lookup(pc, &(cparent->camera.orientation.look_to), &(ced->camera.orientation.look_to));
+
+         break;
+      }
 
-              break;
-           }
       case EDJE_PART_TYPE_LIGHT:
-           {
-              Edje_Part_Description_Light *led = (Edje_Part_Description_Light *) ed;
-              Edje_Part_Description_Light *lparent = (Edje_Part_Description_Light *) parent;
+      {
+         Edje_Part_Description_Light *led = (Edje_Part_Description_Light *)ed;
+         Edje_Part_Description_Light *lparent = (Edje_Part_Description_Light *)parent;
 
-              led->light = lparent->light;
+         led->light = lparent->light;
 
-              data_queue_copied_part_lookup(pc, &(lparent->light.orientation.look_to), &(led->light.orientation.look_to));
+         data_queue_copied_part_lookup(pc, &(lparent->light.orientation.look_to), &(led->light.orientation.look_to));
+
+         break;
+      }
 
-              break;
-           }
       case EDJE_PART_TYPE_MESH_NODE:
-           {
-              Edje_Part_Description_Mesh_Node *med = (Edje_Part_Description_Mesh_Node *) ed;
-              Edje_Part_Description_Mesh_Node *mparent = (Edje_Part_Description_Mesh_Node *) parent;
+      {
+         Edje_Part_Description_Mesh_Node *med = (Edje_Part_Description_Mesh_Node *)ed;
+         Edje_Part_Description_Mesh_Node *mparent = (Edje_Part_Description_Mesh_Node *)parent;
 
-              med->mesh_node = mparent->mesh_node;
+         med->mesh_node = mparent->mesh_node;
 
-              data_queue_model_remove(&med->mesh_node.mesh.id, &med->mesh_node.mesh.set);
-              data_queue_copied_model_lookup(&mparent->mesh_node.mesh.id, &med->mesh_node.mesh.id, &med->mesh_node.mesh.set);
+         data_queue_model_remove(&med->mesh_node.mesh.id, &med->mesh_node.mesh.set);
+         data_queue_copied_model_lookup(&mparent->mesh_node.mesh.id, &med->mesh_node.mesh.id, &med->mesh_node.mesh.set);
 
-              data_queue_image_remove(&med->mesh_node.texture.id, &med->mesh_node.texture.set);
-              data_queue_copied_model_lookup(&mparent->mesh_node.texture.id, &med->mesh_node.texture.id, &med->mesh_node.texture.set);
+         data_queue_image_remove(&med->mesh_node.texture.id, &med->mesh_node.texture.set);
+         data_queue_copied_model_lookup(&mparent->mesh_node.texture.id, &med->mesh_node.texture.id, &med->mesh_node.texture.set);
 
-              data_queue_copied_part_lookup(pc, &(mparent->mesh_node.orientation.look_to), &(med->mesh_node.orientation.look_to));
+         data_queue_copied_part_lookup(pc, &(mparent->mesh_node.orientation.look_to), &(med->mesh_node.orientation.look_to));
+
+         break;
+      }
 
-              break;
-           }
       case EDJE_PART_TYPE_VECTOR:
-           {
-              Edje_Part_Description_Vector *ied = (Edje_Part_Description_Vector *) ed;
-              Edje_Part_Description_Vector *iparent = (Edje_Part_Description_Vector *) parent;
-              ied->vg.set = iparent->vg.set;
-              ied->vg.id = iparent->vg.id;
-              break;
-           }
+      {
+         Edje_Part_Description_Vector *ied = (Edje_Part_Description_Vector *)ed;
+         Edje_Part_Description_Vector *iparent = (Edje_Part_Description_Vector *)parent;
+         ied->vg.set = iparent->vg.set;
+         ied->vg.id = iparent->vg.id;
+         break;
+      }
      }
 }
 
@@ -8768,7 +8855,7 @@ st_collections_group_parts_part_description_inherit(void)
         Causes the part to use another part content as the content of this part.
         Only work with PROXY part.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_source(void)
 {
@@ -8787,7 +8874,7 @@ st_collections_group_parts_part_description_source(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Proxy*) current_desc;
+   ed = (Edje_Part_Description_Proxy *)current_desc;
 
    name = parse_str(0);
 
@@ -8805,12 +8892,12 @@ _part_description_state_update(Edje_Part_Description_Common *ed)
        (!ep->default_desc->state.name && !strcmp(ed->state.name, "default") && ed->state.value == ep->default_desc->state.value))
      {
         if (ep->type == EDJE_PART_TYPE_IMAGE)
-          _edje_part_description_image_remove((Edje_Part_Description_Image*) ed);
+          _edje_part_description_image_remove((Edje_Part_Description_Image *)ed);
 
         free(ed);
         ep->other.desc_count--;
         ep->other.desc = realloc(ep->other.desc,
-                                 sizeof (Edje_Part_Description_Common*) * ep->other.desc_count);
+                                 sizeof (Edje_Part_Description_Common *) * ep->other.desc_count);
         current_desc = ep->default_desc;
      }
    else if (ep->other.desc_count)
@@ -8821,12 +8908,12 @@ _part_description_state_update(Edje_Part_Description_Common *ed)
              if (!strcmp(ed->state.name, ep->other.desc[i]->state.name) && ed->state.value == ep->other.desc[i]->state.value)
                {
                   if (ep->type == EDJE_PART_TYPE_IMAGE)
-                    _edje_part_description_image_remove((Edje_Part_Description_Image*) ed);
+                    _edje_part_description_image_remove((Edje_Part_Description_Image *)ed);
 
                   free(ed);
                   ep->other.desc_count--;
                   ep->other.desc = realloc(ep->other.desc,
-                                           sizeof (Edje_Part_Description_Common*) * ep->other.desc_count);
+                                           sizeof (Edje_Part_Description_Common *) * ep->other.desc_count);
                   current_desc = ep->other.desc[i];
                   break;
                }
@@ -8851,7 +8938,7 @@ _part_description_state_update(Edje_Part_Description_Common *ed)
 
         Defaults: "default" 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_state(void)
 {
@@ -8865,7 +8952,7 @@ st_collections_group_parts_part_description_state(void)
    ep = current_part;
 
    s = parse_str(0);
-   if (!strcmp (s, "custom"))
+   if (!strcmp(s, "custom"))
      {
         ERR("parse error %s:%i. invalid state name: '%s'.",
             file_in, line - 1, s);
@@ -8905,7 +8992,7 @@ st_collections_group_parts_part_description_state(void)
 
         Defaults: 1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_visible(void)
 {
@@ -8913,9 +9000,9 @@ st_collections_group_parts_part_description_visible(void)
 
    if (current_part->type == EDJE_PART_TYPE_SPACER)
      {
-       ERR("parse error %s:%i. SPACER part can't have a visibility defined",
-	   file_in, line - 1);
-       exit(-1);
+        ERR("parse error %s:%i. SPACER part can't have a visibility defined",
+            file_in, line - 1);
+        exit(-1);
      }
 
    current_desc->visible = parse_bool(0);
@@ -8928,9 +9015,9 @@ st_collections_group_parts_part_description_vis(void)
 
    if (current_part->type == EDJE_PART_TYPE_SPACER)
      {
-       ERR("parse error %s:%i. SPACER part can't have a visibility defined",
-           file_in, line - 1);
-       exit(-1);
+        ERR("parse error %s:%i. SPACER part can't have a visibility defined",
+            file_in, line - 1);
+        exit(-1);
      }
 
    current_desc->visible = 1;
@@ -8943,9 +9030,9 @@ st_collections_group_parts_part_description_hid(void)
 
    if (current_part->type == EDJE_PART_TYPE_SPACER)
      {
-       ERR("parse error %s:%i. SPACER part can't have a visibility defined",
-           file_in, line - 1);
-       exit(-1);
+        ERR("parse error %s:%i. SPACER part can't have a visibility defined",
+            file_in, line - 1);
+        exit(-1);
      }
 
    current_desc->visible = 0;
@@ -8963,15 +9050,15 @@ st_collections_group_parts_part_description_hid(void)
         Defaults: 0
     @since 1.19
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_no_render(void)
 {
    if (current_part->type == EDJE_PART_TYPE_SPACER)
      {
-       ERR("parse error %s:%i. SPACER part can't be marked as no_render",
-           file_in, line - 1);
-       exit(-1);
+        ERR("parse error %s:%i. SPACER part can't be marked as no_render",
+            file_in, line - 1);
+        exit(-1);
      }
 
    if (check_range_arg_count(0, 1) == 1)
@@ -8998,17 +9085,17 @@ st_collections_group_parts_part_description_no_render(void)
         Defaults: NONE
     @since 1.7
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_limit(void)
 {
    check_arg_count(1);
 
    current_desc->limit = parse_enum(0,
-				    "NONE", 0,
-				    "WIDTH", 1,
-				    "HEIGHT", 2,
-				    "BOTH", 3);
+                                    "NONE", 0,
+                                    "WIDTH", 1,
+                                    "HEIGHT", 2,
+                                    "BOTH", 3);
 
    if (current_desc->limit)
      {
@@ -9017,11 +9104,11 @@ st_collections_group_parts_part_description_limit(void)
 
         pc = eina_list_data_get(eina_list_last(edje_collections));
         count = pc->limits.parts_count++;
-	pc->limits.parts = realloc(pc->limits.parts,
-				   pc->limits.parts_count * sizeof (Edje_Part_Limit));
-	data_queue_part_reallocated_lookup(pc, current_part->name,
-					   (unsigned char**) &(pc->limits.parts),
-					   (unsigned char*) &pc->limits.parts[count].part - (unsigned char*) pc->limits.parts); //fixme
+        pc->limits.parts = realloc(pc->limits.parts,
+                                   pc->limits.parts_count * sizeof (Edje_Part_Limit));
+        data_queue_part_reallocated_lookup(pc, current_part->name,
+                                           (unsigned char **)&(pc->limits.parts),
+                                           (unsigned char *)&pc->limits.parts[count].part - (unsigned char *)pc->limits.parts); //fixme
      }
 }
 
@@ -9042,7 +9129,7 @@ st_collections_group_parts_part_description_limit(void)
 
         Defaults: 0.5 0.5 (0.5)
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_align(void)
 {
@@ -9076,7 +9163,7 @@ st_collections_group_parts_part_description_align(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_fixed(void)
 {
@@ -9102,32 +9189,35 @@ st_collections_group_parts_part_description_fixed(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_min(void)
 {
    check_min_arg_count(1);
 
-   if (is_param(1)) {
-      current_desc->min.w = parse_int_range(0, 0, 0x7fffffff);
-      current_desc->min.h = parse_int_range(1, 0, 0x7fffffff);
-   } else {
-      char *tmp;
+   if (is_param(1))
+     {
+        current_desc->min.w = parse_int_range(0, 0, 0x7fffffff);
+        current_desc->min.h = parse_int_range(1, 0, 0x7fffffff);
+     }
+   else
+     {
+        char *tmp;
 
-      tmp = parse_str(0);
-      if ((current_part->type != EDJE_PART_TYPE_IMAGE && current_part->type != EDJE_PART_TYPE_GROUP) ||
-          !tmp || strcmp(tmp, "SOURCE") != 0)
-        {
-           free(tmp);
-           ERR("parse error %s:%i. "
-               "Only IMAGE and GROUP part can have a min: SOURCE; defined",
-               file_in, line - 1);
-           exit(-1);
-        }
-      free(tmp);
+        tmp = parse_str(0);
+        if ((current_part->type != EDJE_PART_TYPE_IMAGE && current_part->type != EDJE_PART_TYPE_GROUP) ||
+            !tmp || strcmp(tmp, "SOURCE") != 0)
+          {
+             free(tmp);
+             ERR("parse error %s:%i. "
+                 "Only IMAGE and GROUP part can have a min: SOURCE; defined",
+                 file_in, line - 1);
+             exit(-1);
+          }
+        free(tmp);
 
-      current_desc->min.limit = EINA_TRUE;
-   }
+        current_desc->min.limit = EINA_TRUE;
+     }
 }
 
 /**
@@ -9143,7 +9233,7 @@ st_collections_group_parts_part_description_min(void)
         Defaults: 1.0 1.0
     @since 1.2
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_minmul(void)
 {
@@ -9168,32 +9258,35 @@ st_collections_group_parts_part_description_minmul(void)
 
         Defaults: -1 -1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_max(void)
 {
    check_min_arg_count(1);
 
-   if (is_param(1)) {
-      current_desc->max.w = parse_int_range(0, -1, 0x7fffffff);
-      current_desc->max.h = parse_int_range(1, -1, 0x7fffffff);
-   } else {
-      char *tmp;
+   if (is_param(1))
+     {
+        current_desc->max.w = parse_int_range(0, -1, 0x7fffffff);
+        current_desc->max.h = parse_int_range(1, -1, 0x7fffffff);
+     }
+   else
+     {
+        char *tmp;
 
-      tmp = parse_str(0);
-      if (current_part->type != EDJE_PART_TYPE_IMAGE ||
-          !tmp || strcmp(tmp, "SOURCE") != 0)
-        {
-           free(tmp);
-           ERR("parse error %s:%i. "
-               "Only IMAGE part can have a max: SOURCE; defined",
-               file_in, line - 1);
-           exit(-1);
-        }
-      free(tmp);
+        tmp = parse_str(0);
+        if (current_part->type != EDJE_PART_TYPE_IMAGE ||
+            !tmp || strcmp(tmp, "SOURCE") != 0)
+          {
+             free(tmp);
+             ERR("parse error %s:%i. "
+                 "Only IMAGE part can have a max: SOURCE; defined",
+                 file_in, line - 1);
+             exit(-1);
+          }
+        free(tmp);
 
-      current_desc->max.limit = EINA_TRUE;
-   }
+        current_desc->max.limit = EINA_TRUE;
+     }
 }
 
 /**
@@ -9207,7 +9300,7 @@ st_collections_group_parts_part_description_max(void)
       "min" and "max" property in description can be overridden by the size class
       at runtime.
    @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_size_class(void)
 {
@@ -9229,7 +9322,7 @@ st_collections_group_parts_part_description_size_class(void)
 
         Defaults: 0.0 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_step(void)
 {
@@ -9254,7 +9347,7 @@ st_collections_group_parts_part_description_step(void)
 
         Defaults: 0.0 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_aspect(void)
 {
@@ -9276,19 +9369,19 @@ st_collections_group_parts_part_description_aspect(void)
 
         Defaults: NONE
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_aspect_preference(void)
 {
    check_arg_count(1);
 
-   current_desc->aspect.prefer =  parse_enum(0,
-				   "NONE", EDJE_ASPECT_PREFER_NONE,
-				   "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL,
-				   "HORIZONTAL", EDJE_ASPECT_PREFER_HORIZONTAL,
-				   "BOTH", EDJE_ASPECT_PREFER_BOTH,
-				   "SOURCE", EDJE_ASPECT_PREFER_SOURCE,
-				   NULL);
+   current_desc->aspect.prefer = parse_enum(0,
+                                            "NONE", EDJE_ASPECT_PREFER_NONE,
+                                            "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL,
+                                            "HORIZONTAL", EDJE_ASPECT_PREFER_HORIZONTAL,
+                                            "BOTH", EDJE_ASPECT_PREFER_BOTH,
+                                            "SOURCE", EDJE_ASPECT_PREFER_SOURCE,
+                                            NULL);
 }
 
 /**
@@ -9302,7 +9395,7 @@ st_collections_group_parts_part_description_aspect_preference(void)
         values can be modified by the "color", "color2" and "color3"
         properties set below.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_color_class(void)
 {
@@ -9310,9 +9403,9 @@ st_collections_group_parts_part_description_color_class(void)
 
    if (current_part->type == EDJE_PART_TYPE_SPACER)
      {
-       ERR("parse error %s:%i. SPACER part can't have a color defined",
-	   file_in, line - 1);
-       exit(-1);
+        ERR("parse error %s:%i. SPACER part can't have a color defined",
+            file_in, line - 1);
+        exit(-1);
      }
 
    current_desc->color_class = parse_str(0);
@@ -9340,15 +9433,15 @@ st_collections_group_parts_part_description_color_class(void)
 
         Defaults: 255 255 255 255
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_color(void)
 {
    if (current_part->type == EDJE_PART_TYPE_SPACER)
      {
-       ERR("parse error %s:%i. SPACER part can't have a color defined",
-           file_in, line - 1);
-       exit(-1);
+        ERR("parse error %s:%i. SPACER part can't have a color defined",
+            file_in, line - 1);
+        exit(-1);
      }
 
    parse_color(0, &(current_desc->color.r));
@@ -9376,15 +9469,15 @@ st_collections_group_parts_part_description_color(void)
 
         Defaults: 0 0 0 255
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_color2(void)
 {
    if (current_part->type == EDJE_PART_TYPE_SPACER)
      {
-       ERR("parse error %s:%i. SPACER part can't have a color defined",
-           file_in, line - 1);
-       exit(-1);
+        ERR("parse error %s:%i. SPACER part can't have a color defined",
+            file_in, line - 1);
+        exit(-1);
      }
 
    parse_color(0, &(current_desc->color2.r));
@@ -9412,7 +9505,7 @@ st_collections_group_parts_part_description_color2(void)
 
         Defaults: 0 0 0 128
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_color3(void)
 {
@@ -9429,7 +9522,7 @@ st_collections_group_parts_part_description_color3(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*)current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    parse_color(0, &(ed->text.color3.r));
 }
@@ -9447,7 +9540,7 @@ st_collections_group_parts_part_description_color3(void)
         happen at the end of the animation, when the new state is finally set
         (this is similar to the 'visible' flag).
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_clip_to_id(void)
 {
@@ -9456,13 +9549,13 @@ st_collections_group_parts_part_description_clip_to_id(void)
    check_arg_count(1);
 
    pc = eina_list_data_get(eina_list_last(edje_collections));
-     {
-        char *name;
+   {
+      char *name;
 
-        name = parse_str(0);
-        data_queue_part_lookup(pc, name, &(current_desc->clip_to_id));
-        free(name);
-     }
+      name = parse_str(0);
+      data_queue_part_lookup(pc, name, &(current_desc->clip_to_id));
+      free(name);
+   }
 }
 
 /**
@@ -9481,7 +9574,7 @@ st_collections_group_parts_part_description_clip_to_id(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_offset_scale(void)
 {
@@ -9536,7 +9629,7 @@ st_collections_group_parts_part_description_offset_scale(void)
         @li rel1.relative: 0.0 0.0
         @li rel2.relative: 1.0 1.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_rel1_relative(void)
 {
@@ -9560,7 +9653,7 @@ st_collections_group_parts_part_description_rel1_relative(void)
         @li rel1.offset: 0 0
         @li rel2.offset: -1 -1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_rel1_offset(void)
 {
@@ -9582,7 +9675,7 @@ st_collections_group_parts_part_description_rel1_offset(void)
         container. Setting to "" will unset this value for inherited
         parts.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_rel1_to_set(const char *name)
 {
@@ -9632,7 +9725,7 @@ st_collections_group_parts_part_description_rel1_to(void)
         part's container. Simply put affects the first parameter of "relative".
         Setting to "" will unset this value for inherited parts.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_rel_to_x(void)
 {
@@ -9683,7 +9776,7 @@ st_collections_group_parts_part_description_rel1_to_x(void)
         part's container. Simply put, affects the second parameter of
         "relative". Setting to "" will unset this value for inherited parts.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_rel_to_y(void)
 {
@@ -9873,7 +9966,7 @@ st_collections_group_parts_part_description_rel2_to_y(void)
         Moves an edge of the part to the position of the edge of given part or
         whole edje group. (GROUP means edje group that the part belong to)
     @endproperty
-*/
+ */
 
 static void
 check_has_anchors(void)
@@ -10084,7 +10177,7 @@ anchor_adjust_relative_horizontal(FLOAT_T *rel, FLOAT_T *relc, Edje_Part_Anchor_
         The second parameter of position enumeration can be omitted. (Default
         value is BOTTOM, but TOP when the part is anchored to edje group)
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_anchors_top(void)
 {
@@ -10119,7 +10212,7 @@ st_collections_group_parts_part_description_anchors_top(void)
         The second parameter of position enumeration can be omitted. (Default
         value is TOP, but BOTTOM when the part is anchored to edje group)
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_anchors_bottom(void)
 {
@@ -10154,7 +10247,7 @@ st_collections_group_parts_part_description_anchors_bottom(void)
         The second parameter of position enumeration can be omitted. (Default
         value is RIGHT, but LEFT when the part is anchored to edje group)
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_anchors_left(void)
 {
@@ -10189,7 +10282,7 @@ st_collections_group_parts_part_description_anchors_left(void)
         The second parameter of position enumeration can be omitted. (Default
         value is LEFT, but RIGHT when the part is anchored to edje group)
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_anchors_right(void)
 {
@@ -10226,7 +10319,7 @@ st_collections_group_parts_part_description_anchors_right(void)
         The second parameter of position enumeration can be omitted. (Default
         value is VERTICAL_CENTER)
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_anchors_vertical_center(void)
 {
@@ -10258,7 +10351,7 @@ st_collections_group_parts_part_description_anchors_vertical_center(void)
         The second parameter of position enumeration can be omitted. (Default
         value is HORIZONTAL_CENTER)
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_anchors_horizontal_center(void)
 {
@@ -10290,7 +10383,7 @@ st_collections_group_parts_part_description_anchors_horizontal_center(void)
         The second parameter of direction enumeration can be omitted. (Default
         value is BOTH)
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_anchors_fill(void)
 {
@@ -10311,36 +10404,38 @@ st_collections_group_parts_part_description_anchors_fill(void)
    switch (current_anchors->fill.base.fill)
      {
       case EDJE_PART_ANCHOR_FILL_BOTH:
-         if (strcmp("GROUP", name) || param_had_quote(0))
-           {
-              data_queue_part_lookup(pc, name, &(current_desc->rel1.id_x));
-              data_queue_part_lookup(pc, name, &(current_desc->rel2.id_x));
-              data_queue_part_lookup(pc, name, &(current_desc->rel1.id_y));
-              data_queue_part_lookup(pc, name, &(current_desc->rel2.id_y));
-           }
-         current_desc->align.x = 0.5;
-         current_desc->align.y = 0.5;
-         current_desc->fixed.w = 0;
-         current_desc->fixed.h = 0;
-         break;
+        if (strcmp("GROUP", name) || param_had_quote(0))
+          {
+             data_queue_part_lookup(pc, name, &(current_desc->rel1.id_x));
+             data_queue_part_lookup(pc, name, &(current_desc->rel2.id_x));
+             data_queue_part_lookup(pc, name, &(current_desc->rel1.id_y));
+             data_queue_part_lookup(pc, name, &(current_desc->rel2.id_y));
+          }
+        current_desc->align.x = 0.5;
+        current_desc->align.y = 0.5;
+        current_desc->fixed.w = 0;
+        current_desc->fixed.h = 0;
+        break;
+
       case EDJE_PART_ANCHOR_FILL_HORIZONTAL:
-         if (strcmp("GROUP", name) || param_had_quote(0))
-           {
-              data_queue_part_lookup(pc, name, &(current_desc->rel1.id_x));
-              data_queue_part_lookup(pc, name, &(current_desc->rel2.id_x));
-           }
-         current_desc->align.x = 0.5;
-         current_desc->fixed.w = 0;
-         break;
+        if (strcmp("GROUP", name) || param_had_quote(0))
+          {
+             data_queue_part_lookup(pc, name, &(current_desc->rel1.id_x));
+             data_queue_part_lookup(pc, name, &(current_desc->rel2.id_x));
+          }
+        current_desc->align.x = 0.5;
+        current_desc->fixed.w = 0;
+        break;
+
       case EDJE_PART_ANCHOR_FILL_VERTICAL:
-         if (strcmp("GROUP", name) || param_had_quote(0))
-           {
-              data_queue_part_lookup(pc, name, &(current_desc->rel1.id_y));
-              data_queue_part_lookup(pc, name, &(current_desc->rel2.id_y));
-           }
-         current_desc->align.y = 0.5;
-         current_desc->fixed.h = 0;
-         break;
+        if (strcmp("GROUP", name) || param_had_quote(0))
+          {
+             data_queue_part_lookup(pc, name, &(current_desc->rel1.id_y));
+             data_queue_part_lookup(pc, name, &(current_desc->rel2.id_y));
+          }
+        current_desc->align.y = 0.5;
+        current_desc->fixed.h = 0;
+        break;
      }
 
    free(name);
@@ -10356,7 +10451,7 @@ st_collections_group_parts_part_description_anchors_fill(void)
         Affects the edge position a fixed number of pixels along each direction.
         Margins will scale its size with an edje scaling factor.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_anchors_margin(void)
 {
@@ -10414,7 +10509,7 @@ free_anchors(void)
         In an animation, this is the first and last image displayed. It's
         required in any image part
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_image_normal(void)
 {
@@ -10435,7 +10530,7 @@ st_collections_group_parts_part_description_image_normal(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Image*) current_desc;
+   ed = (Edje_Part_Description_Image *)current_desc;
 
    {
       char *name;
@@ -10462,7 +10557,7 @@ st_collections_group_parts_part_description_image_normal(void)
         the order they are listed, during the transition to the state they are
         declared in; the "normal" image is the final state.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_image_tween(void)
 {
@@ -10477,7 +10572,7 @@ st_collections_group_parts_part_description_image_tween(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Image*) current_desc;
+   ed = (Edje_Part_Description_Image *)current_desc;
 
    {
       char *name;
@@ -10486,7 +10581,7 @@ st_collections_group_parts_part_description_image_tween(void)
       iid = mem_alloc(SZ(Edje_Part_Image_Id));
       ed->image.tweens_count++;
       ed->image.tweens = realloc(ed->image.tweens,
-				 sizeof (Edje_Part_Image_Id*) * ed->image.tweens_count);
+                                 sizeof (Edje_Part_Image_Id *) * ed->image.tweens_count);
       ed->image.tweens[ed->image.tweens_count - 1] = iid;
       name = parse_str(0);
       data_queue_image_remove(&(iid->id), &(iid->set));
@@ -10508,7 +10603,7 @@ st_collections_group_parts_part_description_image_tween(void)
 
         Defaults: 0 0 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_image_border(void)
 {
@@ -10523,7 +10618,7 @@ st_collections_group_parts_part_description_image_border(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Image*) current_desc;
+   ed = (Edje_Part_Description_Image *)current_desc;
 
    ed->image.border.l = parse_int_range(0, 0, 0x7fffffff);
    ed->image.border.r = parse_int_range(1, 0, 0x7fffffff);
@@ -10546,7 +10641,7 @@ st_collections_group_parts_part_description_image_border(void)
         @li 1 or DEFAULT
         @li SOLID
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_image_middle(void)
 {
@@ -10561,15 +10656,15 @@ st_collections_group_parts_part_description_image_middle(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Image*) current_desc;
+   ed = (Edje_Part_Description_Image *)current_desc;
 
-   ed->image.border.no_fill =  parse_enum(0,
-					  "1", 0,
-					  "DEFAULT", 0,
-					  "0", 1,
-					  "NONE", 1,
-					  "SOLID", 2,
-					  NULL);
+   ed->image.border.no_fill = parse_enum(0,
+                                         "1", 0,
+                                         "DEFAULT", 0,
+                                         "0", 1,
+                                         "NONE", 1,
+                                         "SOLID", 2,
+                                         NULL);
 }
 
 /**
@@ -10592,7 +10687,7 @@ st_collections_group_parts_part_description_image_middle(void)
 
         Defaults: 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_image_border_scale_by(void)
 {
@@ -10607,7 +10702,7 @@ st_collections_group_parts_part_description_image_border_scale_by(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Image*) current_desc;
+   ed = (Edje_Part_Description_Image *)current_desc;
 
    ed->image.border.scale_by = FROM_DOUBLE(parse_float_range(0, 0.0, 999999999.0));
 }
@@ -10624,7 +10719,7 @@ st_collections_group_parts_part_description_image_border_scale_by(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_image_border_scale(void)
 {
@@ -10639,9 +10734,9 @@ st_collections_group_parts_part_description_image_border_scale(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Image*) current_desc;
+   ed = (Edje_Part_Description_Image *)current_desc;
 
-   ed->image.border.scale =  parse_bool(0);
+   ed->image.border.scale = parse_bool(0);
 }
 
 /**
@@ -10660,7 +10755,7 @@ st_collections_group_parts_part_description_image_border_scale(void)
 
         Defaults: NONE
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_image_scale_hint(void)
 {
@@ -10675,14 +10770,14 @@ st_collections_group_parts_part_description_image_scale_hint(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Image*) current_desc;
+   ed = (Edje_Part_Description_Image *)current_desc;
 
-   ed->image.scale_hint =  parse_enum(0,
-				      "NONE", EVAS_IMAGE_SCALE_HINT_NONE,
-				      "DYNAMIC", EVAS_IMAGE_SCALE_HINT_DYNAMIC,
-				      "STATIC", EVAS_IMAGE_SCALE_HINT_STATIC,
-				      "0", EVAS_IMAGE_SCALE_HINT_NONE,
-				      NULL);
+   ed->image.scale_hint = parse_enum(0,
+                                     "NONE", EVAS_IMAGE_SCALE_HINT_NONE,
+                                     "DYNAMIC", EVAS_IMAGE_SCALE_HINT_DYNAMIC,
+                                     "STATIC", EVAS_IMAGE_SCALE_HINT_STATIC,
+                                     "0", EVAS_IMAGE_SCALE_HINT_NONE,
+                                     NULL);
 }
 
 /** @edcsubsection{collections_group_parts_description_fill,
@@ -10724,7 +10819,7 @@ st_collections_group_parts_part_description_image_scale_hint(void)
 
         Defaults: 1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_fill_smooth(void)
 {
@@ -10735,30 +10830,32 @@ st_collections_group_parts_part_description_fill_smooth(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_IMAGE:
-        {
-           Edje_Part_Description_Image *ed;
+      {
+         Edje_Part_Description_Image *ed;
 
-           ed = (Edje_Part_Description_Image*) current_desc;
+         ed = (Edje_Part_Description_Image *)current_desc;
+
+         fill = &ed->image.fill;
+         break;
+      }
 
-           fill = &ed->image.fill;
-	   break;
-        }
       case EDJE_PART_TYPE_PROXY:
-        {
-           Edje_Part_Description_Proxy *ed;
+      {
+         Edje_Part_Description_Proxy *ed;
 
-           ed = (Edje_Part_Description_Proxy*) current_desc;
+         ed = (Edje_Part_Description_Proxy *)current_desc;
+
+         fill = &ed->proxy.fill;
+         break;
+      }
 
-           fill = &ed->proxy.fill;
-	   break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. "
-               "image and proxy attributes in non-IMAGE, non-PROXY `%s` part (%i).",
-               file_in, line - 1, current_part->name, current_part->type);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. "
+             "image and proxy attributes in non-IMAGE, non-PROXY `%s` part (%i).",
+             file_in, line - 1, current_part->name, current_part->type);
+         exit(-1);
+      }
      }
 
    fill->smooth = parse_bool(0);
@@ -10784,7 +10881,7 @@ st_collections_group_parts_part_description_fill_smooth(void)
 
         Defaults: SCALE
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_fill_type(void)
 {
@@ -10795,30 +10892,32 @@ st_collections_group_parts_part_description_fill_type(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_IMAGE:
-        {
-           Edje_Part_Description_Image *ed;
+      {
+         Edje_Part_Description_Image *ed;
 
-           ed = (Edje_Part_Description_Image*) current_desc;
+         ed = (Edje_Part_Description_Image *)current_desc;
+
+         fill = &ed->image.fill;
+         break;
+      }
 
-           fill = &ed->image.fill;
-	   break;
-        }
       case EDJE_PART_TYPE_PROXY:
-        {
-           Edje_Part_Description_Proxy *ed;
+      {
+         Edje_Part_Description_Proxy *ed;
 
-           ed = (Edje_Part_Description_Proxy*) current_desc;
+         ed = (Edje_Part_Description_Proxy *)current_desc;
+
+         fill = &ed->proxy.fill;
+         break;
+      }
 
-           fill = &ed->proxy.fill;
-	   break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. "
-               "image and proxy attributes in non-IMAGE, non-PROXY part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. "
+             "image and proxy attributes in non-IMAGE, non-PROXY part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 
    fill->type = parse_enum(0,
@@ -10862,7 +10961,7 @@ st_collections_group_parts_part_description_fill_type(void)
 
         Defaults: 0.0 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_fill_origin_relative(void)
 {
@@ -10873,30 +10972,32 @@ st_collections_group_parts_part_description_fill_origin_relative(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_IMAGE:
-        {
-           Edje_Part_Description_Image *ed;
+      {
+         Edje_Part_Description_Image *ed;
 
-           ed = (Edje_Part_Description_Image*) current_desc;
+         ed = (Edje_Part_Description_Image *)current_desc;
+
+         fill = &ed->image.fill;
+         break;
+      }
 
-           fill = &ed->image.fill;
-	   break;
-        }
       case EDJE_PART_TYPE_PROXY:
-        {
-           Edje_Part_Description_Proxy *ed;
+      {
+         Edje_Part_Description_Proxy *ed;
 
-           ed = (Edje_Part_Description_Proxy*) current_desc;
+         ed = (Edje_Part_Description_Proxy *)current_desc;
+
+         fill = &ed->proxy.fill;
+         break;
+      }
 
-           fill = &ed->proxy.fill;
-	   break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. "
-               "image and proxy attributes in non-IMAGE, non-PROXY part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. "
+             "image and proxy attributes in non-IMAGE, non-PROXY part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 
    fill->pos_rel_x = FROM_DOUBLE(parse_float_range(0, -999999999.0, 999999999.0));
@@ -10914,7 +11015,7 @@ st_collections_group_parts_part_description_fill_origin_relative(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_fill_origin_offset(void)
 {
@@ -10925,30 +11026,32 @@ st_collections_group_parts_part_description_fill_origin_offset(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_IMAGE:
-        {
-           Edje_Part_Description_Image *ed;
+      {
+         Edje_Part_Description_Image *ed;
 
-           ed = (Edje_Part_Description_Image*) current_desc;
+         ed = (Edje_Part_Description_Image *)current_desc;
+
+         fill = &ed->image.fill;
+         break;
+      }
 
-           fill = &ed->image.fill;
-	   break;
-        }
       case EDJE_PART_TYPE_PROXY:
-        {
-           Edje_Part_Description_Proxy *ed;
+      {
+         Edje_Part_Description_Proxy *ed;
 
-           ed = (Edje_Part_Description_Proxy*) current_desc;
+         ed = (Edje_Part_Description_Proxy *)current_desc;
+
+         fill = &ed->proxy.fill;
+         break;
+      }
 
-           fill = &ed->proxy.fill;
-	   break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. "
-               "image and proxy attributes in non-IMAGE, non-PROXY part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. "
+             "image and proxy attributes in non-IMAGE, non-PROXY part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 
    fill->pos_abs_x = parse_int(0);
@@ -10991,7 +11094,7 @@ st_collections_group_parts_part_description_fill_origin_offset(void)
 
         Defaults: 1.0 1.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_fill_size_relative(void)
 {
@@ -11002,30 +11105,32 @@ st_collections_group_parts_part_description_fill_size_relative(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_IMAGE:
-        {
-           Edje_Part_Description_Image *ed;
+      {
+         Edje_Part_Description_Image *ed;
 
-           ed = (Edje_Part_Description_Image*) current_desc;
+         ed = (Edje_Part_Description_Image *)current_desc;
+
+         fill = &ed->image.fill;
+         break;
+      }
 
-           fill = &ed->image.fill;
-	   break;
-        }
       case EDJE_PART_TYPE_PROXY:
-        {
-           Edje_Part_Description_Proxy *ed;
+      {
+         Edje_Part_Description_Proxy *ed;
 
-           ed = (Edje_Part_Description_Proxy*) current_desc;
+         ed = (Edje_Part_Description_Proxy *)current_desc;
+
+         fill = &ed->proxy.fill;
+         break;
+      }
 
-           fill = &ed->proxy.fill;
-	   break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. "
-               "image and proxy attributes in non-IMAGE, non-PROXY part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. "
+             "image and proxy attributes in non-IMAGE, non-PROXY part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 
    fill->rel_x = FROM_DOUBLE(parse_float_range(0, 0.0, 999999999.0));
@@ -11043,7 +11148,7 @@ st_collections_group_parts_part_description_fill_size_relative(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_fill_size_offset(void)
 {
@@ -11054,37 +11159,38 @@ st_collections_group_parts_part_description_fill_size_offset(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_IMAGE:
-        {
-           Edje_Part_Description_Image *ed;
+      {
+         Edje_Part_Description_Image *ed;
 
-           ed = (Edje_Part_Description_Image*) current_desc;
+         ed = (Edje_Part_Description_Image *)current_desc;
+
+         fill = &ed->image.fill;
+         break;
+      }
 
-           fill = &ed->image.fill;
-	   break;
-        }
       case EDJE_PART_TYPE_PROXY:
-        {
-           Edje_Part_Description_Proxy *ed;
+      {
+         Edje_Part_Description_Proxy *ed;
 
-           ed = (Edje_Part_Description_Proxy*) current_desc;
+         ed = (Edje_Part_Description_Proxy *)current_desc;
+
+         fill = &ed->proxy.fill;
+         break;
+      }
 
-           fill = &ed->proxy.fill;
-	   break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. "
-               "image and proxy attributes in non-IMAGE, non-PROXY part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. "
+             "image and proxy attributes in non-IMAGE, non-PROXY part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 
    fill->abs_x = parse_int(0);
    fill->abs_y = parse_int(1);
 }
 
-
 /** @edcsubsection{collections_group_parts_description_text,
  *                 Group.Parts.Part.Description.Text} */
 
@@ -11126,7 +11232,7 @@ st_collections_group_parts_part_description_fill_size_offset(void)
         Sets the default content of a text part, normally the application is
         the one changing its value.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_text(void)
 {
@@ -11142,21 +11248,21 @@ st_collections_group_parts_part_description_text_text(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
-   for (i = 0; ;i++)
+   for (i = 0;; i++)
      {
-	char *s;
+        char *s;
 
-	if (!is_param(i)) break;
-	s = parse_str(i);
-	if (!str) str = s;
-	else
-	  {
-	     str = realloc(str, strlen(str) + strlen(s) + 1);
-	     strcat(str, s);
-	     free(s);
-	  }
+        if (!is_param(i)) break;
+        s = parse_str(i);
+        if (!str) str = s;
+        else
+          {
+             str = realloc(str, strlen(str) + strlen(s) + 1);
+             strcat(str, s);
+             free(s);
+          }
      }
    ed->text.text.str = str;
 }
@@ -11172,7 +11278,7 @@ st_collections_group_parts_part_description_text_text(void)
         This is the domain name of the .mo file which has to be checked
         for translation.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_domain(void)
 {
@@ -11182,11 +11288,11 @@ st_collections_group_parts_part_description_text_domain(void)
        (current_part->type != EDJE_PART_TYPE_TEXTBLOCK))
      {
         ERR("parse error %s:%i. text attributes in non-TEXT part.",
-        file_in, line - 1);
+            file_in, line - 1);
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.domain = parse_str(0);
 }
@@ -11202,7 +11308,7 @@ st_collections_group_parts_part_description_text_domain(void)
         Similar to color_class, this is the name used by the application
         to alter the font family and size at runtime.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_text_class(void)
 {
@@ -11218,7 +11324,7 @@ st_collections_group_parts_part_description_text_text_class(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.text_class = parse_str(0);
 }
@@ -11234,7 +11340,7 @@ st_collections_group_parts_part_description_text_text_class(void)
         This sets the font family to one of the aliases set up in the "fonts"
         block. Can be overridden by the application.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_font(void)
 {
@@ -11250,7 +11356,7 @@ st_collections_group_parts_part_description_text_font(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.font.str = parse_str(0);
 }
@@ -11266,7 +11372,7 @@ st_collections_group_parts_part_description_text_font(void)
         Causes the part to use the default style and tags defined in the
         "style" block with the specified name.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_style(void)
 {
@@ -11282,7 +11388,7 @@ st_collections_group_parts_part_description_text_style(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.style.str = parse_str(0);
 }
@@ -11299,7 +11405,7 @@ st_collections_group_parts_part_description_text_style(void)
         to replace every character to hide the details of the entry. Normally
         you would use a "*", but you can use anything you like.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_repch(void)
 {
@@ -11315,7 +11421,7 @@ st_collections_group_parts_part_description_text_repch(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.repch.str = parse_str(0);
 }
@@ -11333,7 +11439,7 @@ st_collections_group_parts_part_description_text_repch(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_size(void)
 {
@@ -11349,7 +11455,7 @@ st_collections_group_parts_part_description_text_size(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*)current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.size = parse_int_range(0, 0, 255);
 }
@@ -11368,7 +11474,7 @@ st_collections_group_parts_part_description_text_size(void)
         Defaults: 0 0
     @since 1.1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_size_range(void)
 {
@@ -11384,7 +11490,7 @@ st_collections_group_parts_part_description_text_size_range(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.size_range_min = parse_int_range(0, 0, 255);
    ed->text.size_range_max = parse_int_range(1, 0, 255);
@@ -11409,7 +11515,7 @@ st_collections_group_parts_part_description_text_size_range(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_fit(void)
 {
@@ -11425,7 +11531,7 @@ st_collections_group_parts_part_description_text_fit(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.fit_x = parse_bool(0);
    ed->text.fit_y = parse_bool(1);
@@ -11444,7 +11550,7 @@ st_collections_group_parts_part_description_text_fit(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_min(void)
 {
@@ -11460,7 +11566,7 @@ st_collections_group_parts_part_description_text_min(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*)current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.min_x = parse_bool(0);
    ed->text.min_y = parse_bool(1);
@@ -11482,7 +11588,7 @@ st_collections_group_parts_part_description_text_min(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_max(void)
 {
@@ -11498,7 +11604,7 @@ st_collections_group_parts_part_description_text_max(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.max_x = parse_bool(0);
    ed->text.max_y = parse_bool(1);
@@ -11521,7 +11627,7 @@ st_collections_group_parts_part_description_text_max(void)
 
         Defaults: 0.5 0.5
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_align(void)
 {
@@ -11537,7 +11643,7 @@ st_collections_group_parts_part_description_text_align(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.align.x = FROM_DOUBLE(parse_float_range(0, -1.0, 1.0));
    ed->text.align.y = FROM_DOUBLE(parse_float_range(1, 0.0, 1.0));
@@ -11554,7 +11660,7 @@ st_collections_group_parts_part_description_text_align(void)
         Causes the part to use the text properties (like font and size) of
         another part and update them as they change.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_source(void)
 {
@@ -11573,7 +11679,7 @@ st_collections_group_parts_part_description_text_source(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    {
       char *name;
@@ -11595,7 +11701,7 @@ st_collections_group_parts_part_description_text_source(void)
         Causes the part to display the text content of another part and update
         them as they change.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_text_source(void)
 {
@@ -11614,7 +11720,7 @@ st_collections_group_parts_part_description_text_text_source(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    {
       char *name;
@@ -11640,7 +11746,7 @@ st_collections_group_parts_part_description_text_text_source(void)
 
         Defaults: 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_text_ellipsis(void)
 {
@@ -11656,7 +11762,7 @@ st_collections_group_parts_part_description_text_ellipsis(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Text*) current_desc;
+   ed = (Edje_Part_Description_Text *)current_desc;
 
    ed->text.ellipsis = parse_float_range(0, -1.0, 1.0);
 }
@@ -11710,8 +11816,9 @@ st_collections_group_parts_part_description_text_ellipsis(void)
 
         Defaults: "horizontal"
     @endproperty
-*/
-static void st_collections_group_parts_part_description_box_layout(void)
+ */
+static void
+st_collections_group_parts_part_description_box_layout(void)
 {
    Edje_Part_Description_Box *ed;
 
@@ -11724,7 +11831,7 @@ static void st_collections_group_parts_part_description_box_layout(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Box*) current_desc;
+   ed = (Edje_Part_Description_Box *)current_desc;
 
    ed->box.layout = parse_str(0);
    if (is_param(1))
@@ -11742,8 +11849,9 @@ static void st_collections_group_parts_part_description_box_layout(void)
 
         Defaults: 0.5 0.5
     @endproperty
-*/
-static void st_collections_group_parts_part_description_box_align(void)
+ */
+static void
+st_collections_group_parts_part_description_box_align(void)
 {
    Edje_Part_Description_Box *ed;
 
@@ -11756,7 +11864,7 @@ static void st_collections_group_parts_part_description_box_align(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Box*) current_desc;
+   ed = (Edje_Part_Description_Box *)current_desc;
 
    ed->box.align.x = FROM_DOUBLE(parse_float_range(0, -1.0, 1.0));
    ed->box.align.y = FROM_DOUBLE(parse_float_range(1, -1.0, 1.0));
@@ -11773,8 +11881,9 @@ static void st_collections_group_parts_part_description_box_align(void)
 
         Defaults: 0 0
     @endproperty
-*/
-static void st_collections_group_parts_part_description_box_padding(void)
+ */
+static void
+st_collections_group_parts_part_description_box_padding(void)
 {
    Edje_Part_Description_Box *ed;
 
@@ -11787,7 +11896,7 @@ static void st_collections_group_parts_part_description_box_padding(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Box*) current_desc;
+   ed = (Edje_Part_Description_Box *)current_desc;
 
    ed->box.padding.x = parse_int_range(0, 0, 0x7fffffff);
    ed->box.padding.y = parse_int_range(1, 0, 0x7fffffff);
@@ -11805,7 +11914,7 @@ static void st_collections_group_parts_part_description_box_padding(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_box_min(void)
 {
@@ -11820,13 +11929,12 @@ st_collections_group_parts_part_description_box_min(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Box*) current_desc;
+   ed = (Edje_Part_Description_Box *)current_desc;
 
    ed->box.min.h = parse_bool(0);
    ed->box.min.v = parse_bool(1);
 }
 
-
 /** @edcsubsection{collections_group_parts_description_table,
  *                 Group.Parts.Part.Description.Table} */
 
@@ -11866,8 +11974,9 @@ st_collections_group_parts_part_description_box_min(void)
 
         Defaults: NONE
     @endproperty
-*/
-static void st_collections_group_parts_part_description_table_homogeneous(void)
+ */
+static void
+st_collections_group_parts_part_description_table_homogeneous(void)
 {
    Edje_Part_Description_Table *ed;
 
@@ -11880,13 +11989,13 @@ static void st_collections_group_parts_part_description_table_homogeneous(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Table*) current_desc;
+   ed = (Edje_Part_Description_Table *)current_desc;
 
    ed->table.homogeneous = parse_enum(0,
-				     "NONE", EDJE_OBJECT_TABLE_HOMOGENEOUS_NONE,
-				     "TABLE", EDJE_OBJECT_TABLE_HOMOGENEOUS_TABLE,
-				     "ITEM", EDJE_OBJECT_TABLE_HOMOGENEOUS_ITEM,
-				     NULL);
+                                      "NONE", EDJE_OBJECT_TABLE_HOMOGENEOUS_NONE,
+                                      "TABLE", EDJE_OBJECT_TABLE_HOMOGENEOUS_TABLE,
+                                      "ITEM", EDJE_OBJECT_TABLE_HOMOGENEOUS_ITEM,
+                                      NULL);
 }
 
 /**
@@ -11900,8 +12009,9 @@ static void st_collections_group_parts_part_description_table_homogeneous(void)
 
         Defaults: 0.5 0.5
     @endproperty
-*/
-static void st_collections_group_parts_part_description_table_align(void)
+ */
+static void
+st_collections_group_parts_part_description_table_align(void)
 {
    Edje_Part_Description_Table *ed;
 
@@ -11914,7 +12024,7 @@ static void st_collections_group_parts_part_description_table_align(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Table*) current_desc;
+   ed = (Edje_Part_Description_Table *)current_desc;
 
    ed->table.align.x = FROM_DOUBLE(parse_float_range(0, -1.0, 1.0));
    ed->table.align.y = FROM_DOUBLE(parse_float_range(1, -1.0, 1.0));
@@ -11931,8 +12041,9 @@ static void st_collections_group_parts_part_description_table_align(void)
 
         Defaults: 0 0
     @endproperty
-*/
-static void st_collections_group_parts_part_description_table_padding(void)
+ */
+static void
+st_collections_group_parts_part_description_table_padding(void)
 {
    Edje_Part_Description_Table *ed;
 
@@ -11945,7 +12056,7 @@ static void st_collections_group_parts_part_description_table_padding(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Table*) current_desc;
+   ed = (Edje_Part_Description_Table *)current_desc;
 
    ed->table.padding.x = parse_int_range(0, 0, 0x7fffffff);
    ed->table.padding.y = parse_int_range(1, 0, 0x7fffffff);
@@ -11963,7 +12074,7 @@ static void st_collections_group_parts_part_description_table_padding(void)
 
         Defaults: 0 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_table_min(void)
 {
@@ -11978,7 +12089,7 @@ st_collections_group_parts_part_description_table_min(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Table*) current_desc;
+   ed = (Edje_Part_Description_Table *)current_desc;
 
    ed->table.min.h = parse_bool(0);
    ed->table.min.v = parse_bool(1);
@@ -12033,7 +12144,7 @@ st_collections_group_parts_part_description_table_min(void)
 
         Defaults: 1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_proxy_source_clip(void)
 {
@@ -12048,7 +12159,7 @@ st_collections_group_parts_part_description_proxy_source_clip(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Proxy*) current_desc;
+   ed = (Edje_Part_Description_Proxy *)current_desc;
    ed->proxy.source_clip = parse_bool(0);
 }
 
@@ -12066,7 +12177,7 @@ st_collections_group_parts_part_description_proxy_source_visible(void)
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_Proxy*) current_desc;
+   ed = (Edje_Part_Description_Proxy *)current_desc;
    ed->proxy.source_visible = parse_bool(0);
 }
 
@@ -12103,7 +12214,7 @@ st_collections_group_parts_part_description_proxy_source_visible(void)
     @effect
         Sets the point of CAMERA, LIGHT or MESH_NODE centre.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_position_point(void)
 {
@@ -12112,44 +12223,47 @@ st_collections_group_parts_part_description_position_point(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_CAMERA:
-        {
-           Edje_Part_Description_Camera *ed;
+      {
+         Edje_Part_Description_Camera *ed;
 
-           ed = (Edje_Part_Description_Camera*) current_desc;
+         ed = (Edje_Part_Description_Camera *)current_desc;
+
+         ed->camera.position.point.x = FROM_DOUBLE(parse_float(0));
+         ed->camera.position.point.y = FROM_DOUBLE(parse_float(1));
+         ed->camera.position.point.z = FROM_DOUBLE(parse_float(2));
+         break;
+      }
 
-           ed->camera.position.point.x = FROM_DOUBLE(parse_float(0));
-           ed->camera.position.point.y = FROM_DOUBLE(parse_float(1));
-           ed->camera.position.point.z = FROM_DOUBLE(parse_float(2));
-           break;
-        }
       case EDJE_PART_TYPE_LIGHT:
-        {
-           Edje_Part_Description_Light *ed;
+      {
+         Edje_Part_Description_Light *ed;
 
-           ed = (Edje_Part_Description_Light*) current_desc;
+         ed = (Edje_Part_Description_Light *)current_desc;
+
+         ed->light.position.point.x = FROM_DOUBLE(parse_float(0));
+         ed->light.position.point.y = FROM_DOUBLE(parse_float(1));
+         ed->light.position.point.z = FROM_DOUBLE(parse_float(2));
+         break;
+      }
 
-           ed->light.position.point.x = FROM_DOUBLE(parse_float(0));
-           ed->light.position.point.y = FROM_DOUBLE(parse_float(1));
-           ed->light.position.point.z = FROM_DOUBLE(parse_float(2));
-           break;
-        }
       case EDJE_PART_TYPE_MESH_NODE:
-        {
-           Edje_Part_Description_Mesh_Node *ed;
+      {
+         Edje_Part_Description_Mesh_Node *ed;
 
-           ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+         ed = (Edje_Part_Description_Mesh_Node *)current_desc;
+
+         ed->mesh_node.position.point.x = FROM_DOUBLE(parse_float(0));
+         ed->mesh_node.position.point.y = FROM_DOUBLE(parse_float(1));
+         ed->mesh_node.position.point.z = FROM_DOUBLE(parse_float(2));
+         break;
+      }
 
-           ed->mesh_node.position.point.x = FROM_DOUBLE(parse_float(0));
-           ed->mesh_node.position.point.y = FROM_DOUBLE(parse_float(1));
-           ed->mesh_node.position.point.z = FROM_DOUBLE(parse_float(2));
-           break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. camera and light attributes in non-CAMERA, non-LIGHT, and non-MESH_NODE part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. camera and light attributes in non-CAMERA, non-LIGHT, and non-MESH_NODE part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 }
 
@@ -12167,7 +12281,7 @@ st_collections_group_parts_part_description_position_point(void)
             @li PARENT
             @li WORLD
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_position_space(void)
 {
@@ -12176,46 +12290,49 @@ st_collections_group_parts_part_description_position_space(void)
    check_arg_count(1);
 
    space = parse_enum(0,
-                     "LOCAL", EVAS_CANVAS3D_SPACE_LOCAL,
-                     "PARENT", EVAS_CANVAS3D_SPACE_PARENT,
-                     "WORLD", EVAS_CANVAS3D_SPACE_WORLD,
-                     NULL);
+                      "LOCAL", EVAS_CANVAS3D_SPACE_LOCAL,
+                      "PARENT", EVAS_CANVAS3D_SPACE_PARENT,
+                      "WORLD", EVAS_CANVAS3D_SPACE_WORLD,
+                      NULL);
 
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_CAMERA:
-        {
-           Edje_Part_Description_Camera *ed;
+      {
+         Edje_Part_Description_Camera *ed;
 
-           ed = (Edje_Part_Description_Camera*) current_desc;
+         ed = (Edje_Part_Description_Camera *)current_desc;
+
+         ed->camera.position.space = space;
+         break;
+      }
 
-           ed->camera.position.space = space;
-           break;
-        }
       case EDJE_PART_TYPE_LIGHT:
-        {
-           Edje_Part_Description_Light *ed;
+      {
+         Edje_Part_Description_Light *ed;
 
-           ed = (Edje_Part_Description_Light*) current_desc;
+         ed = (Edje_Part_Description_Light *)current_desc;
+
+         ed->light.position.space = space;
+         break;
+      }
 
-           ed->light.position.space = space;
-           break;
-        }
       case EDJE_PART_TYPE_MESH_NODE:
-        {
-           Edje_Part_Description_Mesh_Node *ed;
+      {
+         Edje_Part_Description_Mesh_Node *ed;
 
-           ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+         ed = (Edje_Part_Description_Mesh_Node *)current_desc;
+
+         ed->mesh_node.position.space = space;
+         break;
+      }
 
-           ed->mesh_node.position.space = space;
-           break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. camera and light attributes in non-CAMERA, non-LIGHT, and non-MESH_NODE part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. camera and light attributes in non-CAMERA, non-LIGHT, and non-MESH_NODE part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 }
 
@@ -12249,7 +12366,7 @@ st_collections_group_parts_part_description_position_space(void)
     @effect
         Specifies the basic attributes of the camera.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_camera_properties(void)
 {
@@ -12259,7 +12376,7 @@ st_collections_group_parts_part_description_camera_properties(void)
      {
         Edje_Part_Description_Camera *ed;
 
-        ed = (Edje_Part_Description_Camera*) current_desc;
+        ed = (Edje_Part_Description_Camera *)current_desc;
 
         ed->camera.camera.fovy = FROM_DOUBLE(parse_float(0));
         ed->camera.camera.aspect = FROM_DOUBLE(parse_float(1));
@@ -12270,7 +12387,7 @@ st_collections_group_parts_part_description_camera_properties(void)
      {
         Edje_Part_Description_Light *ed;
 
-        ed = (Edje_Part_Description_Light*) current_desc;
+        ed = (Edje_Part_Description_Light *)current_desc;
 
         ed->light.light.fovy = FROM_DOUBLE(parse_float(0));
         ed->light.light.aspect = FROM_DOUBLE(parse_float(1));
@@ -12333,7 +12450,7 @@ st_collections_group_parts_part_description_camera_properties(void)
 
         Defaults: 50 50 50 255
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_properties_ambient(void)
 {
@@ -12342,29 +12459,31 @@ st_collections_group_parts_part_description_properties_ambient(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_LIGHT:
-        {
-           Edje_Part_Description_Light *ed;
+      {
+         Edje_Part_Description_Light *ed;
 
-           ed = (Edje_Part_Description_Light*) current_desc;
+         ed = (Edje_Part_Description_Light *)current_desc;
+
+         parse_color(0, &(ed->light.properties.ambient));
+         break;
+      }
 
-           parse_color(0, &(ed->light.properties.ambient));
-           break;
-        }
       case EDJE_PART_TYPE_MESH_NODE:
-        {
-           Edje_Part_Description_Mesh_Node *ed;
+      {
+         Edje_Part_Description_Mesh_Node *ed;
 
-           ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+         ed = (Edje_Part_Description_Mesh_Node *)current_desc;
+
+         parse_color(0, &(ed->mesh_node.properties.ambient));
+         break;
+      }
 
-           parse_color(0, &(ed->mesh_node.properties.ambient));
-           break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. light and mesh_node attributes in non-LIGHT and non-MESH_NODE part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. light and mesh_node attributes in non-LIGHT and non-MESH_NODE part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 }
 
@@ -12388,7 +12507,7 @@ st_collections_group_parts_part_description_properties_ambient(void)
 
         Defaults: 255 255 255 255
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_properties_diffuse(void)
 {
@@ -12397,29 +12516,31 @@ st_collections_group_parts_part_description_properties_diffuse(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_LIGHT:
-        {
-           Edje_Part_Description_Light *ed;
+      {
+         Edje_Part_Description_Light *ed;
 
-           ed = (Edje_Part_Description_Light*) current_desc;
+         ed = (Edje_Part_Description_Light *)current_desc;
+
+         parse_color(0, &(ed->light.properties.diffuse));
+         break;
+      }
 
-           parse_color(0, &(ed->light.properties.diffuse));
-           break;
-        }
       case EDJE_PART_TYPE_MESH_NODE:
-        {
-           Edje_Part_Description_Mesh_Node *ed;
+      {
+         Edje_Part_Description_Mesh_Node *ed;
 
-           ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+         ed = (Edje_Part_Description_Mesh_Node *)current_desc;
+
+         parse_color(0, &(ed->mesh_node.properties.diffuse));
+         break;
+      }
 
-           parse_color(0, &(ed->mesh_node.properties.diffuse));
-           break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. light and mesh_node attributes in non-LIGHT and non-MESH_NODE part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. light and mesh_node attributes in non-LIGHT and non-MESH_NODE part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 }
 
@@ -12443,7 +12564,7 @@ st_collections_group_parts_part_description_properties_diffuse(void)
 
         Defaults: 255 255 255 255
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_properties_specular(void)
 {
@@ -12452,29 +12573,31 @@ st_collections_group_parts_part_description_properties_specular(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_LIGHT:
-        {
-           Edje_Part_Description_Light *ed;
+      {
+         Edje_Part_Description_Light *ed;
 
-           ed = (Edje_Part_Description_Light*) current_desc;
+         ed = (Edje_Part_Description_Light *)current_desc;
+
+         parse_color(0, &(ed->light.properties.specular));
+         break;
+      }
 
-           parse_color(0, &(ed->light.properties.specular));
-           break;
-        }
       case EDJE_PART_TYPE_MESH_NODE:
-        {
-           Edje_Part_Description_Mesh_Node *ed;
+      {
+         Edje_Part_Description_Mesh_Node *ed;
 
-           ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+         ed = (Edje_Part_Description_Mesh_Node *)current_desc;
+
+         parse_color(0, &(ed->mesh_node.properties.specular));
+         break;
+      }
 
-           parse_color(0, &(ed->mesh_node.properties.specular));
-           break;
-        }
       default:
-        {
-           ERR("parse error %s:%i. light and mesh_node attributes in non-LIGHT and non-MESH_NODE part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. light and mesh_node attributes in non-LIGHT and non-MESH_NODE part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 }
 
@@ -12492,7 +12615,7 @@ st_collections_group_parts_part_description_properties_specular(void)
             @li EMISSION
             @li NORMAL
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_properties_material(void)
 {
@@ -12501,18 +12624,18 @@ st_collections_group_parts_part_description_properties_material(void)
    check_arg_count(1);
 
    material_attrib = parse_enum(0,
-                     "AMBIENT", EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
-                     "DIFFUSE", EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
-                     "SPECULAR", EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
-                     "EMISSION", EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION,
-                     "NORMAL", EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL,
-                     NULL);
+                                "AMBIENT", EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
+                                "DIFFUSE", EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
+                                "SPECULAR", EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
+                                "EMISSION", EVAS_CANVAS3D_MATERIAL_ATTRIB_EMISSION,
+                                "NORMAL", EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL,
+                                NULL);
 
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.properties.material_attrib = material_attrib;
      }
@@ -12533,7 +12656,7 @@ st_collections_group_parts_part_description_properties_material(void)
     @effect
         Sets the material attribute enable flag of the given material.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_properties_normal(void)
 {
@@ -12543,7 +12666,7 @@ st_collections_group_parts_part_description_properties_normal(void)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.properties.normal = parse_bool(0);
      }
@@ -12564,7 +12687,7 @@ st_collections_group_parts_part_description_properties_normal(void)
     @effect
         Sets the shininess of the given material.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_properties_shininess(void)
 {
@@ -12574,7 +12697,7 @@ st_collections_group_parts_part_description_properties_shininess(void)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.properties.shininess = FROM_DOUBLE(parse_float(0));
      }
@@ -12601,7 +12724,7 @@ st_collections_group_parts_part_description_properties_shininess(void)
             @li MAP
             @li RENDER
     @endproperty
-*/
+ */
 
 static void
 st_collections_group_parts_part_description_properties_shade(void)
@@ -12611,19 +12734,19 @@ st_collections_group_parts_part_description_properties_shade(void)
    check_arg_count(1);
 
    shade = parse_enum(0,
-                     "VERTEX_COLOR", EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR,
-                     "PARENT", EVAS_CANVAS3D_SHADER_MODE_DIFFUSE,
-                     "WORLD", EVAS_CANVAS3D_SHADER_MODE_FLAT,
-                     "PHONG", EVAS_CANVAS3D_SHADER_MODE_PHONG,
-                     "NORMAL_MAP", EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP,
-                     "RENDER", EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER,
-                     NULL);
+                      "VERTEX_COLOR", EVAS_CANVAS3D_SHADER_MODE_VERTEX_COLOR,
+                      "PARENT", EVAS_CANVAS3D_SHADER_MODE_DIFFUSE,
+                      "WORLD", EVAS_CANVAS3D_SHADER_MODE_FLAT,
+                      "PHONG", EVAS_CANVAS3D_SHADER_MODE_PHONG,
+                      "NORMAL_MAP", EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP,
+                      "RENDER", EVAS_CANVAS3D_SHADER_MODE_SHADOW_MAP_RENDER,
+                      NULL);
 
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.properties.shade = shade;
      }
@@ -12671,7 +12794,7 @@ st_collections_group_parts_part_description_properties_shade(void)
         Indicates a target point for CAMERA and MESH_NODE or for LIGHT to see or
         to illuminate.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_orientation_look1(void)
 {
@@ -12680,26 +12803,29 @@ st_collections_group_parts_part_description_orientation_look1(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_CAMERA:
-        {
-           SET_LOOK1(Camera, camera);
-           break;
-        }
+      {
+         SET_LOOK1(Camera, camera);
+         break;
+      }
+
       case EDJE_PART_TYPE_LIGHT:
-        {
-           SET_LOOK1(Light, light);
-           break;
-        }
+      {
+         SET_LOOK1(Light, light);
+         break;
+      }
+
       case EDJE_PART_TYPE_MESH_NODE:
-        {
-           SET_LOOK1(Mesh_Node, mesh_node);
-           break;
-        }
+      {
+         SET_LOOK1(Mesh_Node, mesh_node);
+         break;
+      }
+
       default:
-        {
-           ERR("parse error %s:%i. camera, light and mesh_node  attributes in non-CAMERA, non-LIGHT and non-MESH_NODE part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. camera, light and mesh_node  attributes in non-CAMERA, non-LIGHT and non-MESH_NODE part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 }
 
@@ -12712,7 +12838,7 @@ st_collections_group_parts_part_description_orientation_look1(void)
     @effect
         Specifies the angle at which the target point will be caught.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_orientation_look2(void)
 {
@@ -12721,26 +12847,29 @@ st_collections_group_parts_part_description_orientation_look2(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_CAMERA:
-        {
-           SET_LOOK2(Camera, camera);
-           break;
-        }
+      {
+         SET_LOOK2(Camera, camera);
+         break;
+      }
+
       case EDJE_PART_TYPE_LIGHT:
-        {
-           SET_LOOK2(Light, light);
-           break;
-        }
+      {
+         SET_LOOK2(Light, light);
+         break;
+      }
+
       case EDJE_PART_TYPE_MESH_NODE:
-        {
-           SET_LOOK2(Mesh_Node, mesh_node);
-           break;
-        }
+      {
+         SET_LOOK2(Mesh_Node, mesh_node);
+         break;
+      }
+
       default:
-        {
-           ERR("parse error %s:%i. camera, light and mesh_node  attributes in non-CAMERA, non-LIGHT and non-MESH_NODE part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. camera, light and mesh_node  attributes in non-CAMERA, non-LIGHT and non-MESH_NODE part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 }
 
@@ -12754,7 +12883,7 @@ st_collections_group_parts_part_description_orientation_look2(void)
         Indicates another part to make target of CAMERA, LIGHT or MESH_NODE
         or LIGHT.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_orientation_look_to(void)
 {
@@ -12767,26 +12896,29 @@ st_collections_group_parts_part_description_orientation_look_to(void)
    switch (current_part->type)
      {
       case EDJE_PART_TYPE_CAMERA:
-        {
-           SET_LOOK_TO(pc, Camera, camera);
-           break;
-        }
+      {
+         SET_LOOK_TO(pc, Camera, camera);
+         break;
+      }
+
       case EDJE_PART_TYPE_LIGHT:
-        {
-           SET_LOOK_TO(pc, Light, light);
-           break;
-        }
+      {
+         SET_LOOK_TO(pc, Light, light);
+         break;
+      }
+
       case EDJE_PART_TYPE_MESH_NODE:
-        {
-           SET_LOOK_TO(pc, Mesh_Node, mesh_node);
-           break;
-        }
+      {
+         SET_LOOK_TO(pc, Mesh_Node, mesh_node);
+         break;
+      }
+
       default:
-        {
-           ERR("parse error %s:%i. camera, light and mesh_node  attributes in non-CAMERA, non-LIGHT and non-MESH_NODE part.",
-               file_in, line - 1);
-           exit(-1);
-        }
+      {
+         ERR("parse error %s:%i. camera, light and mesh_node  attributes in non-CAMERA, non-LIGHT and non-MESH_NODE part.",
+             file_in, line - 1);
+         exit(-1);
+      }
      }
 }
 
@@ -12799,7 +12931,7 @@ st_collections_group_parts_part_description_orientation_look_to(void)
     @effect
         Specifies the angle and indicates what proportions the MESH_NODE rotates in.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_orientation_angle_axis(void)
 {
@@ -12825,7 +12957,6 @@ st_collections_group_parts_part_description_orientation_angle_axis(void)
      }
 }
 
-
 /**
     @page edcref
     @property
@@ -12835,7 +12966,7 @@ st_collections_group_parts_part_description_orientation_angle_axis(void)
     @effect
         Specifies the axis and arccosinus of half angle to rotate on the MESH_NODE, CAMERA or LIGHT.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_orientation_quaternion(void)
 {
@@ -12870,7 +13001,7 @@ st_collections_group_parts_part_description_orientation_quaternion(void)
     @effect
         Specifies the scale parameter for MESH_NODE.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_scale(void)
 {
@@ -12878,7 +13009,7 @@ st_collections_group_parts_part_description_scale(void)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.scale_3d.x = FROM_DOUBLE(parse_float_range(0, 0.0, 1000.0));
         ed->mesh_node.scale_3d.y = FROM_DOUBLE(parse_float_range(1, 0.0, 1000.0));
@@ -12920,17 +13051,16 @@ st_collections_group_parts_part_description_scale(void)
         A texture block is used to set texture, this texture will be imposed on
         MESH_NODE model.
     @endblock
-*/
+ */
 
 static void
 ob_collections_group_parts_part_description_texture(void)
 {
    Edje_Part_Description_Mesh_Node *ed;
 
-
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.texture.need_texture = EINA_TRUE;
      }
@@ -12943,25 +13073,25 @@ ob_collections_group_parts_part_description_texture(void)
      }
 }
 
- /**
-     @page edcref
-     @property
-         shade
-         image
-     @parameters
-         [SHADE]
-         [texture's filename]
-     @effect
-         Sets the shade mode for MESH_NODE. Valid shade modes:
-            @li COLOR
-            @li DIFFUSE
-            @li FLAT
-            @li PHONG
-            @li MAP
-            @li RENDER
-         Name of image to be used as previously declared in the image block.
-         It's required in any mesh_node part.
-     @endproperty
+/**
+    @page edcref
+    @property
+        shade
+        image
+    @parameters
+        [SHADE]
+        [texture's filename]
+    @effect
+        Sets the shade mode for MESH_NODE. Valid shade modes:
+           @li COLOR
+           @li DIFFUSE
+           @li FLAT
+           @li PHONG
+           @li MAP
+           @li RENDER
+        Name of image to be used as previously declared in the image block.
+        It's required in any mesh_node part.
+    @endproperty
  */
 static void
 st_collections_group_parts_part_description_texture_image(void)
@@ -12973,7 +13103,7 @@ st_collections_group_parts_part_description_texture_image(void)
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         char *name;
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.texture.textured = EINA_TRUE;
 
@@ -13003,7 +13133,7 @@ st_collections_group_parts_part_description_texture_image(void)
             @li REPEAT
             @li REFLECT
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_texture_wrap1(void)
 {
@@ -13012,16 +13142,16 @@ st_collections_group_parts_part_description_texture_wrap1(void)
    check_arg_count(1);
 
    wrap1 = parse_enum(0,
-                     "CLAMP", EVAS_CANVAS3D_WRAP_MODE_CLAMP,
-                     "REPEAT", EVAS_CANVAS3D_WRAP_MODE_REPEAT,
-                     "REFLECT", EVAS_CANVAS3D_WRAP_MODE_REFLECT,
-                     NULL);
+                      "CLAMP", EVAS_CANVAS3D_WRAP_MODE_CLAMP,
+                      "REPEAT", EVAS_CANVAS3D_WRAP_MODE_REPEAT,
+                      "REFLECT", EVAS_CANVAS3D_WRAP_MODE_REFLECT,
+                      NULL);
 
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.texture.wrap1 = wrap1;
      }
@@ -13045,7 +13175,7 @@ st_collections_group_parts_part_description_texture_wrap1(void)
             @li REPEAT
             @li REFLECT
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_texture_wrap2(void)
 {
@@ -13054,16 +13184,16 @@ st_collections_group_parts_part_description_texture_wrap2(void)
    check_arg_count(1);
 
    wrap2 = parse_enum(0,
-                     "CLAMP", EVAS_CANVAS3D_WRAP_MODE_CLAMP,
-                     "REPEAT", EVAS_CANVAS3D_WRAP_MODE_REPEAT,
-                     "REFLECT", EVAS_CANVAS3D_WRAP_MODE_REFLECT,
-                     NULL);
+                      "CLAMP", EVAS_CANVAS3D_WRAP_MODE_CLAMP,
+                      "REPEAT", EVAS_CANVAS3D_WRAP_MODE_REPEAT,
+                      "REFLECT", EVAS_CANVAS3D_WRAP_MODE_REFLECT,
+                      NULL);
 
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.texture.wrap2 = wrap2;
      }
@@ -13089,7 +13219,7 @@ st_collections_group_parts_part_description_texture_wrap2(void)
             @li LINEAR_MIPMAP_NEAREST
             @li NEAREST_MIPMAP_LINEAR
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_texture_filter1(void)
 {
@@ -13098,19 +13228,19 @@ st_collections_group_parts_part_description_texture_filter1(void)
    check_arg_count(1);
 
    filter1 = parse_enum(0,
-                     "NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
-                     "LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
-                     "NEAREST_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST,
-                     "LINEAR_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST,
-                     "NEAREST_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR,
-                     "LINEAR_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR,
-                     NULL);
+                        "NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
+                        "LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
+                        "NEAREST_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST,
+                        "LINEAR_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST,
+                        "NEAREST_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR,
+                        "LINEAR_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR,
+                        NULL);
 
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.texture.filter1 = filter1;
      }
@@ -13136,7 +13266,7 @@ st_collections_group_parts_part_description_texture_filter1(void)
             @li LINEAR_MIPMAP_NEAREST
             @li NEAREST_MIPMAP_LINEAR
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_texture_filter2(void)
 {
@@ -13145,19 +13275,19 @@ st_collections_group_parts_part_description_texture_filter2(void)
    check_arg_count(1);
 
    filter2 = parse_enum(0,
-                     "NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
-                     "LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
-                     "NEAREST_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST,
-                     "LINEAR_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST,
-                     "NEAREST_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR,
-                     "LINEAR_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR,
-                     NULL);
+                        "NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
+                        "LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
+                        "NEAREST_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST,
+                        "LINEAR_NEAREST", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST,
+                        "NEAREST_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR,
+                        "LINEAR_LINEAR", EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR,
+                        NULL);
 
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.texture.filter2 = filter2;
      }
@@ -13204,7 +13334,7 @@ st_collections_group_parts_part_description_texture_filter2(void)
             @li CUBE
             @li SPHERE
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_mesh_primitive(void)
 {
@@ -13213,16 +13343,16 @@ st_collections_group_parts_part_description_mesh_primitive(void)
    check_arg_count(1);
 
    primitive = parse_enum(0,
-                     "NONE", EVAS_CANVAS3D_MESH_PRIMITIVE_NONE,
-                     "CUBE", EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE,
-                     "SPHERE", EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE,
-                     NULL);
+                          "NONE", EVAS_CANVAS3D_MESH_PRIMITIVE_NONE,
+                          "CUBE", EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE,
+                          "SPHERE", EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE,
+                          NULL);
 
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.mesh.primitive = primitive;
      }
@@ -13250,7 +13380,7 @@ st_collections_group_parts_part_description_mesh_primitive(void)
             @li TRIANGLE_STRIP
             @li TRIANGLE_FAN
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_mesh_assembly(void)
 {
@@ -13259,20 +13389,20 @@ st_collections_group_parts_part_description_mesh_assembly(void)
    check_arg_count(1);
 
    assembly = parse_enum(0,
-                     "POINTS", EVAS_CANVAS3D_VERTEX_ASSEMBLY_POINTS,
-                     "LINES", EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES,
-                     "LINE_STRIP", EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINE_STRIP,
-                     "LINE_LOOP", EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINE_LOOP,
-                     "TRIANGLES", EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES,
-                     "TRIANGLE_STRIP", EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLE_STRIP,
-                     "TRIANGLE_FAN", EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLE_FAN,
-                     NULL);
+                         "POINTS", EVAS_CANVAS3D_VERTEX_ASSEMBLY_POINTS,
+                         "LINES", EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES,
+                         "LINE_STRIP", EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINE_STRIP,
+                         "LINE_LOOP", EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINE_LOOP,
+                         "TRIANGLES", EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES,
+                         "TRIANGLE_STRIP", EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLE_STRIP,
+                         "TRIANGLE_FAN", EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLE_FAN,
+                         NULL);
 
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.mesh.assembly = assembly;
      }
@@ -13294,7 +13424,7 @@ st_collections_group_parts_part_description_mesh_assembly(void)
         Name of model to be used as previously declared in the model block.
         It's required in any mesh_node part.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_mesh_geometry(void)
 {
@@ -13305,7 +13435,7 @@ st_collections_group_parts_part_description_mesh_geometry(void)
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         char *name;
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         name = parse_str(0);
         if (!ecore_file_exists(name))
@@ -13332,12 +13462,11 @@ st_collections_group_parts_part_description_mesh_frame(void)
 {
    check_arg_count(1);
 
-
    if (current_part->type == EDJE_PART_TYPE_MESH_NODE)
      {
         Edje_Part_Description_Mesh_Node *ed;
 
-        ed = (Edje_Part_Description_Mesh_Node*) current_desc;
+        ed = (Edje_Part_Description_Mesh_Node *)current_desc;
 
         ed->mesh_node.mesh.frame = parse_int(0);
      }
@@ -13398,7 +13527,7 @@ st_collections_group_parts_part_description_mesh_frame(void)
         so it will be immovable, static.
     @since 1.8
     @endproperty
-*/
+ */
 
 #ifdef HAVE_EPHYSICS
 static void
@@ -13408,6 +13537,7 @@ st_collections_group_parts_part_description_physics_mass(void)
 
    current_desc->physics.mass = parse_float(0);
 }
+
 #endif
 
 /**
@@ -13428,7 +13558,7 @@ st_collections_group_parts_part_description_physics_mass(void)
 
     @since 1.8
     @endproperty
-*/
+ */
 
 #ifdef HAVE_EPHYSICS
 static void
@@ -13438,6 +13568,7 @@ st_collections_group_parts_part_description_physics_restitution(void)
 
    current_desc->physics.restitution = parse_float(0);
 }
+
 #endif
 
 /**
@@ -13458,7 +13589,7 @@ st_collections_group_parts_part_description_physics_restitution(void)
 
     @since 1.8
     @endproperty
-*/
+ */
 
 #ifdef HAVE_EPHYSICS
 static void
@@ -13468,6 +13599,7 @@ st_collections_group_parts_part_description_physics_friction(void)
 
    current_desc->physics.friction = parse_float(0);
 }
+
 #endif
 
 /**
@@ -13484,7 +13616,7 @@ st_collections_group_parts_part_description_physics_friction(void)
         Default is 1 (enabled).
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_ignore_part_pos(void)
@@ -13493,6 +13625,7 @@ st_collections_group_parts_part_description_physics_ignore_part_pos(void)
 
    current_desc->physics.ignore_part_pos = parse_bool(0);
 }
+
 #endif
 
 /**
@@ -13510,7 +13643,7 @@ st_collections_group_parts_part_description_physics_ignore_part_pos(void)
         Values should be between 0.0 and 1.0, and are set to 0 by default.
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_damping(void)
@@ -13520,6 +13653,7 @@ st_collections_group_parts_part_description_physics_damping(void)
    current_desc->physics.damping.linear = parse_float_range(0, 0, 1.0);
    current_desc->physics.damping.angular = parse_float_range(1, 0, 1.0);
 }
+
 #endif
 
 /**
@@ -13542,7 +13676,7 @@ st_collections_group_parts_part_description_physics_damping(void)
         57.29 degrees / sec (1 rad/sec).
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_sleep(void)
@@ -13552,6 +13686,7 @@ st_collections_group_parts_part_description_physics_sleep(void)
    current_desc->physics.sleep.linear = parse_float(0);
    current_desc->physics.sleep.angular = parse_float(1);
 }
+
 #endif
 
 /**
@@ -13578,7 +13713,7 @@ st_collections_group_parts_part_description_physics_sleep(void)
 
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_material(void)
@@ -13586,15 +13721,16 @@ st_collections_group_parts_part_description_physics_material(void)
    check_arg_count(1);
 
    current_desc->physics.material = parse_enum(0,
-      "CUSTOM", EPHYSICS_BODY_MATERIAL_CUSTOM,
-      "CONCRETE", EPHYSICS_BODY_MATERIAL_CONCRETE,
-      "IRON", EPHYSICS_BODY_MATERIAL_IRON,
-      "PLASTIC", EPHYSICS_BODY_MATERIAL_PLASTIC,
-      "POLYSTYRENE", EPHYSICS_BODY_MATERIAL_POLYSTYRENE,
-      "RUBBER", EPHYSICS_BODY_MATERIAL_RUBBER,
-      "WOOD", EPHYSICS_BODY_MATERIAL_WOOD,
-      NULL);
+                                               "CUSTOM", EPHYSICS_BODY_MATERIAL_CUSTOM,
+                                               "CONCRETE", EPHYSICS_BODY_MATERIAL_CONCRETE,
+                                               "IRON", EPHYSICS_BODY_MATERIAL_IRON,
+                                               "PLASTIC", EPHYSICS_BODY_MATERIAL_PLASTIC,
+                                               "POLYSTYRENE", EPHYSICS_BODY_MATERIAL_POLYSTYRENE,
+                                               "RUBBER", EPHYSICS_BODY_MATERIAL_RUBBER,
+                                               "WOOD", EPHYSICS_BODY_MATERIAL_WOOD,
+                                               NULL);
 }
+
 #endif
 
 /**
@@ -13609,7 +13745,7 @@ st_collections_group_parts_part_description_physics_material(void)
         When a mass is explicitely set the density will be unset.
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_density(void)
@@ -13618,6 +13754,7 @@ st_collections_group_parts_part_description_physics_density(void)
 
    current_desc->physics.density = parse_float(0);
 }
+
 #endif
 
 /**
@@ -13635,7 +13772,7 @@ st_collections_group_parts_part_description_physics_density(void)
         Valid values vary from 0.0 to 1.0. Only works on soft bodies and cloths.
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_hardness(void)
@@ -13644,6 +13781,7 @@ st_collections_group_parts_part_description_physics_hardness(void)
 
    current_desc->physics.hardness = parse_float_range(0, 0, 1.0);
 }
+
 #endif
 
 /**
@@ -13658,7 +13796,7 @@ st_collections_group_parts_part_description_physics_hardness(void)
         Disabled by default (0).
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_light_on(void)
@@ -13667,6 +13805,7 @@ st_collections_group_parts_part_description_physics_light_on(void)
 
    current_desc->physics.light_on = parse_bool(0);
 }
+
 #endif
 
 /**
@@ -13679,7 +13818,7 @@ st_collections_group_parts_part_description_physics_light_on(void)
         Defines body position in z axis. It's set to -15 by default.
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_z(void)
@@ -13688,6 +13827,7 @@ st_collections_group_parts_part_description_physics_z(void)
 
    current_desc->physics.z = parse_int(0);
 }
+
 #endif
 
 /**
@@ -13700,7 +13840,7 @@ st_collections_group_parts_part_description_physics_z(void)
         Defines body's depth (z axis). It's set to 30 by default.
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_depth(void)
@@ -13709,6 +13849,7 @@ st_collections_group_parts_part_description_physics_depth(void)
 
    current_desc->physics.depth = parse_int(0);
 }
+
 #endif
 
 /**
@@ -13723,7 +13864,7 @@ st_collections_group_parts_part_description_physics_depth(void)
         This means that the object will be hidden when "backface culled".
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_backface_cull(void)
@@ -13732,6 +13873,7 @@ st_collections_group_parts_part_description_physics_backface_cull(void)
 
    current_desc->physics.backcull = parse_bool(0);
 }
+
 #endif
 
 /** @edcsubsection{collections_group_parts_description_physics_movement_freedom,
@@ -13767,7 +13909,7 @@ st_collections_group_parts_part_description_physics_backface_cull(void)
         Axes x and y are enabled by default.
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_movement_freedom_linear(void)
@@ -13778,6 +13920,7 @@ st_collections_group_parts_part_description_physics_movement_freedom_linear(void
    current_desc->physics.mov_freedom.lin.y = parse_bool(1);
    current_desc->physics.mov_freedom.lin.z = parse_bool(2);
 }
+
 #endif
 
 /**
@@ -13792,7 +13935,7 @@ st_collections_group_parts_part_description_physics_movement_freedom_linear(void
         Z axis is enabled by default.
     @since 1.8
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_movement_freedom_angular(void)
@@ -13803,6 +13946,7 @@ st_collections_group_parts_part_description_physics_movement_freedom_angular(voi
    current_desc->physics.mov_freedom.ang.y = parse_bool(1);
    current_desc->physics.mov_freedom.ang.z = parse_bool(2);
 }
+
 #endif
 
 /** @edcsubsection{collections_group_parts_description_physics_faces,
@@ -13832,7 +13976,7 @@ st_collections_group_parts_part_description_physics_movement_freedom_angular(voi
         Only the "faces" block declared in the "default" description
         will be considered.
     @endblock
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_face(void)
@@ -13845,6 +13989,7 @@ st_collections_group_parts_part_description_physics_face(void)
    pface->type = 0;
    pface->source = NULL;
 }
+
 #endif
 
 /**
@@ -13874,7 +14019,7 @@ st_collections_group_parts_part_description_physics_face(void)
             @li SPHERE_FRONT
             @li SPHERE_BACK
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_face_type(void)
@@ -13884,35 +14029,36 @@ st_collections_group_parts_part_description_physics_face_type(void)
 
    pface = eina_list_data_get(eina_list_last(current_desc->physics.faces));
    pface->type = parse_enum(0,
-      "BOX_MIDDLE_FRONT", EPHYSICS_BODY_BOX_FACE_MIDDLE_FRONT,
-      "BOX_MIDDLE_BACK", EPHYSICS_BODY_BOX_FACE_MIDDLE_BACK,
-      "BOX_FRONT", EPHYSICS_BODY_BOX_FACE_FRONT,
-      "BOX_BACK", EPHYSICS_BODY_BOX_FACE_BACK,
-      "BOX_LEFT", EPHYSICS_BODY_BOX_FACE_LEFT,
-      "BOX_RIGHT", EPHYSICS_BODY_BOX_FACE_RIGHT,
-      "BOX_TOP", EPHYSICS_BODY_BOX_FACE_TOP,
-      "BOX_BOTTOM", EPHYSICS_BODY_BOX_FACE_BOTTOM,
-      "CLOTH_FRONT", EPHYSICS_BODY_CLOTH_FACE_FRONT,
-      "CLOTH_BACK", EPHYSICS_BODY_CLOTH_FACE_BACK,
-      "CYLINDER_MIDDLE_FRONT", EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT,
-      "CYLINDER_MIDDLE_BACK", EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_BACK,
-      "CYLINDER_FRONT", EPHYSICS_BODY_CYLINDER_FACE_FRONT,
-      "CYLINDER_BACK", EPHYSICS_BODY_CYLINDER_FACE_BACK,
-      "CYLINDER_CURVED", EPHYSICS_BODY_CYLINDER_FACE_CURVED,
-      "SPHERE_FRONT", EPHYSICS_BODY_SPHERE_FACE_FRONT,
-      "SPHERE_BACK", EPHYSICS_BODY_SPHERE_FACE_BACK,
-      NULL);
+                            "BOX_MIDDLE_FRONT", EPHYSICS_BODY_BOX_FACE_MIDDLE_FRONT,
+                            "BOX_MIDDLE_BACK", EPHYSICS_BODY_BOX_FACE_MIDDLE_BACK,
+                            "BOX_FRONT", EPHYSICS_BODY_BOX_FACE_FRONT,
+                            "BOX_BACK", EPHYSICS_BODY_BOX_FACE_BACK,
+                            "BOX_LEFT", EPHYSICS_BODY_BOX_FACE_LEFT,
+                            "BOX_RIGHT", EPHYSICS_BODY_BOX_FACE_RIGHT,
+                            "BOX_TOP", EPHYSICS_BODY_BOX_FACE_TOP,
+                            "BOX_BOTTOM", EPHYSICS_BODY_BOX_FACE_BOTTOM,
+                            "CLOTH_FRONT", EPHYSICS_BODY_CLOTH_FACE_FRONT,
+                            "CLOTH_BACK", EPHYSICS_BODY_CLOTH_FACE_BACK,
+                            "CYLINDER_MIDDLE_FRONT", EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_FRONT,
+                            "CYLINDER_MIDDLE_BACK", EPHYSICS_BODY_CYLINDER_FACE_MIDDLE_BACK,
+                            "CYLINDER_FRONT", EPHYSICS_BODY_CYLINDER_FACE_FRONT,
+                            "CYLINDER_BACK", EPHYSICS_BODY_CYLINDER_FACE_BACK,
+                            "CYLINDER_CURVED", EPHYSICS_BODY_CYLINDER_FACE_CURVED,
+                            "SPHERE_FRONT", EPHYSICS_BODY_SPHERE_FACE_FRONT,
+                            "SPHERE_BACK", EPHYSICS_BODY_SPHERE_FACE_BACK,
+                            NULL);
 
    EINA_LIST_FOREACH(current_desc->physics.faces, l, pface2)
      {
-	if ((pface != pface2) && (pface->type == pface2->type))
-	  {
-	     ERR("parse error %s:%i. There is already a face of type \"%i\"",
-		 file_in, line - 1, pface->type);
-	     exit(-1);
-	  }
+        if ((pface != pface2) && (pface->type == pface2->type))
+          {
+             ERR("parse error %s:%i. There is already a face of type \"%i\"",
+                 file_in, line - 1, pface->type);
+             exit(-1);
+          }
      }
 }
+
 #endif
 
 /**
@@ -13925,7 +14071,7 @@ st_collections_group_parts_part_description_physics_face_type(void)
         This sets the group that is used as the object representing the physics
         body face.
     @endproperty
-*/
+ */
 #ifdef HAVE_EPHYSICS
 static void
 st_collections_group_parts_part_description_physics_face_source(void)
@@ -13938,6 +14084,7 @@ st_collections_group_parts_part_description_physics_face_source(void)
    pface->source = parse_str(0);
    data_queue_face_group_lookup(pface->source);
 }
+
 #endif
 
 /** @edcsubsection{collections_group_parts_description_map,
@@ -13982,7 +14129,7 @@ st_collections_group_parts_part_description_physics_face_source(void)
         This also implicitly enables perspective transforms (see the on
         parameter for the map section).
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_perspective(void)
 {
@@ -14020,7 +14167,7 @@ st_collections_group_parts_part_description_map_perspective(void)
         the ambient lighting when calculating brightness (alpha also not
         used).
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_light(void)
 {
@@ -14050,7 +14197,7 @@ st_collections_group_parts_part_description_map_light(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_on(void)
 {
@@ -14073,7 +14220,7 @@ st_collections_group_parts_part_description_map_on(void)
 
         Defaults: 1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_smooth(void)
 {
@@ -14093,7 +14240,7 @@ st_collections_group_parts_part_description_map_smooth(void)
 
         Defaults: 1
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_alpha(void)
 {
@@ -14115,7 +14262,7 @@ st_collections_group_parts_part_description_map_alpha(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_backface_cull(void)
 {
@@ -14138,7 +14285,7 @@ st_collections_group_parts_part_description_map_backface_cull(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_perspective_on(void)
 {
@@ -14176,7 +14323,7 @@ st_collections_group_parts_part_description_map_perspective_on(void)
 
         Defaults: 255 255 255 255
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_color(void)
 {
@@ -14209,8 +14356,8 @@ st_collections_group_parts_part_description_map_color(void)
    *color = tmp;
    current_desc->map.colors_count++;
    current_desc->map.colors =
-      realloc(current_desc->map.colors,
-              sizeof(Edje_Map_Color*) * current_desc->map.colors_count);
+     realloc(current_desc->map.colors,
+             sizeof(Edje_Map_Color *) * current_desc->map.colors_count);
    current_desc->map.colors[current_desc->map.colors_count - 1] = color;
 }
 
@@ -14225,7 +14372,7 @@ st_collections_group_parts_part_description_map_color(void)
 
         Defaults: 1.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_zoom_x(void)
 {
@@ -14245,7 +14392,7 @@ st_collections_group_parts_part_description_map_zoom_x(void)
 
         Defaults: 1.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_zoom_y(void)
 {
@@ -14275,7 +14422,7 @@ st_collections_group_parts_part_description_map_zoom_y(void)
     @description
         Rotates the part, optionally with the center on another part.
     @endblock
-    
+
     @property
         center
     @parameters
@@ -14287,7 +14434,7 @@ st_collections_group_parts_part_description_map_zoom_y(void)
         x, y and z axes. If no center is given, the parts original center
         itself is used for the rotation center.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_rotation_center(void)
 {
@@ -14318,7 +14465,7 @@ st_collections_group_parts_part_description_map_rotation_center(void)
 
         Defaults: 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_rotation_x(void)
 {
@@ -14339,7 +14486,7 @@ st_collections_group_parts_part_description_map_rotation_x(void)
 
         Defaults: 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_rotation_y(void)
 {
@@ -14360,7 +14507,7 @@ st_collections_group_parts_part_description_map_rotation_y(void)
 
         Defaults: 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_map_rotation_z(void)
 {
@@ -14389,7 +14536,7 @@ st_collections_group_parts_part_description_map_rotation_z(void)
         Adds focal and plane perspective to the part. Active if perspective_on is true.
         Must be provided if the part is being used by other part as it's perspective target.
     @endblock
-    
+
     @property
         zplane
     @parameters
@@ -14400,7 +14547,7 @@ st_collections_group_parts_part_description_map_rotation_z(void)
 
         Defaults: 0
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_perspective_zplane(void)
 {
@@ -14409,7 +14556,6 @@ st_collections_group_parts_part_description_perspective_zplane(void)
    current_desc->persp.zplane = parse_int(0);
 }
 
-
 /**
     @page edcref
     @property
@@ -14422,7 +14568,7 @@ st_collections_group_parts_part_description_perspective_zplane(void)
 
         Defaults: 1000
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_perspective_focal(void)
 {
@@ -14431,7 +14577,6 @@ st_collections_group_parts_part_description_perspective_focal(void)
    current_desc->persp.focal = parse_int_range(0, 1, 0x7fffffff);
 }
 
-
 /** @edcsubsection{collections_group_parts_description_filter,
  *                 Group.Parts.Part.Description.Filter} */
 
@@ -14478,7 +14623,7 @@ st_collections_group_parts_part_description_perspective_focal(void)
         @ref evasfiltersref "here" or a filter name defined in the
         @ref sec_collections_group_filters "Filters" section.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_filter_code(void)
 {
@@ -14501,7 +14646,7 @@ st_collections_group_parts_part_description_filter_code(void)
         exit(-1);
      }
 
-   free((void*) filter->code);
+   free((void *)filter->code);
    filter->code = parse_str(0);
 }
 
@@ -14517,7 +14662,7 @@ st_collections_group_parts_part_description_filter_code(void)
         text or image filter operation. Optionally, a buffer name may be
         specified, so the same filter code can be used with different sources.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_filter_source(void)
 {
@@ -14529,7 +14674,7 @@ st_collections_group_parts_part_description_filter_source(void)
    int args;
 
    static const char allowed_name_chars[] =
-         "abcdefghijklmnopqrstuvwxyzABCDEFGHJIKLMNOPQRSTUVWXYZ0123456789_";
+     "abcdefghijklmnopqrstuvwxyzABCDEFGHJIKLMNOPQRSTUVWXYZ0123456789_";
 
    if (current_part->type == EDJE_PART_TYPE_TEXT)
      filter = &(((Edje_Part_Description_Text *)current_desc)->filter);
@@ -14619,7 +14764,7 @@ st_collections_group_parts_part_description_filter_source(void)
         mycc = { r = 255, g = 0, b, a, r2, g2, b2, a2, r3, g3, b3, a3 }
         @endcode
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_filter_data(void)
 {
@@ -14685,7 +14830,7 @@ st_collections_group_parts_part_description_filter_data(void)
         Set parameters for EXTERNAL parts. The value overwrites previous
         definitions with the same name.
     @endblock
-*/
+ */
 static void
 _st_collections_group_parts_part_description_params(Edje_External_Param_Type type)
 {
@@ -14704,25 +14849,25 @@ _st_collections_group_parts_part_description_params(Edje_External_Param_Type typ
         exit(-1);
      }
 
-   ed = (Edje_Part_Description_External*) current_desc;
+   ed = (Edje_Part_Description_External *)current_desc;
 
    name = parse_str(0);
 
    /* if a param with this name already exists, overwrite it */
    EINA_LIST_FOREACH(ed->external_params, l, param)
      {
-	if (!strcmp(param->name, name))
-	  {
-	     found = 1;
+        if (!strcmp(param->name, name))
+          {
+             found = 1;
              free(name);
-	     break;
-	  }
+             break;
+          }
      }
 
    if (!found)
      {
-	param = mem_alloc(SZ(Edje_External_Param));
-	param->name = name;
+        param = mem_alloc(SZ(Edje_External_Param));
+        param->name = name;
      }
 
    param->type = type;
@@ -14733,22 +14878,26 @@ _st_collections_group_parts_part_description_params(Edje_External_Param_Type typ
    switch (type)
      {
       case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-	 param->i = parse_bool(1);
-	 break;
+        param->i = parse_bool(1);
+        break;
+
       case EDJE_EXTERNAL_PARAM_TYPE_INT:
-	 param->i = parse_int(1);
-	 break;
+        param->i = parse_int(1);
+        break;
+
       case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-	 param->d = parse_float(1);
-	 break;
+        param->d = parse_float(1);
+        break;
+
       case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
       case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-	 param->s = parse_str(1);
-	 break;
+        param->s = parse_str(1);
+        break;
+
       default:
-	 ERR("parse error %s:%i. Invalid param type.",
-	     file_in, line - 1);
-	 break;
+        ERR("parse error %s:%i. Invalid param type.",
+            file_in, line - 1);
+        break;
      }
 
    if (!found)
@@ -14764,7 +14913,7 @@ _st_collections_group_parts_part_description_params(Edje_External_Param_Type typ
     @effect
         Adds an integer parameter for an external object
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_params_int(void)
 {
@@ -14780,7 +14929,7 @@ st_collections_group_parts_part_description_params_int(void)
     @effect
         Adds a double parameter for an external object
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_params_double(void)
 {
@@ -14796,7 +14945,7 @@ st_collections_group_parts_part_description_params_double(void)
     @effect
         Adds a string parameter for an external object
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_params_string(void)
 {
@@ -14812,7 +14961,7 @@ st_collections_group_parts_part_description_params_string(void)
     @effect
         Adds an boolean parameter for an external object.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_params_bool(void)
 {
@@ -14830,7 +14979,7 @@ st_collections_group_parts_part_description_params_bool(void)
         choice values are defined by external type at their register time
         and will be validated at runtime.
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_params_choice(void)
 {
@@ -14862,7 +15011,7 @@ st_collections_group_parts_part_description_params_choice(void)
         signal: "edje,signal"; source: "edje";
     @since 1.10
     @endblock
-*/
+ */
 static void
 ob_collections_group_parts_part_description_link(void)
 {
@@ -14872,10 +15021,10 @@ ob_collections_group_parts_part_description_link(void)
    const char *nm;
 
    pcp = eina_list_last_data_get(edje_collections);
-   epp = (Edje_Part_Parser*)current_part;
+   epp = (Edje_Part_Parser *)current_part;
 
    ob_collections_group_programs_program();
-   _edje_program_remove((Edje_Part_Collection*)pcp, current_program);
+   _edje_program_remove((Edje_Part_Collection *)pcp, current_program);
    el = mem_alloc(SZ(Edje_Part_Description_Link));
    el->pr = current_program;
    el->ed = current_desc;
@@ -14899,7 +15048,7 @@ ob_collections_group_parts_part_description_link(void)
         default value if it is not provided.
     @since 1.10
     @endproperty
-*/
+ */
 static void
 st_collections_group_parts_part_description_link_base(void)
 {
@@ -14913,7 +15062,7 @@ st_collections_group_parts_part_description_link_base(void)
    el = eina_list_last_data_get(pcp->links);
 
    if ((!el) || (el->pr != current_program) ||
-       (el->ed != current_desc) || (el->epp != (Edje_Part_Parser*)current_part) ||
+       (el->ed != current_desc) || (el->epp != (Edje_Part_Parser *)current_part) ||
        el->pr->source)
      ob_collections_group_parts_part_description_link();
    el = eina_list_last_data_get(pcp->links);
@@ -14923,17 +15072,17 @@ st_collections_group_parts_part_description_link_base(void)
    if (current_program->signal && pcp->link_hash)
      {
         snprintf(buf, sizeof(buf), "%s\"\"\"%s", current_program->signal,
-                 current_program->source ? current_program->source: "");
+                 current_program->source ? current_program->source : "");
         eina_hash_list_remove(pcp->link_hash, buf, el);
      }
    if (!pcp->link_hash)
      pcp->link_hash = eina_hash_string_superfast_new((Eina_Free_Cb)eina_list_free);
-   free((void*)current_program->signal);
+   free((void *)current_program->signal);
    current_program->signal = name;
    if (get_arg_count() == 2)
      {
         name = parse_str(1);
-        free((void*)current_program->source);
+        free((void *)current_program->source);
         current_program->source = name;
      }
    snprintf(buf, sizeof(buf), "%s\"\"\"%s", current_program->signal,
@@ -14971,13 +15120,13 @@ st_collections_group_parts_part_description_link_base(void)
     @description
         The programs group contain one ore more program.
     @endblock
-*/
+ */
 static void
 _program_sequence_check(void)
 {
    if (sequencing != current_program) return;
    ERR("parse error %s:%i. cannot set sequence parent program attributes within sequence block",
-                 file_in, line - 1);
+       file_in, line - 1);
    exit(-1);
 }
 
@@ -14997,14 +15146,14 @@ _program_after(const char *name)
 
    EINA_LIST_FOREACH(ep->after, l, pa2)
      {
-        if (!strcmp(name, (char*) (pa2 + 1)))
+        if (!strcmp(name, (char *)(pa2 + 1)))
           return;
      }
 
    pa = mem_alloc(SZ(Edje_Program_After) + strlen(name) + 1);
    pa->id = -1;
    ep->after = eina_list_append(ep->after, pa);
-   copy = (char*)(pa + 1);
+   copy = (char *)(pa + 1);
    memcpy(copy, name, strlen(name) + 1);
    pl = data_queue_program_lookup(pc, name, &(pa->id));
    if (pl)
@@ -15054,7 +15203,7 @@ _program_sequence_new(void)
         Programs can change the state of parts, react to events or trigger
         other events.
     @endblock
-*/
+ */
 static void
 ob_collections_group_programs_program(void)
 {
@@ -15120,7 +15269,7 @@ _program_name(char *name)
     @effect
         Symbolic name of program as a unique identifier.
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_name(void)
 {
@@ -15162,7 +15311,7 @@ st_collections_group_programs_program_name(void)
           - focus,part,in;
           - focus,part,out.
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_signal(void)
 {
@@ -15190,7 +15339,7 @@ st_collections_group_programs_program_signal(void)
         keyword per program may be used. ex: source: "button-*"; (Signals from
         any part or program named "button-*" are accepted).
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_source(void)
 {
@@ -15203,7 +15352,7 @@ st_collections_group_programs_program_source(void)
    pc = eina_list_data_get(eina_list_last(edje_collections));
 
    _edje_program_remove(pc, current_program);
-   free((void*)current_program->source);
+   free((void *)current_program->source);
    current_program->source = parse_str(0);
    _edje_program_insert(pc, current_program);
 }
@@ -15219,7 +15368,7 @@ st_collections_group_programs_program_source(void)
         Only one filter per program can be used. If [part] is not given, the source of
         the event will be used instead.
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_filter(void)
 {
@@ -15227,12 +15376,15 @@ st_collections_group_programs_program_filter(void)
 
    _program_sequence_check();
 
-   if(is_param(1)) {
-	   current_program->filter.part = parse_str(0);
-	   current_program->filter.state = parse_str(1);
-   } else {
-	   current_program->filter.state = parse_str(0);
-   }
+   if (is_param(1))
+     {
+        current_program->filter.part = parse_str(0);
+        current_program->filter.state = parse_str(1);
+     }
+   else
+     {
+        current_program->filter.state = parse_str(0);
+     }
 }
 
 /**
@@ -15247,7 +15399,7 @@ st_collections_group_programs_program_filter(void)
 
         Defaults: 0.0 0.0
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_in(void)
 {
@@ -15302,7 +15454,7 @@ st_collections_group_programs_program_in(void)
         @li ALERT
 
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_action(void)
 {
@@ -15343,11 +15495,11 @@ st_collections_group_programs_program_action(void)
                            NULL);
    if (ep->action == EDJE_ACTION_TYPE_STATE_SET)
      {
-	ep->state = parse_str(1);
-	if (get_arg_count() == 2)
-	  ep->value = 0.0;
-	else
-	  ep->value = parse_float_range(2, 0.0, 1.0);
+        ep->state = parse_str(1);
+        if (get_arg_count() == 2)
+          ep->value = 0.0;
+        else
+          ep->value = parse_float_range(2, 0.0, 1.0);
      }
    else if ((ep->action == EDJE_ACTION_TYPE_FOCUS_SET) ||
             (ep->action == EDJE_ACTION_TYPE_FOCUS_OBJECT))
@@ -15359,8 +15511,8 @@ st_collections_group_programs_program_action(void)
      }
    else if (ep->action == EDJE_ACTION_TYPE_SIGNAL_EMIT)
      {
-	ep->state = parse_str(1);
-	ep->state2 = parse_str(2);
+        ep->state = parse_str(1);
+        ep->state2 = parse_str(2);
      }
    else if (ep->action == EDJE_ACTION_TYPE_SOUND_SAMPLE)
      {
@@ -15431,44 +15583,44 @@ st_collections_group_programs_program_action(void)
      }
    else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_SET)
      {
-	ep->value = parse_float(1);
-	ep->value2 = parse_float(2);
+        ep->value = parse_float(1);
+        ep->value2 = parse_float(2);
      }
    else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_STEP)
      {
-	ep->value = parse_float(1);
-	ep->value2 = parse_float(2);
+        ep->value = parse_float(1);
+        ep->value2 = parse_float(2);
      }
    else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_PAGE)
      {
-	ep->value = parse_float(1);
-	ep->value2 = parse_float(2);
+        ep->value = parse_float(1);
+        ep->value2 = parse_float(2);
      }
    else if (ep->action == EDJE_ACTION_TYPE_PARAM_COPY)
      {
-	char *src_part, *dst_part;
-        
-	src_part = parse_str(1);
-	ep->state = parse_str(2);
-	dst_part = parse_str(3);
-	ep->state2 = parse_str(4);
-        
-	data_queue_part_lookup(pc, src_part, &(ep->param.src));
-	data_queue_part_lookup(pc, dst_part, &(ep->param.dst));
-        
-	free(src_part);
-	free(dst_part);
+        char *src_part, *dst_part;
+
+        src_part = parse_str(1);
+        ep->state = parse_str(2);
+        dst_part = parse_str(3);
+        ep->state2 = parse_str(4);
+
+        data_queue_part_lookup(pc, src_part, &(ep->param.src));
+        data_queue_part_lookup(pc, dst_part, &(ep->param.dst));
+
+        free(src_part);
+        free(dst_part);
      }
    else if (ep->action == EDJE_ACTION_TYPE_PARAM_SET)
      {
-	char *part;
-        
-	part = parse_str(1);
-	ep->state = parse_str(2);
-	ep->state2 = parse_str(3);
-        
-	data_queue_part_lookup(pc, part, &(ep->param.dst));
-	free(part);
+        char *part;
+
+        part = parse_str(1);
+        ep->state = parse_str(2);
+        ep->state2 = parse_str(3);
+
+        data_queue_part_lookup(pc, part, &(ep->param.dst));
+        free(part);
      }
 #ifdef HAVE_EPHYSICS
    else if ((ep->action == EDJE_ACTION_TYPE_PHYSICS_IMPULSE) ||
@@ -15494,14 +15646,16 @@ st_collections_group_programs_program_action(void)
    switch (ep->action)
      {
       case EDJE_ACTION_TYPE_SCRIPT:
-	/* this is implicitly set by script {} so this is here just for
-	 * completeness */
-	break;
+        /* this is implicitly set by script {} so this is here just for
+         * completeness */
+        break;
+
       case EDJE_ACTION_TYPE_ACTION_STOP:
       case EDJE_ACTION_TYPE_PHYSICS_FORCES_CLEAR:
       case EDJE_ACTION_TYPE_PHYSICS_STOP:
         check_arg_count(1);
         break;
+
       case EDJE_ACTION_TYPE_PARAM_SET:
       case EDJE_ACTION_TYPE_PHYSICS_IMPULSE:
       case EDJE_ACTION_TYPE_PHYSICS_TORQUE_IMPULSE:
@@ -15511,22 +15665,27 @@ st_collections_group_programs_program_action(void)
       case EDJE_ACTION_TYPE_PHYSICS_ANG_VEL_SET:
         check_arg_count(4);
         break;
+
       case EDJE_ACTION_TYPE_PARAM_COPY:
       case EDJE_ACTION_TYPE_PHYSICS_ROT_SET:
         check_arg_count(5);
         break;
+
       case EDJE_ACTION_TYPE_SOUND_SAMPLE:
       case EDJE_ACTION_TYPE_VIBRATION_SAMPLE:
         break;
+
       case EDJE_ACTION_TYPE_STATE_SET:
         check_min_arg_count(2);
         break;
+
       case EDJE_ACTION_TYPE_FOCUS_SET:
       case EDJE_ACTION_TYPE_FOCUS_OBJECT:
         check_min_arg_count(1);
         break;
+
       default:
-	check_arg_count(3);
+        check_arg_count(3);
      }
 }
 
@@ -15552,23 +15711,23 @@ st_collections_group_programs_program_action(void)
         @li BOUNCE
         @li SPRING
         @li CUBIC_BEZIER
-        
+
         ACCEL_FAC, DECEL_FAC and SIN_FAC need the extra optional
         "interp val 1" to determine the "factor" of curviness. 1.0 is the same
         as their non-factor counterparts, where 0.0 is equal to linear.
         Numbers higher than one make the curve angles steeper with a more
         pronounced curve point.
-        
+
         DIVIS, BOUNCE and SPRING also require "interp val 2" in addition
         to "interp val 1".
-        
+
         DIVIS uses val 1 as the initial gradient start
         (0.0 is horizontal, 1.0 is diagonal (linear), 2.0 is twice the
         gradient of linear etc.). val 2 is interpreted as an integer factor
         defining how much the value swings "outside" the gradient only to come
         back to the final resting spot at the end. 0.0 for val 2 is equivalent
         to linear interpolation. Note that DIVIS can exceed 1.0
-        
+
         BOUNCE uses val 2 as the number of bounces (so its rounded down to
         the nearest integer value), with val 1 determining how much the
         bounce decays, with 0.0 giving linear decay per bounce, and higher
@@ -15583,7 +15742,7 @@ st_collections_group_programs_program_action(void)
         Can be used as the last parameter of any transition type. (since 1.1.0)
 
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_transition(void)
 {
@@ -15595,38 +15754,38 @@ st_collections_group_programs_program_transition(void)
    _program_sequence_check();
 
    current_program->tween.v1 = current_program->tween.v2 =
-   current_program->tween.v3 = current_program->tween.v4 = 0.0;
+       current_program->tween.v3 = current_program->tween.v4 = 0.0;
 
    current_program->tween.mode = parse_enum(0,
-                                            // short names
-					    "LIN", EDJE_TWEEN_MODE_LINEAR,
-					    "SIN", EDJE_TWEEN_MODE_SINUSOIDAL,
-					    "ACCEL", EDJE_TWEEN_MODE_ACCELERATE,
-					    "DECEL", EDJE_TWEEN_MODE_DECELERATE,
-					    "ACCEL_FAC", EDJE_TWEEN_MODE_ACCELERATE_FACTOR,
-					    "DECEL_FAC", EDJE_TWEEN_MODE_DECELERATE_FACTOR,
-					    "SIN_FAC", EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR,
-					    "DIVIS", EDJE_TWEEN_MODE_DIVISOR_INTERP,
-                                            
-                                            // long/full names
-					    "LINEAR", EDJE_TWEEN_MODE_LINEAR,
-					    "SINUSOIDAL", EDJE_TWEEN_MODE_SINUSOIDAL,
-					    "CUBIC_BEZIER", EDJE_TWEEN_MODE_CUBIC_BEZIER,
-					    "ACCELERATE", EDJE_TWEEN_MODE_ACCELERATE,
-					    "DECELERATE", EDJE_TWEEN_MODE_DECELERATE,
-					    "ACCELERATE_FACTOR", EDJE_TWEEN_MODE_ACCELERATE_FACTOR,
-					    "DECELERATE_FACTOR", EDJE_TWEEN_MODE_DECELERATE_FACTOR,
-					    "SINUSOIDAL_FACTOR", EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR,
-					    "DIVISOR_INTERP", EDJE_TWEEN_MODE_DIVISOR_INTERP,
-                                            
-                                            // long/full is short enough
-					    "BOUNCE", EDJE_TWEEN_MODE_BOUNCE,
-					    "SPRING", EDJE_TWEEN_MODE_SPRING,
-					    NULL);
+     // short names
+                                            "LIN", EDJE_TWEEN_MODE_LINEAR,
+                                            "SIN", EDJE_TWEEN_MODE_SINUSOIDAL,
+                                            "ACCEL", EDJE_TWEEN_MODE_ACCELERATE,
+                                            "DECEL", EDJE_TWEEN_MODE_DECELERATE,
+                                            "ACCEL_FAC", EDJE_TWEEN_MODE_ACCELERATE_FACTOR,
+                                            "DECEL_FAC", EDJE_TWEEN_MODE_DECELERATE_FACTOR,
+                                            "SIN_FAC", EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR,
+                                            "DIVIS", EDJE_TWEEN_MODE_DIVISOR_INTERP,
+
+     // long/full names
+                                            "LINEAR", EDJE_TWEEN_MODE_LINEAR,
+                                            "SINUSOIDAL", EDJE_TWEEN_MODE_SINUSOIDAL,
+                                            "CUBIC_BEZIER", EDJE_TWEEN_MODE_CUBIC_BEZIER,
+                                            "ACCELERATE", EDJE_TWEEN_MODE_ACCELERATE,
+                                            "DECELERATE", EDJE_TWEEN_MODE_DECELERATE,
+                                            "ACCELERATE_FACTOR", EDJE_TWEEN_MODE_ACCELERATE_FACTOR,
+                                            "DECELERATE_FACTOR", EDJE_TWEEN_MODE_DECELERATE_FACTOR,
+                                            "SINUSOIDAL_FACTOR", EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR,
+                                            "DIVISOR_INTERP", EDJE_TWEEN_MODE_DIVISOR_INTERP,
+
+     // long/full is short enough
+                                            "BOUNCE", EDJE_TWEEN_MODE_BOUNCE,
+                                            "SPRING", EDJE_TWEEN_MODE_SPRING,
+                                            NULL);
    current_program->tween.time = FROM_DOUBLE(parse_float_range(1, 0.0, 999999999.0));
 
-  //Check the index of params not related to tweenmode's param
-  //This index use for count of the tweenmode's param
+   //Check the index of params not related to tweenmode's param
+   //This index use for count of the tweenmode's param
    if ((index = get_param_index("USE_DURATION_FACTOR")) != -1)
      {
         current_program->tween.use_duration_factor = parse_bool(index + 1);
@@ -15638,87 +15797,89 @@ st_collections_group_programs_program_transition(void)
           index = current;
         required_args++;
      }
-   switch(current_program->tween.mode)
-     {
-        case EDJE_TWEEN_MODE_LINEAR:
-        case EDJE_TWEEN_MODE_SINUSOIDAL:
-        case EDJE_TWEEN_MODE_ACCELERATE:
-        case EDJE_TWEEN_MODE_DECELERATE:
-          {
-             required_args += 2;
-             check_arg_count(required_args);
-          }
-        break;
-
-        // the following need v1
-        case EDJE_TWEEN_MODE_ACCELERATE_FACTOR:
-        case EDJE_TWEEN_MODE_DECELERATE_FACTOR:
-        case EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR:
-          {
-             required_args += 3;
-             check_arg_count(required_args);
-             if (index == -1 || index > 2)
-               {
-                   current_program->tween.v1 =
-                      FROM_DOUBLE(parse_float_range(2, -999999999.0, 999999999.0));
-                   break;
-               }
-             else
-               {
-                  ERR("parse error %s:%i. Need 3rd parameter to set factor",
+   switch (current_program->tween.mode)
+     {
+      case EDJE_TWEEN_MODE_LINEAR:
+      case EDJE_TWEEN_MODE_SINUSOIDAL:
+      case EDJE_TWEEN_MODE_ACCELERATE:
+      case EDJE_TWEEN_MODE_DECELERATE:
+      {
+         required_args += 2;
+         check_arg_count(required_args);
+      }
+      break;
+
+      // the following need v1
+      case EDJE_TWEEN_MODE_ACCELERATE_FACTOR:
+      case EDJE_TWEEN_MODE_DECELERATE_FACTOR:
+      case EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR:
+      {
+         required_args += 3;
+         check_arg_count(required_args);
+         if (index == -1 || index > 2)
+           {
+              current_program->tween.v1 =
+                FROM_DOUBLE(parse_float_range(2, -999999999.0, 999999999.0));
+              break;
+           }
+         else
+           {
+              ERR("parse error %s:%i. Need 3rd parameter to set factor",
                   file_in, line - 1);
-                  exit(-1);
-               }
-          }
-        case EDJE_TWEEN_MODE_DIVISOR_INTERP:
-        case EDJE_TWEEN_MODE_BOUNCE:
-        case EDJE_TWEEN_MODE_SPRING:
-          {
-             required_args += 4;
-             check_arg_count(required_args);
-             if (index == -1 || index > 3)
-               {
-                   current_program->tween.v1 =
-                      FROM_DOUBLE(parse_float_range(2, -999999999.0, 999999999.0));
-                   current_program->tween.v2 =
-                      FROM_DOUBLE(parse_float_range(3, -999999999.0, 999999999.0));
-                   break;
-               }
-             else
-               {
-                  ERR("parse error %s:%i. "
+              exit(-1);
+           }
+      }
+
+      case EDJE_TWEEN_MODE_DIVISOR_INTERP:
+      case EDJE_TWEEN_MODE_BOUNCE:
+      case EDJE_TWEEN_MODE_SPRING:
+      {
+         required_args += 4;
+         check_arg_count(required_args);
+         if (index == -1 || index > 3)
+           {
+              current_program->tween.v1 =
+                FROM_DOUBLE(parse_float_range(2, -999999999.0, 999999999.0));
+              current_program->tween.v2 =
+                FROM_DOUBLE(parse_float_range(3, -999999999.0, 999999999.0));
+              break;
+           }
+         else
+           {
+              ERR("parse error %s:%i. "
                   "Need 3rd and 4th parameters to set factor and counts",
                   file_in, line - 1);
-                  exit(-1);
-               }
-          }
-        case EDJE_TWEEN_MODE_CUBIC_BEZIER:
-          {
-             required_args += 6;
-             check_arg_count(required_args);
-             if (index == -1 || index > 5)
-               {
-                   current_program->tween.v1 =
-                      FROM_DOUBLE(parse_float_range(2, -999999999.0, 999999999.0));
-                   current_program->tween.v2 =
-                      FROM_DOUBLE(parse_float_range(3, -999999999.0, 999999999.0));
-                   current_program->tween.v3 =
-                      FROM_DOUBLE(parse_float_range(4, -999999999.0, 999999999.0));
-                   current_program->tween.v4 =
-                      FROM_DOUBLE(parse_float_range(5, -999999999.0, 999999999.0));
-                   break;
-               }
-             else
-               {
-                  ERR("parse error %s:%i. "
+              exit(-1);
+           }
+      }
+
+      case EDJE_TWEEN_MODE_CUBIC_BEZIER:
+      {
+         required_args += 6;
+         check_arg_count(required_args);
+         if (index == -1 || index > 5)
+           {
+              current_program->tween.v1 =
+                FROM_DOUBLE(parse_float_range(2, -999999999.0, 999999999.0));
+              current_program->tween.v2 =
+                FROM_DOUBLE(parse_float_range(3, -999999999.0, 999999999.0));
+              current_program->tween.v3 =
+                FROM_DOUBLE(parse_float_range(4, -999999999.0, 999999999.0));
+              current_program->tween.v4 =
+                FROM_DOUBLE(parse_float_range(5, -999999999.0, 999999999.0));
+              break;
+           }
+         else
+           {
+              ERR("parse error %s:%i. "
                   "Need 3rd, 4th, 5th and 6th parameters to set x1, y1, x2 and y2",
                   file_in, line - 1);
-                  exit(-1);
-               }
-          }
-        }
-      if (current > 0)
-        current_program->tween.mode |= EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
+              exit(-1);
+           }
+      }
+     }
+   if (current > 0)
+     current_program->tween.mode |= EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
 }
 
 static void
@@ -15736,7 +15897,7 @@ _program_target_add(char *name)
 
    EINA_LIST_FOREACH(ep->targets, l, etw)
      {
-        if (!strcmp(name, (char*) (etw + 1)))
+        if (!strcmp(name, (char *)(etw + 1)))
           {
              free(name);
              return;
@@ -15745,13 +15906,14 @@ _program_target_add(char *name)
 
    et = mem_alloc(SZ(Edje_Program_Target) + strlen(name) + 1);
    ep->targets = eina_list_append(ep->targets, et);
-   copy = (char*) (et + 1);
+   copy = (char *)(et + 1);
    memcpy(copy, name, strlen(name) + 1);
    switch (ep->action)
      {
       case EDJE_ACTION_TYPE_ACTION_STOP:
-         data_queue_program_lookup(pc, name, &(et->id));
-         break;
+        data_queue_program_lookup(pc, name, &(et->id));
+        break;
+
       case EDJE_ACTION_TYPE_STATE_SET:
       case EDJE_ACTION_TYPE_SIGNAL_EMIT:
       case EDJE_ACTION_TYPE_DRAG_VAL_SET:
@@ -15770,12 +15932,13 @@ _program_target_add(char *name)
       case EDJE_ACTION_TYPE_PHYSICS_STOP:
       case EDJE_ACTION_TYPE_PHYSICS_ROT_SET:
 #endif
-         data_queue_part_lookup(pc, name, &(et->id));
-         break;
+        data_queue_part_lookup(pc, name, &(et->id));
+        break;
+
       default:
-         ERR("parse error %s:%i. target may only be used after action",
-             file_in, line - 1);
-         exit(-1);
+        ERR("parse error %s:%i. target may only be used after action",
+            file_in, line - 1);
+        exit(-1);
      }
    free(name);
 }
@@ -15791,7 +15954,7 @@ _program_target_add(char *name)
         keywords may be specified, one per target. SIGNAL_EMITs can have
         targets.
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_target(void)
 {
@@ -15814,7 +15977,7 @@ st_collections_group_programs_program_target(void)
         targets.
     @since 1.10
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_targets(void)
 {
@@ -15840,7 +16003,7 @@ st_collections_group_programs_program_targets(void)
         and 'targets' keywords may be specified. SIGNAL_EMITs can have targets.
     @since 1.10
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_target_groups(void)
 {
@@ -15873,7 +16036,7 @@ st_collections_group_programs_program_target_groups(void)
              continue;
           }
         ERR("parse error %s:%i. There is no target_group with the name '%s'",
-                   file_in, line - 1, name);
+            file_in, line - 1, name);
         exit(-1);
      }
 }
@@ -15889,7 +16052,7 @@ st_collections_group_programs_program_target_groups(void)
         source and signal parameters of a program run as an "after" are ignored.
         Multiple "after" statements can be specified per program.
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_after(void)
 {
@@ -15910,11 +16073,11 @@ st_collections_group_programs_program_after(void)
         [name] [description]
     @effect
         Specifies a hint to let applications (or IDE's) know how to bind
-	things. The parameter name should contain the name of the function that
-	the application should use, and description describes how it should
-	be used.
+        things. The parameter name should contain the name of the function that
+        the application should use, and description describes how it should
+        be used.
     @endproperty
-*/
+ */
 static void
 st_collections_group_programs_program_api(void)
 {
@@ -15926,8 +16089,8 @@ st_collections_group_programs_program_api(void)
 
    if (is_param(1))
      {
-       check_arg_count(2);
-       current_program->api.description = parse_str(1);
+        check_arg_count(2);
+        current_program->api.description = parse_str(1);
      }
 }
 
@@ -15978,14 +16141,14 @@ st_collections_group_programs_program_api(void)
         sequenced program.
         @since 1.10
     @endblock
-*/
+ */
 static void
 ob_collections_group_programs_program_sequence(void)
 {
    sequencing = current_program;
    sequencing_lookups = current_program_lookups;
    current_program_lookups = NULL;
-   ((Edje_Program_Parser*)sequencing)->can_override = EINA_FALSE;
+   ((Edje_Program_Parser *)sequencing)->can_override = EINA_FALSE;
 }
 
 static void
@@ -15996,8 +16159,8 @@ st_collections_group_parts_part_api(void)
    current_part->api.name = parse_str(0);
    if (is_param(1))
      {
-       check_arg_count(2);
-       current_part->api.description = parse_str(1);
+        check_arg_count(2);
+        current_part->api.description = parse_str(1);
      }
 }
 
@@ -16137,6 +16300,7 @@ st_collections_group_physics_world_gravity(void)
    pc->physics.world.gravity.y = parse_int(1);
    pc->physics.world.gravity.z = parse_int(2);
 }
+
 #endif
 
 /**
@@ -16164,6 +16328,7 @@ st_collections_group_physics_world_rate(void)
 
    pc->physics.world.rate = parse_float(0);
 }
+
 #endif
 
 /**
@@ -16190,6 +16355,7 @@ st_collections_group_physics_world_depth(void)
 
    pc->physics.world.depth = parse_int(0);
 }
+
 #endif
 
 /**
@@ -16217,13 +16383,13 @@ st_collections_group_physics_world_z(void)
 
    pc->physics.world.z = parse_int(0);
 }
+
 #endif
 
 /**
     @page edcref
     </table>
-*/
-
+ */
 
 void
 edje_cc_handlers_pop_notify(const char *token)
@@ -16231,7 +16397,7 @@ edje_cc_handlers_pop_notify(const char *token)
    if (sequencing && (!strcmp(token, "sequence")))
      {
         current_program = sequencing;
-        ((Edje_Program_Parser*)sequencing)->can_override = EINA_TRUE;
+        ((Edje_Program_Parser *)sequencing)->can_override = EINA_TRUE;
         eina_list_free(current_program_lookups);
         current_program_lookups = sequencing_lookups;
         sequencing_lookups = NULL;
@@ -16251,39 +16417,39 @@ edje_cc_handlers_pop_notify(const char *token)
 static void
 edje_cc_handlers_hierarchy_set(Edje_Part *src)
 {  /* This funcion makes current part rel_1.id, rel_2.id relative to src */
-   if (!src->name)
-     {
-        ERR("parse error %s:%i. You must set parent name before creating nested part",
-            file_in, line - 1);
-        exit(-1);
-     }
-   st_collections_group_parts_part_description_rel1_to_set(src->name);
-   st_collections_group_parts_part_description_rel2_to_set(src->name);
+  if (!src->name)
+    {
+       ERR("parse error %s:%i. You must set parent name before creating nested part",
+           file_in, line - 1);
+       exit(-1);
+    }
+  st_collections_group_parts_part_description_rel1_to_set(src->name);
+  st_collections_group_parts_part_description_rel2_to_set(src->name);
 }
 
 static Edje_Part *
 edje_cc_handlers_hierarchy_parent_get(void)
 {  /* Return the parent part pointer */
-   int idx = eina_array_count(part_hierarchy) - 2;
-   Edje_Cc_Handlers_Hierarchy_Info *info = (idx >= 0) ?
-      eina_array_data_get(part_hierarchy, idx) : NULL;
+  int idx = eina_array_count(part_hierarchy) - 2;
+  Edje_Cc_Handlers_Hierarchy_Info *info = (idx >= 0) ?
+    eina_array_data_get(part_hierarchy, idx) : NULL;
 
-   return (info) ? info->ep : NULL;
+  return (info) ? info->ep : NULL;
 }
 
 static void
 edje_cc_handlers_hierarchy_push(Edje_Part *ep, Edje_Part *cp)
 {  /* Remove part from hierarchy stack when finished parsing it */
-   Edje_Cc_Handlers_Hierarchy_Info *info = malloc(sizeof(*info));
-   info->current_de = current_de;
-   info->current_part = cp;  /* current_part restored on pop */
-   info->current_item = current_item;
-   info->current_desc = current_desc;
-   info->parent_desc = parent_desc;
-   info->current_program = current_program;
-   info->ep = ep;
+  Edje_Cc_Handlers_Hierarchy_Info *info = malloc(sizeof(*info));
+  info->current_de = current_de;
+  info->current_part = cp;   /* current_part restored on pop */
+  info->current_item = current_item;
+  info->current_desc = current_desc;
+  info->parent_desc = parent_desc;
+  info->current_program = current_program;
+  info->ep = ep;
 
-   eina_array_push(part_hierarchy, info);
+  eina_array_push(part_hierarchy, info);
 }
 
 static void
@@ -16294,10 +16460,10 @@ edje_cc_handlers_hierarchy_rename(Edje_Part *old, Edje_Part *new)
    unsigned int i;
 
    EINA_ARRAY_ITER_NEXT(part_hierarchy, i, item, iterator)
-     {
-        if (item->ep == old) item->ep = new;
-        if (item->current_part == old) item->current_part = new;
-     }
+   {
+      if (item->ep == old) item->ep = new;
+      if (item->current_part == old) item->current_part = new;
+   }
 }
 
 void
@@ -16316,44 +16482,44 @@ edje_cc_handlers_hierarchy_free(void)
 static void
 edje_cc_handlers_hierarchy_pop(void)
 {  /* Remove part from hierarchy stack when finished parsing it */
-   Edje_Cc_Handlers_Hierarchy_Info *info = eina_array_pop(part_hierarchy);
+  Edje_Cc_Handlers_Hierarchy_Info *info = eina_array_pop(part_hierarchy);
 
-   if (current_part)
-     {
-        unsigned int i;
+  if (current_part)
+    {
+       unsigned int i;
 
-        if (!current_part->name)
-          {
-             WRN("Parse error near %s:%i. Unnamed part exists in Group \"%s\".",
-                 file_in, line - 1, current_de->entry);
-          }
+       if (!current_part->name)
+         {
+            WRN("Parse error near %s:%i. Unnamed part exists in Group \"%s\".",
+                file_in, line - 1, current_de->entry);
+         }
 
-        for (i = 0; i < current_part->other.desc_count; i++)
-          {
-             if (!current_part->other.desc[i]->state.name)
-               {
-                  ERR("syntax error near %s:%i. Non-default or inherited parts are required to have state names for all descriptions (Group '%s', part '%s' has missing description state names)",
-                        file_in, line - 1, current_de->entry, current_part->name);
-                    exit(-1);
-               }
-          }
+       for (i = 0; i < current_part->other.desc_count; i++)
+         {
+            if (!current_part->other.desc[i]->state.name)
+              {
+                 ERR("syntax error near %s:%i. Non-default or inherited parts are required to have state names for all descriptions (Group '%s', part '%s' has missing description state names)",
+                     file_in, line - 1, current_de->entry, current_part->name);
+                 exit(-1);
+              }
+         }
 
-        /* auto-add default desc if it was omitted */
-        if (!current_part->default_desc)
-          ob_collections_group_parts_part_description();
-     }
+       /* auto-add default desc if it was omitted */
+       if (!current_part->default_desc)
+         ob_collections_group_parts_part_description();
+    }
 
-   if (info)
-     {
-        current_de = info->current_de;
-        current_part = info->current_part;
-        current_item = info->current_item;
-        current_desc = info->current_desc;
-        parent_desc = info->parent_desc;
-        current_program = info->current_program;
+  if (info)
+    {
+       current_de = info->current_de;
+       current_part = info->current_part;
+       current_item = info->current_item;
+       current_desc = info->current_desc;
+       parent_desc = info->parent_desc;
+       current_program = info->current_program;
 
-        free(info);
-     }
+       free(info);
+    }
 }
 
 Eina_Bool
@@ -16393,12 +16559,12 @@ edje_cc_handlers_wildcard(void)
                {
                   if ((!current_desc->state.name) || strcmp(current_desc->state.name, token))
                     {
-                       free((char*)current_desc->state.name);
+                       free((char *)current_desc->state.name);
                        current_desc->state.name = token;
                        _part_description_state_update(current_desc);
                     }
-                    stack_pop_quick(EINA_FALSE, current_desc->state.name != token);
-                    return EINA_TRUE;
+                  stack_pop_quick(EINA_FALSE, current_desc->state.name != token);
+                  return EINA_TRUE;
                }
 
              if (!isdigit(token[0])) return EINA_FALSE;
@@ -16459,9 +16625,9 @@ edje_cc_handlers_wildcard(void)
    if (edje_file->styles && (!strcmp(last, "style")))
      {
         if (!had_quote) return EINA_FALSE;
-         _style_name(token);
-         stack_pop_quick(EINA_FALSE, EINA_FALSE);
-         return EINA_TRUE;
+        _style_name(token);
+        stack_pop_quick(EINA_FALSE, EINA_FALSE);
+        return EINA_TRUE;
      }
    if (edje_file->color_classes && (!strcmp(last, "color_class")))
      {
@@ -16486,3 +16652,4 @@ edje_cc_handlers_wildcard(void)
      }
    return EINA_FALSE;
 }
+
diff --git a/src/bin/edje/edje_cc_mem.c b/src/bin/edje/edje_cc_mem.c
index e1fa23953a..9057e4588f 100644
--- a/src/bin/edje/edje_cc_mem.c
+++ b/src/bin/edje/edje_cc_mem.c
@@ -32,3 +32,4 @@ mem_strdup(const char *s)
    exit(-1);
    return NULL;
 }
+
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index 9b828b87e2..b13cf20abd 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -27,13 +27,12 @@
 #include <lauxlib.h>
 
 typedef struct _External_Lookup External_Lookup;
-typedef struct _Part_Lookup Part_Lookup;
+typedef struct _Part_Lookup     Part_Lookup;
 typedef struct _Part_Lookup_Key Part_Lookup_Key;
-typedef struct _Program_Lookup Program_Lookup;
-typedef struct _Group_Lookup Group_Lookup;
-typedef struct _Image_Lookup Image_Lookup;
-typedef struct _Code_Lookup Code_Lookup;
-
+typedef struct _Program_Lookup  Program_Lookup;
+typedef struct _Group_Lookup    Group_Lookup;
+typedef struct _Image_Lookup    Image_Lookup;
+typedef struct _Code_Lookup     Code_Lookup;
 
 struct _External_Lookup
 {
@@ -43,15 +42,17 @@ struct _External_Lookup
 struct _Part_Lookup_Key
 {
    Edje_Part_Collection *pc;
-   
-   union {
+
+   union
+   {
       int *dest;
-      struct {
+      struct
+      {
          unsigned char **base;
-         int offset;
+         int             offset;
       } reallocated;
    } mem;
-   char **dest2;
+   char    **dest2;
 
    Eina_Bool stable : 1;
 };
@@ -59,7 +60,7 @@ struct _Part_Lookup_Key
 struct _Part_Lookup
 {
    Part_Lookup_Key key;
-   char *name;
+   char           *name;
 };
 
 struct _Program_Lookup
@@ -68,39 +69,39 @@ struct _Program_Lookup
 
    union
    {
-      char *name;
+      char         *name;
       Edje_Program *ep;
    } u;
 
-   int *dest;
+   int                  *dest;
 
-   Eina_Bool anonymous : 1;
+   Eina_Bool             anonymous : 1;
 };
 
 struct _Group_Lookup
 {
-   char *name;
+   char      *name;
    Edje_Part *part;
 };
 
 struct _String_Lookup
 {
    char *name;
-   int *dest;
+   int  *dest;
 };
 
 struct _Image_Lookup
 {
-   char *name;
-   int *dest;
+   char      *name;
+   int       *dest;
    Eina_Bool *set;
 };
 
 struct _Code_Lookup
 {
-   char *ptr;
-   int   len;
-   int   val;
+   char     *ptr;
+   int       len;
+   int       val;
    Eina_Bool set;
 };
 
@@ -109,94 +110,94 @@ typedef struct _Script_Lua_Writer Script_Lua_Writer;
 struct _Script_Lua_Writer
 {
    char *buf;
-   int size;
+   int   size;
 };
 
-typedef struct _Script_Write Script_Write;
-typedef struct _Head_Write Head_Write;
-typedef struct _Fonts_Write Fonts_Write;
-typedef struct _Image_Write Image_Write;
-typedef struct _Sound_Write Sound_Write;
-typedef struct _Mo_Write Mo_Write;
+typedef struct _Script_Write    Script_Write;
+typedef struct _Head_Write      Head_Write;
+typedef struct _Fonts_Write     Fonts_Write;
+typedef struct _Image_Write     Image_Write;
+typedef struct _Sound_Write     Sound_Write;
+typedef struct _Mo_Write        Mo_Write;
 typedef struct _Vibration_Write Vibration_Write;
-typedef struct _Group_Write Group_Write;
-typedef struct _License_Write License_Write;
+typedef struct _Group_Write     Group_Write;
+typedef struct _License_Write   License_Write;
 
 struct _Script_Write
 {
-   Eet_File *ef;
-   Code *cd;
-   int i;
-   Ecore_Exe *exe;
-   int tmpn_fd, tmpo_fd;
+   Eet_File    *ef;
+   Code        *cd;
+   int          i;
+   Ecore_Exe   *exe;
+   int          tmpn_fd, tmpo_fd;
    Eina_Tmpstr *tmpn;
    Eina_Tmpstr *tmpo;
-   char *errstr;
+   char        *errstr;
 };
 
 struct _Head_Write
 {
    Eet_File *ef;
-   char *errstr;
+   char     *errstr;
 };
 
 struct _Fonts_Write
 {
-   Eet_File *ef;
+   Eet_File  *ef;
    Edje_Font *fn;
-   char *errstr;
+   char      *errstr;
 };
 
 struct _Image_Write
 {
-   Eet_File *ef;
+   Eet_File                   *ef;
    Edje_Image_Directory_Entry *img;
-   Evas_Object *im;
-   Emile_Image_Property prop;
-   Eina_File *f;
-   Emile_Image *emi;
-   int w, h;
-   int alpha;
-   unsigned int *data;
-   char *path;
-   char *errstr;
+   Evas_Object                *im;
+   Emile_Image_Property        prop;
+   Eina_File                  *f;
+   Emile_Image                *emi;
+   int                         w, h;
+   int                         alpha;
+   unsigned int               *data;
+   char                       *path;
+   char                       *errstr;
 };
 
 struct _Sound_Write
 {
-   Eet_File *ef;
+   Eet_File          *ef;
    Edje_Sound_Sample *sample;
-   int i;
+   int                i;
 };
 
 struct _Mo_Write
 {
-   Eet_File *ef;
-   Edje_Mo *mo_entry;
-   char *mo_path;
+   Eet_File  *ef;
+   Edje_Mo   *mo_entry;
+   char      *mo_path;
    Ecore_Exe *exe;
-   char *errstr;
+   char      *errstr;
 };
 
 struct _Vibration_Write
 {
-   Eet_File *ef;
+   Eet_File              *ef;
    Edje_Vibration_Sample *sample;
-   int i;
+   int                    i;
 };
 
 struct _Group_Write
 {
-   Eet_File *ef;
+   Eet_File             *ef;
    Edje_Part_Collection *pc;
-   char *errstr;
+   char                 *errstr;
 };
 
 struct _License_Write
 {
-   Eet_File *ef;
+   Eet_File   *ef;
    const char *file;
-   Eina_Bool master;
+   Eina_Bool   master;
 };
 
 struct _Image_Unused_Ids
@@ -210,7 +211,7 @@ typedef struct _Image_Unused_Ids Image_Unused_Ids;
 static int pending_threads = 0;
 static int pending_image_threads = 0;
 
-static void data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, char* ptr, int len));
+static void data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, char *ptr, int len));
 
 extern Eina_List *po_files;
 
@@ -304,23 +305,23 @@ _part_lookup_key_pc_hash(const void *key, int key_length EINA_UNUSED)
    if (a->stable)
      {
 #ifdef EFL64
-        return eina_hash_int64((unsigned long long int *) &a->pc, sizeof (void*)) ^
-          eina_hash_int64((unsigned long long int *) &a->mem.dest, sizeof (void*));
+        return eina_hash_int64((unsigned long long int *)&a->pc, sizeof (void *)) ^
+               eina_hash_int64((unsigned long long int *)&a->mem.dest, sizeof (void *));
 #else
-        return eina_hash_int32((uintptr_t *) &a->pc, sizeof (void*)) ^
-          eina_hash_int32((uintptr_t *) &a->mem.dest, sizeof (void*));
+        return eina_hash_int32((uintptr_t *)&a->pc, sizeof (void *)) ^
+               eina_hash_int32((uintptr_t *)&a->mem.dest, sizeof (void *));
 #endif
      }
    else
      {
 #ifdef EFL64
-        return eina_hash_int64((unsigned long long int *) &a->pc, sizeof (void*)) ^
-          eina_hash_int64((unsigned long long int *) &a->mem.reallocated.base, sizeof (void*)) ^
-          eina_hash_int32((unsigned int *) &a->mem.reallocated.offset, sizeof (int));
+        return eina_hash_int64((unsigned long long int *)&a->pc, sizeof (void *)) ^
+               eina_hash_int64((unsigned long long int *)&a->mem.reallocated.base, sizeof (void *)) ^
+               eina_hash_int32((unsigned int *)&a->mem.reallocated.offset, sizeof (int));
 #else
-        return eina_hash_int32((uintptr_t *) &a->pc, sizeof (void*)) ^
-          eina_hash_int32((uintptr_t *) &a->mem.reallocated.base, sizeof (void*)) ^
-          eina_hash_int32((unsigned int *) &a->mem.reallocated.offset, sizeof (int));
+        return eina_hash_int32((uintptr_t *)&a->pc, sizeof (void *)) ^
+               eina_hash_int32((uintptr_t *)&a->mem.reallocated.base, sizeof (void *)) ^
+               eina_hash_int32((unsigned int *)&a->mem.reallocated.offset, sizeof (int));
 #endif
      }
 }
@@ -348,19 +349,19 @@ _part_lookup_key_hash(const void *key, int key_length EINA_UNUSED)
    if (a->stable)
      {
 #ifdef EFL64
-        return eina_hash_int64((unsigned long long int *) &a->mem.dest, sizeof (void*));
+        return eina_hash_int64((unsigned long long int *)&a->mem.dest, sizeof (void *));
 #else
-        return eina_hash_int32((uintptr_t *) &a->mem.dest, sizeof (void*));
+        return eina_hash_int32((uintptr_t *)&a->mem.dest, sizeof (void *));
 #endif
      }
    else
      {
 #ifdef EFL64
-        return eina_hash_int64((unsigned long long int *) &a->mem.reallocated.base, sizeof (void*)) ^
-          eina_hash_int32((unsigned int *) &a->mem.reallocated.offset, sizeof (int));
+        return eina_hash_int64((unsigned long long int *)&a->mem.reallocated.base, sizeof (void *)) ^
+               eina_hash_int32((unsigned int *)&a->mem.reallocated.offset, sizeof (int));
 #else
-        return eina_hash_int32((uintptr_t *) &a->mem.reallocated.base, sizeof (void*)) ^
-          eina_hash_int32((unsigned int *) &a->mem.reallocated.offset, sizeof (int));
+        return eina_hash_int32((uintptr_t *)&a->mem.reallocated.base, sizeof (void *)) ^
+               eina_hash_int32((unsigned int *)&a->mem.reallocated.offset, sizeof (int));
 #endif
      }
 }
@@ -401,16 +402,16 @@ check_image_part_desc(Edje_Part_Collection *pc, Edje_Part *ep,
 
    if (epd->image.id == -1 && epd->common.visible)
      WRN("Collection %s(%i): image attributes missing for "
-	 "part \"%s\", description \"%s\" %f",
-	 pc->part, pc->id, ep->name, epd->common.state.name, epd->common.state.value);
+         "part \"%s\", description \"%s\" %f",
+         pc->part, pc->id, ep->name, epd->common.state.name, epd->common.state.value);
 
    for (i = 0; i < epd->image.tweens_count; ++i)
      {
-	if (epd->image.tweens[i]->id == -1)
-	  error_and_abort(ef, "Collection %i: tween image id missing for "
-			  "part \"%s\", description \"%s\" %f",
-			  pc->id, ep->name, epd->common.state.name, epd->common.state.value);
-    }
+        if (epd->image.tweens[i]->id == -1)
+          error_and_abort(ef, "Collection %i: tween image id missing for "
+                              "part \"%s\", description \"%s\" %f",
+                          pc->id, ep->name, epd->common.state.name, epd->common.state.value);
+     }
 }
 
 static Edje_Part_Collection *
@@ -476,7 +477,6 @@ check_text_part_desc(Edje_Part_Collection *pc, Edje_Part *ep,
 
    if (epd->text.id_text_source != -1)
      {
-
         if ((pc->parts[epd->text.id_text_source]->type == EDJE_PART_TYPE_TEXT) ||
             (pc->parts[epd->text.id_text_source]->type == EDJE_PART_TYPE_TEXTBLOCK))
           return;
@@ -491,7 +491,7 @@ check_text_part_desc(Edje_Part_Collection *pc, Edje_Part *ep,
 
         error_and_abort(ef, "Collection \"%s\" Part \"%s\" Description \"%s\" [%.3f]: "
                             "text.text_source point to a non TEXT part \"%s\"!",
-                        pc->part, ep->name,epd->common.state.name,
+                        pc->part, ep->name, epd->common.state.name,
                         epd->common.state.value, pc->parts[epd->text.id_text_source]->name);
      }
 }
@@ -526,9 +526,9 @@ check_source_links(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef, Eina_L
                          {
                             if (data == pc_source->parts[i]->source)
                               {
-                                 error_and_abort(ef,"Recursive loop group '%s' "
-                                                 "already included inside "
-                                                 "part '%s' of group '%s'",
+                                 error_and_abort(ef, "Recursive loop group '%s' "
+                                                     "already included inside "
+                                                     "part '%s' of group '%s'",
                                                  data, pc_source->parts[i]->name,
                                                  pc->part);
                               }
@@ -548,14 +548,14 @@ check_packed_items(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef)
 
    for (i = 0; i < ep->items_count; ++i)
      {
-	if (ep->items[i]->type == EDJE_PART_TYPE_GROUP && !ep->items[i]->source)
-	  error_and_abort(ef, "Collection %i: missing source on packed item "
-			  "of type GROUP in part \"%s\"",
-			  pc->id, ep->name);
-	if (ep->type == EDJE_PART_TYPE_TABLE && (ep->items[i]->col < 0 || ep->items[i]->row < 0))
-	  error_and_abort(ef, "Collection %i: missing col/row on packed item "
-			  "for part \"%s\" of type TABLE",
-			  pc->id, ep->name);
+        if (ep->items[i]->type == EDJE_PART_TYPE_GROUP && !ep->items[i]->source)
+          error_and_abort(ef, "Collection %i: missing source on packed item "
+                              "of type GROUP in part \"%s\"",
+                          pc->id, ep->name);
+        if (ep->type == EDJE_PART_TYPE_TABLE && (ep->items[i]->col < 0 || ep->items[i]->row < 0))
+          error_and_abort(ef, "Collection %i: missing col/row on packed item "
+                              "for part \"%s\" of type TABLE",
+                          pc->id, ep->name);
      }
 }
 
@@ -603,10 +603,10 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef)
 
    if (ep->type == EDJE_PART_TYPE_IMAGE)
      {
-        check_image_part_desc(pc, ep, (Edje_Part_Description_Image*) ep->default_desc, ef);
+        check_image_part_desc(pc, ep, (Edje_Part_Description_Image *)ep->default_desc, ef);
 
         for (i = 0; i < ep->other.desc_count; ++i)
-          check_image_part_desc(pc, ep, (Edje_Part_Description_Image*) ep->other.desc[i], ef);
+          check_image_part_desc(pc, ep, (Edje_Part_Description_Image *)ep->other.desc[i], ef);
      }
    else if ((ep->type == EDJE_PART_TYPE_BOX) ||
             (ep->type == EDJE_PART_TYPE_TABLE))
@@ -615,13 +615,12 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef)
      check_source_links(pc, ep, ef, group_path);
    else if (ep->type == EDJE_PART_TYPE_TEXT)
      {
-        check_text_part_desc(pc, ep, (Edje_Part_Description_Text*) ep->default_desc, ef);
+        check_text_part_desc(pc, ep, (Edje_Part_Description_Text *)ep->default_desc, ef);
 
         for (i = 0; i < ep->other.desc_count; ++i)
-          check_text_part_desc(pc, ep, (Edje_Part_Description_Text*) ep->other.desc[i], ef);
+          check_text_part_desc(pc, ep, (Edje_Part_Description_Text *)ep->other.desc[i], ef);
      }
 
-
    /* FIXME: When smart masks are supported, remove this check */
    if (ep->clip_to_id != -1 &&
        (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) &&
@@ -641,12 +640,13 @@ check_program(Edje_Part_Collection *pc, Edje_Program *ep, Eet_File *ef)
       case EDJE_ACTION_TYPE_DRAG_VAL_SET:
       case EDJE_ACTION_TYPE_DRAG_VAL_STEP:
       case EDJE_ACTION_TYPE_DRAG_VAL_PAGE:
-	 if (!ep->targets)
-	   error_and_abort(ef, "Collection %i: target missing in program "
-			   "\"%s\"", pc->id, ep->name);
-	 break;
+        if (!ep->targets)
+          error_and_abort(ef, "Collection %i: target missing in program "
+                              "\"%s\"", pc->id, ep->name);
+        break;
+
       default:
-	 break;
+        break;
      }
    Edje_Program_Target *et;
    Eina_List *l;
@@ -683,22 +683,22 @@ _alias_clean(Edje_Part_Collection_Directory_Entry *ce)
 {
    if (ce)
      {
-         ce->count.RECTANGLE = 0;
-         ce->count.TEXT = 0;
-         ce->count.IMAGE = 0;
-         ce->count.SWALLOW = 0;
-         ce->count.TEXTBLOCK = 0;
-         ce->count.GROUP = 0;
-         ce->count.BOX = 0;
-         ce->count.TABLE = 0;
-         ce->count.EXTERNAL = 0;
-         ce->count.PROXY = 0;
-         ce->count.MESH_NODE = 0;
-         ce->count.LIGHT = 0;
-         ce->count.CAMERA = 0;
-         ce->count.SPACER = 0;
-         ce->count.VECTOR = 0;
-         ce->count.part = 0;
+        ce->count.RECTANGLE = 0;
+        ce->count.TEXT = 0;
+        ce->count.IMAGE = 0;
+        ce->count.SWALLOW = 0;
+        ce->count.TEXTBLOCK = 0;
+        ce->count.GROUP = 0;
+        ce->count.BOX = 0;
+        ce->count.TABLE = 0;
+        ce->count.EXTERNAL = 0;
+        ce->count.PROXY = 0;
+        ce->count.MESH_NODE = 0;
+        ce->count.LIGHT = 0;
+        ce->count.CAMERA = 0;
+        ce->count.SPACER = 0;
+        ce->count.VECTOR = 0;
+        ce->count.part = 0;
      }
 }
 
@@ -711,15 +711,15 @@ data_thread_head(void *data, Ecore_Thread *thread EINA_UNUSED)
 
    if (edje_file)
      {
-	if (edje_file->collection)
-	  {
-	     Edje_Part_Collection_Directory_Entry *ce;
+        if (edje_file->collection)
+          {
+             Edje_Part_Collection_Directory_Entry *ce;
 
-	     EINA_LIST_FREE(aliases, ce)
-	       {
-		  Edje_Part_Collection_Directory_Entry *sce;
+             EINA_LIST_FREE(aliases, ce)
+               {
+                  Edje_Part_Collection_Directory_Entry *sce;
 
-		  if (!ce->entry)
+                  if (!ce->entry)
                     {
                        snprintf(buf, sizeof(buf),
                                 "Collection %i: name missing.", ce->id);
@@ -727,12 +727,12 @@ data_thread_head(void *data, Ecore_Thread *thread EINA_UNUSED)
                        return;
                     }
 
-		  sce = eina_hash_find(edje_collections_lookup, &ce->id);
-		  if (sce)
+                  sce = eina_hash_find(edje_collections_lookup, &ce->id);
+                  if (sce)
                     {
                        memcpy(&ce->count, &sce->count, sizeof (ce->count));
                     }
-		  else
+                  else
                     {
                        snprintf(buf, sizeof(buf),
                                 "Collection %s (%i) can't find an correct alias.",
@@ -742,12 +742,12 @@ data_thread_head(void *data, Ecore_Thread *thread EINA_UNUSED)
                     }
 
                   _alias_clean(ce);
-		  eina_hash_direct_add(edje_file->collection, ce->entry, ce);
-	       }
-	  }
-	bytes = eet_data_write(hw->ef, edd_edje_file, "edje/file", edje_file,
+                  eina_hash_direct_add(edje_file->collection, ce->entry, ce);
+               }
+          }
+        bytes = eet_data_write(hw->ef, edd_edje_file, "edje/file", edje_file,
                                compress_mode);
-	if (bytes <= 0)
+        if (bytes <= 0)
           {
              snprintf(buf, sizeof(buf),
                       "Unable to write \"edje_file\" entry to \"%s\"",
@@ -778,7 +778,7 @@ data_thread_head_end(void *data, Ecore_Thread *thread EINA_UNUSED)
 static void
 data_write_header(Eet_File *ef)
 {
-   Head_Write  *hw;
+   Head_Write *hw;
 
    hw = calloc(1, sizeof(Head_Write));
    hw->ef = ef;
@@ -807,7 +807,7 @@ data_thread_fonts(void *data, Ecore_Thread *thread EINA_UNUSED)
    f = eina_file_open(fc->fn->file, 0);
    if (f)
      {
-       using_file(fc->fn->file, 'F');
+        using_file(fc->fn->file, 'F');
         m = eina_file_map_all(f, EINA_FILE_SEQUENTIAL);
      }
    else
@@ -820,7 +820,7 @@ data_thread_fonts(void *data, Ecore_Thread *thread EINA_UNUSED)
              f = eina_file_open(buf, 0);
              if (f)
                {
-		 using_file(buf, 'F');
+                  using_file(buf, 'F');
                   m = eina_file_map_all(f, EINA_FILE_SEQUENTIAL);
                   if (m) break;
                   eina_file_close(f);
@@ -912,82 +912,82 @@ error_and_abort_image_load_error(Eet_File *ef, const char *file, int error)
 
    if (error == EVAS_LOAD_ERROR_DOES_NOT_EXIST)
      {
-	snprintf
-	  (hint, sizeof(hint),
-	   " Check if path to file \"%s\" is correct "
-	   "(both directory and file name).",
-	   file);
+        snprintf
+          (hint, sizeof(hint),
+          " Check if path to file \"%s\" is correct "
+          "(both directory and file name).",
+          file);
      }
    else if (error == EVAS_LOAD_ERROR_CORRUPT_FILE)
      {
-	snprintf
-	  (hint, sizeof(hint),
-	   " Check if file \"%s\" is consistent.",
-	   file);
+        snprintf
+          (hint, sizeof(hint),
+          " Check if file \"%s\" is consistent.",
+          file);
      }
    else if (error == EVAS_LOAD_ERROR_UNKNOWN_FORMAT)
      {
-	const char *ext = strrchr(file, '.');
-	const char **itr, *known_loaders[] = {
-	  /* list from evas_image_load.c */
-	  "png",
-	  "jpg",
-	  "jpeg",
-	  "jfif",
-	  "eet",
-	  "edj",
-	  "eap",
-	  "edb",
-	  "xpm",
-	  "tiff",
-	  "tif",
-	  "svg",
-	  "svgz",
-	  "gif",
-	  "pbm",
-	  "pgm",
-	  "ppm",
-	  "pnm",
-	  "bmp",
-	  "ico",
-	  "tga",
-	  "tgv",
-	  NULL
-	};
-
-	if (!ext)
-	  {
-	     snprintf
-	       (hint, sizeof(hint),
-		" File \"%s\" does not have an extension, "
-		"maybe it should?",
-		file);
-	     goto show_err;
-	  }
-
-	ext++;
-	for (itr = known_loaders; *itr; itr++)
-	  {
-	     if (strcasecmp(ext, *itr) == 0)
-	       {
-		  snprintf
-		    (hint, sizeof(hint),
-		     " Check if Evas was compiled with %s module enabled and "
-		     "all required dependencies exist.",
-		     ext);
-		  goto show_err;
-	       }
-	  }
-
-	snprintf(hint, sizeof(hint),
-		 " Check if Evas supports loading files of type \"%s\" (%s) "
-		 "and this module was compiled and all its dependencies exist.",
-		 ext, file);
-     }
- show_err:
+        const char *ext = strrchr(file, '.');
+        const char **itr, *known_loaders[] = {
+           /* list from evas_image_load.c */
+           "png",
+           "jpg",
+           "jpeg",
+           "jfif",
+           "eet",
+           "edj",
+           "eap",
+           "edb",
+           "xpm",
+           "tiff",
+           "tif",
+           "svg",
+           "svgz",
+           "gif",
+           "pbm",
+           "pgm",
+           "ppm",
+           "pnm",
+           "bmp",
+           "ico",
+           "tga",
+           "tgv",
+           NULL
+        };
+
+        if (!ext)
+          {
+             snprintf
+               (hint, sizeof(hint),
+               " File \"%s\" does not have an extension, "
+               "maybe it should?",
+               file);
+             goto show_err;
+          }
+
+        ext++;
+        for (itr = known_loaders; *itr; itr++)
+          {
+             if (strcasecmp(ext, *itr) == 0)
+               {
+                  snprintf
+                    (hint, sizeof(hint),
+                    " Check if Evas was compiled with %s module enabled and "
+                    "all required dependencies exist.",
+                    ext);
+                  goto show_err;
+               }
+          }
+
+        snprintf(hint, sizeof(hint),
+                 " Check if Evas supports loading files of type \"%s\" (%s) "
+                 "and this module was compiled and all its dependencies exist.",
+                 ext, file);
+     }
+show_err:
    error_and_abort
      (ef, "Unable to load image \"%s\" used by file \"%s\": %s.%s",
-      file, file_out, errmsg, hint);
+     file, file_out, errmsg, hint);
 }
 
 static void
@@ -1008,27 +1008,27 @@ data_thread_image(void *data, Ecore_Thread *thread EINA_UNUSED)
         qual = 80;
         if ((iw->img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_PERFECT) &&
             (iw->img->source_param == 0))
-          mode = 0; /* RAW */
+          mode = 0;  /* RAW */
         else if ((iw->img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_PERFECT) &&
                  (iw->img->source_param == 1))
-          mode = 1; /* COMPRESS */
+          mode = 1;  /* COMPRESS */
         else if (iw->img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1)
-          mode = 3; /* LOSSY_ETC1 */
+          mode = 3;  /* LOSSY_ETC1 */
         else if (iw->img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2)
-          mode = 4; /* LOSSY_ETC2 */
+          mode = 4;  /* LOSSY_ETC2 */
         else
-          mode = 2; /* LOSSY */
+          mode = 2;  /* LOSSY */
         if ((mode == 0) && (no_raw))
           {
              mode = 1; /* promote compression */
              iw->img->source_param = 95;
           }
-        if ((mode == 4) && (no_etc2)) mode = 2; /* demote etc2 to jpeg */
-        if ((mode == 3) && (no_etc1)) mode = 2; /* demote etc1 to jpeg */
-        if ((mode == 2) && (no_lossy)) mode = 1; /* demote compression */
+        if ((mode == 4) && (no_etc2)) mode = 2;  /* demote etc2 to jpeg */
+        if ((mode == 3) && (no_etc1)) mode = 2;  /* demote etc1 to jpeg */
+        if ((mode == 2) && (no_lossy)) mode = 1;  /* demote compression */
         if ((mode == 1) && (no_comp))
           {
-             if (no_lossy) mode = 0; /* demote compression */
+             if (no_lossy) mode = 0;  /* demote compression */
              else if (no_raw)
                {
                   iw->img->source_param = 90;
@@ -1044,7 +1044,7 @@ data_thread_image(void *data, Ecore_Thread *thread EINA_UNUSED)
           }
         if (iw->alpha)
           {
-             start = (unsigned int *) iw->data;
+             start = (unsigned int *)iw->data;
              end = start + (iw->w * iw->h);
              while (start < end)
                {
@@ -1121,7 +1121,7 @@ data_thread_image(void *data, Ecore_Thread *thread EINA_UNUSED)
                  bytes, (bytes + 512) / 1024, buf, iw->img->entry,
                  100 - (100 * (double)bytes) / ((double)(iw->w * iw->h * 4)),
                  100 - (100 * (double)bytes) / ((double)(st.st_size))
-                );
+                 );
           }
      }
 }
@@ -1231,7 +1231,7 @@ tgv_file_check_and_add(Eet_File *ef, Edje_Image_Directory_Entry *img)
    iw->ef = ef;
    iw->img = img;
    iw->emi = emi;
-   iw->data = (unsigned int *) data;
+   iw->data = (unsigned int *)data;
    iw->w = iw->prop.w;
    iw->h = iw->prop.h;
 
@@ -1495,7 +1495,6 @@ data_check_models(Eet_File *ef EINA_UNUSED, int *model_num EINA_UNUSED)
              snprintf(buf, sizeof(buf), "%s/%s", s, model->entry);
 
              file_exist = file_exist || ecore_file_exists(buf);
-
           }
         if (!file_exist)
           {
@@ -1656,35 +1655,34 @@ data_thread_mo(void *data, Ecore_Thread *thread EINA_UNUSED)
 
    if (!f)
      {
-         snprintf(buf, sizeof(buf), "Unable to load mo data of: %s", mo_path);
-         ERR("%s", buf);
-         mw->errstr = strdup(buf);
-         exit(-1);
+        snprintf(buf, sizeof(buf), "Unable to load mo data of: %s", mo_path);
+        ERR("%s", buf);
+        mw->errstr = strdup(buf);
+        exit(-1);
      }
 
    snprintf(moid_str, sizeof(moid_str), "edje/mo/%i/%s/LC_MESSAGES", mw->mo_entry->id, mw->mo_entry->locale);
    m = eina_file_map_all(f, EINA_FILE_WILLNEED);
    if (m)
      {
-         bytes = eet_write(mw->ef, moid_str, m, eina_file_size_get(f), EET_COMPRESSION_NONE);
-         if (eina_file_map_faulted(f, m))
-           {
-              snprintf(buf, sizeof(buf), "File access error when reading '%s'",
-              eina_file_filename_get(f));
-              ERR("%s", buf);
-              mw->errstr = strdup(buf);
-              eina_file_close(f);
-              exit(-1);
-           }
-         eina_file_map_free(f, m);
+        bytes = eet_write(mw->ef, moid_str, m, eina_file_size_get(f), EET_COMPRESSION_NONE);
+        if (eina_file_map_faulted(f, m))
+          {
+             snprintf(buf, sizeof(buf), "File access error when reading '%s'",
+                      eina_file_filename_get(f));
+             ERR("%s", buf);
+             mw->errstr = strdup(buf);
+             eina_file_close(f);
+             exit(-1);
+          }
+        eina_file_map_free(f, m);
      }
    eina_file_close(f);
    if (mw->mo_path)
      ecore_file_remove(mo_path);
 
    INF("Wrote %9i bytes (%4iKb) for \"%s\" %s mo entry \"%s\"",
-	   bytes, (bytes + 512) / 1024, moid_str, "RAW PCM", mw->mo_entry->locale);
-
+       bytes, (bytes + 512) / 1024, moid_str, "RAW PCM", mw->mo_entry->locale);
 }
 
 static void
@@ -1693,8 +1691,8 @@ data_thread_mo_end(void *data, Ecore_Thread *thread EINA_UNUSED)
    Mo_Write *mw = data;
    if (mw->errstr)
      {
-       error_and_abort(mw->ef, mw->errstr);
-       free(mw->errstr);
+        error_and_abort(mw->ef, mw->errstr);
+        free(mw->errstr);
      }
    if (mw->mo_path)
      free(mw->mo_path);
@@ -1886,6 +1884,7 @@ data_write_vibrations(Eet_File *ef, int *num)
           }
      }
 }
+
 static void
 check_groups(Eet_File *ef)
 {
@@ -1895,20 +1894,20 @@ check_groups(Eet_File *ef)
    /* sanity checks for parts and programs */
    EINA_LIST_FOREACH(edje_collections, l, pc)
      {
-	unsigned int i;
+        unsigned int i;
 
-	for (i = 0; i < pc->parts_count; ++i)
-	  check_part(pc, pc->parts[i], ef);
+        for (i = 0; i < pc->parts_count; ++i)
+          check_part(pc, pc->parts[i], ef);
 
-#define CHECK_PROGRAM(Type, Pc, It)				\
-	for (It = 0; It < Pc->programs.Type ## _count; ++It)	\
-	  check_program(Pc, Pc->programs.Type[i], ef);		\
+#define CHECK_PROGRAM(Type, Pc, It)                    \
+  for (It = 0; It < Pc->programs.Type ## _count; ++It) \
+    check_program(Pc, Pc->programs.Type[i], ef);       \
 
-	CHECK_PROGRAM(fnmatch, pc, i);
-	CHECK_PROGRAM(strcmp, pc, i);
-	CHECK_PROGRAM(strncmp, pc, i);
-	CHECK_PROGRAM(strrncmp, pc, i);
-	CHECK_PROGRAM(nocmp, pc, i);
+        CHECK_PROGRAM(fnmatch, pc, i);
+        CHECK_PROGRAM(strcmp, pc, i);
+        CHECK_PROGRAM(strncmp, pc, i);
+        CHECK_PROGRAM(strrncmp, pc, i);
+        CHECK_PROGRAM(nocmp, pc, i);
      }
 }
 
@@ -1973,7 +1972,7 @@ create_script_file(Eet_File *ef, const char *filename, const Code *cd, int fd)
    FILE *f = fdopen(fd, "wb");
    if (!f)
      error_and_abort(ef, "Unable to open temp file \"%s\" for script "
-		     "compilation.", filename);
+                         "compilation.", filename);
 
    Eina_List *ll;
    Code_Program *cp;
@@ -1983,63 +1982,65 @@ create_script_file(Eet_File *ef, const char *filename, const Code *cd, int fd)
 
    if (cd->shared)
      {
-	while (ln < (cd->l1 - 1))
-	  {
-	     fprintf(f, " \n");
-	     ln++;
-	  }
-	{
-	   char *sp;
-	   int hash = 0;
-	   int newlined = 0;
-
-	   for (sp = cd->shared; *sp; sp++)
-	     {
-		if ((sp[0] == '#') && (newlined))
-		  {
-		     hash = 1;
-		  }
-		newlined = 0;
-		if (sp[0] == '\n') newlined = 1;
-		if (!hash) fputc(sp[0], f);
-		else if (sp[0] == '\n') hash = 0;
-	     }
-	   fputc('\n', f);
-	}
-	ln += cd->l2 - cd->l1 + 1;
+        while (ln < (cd->l1 - 1))
+          {
+             fprintf(f, " \n");
+             ln++;
+          }
+        {
+           char *sp;
+           int hash = 0;
+           int newlined = 0;
+
+           for (sp = cd->shared; *sp; sp++)
+             {
+                if ((sp[0] == '#') && (newlined))
+                  {
+                     hash = 1;
+                  }
+                newlined = 0;
+                if (sp[0] == '\n') newlined = 1;
+                if (!hash) fputc(sp[0], f);
+                else if (sp[0] == '\n')
+                  hash = 0;
+             }
+           fputc('\n', f);
+        }
+        ln += cd->l2 - cd->l1 + 1;
      }
    EINA_LIST_FOREACH(cd->programs, ll, cp)
      {
-	if (cp->script)
-	  {
-	     while (ln < (cp->l1 - 1))
-	       {
-		  fprintf(f, " \n");
-		  ln++;
-	       }
-	     /* FIXME: this prototype needs to be */
-	     /* formalised and set in stone */
-	     fprintf(f, "public _p%i(sig[], src[]) {", cp->id);
-	     {
-		char *sp;
-		int hash = 0;
-		int newlined = 0;
-
-		for (sp = cp->script; *sp; sp++)
-		  {
-		     if ((sp[0] == '#') && (newlined))
-		       {
-			  hash = 1;
-		       }
-		     newlined = 0;
-		     if (sp[0] == '\n') newlined = 1;
-		     if (!hash) fputc(sp[0], f);
-		     else if (sp[0] == '\n') hash = 0;
-		  }
-	     }
-	     fprintf(f, "}\n");
-	     ln += cp->l2 - cp->l1 + 1;
-	  }
+        if (cp->script)
+          {
+             while (ln < (cp->l1 - 1))
+               {
+                  fprintf(f, " \n");
+                  ln++;
+               }
+             /* FIXME: this prototype needs to be */
+             /* formalised and set in stone */
+             fprintf(f, "public _p%i(sig[], src[]) {", cp->id);
+             {
+                char *sp;
+                int hash = 0;
+                int newlined = 0;
+
+                for (sp = cp->script; *sp; sp++)
+                  {
+                     if ((sp[0] == '#') && (newlined))
+                       {
+                          hash = 1;
+                       }
+                     newlined = 0;
+                     if (sp[0] == '\n') newlined = 1;
+                     if (!hash) fputc(sp[0], f);
+                     else if (sp[0] == '\n')
+                       hash = 0;
+                  }
+             }
+             fprintf(f, "}\n");
+             ln += cp->l2 - cp->l1 + 1;
+          }
      }
 
    fclose(f);
@@ -2069,11 +2070,11 @@ data_thread_script(void *data, Ecore_Thread *thread EINA_UNUSED)
 
    if (size > 0)
      {
-	void *dat = malloc(size);
+        void *dat = malloc(size);
 
-	if (dat)
-	  {
-	     if (fread(dat, size, 1, f) != 1)
+        if (dat)
+          {
+             if (fread(dat, size, 1, f) != 1)
                {
                   snprintf(buf, sizeof(buf),
                            "Unable to read all of script object \"%s\"",
@@ -2083,11 +2084,11 @@ data_thread_script(void *data, Ecore_Thread *thread EINA_UNUSED)
                   fclose(f);
                   return;
                }
-	     snprintf(buf, sizeof(buf), "edje/scripts/embryo/compiled/%i",
+             snprintf(buf, sizeof(buf), "edje/scripts/embryo/compiled/%i",
                       sc->i);
-	     eet_write(sc->ef, buf, dat, size, compress_mode);
-	     free(dat);
-	  }
+             eet_write(sc->ef, buf, dat, size, compress_mode);
+             free(dat);
+          }
         else
           {
              snprintf(buf, sizeof(buf),
@@ -2134,7 +2135,7 @@ data_thread_script(void *data, Ecore_Thread *thread EINA_UNUSED)
 
 typedef struct
 {
-   char *exe;
+   char         *exe;
    Script_Write *sc;
 } Pending_Script_Write;
 
@@ -2174,7 +2175,7 @@ data_scripts_exe_del_cb(void *data EINA_UNUSED, int evtype EINA_UNUSED, void *ev
              Pending_Script_Write *pend = pending_script_writes->data;
 
              pending_script_writes = eina_list_remove_list
-               (pending_script_writes, pending_script_writes);
+                 (pending_script_writes, pending_script_writes);
              data_write_script_queue(pend->sc, pend->exe);
              free(pend->exe);
              free(pend);
@@ -2247,39 +2248,39 @@ data_write_scripts(Eet_File *ef)
 # define BIN_EXT
 #endif
 #ifdef NEED_RUN_IN_TREE
-     if (getenv("EFL_RUN_IN_TREE"))
-       {
-          snprintf(embryo_cc_path, sizeof(embryo_cc_path),
-                   "%s/src/bin/embryo/embryo_cc" BIN_EXT,
-                   PACKAGE_BUILD_DIR);
-          snprintf(inc_path, sizeof(inc_path),
-                   "%s/data/edje/include", PACKAGE_SRC_DIR);
-          if (!ecore_file_exists(embryo_cc_path))
-            embryo_cc_path[0] = '\0';
-       }
+   if (getenv("EFL_RUN_IN_TREE"))
+     {
+        snprintf(embryo_cc_path, sizeof(embryo_cc_path),
+                 "%s/src/bin/embryo/embryo_cc" BIN_EXT,
+                 PACKAGE_BUILD_DIR);
+        snprintf(inc_path, sizeof(inc_path),
+                 "%s/data/edje/include", PACKAGE_SRC_DIR);
+        if (!ecore_file_exists(embryo_cc_path))
+          embryo_cc_path[0] = '\0';
+     }
 #endif
 
-     if (embryo_cc_path[0] == '\0')
-       {
-          snprintf(embryo_cc_path, sizeof(embryo_cc_path),
-                   "%s/embryo_cc" BIN_EXT,
-                   eina_prefix_bin_get(pfx));
-          snprintf(inc_path, sizeof(inc_path),
-                   "%s/include",
-                   eina_prefix_data_get(pfx));
-       }
+   if (embryo_cc_path[0] == '\0')
+     {
+        snprintf(embryo_cc_path, sizeof(embryo_cc_path),
+                 "%s/embryo_cc" BIN_EXT,
+                 eina_prefix_bin_get(pfx));
+        snprintf(inc_path, sizeof(inc_path),
+                 "%s/include",
+                 eina_prefix_data_get(pfx));
+     }
 #undef BIN_EXT
 
    for (i = 0, l = codes; l; l = eina_list_next(l), i++)
      {
-	Code *cd = eina_list_data_get(l);
+        Code *cd = eina_list_data_get(l);
         Script_Write *sc;
         char buf[EINA_PATH_MAX];
 
-	if (cd->is_lua)
-	  continue;
-	if ((!cd->shared) && (!cd->programs))
-	  continue;
+        if (cd->is_lua)
+          continue;
+        if ((!cd->shared) && (!cd->programs))
+          continue;
         sc = calloc(1, sizeof(Script_Write));
         sc->ef = ef;
         sc->cd = cd;
@@ -2287,14 +2288,14 @@ data_write_scripts(Eet_File *ef)
         sc->tmpn_fd = eina_file_mkstemp("edje_cc.sma-tmp-XXXXXX", &sc->tmpn);
         if (sc->tmpn_fd < 0)
           error_and_abort(ef, "Unable to open temp file \"%s\" for script "
-                          "compilation.", sc->tmpn);
+                              "compilation.", sc->tmpn);
         sc->tmpo_fd = eina_file_mkstemp("edje_cc.amx-tmp-XXXXXX", &sc->tmpo);
         if (sc->tmpo_fd < 0)
           {
              unlink(sc->tmpn);
              eina_tmpstr_del(sc->tmpn);
              error_and_abort(ef, "Unable to open temp file \"%s\" for script "
-                             "compilation.", sc->tmpo);
+                                 "compilation.", sc->tmpo);
           }
         create_script_file(ef, sc->tmpn, cd, sc->tmpn_fd);
         snprintf(buf, sizeof(buf),
@@ -2311,7 +2312,6 @@ _edje_lua_script_writer(lua_State *L EINA_UNUSED, const void *chunk_buf, size_t
    Script_Lua_Writer *data;
    void *old;
 
-
    data = (Script_Lua_Writer *)_data;
    old = data->buf;
    data->buf = realloc(data->buf, data->size + chunk_size);
@@ -2320,7 +2320,7 @@ _edje_lua_script_writer(lua_State *L EINA_UNUSED, const void *chunk_buf, size_t
         memcpy(&((data->buf)[data->size]), chunk_buf, chunk_size);
         data->size += chunk_size;
      }
-    else
+   else
      {
         ERR("Failed to copy chunk buffer.\n");
         data->buf = old;
@@ -2328,6 +2328,7 @@ _edje_lua_script_writer(lua_State *L EINA_UNUSED, const void *chunk_buf, size_t
 
    return 0;
 }
+
 #endif
 
 void
@@ -2339,20 +2340,24 @@ _edje_lua_error_and_abort(lua_State *L, int err_code, Script_Write *sc)
    switch (err_code)
      {
       case LUA_ERRRUN:
-	err_type = "runtime";
-	break;
+        err_type = "runtime";
+        break;
+
       case LUA_ERRSYNTAX:
-	err_type = "syntax";
-	break;
+        err_type = "syntax";
+        break;
+
       case LUA_ERRMEM:
-	err_type = "memory allocation";
-	break;
+        err_type = "memory allocation";
+        break;
+
       case LUA_ERRERR:
-	err_type = "error handler";
-	break;
+        err_type = "error handler";
+        break;
+
       default:
-	err_type = "unknown";
-	break;
+        err_type = "unknown";
+        break;
      }
    snprintf(buf, sizeof(buf),
             "Lua %s error: %s", err_type, lua_tostring(L, -1));
@@ -2418,7 +2423,7 @@ data_thread_lua_script(void *data, Ecore_Thread *thread EINA_UNUSED)
      }
    luaL_pushresult(&b);
 #ifdef LUA_BINARY
-   if (err_code = luaL_loadstring(L, lua_tostring (L, -1)))
+   if (err_code = luaL_loadstring(L, lua_tostring(L, -1)))
      {
         _edje_lua_error_and_abort(L, err_code, sc);
         return;
@@ -2435,10 +2440,10 @@ data_thread_lua_script(void *data, Ecore_Thread *thread EINA_UNUSED)
     */
 
    /*
-    if (luaL_loadbuffer(L, globbuf, globbufsize, "edje_lua_script"))
-    printf("lua load error: %s\n", lua_tostring (L, -1));
-    if (lua_pcall(L, 0, 0, 0))
-    printf("lua call error: %s\n", lua_tostring (L, -1));
+      if (luaL_loadbuffer(L, globbuf, globbufsize, "edje_lua_script"))
+      printf("lua load error: %s\n", lua_tostring (L, -1));
+      if (lua_pcall(L, 0, 0, 0))
+      printf("lua call error: %s\n", lua_tostring (L, -1));
     */
 
    snprintf(buf, sizeof(buf), "edje/scripts/lua/%i", sc->i);
@@ -2523,7 +2528,7 @@ data_thread_license(void *data, Ecore_Thread *thread EINA_UNUSED)
    int bytes;
 
    f = eina_file_open(lw->file, 0);
-   if (!f) return ;
+   if (!f) return;
 
    m = eina_file_map_all(f, EINA_FILE_WILLNEED);
    if (!m) goto on_error;
@@ -2558,7 +2563,7 @@ data_thread_license(void *data, Ecore_Thread *thread EINA_UNUSED)
 
    eina_file_map_free(f, m);
 
- on_error:
+on_error:
    eina_file_close(f);
 }
 
@@ -2576,10 +2581,10 @@ data_write_license(Eet_File *ef)
    Eina_List *l;
    const char *file;
 
-   if (!license) return ;
+   if (!license) return;
 
    lw = calloc(1, sizeof (License_Write));
-   if (!lw) return ;
+   if (!lw) return;
 
    lw->ef = ef;
    lw->file = license;
@@ -2597,7 +2602,7 @@ data_write_license(Eet_File *ef)
    EINA_LIST_FOREACH(licenses, l, file)
      {
         lw = calloc(1, sizeof (License_Write));
-        if (!lw) return ;
+        if (!lw) return;
 
         lw->ef = ef;
         lw->file = file;
@@ -2623,7 +2628,7 @@ data_thread_authors(void *data, Ecore_Thread *thread EINA_UNUSED)
    int bytes;
 
    f = eina_file_open(authors, 0);
-   if (!f) return ;
+   if (!f) return;
 
    m = eina_file_map_all(f, EINA_FILE_WILLNEED);
    if (!m) goto on_error;
@@ -2645,7 +2650,7 @@ data_thread_authors(void *data, Ecore_Thread *thread EINA_UNUSED)
 
    eina_file_map_free(f, m);
 
- on_error:
+on_error:
    eina_file_close(f);
 }
 
@@ -2684,15 +2689,15 @@ data_write(void)
 
    if (!edje_file)
      {
-	ERR("No data to put in \"%s\"", file_out);
-	exit(-1);
+        ERR("No data to put in \"%s\"", file_out);
+        exit(-1);
      }
 
    cur_ef = ef = eet_open(file_out, EET_FILE_MODE_WRITE);
    if (!ef)
      {
-	ERR("Unable to open \"%s\" for writing output", file_out);
-	exit(-1);
+        ERR("Unable to open \"%s\" for writing output", file_out);
+        exit(-1);
      }
 
    if ((edje_file->efl_version.major <= 1) && (edje_file->efl_version.minor <= 18)
@@ -2819,9 +2824,9 @@ reorder_parts(void)
    EINA_LIST_FOREACH(edje_collections, l, pc)
      {
         unsigned int i, j, k;
-	Eina_Bool found = EINA_FALSE;
+        Eina_Bool found = EINA_FALSE;
 
-	for (i = 0; i < pc->parts_count; i++)
+        for (i = 0; i < pc->parts_count; i++)
           {
              ep = (Edje_Part_Parser *)pc->parts[i];
              if (ep->reorder.insert_before && ep->reorder.insert_after)
@@ -2884,7 +2889,7 @@ reorder_parts(void)
                     }
                   if (found)
                     {
-		       unsigned int amount, linked;
+                       unsigned int amount, linked;
 
                        if (((i > k) && ((i - ep->reorder.linked_prev) <= k))
                            || ((i < k) && ((i + ep->reorder.linked_next) >= k)))
@@ -2893,19 +2898,19 @@ reorder_parts(void)
                        amount = ep->reorder.linked_prev + ep->reorder.linked_next + 1;
                        linked = i - ep->reorder.linked_prev;
                        parts = malloc(amount * sizeof(Edje_Part *));
-                       for (j = 0 ; j < amount ; j++)
+                       for (j = 0; j < amount; j++)
                          {
                             parts[j] = pc->parts[linked];
                             linked++;
                          }
                        if (i > k)
                          {
-                            for (j = i - ep->reorder.linked_prev ; j > k; j--)
+                            for (j = i - ep->reorder.linked_prev; j > k; j--)
                               {
                                  pc->parts[j + amount - 1] = pc->parts[j - 1];
                                  pc->parts[j + amount - 1]->id = j + amount - 1;
                               }
-                            for (j = 0 ; j < amount ; j++)
+                            for (j = 0; j < amount; j++)
                               {
                                  pc->parts[j + k] = parts[j];
                                  pc->parts[j + k]->id = j + k;
@@ -2913,12 +2918,12 @@ reorder_parts(void)
                          }
                        else if (i < k)
                          {
-                            for (j = i + ep->reorder.linked_next + 1 ; j <= k ; j++)
+                            for (j = i + ep->reorder.linked_next + 1; j <= k; j++)
                               {
                                  pc->parts[j - amount] = pc->parts[j];
                                  pc->parts[j - amount]->id = j - amount;
                               }
-                            for (j = 0 ; j < amount ; j++)
+                            for (j = 0; j < amount; j++)
                               {
                                  pc->parts[j + k - amount + 1] = parts[j];
                                  pc->parts[j + k - amount + 1]->id = j + k - amount + 1;
@@ -3018,7 +3023,7 @@ data_queue_part_nest_lookup(Edje_Part_Collection *pc, const char *name, int *des
 
 void
 data_queue_part_reallocated_lookup(Edje_Part_Collection *pc, const char *name,
-				   unsigned char **base, int offset)
+                                   unsigned char **base, int offset)
 {
    Part_Lookup_Key key;
    Part_Lookup *pl = NULL;
@@ -3080,7 +3085,6 @@ part_lookup_del(Edje_Part_Collection *pc, int *dest)
    eina_hash_del(part_pc_dest_lookup, &key, pl);
 }
 
-
 void
 part_lookup_delete(Edje_Part_Collection *pc, const char *name, int *dest, char **dest2)
 {
@@ -3135,7 +3139,7 @@ data_queue_anonymous_lookup(Edje_Part_Collection *pc, Edje_Program *ep, int *des
    Eina_List *l, *l1, *l2, *l3;
    Program_Lookup *pl;
 
-   if (!ep) return; /* FIXME: should we stop compiling ? */
+   if (!ep) return;  /* FIXME: should we stop compiling ? */
 
    EINA_LIST_FOREACH_SAFE(program_lookups, l, l1, pl)
      {
@@ -3215,31 +3219,31 @@ data_queue_copied_anonymous_lookup(Edje_Part_Collection *pc, int *src, int *dest
      {
         if (pl->dest == src && pl->u.ep->name)
           {
-             for (i = 0 ; i < pc->programs.fnmatch_count ; i++)
+             for (i = 0; i < pc->programs.fnmatch_count; i++)
                {
                   if (pc->programs.fnmatch[i]->name &&
                       !strcmp(pl->u.ep->name, pc->programs.fnmatch[i]->name))
                     data_queue_anonymous_lookup(pc, pc->programs.fnmatch[i], dest);
                }
-             for (i = 0 ; i < pc->programs.strcmp_count ; i++)
+             for (i = 0; i < pc->programs.strcmp_count; i++)
                {
                   if (pc->programs.strcmp[i]->name &&
                       !strcmp(pl->u.ep->name, pc->programs.strcmp[i]->name))
                     data_queue_anonymous_lookup(pc, pc->programs.strcmp[i], dest);
                }
-             for (i = 0 ; i < pc->programs.strncmp_count ; i++)
+             for (i = 0; i < pc->programs.strncmp_count; i++)
                {
                   if (pc->programs.strncmp[i]->name &&
                       !strcmp(pl->u.ep->name, pc->programs.strncmp[i]->name))
                     data_queue_anonymous_lookup(pc, pc->programs.strncmp[i], dest);
                }
-             for (i = 0 ; i < pc->programs.strrncmp_count ; i++)
+             for (i = 0; i < pc->programs.strrncmp_count; i++)
                {
                   if (pc->programs.strrncmp[i]->name &&
                       !strcmp(pl->u.ep->name, pc->programs.strrncmp[i]->name))
                     data_queue_anonymous_lookup(pc, pc->programs.strrncmp[i], dest);
                }
-             for (i = 0 ; i < pc->programs.nocmp_count ; i++)
+             for (i = 0; i < pc->programs.nocmp_count; i++)
                {
                   if (pc->programs.nocmp[i]->name &&
                       !strcmp(pl->u.ep->name, pc->programs.nocmp[i]->name))
@@ -3257,7 +3261,7 @@ data_queue_program_lookup(Edje_Part_Collection *pc, const char *name, int *dest)
 
    if (pcp->inherit_only && (!current_group_inherit)) return NULL;
 
-   if (!name) return NULL; /* FIXME: should we stop compiling ? */
+   if (!name) return NULL;  /* FIXME: should we stop compiling ? */
 
    pl = mem_alloc(SZ(Program_Lookup));
    program_lookups = eina_list_append(program_lookups, pl);
@@ -3337,7 +3341,7 @@ data_queue_image_remove(int *dest, Eina_Bool *set)
              return;
           }
      }
- }
+}
 
 void
 data_queue_model_lookup(char *name, int *dest, Eina_Bool *set)
@@ -3405,8 +3409,8 @@ data_process_part_set(Part_Lookup *target, int value)
      }
    else
      {
-        *((int*)(*target->key.mem.reallocated.base +
-                 target->key.mem.reallocated.offset)) = value;
+        *((int *)(*target->key.mem.reallocated.base +
+                  target->key.mem.reallocated.offset)) = value;
      }
    return EINA_FALSE;
 }
@@ -3548,40 +3552,40 @@ _data_image_id_update(Eina_List *images_unused_list)
    unsigned int i, j, desc_it;
    Eina_List *l, *l2, *l3;
 
-#define PART_DESC_IMAGE_ID_UPDATE \
-   EINA_LIST_FOREACH(images_unused_list, l3, iui) \
-     { \
-        if ((iui) && (part_desc_image->image.id == iui->old_id)) \
-          { \
-             part_desc_image->image.id = iui->new_id; \
-             break; \
-          } \
-     } \
-   for (desc_it = 0; desc_it < part_desc_image->image.tweens_count; desc_it++) \
-     { \
-        tween_id = part_desc_image->image.tweens[desc_it]; \
-        EINA_LIST_FOREACH(images_unused_list, l3, iui) \
-          { \
-             if ((iui) && (tween_id->id == iui->old_id)) \
-               { \
-                  tween_id->id = iui->new_id; \
-                  break; \
-               } \
-          } \
-     }
-
-#define PART_DESC_PROXY_ID_UPDATE \
-   EINA_LIST_FOREACH(images_unused_list, l3, iui) \
-     { \
-        if ((iui) && (part_desc_mesh_node->mesh_node.texture.id == iui->old_id)) \
-          { \
-             part_desc_mesh_node->mesh_node.texture.id = iui->new_id; \
-             break; \
-          } \
-     }
+#define PART_DESC_IMAGE_ID_UPDATE                                             \
+  EINA_LIST_FOREACH(images_unused_list, l3, iui)                             \
+    {                                                                         \
+       if ((iui) && (part_desc_image->image.id == iui->old_id))               \
+         {                                                                    \
+            part_desc_image->image.id = iui->new_id;                          \
+            break;                                                            \
+         }                                                                    \
+    }                                                                         \
+  for (desc_it = 0; desc_it < part_desc_image->image.tweens_count; desc_it++) \
+    {                                                                         \
+       tween_id = part_desc_image->image.tweens[desc_it];                     \
+       EINA_LIST_FOREACH(images_unused_list, l3, iui)                        \
+         {                                                                    \
+            if ((iui) && (tween_id->id == iui->old_id))                       \
+              {                                                               \
+                 tween_id->id = iui->new_id;                                  \
+                 break;                                                       \
+              }                                                               \
+         }                                                                    \
+    }
+
+#define PART_DESC_PROXY_ID_UPDATE                                               \
+  EINA_LIST_FOREACH(images_unused_list, l3, iui)                               \
+    {                                                                           \
+       if ((iui) && (part_desc_mesh_node->mesh_node.texture.id == iui->old_id)) \
+         {                                                                      \
+            part_desc_mesh_node->mesh_node.texture.id = iui->new_id;            \
+            break;                                                              \
+         }                                                                      \
+    }
    EINA_LIST_FOREACH_SAFE(edje_collections, l, l2, pc)
      {
-        for(i = 0; i < pc->parts_count; i++)
+        for (i = 0; i < pc->parts_count; i++)
           {
              part = pc->parts[i];
              if (part->type == EDJE_PART_TYPE_IMAGE)
@@ -3590,10 +3594,10 @@ _data_image_id_update(Eina_List *images_unused_list)
                   if (!part_desc_image) continue;
                   PART_DESC_IMAGE_ID_UPDATE
                   for (j = 0; j < part->other.desc_count; j++)
-                     {
-                        part_desc_image = (Edje_Part_Description_Image *)part->other.desc[j];
-                        PART_DESC_IMAGE_ID_UPDATE
-                     }
+                    {
+                       part_desc_image = (Edje_Part_Description_Image *)part->other.desc[j];
+                       PART_DESC_IMAGE_ID_UPDATE
+                    }
                }
              else if (part->type == EDJE_PART_TYPE_MESH_NODE)
                {
@@ -3601,10 +3605,10 @@ _data_image_id_update(Eina_List *images_unused_list)
                   if (!part_desc_mesh_node) continue;
                   PART_DESC_PROXY_ID_UPDATE
                   for (j = 0; j < part->other.desc_count; j++)
-                     {
-                        part_desc_mesh_node = (Edje_Part_Description_Mesh_Node *)part->other.desc[j];
-                        PART_DESC_PROXY_ID_UPDATE
-                     }
+                    {
+                       part_desc_mesh_node = (Edje_Part_Description_Mesh_Node *)part->other.desc[j];
+                       PART_DESC_PROXY_ID_UPDATE
+                    }
                }
           }
      }
@@ -3624,7 +3628,6 @@ _data_image_id_update(Eina_List *images_unused_list)
                        break;
                     }
                }
-
           }
      }
 }
@@ -3639,19 +3642,19 @@ _data_model_id_update(Eina_List *models_unused_list)
    unsigned int i, j;
    Eina_List *l, *l2, *l3;
 
-#define PART_DESC_MODEL_ID_UPDATE \
-   EINA_LIST_FOREACH(models_unused_list, l3, iui) \
-     { \
-        if ((iui) && (part_desc_mesh_node->mesh_node.mesh.id == iui->old_id)) \
-          { \
-             part_desc_mesh_node->mesh_node.mesh.id = iui->new_id; \
-             break; \
-          } \
-     } \
+#define PART_DESC_MODEL_ID_UPDATE                                            \
+  EINA_LIST_FOREACH(models_unused_list, l3, iui)                            \
+    {                                                                        \
+       if ((iui) && (part_desc_mesh_node->mesh_node.mesh.id == iui->old_id)) \
+         {                                                                   \
+            part_desc_mesh_node->mesh_node.mesh.id = iui->new_id;            \
+            break;                                                           \
+         }                                                                   \
+    }                                                                        \
 
    EINA_LIST_FOREACH_SAFE(edje_collections, l, l2, pc)
      {
-        for(i = 0; i < pc->parts_count; i++)
+        for (i = 0; i < pc->parts_count; i++)
           {
              part = pc->parts[i];
              if (part->type == EDJE_PART_TYPE_MESH_NODE)
@@ -3660,10 +3663,10 @@ _data_model_id_update(Eina_List *models_unused_list)
                   if (!part_desc_mesh_node) continue;
                   PART_DESC_MODEL_ID_UPDATE
                   for (j = 0; j < part->other.desc_count; j++)
-                     {
-                        part_desc_mesh_node = (Edje_Part_Description_Mesh_Node *)part->other.desc[j];
-                        PART_DESC_MODEL_ID_UPDATE
-                     }
+                    {
+                       part_desc_mesh_node = (Edje_Part_Description_Mesh_Node *)part->other.desc[j];
+                       PART_DESC_MODEL_ID_UPDATE
+                    }
                }
           }
      }
@@ -3704,15 +3707,15 @@ data_process_lookups(void)
         find = eina_hash_find(edje_file->collection, pc->part);
         if (find && find->id == pc->id)
           {
-             if ( ((Edje_Part_Collection_Parser*)pc)->inherit_only)
+             if (((Edje_Part_Collection_Parser *)pc)->inherit_only)
                eina_hash_del_by_data(edje_file->collection, find);
              else
-               continue ;
+               continue;
           }
 
         EINA_LIST_FOREACH(aliases, l3, alias)
           if (alias->id == pc->id)
-            continue ;
+            continue;
 
         /* This Edje_Part_Collection is not used at all */
         edje_collections = eina_list_remove_list(edje_collections, l);
@@ -3721,7 +3724,7 @@ data_process_lookups(void)
 
         /* Unref all image used by that group */
         for (i = 0; i < pc->parts_count; ++i)
-	  part_description_image_cleanup(pc->parts[i]);
+          part_description_image_cleanup(pc->parts[i]);
 
         /* Correct all id */
         EINA_LIST_FOREACH(edje_collections, l3, pc)
@@ -3749,11 +3752,11 @@ data_process_lookups(void)
 
         if (pc->lua_script_only)
           is_lua = EINA_TRUE;
-#define PROGRAM_ID_SET(Type, Pc, It, Count)				\
-        for (It = 0; It < Pc->programs.Type ## _count; ++It)		\
-          {								\
-             Pc->programs.Type[It]->id = Count++;			\
-          }
+#define PROGRAM_ID_SET(Type, Pc, It, Count)            \
+  for (It = 0; It < Pc->programs.Type ## _count; ++It) \
+    {                                                  \
+       Pc->programs.Type[It]->id = Count++;            \
+    }
 
         PROGRAM_ID_SET(fnmatch, pc, i, count);
         PROGRAM_ID_SET(strcmp, pc, i, count);
@@ -3804,7 +3807,7 @@ data_process_lookups(void)
                     }
                }
 
-             if ((i == part->key.pc->parts_count) && (!((Edje_Part_Collection_Parser*)part->key.pc)->inherit_only))
+             if ((i == part->key.pc->parts_count) && (!((Edje_Part_Collection_Parser *)part->key.pc)->inherit_only))
                {
                   ERR("Unable to find part name \"%s\" needed in group '%s'.",
                       alias, part->key.pc->part);
@@ -3821,21 +3824,21 @@ data_process_lookups(void)
         unsigned int i;
         Eina_Bool find = EINA_FALSE;
 
-#define PROGRAM_MATCH(Type, Pl, It)					\
-        for (It = 0; It < Pl->pc->programs.Type ## _count; ++It)	\
-          {								\
-             Edje_Program *ep;						\
-             \
-             ep = Pl->pc->programs.Type[It];				\
-             \
-             if ((Pl->anonymous && ep == Pl->u.ep) ||			\
-                 ((!Pl->anonymous) && (ep->name) && (!strcmp(ep->name, Pl->u.name)))) \
-               {							\
-                  *(Pl->dest) = ep->id;					\
-                  find = EINA_TRUE;					\
-                  break;						\
-               }							\
-          }
+#define PROGRAM_MATCH(Type, Pl, It)                                             \
+  for (It = 0; It < Pl->pc->programs.Type ## _count; ++It)                      \
+    {                                                                           \
+       Edje_Program *ep;                                                        \
+                                                                                \
+       ep = Pl->pc->programs.Type[It];                                          \
+                                                                                \
+       if ((Pl->anonymous && ep == Pl->u.ep) ||                                 \
+           ((!Pl->anonymous) && (ep->name) && (!strcmp(ep->name, Pl->u.name)))) \
+         {                                                                      \
+            *(Pl->dest) = ep->id;                                               \
+            find = EINA_TRUE;                                                   \
+            break;                                                              \
+         }                                                                      \
+    }
 
         PROGRAM_MATCH(fnmatch, program, i);
         PROGRAM_MATCH(strcmp, program, i);
@@ -3975,8 +3978,8 @@ free_group:
                             find = EINA_TRUE;
 
                             EINA_LIST_FOREACH(set->entries, lc, child)
-                               if (!eina_hash_find(images_in_use, child->name))
-                                 eina_hash_direct_add(images_in_use, child->name, child);
+                              if (!eina_hash_find(images_in_use, child->name))
+                                eina_hash_direct_add(images_in_use, child->name, child);
 
                             if (!eina_hash_find(images_in_use, image->name))
                               eina_hash_direct_add(images_in_use, set->name, set);
@@ -4011,7 +4014,7 @@ free_group:
              de = edje_file->image_dir->entries + i;
 
              if (de->entry && eina_hash_find(images_in_use, de->entry))
-               continue ;
+               continue;
 
              INF("Image '%s' in resource 'edje/image/%i' will not be included as it is unused.",
                  de->entry, de->id);
@@ -4039,7 +4042,7 @@ free_group:
              set = edje_file->image_dir->sets + i;
 
              if (set->name && eina_hash_find(images_in_use, set->name))
-               continue ;
+               continue;
 
              INF("Set '%s' will not be included as it is unused.", set->name);
 
@@ -4056,7 +4059,7 @@ free_group:
              images_unused_list = eina_list_append(images_unused_list, iui);
              iui->new_id = i;
              set_last->id = i;
-              memcpy(set, set_last, sizeof(Edje_Image_Directory_Set));
+             memcpy(set, set_last, sizeof(Edje_Image_Directory_Set));
              --i;
              edje_file->image_dir->sets_count--;
              set_realloc = realloc(edje_file->image_dir->sets,
@@ -4067,7 +4070,7 @@ free_group:
         /* update image id in parts */
         if (images_unused_list) _data_image_id_update(images_unused_list);
         EINA_LIST_FREE(images_unused_list, iui)
-           free(iui);
+          free(iui);
 
         _data_image_sets_size_set();
      }
@@ -4123,7 +4126,7 @@ free_group:
              de = edje_file->model_dir->entries + i;
 
              if (de->entry && eina_hash_find(models_in_use, de->entry))
-               continue ;
+               continue;
 
              INF("Model '%s' in resource 'edje/model/%i' will not be included as it is unused.",
                  de->entry, de->id);
@@ -4149,14 +4152,14 @@ free_group:
         /* update model id in parts */
         if (models_unused_list) _data_model_id_update(models_unused_list);
         EINA_LIST_FREE(models_unused_list, iui)
-           free(iui);
+          free(iui);
      }
 
    eina_hash_free(models_in_use);
 }
 
 static void
-data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, char* ptr, int len))
+data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, char *ptr, int len))
 {
    char *p;
    char *key;
@@ -4172,97 +4175,98 @@ data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void
    escape = 0;
    for (p = s; (p) && (*p); p++)
      {
-	if (!quote)
-	  {
-	     if (*p == '\"')
-	       {
-		  quote = 1;
-		  p++;
-	       }
-	  }
-	if (!quote)
-	  {
-	     if (!strncmp(p, key, keyl))
-	       {
+        if (!quote)
+          {
+             if (*p == '\"')
+               {
+                  quote = 1;
+                  p++;
+               }
+          }
+        if (!quote)
+          {
+             if (!strncmp(p, key, keyl))
+               {
                   char *ptr;
                   int len;
                   int inesc = 0;
-		  char *name;
+                  char *name;
 
                   ptr = p;
                   p += keyl;
-		  while ((*p))
-		    {
-		       if (!inesc)
-		         {
-			    if (*p == '\\') inesc = 1;
-			    else if (*p == '\"')
-			      {
-			         /* string concatenation, see below */
-				 if (*(p + 1) != '\"')
-				   break;
-				 else
-				   p++;
-			      }
-			 }
+                  while ((*p))
+                    {
+                       if (!inesc)
+                         {
+                            if (*p == '\\') inesc = 1;
+                            else if (*p == '\"')
+                              {
+                                 /* string concatenation, see below */
+                                 if (*(p + 1) != '\"')
+                                   break;
+                                 else
+                                   p++;
+                              }
+                         }
                        else
-                            inesc = 0;
+                         inesc = 0;
                        p++;
-		    }
-		  len = p - ptr + 1;
-		  name = alloca(len);
-		  if (name)
-		    {
-		       char *pp;
-		       int i;
-
-		       name[0] = 0;
-		       pp = ptr + keyl;
-		       inesc = 0;
-		       i = 0;
-		       while (*pp)
-		         {
-			    if (!inesc)
-			      {
-			         if (*pp == '\\') inesc = 1;
-			         else if (*pp == '\"')
-				   {
-				      /* concat strings like "foo""bar" to "foobar" */
-				      if (*(pp + 1) == '\"')
-				        pp++;
-				      else
-				        {
-					   name[i] = 0;
-					   break;
-					}
-				   }
-				 else
-				   {
-				      name[i] = *pp;
-				      name[i + 1] = 0;
-				      i++;
-				   }
-			      }
-			    else
+                    }
+                  len = p - ptr + 1;
+                  name = alloca(len);
+                  if (name)
+                    {
+                       char *pp;
+                       int i;
+
+                       name[0] = 0;
+                       pp = ptr + keyl;
+                       inesc = 0;
+                       i = 0;
+                       while (*pp)
+                         {
+                            if (!inesc)
+                              {
+                                 if (*pp == '\\') inesc = 1;
+                                 else if (*pp == '\"')
+                                   {
+                                      /* concat strings like "foo""bar" to "foobar" */
+                                      if (*(pp + 1) == '\"')
+                                        pp++;
+                                      else
+                                        {
+                                           name[i] = 0;
+                                           break;
+                                        }
+                                   }
+                                 else
+                                   {
+                                      name[i] = *pp;
+                                      name[i + 1] = 0;
+                                      i++;
+                                   }
+                              }
+                            else
                               inesc = 0;
-			    pp++;
-			}
-		      func(pc, name, ptr, len);
-		   }
-              }
-	  }
-	else
-	  {
-	     if (!escape)
-	       {
-		  if (*p == '\"') quote = 0;
-		  else if (*p == '\\') escape = 1;
-	       }
-	     else if (escape)
-	       {
-		  escape = 0;
-	       }
-	  }
+                            pp++;
+                         }
+                       func(pc, name, ptr, len);
+                    }
+               }
+          }
+        else
+          {
+             if (!escape)
+               {
+                  if (*p == '\"') quote = 0;
+                  else if (*p == '\\')
+                    escape = 1;
+               }
+             else if (escape)
+               {
+                  escape = 0;
+               }
+          }
      }
 }
 
@@ -4279,6 +4283,7 @@ _data_queue_part_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len
 
    code_lookups = eina_list_append(code_lookups, cl);
 }
+
 static void
 _data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len)
 {
@@ -4292,11 +4297,13 @@ _data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int
 
    code_lookups = eina_list_append(code_lookups, cl);
 }
+
 static void
 _data_queue_group_lookup(Edje_Part_Collection *pc EINA_UNUSED, char *name, char *ptr EINA_UNUSED, int len EINA_UNUSED)
 {
    data_queue_group_lookup(name, NULL);
 }
+
 static void
 _data_queue_image_pc_lookup(Edje_Part_Collection *pc EINA_UNUSED, char *name, char *ptr, int len)
 {
@@ -4306,7 +4313,7 @@ _data_queue_image_pc_lookup(Edje_Part_Collection *pc EINA_UNUSED, char *name, ch
    cl->ptr = ptr;
    cl->len = len;
 
-   data_queue_image_lookup(name, &(cl->val),  &(cl->set));
+   data_queue_image_lookup(name, &(cl->val), &(cl->set));
 
    code_lookups = eina_list_append(code_lookups, cl);
 }
@@ -4318,36 +4325,36 @@ data_process_scripts(void)
 
    for (l = codes, l2 = edje_collections; (l) && (l2); l = eina_list_next(l), l2 = eina_list_next(l2))
      {
-	Edje_Part_Collection *pc;
-	Code *cd;
-
-	cd = eina_list_data_get(l);
-	pc = eina_list_data_get(l2);
-
-	if ((cd->shared) && (!cd->is_lua))
-	  {
-	     data_process_string(pc, "PART",    cd->shared, _data_queue_part_lookup);
-	     data_process_string(pc, "PROGRAM", cd->shared, _data_queue_program_lookup);
-	     data_process_string(pc, "IMAGE",   cd->shared, _data_queue_image_pc_lookup);
-	     data_process_string(pc, "GROUP",   cd->shared, _data_queue_group_lookup);
-	  }
-
-	if (cd->programs)
-	  {
-	     Code_Program *cp;
-	     Eina_List *ll;
-
-	     EINA_LIST_FOREACH(cd->programs, ll, cp)
-	       {
-		  if (cp->script)
-		    {
-		       data_process_string(pc, "PART",    cp->script, _data_queue_part_lookup);
-		       data_process_string(pc, "PROGRAM", cp->script, _data_queue_program_lookup);
-		       data_process_string(pc, "IMAGE",   cp->script, _data_queue_image_pc_lookup);
-		       data_process_string(pc, "GROUP",   cp->script, _data_queue_group_lookup);
-		    }
-	       }
-	  }
+        Edje_Part_Collection *pc;
+        Code *cd;
+
+        cd = eina_list_data_get(l);
+        pc = eina_list_data_get(l2);
+
+        if ((cd->shared) && (!cd->is_lua))
+          {
+             data_process_string(pc, "PART", cd->shared, _data_queue_part_lookup);
+             data_process_string(pc, "PROGRAM", cd->shared, _data_queue_program_lookup);
+             data_process_string(pc, "IMAGE", cd->shared, _data_queue_image_pc_lookup);
+             data_process_string(pc, "GROUP", cd->shared, _data_queue_group_lookup);
+          }
+
+        if (cd->programs)
+          {
+             Code_Program *cp;
+             Eina_List *ll;
+
+             EINA_LIST_FOREACH(cd->programs, ll, cp)
+               {
+                  if (cp->script)
+                    {
+                       data_process_string(pc, "PART", cp->script, _data_queue_part_lookup);
+                       data_process_string(pc, "PROGRAM", cp->script, _data_queue_program_lookup);
+                       data_process_string(pc, "IMAGE", cp->script, _data_queue_image_pc_lookup);
+                       data_process_string(pc, "GROUP", cp->script, _data_queue_group_lookup);
+                    }
+               }
+          }
      }
 }
 
@@ -4359,18 +4366,18 @@ data_process_script_lookups(void)
 
    EINA_LIST_FOREACH(code_lookups, l, cl)
      {
-	char buf[12];
-	int n;
+        char buf[12];
+        int n;
 
-	/* FIXME !! Handle set in program */
-	n = eina_convert_itoa(cl->val, buf);
-	if (n > cl->len)
-	  {
-	     ERR("The unexpected happened. A numeric replacement string was larger than the original!");
-	     exit(-1);
-	  }
-	memset(cl->ptr, ' ', cl->len);
-	strncpy(cl->ptr, buf, n);
+        /* FIXME !! Handle set in program */
+        n = eina_convert_itoa(cl->val, buf);
+        if (n > cl->len)
+          {
+             ERR("The unexpected happened. A numeric replacement string was larger than the original!");
+             exit(-1);
+          }
+        memset(cl->ptr, ' ', cl->len);
+        strncpy(cl->ptr, buf, n);
      }
 }
 
@@ -4456,10 +4463,10 @@ color_tree_parent_node_get(const char *color_class)
    char *name;
 
    EINA_LIST_FOREACH(edje_file->color_tree, l, ctn)
-      if (ctn->color_classes)
-         EINA_LIST_FOREACH(ctn->color_classes, ll, name)
-            if (!strcmp(name, color_class))
-              return ctn;
+     if (ctn->color_classes)
+       EINA_LIST_FOREACH(ctn->color_classes, ll, name)
+         if (!strcmp(name, color_class))
+           return ctn;
 
    return NULL;
 }
@@ -4515,12 +4522,12 @@ process_color_tree(char *s, const char *f_in, int ln)
                       if (!strcmp(name, token[id]))
                         {
                            error_and_abort(NULL, "parse error %s:%i. The color class \"%s\" already belongs to the root node.",
-                                           f_in, ln -1, token[id]);
+                                           f_in, ln - 1, token[id]);
                         }
 
                   if ((ctn = color_tree_parent_node_get(token[id])))
                     error_and_abort(NULL, "parse error %s:%i. The color class \"%s\" already belongs to the \"%s\" node.",
-                                    f_in, ln -1, token[id], ctn->name);
+                                    f_in, ln - 1, token[id], ctn->name);
 
                   ctn = eina_array_data_get(array, eina_array_count(array) - 1);
                   ctn->color_classes = eina_list_append(ctn->color_classes, strdup(token[id]));
@@ -4529,14 +4536,13 @@ process_color_tree(char *s, const char *f_in, int ln)
                {
                   if ((ctn = color_tree_parent_node_get(token[id])))
                     error_and_abort(NULL, "parse error %s:%i. The color class \"%s\" already belongs to the \"%s\" node.",
-                                    f_in, ln -1, token[id], ctn->name);
+                                    f_in, ln - 1, token[id], ctn->name);
 
                   color_tree_root = eina_list_append(color_tree_root, strdup(token[id]));
                }
           }
 
         id = !id;
-
      } while (*s);
 
    if (eina_array_count(array))
@@ -4550,7 +4556,7 @@ char
 validate_hex_digit(char c)
 {
    if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-    return c;
+     return c;
 
    ERR("%s:%i. invalid character '%c' is used in color code.",
        file_in, line - 1, c);
@@ -4644,3 +4650,4 @@ convert_color_code(char *str, int *r, int *g, int *b, int *a)
 
    free(str);
 }
+
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index d8a7802e87..068bd74eee 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -2,7 +2,6 @@
 # include <config.h>
 #endif
 
-
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
@@ -29,55 +28,54 @@
 #define EDJE_1_21_SUPPORTED " -DEFL_VERSION_1_21=1 "
 
 #define EDJE_CC_EFL_VERSION_SUPPORTED \
-  EDJE_1_18_SUPPORTED \
-  EDJE_1_19_SUPPORTED \
-  EDJE_1_20_SUPPORTED \
+  EDJE_1_18_SUPPORTED                 \
+  EDJE_1_19_SUPPORTED                 \
+  EDJE_1_20_SUPPORTED                 \
   EDJE_1_21_SUPPORTED
 
-static void  new_object(void);
-static void  new_statement(void);
-static char *perform_math (char *input);
-static int   isdelim(char c);
-static char *next_token(char *p, char *end, char **new_p, int *delim);
+static void        new_object(void);
+static void        new_statement(void);
+static char       *perform_math(char *input);
+static int         isdelim(char c);
+static char       *next_token(char *p, char *end, char **new_p, int *delim);
 static const char *stack_id(void);
-static void  parse(char *data, off_t size);
+static void        parse(char *data, off_t size);
 
 /* simple expression parsing protos */
-static int my_atoi(const char * s);
-static char * _alphai(char *s, int * val);
-static char * _betai(char *s, int * val);
-static char * _gammai(char *s, int * val);
-static char * _deltai(char *s, int * val);
-static char * _get_numi(char *s, int * val);
-static int _is_numi(char c);
-static int _is_op1i(char c);
-static int _is_op2i(char c);
-static int _calci(char op, int a, int b);
-
-static double my_atof(const char * s);
-static char * _alphaf(char *s, double * val);
-static char * _betaf(char *s, double * val);
-static char * _gammaf(char *s, double * val);
-static char * _deltaf(char *s, double * val);
-static char * _get_numf(char *s, double * val);
-static int _is_numf(char c);
-static int _is_op1f(char c);
-static int _is_op2f(char c);
-static double _calcf(char op, double a, double b);
-static int strstrip(const char *in, char *out, size_t size);
-
-
-int        line = 0;
+static int         my_atoi(const char *s);
+static char       *_alphai(char *s, int *val);
+static char       *_betai(char *s, int *val);
+static char       *_gammai(char *s, int *val);
+static char       *_deltai(char *s, int *val);
+static char       *_get_numi(char *s, int *val);
+static int         _is_numi(char c);
+static int         _is_op1i(char c);
+static int         _is_op2i(char c);
+static int         _calci(char op, int a, int b);
+
+static double      my_atof(const char *s);
+static char       *_alphaf(char *s, double *val);
+static char       *_betaf(char *s, double *val);
+static char       *_gammaf(char *s, double *val);
+static char       *_deltaf(char *s, double *val);
+static char       *_get_numf(char *s, double *val);
+static int         _is_numf(char c);
+static int         _is_op1f(char c);
+static int         _is_op2f(char c);
+static double      _calcf(char op, double a, double b);
+static int         strstrip(const char *in, char *out, size_t size);
+
+int line = 0;
 Eina_List *stack = NULL;
 Eina_Array params;
 int had_quote = 0;
 int params_quote = 0;
 
-static char  file_buf[4096];
-static int   did_wildcard = 0;
-static int   verbatim = 0;
-static int   verbatim_line1 = 0;
-static int   verbatim_line2 = 0;
+static char file_buf[4096];
+static int did_wildcard = 0;
+static int verbatim = 0;
+static int verbatim_line1 = 0;
+static int verbatim_line2 = 0;
 static char *verbatim_str = NULL;
 static Eina_Strbuf *stack_buf = NULL;
 
@@ -102,9 +100,9 @@ err_show_params(void)
 
    ERR("PARAMS:");
    EINA_ARRAY_ITER_NEXT(&params, i, p, iterator)
-     {
-        ERR("  %s", p);
-     }
+   {
+      ERR("  %s", p);
+   }
 }
 
 static void
@@ -117,7 +115,7 @@ err_show(void)
 static char *
 _parse_param_get(int n)
 {
-   if (n < (int) eina_array_count(&params))
+   if (n < (int)eina_array_count(&params))
      return eina_array_data_get(&params, n);
    return NULL;
 }
@@ -304,7 +302,7 @@ new_statement_single(void)
 }
 
 static char *
-perform_math (char *input)
+perform_math(char *input)
 {
    char buf[256];
    double res;
@@ -344,9 +342,9 @@ next_token(char *p, char *end, char **new_p, int *delim)
    int in_tok = 0;
    int in_quote = 0;
    int in_parens = 0;
-   int in_comment_ss  = 0;
+   int in_comment_ss = 0;
    int in_comment_cpp = 0;
-   int in_comment_sa  = 0;
+   int in_comment_sa = 0;
    int is_escaped = 0;
 
    had_quote = 0;
@@ -377,7 +375,7 @@ next_token(char *p, char *end, char **new_p, int *delim)
           {
              char *pp, fl[4096];
              char *tmpstr = NULL;
-             int   l, nm;
+             int l, nm;
 
              /* handle cpp comments */
              /* their line format is
@@ -470,14 +468,14 @@ next_token(char *p, char *end, char **new_p, int *delim)
 
                        /* check for end-of-token */
                        if (
-                          (isspace(*p)) ||
-                          ((*delim) && (!isdelim(*p))) ||
-                          (isdelim(*p))
-                          )
-                         {/*the line below this is never  used because it skips to
-                           * the 'done' label which is after the return call for
-                           * in_tok being 0. is this intentional?
-                           */
+                         (isspace(*p)) ||
+                         ((*delim) && (!isdelim(*p))) ||
+                         (isdelim(*p))
+                         ) /*the line below this is never  used because it skips to
+                            * the 'done' label which is after the return call for
+                            * in_tok being 0. is this intentional?
+                            */
+                         {
                             in_tok = 0;
 
                             tok_end = p - 1;
@@ -497,7 +495,7 @@ next_token(char *p, char *end, char **new_p, int *delim)
    if (!in_tok) return NULL;
    tok_end = p - 1;
 
-   done:
+done:
    *new_p = p;
 
    tok = mem_alloc(tok_end - tok_start + 2);
@@ -661,7 +659,7 @@ stack_pop(void)
         if (do_remove)
           eina_strbuf_remove(stack_buf,
                              eina_strbuf_length_get(stack_buf) - tmp_length - 1,
-                             eina_strbuf_length_get(stack_buf)); /* remove: '.tmp' */
+                             eina_strbuf_length_get(stack_buf));  /* remove: '.tmp' */
      }
    else
      {
@@ -698,8 +696,8 @@ stack_pop_quick(Eina_Bool check_last, Eina_Bool do_free)
           tmp = end + 1;
      }
    eina_strbuf_remove(stack_buf,
-                           eina_strbuf_length_get(stack_buf) - strlen(tmp) - 1,
-                           eina_strbuf_length_get(stack_buf)); /* remove: '.tmp' */
+                      eina_strbuf_length_get(stack_buf) - strlen(tmp) - 1,
+                      eina_strbuf_length_get(stack_buf));      /* remove: '.tmp' */
    stack = eina_list_remove_list(stack, eina_list_last(stack));
    if (do_free)
      {
@@ -785,7 +783,8 @@ parse(char *data, off_t size)
                   err_show();
                   exit(-1);
                }
-             else if (*token == ',' || *token == ':') do_params = 1;
+             else if (*token == ',' || *token == ':')
+               do_params = 1;
              else if (*token == '}')
                {
                   if (do_params)
@@ -921,8 +920,9 @@ parse(char *data, off_t size)
                                    }
                                  else if ((!inquotes) && (!insquotes))
                                    {
-                                      if      (p[0] == '{') squigglie++;
-                                      else if (p[0] == '}') squigglie--;
+                                      if (p[0] == '{') squigglie++;
+                                      else if (p[0] == '}')
+                                        squigglie--;
                                       if (squigglie == 0)
                                         {
                                            verbatim_2 = p - 1;
@@ -1046,7 +1046,7 @@ compile(void)
 
              len = 0;
              EINA_LIST_FOREACH(defines, l, define)
-                len += strlen(define) + 1;
+               len += strlen(define) + 1;
              def = mem_alloc(len + 1);
              def[0] = 0;
              EINA_LIST_FOREACH(defines, l, define)
@@ -1083,24 +1083,24 @@ compile(void)
              inc = ecore_file_dir_get(file_in);
              if (depfile)
                snprintf(buf, sizeof(buf), "\"%s\" -MMD \"%s\" -MT \"%s\" \"%s\""
-                        " -I\"%s\" %s -o \"%s\""
-                        " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d"
+                                          " -I\"%s\" %s -o \"%s\""
+                                          " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d"
                         EDJE_CC_EFL_VERSION_SUPPORTED,
                         buf2, depfile, file_out, file_in,
                         inc ? inc : "./", def, clean_file,
                         EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
              else if (annotate)
                snprintf(buf, sizeof(buf), "\"%s\" -annotate -a \"%s\" \"%s\""
-                        " -I\"%s\" %s -o \"%s\""
-                        " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d"
+                                          " -I\"%s\" %s -o \"%s\""
+                                          " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d"
                         EDJE_CC_EFL_VERSION_SUPPORTED,
                         buf2, watchfile ? watchfile : "/dev/null", file_in,
                         inc ? inc : "./", def, clean_file,
                         EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
              else
                snprintf(buf, sizeof(buf), "\"%s\" -a \"%s\" \"%s\" -I\"%s\" %s"
-                        " -o \"%s\""
-                        " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d"
+                                          " -o \"%s\""
+                                          " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d"
                         EDJE_CC_EFL_VERSION_SUPPORTED,
                         buf2, watchfile ? watchfile : "/dev/null", file_in,
                         inc ? inc : "./", def, clean_file,
@@ -1247,10 +1247,10 @@ _parse_enum(char *str, va_list va)
    va_list va2;
    va_copy(va2, va); /* iterator for the error message */
 
-   for (;;)
+   for (;; )
      {
         char *s;
-        int   v;
+        int v;
 
         s = va_arg(va, char *);
 
@@ -1328,7 +1328,7 @@ parse_flags(int n, ...)
    va_list va;
 
    va_start(va, n);
-   while (n < (int) eina_array_count(&params))
+   while (n < (int)eina_array_count(&params))
      {
         result |= _parse_enum(eina_array_data_get(&params, n), va);
         n++;
@@ -1665,7 +1665,7 @@ _get_numi(char *s, int *val)
      }
    buf[pos] = '\0';
    (*val) = atoi(buf);
-   return (s + pos);
+   return s + pos;
 }
 
 int
@@ -1682,10 +1682,13 @@ _is_op1i(char c)
 {
    switch (c)
      {
-     case '*':;
-     case '%':;
-     case '/': return 1;
-     default: break;
+      case '*':;
+
+      case '%':;
+
+      case '/': return 1;
+
+      default: break;
      }
    return 0;
 }
@@ -1695,9 +1698,11 @@ _is_op2i(char c)
 {
    switch (c)
      {
-     case '+':;
-     case '-': return 1;
-     default: break;
+      case '+':;
+
+      case '-': return 1;
+
+      default: break;
      }
    return 0;
 }
@@ -1705,29 +1710,34 @@ _is_op2i(char c)
 int
 _calci(char op, int a, int b)
 {
-   switch(op)
+   switch (op)
      {
       case '+':
-         a += b;
-         return a;
+        a += b;
+        return a;
+
       case '-':
-         a -= b;
-         return a;
+        a -= b;
+        return a;
+
       case '/':
-         if (0 != b) a /= b;
-         else
-           ERR("%s:%i divide by zero", file_in, line - 1);
-         return a;
+        if (0 != b) a /= b;
+        else
+          ERR("%s:%i divide by zero", file_in, line - 1);
+        return a;
+
       case '*':
-         a *= b;
-         return a;
+        a *= b;
+        return a;
+
       case '%':
-         if (0 != b) a = a % b;
-         else
-           ERR("%s:%i modula by zero", file_in, line - 1);
-         return a;
+        if (0 != b) a = a % b;
+        else
+          ERR("%s:%i modula by zero", file_in, line - 1);
+        return a;
+
       default:
-         ERR("%s:%i unexpected character '%c'", file_in, line - 1, op);
+        ERR("%s:%i unexpected character '%c'", file_in, line - 1, op);
      }
    return a;
 }
@@ -1818,7 +1828,7 @@ _gammaf(char *s, double *val)
 static char *
 _betaf(char *s, double *val)
 {
-   double a1=0, a2=0;
+   double a1 = 0, a2 = 0;
    char op;
 
    if (!val) return NULL;
@@ -1837,7 +1847,7 @@ _betaf(char *s, double *val)
 static char *
 _alphaf(char *s, double *val)
 {
-   double a1=0, a2=0;
+   double a1 = 0, a2 = 0;
    char op;
 
    if (!val) return NULL;
@@ -1870,7 +1880,7 @@ _get_numf(char *s, double *val)
      }
    buf[pos] = '\0';
    (*val) = atof(buf);
-   return (s+pos);
+   return s + pos;
 }
 
 static int
@@ -1887,11 +1897,14 @@ _is_numf(char c)
 static int
 _is_op1f(char c)
 {
-   switch(c)
+   switch (c)
      {
       case '*':;
+
       case '%':;
+
       case '/': return 1;
+
       default: break;
      }
    return 0;
@@ -1900,10 +1913,12 @@ _is_op1f(char c)
 static int
 _is_op2f(char c)
 {
-   switch(c)
+   switch (c)
      {
       case '+':;
+
       case '-': return 1;
+
       default: break;
      }
    return 0;
@@ -1912,29 +1927,34 @@ _is_op2f(char c)
 static double
 _calcf(char op, double a, double b)
 {
-   switch(op)
+   switch (op)
      {
       case '+':
-         a += b;
-         return a;
+        a += b;
+        return a;
+
       case '-':
-         a -= b;
-         return a;
+        a -= b;
+        return a;
+
       case '/':
-         if (b != 0) a /= b;
-         else
-           ERR("%s:%i divide by zero", file_in, line - 1);
-         return a;
+        if (b != 0) a /= b;
+        else
+          ERR("%s:%i divide by zero", file_in, line - 1);
+        return a;
+
       case '*':
-         a *= b;
-         return a;
+        a *= b;
+        return a;
+
       case '%':
-         if (0 != b) a = (double)((int)a % (int)b);
-         else
-           ERR("%s:%i modula by zero", file_in, line - 1);
-         return a;
+        if (0 != b) a = (double)((int)a % (int)b);
+        else
+          ERR("%s:%i modula by zero", file_in, line - 1);
+        return a;
+
       default:
-         ERR("%s:%i unexpected character '%c'", file_in, line - 1, op);
+        ERR("%s:%i unexpected character '%c'", file_in, line - 1, op);
      }
    return a;
 }
@@ -1942,7 +1962,7 @@ _calcf(char op, double a, double b)
 static int
 strstrip(const char *in, char *out, size_t size)
 {
-   if ((size -1 ) < strlen(in))
+   if ((size - 1) < strlen(in))
      {
         ERR("%s:%i expression is too long", file_in, line - 1);
         return 0;
@@ -1967,7 +1987,7 @@ get_param_index(char *str)
    int index;
    char *p;
 
-   for(index = 0; index < get_arg_count(); index++)
+   for (index = 0; index < get_arg_count(); index++)
      {
         p = _parse_param_get(index);
         if (!p) continue;
@@ -1982,5 +2002,6 @@ get_param_index(char *str)
 int
 param_had_quote(int n)
 {
-   return (params_quote & (1 << n));
+   return params_quote & (1 << n);
 }
+
diff --git a/src/bin/edje/edje_cc_script.c b/src/bin/edje/edje_cc_script.c
index dca9fef953..e17355c78b 100644
--- a/src/bin/edje/edje_cc_script.c
+++ b/src/bin/edje/edje_cc_script.c
@@ -19,19 +19,19 @@ typedef enum
 {
    TOKEN_TYPE_INVALID = -1,
    TOKEN_TYPE_EOF,
-   TOKEN_TYPE_COLON      = (1 << 0),
-   TOKEN_TYPE_SEMICOLON  = (1 << 1),
-   TOKEN_TYPE_COMMA      = (1 << 2),
-   TOKEN_TYPE_PARENS     = (1 << 3),
-   TOKEN_TYPE_BRACES     = (1 << 4),
+   TOKEN_TYPE_COLON = (1 << 0),
+   TOKEN_TYPE_SEMICOLON = (1 << 1),
+   TOKEN_TYPE_COMMA = (1 << 2),
+   TOKEN_TYPE_PARENS = (1 << 3),
+   TOKEN_TYPE_BRACES = (1 << 4),
    TOKEN_TYPE_EQUAL_MARK = (1 << 5),
-   TOKEN_TYPE_PUBLIC     = (1 << 6),
+   TOKEN_TYPE_PUBLIC = (1 << 6),
    TOKEN_TYPE_IDENTIFIER = (1 << 7)
 } Token_Type;
 
 typedef struct _Token
 {
-   char *str;
+   char      *str;
    Token_Type type;
 } Token;
 
@@ -102,6 +102,7 @@ code_parse_internal(Code *code)
                sym = mem_alloc(SZ(Code_Symbol));
              sym->tag = eina_array_pop(name_stack);
              break;
+
            case TOKEN_TYPE_SEMICOLON:
              if (eina_array_count(name_stack))
                {
@@ -114,6 +115,7 @@ code_parse_internal(Code *code)
                }
              is_public = EINA_FALSE;
              break;
+
            case TOKEN_TYPE_COMMA:
              if (!sym)
                sym = mem_alloc(SZ(Code_Symbol));
@@ -127,6 +129,7 @@ code_parse_internal(Code *code)
                }
              sym = NULL;
              break;
+
            case TOKEN_TYPE_PARENS:
              is_args = !is_args;
              if (is_args)
@@ -152,6 +155,7 @@ code_parse_internal(Code *code)
                   sym = func;
                }
              break;
+
            case TOKEN_TYPE_BRACES:
              depth = 1;
              body = begin;
@@ -164,6 +168,7 @@ code_parse_internal(Code *code)
                           case '{':
                             depth++;
                             break;
+
                           case '}':
                             depth--;
                             break;
@@ -182,13 +187,16 @@ code_parse_internal(Code *code)
              sym = NULL;
              is_public = EINA_FALSE;
              break;
+
            case TOKEN_TYPE_PUBLIC:
              is_public = EINA_TRUE;
              break;
+
            case TOKEN_TYPE_IDENTIFIER:
              eina_array_push(name_stack, token->str);
              token->str = NULL;
              break;
+
            default:
              break;
           }
@@ -228,9 +236,10 @@ next_token(char **begin, char *end)
            case ' ':
            case '\t':
            case '\n':
-              if (index > 0)
-                parsed = EINA_TRUE;
-              break;
+             if (index > 0)
+               parsed = EINA_TRUE;
+             break;
+
            case ':':
            case ';':
            case ',':
@@ -239,46 +248,53 @@ next_token(char **begin, char *end)
            case '{':
            case '}':
            case '=':
-              if (!index)
-                {
-                   buf[index++] = ch;
-                   src++;
-                }
-              goto exit;
+             if (!index)
+               {
+                  buf[index++] = ch;
+                  src++;
+               }
+             goto exit;
+
            default:
-              if (parsed)
-                goto exit;
-              buf[index++] = ch;
-              break;
+             if (parsed)
+               goto exit;
+             buf[index++] = ch;
+             break;
           }
      }
 
 exit:
    switch (buf[0])
      {
-       case ':':
-         token->type = TOKEN_TYPE_COLON;
-         break;
-       case ';':
-         token->type = TOKEN_TYPE_SEMICOLON;
-         break;
-       case ',':
-         token->type = TOKEN_TYPE_COMMA;
-         break;
-       case '(':
-       case ')':
-         token->type = TOKEN_TYPE_PARENS;
-         break;
-       case '{':
-       case '}':
-         token->type = TOKEN_TYPE_BRACES;
-         break;
-       case '=':
-         token->type = TOKEN_TYPE_EQUAL_MARK;
-         break;
-       case '\0':
-         token->type = TOKEN_TYPE_EOF;
-         break;
+      case ':':
+        token->type = TOKEN_TYPE_COLON;
+        break;
+
+      case ';':
+        token->type = TOKEN_TYPE_SEMICOLON;
+        break;
+
+      case ',':
+        token->type = TOKEN_TYPE_COMMA;
+        break;
+
+      case '(':
+      case ')':
+        token->type = TOKEN_TYPE_PARENS;
+        break;
+
+      case '{':
+      case '}':
+        token->type = TOKEN_TYPE_BRACES;
+        break;
+
+      case '=':
+        token->type = TOKEN_TYPE_EQUAL_MARK;
+        break;
+
+      case '\0':
+        token->type = TOKEN_TYPE_EOF;
+        break;
      }
 
    if (token->type < 0)
@@ -448,3 +464,4 @@ script_rewrite(Code *code)
    code->vars = vars;
    code->func = func;
 }
+
diff --git a/src/bin/edje/edje_cc_sources.c b/src/bin/edje/edje_cc_sources.c
index a2edf4d531..a8bd949576 100644
--- a/src/bin/edje/edje_cc_sources.c
+++ b/src/bin/edje/edje_cc_sources.c
@@ -59,8 +59,8 @@ source_fetch_file(const char *fil, const char *filname)
    f = fopen(fil, "rb");
    if (!f)
      {
-	ERR("Cannot open file '%s'", fil);
-	exit(-1);
+        ERR("Cannot open file '%s'", fil);
+        exit(-1);
      }
 
    fseek(f, 0, SEEK_END);
@@ -71,12 +71,12 @@ source_fetch_file(const char *fil, const char *filname)
    sf->file = mem_alloc(sz + 1);
    if (sz > 0)
      {
-	tmp = fread(sf->file, sz, 1, f);
-	if (tmp != 1)
-	  {
-	     ERR("file length for (%s) doesn't match!", filname);
-	     exit(-1);
-	  }
+        tmp = fread(sf->file, sz, 1, f);
+        if (tmp != 1)
+          {
+             ERR("file length for (%s) doesn't match!", filname);
+             exit(-1);
+          }
      }
 
    sf->file[sz] = '\0';
@@ -85,14 +85,14 @@ source_fetch_file(const char *fil, const char *filname)
 
    while (fgets(buf, sizeof(buf), f))
      {
-	char *p, *pp;
-	int forgetit = 0;
-	int haveinclude = 0;
-	char *file = NULL, *fname = NULL;
-
-	p = buf;
-	while ((!forgetit) && (*p))
-	  {
+        char *p, *pp;
+        int forgetit = 0;
+        int haveinclude = 0;
+        char *file = NULL, *fname = NULL;
+
+        p = buf;
+        while ((!forgetit) && (*p))
+          {
              if (!isspace(*p))
                {
                   if (*p != '#')
@@ -100,87 +100,87 @@ source_fetch_file(const char *fil, const char *filname)
                }
              p++;
 
-	     if (!haveinclude)
-	       {
-		  if (!isspace(*p))
-		    {
-		       if (!strncmp(p, "include", 7))
-			 {
-			    haveinclude = 1;
-			    p += 7;
-			 }
-		       /* HACK! the logic above should be fixed so
-			* preprocessor statements don't have to begin
-			* in column 0.
-			* otoh, edje_cc should print a warning in that case,
-			* since according to the standard, preprocessor
-			* statements need to be put in column 0.
-			*/
-		       else if (!strncmp(p, "#include", 8))
-			 {
-			    haveinclude = 1;
-			    p += 8;
-			 }
-		       else
-			 forgetit = 1;
-		    }
-	       }
-	     else
-	       {
-		  if (!isspace(*p))
-		    {
-		       char end = '\0';
-
-		       if (*p == '"') end = '"';
-		       else if (*p == '<') end = '>';
-
-		       if (end)
-			 {
-			    pp = strchr(p + 1, end);
-			    if (!pp)
-			      forgetit = 1;
-			    else
-			      {
-				 ssize_t l = 0;
-
-				 /* get the directory of the current file
-				  * if we haven't already done so
-				  */
-				 if (!dir)
-				   {
+             if (!haveinclude)
+               {
+                  if (!isspace(*p))
+                    {
+                       if (!strncmp(p, "include", 7))
+                         {
+                            haveinclude = 1;
+                            p += 7;
+                         }
+                       /* HACK! the logic above should be fixed so
+                        * preprocessor statements don't have to begin
+                        * in column 0.
+                        * otoh, edje_cc should print a warning in that case,
+                        * since according to the standard, preprocessor
+                        * statements need to be put in column 0.
+                        */
+                       else if (!strncmp(p, "#include", 8))
+                         {
+                            haveinclude = 1;
+                            p += 8;
+                         }
+                       else
+                         forgetit = 1;
+                    }
+               }
+             else
+               {
+                  if (!isspace(*p))
+                    {
+                       char end = '\0';
+
+                       if (*p == '"') end = '"';
+                       else if (*p == '<')
+                         end = '>';
+
+                       if (end)
+                         {
+                            pp = strchr(p + 1, end);
+                            if (!pp)
+                              forgetit = 1;
+                            else
+                              {
+                                 ssize_t l = 0;
+
+                                 /* get the directory of the current file
+                                  * if we haven't already done so
+                                  */
+                                 if (!dir)
+                                   {
                                       dir = ecore_file_dir_get(fil);
-				      if (dir) dir_len = strlen(dir);
-				   }
-
-				 l = pp - p + dir_len + 1;
-				 file = mem_alloc(l);
-
-				 if (!dir_len)
-				   {
-				      snprintf(file, l - 1, "%s", p + 1);
-				      file[l - 2] = 0;
-				   }
-				 else
-				   {
-				      snprintf(file, l, "%s/%s", dir, p + 1);
-				      file[l - 1] = 0;
-				   }
-
-
-				 fname = strdup(p + 1);
-				 pp = strrchr(fname, end);
-				 if (pp) *pp = 0;
-				 forgetit = 1;
-			      }
-			 }
-		       else
-			 forgetit = 1;
-		    }
-		  else
-		    p++;
+                                      if (dir) dir_len = strlen(dir);
+                                   }
+
+                                 l = pp - p + dir_len + 1;
+                                 file = mem_alloc(l);
+
+                                 if (!dir_len)
+                                   {
+                                      snprintf(file, l - 1, "%s", p + 1);
+                                      file[l - 2] = 0;
+                                   }
+                                 else
+                                   {
+                                      snprintf(file, l, "%s/%s", dir, p + 1);
+                                      file[l - 1] = 0;
+                                   }
+
+                                 fname = strdup(p + 1);
+                                 pp = strrchr(fname, end);
+                                 if (pp) *pp = 0;
+                                 forgetit = 1;
+                              }
+                         }
+                       else
+                         forgetit = 1;
+                    }
+                  else
+                    p++;
                }
-	  }
-	if ((file) && (fname))
+          }
+        if ((file) && (fname))
           source_fetch_file(file, fname);
 
         if (file) free(file);
@@ -230,3 +230,4 @@ source_fontmap_load(Eet_File *ef)
    fl = eet_data_read(ef, _font_list_edd, "edje_source_fontmap");
    return fl;
 }
+
diff --git a/src/bin/edje/edje_codegen.c b/src/bin/edje/edje_codegen.c
index 0b2412fa37..cbca138429 100644
--- a/src/bin/edje/edje_codegen.c
+++ b/src/bin/edje/edje_codegen.c
@@ -19,8 +19,8 @@
 #include "Edje_Edit.h"
 
 static int _log_dom;
-#define DBG(...)  EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)
-#define ERR(...)  EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
+#define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)
+#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
 
 static Ecore_Evas *ee = NULL;
 static char *file = NULL;
@@ -30,31 +30,31 @@ static FILE *source_fd = NULL;
 static FILE *header_fd = NULL;
 static Eina_List *externals = NULL;
 
-#define H_HEADER                                        \
-  "#ifndef _%s\n"                                       \
-  "#define _%s\n\n"                                     \
-  "#include <Edje.h>\n"                                 \
-  "#include <Evas.h>\n\n"                               \
+#define H_HEADER          \
+  "#ifndef _%s\n"         \
+  "#define _%s\n\n"       \
+  "#include <Edje.h>\n"   \
+  "#include <Evas.h>\n\n" \
   "#include <stdlib.h>\n\n"
 
-#define H_FOOTER                                        \
+#define H_FOOTER \
   "\n#endif /* _%s */\n"
 
-#define C_HEADER                                        \
+#define C_HEADER \
   "#include \"%s\"\n\n"
 
-#define C_CODEGEN_OBJECT_ADD                              \
-  "Evas_Object *\n"                                       \
-  "%s_object_add(Evas *e, const char *file)\n"            \
-  "{\n"                                                   \
-  "   Evas_Object *o;\n\n"                                \
-  "   o = edje_object_add(e);\n"                          \
-  "   if (!o) return NULL;\n\n"                           \
-  "   if (file)\n"                                        \
-  "      edje_object_file_set(o, file, \"%s\");\n"        \
-  "   else\n"                                             \
-  "      edje_object_file_set(o, \"%s\", \"%s\");\n\n"    \
-  "   return o;\n"                                        \
+#define C_CODEGEN_OBJECT_ADD                           \
+  "Evas_Object *\n"                                    \
+  "%s_object_add(Evas *e, const char *file)\n"         \
+  "{\n"                                                \
+  "   Evas_Object *o;\n\n"                             \
+  "   o = edje_object_add(e);\n"                       \
+  "   if (!o) return NULL;\n\n"                        \
+  "   if (file)\n"                                     \
+  "      edje_object_file_set(o, file, \"%s\");\n"     \
+  "   else\n"                                          \
+  "      edje_object_file_set(o, \"%s\", \"%s\");\n\n" \
+  "   return o;\n"                                     \
   "}\n\n"
 
 #define H_CODEGEN_OBJECT_ADD                                           \
@@ -64,118 +64,118 @@ static Eina_List *externals = NULL;
   " *             to edje_codegen\n */\n"                              \
   "Evas_Object *%s_object_add(Evas *e, const char *file);\n\n"
 
-#define C_CODEGEN_DRAG_SET(option)                                      \
-  "Eina_Bool\n"                                                         \
-  "%s_%s_drag_"#option"_set(Evas_Object *o, double dx, double dy)\n"    \
-  "{\n"                                                                 \
-  "   return edje_object_part_drag_"#option"_set(o, \"%s\", dx, dy);\n" \
-  "}\n\n"
-
-#define H_CODEGEN_DRAG_SET(option)                                      \
-  "Eina_Bool %s_%s_drag_"#option"_set(Evas_Object *o, double dx, double dy);\n"
-
-#define C_CODEGEN_DRAG_GET(option)                                      \
-  "Eina_Bool\n"                                                         \
-  "%s_%s_drag_"#option"_get(Evas_Object *o, double *dx, double *dy)\n"  \
-  "{\n"                                                                 \
-  "   return edje_object_part_drag_"#option"_get(o, \"%s\", dx, dy);\n" \
-  "}\n\n"
-
-#define H_CODEGEN_DRAG_GET(option)                                      \
-  "Eina_Bool %s_%s_drag_"#option"_get(Evas_Object *o, double *dx"       \
-  ", double *dy);\n"
-
-#define C_CODEGEN_DRAG_ACTION(option)                                   \
-  "Eina_Bool\n"                                                         \
-  "%s_%s_drag_"#option"(Evas_Object *o, double dx, double dy)\n"        \
-  "{\n"                                                                 \
-  "   return edje_object_part_drag_"#option"(o, \"%s\", dx, dy);\n"     \
-  "}\n\n"
-
-#define H_CODEGEN_DRAG_ACTION(option)                                   \
-  "Eina_Bool %s_%s_drag_"#option"(Evas_Object *o, double dx, double dy);\n"
-
-#define C_CODEGEN_DRAG_DIR_GET                              \
-  "Edje_Drag_Dir\n"                                         \
-  "%s_%s_drag_dir_get(Evas_Object *o)\n"                    \
-  "{\n"                                                     \
-  "   return edje_object_part_drag_dir_get(o, \"%s\");\n"   \
+#define C_CODEGEN_DRAG_SET(option)                                                              \
+  "Eina_Bool\n"                                                                                 \
+  "%s_%s_drag_" #option "_set(Evas_Object *o, double dx, double dy)\n"                          \
+                        "{\n"                                                                   \
+                        "   return edje_object_part_drag_" #option "_set(o, \"%s\", dx, dy);\n" \
+                                                                   "}\n\n"
+
+#define H_CODEGEN_DRAG_SET(option) \
+  "Eina_Bool %s_%s_drag_" #option "_set(Evas_Object *o, double dx, double dy);\n"
+
+#define C_CODEGEN_DRAG_GET(option)                                                              \
+  "Eina_Bool\n"                                                                                 \
+  "%s_%s_drag_" #option "_get(Evas_Object *o, double *dx, double *dy)\n"                        \
+                        "{\n"                                                                   \
+                        "   return edje_object_part_drag_" #option "_get(o, \"%s\", dx, dy);\n" \
+                                                                   "}\n\n"
+
+#define H_CODEGEN_DRAG_GET(option)                                  \
+  "Eina_Bool %s_%s_drag_" #option "_get(Evas_Object *o, double *dx" \
+                                  ", double *dy);\n"
+
+#define C_CODEGEN_DRAG_ACTION(option)                                                       \
+  "Eina_Bool\n"                                                                             \
+  "%s_%s_drag_" #option "(Evas_Object *o, double dx, double dy)\n"                          \
+                        "{\n"                                                               \
+                        "   return edje_object_part_drag_" #option "(o, \"%s\", dx, dy);\n" \
+                                                                   "}\n\n"
+
+#define H_CODEGEN_DRAG_ACTION(option) \
+  "Eina_Bool %s_%s_drag_" #option "(Evas_Object *o, double dx, double dy);\n"
+
+#define C_CODEGEN_DRAG_DIR_GET                            \
+  "Edje_Drag_Dir\n"                                       \
+  "%s_%s_drag_dir_get(Evas_Object *o)\n"                  \
+  "{\n"                                                   \
+  "   return edje_object_part_drag_dir_get(o, \"%s\");\n" \
   "}\n\n"
 
-#define H_CODEGEN_DRAG_DIR_GET                          \
+#define H_CODEGEN_DRAG_DIR_GET \
   "Edje_Drag_Dir %s_%s_drag_dir_get(Evas_Object *o);\n"
 
-#define C_CODEGEN_PART_TEXT_SET                         \
-  "void\n"                                              \
-  "%s_%s_set(Evas_Object *o, const char *value)\n"      \
-  "{\n"                                                 \
-  "   edje_object_part_text_set(o, \"%s\", value);\n"   \
+#define C_CODEGEN_PART_TEXT_SET                       \
+  "void\n"                                            \
+  "%s_%s_set(Evas_Object *o, const char *value)\n"    \
+  "{\n"                                               \
+  "   edje_object_part_text_set(o, \"%s\", value);\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_TEXT_SET                              \
+#define H_CODEGEN_PART_TEXT_SET \
   "void %s_%s_set(Evas_Object *o, const char *value);\n"
 
-#define C_CODEGEN_PART_SWALLOW_SET                             \
-  "void\n"                                                     \
-  "%s_%s_set(Evas_Object *o, Evas_Object *value)\n"            \
-  "{\n"                                                        \
-  "   edje_object_part_swallow(o, \"%s\", value);\n"           \
+#define C_CODEGEN_PART_SWALLOW_SET                   \
+  "void\n"                                           \
+  "%s_%s_set(Evas_Object *o, Evas_Object *value)\n"  \
+  "{\n"                                              \
+  "   edje_object_part_swallow(o, \"%s\", value);\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_SWALLOW_SET                             \
+#define H_CODEGEN_PART_SWALLOW_SET \
   "void %s_%s_set(Evas_Object *o, Evas_Object *value);\n"
 
-#define C_CODEGEN_PART_TEXT_GET                         \
-  "const char *\n"                                      \
-  "%s_%s_get(const Evas_Object *o)\n"                   \
-  "{\n"                                                 \
-  "   return edje_object_part_text_get(o, \"%s\");\n"   \
+#define C_CODEGEN_PART_TEXT_GET                       \
+  "const char *\n"                                    \
+  "%s_%s_get(const Evas_Object *o)\n"                 \
+  "{\n"                                               \
+  "   return edje_object_part_text_get(o, \"%s\");\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_TEXT_GET                         \
+#define H_CODEGEN_PART_TEXT_GET \
   "const char *%s_%s_get(const Evas_Object *o);\n"
 
-#define C_CODEGEN_PART_SWALLOW_GET                        \
-  "Evas_Object *\n"                                       \
-  "%s_%s_get(const Evas_Object *o)\n"                     \
-  "{\n"                                                   \
-  "   return edje_object_part_swallow_get(o, \"%s\");\n"  \
+#define C_CODEGEN_PART_SWALLOW_GET                       \
+  "Evas_Object *\n"                                      \
+  "%s_%s_get(const Evas_Object *o)\n"                    \
+  "{\n"                                                  \
+  "   return edje_object_part_swallow_get(o, \"%s\");\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_SWALLOW_GET                         \
+#define H_CODEGEN_PART_SWALLOW_GET \
   "Evas_Object *%s_%s_get(const Evas_Object *o);\n"
 
-#define C_CODEGEN_PART_BOX_APPEND                                \
-  "Eina_Bool\n"                                                  \
-  "%s_%s_append(Evas_Object *o, Evas_Object *child)\n"           \
-  "{\n"                                                          \
-  "   return edje_object_part_box_append(o, \"%s\", child);\n"   \
+#define C_CODEGEN_PART_BOX_APPEND                              \
+  "Eina_Bool\n"                                                \
+  "%s_%s_append(Evas_Object *o, Evas_Object *child)\n"         \
+  "{\n"                                                        \
+  "   return edje_object_part_box_append(o, \"%s\", child);\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_BOX_APPEND                                      \
+#define H_CODEGEN_PART_BOX_APPEND \
   "Eina_Bool %s_%s_append(Evas_Object *o, Evas_Object *child);\n"
 
-#define C_CODEGEN_PART_BOX_PREPEND                                \
-  "Eina_Bool\n"                                                   \
-  "%s_%s_prepend(Evas_Object *o, Evas_Object *child)\n"           \
-  "{\n"                                                           \
-  "   return edje_object_part_box_prepend(o, \"%s\", child);\n"   \
+#define C_CODEGEN_PART_BOX_PREPEND                              \
+  "Eina_Bool\n"                                                 \
+  "%s_%s_prepend(Evas_Object *o, Evas_Object *child)\n"         \
+  "{\n"                                                         \
+  "   return edje_object_part_box_prepend(o, \"%s\", child);\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_BOX_PREPEND                                      \
+#define H_CODEGEN_PART_BOX_PREPEND \
   "Eina_Bool %s_%s_prepend(Evas_Object *o, Evas_Object *child);\n"
 
-#define C_CODEGEN_PART_BOX_INSERT_BEFORE                          \
-  "Eina_Bool\n"                                                   \
-  "%s_%s_insert_before(Evas_Object *o, Evas_Object *child, "      \
-  "const Evas_Object *reference)\n"                               \
-  "{\n"                                                           \
-  "   return edje_object_part_box_insert_before(o, \"%s\", "      \
-  "child, reference);\n"   \
+#define C_CODEGEN_PART_BOX_INSERT_BEFORE                     \
+  "Eina_Bool\n"                                              \
+  "%s_%s_insert_before(Evas_Object *o, Evas_Object *child, " \
+  "const Evas_Object *reference)\n"                          \
+  "{\n"                                                      \
+  "   return edje_object_part_box_insert_before(o, \"%s\", " \
+  "child, reference);\n"                                     \
   "}\n\n"
 
-#define H_CODEGEN_PART_BOX_INSERT_BEFORE                                \
-  "Eina_Bool %s_%s_insert_before(Evas_Object *o, Evas_Object *child, "  \
+#define H_CODEGEN_PART_BOX_INSERT_BEFORE                               \
+  "Eina_Bool %s_%s_insert_before(Evas_Object *o, Evas_Object *child, " \
   "const Evas_Object *reference);\n"
 
 #define C_CODEGEN_PART_BOX_INSERT_AT                                        \
@@ -185,38 +185,38 @@ static Eina_List *externals = NULL;
   "   return edje_object_part_box_insert_at(o, \"%s\", child, pos);\n"      \
   "}\n\n"
 
-#define H_CODEGEN_PART_BOX_INSERT_AT                                     \
-  "Eina_Bool %s_%s_insert_at(Evas_Object *o, Evas_Object *child, "       \
+#define H_CODEGEN_PART_BOX_INSERT_AT                               \
+  "Eina_Bool %s_%s_insert_at(Evas_Object *o, Evas_Object *child, " \
   "unsigned int pos);\n"
 
-#define C_CODEGEN_PART_BOX_REMOVE                                   \
-  "Evas_Object *\n"                                                 \
-  "%s_%s_remove(Evas_Object *o, Evas_Object *child)\n"              \
-  "{\n"                                                             \
-  "   return edje_object_part_box_remove(o, \"%s\", child);\n"      \
+#define C_CODEGEN_PART_BOX_REMOVE                              \
+  "Evas_Object *\n"                                            \
+  "%s_%s_remove(Evas_Object *o, Evas_Object *child)\n"         \
+  "{\n"                                                        \
+  "   return edje_object_part_box_remove(o, \"%s\", child);\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_BOX_REMOVE                                    \
+#define H_CODEGEN_PART_BOX_REMOVE \
   "Evas_Object *%s_%s_remove(Evas_Object *o, Evas_Object *child);\n"
 
-#define C_CODEGEN_PART_BOX_REMOVE_AT                                 \
-  "Evas_Object *\n"                                                  \
-  "%s_%s_remove_at(Evas_Object *o, unsigned int pos)\n"              \
-  "{\n"                                                              \
-  "   return edje_object_part_box_remove_at(o, \"%s\", pos);\n"      \
+#define C_CODEGEN_PART_BOX_REMOVE_AT                            \
+  "Evas_Object *\n"                                             \
+  "%s_%s_remove_at(Evas_Object *o, unsigned int pos)\n"         \
+  "{\n"                                                         \
+  "   return edje_object_part_box_remove_at(o, \"%s\", pos);\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_BOX_REMOVE_AT                                 \
+#define H_CODEGEN_PART_BOX_REMOVE_AT \
   "Evas_Object *%s_%s_remove_at(Evas_Object *o, unsigned int pos);\n"
 
-#define C_CODEGEN_PART_BOX_REMOVE_ALL                                \
-  "Eina_Bool\n"                                                      \
-  "%s_%s_remove_all(Evas_Object *o, Eina_Bool clear)\n"              \
-  "{\n"                                                              \
-  "   return edje_object_part_box_remove_all(o, \"%s\", clear);\n"   \
+#define C_CODEGEN_PART_BOX_REMOVE_ALL                              \
+  "Eina_Bool\n"                                                    \
+  "%s_%s_remove_all(Evas_Object *o, Eina_Bool clear)\n"            \
+  "{\n"                                                            \
+  "   return edje_object_part_box_remove_all(o, \"%s\", clear);\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_BOX_REMOVE_ALL                                     \
+#define H_CODEGEN_PART_BOX_REMOVE_ALL \
   "Eina_Bool %s_%s_remove_all(Evas_Object *o, Eina_Bool clear);\n"
 
 #define C_CODEGEN_PART_TABLE_CHILD_GET                                    \
@@ -226,8 +226,8 @@ static Eina_List *externals = NULL;
   "   return edje_object_part_table_child_get(o, \"%s\", col, row);\n"    \
   "}\n\n"
 
-#define H_CODEGEN_PART_TABLE_CHILD_GET                                \
-  "Evas_Object * %s_%s_child_get(Evas_Object *o, unsigned int col, "  \
+#define H_CODEGEN_PART_TABLE_CHILD_GET                               \
+  "Evas_Object * %s_%s_child_get(Evas_Object *o, unsigned int col, " \
   "unsigned int row);\n"
 
 #define C_CODEGEN_PART_TABLE_PACK                                         \
@@ -239,132 +239,132 @@ static Eina_List *externals = NULL;
   "colspan, rowspan);\n"                                                  \
   "}\n\n"
 
-#define H_CODEGEN_PART_TABLE_PACK                                \
-  "Eina_Bool %s_%s_pack(Evas_Object *o, Evas_Object *child, "    \
-  "unsigned short col, unsigned short row, unsigned short "      \
+#define H_CODEGEN_PART_TABLE_PACK                             \
+  "Eina_Bool %s_%s_pack(Evas_Object *o, Evas_Object *child, " \
+  "unsigned short col, unsigned short row, unsigned short "   \
   "colspan, unsigned short rowspan);\n"
 
-#define C_CODEGEN_PART_TABLE_UNPACK                                  \
-  "Eina_Bool\n"                                                      \
-  "%s_%s_unpack(Evas_Object *o, Evas_Object *child)\n"               \
-  "{\n"                                                              \
-  "   return edje_object_part_table_unpack(o, \"%s\", child);\n"     \
+#define C_CODEGEN_PART_TABLE_UNPACK                              \
+  "Eina_Bool\n"                                                  \
+  "%s_%s_unpack(Evas_Object *o, Evas_Object *child)\n"           \
+  "{\n"                                                          \
+  "   return edje_object_part_table_unpack(o, \"%s\", child);\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_TABLE_UNPACK                                  \
+#define H_CODEGEN_PART_TABLE_UNPACK \
   "Eina_Bool %s_%s_unpack(Evas_Object *o, Evas_Object *child);\n"
 
-#define C_CODEGEN_PART_TABLE_CLEAR                               \
-  "Eina_Bool\n"                                                  \
-  "%s_%s_clear(Evas_Object *o, Eina_Bool clear)\n"               \
-  "{\n"                                                          \
-  "   return edje_object_part_table_clear(o, \"%s\", clear);\n"  \
+#define C_CODEGEN_PART_TABLE_CLEAR                              \
+  "Eina_Bool\n"                                                 \
+  "%s_%s_clear(Evas_Object *o, Eina_Bool clear)\n"              \
+  "{\n"                                                         \
+  "   return edje_object_part_table_clear(o, \"%s\", clear);\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_TABLE_CLEAR                                   \
+#define H_CODEGEN_PART_TABLE_CLEAR \
   "Eina_Bool %s_%s_clear(Evas_Object *o, Eina_Bool clear);\n"
 
-#define C_CODEGEN_PART_TABLE_COL_ROW_SIZE_GET                        \
-  "Eina_Bool\n"                                                      \
-  "%s_%s_col_row_size_get(Evas_Object *o, int  *cols, int *rows)\n"  \
-  "{\n"                                                              \
-  "   return edje_object_part_table_col_row_size_get(o, \"%s\", "    \
-  "cols, rows);\n"                                                   \
+#define C_CODEGEN_PART_TABLE_COL_ROW_SIZE_GET                       \
+  "Eina_Bool\n"                                                     \
+  "%s_%s_col_row_size_get(Evas_Object *o, int  *cols, int *rows)\n" \
+  "{\n"                                                             \
+  "   return edje_object_part_table_col_row_size_get(o, \"%s\", "   \
+  "cols, rows);\n"                                                  \
   "}\n\n"
 
-#define H_CODEGEN_PART_TABLE_COL_ROW_SIZE_GET                                \
+#define H_CODEGEN_PART_TABLE_COL_ROW_SIZE_GET \
   "Eina_Bool %s_%s_col_row_size_get(Evas_Object *o, int *cols, int *rows);\n"
 
-#define C_CODEGEN_PART_EXTERNAL_PARAM_SET(type, param_type, field)            \
-  "Eina_Bool\n"                                                               \
-  "%s_%s_%s_set(Evas_Object *o, "type"value)\n"                               \
-  "{\n"                                                                       \
-  "   Edje_External_Param param;\n\n"                                         \
-  "   param.name = \"%s\";\n"                                                 \
-  "   param.type = "param_type";\n"                                           \
-  "   param."field" = value;\n"                                               \
-  "   return edje_object_part_external_param_set(o, \"%s\", &param);\n"       \
-  "}\n\n"
-
-#define H_CODEGEN_PART_EXTERNAL_PARAM_SET(type)            \
-  "Eina_Bool %s_%s_%s_set(Evas_Object *o, "type"value);\n"
-
-#define C_CODEGEN_PART_EXTERNAL_PARAM_GET(type, param_type, field)            \
-  "Eina_Bool\n"                                                               \
-  "%s_%s_%s_get(Evas_Object *o, "type"*value)\n"                              \
-  "{\n"                                                                       \
-  "   if (!value) return EINA_FALSE;\n\n"                                     \
-  "   Edje_External_Param param;\n\n"                                         \
-  "   param.name = \"%s\";\n"                                                 \
-  "   param.type = "param_type";\n"                                           \
-  "   if (!edje_object_part_external_param_get(o, \"%s\", &param))\n"         \
-  "     return EINA_FALSE;\n\n"                                               \
-  "   *value = param."field";\n"                                              \
-  "   return EINA_TRUE;\n"                                                    \
+#define C_CODEGEN_PART_EXTERNAL_PARAM_SET(type, param_type, field)                                                                                        \
+  "Eina_Bool\n"                                                                                                                                           \
+  "%s_%s_%s_set(Evas_Object *o, "type "value)\n"                                                                                                          \
+                                      "{\n"                                                                                                               \
+                                      "   Edje_External_Param param;\n\n"                                                                                 \
+                                      "   param.name = \"%s\";\n"                                                                                         \
+                                      "   param.type = "param_type ";\n"                                                                                  \
+                                                                   "   param."field " = value;\n"                                                         \
+                                                                                    "   return edje_object_part_external_param_set(o, \"%s\", &param);\n" \
+                                                                                    "}\n\n"
+
+#define H_CODEGEN_PART_EXTERNAL_PARAM_SET(type) \
+  "Eina_Bool %s_%s_%s_set(Evas_Object *o, "type "value);\n"
+
+#define C_CODEGEN_PART_EXTERNAL_PARAM_GET(type, param_type, field)                                                                     \
+  "Eina_Bool\n"                                                                                                                        \
+  "%s_%s_%s_get(Evas_Object *o, "type "*value)\n"                                                                                      \
+                                      "{\n"                                                                                            \
+                                      "   if (!value) return EINA_FALSE;\n\n"                                                          \
+                                      "   Edje_External_Param param;\n\n"                                                              \
+                                      "   param.name = \"%s\";\n"                                                                      \
+                                      "   param.type = "param_type ";\n"                                                               \
+                                                                   "   if (!edje_object_part_external_param_get(o, \"%s\", &param))\n" \
+                                                                   "     return EINA_FALSE;\n\n"                                       \
+                                                                   "   *value = param."field ";\n"                                     \
+                                                                                             "   return EINA_TRUE;\n"                  \
+                                                                                             "}\n\n"
+
+#define H_CODEGEN_PART_EXTERNAL_PARAM_GET(type) \
+  "Eina_Bool %s_%s_%s_get(Evas_Object *o, "type "*value);\n"
+
+#define C_CODEGEN_PROGRAM_EMIT                       \
+  "void\n"                                           \
+  "%s_%s_emit(Evas_Object *o)\n"                     \
+  "{\n"                                              \
+  "   edje_object_signal_emit(o, \"%s\", \"%s\");\n" \
   "}\n\n"
 
-#define H_CODEGEN_PART_EXTERNAL_PARAM_GET(type)               \
-  "Eina_Bool %s_%s_%s_get(Evas_Object *o, "type"*value);\n"
-
-#define C_CODEGEN_PROGRAM_EMIT                          \
-  "void\n"                                              \
-  "%s_%s_emit(Evas_Object *o)\n"                        \
-  "{\n"                                                 \
-  "   edje_object_signal_emit(o, \"%s\", \"%s\");\n"    \
-  "}\n\n"
-
-#define H_CODEGEN_PROGRAM_EMIT         \
+#define H_CODEGEN_PROGRAM_EMIT \
   "void %s_%s_emit(Evas_Object *o);\n"
 
-#define C_CODEGEN_PROGRAM_CALLBACK_ADD                                        \
-  "void\n"                                                                    \
-  "%s_%s_callback_add(Evas_Object *o, Edje_Signal_Cb func, void *data)\n"     \
-  "{\n"                                                                       \
-  "   edje_object_signal_callback_add(o, \"%s\", \"%s\", func, data);\n"      \
+#define C_CODEGEN_PROGRAM_CALLBACK_ADD                                    \
+  "void\n"                                                                \
+  "%s_%s_callback_add(Evas_Object *o, Edje_Signal_Cb func, void *data)\n" \
+  "{\n"                                                                   \
+  "   edje_object_signal_callback_add(o, \"%s\", \"%s\", func, data);\n"  \
   "}\n\n"
 
-#define H_CODEGEN_PROGRAM_CALLBACK_ADD                                  \
-  "void %s_%s_callback_add(Evas_Object *o, Edje_Signal_Cb func, "       \
+#define H_CODEGEN_PROGRAM_CALLBACK_ADD                            \
+  "void %s_%s_callback_add(Evas_Object *o, Edje_Signal_Cb func, " \
   "void *data);\n"
 
-#define C_CODEGEN_PROGRAM_CALLBACK_DEL                                          \
-  "void\n"                                                                      \
-  "%s_%s_callback_del_full(Evas_Object *o, Edje_Signal_Cb func, void *data)\n"  \
-  "{\n"                                                                         \
-  "   edje_object_signal_callback_del_full(o, \"%s\", \"%s\", func, data);\n"   \
+#define C_CODEGEN_PROGRAM_CALLBACK_DEL                                         \
+  "void\n"                                                                     \
+  "%s_%s_callback_del_full(Evas_Object *o, Edje_Signal_Cb func, void *data)\n" \
+  "{\n"                                                                        \
+  "   edje_object_signal_callback_del_full(o, \"%s\", \"%s\", func, data);\n"  \
   "}\n\n"
 
-#define H_CODEGEN_PROGRAM_CALLBACK_DEL                                  \
-  "void %s_%s_callback_del_full(Evas_Object *o, Edje_Signal_Cb func, "  \
+#define H_CODEGEN_PROGRAM_CALLBACK_DEL                                 \
+  "void %s_%s_callback_del_full(Evas_Object *o, Edje_Signal_Cb func, " \
   "void *data);\n"
 
-
 typedef struct _Part_External_Info Part_External_Info;
-struct _Part_External_Info {
-  const char *description, *name, *source;
-  char *apiname;
-  Eina_Bool draggable;
+struct _Part_External_Info
+{
+   const char *description, *name, *source;
+   char       *apiname;
+   Eina_Bool   draggable;
 };
 
 const Ecore_Getopt optdesc = {
-  "edje_codegen",
-  "%prog [options] <file.edj> <group> <source_file_name> <header_file_name>",
-  PACKAGE_VERSION,
-  "(C) 2012 - The Enlightenment Project",
-  "BSD",
-  "Edje generates the boilerplate code to get and set the "
-  "parts of a group from a compiled (binary) edje "
-  "file avoiding common errors with typos.\n",
-  0,
-  {
-    ECORE_GETOPT_STORE_STR('p', "prefix", "The prefix for the " \
-			   "generataed code."),
-    ECORE_GETOPT_LICENSE('L', "license"),
-    ECORE_GETOPT_COPYRIGHT('C', "copyright"),
-    ECORE_GETOPT_VERSION('V', "version"),
-    ECORE_GETOPT_HELP('h', "help"),
-    ECORE_GETOPT_SENTINEL
-  }
+   "edje_codegen",
+   "%prog [options] <file.edj> <group> <source_file_name> <header_file_name>",
+   PACKAGE_VERSION,
+   "(C) 2012 - The Enlightenment Project",
+   "BSD",
+   "Edje generates the boilerplate code to get and set the "
+   "parts of a group from a compiled (binary) edje "
+   "file avoiding common errors with typos.\n",
+   0,
+   {
+      ECORE_GETOPT_STORE_STR('p', "prefix", "The prefix for the " \
+                                            "generataed code."),
+      ECORE_GETOPT_LICENSE('L', "license"),
+      ECORE_GETOPT_COPYRIGHT('C', "copyright"),
+      ECORE_GETOPT_VERSION('V', "version"),
+      ECORE_GETOPT_HELP('h', "help"),
+      ECORE_GETOPT_SENTINEL
+   }
 };
 
 static char *
@@ -397,7 +397,7 @@ _open_file_descriptors(const char *source, const char *header)
 
    return EINA_TRUE;
 
- err:
+err:
    fclose(header_fd);
    return EINA_FALSE;
 }
@@ -426,15 +426,15 @@ _write_headers(const char *filename)
    snprintf(buf, sizeof(buf), H_HEADER, str, str);
    if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
      {
-	free(str);
-	return EINA_FALSE;
+        free(str);
+        return EINA_FALSE;
      }
 
    free(str);
 
    snprintf(buf, sizeof(buf), C_HEADER, filename);
    if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
-	return EINA_FALSE;
+     return EINA_FALSE;
 
    return EINA_TRUE;
 }
@@ -449,8 +449,8 @@ _write_footer(const char *filename)
    snprintf(buf, sizeof(buf), H_FOOTER, str);
    if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
      {
-	free(str);
-	return EINA_FALSE;
+        free(str);
+        return EINA_FALSE;
      }
 
    free(str);
@@ -479,20 +479,20 @@ _write_part_draggable(const char *apiname, const char *partname)
 {
    char buf[1024];
 
-#define TEMPLATE_DRAGGABLE(sufix, option)                               \
-   do {                                                                 \
-     const char *template;                                              \
-     template = C_CODEGEN_DRAG_##sufix(option);                         \
-     snprintf(buf, sizeof(buf), template, prefix, apiname,              \
-              partname);                                                \
-     if (fwrite(buf, strlen(buf), 1, source_fd) != 1)                   \
-       return EINA_FALSE;                                               \
-     template = H_CODEGEN_DRAG_##sufix(option);                         \
-     snprintf(buf, sizeof(buf), template, prefix,                       \
-              apiname);                                                 \
-     if (fwrite(buf, strlen(buf), 1, header_fd) != 1)                   \
-       return EINA_FALSE;                                               \
-   } while (0)
+#define TEMPLATE_DRAGGABLE(sufix, option)                    \
+  do {                                                       \
+       const char *template;                                 \
+       template = C_CODEGEN_DRAG_##sufix(option);            \
+       snprintf(buf, sizeof(buf), template, prefix, apiname, \
+                partname);                                   \
+       if (fwrite(buf, strlen(buf), 1, source_fd) != 1)      \
+         return EINA_FALSE;                                  \
+       template = H_CODEGEN_DRAG_##sufix(option);            \
+       snprintf(buf, sizeof(buf), template, prefix,          \
+                apiname);                                    \
+       if (fwrite(buf, strlen(buf), 1, header_fd) != 1)      \
+         return EINA_FALSE;                                  \
+    } while (0)
 
    TEMPLATE_DRAGGABLE(SET, value);
    TEMPLATE_DRAGGABLE(GET, value);
@@ -508,7 +508,7 @@ _write_part_draggable(const char *apiname, const char *partname)
 #undef TEMPLATE_DRAGGABLE
 
    snprintf(buf, sizeof(buf), C_CODEGEN_DRAG_DIR_GET, prefix,
-	    apiname, partname);
+            apiname, partname);
    if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
      return EINA_FALSE;
    snprintf(buf, sizeof(buf), H_CODEGEN_DRAG_DIR_GET, prefix, apiname);
@@ -520,55 +520,60 @@ _write_part_draggable(const char *apiname, const char *partname)
 
 static Eina_Bool
 _write_part_external_param(const Part_External_Info *info,
-			   const Edje_External_Param_Info *param)
+                           const Edje_External_Param_Info *param)
 {
    const char *template;
    char buf[1024];
 
-#define WRITE_TEMPLATE(type, param_type, field)		                     \
-   do {                                                                      \
-      template = C_CODEGEN_PART_EXTERNAL_PARAM_SET(type, param_type, field); \
-      snprintf(buf, sizeof(buf), template, info->apiname, info->name,        \
-	      param->name, param->name, info->name);                         \
-      if (fwrite(buf, strlen(buf), 1, source_fd) != 1)                       \
-	return EINA_FALSE;                                                   \
-      template = H_CODEGEN_PART_EXTERNAL_PARAM_SET(type);                    \
-      snprintf(buf, sizeof(buf), template, info->apiname, info->name,        \
-	       param->name);                                                 \
-      if (fwrite(buf, strlen(buf), 1, header_fd) != 1)                       \
-	return EINA_FALSE;                                                   \
-      template =                                                             \
-	C_CODEGEN_PART_EXTERNAL_PARAM_GET(type, param_type, field);          \
-      snprintf(buf, sizeof(buf), template, info->apiname, info->name,        \
-	      param->name, param->name, info->name);                         \
-      if (fwrite(buf, strlen(buf), 1, source_fd) != 1)                       \
-	return EINA_FALSE;                                                   \
-      template = H_CODEGEN_PART_EXTERNAL_PARAM_GET(type);                    \
-      snprintf(buf, sizeof(buf), template, info->apiname, info->name,        \
-	       param->name);                                                 \
-      if (fwrite(buf, strlen(buf), 1, header_fd) != 1)                       \
-	return EINA_FALSE;                                                   \
-   } while (0)
+#define WRITE_TEMPLATE(type, param_type, field)                               \
+  do {                                                                        \
+       template = C_CODEGEN_PART_EXTERNAL_PARAM_SET(type, param_type, field); \
+       snprintf(buf, sizeof(buf), template, info->apiname, info->name,        \
+                param->name, param->name, info->name);                        \
+       if (fwrite(buf, strlen(buf), 1, source_fd) != 1)                       \
+         return EINA_FALSE;                                                   \
+       template = H_CODEGEN_PART_EXTERNAL_PARAM_SET(type);                    \
+       snprintf(buf, sizeof(buf), template, info->apiname, info->name,        \
+                param->name);                                                 \
+       if (fwrite(buf, strlen(buf), 1, header_fd) != 1)                       \
+         return EINA_FALSE;                                                   \
+       template =                                                             \
+         C_CODEGEN_PART_EXTERNAL_PARAM_GET(type, param_type, field);          \
+       snprintf(buf, sizeof(buf), template, info->apiname, info->name,        \
+                param->name, param->name, info->name);                        \
+       if (fwrite(buf, strlen(buf), 1, source_fd) != 1)                       \
+         return EINA_FALSE;                                                   \
+       template = H_CODEGEN_PART_EXTERNAL_PARAM_GET(type);                    \
+       snprintf(buf, sizeof(buf), template, info->apiname, info->name,        \
+                param->name);                                                 \
+       if (fwrite(buf, strlen(buf), 1, header_fd) != 1)                       \
+         return EINA_FALSE;                                                   \
+    } while (0)
 
    switch (param->type)
      {
       case EDJE_EXTERNAL_PARAM_TYPE_INT:
-	 WRITE_TEMPLATE("int ", "EDJE_EXTERNAL_PARAM_TYPE_INT", "i");
-	 break;
+        WRITE_TEMPLATE("int ", "EDJE_EXTERNAL_PARAM_TYPE_INT", "i");
+        break;
+
       case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-	 WRITE_TEMPLATE("double ", "EDJE_EXTERNAL_PARAM_TYPE_DOUBLE", "d");
-	 break;
+        WRITE_TEMPLATE("double ", "EDJE_EXTERNAL_PARAM_TYPE_DOUBLE", "d");
+        break;
+
       case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-	 WRITE_TEMPLATE("const char *", "EDJE_EXTERNAL_PARAM_TYPE_STRING", "s");
-	 break;
+        WRITE_TEMPLATE("const char *", "EDJE_EXTERNAL_PARAM_TYPE_STRING", "s");
+        break;
+
       case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-	 WRITE_TEMPLATE("Eina_Bool ", "EDJE_EXTERNAL_PARAM_TYPE_BOOL", "i");
-	 break;
+        WRITE_TEMPLATE("Eina_Bool ", "EDJE_EXTERNAL_PARAM_TYPE_BOOL", "i");
+        break;
+
       case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
-	 WRITE_TEMPLATE("const char *", "EDJE_EXTERNAL_PARAM_TYPE_CHOICE", "s");
-	 break;
+        WRITE_TEMPLATE("const char *", "EDJE_EXTERNAL_PARAM_TYPE_CHOICE", "s");
+        break;
+
       default:
-         break;
+        break;
      }
 
 #undef WRITE_TEMPLATE
@@ -606,49 +611,48 @@ _write_part_external(Eina_List **parts)
              continue;
           }
 
-	EINA_LIST_FOREACH_SAFE(*parts, l, l_next, ei)
-	  {
-	     if (!strcmp(ei->source, name))
-	       {
-		  if (ei->description)
-		    {
-		       snprintf(buf, sizeof(buf), "\n/**\n * @brief %s\n */\n",
-				ei->description);
-		       if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
-			 {
-			    ret = EINA_FALSE;
-			    goto end;
-			 }
-		    }
+        EINA_LIST_FOREACH_SAFE(*parts, l, l_next, ei)
+          {
+             if (!strcmp(ei->source, name))
+               {
+                  if (ei->description)
+                    {
+                       snprintf(buf, sizeof(buf), "\n/**\n * @brief %s\n */\n",
+                                ei->description);
+                       if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
+                         {
+                            ret = EINA_FALSE;
+                            goto end;
+                         }
+                    }
 
                   if (ei->draggable)
                     {
-		       if (!_write_part_draggable(ei->apiname, ei->name))
-			 {
-			    ret = EINA_FALSE;
-			    goto end;
-			 }
+                       if (!_write_part_draggable(ei->apiname, ei->name))
+                         {
+                            ret = EINA_FALSE;
+                            goto end;
+                         }
                     }
 
-		  for (param = type->parameters_info; param->name != NULL;
-		       param++)
-		    if (!_write_part_external_param(ei, param))
-		      {
-			 ret = EINA_FALSE;
-			 goto end;
-		      }
+                  for (param = type->parameters_info; param->name != NULL;
+                       param++)
+                    if (!_write_part_external_param(ei, param))
+                      {
+                         ret = EINA_FALSE;
+                         goto end;
+                      }
 
-		  edje_edit_string_free(ei->description);
-		  free(ei->apiname);
-		  free(ei);
+                  edje_edit_string_free(ei->description);
+                  free(ei->apiname);
+                  free(ei);
 
-		  *parts = eina_list_remove_list(*parts, l);
-
-	       }
-	  }
+                  *parts = eina_list_remove_list(*parts, l);
+               }
+          }
      }
 
- end:
+end:
    if (eina_list_count(*parts) == 0) *parts = NULL;
    eina_iterator_free(itr);
 
@@ -661,57 +665,57 @@ _write_part(const char *apiname, const char *partname, Edje_Part_Type parttype,
 {
    char buf[512];
 
-#define TEMPLATE_NAME(sufix)                                     \
-   do {                                                          \
-     snprintf(buf, sizeof(buf), C_CODEGEN_##sufix, prefix,       \
-              apiname, partname);                                \
-     if (fwrite(buf, strlen(buf), 1, source_fd) != 1)            \
-       goto err;                                                 \
-     snprintf(buf, sizeof(buf), H_CODEGEN_##sufix, prefix,       \
-              apiname);                                          \
-     if (fwrite(buf, strlen(buf), 1, header_fd) != 1)            \
-       goto err;                                                 \
-   } while (0)
+#define TEMPLATE_NAME(sufix)                                 \
+  do {                                                       \
+       snprintf(buf, sizeof(buf), C_CODEGEN_##sufix, prefix, \
+                apiname, partname);                          \
+       if (fwrite(buf, strlen(buf), 1, source_fd) != 1)      \
+         goto err;                                           \
+       snprintf(buf, sizeof(buf), H_CODEGEN_##sufix, prefix, \
+                apiname);                                    \
+       if (fwrite(buf, strlen(buf), 1, header_fd) != 1)      \
+         goto err;                                           \
+    } while (0)
 
    if (description)
      {
-	snprintf(buf, sizeof(buf), "\n/**\n * @brief %s\n */\n", description);
-	if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
-	  goto err;
+        snprintf(buf, sizeof(buf), "\n/**\n * @brief %s\n */\n", description);
+        if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
+          goto err;
      }
 
    switch (parttype)
      {
       case EDJE_PART_TYPE_BOX:
-	 TEMPLATE_NAME(PART_BOX_APPEND);
-	 TEMPLATE_NAME(PART_BOX_PREPEND);
-	 TEMPLATE_NAME(PART_BOX_INSERT_BEFORE);
-	 TEMPLATE_NAME(PART_BOX_INSERT_AT);
-	 TEMPLATE_NAME(PART_BOX_REMOVE);
-	 TEMPLATE_NAME(PART_BOX_REMOVE_AT);
-	 TEMPLATE_NAME(PART_BOX_REMOVE_ALL);
-	 break;
+        TEMPLATE_NAME(PART_BOX_APPEND);
+        TEMPLATE_NAME(PART_BOX_PREPEND);
+        TEMPLATE_NAME(PART_BOX_INSERT_BEFORE);
+        TEMPLATE_NAME(PART_BOX_INSERT_AT);
+        TEMPLATE_NAME(PART_BOX_REMOVE);
+        TEMPLATE_NAME(PART_BOX_REMOVE_AT);
+        TEMPLATE_NAME(PART_BOX_REMOVE_ALL);
+        break;
 
       case EDJE_PART_TYPE_TABLE:
-	 TEMPLATE_NAME(PART_TABLE_PACK);
-	 TEMPLATE_NAME(PART_TABLE_UNPACK);
-	 TEMPLATE_NAME(PART_TABLE_CHILD_GET);
-	 TEMPLATE_NAME(PART_TABLE_CLEAR);
-	 TEMPLATE_NAME(PART_TABLE_COL_ROW_SIZE_GET);
-	 break;
+        TEMPLATE_NAME(PART_TABLE_PACK);
+        TEMPLATE_NAME(PART_TABLE_UNPACK);
+        TEMPLATE_NAME(PART_TABLE_CHILD_GET);
+        TEMPLATE_NAME(PART_TABLE_CLEAR);
+        TEMPLATE_NAME(PART_TABLE_COL_ROW_SIZE_GET);
+        break;
 
       case EDJE_PART_TYPE_TEXT:
-	 TEMPLATE_NAME(PART_TEXT_SET);
-	 TEMPLATE_NAME(PART_TEXT_GET);
-	 break;
+        TEMPLATE_NAME(PART_TEXT_SET);
+        TEMPLATE_NAME(PART_TEXT_GET);
+        break;
 
       case EDJE_PART_TYPE_SWALLOW:
-	 TEMPLATE_NAME(PART_SWALLOW_SET);
-	 TEMPLATE_NAME(PART_SWALLOW_GET);
-	 break;
+        TEMPLATE_NAME(PART_SWALLOW_SET);
+        TEMPLATE_NAME(PART_SWALLOW_GET);
+        break;
 
       default:
-	 break;
+        break;
      }
 
    if (draggable)
@@ -722,7 +726,7 @@ _write_part(const char *apiname, const char *partname, Edje_Part_Type parttype,
 
    return EINA_TRUE;
 
- err:
+err:
    ERR("Could not write the part: %s", partname);
    return EINA_FALSE;
 }
@@ -783,71 +787,71 @@ _parse_parts(Evas_Object *ed)
    parts = edje_edit_parts_list_get(ed);
    EINA_LIST_FOREACH(parts, l, name)
      {
-	if (!(apiname = _part_api_name_get(ed, name)))
-	  {
-	     DBG("filter out part '%s': not API.", name);
-	     continue;
-	  }
-
-	type = edje_edit_part_type_get(ed, name);
-	if (!((type == EDJE_PART_TYPE_TEXT)      ||
-	      (type == EDJE_PART_TYPE_SWALLOW)   ||
-	      (type == EDJE_PART_TYPE_BOX)       ||
-	      (type == EDJE_PART_TYPE_EXTERNAL)  ||
-	      (type == EDJE_PART_TYPE_IMAGE)     ||
-	      (type == EDJE_PART_TYPE_TABLE)))
-	  {
-	     ERR("Invalid part type %d", type);
-	     free(apiname);
-	     continue;
-	  }
+        if (!(apiname = _part_api_name_get(ed, name)))
+          {
+             DBG("filter out part '%s': not API.", name);
+             continue;
+          }
+
+        type = edje_edit_part_type_get(ed, name);
+        if (!((type == EDJE_PART_TYPE_TEXT) ||
+              (type == EDJE_PART_TYPE_SWALLOW) ||
+              (type == EDJE_PART_TYPE_BOX) ||
+              (type == EDJE_PART_TYPE_EXTERNAL) ||
+              (type == EDJE_PART_TYPE_IMAGE) ||
+              (type == EDJE_PART_TYPE_TABLE)))
+          {
+             ERR("Invalid part type %d", type);
+             free(apiname);
+             continue;
+          }
         if (edje_edit_part_drag_x_get(ed, name) ||
             edje_edit_part_drag_y_get(ed, name))
-	  draggable = EINA_TRUE;
+          draggable = EINA_TRUE;
         else
-	  draggable = EINA_FALSE;
+          draggable = EINA_FALSE;
 
-	description = edje_edit_part_api_description_get(ed, name);
-	if (type == EDJE_PART_TYPE_EXTERNAL)
-	  {
-	     ei = calloc(1, sizeof(Part_External_Info));
-	     if (!ei)
+        description = edje_edit_part_api_description_get(ed, name);
+        if (type == EDJE_PART_TYPE_EXTERNAL)
+          {
+             ei = calloc(1, sizeof(Part_External_Info));
+             if (!ei)
                {
                   free(apiname);
                   goto end;
                }
-	     ei->description = description;
-	     ei->source = edje_edit_part_source_get(ed, name);
-	     ei->apiname = apiname;
-	     ei->name = name;
-	     ei->draggable = draggable;
-
-	     parts_external = eina_list_append(parts_external, ei);
-	  }
-	else
-	  {
-	     if (!_write_part(apiname, name, type, description, draggable))
-	       {
-		  ret = EINA_FALSE;
-		  edje_edit_string_free(description);
-		  free(apiname);
-		  goto end;
-	       }
-
-	     edje_edit_string_free(description);
-	     free(apiname);
-	  }
+             ei->description = description;
+             ei->source = edje_edit_part_source_get(ed, name);
+             ei->apiname = apiname;
+             ei->name = name;
+             ei->draggable = draggable;
+
+             parts_external = eina_list_append(parts_external, ei);
+          }
+        else
+          {
+             if (!_write_part(apiname, name, type, description, draggable))
+               {
+                  ret = EINA_FALSE;
+                  edje_edit_string_free(description);
+                  free(apiname);
+                  goto end;
+               }
+
+             edje_edit_string_free(description);
+             free(apiname);
+          }
      }
 
    ret = _write_part_external(&parts_external);
 
- end:
+end:
    edje_edit_string_list_free(parts);
    EINA_LIST_FREE(parts_external, ei)
      {
-	edje_edit_string_free(ei->description);
-	free(ei->apiname);
-	free(ei);
+        edje_edit_string_free(ei->description);
+        free(ei->apiname);
+        free(ei);
      }
 
    return ret;
@@ -855,70 +859,70 @@ _parse_parts(Evas_Object *ed)
 
 static Eina_Bool
 _write_program_emit(const char *apiname, const char *source, const char *sig,
-		    const char *description)
+                    const char *description)
 {
    char buf[512];
 
    snprintf(buf, sizeof(buf), C_CODEGEN_PROGRAM_EMIT, prefix,
-	    apiname, sig, source);
+            apiname, sig, source);
    if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
      goto err;
 
    if (description)
      {
-	snprintf(buf, sizeof(buf), "\n/**\n * @brief %s\n */\n", description);
-	if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
-	  goto err;
+        snprintf(buf, sizeof(buf), "\n/**\n * @brief %s\n */\n", description);
+        if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
+          goto err;
      }
 
    snprintf(buf, sizeof(buf), H_CODEGEN_PROGRAM_EMIT, prefix,
-	    apiname);
+            apiname);
    if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
      goto err;
 
    return EINA_TRUE;
 
- err:
+err:
    ERR("Could not write the program: %s", apiname);
    return EINA_FALSE;
 }
 
 static Eina_Bool
 _write_program_add(const char *apiname, const char *source, const char *sig,
-		   const char *description)
+                   const char *description)
 {
-  char buf[512];
+   char buf[512];
 
    snprintf(buf, sizeof(buf), C_CODEGEN_PROGRAM_CALLBACK_ADD, prefix,
-	    apiname, sig, source);
+            apiname, sig, source);
    if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
      goto err;
 
    snprintf(buf, sizeof(buf), C_CODEGEN_PROGRAM_CALLBACK_DEL, prefix,
-	    apiname, sig, source);
+            apiname, sig, source);
    if (fwrite(buf, strlen(buf), 1, source_fd) != 1)
      goto err;
 
    if (description)
      {
-	snprintf(buf, sizeof(buf), "\n/**\n * @brief %s\n */\n", description);
-	if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
-	  goto err;
+        snprintf(buf, sizeof(buf), "\n/**\n * @brief %s\n */\n", description);
+        if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
+          goto err;
      }
 
    snprintf(buf, sizeof(buf), H_CODEGEN_PROGRAM_CALLBACK_ADD, prefix,
-	    apiname);
+            apiname);
    if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
      goto err;
 
    snprintf(buf, sizeof(buf), H_CODEGEN_PROGRAM_CALLBACK_DEL, prefix,
-	    apiname);
+            apiname);
    if (fwrite(buf, strlen(buf), 1, header_fd) != 1)
      goto err;
 
    return EINA_TRUE;
 
- err:
+err:
    ERR("Could not write the program [action]: %s", apiname);
    return EINA_FALSE;
 }
@@ -948,68 +952,68 @@ _parse_programs(Evas_Object *ed)
    programs = edje_edit_programs_list_get(ed);
    EINA_LIST_FOREACH(programs, l, name)
      {
-	if (!(apiname = _program_api_name_get(ed, name)))
-	  {
-	     DBG("filter out program '%s': not API.", name);
-	     continue;
-	  }
-
-	description = edje_edit_program_api_description_get(ed, name);
-	type = edje_edit_program_action_get(ed, name);
-	if (type == EDJE_ACTION_TYPE_SIGNAL_EMIT)
-	  {
-	     const char *str, *str2;
-	     str = edje_edit_program_state_get(ed, name);
-	     str2 = edje_edit_program_state2_get(ed, name);
-
-	     if (!_write_program_add(apiname, str2, str, description))
-	       {
-		  ret = EINA_FALSE;
-		  edje_edit_string_free(str);
-		  edje_edit_string_free(str2);
-		  break;
-	       }
-
-	     edje_edit_string_free(str);
-	     edje_edit_string_free(str2);
-	  }
-
-	sig = edje_edit_program_signal_get(ed, name);
-	if (!sig)
-	  {
-	     free(apiname);
-	     edje_edit_string_free(description);
-	     continue;
-	  }
-
-	source = edje_edit_program_source_get(ed, name);
-	if (!source)
-	  {
-	     free(apiname);
-	     edje_edit_string_free(sig);
-	     edje_edit_string_free(description);
-	     continue;
-	  }
-
-	if (!_write_program_emit(apiname, source, sig, description))
-	  {
-	     ret = EINA_FALSE;
-	     break;
-	  }
-
-	edje_edit_string_free(description);
-	edje_edit_string_free(sig);
-	edje_edit_string_free(source);
-	free(apiname);
+        if (!(apiname = _program_api_name_get(ed, name)))
+          {
+             DBG("filter out program '%s': not API.", name);
+             continue;
+          }
+
+        description = edje_edit_program_api_description_get(ed, name);
+        type = edje_edit_program_action_get(ed, name);
+        if (type == EDJE_ACTION_TYPE_SIGNAL_EMIT)
+          {
+             const char *str, *str2;
+             str = edje_edit_program_state_get(ed, name);
+             str2 = edje_edit_program_state2_get(ed, name);
+
+             if (!_write_program_add(apiname, str2, str, description))
+               {
+                  ret = EINA_FALSE;
+                  edje_edit_string_free(str);
+                  edje_edit_string_free(str2);
+                  break;
+               }
+
+             edje_edit_string_free(str);
+             edje_edit_string_free(str2);
+          }
+
+        sig = edje_edit_program_signal_get(ed, name);
+        if (!sig)
+          {
+             free(apiname);
+             edje_edit_string_free(description);
+             continue;
+          }
+
+        source = edje_edit_program_source_get(ed, name);
+        if (!source)
+          {
+             free(apiname);
+             edje_edit_string_free(sig);
+             edje_edit_string_free(description);
+             continue;
+          }
+
+        if (!_write_program_emit(apiname, source, sig, description))
+          {
+             ret = EINA_FALSE;
+             break;
+          }
+
+        edje_edit_string_free(description);
+        edje_edit_string_free(sig);
+        edje_edit_string_free(source);
+        free(apiname);
      }
 
    edje_edit_string_list_free(programs);
    if (!ret)
      {
-	edje_edit_string_free(description);
-	edje_edit_string_free(sig);
-	edje_edit_string_free(source);
-	free(apiname);
+        edje_edit_string_free(description);
+        edje_edit_string_free(sig);
+        edje_edit_string_free(source);
+        free(apiname);
      }
 
    return ret;
@@ -1023,8 +1027,8 @@ _module_matches(const char *module)
 
    EINA_LIST_FOREACH(externals, l, name)
      {
-	if (!strcmp(module, name))
-	  return EINA_TRUE;
+        if (!strcmp(module, name))
+          return EINA_TRUE;
      }
 
    return EINA_FALSE;
@@ -1043,36 +1047,36 @@ _parse(void)
    ed = edje_edit_object_add(ecore_evas_get(ee));
    if (!edje_object_file_set(ed, file, group))
      {
-	Edje_Load_Error err = edje_object_load_error_get(ed);
-	const char *errmsg = edje_load_error_str(err);
-	ERR("could not load group '%s' from file '%s': %s",
-	    group, file, errmsg);
-	evas_object_del(ed);
-	return EINA_FALSE;
+        Edje_Load_Error err = edje_object_load_error_get(ed);
+        const char *errmsg = edje_load_error_str(err);
+        ERR("could not load group '%s' from file '%s': %s",
+            group, file, errmsg);
+        evas_object_del(ed);
+        return EINA_FALSE;
      }
 
    externals = edje_edit_externals_list_get(ed);
    if (externals)
      {
-	EINA_LIST_FOREACH(modules_available, l, module_name)
-	  {
-	     if (_module_matches(module_name))
-	       {
-		  if (!edje_module_load(module_name))
-		    {
-		       ERR("error loading external '%s'", module_name);
-		       continue;
-		    }
-		  modules_loaded++;
-	       }
-	  }
+        EINA_LIST_FOREACH(modules_available, l, module_name)
+          {
+             if (_module_matches(module_name))
+               {
+                  if (!edje_module_load(module_name))
+                    {
+                       ERR("error loading external '%s'", module_name);
+                       continue;
+                    }
+                  modules_loaded++;
+               }
+          }
      }
 
    if (eina_list_count(externals) != modules_loaded)
      {
-	edje_edit_string_list_free(externals);
-	evas_object_del(ed);
-	return EINA_FALSE;
+        edje_edit_string_list_free(externals);
+        evas_object_del(ed);
+        return EINA_FALSE;
      }
 
    ret = _parse_parts(ed) && _parse_programs(ed);
@@ -1088,12 +1092,12 @@ main(int argc, char *argv[])
    char *source, *header;
    int arg_index, ret = 0;
    Ecore_Getopt_Value values[] = {
-     ECORE_GETOPT_VALUE_STR(prefix),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_NONE
+      ECORE_GETOPT_VALUE_STR(prefix),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_NONE
    };
 
    setlocale(LC_NUMERIC, "C");
@@ -1109,7 +1113,7 @@ main(int argc, char *argv[])
      {
         fprintf(stderr, "Missing action. See '--help or -h'.\n");
         ret = 1;
-	goto error_log;
+        goto error_log;
      }
 
    _log_dom = eina_log_domain_register("edje_codegen", EINA_COLOR_YELLOW);
@@ -1127,13 +1131,14 @@ main(int argc, char *argv[])
         ret = 1;
         goto error_getopt;
      }
-   else if (quit_option) goto error_getopt;
+   else if (quit_option)
+     goto error_getopt;
    else if (arg_index != argc - 4)
      {
-        fprintf(stderr, "Incorrect number of parameters. Requires "	\
-		"fours arguments, an edje, the group, "			\
-		"the source output (foo.c) and the header(foo.h).\n"    \
-		"See %s --help\n", argv[0]);
+        fprintf(stderr, "Incorrect number of parameters. Requires "          \
+                        "fours arguments, an edje, the group, "              \
+                        "the source output (foo.c) and the header(foo.h).\n" \
+                        "See %s --help\n", argv[0]);
         ret = 1;
         goto error_getopt;
      }
@@ -1155,70 +1160,70 @@ main(int argc, char *argv[])
 
    if (!edje_file_group_exists(file, group))
      {
-	ERR("The group %s not exists", group);
-	ret = 2;
-	goto error_getopt;
+        ERR("The group %s not exists", group);
+        ret = 2;
+        goto error_getopt;
      }
 
    ee = ecore_evas_buffer_new(1, 1);
    if (!ee)
      {
-	ERR("could not create ecore_evas_buffer");
-	ret = 3;
-	goto error_getopt;
+        ERR("could not create ecore_evas_buffer");
+        ret = 3;
+        goto error_getopt;
      }
 
    if (!_open_file_descriptors(source, header))
      {
-	ERR("Could not create the source files, error %d (%s)",
-	    errno, strerror(errno));
-	ret = 4;
-	goto error_getopt;
+        ERR("Could not create the source files, error %d (%s)",
+            errno, strerror(errno));
+        ret = 4;
+        goto error_getopt;
      }
 
    if (!_write_headers(header))
      {
-	ERR("Could not write the header, error %d (%s)",
-	    errno, strerror(errno));
-	ret = 5;
-	goto error_getopt;
+        ERR("Could not write the header, error %d (%s)",
+            errno, strerror(errno));
+        ret = 5;
+        goto error_getopt;
      }
 
    if (!_write_object_get())
      {
-	ERR("Could not write the object get, error %d (%s)",
-	    errno, strerror(errno));
-	ret = 6;
-	goto error_getopt;
+        ERR("Could not write the object get, error %d (%s)",
+            errno, strerror(errno));
+        ret = 6;
+        goto error_getopt;
      }
 
    if (!_parse())
      {
-	ERR("Could not parsing the EDJE");
-	ret = 7;
-	goto error_getopt;
+        ERR("Could not parsing the EDJE");
+        ret = 7;
+        goto error_getopt;
      }
 
    if (!_write_footer(header))
      {
-	ERR("Could not write the footer, error %d (%s)",
-	    errno, strerror(errno));
-	ret = 8;
-	goto error_getopt;
+        ERR("Could not write the footer, error %d (%s)",
+            errno, strerror(errno));
+        ret = 8;
+        goto error_getopt;
      }
 
    if (!_close_file_descriptors())
      {
-	ERR("Could not close the source files, error %d (%s)",
-	    errno, strerror(errno));
-	ret = 9;
+        ERR("Could not close the source files, error %d (%s)",
+            errno, strerror(errno));
+        ret = 9;
      }
 
- error_getopt:
+error_getopt:
    if (ee)
      ecore_evas_free(ee);
 
- error_log:
+error_log:
    edje_shutdown();
    ecore_evas_shutdown();
    ecore_shutdown();
@@ -1227,9 +1232,10 @@ main(int argc, char *argv[])
 
    if (ret > 4)
      {
-	unlink(header);
-	unlink(source);
+        unlink(header);
+        unlink(source);
      }
 
    return ret;
 }
+
diff --git a/src/bin/edje/edje_convert.c b/src/bin/edje/edje_convert.c
index eb113a7fee..4e81ff1b28 100644
--- a/src/bin/edje/edje_convert.c
+++ b/src/bin/edje/edje_convert.c
@@ -37,8 +37,8 @@ _edje_file_convert_external(Edje_File *edf, Old_Edje_File *oedf)
 
    EINA_LIST_FREE(oedf->external_dir->entries, ede)
      {
-	edf->external_dir->entries[i++].entry = ede->entry;
-	free(ede);
+        edf->external_dir->entries[i++].entry = ede->entry;
+        free(ede);
      }
 
    free(oedf->external_dir);
@@ -72,10 +72,10 @@ _edje_file_convert_images(Edje_File *edf, Old_Edje_File *oedf)
 
    EINA_LIST_FREE(oedf->image_dir->entries, de)
      {
-	memcpy(edf->image_dir->entries + de->id,
-	       de,
-	       sizeof (Edje_Image_Directory_Entry));
-	free(de);
+        memcpy(edf->image_dir->entries + de->id,
+               de,
+               sizeof (Edje_Image_Directory_Entry));
+        free(de);
      }
 
    max = -1;
@@ -88,17 +88,17 @@ _edje_file_convert_images(Edje_File *edf, Old_Edje_File *oedf)
 
    if (!edf->image_dir->sets && edf->image_dir->sets_count)
      {
-	free(edf->image_dir->entries);
-	edf->image_dir->entries = NULL;
-	return EINA_FALSE;
+        free(edf->image_dir->entries);
+        edf->image_dir->entries = NULL;
+        return EINA_FALSE;
      }
 
    EINA_LIST_FREE(oedf->image_dir->sets, ds)
      {
-	memcpy(edf->image_dir->sets + ds->id,
-	       ds,
-	       sizeof (Edje_Image_Directory_Set));
-	free(ds);
+        memcpy(edf->image_dir->sets + ds->id,
+               ds,
+               sizeof (Edje_Image_Directory_Set));
+        free(ds);
      }
 
    return EINA_TRUE;
@@ -129,15 +129,15 @@ _edje_file_convert(Eet_File *ef, Old_Edje_File *oedf)
 
    EINA_LIST_FREE(oedf->data, ed)
      {
-	Edje_String *es;
+        Edje_String *es;
 
-	es = calloc(1, sizeof (Edje_String));
-	if (!es) continue;
+        es = calloc(1, sizeof (Edje_String));
+        if (!es) continue;
 
-	es->str = ed->value;
+        es->str = ed->value;
 
-	eina_hash_direct_add(edf->data, ed->key, es);
-	free(ed);
+        eina_hash_direct_add(edf->data, ed->key, es);
+        free(ed);
      }
 
    EINA_LIST_FOREACH(oedf->collection_dir->entries, l, ce)
@@ -148,7 +148,7 @@ _edje_file_convert(Eet_File *ef, Old_Edje_File *oedf)
 
    if (oedf->font_dir)
      EINA_LIST_FOREACH(oedf->font_dir->entries, l, fnt)
-        eina_hash_direct_add(edf->fonts, fnt->entry, fnt);
+       eina_hash_direct_add(edf->fonts, fnt->entry, fnt);
 
    if (!_edje_file_convert_images(edf, oedf))
      goto on_error;
@@ -174,7 +174,7 @@ _edje_file_convert(Eet_File *ef, Old_Edje_File *oedf)
 
    return edf;
 
- on_error:
+on_error:
    eina_hash_free(edf->fonts);
    eina_hash_free(edf->collection);
    eina_hash_free(edf->data);
@@ -186,12 +186,12 @@ _edje_file_convert(Eet_File *ef, Old_Edje_File *oedf)
 
 static void
 _edje_collection_program_add(Edje_Program ***array,
-			     unsigned int *count,
-			     Edje_Program *add)
+                             unsigned int *count,
+                             Edje_Program *add)
 {
    Edje_Program **tmp;
 
-   tmp = realloc(*array, sizeof (Edje_Program*) * (*count + 1));
+   tmp = realloc(*array, sizeof (Edje_Program *) * (*count + 1));
    if (!tmp)
      {
         error_and_abort(ef, "Not enough memory");
@@ -218,40 +218,40 @@ _edje_collection_convert(Eet_File *ef, Edje_Part_Collection_Directory_Entry *ce,
    /* Count each type part and their respective state */
    EINA_LIST_FOREACH(oedc->parts, l, part)
      {
-	int *count;
-	int dummy = 0;
-
-
-	switch (part->type)
-	  {
-#define CSP(Tp, Ce)						\
-	     case EDJE_PART_TYPE_##Tp :				\
-		count = &Ce->count.Tp;				\
-		break;
-
-	     CSP(RECTANGLE, ce);
-	     CSP(TEXT, ce);
-	     CSP(IMAGE, ce);
-	     CSP(SWALLOW, ce);
-	     CSP(TEXTBLOCK, ce);
-	     CSP(GROUP, ce);
-	     CSP(BOX, ce);
-	     CSP(TABLE, ce);
-	     CSP(EXTERNAL, ce);
-       CSP(VECTOR, ce);
-	   default:
-	      count = &dummy;
-	      break;
-	  }
-
-	*count += eina_list_count(part->other_desc) + 1;
+        int *count;
+        int dummy = 0;
+
+        switch (part->type)
+          {
+#define CSP(Tp, Ce)       \
+case EDJE_PART_TYPE_##Tp: \
+  count = &Ce->count.Tp;  \
+  break;
+
+             CSP(RECTANGLE, ce);
+             CSP(TEXT, ce);
+             CSP(IMAGE, ce);
+             CSP(SWALLOW, ce);
+             CSP(TEXTBLOCK, ce);
+             CSP(GROUP, ce);
+             CSP(BOX, ce);
+             CSP(TABLE, ce);
+             CSP(EXTERNAL, ce);
+             CSP(VECTOR, ce);
+
+           default:
+             count = &dummy;
+             break;
+          }
+
+        *count += eina_list_count(part->other_desc) + 1;
      }
    ce->count.part = eina_list_count(oedc->parts);
 
-#define CONVERT_EMN(Tp, Sz, Ce)						\
-   buffer = alloca(strlen(ce->entry) + strlen(#Tp) + 2);		\
-   sprintf(buffer, "%s/%s", ce->entry, #Tp);				\
-   Ce->mp.Tp = eina_mempool_add("one_big", buffer, NULL, sizeof (Sz), Ce->count.Tp);
+#define CONVERT_EMN(Tp, Sz, Ce)                         \
+  buffer = alloca(strlen(ce->entry) + strlen(#Tp) + 2); \
+  sprintf(buffer, "%s/%s", ce->entry, #Tp);             \
+  Ce->mp.Tp = eina_mempool_add("one_big", buffer, NULL, sizeof (Sz), Ce->count.Tp);
 
    CONVERT_EMN(RECTANGLE, Edje_Part_Description_Common, ce);
    CONVERT_EMN(TEXT, Edje_Part_Description_Text, ce);
@@ -272,43 +272,43 @@ _edje_collection_convert(Eet_File *ef, Edje_Part_Collection_Directory_Entry *ce,
 
    EINA_LIST_FREE(oedc->programs, pg)
      {
-	if (!pg->signal && !pg->source)
-	  _edje_collection_program_add(&edc->programs.nocmp,
-				       &edc->programs.nocmp_count,
-				       pg);
-	else if (pg->signal && !strpbrk(pg->signal, "*?[\\")
-		 && pg->source && !strpbrk(pg->source, "*?[\\"))
-	  _edje_collection_program_add(&edc->programs.strcmp,
-				       &edc->programs.strcmp_count,
-				       pg);
-	else if (pg->signal && edje_program_is_strncmp(pg->signal)
-		 && pg->source && edje_program_is_strncmp(pg->source))
-	  _edje_collection_program_add(&edc->programs.strncmp,
-				       &edc->programs.strncmp_count,
-				       pg);
-	else if (pg->signal && edje_program_is_strrncmp(pg->signal)
-		 && pg->source && edje_program_is_strrncmp(pg->source))
-	  _edje_collection_program_add(&edc->programs.strrncmp,
-				       &edc->programs.strrncmp_count,
-				       pg);
-	else
-	  _edje_collection_program_add(&edc->programs.fnmatch,
-				       &edc->programs.fnmatch_count,
-				       pg);
+        if (!pg->signal && !pg->source)
+          _edje_collection_program_add(&edc->programs.nocmp,
+                                       &edc->programs.nocmp_count,
+                                       pg);
+        else if (pg->signal && !strpbrk(pg->signal, "*?[\\")
+                 && pg->source && !strpbrk(pg->source, "*?[\\"))
+          _edje_collection_program_add(&edc->programs.strcmp,
+                                       &edc->programs.strcmp_count,
+                                       pg);
+        else if (pg->signal && edje_program_is_strncmp(pg->signal)
+                 && pg->source && edje_program_is_strncmp(pg->source))
+          _edje_collection_program_add(&edc->programs.strncmp,
+                                       &edc->programs.strncmp_count,
+                                       pg);
+        else if (pg->signal && edje_program_is_strrncmp(pg->signal)
+                 && pg->source && edje_program_is_strrncmp(pg->source))
+          _edje_collection_program_add(&edc->programs.strrncmp,
+                                       &edc->programs.strrncmp_count,
+                                       pg);
+        else
+          _edje_collection_program_add(&edc->programs.fnmatch,
+                                       &edc->programs.fnmatch_count,
+                                       pg);
      }
 
    edc->data = eina_hash_string_small_new(NULL);
    EINA_LIST_FREE(oedc->data, di)
      {
-	Edje_String *es;
+        Edje_String *es;
 
-	es = calloc(1, sizeof (Edje_String));
-	if (!es) continue ;
+        es = calloc(1, sizeof (Edje_String));
+        if (!es) continue;
 
-	es->str = di->value;
+        es->str = di->value;
 
-	eina_hash_direct_add(edc->data, di->key, es);
-	free(di);
+        eina_hash_direct_add(edc->data, di->key, es);
+        free(di);
      }
 
    edc->parts_count = eina_list_count(oedc->parts);
@@ -319,60 +319,60 @@ _edje_collection_convert(Eet_File *ef, Edje_Part_Collection_Directory_Entry *ce,
 
    EINA_LIST_FREE(oedc->parts, part)
      {
-	Old_Edje_Part_Description *oepd;
-	Edje_Pack_Element *elm;
-	Edje_Part *replacement;
-	unsigned int i;
-
-	replacement = eina_mempool_malloc(ce->mp.part, sizeof (Edje_Part));
-	if (!replacement)
-	  error_and_abort(ef, "Not enough memory");
-
-	replacement->name = part->name;
-	replacement->default_desc = _edje_description_convert(part->type, ce, part->default_desc);
-
-	replacement->other.desc_count = eina_list_count(part->other_desc);
-	replacement->other.desc = calloc(replacement->other.desc_count, sizeof (Edje_Part_Description_Common*));
-
-	i = 0;
-	EINA_LIST_FREE(part->other_desc, oepd)
-	  replacement->other.desc[i++] = _edje_description_convert(part->type, ce, oepd);
-
-	replacement->source = part->source;
-	replacement->source2 = part->source2;
-	replacement->source3 = part->source3;
-	replacement->source4 = part->source4;
-	replacement->source5 = part->source5;
-	replacement->source6 = part->source6;
-	replacement->id = part->id;
-	replacement->clip_to_id = part->clip_to_id;
-	replacement->dragable = part->dragable;
-	replacement->items_count = eina_list_count(part->items);
-	replacement->items = calloc(replacement->items_count, sizeof (Edje_Pack_Element*));
-
-	i = 0;
-	EINA_LIST_FREE(part->items, elm)
-	  replacement->items[i++] = elm;
-
-	replacement->type = part->type;
-	replacement->effect = part->effect;
-	replacement->mouse_events = part->mouse_events;
-	replacement->repeat_events = part->repeat_events;
-	replacement->ignore_flags = part->ignore_flags;
-	replacement->mask_flags = part->mask_flags;
-	replacement->scale = part->scale;
-	replacement->precise_is_inside = part->precise_is_inside;
-	replacement->use_alternate_font_metrics = part->use_alternate_font_metrics;
-	replacement->pointer_mode = part->pointer_mode;
-	replacement->entry_mode = part->entry_mode;
-	replacement->select_mode = part->select_mode;
-	replacement->multiline = part->multiline;
-	replacement->api = part->api;
-	replacement->required = part->required;
-
-	edc->parts[k++] = replacement;
-
-	free(part);
+        Old_Edje_Part_Description *oepd;
+        Edje_Pack_Element *elm;
+        Edje_Part *replacement;
+        unsigned int i;
+
+        replacement = eina_mempool_malloc(ce->mp.part, sizeof (Edje_Part));
+        if (!replacement)
+          error_and_abort(ef, "Not enough memory");
+
+        replacement->name = part->name;
+        replacement->default_desc = _edje_description_convert(part->type, ce, part->default_desc);
+
+        replacement->other.desc_count = eina_list_count(part->other_desc);
+        replacement->other.desc = calloc(replacement->other.desc_count, sizeof (Edje_Part_Description_Common *));
+
+        i = 0;
+        EINA_LIST_FREE(part->other_desc, oepd)
+          replacement->other.desc[i++] = _edje_description_convert(part->type, ce, oepd);
+
+        replacement->source = part->source;
+        replacement->source2 = part->source2;
+        replacement->source3 = part->source3;
+        replacement->source4 = part->source4;
+        replacement->source5 = part->source5;
+        replacement->source6 = part->source6;
+        replacement->id = part->id;
+        replacement->clip_to_id = part->clip_to_id;
+        replacement->dragable = part->dragable;
+        replacement->items_count = eina_list_count(part->items);
+        replacement->items = calloc(replacement->items_count, sizeof (Edje_Pack_Element *));
+
+        i = 0;
+        EINA_LIST_FREE(part->items, elm)
+          replacement->items[i++] = elm;
+
+        replacement->type = part->type;
+        replacement->effect = part->effect;
+        replacement->mouse_events = part->mouse_events;
+        replacement->repeat_events = part->repeat_events;
+        replacement->ignore_flags = part->ignore_flags;
+        replacement->mask_flags = part->mask_flags;
+        replacement->scale = part->scale;
+        replacement->precise_is_inside = part->precise_is_inside;
+        replacement->use_alternate_font_metrics = part->use_alternate_font_metrics;
+        replacement->pointer_mode = part->pointer_mode;
+        replacement->entry_mode = part->entry_mode;
+        replacement->select_mode = part->select_mode;
+        replacement->multiline = part->multiline;
+        replacement->api = part->api;
+        replacement->required = part->required;
+
+        edc->parts[k++] = replacement;
+
+        free(part);
      }
 
    edc->id = oedc->id;
@@ -389,76 +389,78 @@ _edje_collection_convert(Eet_File *ef, Edje_Part_Collection_Directory_Entry *ce,
    return edc;
 }
 
-Edje_Part_Description_Common*
+Edje_Part_Description_Common *
 _edje_description_convert(int type,
-			  Edje_Part_Collection_Directory_Entry *ce,
-			  Old_Edje_Part_Description *oed)
+                          Edje_Part_Collection_Directory_Entry *ce,
+                          Old_Edje_Part_Description *oed)
 {
    Edje_Part_Description_Common *result = NULL;
 
    switch (type)
      {
       case EDJE_PART_TYPE_RECTANGLE:
-	 result = eina_mempool_malloc(ce->mp.RECTANGLE,
-				      sizeof (Edje_Part_Description_Common));
-	 break;
+        result = eina_mempool_malloc(ce->mp.RECTANGLE,
+                                     sizeof (Edje_Part_Description_Common));
+        break;
+
       case EDJE_PART_TYPE_SWALLOW:
-	 result = eina_mempool_malloc(ce->mp.SWALLOW,
-				      sizeof (Edje_Part_Description_Common));
-	 break;
+        result = eina_mempool_malloc(ce->mp.SWALLOW,
+                                     sizeof (Edje_Part_Description_Common));
+        break;
+
       case EDJE_PART_TYPE_GROUP:
-	 result = eina_mempool_malloc(ce->mp.GROUP,
-				      sizeof (Edje_Part_Description_Common));
-	 break;
+        result = eina_mempool_malloc(ce->mp.GROUP,
+                                     sizeof (Edje_Part_Description_Common));
+        break;
 
       case EDJE_PART_TYPE_IMAGE:
-	{
-	   Edje_Part_Description_Image *img;
-	   Edje_Part_Image_Id *id;
-	   unsigned int i = 0;
-
-	   img = eina_mempool_malloc(ce->mp.IMAGE, sizeof (Edje_Part_Description_Image));
-
-	   img->image.tweens_count = eina_list_count(oed->image.tween_list);
-	   img->image.tweens = calloc(img->image.tweens_count,
-				      sizeof (Edje_Part_Image_Id*));
-	   if (img->image.tweens_count > 0 && !img->image.tweens)
-	     {
-		eina_mempool_free(ce->mp.IMAGE, img);
-		return NULL;
-	     }
-
-	   EINA_LIST_FREE(oed->image.tween_list, id)
-	     img->image.tweens[i++] = id;
-
-	   img->image.id = oed->image.id;
-	   img->image.scale_hint = oed->image.scale_hint;
-	   img->image.set = oed->image.set;
-
-	   img->image.border = oed->image.border;
-	   img->image.fill = oed->image.fill;
-
-	   result = &img->common;
-	   break;
-	}
-
-#define CONVERT_ALLOC_POOL(Short, Type, Name)				\
-	 case EDJE_PART_TYPE_##Short:					\
-	   {								\
-	      Edje_Part_Description_##Type *Name;			\
-	      								\
-	      Name = eina_mempool_malloc(ce->mp.Short, sizeof (Edje_Part_Description_##Type)); \
-	      Name->Name = oed->Name;					\
-	      result = &Name->common;					\
-	      break;							\
-	   }
-
-	 CONVERT_ALLOC_POOL(TEXT, Text, text);
-	 CONVERT_ALLOC_POOL(TEXTBLOCK, Text, text);
-	 CONVERT_ALLOC_POOL(BOX, Box, box);
-	 CONVERT_ALLOC_POOL(TABLE, Table, table);
-	 CONVERT_ALLOC_POOL(EXTERNAL, External, external_params);
-   CONVERT_ALLOC_POOL(VECTOR, Vector, vector);
+      {
+         Edje_Part_Description_Image *img;
+         Edje_Part_Image_Id *id;
+         unsigned int i = 0;
+
+         img = eina_mempool_malloc(ce->mp.IMAGE, sizeof (Edje_Part_Description_Image));
+
+         img->image.tweens_count = eina_list_count(oed->image.tween_list);
+         img->image.tweens = calloc(img->image.tweens_count,
+                                    sizeof (Edje_Part_Image_Id *));
+         if (img->image.tweens_count > 0 && !img->image.tweens)
+           {
+              eina_mempool_free(ce->mp.IMAGE, img);
+              return NULL;
+           }
+
+         EINA_LIST_FREE(oed->image.tween_list, id)
+           img->image.tweens[i++] = id;
+
+         img->image.id = oed->image.id;
+         img->image.scale_hint = oed->image.scale_hint;
+         img->image.set = oed->image.set;
+
+         img->image.border = oed->image.border;
+         img->image.fill = oed->image.fill;
+
+         result = &img->common;
+         break;
+      }
+
+#define CONVERT_ALLOC_POOL(Short, Type, Name)                                       \
+case EDJE_PART_TYPE_##Short:                                                        \
+{                                                                                   \
+   Edje_Part_Description_##Type * Name;                                             \
+                                                                                    \
+   Name = eina_mempool_malloc(ce->mp.Short, sizeof (Edje_Part_Description_##Type)); \
+   Name->Name = oed->Name;                                                          \
+   result = &Name->common;                                                          \
+   break;                                                                           \
+}
+
+        CONVERT_ALLOC_POOL(TEXT, Text, text);
+        CONVERT_ALLOC_POOL(TEXTBLOCK, Text, text);
+        CONVERT_ALLOC_POOL(BOX, Box, box);
+        CONVERT_ALLOC_POOL(TABLE, Table, table);
+        CONVERT_ALLOC_POOL(EXTERNAL, External, external_params);
+        CONVERT_ALLOC_POOL(VECTOR, Vector, vector);
      }
 
    if (result)
@@ -467,3 +469,4 @@ _edje_description_convert(int type,
    free(oed);
    return result;
 }
+
diff --git a/src/bin/edje/edje_convert_main.c b/src/bin/edje/edje_convert_main.c
index 97a96d8763..6cdd5783f9 100644
--- a/src/bin/edje/edje_convert_main.c
+++ b/src/bin/edje/edje_convert_main.c
@@ -39,7 +39,7 @@ main_help(void)
      ("Usage:\n"
       "\t%s file.edj\n"
       "\n"
-      ,progname);
+     , progname);
 }
 
 static void
@@ -57,17 +57,17 @@ _edje_alias_int(const char *target, Eet_File *ef, const char *base, const char *
    strcat(buf, "%i");
    for (i = 0; i < count && match; ++i)
      {
-	char name[1024];
-	int id;
+        char name[1024];
+        int id;
 
-	if (sscanf(match[i], buf, &id) != 1)
-	  {
-	     EINA_LOG_ERR("Wrong fonts section `%s' in `%s'. Discarding it.", match[i], target);
-	     continue ;
-	  }
+        if (sscanf(match[i], buf, &id) != 1)
+          {
+             EINA_LOG_ERR("Wrong fonts section `%s' in `%s'. Discarding it.", match[i], target);
+             continue;
+          }
 
-	snprintf(name, sizeof (name), "%s/%i", to, id);
-	eet_alias(ef, name, match[i], 1);
+        snprintf(name, sizeof (name), "%s/%i", to, id);
+        eet_alias(ef, name, match[i], 1);
      }
    free(match);
 }
@@ -87,17 +87,17 @@ _edje_alias_string(const char *target, Eet_File *ef, const char *base, const cha
    strcat(buf, "%s");
    for (i = 0; i < count && match; ++i)
      {
-	char name[1024];
-	char id[1024];
+        char name[1024];
+        char id[1024];
 
-	if (sscanf(match[i], buf, &id) != 1)
-	  {
-	     EINA_LOG_ERR("Wrong fonts section `%s' in `%s'. Discarding it.", match[i], target);
-	     continue ;
-	  }
+        if (sscanf(match[i], buf, &id) != 1)
+          {
+             EINA_LOG_ERR("Wrong fonts section `%s' in `%s'. Discarding it.", match[i], target);
+             continue;
+          }
 
-	snprintf(name, sizeof (name), "%s/%s", to, id);
-	eet_alias(ef, name, match[i], 1);
+        snprintf(name, sizeof (name), "%s/%s", to, id);
+        eet_alias(ef, name, match[i], 1);
      }
    free(match);
 }
@@ -119,11 +119,11 @@ main(int argc, char **argv)
      return -1;
 
    _edje_cc_log_dom = eina_log_domain_register
-     ("edje_convert", EDJE_CC_DEFAULT_LOG_COLOR);
+       ("edje_convert", EDJE_CC_DEFAULT_LOG_COLOR);
    if (_edje_cc_log_dom < 0)
      {
-       EINA_LOG_ERR("Enable to create a log domain.");
-       exit(-1);
+        EINA_LOG_ERR("Enable to create a log domain.");
+        exit(-1);
      }
 
    eet_init();
@@ -131,8 +131,8 @@ main(int argc, char **argv)
    progname = argv[0];
    if (argc > 2 || argc < 2 || !strcmp(argv[1], "-h"))
      {
-	main_help();
-	return 0;
+        main_help();
+        return 0;
      }
 
    _edje_edd_old_init();
@@ -141,15 +141,15 @@ main(int argc, char **argv)
    ef = eet_open(argv[1], EET_FILE_MODE_READ_WRITE);
    if (!ef)
      {
-	EINA_LOG_ERR("Unable to open `%s'.", argv[1]);
-	return -1;
+        EINA_LOG_ERR("Unable to open `%s'.", argv[1]);
+        return -1;
      }
 
    oef = eet_data_read(ef, _edje_edd_old_edje_file, "edje_file");
    if (!oef)
      {
-	EINA_LOG_ERR("Unable to get edje_file section from old file format, are you sure it's an old file ?");
-	return -1;
+        EINA_LOG_ERR("Unable to get edje_file section from old file format, are you sure it's an old file ?");
+        return -1;
      }
 
    nef = _edje_file_convert(ef, oef);
@@ -160,34 +160,34 @@ main(int argc, char **argv)
 
    EINA_ITERATOR_FOREACH(it, ce)
      {
-	Old_Edje_Part_Collection *opc;
-	Edje_Part_Collection *npc;
-	char buf[1024];
-	int bytes = 0;
-
-	snprintf(buf, sizeof (buf), "collections/%i", ce->id);
-	opc = eet_data_read(ef, _edje_edd_old_edje_part_collection, buf);
-	if (!opc)
-	  {
-	     EINA_LOG_ERR("Unable to find collection `%s'[%i] in `%s'.", ce->entry, ce->id, argv[1]);
-	     return -1;
-	  }
-
-	npc = _edje_collection_convert(ef, ce, opc);
-
-	snprintf(buf, sizeof (buf), "edje/collections/%i", ce->id);
-	bytes = eet_data_write(ef, _edje_edd_edje_part_collection, buf, npc, 1);
-	if (bytes <= 0)
-	  {
-	     EINA_LOG_ERR("Unable to save `%s' in section `%s' of `%s'.", ce->entry, buf, argv[1]);
-	     return -1;
-	  }
+        Old_Edje_Part_Collection *opc;
+        Edje_Part_Collection *npc;
+        char buf[1024];
+        int bytes = 0;
+
+        snprintf(buf, sizeof (buf), "collections/%i", ce->id);
+        opc = eet_data_read(ef, _edje_edd_old_edje_part_collection, buf);
+        if (!opc)
+          {
+             EINA_LOG_ERR("Unable to find collection `%s'[%i] in `%s'.", ce->entry, ce->id, argv[1]);
+             return -1;
+          }
+
+        npc = _edje_collection_convert(ef, ce, opc);
+
+        snprintf(buf, sizeof (buf), "edje/collections/%i", ce->id);
+        bytes = eet_data_write(ef, _edje_edd_edje_part_collection, buf, npc, 1);
+        if (bytes <= 0)
+          {
+             EINA_LOG_ERR("Unable to save `%s' in section `%s' of `%s'.", ce->entry, buf, argv[1]);
+             return -1;
+          }
      }
 
    if (eet_data_write(ef, _edje_edd_edje_file, "edje/file", nef, 1) <= 0)
      {
-	EINA_LOG_ERR("Unable to save main section of `%s'.", argv[1]);
-	return -1;
+        EINA_LOG_ERR("Unable to save main section of `%s'.", argv[1]);
+        return -1;
      }
 
    _edje_alias_string(argv[1], ef, "fonts", "edje/fonts");
@@ -205,3 +205,4 @@ main(int argc, char **argv)
 
    return 0;
 }
+
diff --git a/src/bin/edje/edje_data_convert.c b/src/bin/edje/edje_data_convert.c
index f35ed94e6a..bdbca1f9e8 100644
--- a/src/bin/edje/edje_data_convert.c
+++ b/src/bin/edje/edje_data_convert.c
@@ -26,12 +26,12 @@ Eet_Data_Descriptor *_edje_edd_old_edje_part_description = NULL;
 Eet_Data_Descriptor *_edje_edd_old_edje_part_image_id = NULL;
 Eet_Data_Descriptor *_edje_edd_old_edje_external_param = NULL;
 
-#define FREED(eed) \
-   if (eed) \
-   { \
-      eet_data_descriptor_free((eed)); \
-      (eed) = NULL; \
-   }
+#define FREED(eed)                      \
+  if (eed)                              \
+    {                                   \
+       eet_data_descriptor_free((eed)); \
+       (eed) = NULL;                    \
+    }
 
 void
 _edje_edd_old_shutdown(void)
@@ -74,8 +74,8 @@ _edje_edd_old_init(void)
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_external_directory_entry, Edje_External_Directory_Entry, "entry", entry, EET_T_STRING);
 
    eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc),
-					   "Edje_External_Directory",
-					   sizeof (Old_Edje_External_Directory));
+                                           "Edje_External_Directory",
+                                           sizeof (Old_Edje_External_Directory));
    _edje_edd_old_edje_external_directory =
      eet_data_descriptor_file_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_old_edje_external_directory, Edje_External_Directory, "entries", entries, _edje_edd_old_edje_external_directory_entry);
@@ -88,8 +88,8 @@ _edje_edd_old_init(void)
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_font_directory_entry, Edje_Font_Directory_Entry, "file", file, EET_T_STRING);
 
    eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc),
-					   "Edje_Font_Directory",
-					   sizeof (Old_Edje_Font_Directory));
+                                           "Edje_Font_Directory",
+                                           sizeof (Old_Edje_Font_Directory));
    _edje_edd_old_edje_font_directory =
      eet_data_descriptor_file_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_old_edje_font_directory, Old_Edje_Font_Directory, "entries", entries, _edje_edd_old_edje_font_directory_entry);
@@ -117,12 +117,12 @@ _edje_edd_old_init(void)
    _edje_edd_old_edje_image_directory_set =
      eet_data_descriptor_file_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_image_directory_set, Edje_Image_Directory_Set, "name", name, EET_T_STRING);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_image_directory_set, Edje_Image_Directory_Set,  "id", id, EET_T_INT);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_image_directory_set, Edje_Image_Directory_Set, "id", id, EET_T_INT);
    EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_old_edje_image_directory_set, Edje_Image_Directory_Set, "entries", entries, _edje_edd_old_edje_image_directory_set_entry);
 
    eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc),
-					   "Edje_Image_Directory",
-					   sizeof (Old_Edje_Image_Directory));
+                                           "Edje_Image_Directory",
+                                           sizeof (Old_Edje_Image_Directory));
    _edje_edd_old_edje_image_directory =
      eet_data_descriptor_file_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_old_edje_image_directory, Old_Edje_Image_Directory, "entries", entries, _edje_edd_old_edje_image_directory_entry);
@@ -136,15 +136,15 @@ _edje_edd_old_init(void)
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_collection_directory_entry, Edje_Part_Collection_Directory_Entry, "id", id, EET_T_INT);
 
    eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc),
-					   "Edje_Part_Collection_Directory",
-					   sizeof (Old_Edje_Part_Collection_Directory));
+                                           "Edje_Part_Collection_Directory",
+                                           sizeof (Old_Edje_Part_Collection_Directory));
    _edje_edd_old_edje_part_collection_directory =
      eet_data_descriptor_file_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_old_edje_part_collection_directory, Old_Edje_Part_Collection_Directory, "entries", entries, _edje_edd_old_edje_part_collection_directory_entry);
 
    /* generic data attachment */
    eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc),
-					   "Edje_Data", sizeof (Old_Edje_Data));
+                                           "Edje_Data", sizeof (Old_Edje_Data));
    _edje_edd_old_edje_data =
      eet_data_descriptor_file_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_data, Old_Edje_Data, "key", key, EET_T_STRING);
@@ -181,7 +181,7 @@ _edje_edd_old_init(void)
 
    /* the main file directory */
    eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc),
-					   "Edje_File", sizeof (Old_Edje_File));
+                                           "Edje_File", sizeof (Old_Edje_File));
    _edje_edd_old_edje_file =
      eet_data_descriptor_file_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_file, Old_Edje_File, "compiler", compiler, EET_T_STRING);
@@ -364,7 +364,7 @@ _edje_edd_old_init(void)
 
    EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Pack_Element);
    _edje_edd_old_edje_pack_element =
-      eet_data_descriptor_file_new(&eddc);
+     eet_data_descriptor_file_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_pack_element, Edje_Pack_Element, "type", type, EET_T_UCHAR);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_pack_element, Edje_Pack_Element, "name", name, EET_T_STRING);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_pack_element, Edje_Pack_Element, "source", source, EET_T_STRING);
@@ -433,7 +433,7 @@ _edje_edd_old_init(void)
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part, Old_Edje_Part, "required", required, EET_T_UCHAR);
 
    eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc), "Edje_Part_Collection", sizeof (Old_Edje_Part_Collection));
-   _edje_edd_old_edje_part_collection  =
+   _edje_edd_old_edje_part_collection =
      eet_data_descriptor_file_new(&eddc);
    EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "programs", programs, _edje_edd_old_edje_program);
    EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "parts", parts, _edje_edd_old_edje_part);
@@ -449,8 +449,9 @@ _edje_edd_old_init(void)
       Old_Edje_Part_Collection epc;
 
       eet_data_descriptor_element_add(_edje_edd_old_edje_part_collection,
-				      "alias", EET_T_STRING, EET_G_HASH,
-				      (char *)(&(epc.alias)) - (char *)(&(epc)),
-				      0, /* 0,  */NULL, NULL);
+                                      "alias", EET_T_STRING, EET_G_HASH,
+                                      (char *)(&(epc.alias)) - (char *)(&(epc)),
+                                      0, /* 0,  */ NULL, NULL);
    }
 }
+
diff --git a/src/bin/edje/edje_decc.c b/src/bin/edje/edje_decc.c
index 1b8c3120a0..ee640479d7 100644
--- a/src/bin/edje/edje_decc.c
+++ b/src/bin/edje/edje_decc.c
@@ -12,7 +12,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-
 #include <Ecore_File.h>
 #include <Ecore_Evas.h>
 
@@ -38,7 +37,6 @@ void       output(void);
 static int compiler_cmd_is_sane(void);
 static int root_filename_is_sane(void);
 
-
 static void
 _edje_cc_log_cb(const Eina_Log_Domain *d,
                 Eina_Log_Level level,
@@ -64,22 +62,27 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
              switch (level)
                {
                 case EINA_LOG_LEVEL_CRITICAL:
-                   color = FOREGROUND_RED | FOREGROUND_INTENSITY;
-                   break;
+                  color = FOREGROUND_RED | FOREGROUND_INTENSITY;
+                  break;
+
                 case EINA_LOG_LEVEL_ERR:
-                   color = FOREGROUND_RED;
-                   break;
+                  color = FOREGROUND_RED;
+                  break;
+
                 case EINA_LOG_LEVEL_WARN:
-                   color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
-                   break;
+                  color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
+                  break;
+
                 case EINA_LOG_LEVEL_INFO:
-                   color = FOREGROUND_GREEN | FOREGROUND_INTENSITY;
-                   break;
+                  color = FOREGROUND_GREEN | FOREGROUND_INTENSITY;
+                  break;
+
                 case EINA_LOG_LEVEL_DBG:
-                   color = FOREGROUND_BLUE | FOREGROUND_INTENSITY;
-                   break;
+                  color = FOREGROUND_BLUE | FOREGROUND_INTENSITY;
+                  break;
+
                 default:
-                   color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
+                  color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
                }
              SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), color);
 #endif
@@ -88,16 +91,19 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
         switch (level)
           {
            case EINA_LOG_LEVEL_CRITICAL:
-              prefix = "Critical. ";
-              break;
+             prefix = "Critical. ";
+             break;
+
            case EINA_LOG_LEVEL_ERR:
-              prefix = "Error. ";
-              break;
+             prefix = "Error. ";
+             break;
+
            case EINA_LOG_LEVEL_WARN:
-              prefix = "Warning. ";
-              break;
+             prefix = "Warning. ";
+             break;
+
            default:
-              prefix = "";
+             prefix = "";
           }
         fprintf(stderr, "%s: %s", progname, prefix);
 
@@ -111,7 +117,6 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
 #endif
           }
 
-
         vfprintf(stderr, fmt, args);
         putc('\n', stderr);
      }
@@ -132,7 +137,7 @@ main_help(void)
       " -current-dir\tOutput to current directory \n"
       " -quiet\t\tProduce less output\n"
       "\n"
-      ,progname);
+     , progname);
 }
 
 Eet_File *ef;
@@ -150,12 +155,12 @@ main(int argc, char **argv)
    if (!eina_init())
      exit(-1);
    _edje_cc_log_dom = eina_log_domain_register
-     ("edje_decc", EDJE_CC_DEFAULT_LOG_COLOR);
+       ("edje_decc", EDJE_CC_DEFAULT_LOG_COLOR);
    if (_edje_cc_log_dom < 0)
      {
-       EINA_LOG_ERR("Impossible to create a log domain.");
-       eina_shutdown();
-       exit(-1);
+        EINA_LOG_ERR("Impossible to create a log domain.");
+        eina_shutdown();
+        exit(-1);
      }
    progname = ecore_file_file_get(argv[0]);
    eina_log_print_cb_set(_edje_cc_log_cb, NULL);
@@ -163,37 +168,37 @@ main(int argc, char **argv)
 
    for (i = 1; i < argc; i++)
      {
-	if (!strcmp(argv[i], "-h"))
-	  {
-	     main_help();
-	     exit(0);
-	  }
-	if (!file_in)
-	  file_in = argv[i];
-	else if ((!strcmp(argv[i], "-main-out")) && (i < (argc - 1)))
-	  {
-	     i++;
+        if (!strcmp(argv[i], "-h"))
+          {
+             main_help();
+             exit(0);
+          }
+        if (!file_in)
+          file_in = argv[i];
+        else if ((!strcmp(argv[i], "-main-out")) && (i < (argc - 1)))
+          {
+             i++;
 #ifndef _WIN32
-	     file_out = argv[i];
+             file_out = argv[i];
 #endif
-	  }
-	else if (!strcmp(argv[i], "-no-build-sh"))
-	  build_sh = 0;
-	else if (!strcmp(argv[i], "-current-dir"))
-	  new_dir = 0;
+          }
+        else if (!strcmp(argv[i], "-no-build-sh"))
+          build_sh = 0;
+        else if (!strcmp(argv[i], "-current-dir"))
+          new_dir = 0;
         else if (!strcmp(argv[i], "-quiet"))
           eina_log_domain_level_set("edje_decc", EINA_LOG_LEVEL_WARN);
         else if ((!strcmp(argv[i], "-o") || !strcmp(argv[i], "-output")) && (i < (argc - 1)))
-         {
-            i++;
-            outdir = strdup(argv[i]);
-         }
+          {
+             i++;
+             outdir = strdup(argv[i]);
+          }
      }
    if (!file_in)
      {
-	ERR("no input file specified.");
-	main_help();
-	exit(-1);
+        ERR("no input file specified.");
+        main_help();
+        exit(-1);
      }
 
    if (!edje_init())
@@ -220,41 +225,41 @@ decomp(void)
    ef = eet_open(file_in, EET_FILE_MODE_READ);
    if (!ef)
      {
-	ERR("cannot open %s", file_in);
-	return 0;
+        ERR("cannot open %s", file_in);
+        return 0;
      }
 
    srcfiles = source_load(ef);
    if (!srcfiles || !srcfiles->list)
      {
-	ERR("%s has no decompile information", file_in);
-	eet_close(ef);
-	return 0;
+        ERR("%s has no decompile information", file_in);
+        eet_close(ef);
+        return 0;
      }
    if (!eina_list_data_get(srcfiles->list) || !root_filename_is_sane())
      {
-        ERR("Invalid root filename: '%s'", (char *) eina_list_data_get(srcfiles->list));
-	eet_close(ef);
-	return 0;
+        ERR("Invalid root filename: '%s'", (char *)eina_list_data_get(srcfiles->list));
+        eet_close(ef);
+        return 0;
      }
    edje_file = eet_data_read(ef, _edje_edd_edje_file, "edje/file");
    if (!edje_file)
      {
         ERR("%s does not appear to be an edje file", file_in);
-	eet_close(ef);
-	return 0;
+        eet_close(ef);
+        return 0;
      }
    /* force compiler to be edje_cc */
    edje_file->compiler = strdup("edje_cc");
    if (!edje_file->compiler)
      {
-	edje_file->compiler = strdup("edje_cc");
+        edje_file->compiler = strdup("edje_cc");
      }
    else if (!compiler_cmd_is_sane())
      {
-	ERR("invalid compiler executable: '%s'", edje_file->compiler);
-	eet_close(ef);
-	return 0;
+        ERR("invalid compiler executable: '%s'", edje_file->compiler);
+        eet_close(ef);
+        return 0;
      }
    fontlist = source_fontmap_load(ef);
    return 1;
@@ -270,122 +275,121 @@ output(void)
 
    if (!outdir)
      {
-         if (!new_dir)
-            outdir = strdup(".");
-         else
-           {
-               p = strrchr(file_in, '/');
-               if (p)
-                  outdir = strdup(p + 1);
-               else
-                  outdir = strdup(file_in);
-               p = strrchr(outdir, '.');
-               if (p) *p = 0;
-               ecore_file_mkpath(outdir);
-           }
+        if (!new_dir)
+          outdir = strdup(".");
+        else
+          {
+             p = strrchr(file_in, '/');
+             if (p)
+               outdir = strdup(p + 1);
+             else
+               outdir = strdup(file_in);
+             p = strrchr(outdir, '.');
+             if (p) *p = 0;
+             ecore_file_mkpath(outdir);
+          }
      }
 
-
    tef = eet_open(file_in, EET_FILE_MODE_READ);
 
    if (edje_file->image_dir)
      {
         Edje_Image_Directory_Entry *ei;
-	unsigned int i;
-
-	for (i = 0; i < edje_file->image_dir->entries_count; ++i)
-	  {
-	     ei = &edje_file->image_dir->entries[i];
-
-	     if ((ei->source_type > EDJE_IMAGE_SOURCE_TYPE_NONE) &&
-		 (ei->source_type < EDJE_IMAGE_SOURCE_TYPE_LAST) &&
-		 (ei->source_type != EDJE_IMAGE_SOURCE_TYPE_USER) &&
-		 (ei->entry))
-	       {
-		  Ecore_Evas *ee;
-		  Evas *evas;
-		  Evas_Object *im;
-		  char buf[4096];
-		  char out[4096];
-		  char *pp;
-
-		  ecore_init();
-		  ecore_evas_init();
-		  ee = ecore_evas_buffer_new(1, 1);
-		  if (!ee)
-		    {
-		       ERR("Cannot create buffer engine canvas for image save.");
-		       exit(-1);
-		    }
-		  evas = ecore_evas_get(ee);
-		  im = evas_object_image_add(evas);
-		  if (!im)
-		    {
-		       ERR("Cannot create image object for save.");
-		       exit(-1);
-		    }
-		  snprintf(buf, sizeof(buf), "edje/images/%i", ei->id);
-		  evas_object_image_file_set(im, file_in, buf);
-		  snprintf(out, sizeof(out), "%s/%s", outdir, ei->entry);
-		  INF("Output Image: %s", out);
-		  pp = strdup(out);
-		  p = strrchr(pp, '/');
-		  if (p) *p = 0;
-		  if (strstr(pp, "../"))
-		    {
-		       ERR("Potential security violation. attempt to write in parent dir.");
-		       exit(-1);
-		    }
-		  ecore_file_mkpath(pp);
-		  free(pp);
+        unsigned int i;
+
+        for (i = 0; i < edje_file->image_dir->entries_count; ++i)
+          {
+             ei = &edje_file->image_dir->entries[i];
+
+             if ((ei->source_type > EDJE_IMAGE_SOURCE_TYPE_NONE) &&
+                 (ei->source_type < EDJE_IMAGE_SOURCE_TYPE_LAST) &&
+                 (ei->source_type != EDJE_IMAGE_SOURCE_TYPE_USER) &&
+                 (ei->entry))
+               {
+                  Ecore_Evas *ee;
+                  Evas *evas;
+                  Evas_Object *im;
+                  char buf[4096];
+                  char out[4096];
+                  char *pp;
+
+                  ecore_init();
+                  ecore_evas_init();
+                  ee = ecore_evas_buffer_new(1, 1);
+                  if (!ee)
+                    {
+                       ERR("Cannot create buffer engine canvas for image save.");
+                       exit(-1);
+                    }
+                  evas = ecore_evas_get(ee);
+                  im = evas_object_image_add(evas);
+                  if (!im)
+                    {
+                       ERR("Cannot create image object for save.");
+                       exit(-1);
+                    }
+                  snprintf(buf, sizeof(buf), "edje/images/%i", ei->id);
+                  evas_object_image_file_set(im, file_in, buf);
+                  snprintf(out, sizeof(out), "%s/%s", outdir, ei->entry);
+                  INF("Output Image: %s", out);
+                  pp = strdup(out);
+                  p = strrchr(pp, '/');
+                  if (p) *p = 0;
+                  if (strstr(pp, "../"))
+                    {
+                       ERR("Potential security violation. attempt to write in parent dir.");
+                       exit(-1);
+                    }
+                  ecore_file_mkpath(pp);
+                  free(pp);
                   if (!evas_object_image_save(im, out, NULL, "quality=100 compress=9 encoding=auto"))
-		    {
-		       ERR("Cannot write file %s. Perhaps missing JPEG or PNG saver modules for Evas.", out);
-		       exit(-1);
-		    }
-		  evas_object_del(im);
-		  ecore_evas_free(ee);
-		  ecore_evas_shutdown();
-		  ecore_shutdown();
-	       }
-	  }
+                    {
+                       ERR("Cannot write file %s. Perhaps missing JPEG or PNG saver modules for Evas.", out);
+                       exit(-1);
+                    }
+                  evas_object_del(im);
+                  ecore_evas_free(ee);
+                  ecore_evas_shutdown();
+                  ecore_shutdown();
+               }
+          }
      }
 
    EINA_LIST_FOREACH(srcfiles->list, l, sf)
      {
-	char out[4096];
-	FILE *f;
-	char *pp;
-
-	snprintf(out, sizeof(out), "%s/%s", outdir, sf->name);
-	INF("Output Source File: %s", out);
-	pp = strdup(out);
-	p = strrchr(pp, '/');
-	if (p) *p = 0;
-	if (strstr(pp, "../"))
-	  {
-	     ERR("Potential security violation. attempt to write in parent dir.");
-	     exit (-1);
-	  }
-	ecore_file_mkpath(pp);
-	free(pp);
-	if (strstr(out, "../"))
-	  {
-	     ERR("Potential security violation. attempt to write in parent dir.");
-	     exit (-1);
-	  }
-	f = fopen(out, "wb");
-	if (!f)
-	  {
-	     ERR("Unable to write file (%s).", out);
-	     exit (-1);
-	  }
-
-	/* if the file is empty, sf->file will be NULL.
-	 * note that that's not an error
-	 */
-	if (sf->file) fputs(sf->file, f);
-	fclose(f);
+        char out[4096];
+        FILE *f;
+        char *pp;
+
+        snprintf(out, sizeof(out), "%s/%s", outdir, sf->name);
+        INF("Output Source File: %s", out);
+        pp = strdup(out);
+        p = strrchr(pp, '/');
+        if (p) *p = 0;
+        if (strstr(pp, "../"))
+          {
+             ERR("Potential security violation. attempt to write in parent dir.");
+             exit(-1);
+          }
+        ecore_file_mkpath(pp);
+        free(pp);
+        if (strstr(out, "../"))
+          {
+             ERR("Potential security violation. attempt to write in parent dir.");
+             exit(-1);
+          }
+        f = fopen(out, "wb");
+        if (!f)
+          {
+             ERR("Unable to write file (%s).", out);
+             exit(-1);
+          }
+
+        /* if the file is empty, sf->file will be NULL.
+         * note that that's not an error
+         */
+        if (sf->file) fputs(sf->file, f);
+        fclose(f);
      }
    if (edje_file->fonts)
      {
@@ -393,93 +397,91 @@ output(void)
         Eina_Iterator *it;
 
         it = eina_hash_iterator_data_new(edje_file->fonts);
-	EINA_ITERATOR_FOREACH(it, fn)
-	  {
-	     void *font;
-	     int fontsize;
-	     char out[4096];
+        EINA_ITERATOR_FOREACH(it, fn)
+          {
+             void *font;
+             int fontsize;
+             char out[4096];
              /* FIXME!!!! */
-                                         /* should be fn->entry -v */
-	     snprintf(out, sizeof(out), "edje/fonts/%s", fn->file);
-	     font = eet_read(tef, out, &fontsize);
-	     if (font)
-	       {
-		  FILE *f;
-		  char *pp;
-
-                                         /* should be fn->file -v */
-		  snprintf(out, sizeof(out), "%s/%s", outdir, fn->entry);
-		  INF("Output Font: %s", out);
-		  pp = strdup(out);
-		  p = strrchr(pp, '/');
-		  if (p) *p = 0;
-		  if (strstr(pp, "../"))
-		    {
-		       ERR("Potential security violation. attempt to write in parent dir.");
-		       exit (-1);
-		    }
-		  ecore_file_mkpath(pp);
-		  free(pp);
-		  if (strstr(out, "../"))
-		    {
-		       ERR("Potential security violation. attempt to write in parent dir.");
-		       exit (-1);
-		    }
-		  if (!(f = fopen(out, "wb")))
+             /* should be fn->entry -v */
+             snprintf(out, sizeof(out), "edje/fonts/%s", fn->file);
+             font = eet_read(tef, out, &fontsize);
+             if (font)
+               {
+                  FILE *f;
+                  char *pp;
+
+                  /* should be fn->file -v */
+                  snprintf(out, sizeof(out), "%s/%s", outdir, fn->entry);
+                  INF("Output Font: %s", out);
+                  pp = strdup(out);
+                  p = strrchr(pp, '/');
+                  if (p) *p = 0;
+                  if (strstr(pp, "../"))
+                    {
+                       ERR("Potential security violation. attempt to write in parent dir.");
+                       exit(-1);
+                    }
+                  ecore_file_mkpath(pp);
+                  free(pp);
+                  if (strstr(out, "../"))
+                    {
+                       ERR("Potential security violation. attempt to write in parent dir.");
+                       exit(-1);
+                    }
+                  if (!(f = fopen(out, "wb")))
                     {
                        ERR("Could not open file: %s", out);
-		       exit (-1);
+                       exit(-1);
                     }
-		  if (fwrite(font, fontsize, 1, f) != 1)
-		    ERR("Could not write font: %s", strerror(errno));
-		  if (f) fclose(f);
-		  free(font);
-	       }
-	  }
-        eina_iterator_free(it);
-     }
-     {
-	char out[4096];
-	FILE *f;
-	sf = eina_list_data_get(srcfiles->list);
-
-
-	if (build_sh)
-	  {
-	     snprintf(out, sizeof(out), "%s/build.sh", outdir);
-	     INF("Output Build Script: %s", out);
-	     if (strstr(out, "../"))
-	       {
-		  ERR("potential security violation. attempt to write in parent dir.");
-		  exit (-1);
-	       }
-	     if ((f = fopen(out, "wb")))
-               {
-                  fprintf(f, "#!/bin/sh\n");
-                  fprintf(f, "%s $@ -id . -fd . %s -o %s.edj\n", 
-                          edje_file->compiler, sf->name, outdir);
-                  fclose(f);
-                  if (chmod(out,
-                            S_IRUSR | S_IWUSR | S_IXUSR |
-                            S_IRGRP | S_IWGRP | S_IXGRP) < 0)
-                    ERR("chmod on %s failed", out);
-               }
-
-	     WRN("*** CAUTION ***\n"
-		 "Please check the build script for anything malicious "
-		 "before running it!\n\n");
-	  }
-
-	if (file_out)
-	  {
-	     snprintf(out, sizeof(out), "%s/%s", outdir, file_out);
-	     if (ecore_file_symlink(sf->name, out) != EINA_TRUE)
-               {
-                  ERR("symlink %s -> %s failed", sf->name, out);
+                  if (fwrite(font, fontsize, 1, f) != 1)
+                    ERR("Could not write font: %s", strerror(errno));
+                  if (f) fclose(f);
+                  free(font);
                }
-	  }
-
+          }
+        eina_iterator_free(it);
      }
+   {
+      char out[4096];
+      FILE *f;
+      sf = eina_list_data_get(srcfiles->list);
+
+      if (build_sh)
+        {
+           snprintf(out, sizeof(out), "%s/build.sh", outdir);
+           INF("Output Build Script: %s", out);
+           if (strstr(out, "../"))
+             {
+                ERR("potential security violation. attempt to write in parent dir.");
+                exit(-1);
+             }
+           if ((f = fopen(out, "wb")))
+             {
+                fprintf(f, "#!/bin/sh\n");
+                fprintf(f, "%s $@ -id . -fd . %s -o %s.edj\n",
+                        edje_file->compiler, sf->name, outdir);
+                fclose(f);
+                if (chmod(out,
+                          S_IRUSR | S_IWUSR | S_IXUSR |
+                          S_IRGRP | S_IWGRP | S_IXGRP) < 0)
+                  ERR("chmod on %s failed", out);
+             }
+
+           WRN("*** CAUTION ***\n"
+               "Please check the build script for anything malicious "
+               "before running it!\n\n");
+        }
+
+      if (file_out)
+        {
+           snprintf(out, sizeof(out), "%s/%s", outdir, file_out);
+           if (ecore_file_symlink(sf->name, out) != EINA_TRUE)
+             {
+                ERR("symlink %s -> %s failed", sf->name, out);
+             }
+        }
+   }
 
    if (edje_file->sound_dir)
      {
@@ -524,9 +526,8 @@ output(void)
                        fclose(f);
                     }
                   else ERR("Could not open for writing sound: %s: %s", out1, strerror(errno));
-              }
+               }
           }
-
      }
    if (edje_file->vibration_dir)
      {
@@ -571,7 +572,7 @@ output(void)
                        fclose(f);
                     }
                   else ERR("Could not open for writing sound: %s: %s", out1, strerror(errno));
-              }
+               }
           }
      }
 
@@ -586,16 +587,16 @@ compiler_cmd_is_sane()
 
    if ((!c) || (!*c))
      {
-	return 0;
+        return 0;
      }
 
    for (ptr = c; ptr && *ptr; ptr++)
      {
-	/* only allow [a-z][A-Z][0-9]_- */
-	if ((!isalnum(*ptr)) && (*ptr != '_') && (*ptr != '-'))
-	  {
-	     return 0;
-	  }
+        /* only allow [a-z][A-Z][0-9]_- */
+        if ((!isalnum(*ptr)) && (*ptr != '_') && (*ptr != '-'))
+          {
+             return 0;
+          }
      }
 
    return 1;
@@ -609,22 +610,27 @@ root_filename_is_sane()
 
    if (!f || !*f)
      {
-	return 0;
+        return 0;
      }
 
    for (ptr = f; ptr && *ptr; ptr++)
      {
-	/* only allow [a-z][A-Z][0-9]_-./ */
-	switch (*ptr)
-	  {
-	   case '_': case '-':  case '.': case '/':
-	      break;
-	   default:
-	      if (!isalnum(*ptr))
-		{
-		   return 0;
-		}
-	  }
+        /* only allow [a-z][A-Z][0-9]_-./ */
+        switch (*ptr)
+          {
+           case '_':
+           case '-':
+           case '.':
+           case '/':
+             break;
+
+           default:
+             if (!isalnum(*ptr))
+               {
+                  return 0;
+               }
+          }
      }
    return 1;
 }
+
diff --git a/src/bin/edje/edje_external_inspector.c b/src/bin/edje/edje_external_inspector.c
index 5fd8e5e5ee..3a4f937b06 100644
--- a/src/bin/edje/edje_external_inspector.c
+++ b/src/bin/edje/edje_external_inspector.c
@@ -17,7 +17,7 @@ static int _log_dom;
 #define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
 #define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
 
-#define INDENT "   "
+#define INDENT  "   "
 #define INDENT2 INDENT INDENT
 #define INDENT3 INDENT2 INDENT
 #define INDENT4 INDENT3 INDENT
@@ -27,15 +27,14 @@ static char *module_patterns_str = NULL;
 static int detail = 1;
 static Eina_Bool machine = EINA_FALSE;
 static char *type_glob = NULL;
-static char * const *module_patterns;
+static char *const *module_patterns;
 static const Eina_List *modules;
 
-
 static char *
 _module_patterns_str_new(void)
 {
    Eina_Strbuf *buf;
-   char * const *itr;
+   char *const *itr;
    char *ret;
    if (!module_patterns) return strdup("*");
 
@@ -53,7 +52,7 @@ _module_patterns_str_new(void)
 static Eina_Bool
 module_matches(const char *name)
 {
-   char * const *itr;
+   char *const *itr;
    if (!module_patterns) return EINA_TRUE;
 
    for (itr = module_patterns; *itr != NULL; itr++)
@@ -93,13 +92,18 @@ _param_type_str_get(const Edje_External_Param_Info *param)
    switch (param->type)
      {
       case EDJE_EXTERNAL_PARAM_TYPE_INT: return "int";
+
       case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: return "double";
+
       case EDJE_EXTERNAL_PARAM_TYPE_STRING: return "string";
+
       case EDJE_EXTERNAL_PARAM_TYPE_BOOL: return "bool";
+
       case EDJE_EXTERNAL_PARAM_TYPE_CHOICE: return "choice";
+
       default:
-         ERR("Unknown parameter type %d", param->type);
-         return "???";
+        ERR("Unknown parameter type %d", param->type);
+        return "???";
      }
 }
 
@@ -109,38 +113,39 @@ _param_value_str_get(const Edje_External_Type *type, const Edje_External_Param_I
    switch (param->type)
      {
       case EDJE_EXTERNAL_PARAM_TYPE_INT:
-         if (param->info.i.def == EDJE_EXTERNAL_INT_UNSET) return NULL;
-         snprintf(buf, buflen, "%d", param->info.i.def);
-         return buf;
+        if (param->info.i.def == EDJE_EXTERNAL_INT_UNSET) return NULL;
+        snprintf(buf, buflen, "%d", param->info.i.def);
+        return buf;
 
       case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-         if (EINA_DBL_EQ(param->info.d.def, EDJE_EXTERNAL_DOUBLE_UNSET)) return NULL;
-         snprintf(buf, buflen, "%g", param->info.d.def);
-         return buf;
+        if (EINA_DBL_EQ(param->info.d.def, EDJE_EXTERNAL_DOUBLE_UNSET)) return NULL;
+        snprintf(buf, buflen, "%g", param->info.d.def);
+        return buf;
 
       case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-         return param->info.s.def;
+        return param->info.s.def;
 
       case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-         if (param->info.b.def == 0) return "0";
-         else if (param->info.b.def == 1) return "1";
-         return NULL;
+        if (param->info.b.def == 0) return "0";
+        else if (param->info.b.def == 1)
+          return "1";
+        return NULL;
 
       case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
-        {
-           char *def;
-           if (param->info.c.def) return param->info.c.def;
-           if (!param->info.c.def_get) return NULL;
-           def = param->info.c.def_get(type->data, param);
-           if (!def) return NULL;
-           eina_strlcpy(buf, def, buflen);
-           free(def);
-           return buf;
-        }
+      {
+         char *def;
+         if (param->info.c.def) return param->info.c.def;
+         if (!param->info.c.def_get) return NULL;
+         def = param->info.c.def_get(type->data, param);
+         if (!def) return NULL;
+         eina_strlcpy(buf, def, buflen);
+         free(def);
+         return buf;
+      }
 
       default:
-         ERR("Unknown parameter type %d", param->type);
-         return NULL;
+        ERR("Unknown parameter type %d", param->type);
+        return NULL;
      }
 }
 
@@ -179,7 +184,7 @@ _param_flags_str_get(const Edje_External_Param_Info *param)
 }
 
 static void
-_param_choices_print(const char * const *choices)
+_param_choices_print(const char *const *choices)
 {
    if (machine) puts("CHOICES-BEGIN");
    else fputs(", choices:", stdout);
@@ -201,90 +206,91 @@ _param_extra_details(const Edje_External_Type *type, const Edje_External_Param_I
    switch (param->type)
      {
       case EDJE_EXTERNAL_PARAM_TYPE_INT:
-         if (param->info.i.min != EDJE_EXTERNAL_INT_UNSET)
-           {
-              if (machine) printf("MIN: %d\n", param->info.i.min);
-              else printf(", min: %d", param->info.i.min);
-           }
-         if (param->info.i.max != EDJE_EXTERNAL_INT_UNSET)
-           {
-              if (machine) printf("MAX: %d\n", param->info.i.max);
-              else printf(", max: %d", param->info.i.max);
-           }
-         if (param->info.i.step != EDJE_EXTERNAL_INT_UNSET)
-           {
-              if (machine) printf("STEP: %d\n", param->info.i.step);
-              else printf(", step: %d", param->info.i.step);
-           }
-         break;
+        if (param->info.i.min != EDJE_EXTERNAL_INT_UNSET)
+          {
+             if (machine) printf("MIN: %d\n", param->info.i.min);
+             else printf(", min: %d", param->info.i.min);
+          }
+        if (param->info.i.max != EDJE_EXTERNAL_INT_UNSET)
+          {
+             if (machine) printf("MAX: %d\n", param->info.i.max);
+             else printf(", max: %d", param->info.i.max);
+          }
+        if (param->info.i.step != EDJE_EXTERNAL_INT_UNSET)
+          {
+             if (machine) printf("STEP: %d\n", param->info.i.step);
+             else printf(", step: %d", param->info.i.step);
+          }
+        break;
 
       case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-         if (EINA_DBL_EQ(param->info.d.min, EDJE_EXTERNAL_DOUBLE_UNSET))
-           {
-              if (machine) printf("MIN: %g\n", param->info.d.min);
-              else printf(", min: %g", param->info.d.min);
-           }
-         if (EINA_DBL_EQ(param->info.d.max, EDJE_EXTERNAL_DOUBLE_UNSET))
-           {
-              if (machine) printf("MAX: %g\n", param->info.d.max);
-              else printf(", max: %g", param->info.d.max);
-           }
-         if (EINA_DBL_EQ(param->info.d.step, EDJE_EXTERNAL_DOUBLE_UNSET))
-           {
-              if (machine) printf("STEP: %g\n", param->info.d.step);
-              else printf(", step: %g", param->info.d.step);
-           }
-         break;
+        if (EINA_DBL_EQ(param->info.d.min, EDJE_EXTERNAL_DOUBLE_UNSET))
+          {
+             if (machine) printf("MIN: %g\n", param->info.d.min);
+             else printf(", min: %g", param->info.d.min);
+          }
+        if (EINA_DBL_EQ(param->info.d.max, EDJE_EXTERNAL_DOUBLE_UNSET))
+          {
+             if (machine) printf("MAX: %g\n", param->info.d.max);
+             else printf(", max: %g", param->info.d.max);
+          }
+        if (EINA_DBL_EQ(param->info.d.step, EDJE_EXTERNAL_DOUBLE_UNSET))
+          {
+             if (machine) printf("STEP: %g\n", param->info.d.step);
+             else printf(", step: %g", param->info.d.step);
+          }
+        break;
 
       case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-         if (param->info.s.accept_fmt)
-           {
-              if (machine) printf("ACCEPT_FMT: %s\n", param->info.s.accept_fmt);
-              else printf(", accept_fmt: \"%s\"", param->info.s.accept_fmt);
-           }
-         if (param->info.s.deny_fmt)
-           {
-              if (machine) printf("DENY_FMT: %s\n", param->info.s.deny_fmt);
-              else printf(", deny_fmt: \"%s\"", param->info.s.deny_fmt);
-           }
-         break;
+        if (param->info.s.accept_fmt)
+          {
+             if (machine) printf("ACCEPT_FMT: %s\n", param->info.s.accept_fmt);
+             else printf(", accept_fmt: \"%s\"", param->info.s.accept_fmt);
+          }
+        if (param->info.s.deny_fmt)
+          {
+             if (machine) printf("DENY_FMT: %s\n", param->info.s.deny_fmt);
+             else printf(", deny_fmt: \"%s\"", param->info.s.deny_fmt);
+          }
+        break;
 
       case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-         if (param->info.b.false_str)
-           {
-              if (machine) printf("FALSE_STR: %s\n", param->info.b.false_str);
-              else printf(", false_str: \"%s\"", param->info.b.false_str);
-           }
-         if (param->info.b.true_str)
-           {
-              if (machine) printf("TRUE_STR: %s\n", param->info.b.true_str);
-              else printf(", true_str: \"%s\"", param->info.b.true_str);
-           }
-         break;
+        if (param->info.b.false_str)
+          {
+             if (machine) printf("FALSE_STR: %s\n", param->info.b.false_str);
+             else printf(", false_str: \"%s\"", param->info.b.false_str);
+          }
+        if (param->info.b.true_str)
+          {
+             if (machine) printf("TRUE_STR: %s\n", param->info.b.true_str);
+             else printf(", true_str: \"%s\"", param->info.b.true_str);
+          }
+        break;
 
       case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
-        {
-           if (param->info.c.choices)
-             _param_choices_print(param->info.c.choices);
-           else if (param->info.c.query)
-             {
-                char **choices = param->info.c.query(type->data, param);
-                if (choices)
-                  {
-                     char **itr;
-                     _param_choices_print((const char * const*)choices);
-                     for (itr = choices; *itr; itr++) free(*itr);
-                     free(choices);
-                  }
-             }
-        }
-        break;
+      {
+         if (param->info.c.choices)
+           _param_choices_print(param->info.c.choices);
+         else if (param->info.c.query)
+           {
+              char **choices = param->info.c.query(type->data, param);
+              if (choices)
+                {
+                   char **itr;
+                   _param_choices_print((const char *const *)choices);
+                   for (itr = choices; *itr; itr++)
+                     free(*itr);
+                   free(choices);
+                }
+           }
+      }
+      break;
 
       default:
-         ERR("Unknown parameter type %d", param->type);
+        ERR("Unknown parameter type %d", param->type);
      }
 
-   if (!machine) fputs(" */", stdout); /* \n not desired */
+   if (!machine) fputs(" */", stdout);  /* \n not desired */
 }
 
 static int
@@ -397,12 +403,14 @@ _info_list(void)
              if (!type->label_get) str = NULL;
              else str = type->label_get(type->data);
              if (machine) printf("LABEL: %s\n", str ? str : "");
-             else if (str) printf(INDENT3 "label: \"%s\";\n", str);
+             else if (str)
+               printf(INDENT3 "label: \"%s\";\n", str);
 
              if (!type->description_get) str = NULL;
              else str = type->description_get(type->data);
              if (machine) printf("DESCRIPTION: %s\n", str ? str : "");
-             else if (str) printf(INDENT3 "description: \"%s\";\n", str);
+             else if (str)
+               printf(INDENT3 "description: \"%s\";\n", str);
           }
 
         if (machine) puts("PARAMS-BEGIN");
@@ -420,9 +428,10 @@ _info_list(void)
              if (detail > 0)
                {
                   const char *str = _param_value_str_get
-                    (type, param, buf, sizeof(buf));
+                      (type, param, buf, sizeof(buf));
                   if (machine) printf("DEFAULT: %s\n", str ? str : "");
-                  else if (str) printf(" \"%s\"", str);
+                  else if (str)
+                    printf(" \"%s\"", str);
 
                   if (detail > 1)
                     {
@@ -432,7 +441,8 @@ _info_list(void)
                }
 
              if (machine) puts("PARAM-END");
-             else if (detail > 1) putchar('\n');
+             else if (detail > 1)
+               putchar('\n');
              else puts(";");
           }
 
@@ -544,40 +554,40 @@ _modules_names_list(void)
 }
 
 static const char *mode_choices[] = {
-  "info",
-  "modules-names",
-  "types-names",
-  NULL,
+   "info",
+   "modules-names",
+   "types-names",
+   NULL,
 };
 
 static const char *detail_choices[] = {
-  "none",
-  "terse",
-  "all",
-  NULL
+   "none",
+   "terse",
+   "all",
+   NULL
 };
 
 const Ecore_Getopt optdesc = {
-  "edje_external_inspector",
-  "%prog [options] [module|module-glob] ... [module|module-glob]",
-  PACKAGE_VERSION,
-  "(C) 2010 - The Enlightenment Project",
-  "BSD",
-  "Edje external module inspector.",
-  0,
-  {
-    ECORE_GETOPT_CHOICE('m', "mode", "Choose which mode to operate.",
-                        mode_choices),
-    ECORE_GETOPT_STORE_STR('t', "type", "Limit output to type (or glob)."),
-    ECORE_GETOPT_CHOICE('d', "detail", "Choose detail level (default=terse)",
-                        detail_choices),
-    ECORE_GETOPT_STORE_TRUE('M', "machine", "Produce machine readable output."),
-    ECORE_GETOPT_LICENSE('L', "license"),
-    ECORE_GETOPT_COPYRIGHT('C', "copyright"),
-    ECORE_GETOPT_VERSION('V', "version"),
-    ECORE_GETOPT_HELP('h', "help"),
-    ECORE_GETOPT_SENTINEL
-  }
+   "edje_external_inspector",
+   "%prog [options] [module|module-glob] ... [module|module-glob]",
+   PACKAGE_VERSION,
+   "(C) 2010 - The Enlightenment Project",
+   "BSD",
+   "Edje external module inspector.",
+   0,
+   {
+      ECORE_GETOPT_CHOICE('m', "mode", "Choose which mode to operate.",
+                          mode_choices),
+      ECORE_GETOPT_STORE_STR('t', "type", "Limit output to type (or glob)."),
+      ECORE_GETOPT_CHOICE('d', "detail", "Choose detail level (default=terse)",
+                          detail_choices),
+      ECORE_GETOPT_STORE_TRUE('M', "machine", "Produce machine readable output."),
+      ECORE_GETOPT_LICENSE('L', "license"),
+      ECORE_GETOPT_COPYRIGHT('C', "copyright"),
+      ECORE_GETOPT_VERSION('V', "version"),
+      ECORE_GETOPT_HELP('h', "help"),
+      ECORE_GETOPT_SENTINEL
+   }
 };
 
 int
@@ -589,15 +599,15 @@ main(int argc, char **argv)
    int arg_index;
    int ret = 0;
    Ecore_Getopt_Value values[] = {
-     ECORE_GETOPT_VALUE_STR(mode),
-     ECORE_GETOPT_VALUE_STR(type_glob),
-     ECORE_GETOPT_VALUE_STR(detail_name),
-     ECORE_GETOPT_VALUE_BOOL(machine),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_NONE
+      ECORE_GETOPT_VALUE_STR(mode),
+      ECORE_GETOPT_VALUE_STR(type_glob),
+      ECORE_GETOPT_VALUE_STR(detail_name),
+      ECORE_GETOPT_VALUE_BOOL(machine),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_NONE
    };
 
    setlocale(LC_NUMERIC, "C");
@@ -609,7 +619,7 @@ main(int argc, char **argv)
    edje_init();
 
    _log_dom = eina_log_domain_register
-     ("edje_external_inspector", EINA_COLOR_YELLOW);
+       ("edje_external_inspector", EINA_COLOR_YELLOW);
    if (_log_dom < 0)
      {
         EINA_LOG_CRIT
@@ -625,27 +635,32 @@ main(int argc, char **argv)
         ret = 1;
         goto error_getopt;
      }
-   else if (quit_option) goto error_getopt;
+   else if (quit_option)
+     goto error_getopt;
 
    if (!mode) mode = (char *)mode_choices[0];
 
    if (detail_name)
      {
         if (!strcmp(detail_name, "none")) detail = 0;
-        else if (!strcmp(detail_name, "terse")) detail = 1;
-        else if (!strcmp(detail_name, "all")) detail = 2;
+        else if (!strcmp(detail_name, "terse"))
+          detail = 1;
+        else if (!strcmp(detail_name, "all"))
+          detail = 2;
         else ERR("Unknown detail level: '%s'", detail_name);
      }
 
    if (arg_index < argc) module_patterns = argv + arg_index;
-   else                  module_patterns = NULL;
+   else module_patterns = NULL;
 
    modules = edje_available_modules_get();
    module_patterns_str = _module_patterns_str_new();
 
    if (!strcmp(mode, "info")) ret = _info_list();
-   else if (!strcmp(mode, "modules-names")) ret = _modules_names_list();
-   else if (!strcmp(mode, "types-names")) ret = _types_names_list();
+   else if (!strcmp(mode, "modules-names"))
+     ret = _modules_names_list();
+   else if (!strcmp(mode, "types-names"))
+     ret = _types_names_list();
    else
      {
         ERR("Unknown mode: %s", mode);
@@ -654,12 +669,13 @@ main(int argc, char **argv)
 
    free(module_patterns_str);
 
- error_getopt:
+error_getopt:
    eina_log_domain_unregister(_log_dom);
- error_log:
+error_log:
    edje_shutdown();
    ecore_shutdown();
    eina_shutdown();
 
    return ret;
 }
+
diff --git a/src/bin/edje/edje_inspector.c b/src/bin/edje/edje_inspector.c
index b0710343ca..25024cee73 100644
--- a/src/bin/edje/edje_inspector.c
+++ b/src/bin/edje/edje_inspector.c
@@ -22,13 +22,13 @@ static int _log_dom;
 #define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
 #define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
 
-#define INDENT "   "
-#define INDENT2 INDENT INDENT
-#define INDENT3 INDENT2 INDENT
-#define INDENT4 INDENT3 INDENT
-#define INDENT5 INDENT4 INDENT
-#define INDENT6 INDENT5 INDENT
-#define INDENT7 INDENT6 INDENT
+#define INDENT          "   "
+#define INDENT2         INDENT INDENT
+#define INDENT3         INDENT2 INDENT
+#define INDENT4         INDENT3 INDENT
+#define INDENT5         INDENT4 INDENT
+#define INDENT6         INDENT5 INDENT
+#define INDENT7         INDENT6 INDENT
 
 #define FLOAT_PRECISION 0.0001
 #define FDIFF(a, b) (fabs((a) - (b)) > FLOAT_PRECISION)
@@ -48,53 +48,53 @@ static Eina_Bool api_fix = EINA_FALSE;
 static Eina_Bool machine = EINA_FALSE;
 
 static const char *mode_choices[] = {
-  "groups",
-  "parts",
-  "programs",
-  "groups-names",
-  "part-names",
-  "global-data",
-  "images",
-  "fonts",
-  "externals",
-  NULL,
+   "groups",
+   "parts",
+   "programs",
+   "groups-names",
+   "part-names",
+   "global-data",
+   "images",
+   "fonts",
+   "externals",
+   NULL,
 };
 
 static const char *detail_choices[] = {
-  "none",
-  "terse",
-  "all",
-  NULL
+   "none",
+   "terse",
+   "all",
+   NULL
 };
 
 const Ecore_Getopt optdesc = {
-  "edje_inspector",
-  "%prog [options] <file.edj>",
-  PACKAGE_VERSION,
-  "(C) 2010 - The Enlightenment Project",
-  "BSD",
-  "Edje file inspector, let one see groups, parts, programs and other details "
-  "of a compiled (binary) edje file.\n",
-  0,
-  {
-    ECORE_GETOPT_CHOICE('m', "mode", "Choose which mode to operate on file.",
-                        mode_choices),
-    ECORE_GETOPT_CHOICE('d', "detail", "Choose detail level (default=terse)",
-                        detail_choices),
-    ECORE_GETOPT_STORE_STR('g', "group", "Limit output to group (or glob)."),
-    ECORE_GETOPT_STORE_STR('p', "part", "Limit output to part (or glob)."),
-    ECORE_GETOPT_STORE_STR('r', "program",
-                           "Limit output to program (or glob)."),
-    ECORE_GETOPT_STORE_TRUE('a', "api-only", "Limit to just api parts or "
-                            "programs."),
-    ECORE_GETOPT_STORE_TRUE('A', "api-fix", "Fix API names to be C compliant."),
-    ECORE_GETOPT_STORE_TRUE('M', "machine", "Produce machine readable output."),
-    ECORE_GETOPT_LICENSE('L', "license"),
-    ECORE_GETOPT_COPYRIGHT('C', "copyright"),
-    ECORE_GETOPT_VERSION('V', "version"),
-    ECORE_GETOPT_HELP('h', "help"),
-    ECORE_GETOPT_SENTINEL
-  }
+   "edje_inspector",
+   "%prog [options] <file.edj>",
+   PACKAGE_VERSION,
+   "(C) 2010 - The Enlightenment Project",
+   "BSD",
+   "Edje file inspector, let one see groups, parts, programs and other details "
+   "of a compiled (binary) edje file.\n",
+   0,
+   {
+      ECORE_GETOPT_CHOICE('m', "mode", "Choose which mode to operate on file.",
+                          mode_choices),
+      ECORE_GETOPT_CHOICE('d', "detail", "Choose detail level (default=terse)",
+                          detail_choices),
+      ECORE_GETOPT_STORE_STR('g', "group", "Limit output to group (or glob)."),
+      ECORE_GETOPT_STORE_STR('p', "part", "Limit output to part (or glob)."),
+      ECORE_GETOPT_STORE_STR('r', "program",
+                             "Limit output to program (or glob)."),
+      ECORE_GETOPT_STORE_TRUE('a', "api-only", "Limit to just api parts or "
+                                               "programs."),
+      ECORE_GETOPT_STORE_TRUE('A', "api-fix", "Fix API names to be C compliant."),
+      ECORE_GETOPT_STORE_TRUE('M', "machine", "Produce machine readable output."),
+      ECORE_GETOPT_LICENSE('L', "license"),
+      ECORE_GETOPT_COPYRIGHT('C', "copyright"),
+      ECORE_GETOPT_VERSION('V', "version"),
+      ECORE_GETOPT_HELP('h', "help"),
+      ECORE_GETOPT_SENTINEL
+   }
 };
 
 static inline Eina_Bool
@@ -130,12 +130,14 @@ group_details(Evas_Object *ed)
    w = edje_edit_group_min_w_get(ed);
    h = edje_edit_group_min_h_get(ed);
    if (machine) printf("MIN-W: %d\nMIN-H: %d\n", w, h);
-   else if ((w > 0) || (h > 0)) printf(INDENT "min: %d %d;\n", w, h);
+   else if ((w > 0) || (h > 0))
+     printf(INDENT "min: %d %d;\n", w, h);
 
    w = edje_edit_group_max_w_get(ed);
    h = edje_edit_group_max_h_get(ed);
    if (machine) printf("MAX-W: %d\nMAX-H: %d\n", w, h);
-   else if ((w > 0) || (h > 0)) printf(INDENT "max: %d %d;\n", w, h);
+   else if ((w > 0) || (h > 0))
+     printf(INDENT "max: %d %d;\n", w, h);
 
    if (detail > 1)
      {
@@ -185,39 +187,52 @@ part_type_name_get(Edje_Part_Type t)
    switch (t)
      {
       case EDJE_PART_TYPE_RECTANGLE:
-         return "RECT";
+        return "RECT";
+
       case EDJE_PART_TYPE_TEXT:
-         return "TEXT";
+        return "TEXT";
+
       case EDJE_PART_TYPE_IMAGE:
-         return "IMAGE";
+        return "IMAGE";
+
       case EDJE_PART_TYPE_PROXY:
-	 return "PROXY";
+        return "PROXY";
+
       case EDJE_PART_TYPE_SWALLOW:
-         return "SWALLOW";
+        return "SWALLOW";
+
       case EDJE_PART_TYPE_TEXTBLOCK:
-         return "TEXTBLOCK";
+        return "TEXTBLOCK";
+
       case EDJE_PART_TYPE_GRADIENT:
-         return "GRADIENT";
+        return "GRADIENT";
+
       case EDJE_PART_TYPE_GROUP:
-         return "GROUP";
+        return "GROUP";
+
       case EDJE_PART_TYPE_BOX:
-         return "BOX";
+        return "BOX";
+
       case EDJE_PART_TYPE_TABLE:
-         return "TABLE";
+        return "TABLE";
+
       case EDJE_PART_TYPE_EXTERNAL:
-         return "EXTERNAL";
+        return "EXTERNAL";
+
       case EDJE_PART_TYPE_SPACER:
-         return "SPACER";
+        return "SPACER";
+
       case EDJE_PART_TYPE_VECTOR:
-         return "VECTOR";
+        return "VECTOR";
 
       case EDJE_PART_TYPE_NONE:
       case EDJE_PART_TYPE_LAST:
-         ERR("Invalid part type %d", t);
-         return "???";
+        ERR("Invalid part type %d", t);
+        return "???";
+
       default:
-         ERR("Unknown part type %d", t);
-         return "???";
+        ERR("Unknown part type %d", t);
+        return "???";
      }
 }
 
@@ -239,12 +254,16 @@ aspect_pref_name_get(int id)
    switch (id)
      {
       case 0: return "NONE";
+
       case 1: return "VERTICAL";
+
       case 2: return "HORIZONTAL";
+
       case 3: return "BOTH";
+
       default:
-         ERR("Unknown aspect preference %d", id);
-         return "???";
+        ERR("Unknown aspect preference %d", id);
+        return "???";
      }
 }
 
@@ -254,11 +273,14 @@ border_fill_name_get(int id)
    switch (id)
      {
       case 0: return "NONE";
+
       case 1: return "DEFAULT";
+
       case 2: return "SOLID";
+
       default:
-         ERR("Unknown border fill %d", id);
-         return "???";
+        ERR("Unknown border fill %d", id);
+        return "???";
      }
 }
 
@@ -274,7 +296,8 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
 
    b = edje_edit_state_visible_get(ed, ppart, state, value);
    if (machine) printf("VISIBLE: %d\n", b);
-   else if (!b) puts(INDENT4 "visible: 0;");
+   else if (!b)
+     puts(INDENT4 "visible: 0;");
 
    edje_edit_state_color_get(ed, ppart, state, value, &r, &g, &b, &a);
    if (machine)
@@ -308,12 +331,14 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
    x = edje_edit_state_min_w_get(ed, ppart, state, value);
    y = edje_edit_state_min_h_get(ed, ppart, state, value);
    if (machine) printf("MIN-W: %d\nMIN-H: %d\n", x, y);
-   else if ((x) || (y)) printf(INDENT4 "min: %d %d;\n", x, y);
+   else if ((x) || (y))
+     printf(INDENT4 "min: %d %d;\n", x, y);
 
    x = edje_edit_state_max_w_get(ed, ppart, state, value);
    y = edje_edit_state_max_h_get(ed, ppart, state, value);
    if (machine) printf("MAX-W: %d\nMAX-H: %d\n", x, y);
-   else if ((x != -1) || (y != -1)) printf(INDENT4 "max: %d %d;\n", x, y);
+   else if ((x != -1) || (y != -1))
+     printf(INDENT4 "max: %d %d;\n", x, y);
 
    //TODO Support fixed
    //TODO Support step
@@ -329,12 +354,14 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
         x = edje_edit_state_aspect_pref_get(ed, ppart, state, value);
         str = aspect_pref_name_get(x);
         if (machine) printf("ASPECT-PREFERENCE: %s\n", str);
-        else if (x) printf(INDENT4 "aspect_preference: %s;\n", str);
+        else if (x)
+          printf(INDENT4 "aspect_preference: %s;\n", str);
         /* do not free this str! */
 
         str = edje_edit_state_color_class_get(ed, ppart, state, value);
         if (machine) printf("COLOR_CLASS: %s\n", str ? str : "");
-        else if (str) printf(INDENT4 "color_class: \"%s\";\n", str);
+        else if (str)
+          printf(INDENT4 "color_class: \"%s\";\n", str);
         edje_edit_string_free(str);
      }
 
@@ -354,7 +381,8 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
           printf(INDENT5 "relative: %g %g;\n", dx, dy);
 
         if (machine) printf("OFFSET-X: %d\nOFFSET-Y: %d\n", x, y);
-        else if ((x) || (y)) printf(INDENT5 "offset: %d %d;\n", x, y);
+        else if ((x) || (y))
+          printf(INDENT5 "offset: %d %d;\n", x, y);
 
         if (machine)
           printf("TO-X: %s\nTO-Y: %s\n", str ? str : "", str2 ? str2 : "");
@@ -418,7 +446,8 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
              puts(INDENT4 "image {");
              if (str) printf(INDENT5 "normal: \"%s\";\n", str);
           }
-        else if (str) printf(INDENT4 "image.normal: \"%s\";\n", str);
+        else if (str)
+          printf(INDENT4 "image.normal: \"%s\";\n", str);
 
         edje_edit_string_free(str);
 
@@ -448,28 +477,29 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
              x = edje_edit_state_image_border_fill_get(ed, ppart, state, value);
              str = border_fill_name_get(x);
              if (machine) printf("BORDER-FILL: %s\n", str);
-             else if (x != 1) printf(INDENT5 "middle: %s;\n", str);
+             else if (x != 1)
+               printf(INDENT5 "middle: %s;\n", str);
              /* do not free str! */
 
              // TODO support image.fill.smooth
 
              dx = edje_edit_state_fill_origin_relative_x_get
-               (ed, ppart, state, value);
+                 (ed, ppart, state, value);
              dy = edje_edit_state_fill_origin_relative_y_get
-               (ed, ppart, state, value);
+                 (ed, ppart, state, value);
              x = edje_edit_state_fill_origin_offset_x_get
-               (ed, ppart, state, value);
+                 (ed, ppart, state, value);
              y = edje_edit_state_fill_origin_offset_y_get
-               (ed, ppart, state, value);
+                 (ed, ppart, state, value);
 
              dx2 = edje_edit_state_fill_size_relative_x_get
-               (ed, ppart, state, value);
+                 (ed, ppart, state, value);
              dy2 = edje_edit_state_fill_size_relative_y_get
-               (ed, ppart, state, value);
+                 (ed, ppart, state, value);
              x2 = edje_edit_state_fill_size_offset_x_get
-               (ed, ppart, state, value);
+                 (ed, ppart, state, value);
              y2 = edje_edit_state_fill_size_offset_y_get
-               (ed, ppart, state, value);
+                 (ed, ppart, state, value);
 
              has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y));
              has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2));
@@ -517,83 +547,84 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
           }
 
         if (machine) puts("IMAGE-END");
-        else if (detail > 1) puts(INDENT4 "}");
+        else if (detail > 1)
+          puts(INDENT4 "}");
      }
    else if (t == EDJE_PART_TYPE_PROXY)
-     { 
-       int x2, y2;
-       double dx2, dy2;
-       Eina_Bool has_orgin, has_size;
-
-       if (machine) puts("PROXY-BEGIN");
-       else puts(INDENT4 "proxy {");
-       // TODO Support source
-       // TODO support proxy.fill.smooth
-
-       dx = edje_edit_state_fill_origin_relative_x_get
-	 (ed, ppart, state, value);
-       dy = edje_edit_state_fill_origin_relative_y_get
-	 (ed, ppart, state, value);
-       x = edje_edit_state_fill_origin_offset_x_get
-	 (ed, ppart, state, value);
-       y = edje_edit_state_fill_origin_offset_y_get
-	 (ed, ppart, state, value);
-
-       dx2 = edje_edit_state_fill_size_relative_x_get
-	 (ed, ppart, state, value);
-       dy2 = edje_edit_state_fill_size_relative_y_get
-	 (ed, ppart, state, value);
-       x2 = edje_edit_state_fill_size_offset_x_get
-	 (ed, ppart, state, value);
-       y2 = edje_edit_state_fill_size_offset_y_get
-	 (ed, ppart, state, value);
-
-       has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y));
-       has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2));
-
-       if ((has_orgin) || (has_size))
-	 {
-	   if (machine) puts("PROXY-FILL-BEGIN");
-	   else puts(INDENT5 "fill {");
-
-	   if (has_orgin)
-	     {
-	       if (machine)
-		 printf("ORIGIN-RELATIVE-X: %g\n"
-			"ORIGIN-RELATIVE-Y: %g\n"
-			"ORIGIN-OFFSET-X: %d\n"
-			"ORIGIN-OFFSET-Y: %d\n",
-			dx, dy, x, y);
-	       else
-		 printf(INDENT6 "origin {\n"
-			INDENT7 "relative: %g %g;\n"
-			INDENT7 "offset: %d %d;\n"
-			INDENT6 "}\n",
-			dx, dy, x, y);
-	     }
-
-	   if (has_size)
-	     {
-	       if (machine)
-		 printf("SIZE-RELATIVE-X: %g\n"
-			"SIZE-RELATIVE-Y: %g\n"
-			"SIZE-OFFSET-X: %d\n"
-			"SIZE-OFFSET-Y: %d\n",
-			dx2, dy2, x2, y2);
-	       else
-		 printf(INDENT6 "size {\n"
-			INDENT7 "relative: %g %g;\n"
-			INDENT7 "offset: %d %d;\n"
-			INDENT6 "}\n",
-			dx2, dy2, x2, y2);
-	     }
-
-	   if (machine) puts("PROXY-FILL-END");
-	   else puts(INDENT5 "}");
-	 }
+     {
+        int x2, y2;
+        double dx2, dy2;
+        Eina_Bool has_orgin, has_size;
+
+        if (machine) puts("PROXY-BEGIN");
+        else puts(INDENT4 "proxy {");
+        // TODO Support source
+        // TODO support proxy.fill.smooth
+
+        dx = edje_edit_state_fill_origin_relative_x_get
+            (ed, ppart, state, value);
+        dy = edje_edit_state_fill_origin_relative_y_get
+            (ed, ppart, state, value);
+        x = edje_edit_state_fill_origin_offset_x_get
+            (ed, ppart, state, value);
+        y = edje_edit_state_fill_origin_offset_y_get
+            (ed, ppart, state, value);
+
+        dx2 = edje_edit_state_fill_size_relative_x_get
+            (ed, ppart, state, value);
+        dy2 = edje_edit_state_fill_size_relative_y_get
+            (ed, ppart, state, value);
+        x2 = edje_edit_state_fill_size_offset_x_get
+            (ed, ppart, state, value);
+        y2 = edje_edit_state_fill_size_offset_y_get
+            (ed, ppart, state, value);
+
+        has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y));
+        has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2));
+
+        if ((has_orgin) || (has_size))
+          {
+             if (machine) puts("PROXY-FILL-BEGIN");
+             else puts(INDENT5 "fill {");
+
+             if (has_orgin)
+               {
+                  if (machine)
+                    printf("ORIGIN-RELATIVE-X: %g\n"
+                           "ORIGIN-RELATIVE-Y: %g\n"
+                           "ORIGIN-OFFSET-X: %d\n"
+                           "ORIGIN-OFFSET-Y: %d\n",
+                           dx, dy, x, y);
+                  else
+                    printf(INDENT6 "origin {\n"
+                           INDENT7 "relative: %g %g;\n"
+                           INDENT7 "offset: %d %d;\n"
+                           INDENT6 "}\n",
+                           dx, dy, x, y);
+               }
+
+             if (has_size)
+               {
+                  if (machine)
+                    printf("SIZE-RELATIVE-X: %g\n"
+                           "SIZE-RELATIVE-Y: %g\n"
+                           "SIZE-OFFSET-X: %d\n"
+                           "SIZE-OFFSET-Y: %d\n",
+                           dx2, dy2, x2, y2);
+                  else
+                    printf(INDENT6 "size {\n"
+                           INDENT7 "relative: %g %g;\n"
+                           INDENT7 "offset: %d %d;\n"
+                           INDENT6 "}\n",
+                           dx2, dy2, x2, y2);
+               }
+
+             if (machine) puts("PROXY-FILL-END");
+             else puts(INDENT5 "}");
+          }
 
         if (machine) puts("PROXY-END");
-        else puts(INDENT4 "}");       
+        else puts(INDENT4 "}");
      }
    else if ((t == EDJE_PART_TYPE_TEXTBLOCK) || (t == EDJE_PART_TYPE_TEXT))
      {
@@ -602,17 +633,20 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
 
         str = edje_edit_state_text_get(ed, ppart, state, value);
         if (machine) printf("TEXT: %s\n", str ? str : "");
-        else if (str) printf(INDENT5 "text: \"%s\";\n", str);
+        else if (str)
+          printf(INDENT5 "text: \"%s\";\n", str);
         edje_edit_string_free(str);
 
         str = edje_edit_state_font_get(ed, ppart, state, value);
         if (machine) printf("FONT: %s\n", str ? str : "");
-        else if (str) printf(INDENT5 "font: \"%s\";\n", str);
+        else if (str)
+          printf(INDENT5 "font: \"%s\";\n", str);
         edje_edit_string_free(str);
 
         x = edje_edit_state_text_size_get(ed, ppart, state, value);
         if (machine) printf("SIZE: %d\n", x);
-        else if (x > 0) printf(INDENT5 "size: %d;\n", x);
+        else if (x > 0)
+          printf(INDENT5 "size: %d;\n", x);
 
         // TODO text_class
 
@@ -625,11 +659,13 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
         x = edje_edit_state_text_fit_x_get(ed, ppart, state, value);
         y = edje_edit_state_text_fit_y_get(ed, ppart, state, value);
         if (machine) printf("TEXT-FIT-X: %d\nTEXT-FIT-Y: %d\n", x, y);
-        else if ((x) || (y)) printf(INDENT5 "fit: %d %d;\n", x, y);
+        else if ((x) || (y))
+          printf(INDENT5 "fit: %d %d;\n", x, y);
 
         dx = edje_edit_state_text_elipsis_get(ed, ppart, state, value);
         if (machine) printf("TEXT-ELLIPSIS: %g\n", dx);
-        else if (FDIFF(dx, 0.5)) printf(INDENT5 "ellipsis: %g;\n", dx);
+        else if (FDIFF(dx, 0.5))
+          printf(INDENT5 "ellipsis: %g;\n", dx);
 
         if (machine) puts("TEXT-END");
         else puts(INDENT4 "}");
@@ -640,7 +676,7 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
         const Edje_External_Param *p;
 
         params = edje_edit_state_external_params_list_get
-          (ed, ppart, state, value);
+            (ed, ppart, state, value);
 
         if (params)
           {
@@ -651,26 +687,31 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
                switch (p->type)
                  {
                   case EDJE_EXTERNAL_PARAM_TYPE_INT:
-                     printf(INDENT5 "int: \"%s\" \"%d\";\n", p->name, p->i);
-                     break;
+                    printf(INDENT5 "int: \"%s\" \"%d\";\n", p->name, p->i);
+                    break;
+
                   case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-                     printf(INDENT5 "double: \"%s\" \"%g\";\n", p->name, p->d);
-                     break;
+                    printf(INDENT5 "double: \"%s\" \"%g\";\n", p->name, p->d);
+                    break;
+
                   case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-                     if (p->s)
-                       printf(INDENT5 "string: \"%s\" \"%s\";\n",
-                              p->name, p->s);
-                     break;
+                    if (p->s)
+                      printf(INDENT5 "string: \"%s\" \"%s\";\n",
+                             p->name, p->s);
+                    break;
+
                   case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-                     printf(INDENT5 "bool: \"%s\" \"%d\";\n", p->name, p->i);
-                     break;
+                    printf(INDENT5 "bool: \"%s\" \"%d\";\n", p->name, p->i);
+                    break;
+
                   case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
-                     if (p->s)
-                       printf(INDENT5 "choice: \"%s\" \"%s\";\n",
-                              p->name, p->s);
-                     break;
+                    if (p->s)
+                      printf(INDENT5 "choice: \"%s\" \"%s\";\n",
+                             p->name, p->s);
+                    break;
+
                   default:
-                     break;
+                    break;
                  }
 
              if (machine) puts("PARAMS-END");
@@ -683,7 +724,8 @@ static void
 state_end(void)
 {
    if (machine) puts("PART-STATE-END");
-   else if (detail > 0) puts(INDENT3 "}");
+   else if (detail > 0)
+     puts(INDENT3 "}");
    else puts(" }");
 }
 
@@ -705,34 +747,45 @@ text_effect_name_get(Edje_Text_Effect effect)
    switch (effect)
      {
       case EDJE_TEXT_EFFECT_NONE:
-         return "NONE";
+        return "NONE";
+
       case EDJE_TEXT_EFFECT_PLAIN:
-         return "PLAIN";
+        return "PLAIN";
+
       case EDJE_TEXT_EFFECT_OUTLINE:
-         return "OUTLINE";
+        return "OUTLINE";
+
       case EDJE_TEXT_EFFECT_SOFT_OUTLINE:
-         return "SOFT_OUTLINE";
+        return "SOFT_OUTLINE";
+
       case EDJE_TEXT_EFFECT_SHADOW:
-         return "SHADOW";
+        return "SHADOW";
+
       case EDJE_TEXT_EFFECT_SOFT_SHADOW:
-         return "SOFT_SHADOW";
+        return "SOFT_SHADOW";
+
       case EDJE_TEXT_EFFECT_OUTLINE_SHADOW:
-         return "OUTLINE_SHADOW";
+        return "OUTLINE_SHADOW";
+
       case EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW:
-         return "OUTLINE_SOFT_SHADOW";
+        return "OUTLINE_SOFT_SHADOW";
+
       case EDJE_TEXT_EFFECT_FAR_SHADOW:
-         return "FAR_SHADOW";
+        return "FAR_SHADOW";
+
       case EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW:
-         return "FAR_SOFT_SHADOW";
+        return "FAR_SOFT_SHADOW";
+
       case EDJE_TEXT_EFFECT_GLOW:
-         return "GLOW";
+        return "GLOW";
 
       case EDJE_TEXT_EFFECT_LAST:
-         ERR("Invalid part type %d", effect);
-         return "???";
+        ERR("Invalid part type %d", effect);
+        return "???";
+
       default:
-         ERR("Unknown effect type %d", effect);
-         return "???";
+        ERR("Unknown effect type %d", effect);
+        return "???";
      }
 }
 
@@ -786,7 +839,7 @@ part_details(Evas_Object *ed, const char *ppart)
 
    if (machine) puts("PART-DETAILS-BEGIN");
 
-   str = api =_part_api_name_get(ed, ppart);
+   str = api = _part_api_name_get(ed, ppart);
    str2 = edje_edit_part_api_description_get(ed, ppart);
    if (machine)
      {
@@ -800,27 +853,32 @@ part_details(Evas_Object *ed, const char *ppart)
 
    b = edje_edit_part_mouse_events_get(ed, ppart);
    if (machine) printf("MOUSE_EVENTS: %d\n", b);
-   else if (!b) puts(INDENT3 "mouse_events: 0;");
+   else if (!b)
+     puts(INDENT3 "mouse_events: 0;");
 
    if (detail > 1)
      {
         b = edje_edit_part_repeat_events_get(ed, ppart);
         if (machine) printf("REPEAT_EVENTS: %d\n", b);
-        else if (b) puts(INDENT3 "repeat_events: 1;");
+        else if (b)
+          puts(INDENT3 "repeat_events: 1;");
 
         b = edje_edit_part_scale_get(ed, ppart);
         if (machine) printf("SCALE: %d\n", b);
-        else if (b) puts(INDENT3 "scale: 1;");
+        else if (b)
+          puts(INDENT3 "scale: 1;");
      }
 
    str = edje_edit_part_clip_to_get(ed, ppart);
    if (machine) printf("CLIP_TO: %s\n", str ? str : "");
-   else if (str) printf(INDENT3 "clip_to: \"%s\";\n", str);
+   else if (str)
+     printf(INDENT3 "clip_to: \"%s\";\n", str);
    edje_edit_string_free(str);
 
    str = edje_edit_part_source_get(ed, ppart);
    if (machine) printf("SOURCE: %s\n", str ? str : "");
-   else if (str) printf(INDENT3 "source: \"%s\";\n", str);
+   else if (str)
+     printf(INDENT3 "source: \"%s\";\n", str);
    edje_edit_string_free(str);
 
    if (detail > 1)
@@ -829,7 +887,8 @@ part_details(Evas_Object *ed, const char *ppart)
           {
              str = text_effect_name_get(edje_edit_part_effect_get(ed, ppart));
              if (machine) printf("EFFECT: %s\n", str ? str : "");
-             else if (str) printf(INDENT3 "effect: %s;\n", str);
+             else if (str)
+               printf(INDENT3 "effect: %s;\n", str);
              /* do not free this str! */
           }
 
@@ -855,12 +914,14 @@ part_details(Evas_Object *ed, const char *ppart)
 
              str = edje_edit_part_drag_confine_get(ed, ppart);
              if (machine) printf("DRAG-CONFINE: %s\n", str ? str : "");
-             else if (str) printf(INDENT4 "confine: \"%s\";\n", str);
+             else if (str)
+               printf(INDENT4 "confine: \"%s\";\n", str);
              edje_edit_string_free(str);
 
              str = edje_edit_part_drag_event_get(ed, ppart);
              if (machine) printf("DRAG-EVENTS: %s\n", str ? str : "");
-             else if (str) printf(INDENT4 "events: \"%s\";\n", str);
+             else if (str)
+               printf(INDENT4 "events: \"%s\";\n", str);
              edje_edit_string_free(str);
 
              if (machine) puts("DRAGABLE-END");
@@ -875,7 +936,7 @@ part_details(Evas_Object *ed, const char *ppart)
         double value;
         eina_strlcpy(state, str, sizeof(state)); /* bad states_list! :-( */
         delim = strchr(state, ' ');
-        if (!delim) continue ;
+        if (!delim) continue;
         *delim = '\0';
         delim++;
         value = strtod(delim, NULL);
@@ -892,7 +953,8 @@ static void
 part_end(void)
 {
    if (machine) puts("PART-END");
-   else if (detail > 0) puts(INDENT2 "}");
+   else if (detail > 0)
+     puts(INDENT2 "}");
    else puts(" }");
 }
 
@@ -1046,7 +1108,6 @@ program_end(void)
    else puts(INDENT2 "}");
 }
 
-
 static char *
 _program_api_name_get(Evas_Object *ed, const char *pprogram)
 {
@@ -1062,13 +1123,18 @@ _transition_name_get(Edje_Tween_Mode mode)
    switch (mode)
      {
       case EDJE_TWEEN_MODE_LINEAR: return "LINEAR";
+
       case EDJE_TWEEN_MODE_ACCELERATE: return "ACCELERATE";
+
       case EDJE_TWEEN_MODE_DECELERATE: return "DECELERATE";
+
       case EDJE_TWEEN_MODE_SINUSOIDAL: return "SINUSOIDAL";
+
       case EDJE_TWEEN_MODE_CUBIC_BEZIER: return "CUBIC_BEZIER";
+
       default:
-         ERR("Unknown transition mode %d", mode);
-         return "???";
+        ERR("Unknown transition mode %d", mode);
+        return "???";
      }
 }
 
@@ -1082,7 +1148,7 @@ program_details(Evas_Object *ed, const char *pprogram)
 
    if (machine) puts("PROGRAM-DETAILS-BEGIN");
 
-   str = api =_program_api_name_get(ed, pprogram);
+   str = api = _program_api_name_get(ed, pprogram);
    str2 = edje_edit_program_api_description_get(ed, pprogram);
    if (machine)
      {
@@ -1096,12 +1162,14 @@ program_details(Evas_Object *ed, const char *pprogram)
 
    str = edje_edit_program_signal_get(ed, pprogram);
    if (machine) printf("SIGNAL: %s\n", str ? str : "");
-   else if (str) printf(INDENT3 "signal: \"%s\";\n", str);
+   else if (str)
+     printf(INDENT3 "signal: \"%s\";\n", str);
    edje_edit_string_free(str);
 
    str = edje_edit_program_source_get(ed, pprogram);
    if (machine) printf("SOURCE: %s\n", str ? str : "");
-   else if (str) printf(INDENT3 "source: \"%s\";\n", str);
+   else if (str)
+     printf(INDENT3 "source: \"%s\";\n", str);
    edje_edit_string_free(str);
 
    if (detail >= 1)
@@ -1111,45 +1179,48 @@ program_details(Evas_Object *ed, const char *pprogram)
         switch (type)
           {
            case EDJE_ACTION_TYPE_ACTION_STOP:
-              if (machine) puts("ACTION: ACTION_STOP");
-              else puts(INDENT3 "action: ACTION_STOP;");
-              break;
+             if (machine) puts("ACTION: ACTION_STOP");
+             else puts(INDENT3 "action: ACTION_STOP;");
+             break;
+
            case EDJE_ACTION_TYPE_STATE_SET:
-              str = edje_edit_program_state_get(ed, pprogram);
-              if (machine)
-                printf("ACTION: STATE_SET\nACTION-STATE: %s %g\n",
-                       str, edje_edit_program_value_get(ed, pprogram));
-              else
-                printf(INDENT3 "action: STATE_SET \"%s\" %2.1f;\n",
-                       str, edje_edit_program_value_get(ed, pprogram));
-              edje_edit_string_free(str);
-              break;
+             str = edje_edit_program_state_get(ed, pprogram);
+             if (machine)
+               printf("ACTION: STATE_SET\nACTION-STATE: %s %g\n",
+                      str, edje_edit_program_value_get(ed, pprogram));
+             else
+               printf(INDENT3 "action: STATE_SET \"%s\" %2.1f;\n",
+                      str, edje_edit_program_value_get(ed, pprogram));
+             edje_edit_string_free(str);
+             break;
+
            case EDJE_ACTION_TYPE_SIGNAL_EMIT:
-              str = edje_edit_program_state_get(ed, pprogram);
-              str2 = edje_edit_program_state2_get(ed, pprogram);
-              if (machine)
-                printf("ACTION: SIGNAL_EMIT\nACTION-SIGNAL: %s\n"
-                       "ACTION-SOURCE: %s\n",
-                       str ? str : "", str2 ? str2 : "");
-              else if ((str) || (str2))
-                printf(INDENT3 "action: SIGNAL_EMIT \"%s\" \"%s\";\n",
-                       str ? str : "", str2 ? str2 : "");
-              edje_edit_string_free(str);
-              edje_edit_string_free(str2);
-              break;
-              //TODO Support Drag
-              //~ case EDJE_ACTION_TYPE_DRAG_VAL_SET:
-              //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_SET TODO;\n");
-              //~ break;
-              //~ case EDJE_ACTION_TYPE_DRAG_VAL_STEP:
-              //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_STEP TODO;\n");
-              //~ break;
-              //~ case EDJE_ACTION_TYPE_DRAG_VAL_PAGE:
-              //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_PAGE TODO;\n");
-              //~ break;
+             str = edje_edit_program_state_get(ed, pprogram);
+             str2 = edje_edit_program_state2_get(ed, pprogram);
+             if (machine)
+               printf("ACTION: SIGNAL_EMIT\nACTION-SIGNAL: %s\n"
+                      "ACTION-SOURCE: %s\n",
+                      str ? str : "", str2 ? str2 : "");
+             else if ((str) || (str2))
+               printf(INDENT3 "action: SIGNAL_EMIT \"%s\" \"%s\";\n",
+                      str ? str : "", str2 ? str2 : "");
+             edje_edit_string_free(str);
+             edje_edit_string_free(str2);
+             break;
+
+           //TODO Support Drag
+           //~ case EDJE_ACTION_TYPE_DRAG_VAL_SET:
+           //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_SET TODO;\n");
+           //~ break;
+           //~ case EDJE_ACTION_TYPE_DRAG_VAL_STEP:
+           //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_STEP TODO;\n");
+           //~ break;
+           //~ case EDJE_ACTION_TYPE_DRAG_VAL_PAGE:
+           //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_PAGE TODO;\n");
+           //~ break;
            default:
-              ERR("Unhandled pprogram action type %d", type);
-              break;
+             ERR("Unhandled pprogram action type %d", type);
+             break;
           }
 
         if (detail > 1)
@@ -1160,7 +1231,7 @@ program_details(Evas_Object *ed, const char *pprogram)
              if (from > 0.0)
                {
                   str = _transition_name_get
-                    (edje_edit_program_transition_get(ed, pprogram));
+                      (edje_edit_program_transition_get(ed, pprogram));
                   if (machine)
                     printf("TRANSITION-NAME: %s\nTRANSITION-DURATION: %g\n",
                            str, from);
@@ -1372,26 +1443,32 @@ _comp_str_get(Evas_Object *ed, const char *img)
    switch (type)
      {
       case EDJE_EDIT_IMAGE_COMP_RAW:
-         return "RAW";
+        return "RAW";
+
       case EDJE_EDIT_IMAGE_COMP_USER:
-         return "USER";
+        return "USER";
+
       case EDJE_EDIT_IMAGE_COMP_COMP:
-         return "COMP";
+        return "COMP";
+
       case EDJE_EDIT_IMAGE_COMP_LOSSY:
-         rate = edje_edit_image_compression_rate_get(ed, img);
-         snprintf(buf, sizeof(buf), "LOSSY %d", rate);
-         return buf;
+        rate = edje_edit_image_compression_rate_get(ed, img);
+        snprintf(buf, sizeof(buf), "LOSSY %d", rate);
+        return buf;
+
       case EDJE_EDIT_IMAGE_COMP_LOSSY_ETC1:
         rate = edje_edit_image_compression_rate_get(ed, img);
         snprintf(buf, sizeof(buf), "LOSSY_ETC1 %d", rate);
         return buf;
+
       case EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2:
         rate = edje_edit_image_compression_rate_get(ed, img);
         snprintf(buf, sizeof(buf), "LOSSY_ETC2 %d", rate);
         return buf;
+
       default:
-         ERR("Unknown compression type %d", type);
-         return "???";
+        ERR("Unknown compression type %d", type);
+        return "???";
      }
 }
 
@@ -1521,7 +1598,6 @@ _externals_list(void)
    return EINA_TRUE;
 }
 
-
 int
 main(int argc, char **argv)
 {
@@ -1531,19 +1607,19 @@ main(int argc, char **argv)
    int arg_index;
    int ret = 0;
    Ecore_Getopt_Value values[] = {
-     ECORE_GETOPT_VALUE_STR(mode),
-     ECORE_GETOPT_VALUE_STR(detail_name),
-     ECORE_GETOPT_VALUE_STR(group),
-     ECORE_GETOPT_VALUE_STR(part),
-     ECORE_GETOPT_VALUE_STR(program),
-     ECORE_GETOPT_VALUE_BOOL(api_only),
-     ECORE_GETOPT_VALUE_BOOL(api_fix),
-     ECORE_GETOPT_VALUE_BOOL(machine),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_BOOL(quit_option),
-     ECORE_GETOPT_VALUE_NONE
+      ECORE_GETOPT_VALUE_STR(mode),
+      ECORE_GETOPT_VALUE_STR(detail_name),
+      ECORE_GETOPT_VALUE_STR(group),
+      ECORE_GETOPT_VALUE_STR(part),
+      ECORE_GETOPT_VALUE_STR(program),
+      ECORE_GETOPT_VALUE_BOOL(api_only),
+      ECORE_GETOPT_VALUE_BOOL(api_fix),
+      ECORE_GETOPT_VALUE_BOOL(machine),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_BOOL(quit_option),
+      ECORE_GETOPT_VALUE_NONE
    };
 
    setlocale(LC_NUMERIC, "C");
@@ -1570,7 +1646,8 @@ main(int argc, char **argv)
         ret = 1;
         goto error_getopt;
      }
-   else if (quit_option) goto error_getopt;
+   else if (quit_option)
+     goto error_getopt;
    else if (arg_index != argc - 1)
      {
         ERR("incorrect number of parameters. Requires one single file.");
@@ -1583,8 +1660,10 @@ main(int argc, char **argv)
    if (detail_name)
      {
         if (!strcmp(detail_name, "none")) detail = 0;
-        else if (!strcmp(detail_name, "terse")) detail = 1;
-        else if (!strcmp(detail_name, "all")) detail = 2;
+        else if (!strcmp(detail_name, "terse"))
+          detail = 1;
+        else if (!strcmp(detail_name, "all"))
+          detail = 2;
         else ERR("Unknown detail level: '%s'", detail_name);
      }
 
@@ -1608,7 +1687,6 @@ main(int argc, char **argv)
        program ? program : "",
        api_only, api_fix, machine, file);
 
-
    groups = edje_file_collection_list(file);
    if (!groups)
      {
@@ -1629,19 +1707,23 @@ main(int argc, char **argv)
         else
           {
              if (!strcmp(mode, "parts-names")) ret = _parts_names_list();
-             else if (!strcmp(mode, "global-data")) ret = _gdata_list();
-             else if (!strcmp(mode, "images")) ret = _images_list();
-             else if (!strcmp(mode, "fonts")) ret = _fonts_list();
-             else if (!strcmp(mode, "externals")) ret = _externals_list();
+             else if (!strcmp(mode, "global-data"))
+               ret = _gdata_list();
+             else if (!strcmp(mode, "images"))
+               ret = _images_list();
+             else if (!strcmp(mode, "fonts"))
+               ret = _fonts_list();
+             else if (!strcmp(mode, "externals"))
+               ret = _externals_list();
              else ret = _list(mode);
              ecore_evas_free(ee);
           }
      }
 
    edje_file_collection_list_free(groups);
- error_getopt:
+error_getopt:
    eina_log_domain_unregister(_log_dom);
- error_log:
+error_log:
    edje_shutdown();
    ecore_evas_shutdown();
    ecore_shutdown();
@@ -1649,3 +1731,4 @@ main(int argc, char **argv)
 
    return ret;
 }
+
diff --git a/src/bin/edje/edje_multisense_convert.c b/src/bin/edje/edje_multisense_convert.c
index 49e58f7181..50576efab2 100644
--- a/src/bin/edje/edje_multisense_convert.c
+++ b/src/bin/edje/edje_multisense_convert.c
@@ -15,22 +15,22 @@ Edje_Sound_Encode *
 _edje_multisense_encode(const char *filename, Edje_Sound_Sample *sample, double quality EINA_UNUSED)
 {
    SF_INFO sfinfo;
-   SNDFILE* sfile;
+   SNDFILE *sfile;
    Edje_Sound_Encode *enc_info;
-   
+
    enc_info = calloc(1, sizeof(Edje_Sound_Encode));
    if (!enc_info)
      {
         ERR("while allocating memory to load file ");
         exit(-1);
      }
-   memset (&sfinfo, 0, sizeof (SF_INFO));
-   
+   memset(&sfinfo, 0, sizeof (SF_INFO));
+
    enc_info->encoded = EINA_FALSE;
    enc_info->comp_type = "RAW PCM";
-   
+
    // Open wav file using sndfile
-   sfile = sf_open (filename, SFM_READ, &sfinfo);
+   sfile = sf_open(filename, SFM_READ, &sfinfo);
    if (!sfile)
      {
         ERR("Unable to open audio file: %s", filename);
@@ -82,7 +82,7 @@ _edje_multisense_encode(const char *filename, Edje_Sound_Sample *sample, double
 }
 
 #ifdef HAVE_LIBFLAC
-const char*
+const char *
 _edje_multisense_encode_to_flac(char *snd_path, SF_INFO sfinfo)
 {
    unsigned int total_samples = 0; /* can use a 32-bit number due to WAVE size limitations */
@@ -164,14 +164,14 @@ _edje_multisense_encode_to_flac(char *snd_path, SF_INFO sfinfo)
              ok = 0;
           }
      }
-   
+
    /* read blocks of samples from WAVE file and feed to encoder */
    while (ok)
      {
         FLAC__int32 readbuffer[READBUF * 2];
         sf_count_t count;
         int i;
-        
+
         count = sf_readf_int(sfile, readbuffer, READBUF);
         if (count <= 0) break;
         for (i = 0; i < (count * sfinfo.channels); i++)
@@ -187,8 +187,9 @@ _edje_multisense_encode_to_flac(char *snd_path, SF_INFO sfinfo)
 
    FLAC__stream_encoder_delete(encoder);
    sf_close(sfile);
-   return (snd_path);
+   return snd_path;
 }
+
 #endif
 
 #ifdef HAVE_VORBIS
@@ -233,7 +234,7 @@ _edje_multisense_encode_to_ogg_vorbis(char *snd_path, double quality, SF_INFO sf
 
    /********** Encode setup ************/
    vorbis_info_init(&vi);
-   ret = vorbis_encode_init(&vi, sfinfo.channels, sfinfo.samplerate, 
+   ret = vorbis_encode_init(&vi, sfinfo.channels, sfinfo.samplerate,
                             -1, (long)(quality * 1000), -1);
    if (ret == OV_EFAULT) printf("OV_EFAULT\n");
    if (ret == OV_EINVAL) printf("OV_EINVAL\n");
@@ -280,7 +281,7 @@ _edje_multisense_encode_to_ogg_vorbis(char *snd_path, double quality, SF_INFO sf
         int i, ch;
         float readbuffer[READBUF * 2];
         sf_count_t count;
-        
+
         count = sf_readf_float(sfile, readbuffer, READBUF);
 
         if (!count)
@@ -288,12 +289,12 @@ _edje_multisense_encode_to_ogg_vorbis(char *snd_path, double quality, SF_INFO sf
         else
           {
              float **buffer = vorbis_analysis_buffer(&vd, count);
-             
+
              /* uninterleave samples */
              for (i = 0; i < count; i++)
                {
                   for (ch = 0; ch < sfinfo.channels; ch++)
-                    buffer[ch][i]= readbuffer[(i * sfinfo.channels) + ch];
+                    buffer[ch][i] = readbuffer[(i * sfinfo.channels) + ch];
                }
              vorbis_analysis_wrote(&vd, i);
           }
@@ -322,8 +323,9 @@ _edje_multisense_encode_to_ogg_vorbis(char *snd_path, double quality, SF_INFO sf
    vorbis_comment_clear(&vc);
    vorbis_info_clear(&vi);
    sf_close(sfile);
-   fclose (fout);
+   fclose(fout);
    return snd_path;
 }
+
 #endif
 #endif
diff --git a/src/bin/edje/edje_pick.c b/src/bin/edje/edje_pick.c
index bc92297675..2079d92cee 100644
--- a/src/bin/edje/edje_pick.c
+++ b/src/bin/edje/edje_pick.c
@@ -19,7 +19,7 @@
 #include "edje_private.h"
 
 #define EDJE_PICK_HELP_STRING \
-"\nEdje Pick - the \"edj\" merging tool.\n\
+  "\nEdje Pick - the \"edj\" merging tool.\n\
 ===================================\n\n\
 Use Edje Pick to compose a single edj file \
 by selecting groups from edj files.\n\n\
@@ -46,8 +46,8 @@ Replacing the button and check with widgets taken from default theme.\n\
 
 struct _Edje_Pick_Id
 {
-   int old_id;
-   int new_id;
+   int       old_id;
+   int       new_id;
    Eina_Bool used;
 };
 typedef struct _Edje_Pick_Id Edje_Pick_Id;
@@ -55,30 +55,30 @@ typedef struct _Edje_Pick_Id Edje_Pick_Id;
 struct _Edje_Pick_File_Params
 {
    const char *name;
-   Eina_List *groups;
-   Edje_File *edf;     /* Keeps all file data after reading  */
-   Eina_Bool append;   /* Take everything from this file */
+   Eina_List  *groups;
+   Edje_File  *edf;    /* Keeps all file data after reading  */
+   Eina_Bool   append; /* Take everything from this file */
 
    /* We hold list of IDs for each file */
-   Eina_List *scriptlist;
-   Eina_List *luascriptlist;
-   Eina_List *imagelist;
-   Eina_List *imagesetlist;  /* List of IDs (Edje_Pick_Data) for image sets */
-   Eina_List *vectorlist;
-   Eina_List *samplelist;
-   Eina_List *tonelist;
-   Eina_List *vibrationlist;
-   Eina_List *fontlist;
+   Eina_List  *scriptlist;
+   Eina_List  *luascriptlist;
+   Eina_List  *imagelist;
+   Eina_List  *imagesetlist; /* List of IDs (Edje_Pick_Data) for image sets */
+   Eina_List  *vectorlist;
+   Eina_List  *samplelist;
+   Eina_List  *tonelist;
+   Eina_List  *vibrationlist;
+   Eina_List  *fontlist;
 };
 typedef struct _Edje_Pick_File_Params Edje_Pick_File_Params;
 
 struct _Edje_Pick_Data
 {
-   const char *filename;  /* Image, Sample File Name       */
-   void *entry ;          /* used to build output file dir FIXME: REMOVE THIS */
-   void *data;            /* Data as taken from input file */
+   const char  *filename; /* Image, Sample File Name       */
+   void        *entry; /* used to build output file dir FIXME: REMOVE THIS */
+   void        *data; /* Data as taken from input file */
 
-   int size;
+   int          size;
    Edje_Pick_Id id;
 };
 typedef struct _Edje_Pick_Data Edje_Pick_Data;
@@ -86,7 +86,7 @@ typedef struct _Edje_Pick_Data Edje_Pick_Data;
 struct _Edje_Pick_Tone
 {
    Edje_Sound_Tone *tone;
-   Eina_Bool used;
+   Eina_Bool        used;
 };
 typedef struct _Edje_Pick_Tone Edje_Pick_Tone;
 
@@ -94,15 +94,15 @@ struct _Edje_Pick_Font
 {
    Edje_Font *f;
 
-   void *data;             /* Font data as take from source edj file */
-   int size;               /* data size */
-   Eina_Bool used;
+   void      *data; /* Font data as take from source edj file */
+   int        size; /* data size */
+   Eina_Bool  used;
 };
 typedef struct _Edje_Pick_Font Edje_Pick_Font;
 
 struct _Edje_Pick
 {
-   Eina_Bool v; /* Verbose */
+   Eina_Bool              v; /* Verbose */
    Edje_Pick_File_Params *current_file;
 };
 typedef struct _Edje_Pick Edje_Pick;
@@ -112,46 +112,46 @@ static Edje_Pick context = { EINA_FALSE, NULL };
 #define VERBOSE(COMMAND) if (context.v) { COMMAND; }
 
 enum _Edje_Pick_Status
-  {
-    EDJE_PICK_NO_ERROR,
-    EDJE_PICK_OUT_FILENAME_MISSING,
-    EDJE_PICK_FAILED_OPEN_INP,
-    EDJE_PICK_FAILED_READ_INP,
-    EDJE_PICK_GROUP_NOT_FOUND,
-    EDJE_PICK_IMAGE_NOT_FOUND,
-    EDJE_PICK_SAMPLE_NOT_FOUND,
-    EDJE_PICK_INCLUDE_MISSING,
-    EDJE_PICK_GROUP_MISSING,
-    EDJE_PICK_PARSE_FAILED,
-    EDJE_PICK_HELP_SHOWN,
-    EDJE_PICK_DUP_GROUP
-  };
+{
+   EDJE_PICK_NO_ERROR,
+   EDJE_PICK_OUT_FILENAME_MISSING,
+   EDJE_PICK_FAILED_OPEN_INP,
+   EDJE_PICK_FAILED_READ_INP,
+   EDJE_PICK_GROUP_NOT_FOUND,
+   EDJE_PICK_IMAGE_NOT_FOUND,
+   EDJE_PICK_SAMPLE_NOT_FOUND,
+   EDJE_PICK_INCLUDE_MISSING,
+   EDJE_PICK_GROUP_MISSING,
+   EDJE_PICK_PARSE_FAILED,
+   EDJE_PICK_HELP_SHOWN,
+   EDJE_PICK_DUP_GROUP
+};
 typedef enum _Edje_Pick_Status Edje_Pick_Status;
 
 static void
 _edje_pick_args_show(Eina_List *ifs, char *out)
 {  /* Print command-line arguments after parsing phase */
-   Edje_Pick_File_Params *p;
-   Eina_List *l;
-   char *g;
-
-   EINA_LOG_INFO("Got args for <%d> input files.\n", eina_list_count(ifs));
-
-   EINA_LIST_FOREACH(ifs, l, p)
-     {
-        Eina_List *ll;
-
-        if (p->append)
-          printf("\nFile name: %s\n\tGroups: ALL (append mode)\n", p->name);
-        else
-          {
-             printf("\nFile name: %s\n\tGroups:\n", p->name);
-             EINA_LIST_FOREACH(p->groups, ll, g)
-                printf("\t\t%s\n", g);
-          }
-     }
-
-   EINA_LOG_INFO("\nOutput file name was <%s>\n", out);
+  Edje_Pick_File_Params *p;
+  Eina_List *l;
+  char *g;
+
+  EINA_LOG_INFO("Got args for <%d> input files.\n", eina_list_count(ifs));
+
+  EINA_LIST_FOREACH(ifs, l, p)
+    {
+       Eina_List *ll;
+
+       if (p->append)
+         printf("\nFile name: %s\n\tGroups: ALL (append mode)\n", p->name);
+       else
+         {
+            printf("\nFile name: %s\n\tGroups:\n", p->name);
+            EINA_LIST_FOREACH(p->groups, ll, g)
+              printf("\t\t%s\n", g);
+         }
+    }
+
+  EINA_LOG_INFO("\nOutput file name was <%s>\n", out);
 }
 
 static void
@@ -273,28 +273,35 @@ _edje_pick_cleanup(Eina_List *ifs, Edje_File *out_file, Edje_Pick_Status s)
    switch (s)
      {
       case EDJE_PICK_OUT_FILENAME_MISSING:
-         EINA_LOG_ERR("Output file name missing.\n");
-         break;
+        EINA_LOG_ERR("Output file name missing.\n");
+        break;
+
       case EDJE_PICK_FAILED_OPEN_INP:
-         EINA_LOG_ERR("Failed to open input file.\n");
-         break;
+        EINA_LOG_ERR("Failed to open input file.\n");
+        break;
+
       case EDJE_PICK_FAILED_READ_INP:
-         EINA_LOG_ERR("Failed to read input file.\n");
-         break;
+        EINA_LOG_ERR("Failed to read input file.\n");
+        break;
+
       case EDJE_PICK_DUP_GROUP:
-         EINA_LOG_ERR("Can't fetch groups with identical name from various files.\n");
-         break;
+        EINA_LOG_ERR("Can't fetch groups with identical name from various files.\n");
+        break;
+
       case EDJE_PICK_INCLUDE_MISSING:
-         EINA_LOG_ERR("Cannot select groups when no input file included.\n");
-         break;
+        EINA_LOG_ERR("Cannot select groups when no input file included.\n");
+        break;
+
       case EDJE_PICK_GROUP_MISSING:
-         EINA_LOG_ERR("Group name missing for include file.\n");
-         break;
+        EINA_LOG_ERR("Group name missing for include file.\n");
+        break;
+
       case EDJE_PICK_PARSE_FAILED:
-         EINA_LOG_ERR("Command parsing failed.\n");
-         break;
+        EINA_LOG_ERR("Command parsing failed.\n");
+        break;
+
       default:
-         return s;
+        return s;
      }
 
    _edje_edd_shutdown();
@@ -314,7 +321,7 @@ _group_name_in_other_file(Eina_List *inp_files, void *d1, void *d2)
    EINA_LIST_FOREACH(inp_files, f, current_file)
      if (inp_file != current_file)
        if (eina_list_search_unsorted(current_file->groups,
-                                     (Eina_Compare_Cb) strcmp,
+                                     (Eina_Compare_Cb)strcmp,
                                      group))
          return 1;
 
@@ -323,173 +330,171 @@ _group_name_in_other_file(Eina_List *inp_files, void *d1, void *d2)
 
 static int
 _edje_pick_command_line_parse(int argc, char **argv,
-			      Eina_List **ifs, char **ofn)
+                              Eina_List **ifs, char **ofn)
 {  /* On return ifs is Input Files List, ofn is Output File Name */
-   Eina_List *gpf = NULL; /* List including counters of groups-per-file */
-   Eina_List *a_files = NULL;
-   Eina_List *i_files = NULL;
-   Eina_List *l;
-   Eina_List *ll;
-   Eina_List *cg;
-   Eina_List *groups = NULL;
-   char *output_filename = NULL;
-   Edje_Pick_File_Params *current_inp = NULL;
-   Eina_List *files = NULL;  /* List of input files */
-   int *c = NULL;
-   char *str = NULL;
-   int k;
-   Eina_Bool show_help = EINA_FALSE;
-
-   /* Define args syntax */
-#define IS_GROUP(x) ((!strcmp(x, "-g")) || (!strcmp(x, "--group")))
+  Eina_List *gpf = NULL;  /* List including counters of groups-per-file */
+  Eina_List *a_files = NULL;
+  Eina_List *i_files = NULL;
+  Eina_List *l;
+  Eina_List *ll;
+  Eina_List *cg;
+  Eina_List *groups = NULL;
+  char *output_filename = NULL;
+  Edje_Pick_File_Params *current_inp = NULL;
+  Eina_List *files = NULL;   /* List of input files */
+  int *c = NULL;
+  char *str = NULL;
+  int k;
+  Eina_Bool show_help = EINA_FALSE;
+
+  /* Define args syntax */
+#define IS_GROUP(x)   ((!strcmp(x, "-g")) || (!strcmp(x, "--group")))
 #define IS_INCLUDE(x) ((!strcmp(x, "-i")) || (!strcmp(x, "--include")))
-#define IS_HELP(x) ((!strcmp(x, "-h")) || (!strcmp(x, "--help")))
-   static const Ecore_Getopt optdesc = {
-        "edje_pick",
-        NULL,
-        "0.0",
-        "(C) 2012 Enlightenment",
-        "Public domain?",
-        "Edje Pick - the \"edj\" merging tool.",
-
-        EINA_TRUE,
-        {
-           ECORE_GETOPT_STORE_TRUE('v', "verbose", "Verbose"),
-           ECORE_GETOPT_STORE('o', "output", "Output File",
-                 ECORE_GETOPT_TYPE_STR),
-           ECORE_GETOPT_APPEND_METAVAR('a', "append", "Append File",
-                 "STRING", ECORE_GETOPT_TYPE_STR),
-           ECORE_GETOPT_APPEND_METAVAR('i', "include", "Include File",
-                 "STRING", ECORE_GETOPT_TYPE_STR),
-           ECORE_GETOPT_APPEND_METAVAR('g', "group", "Add Group",
-                 "STRING", ECORE_GETOPT_TYPE_STR),
-           ECORE_GETOPT_HELP('h', "help"),
-           ECORE_GETOPT_SENTINEL
-        }
-   };
-
-   Ecore_Getopt_Value values[] = {
-        ECORE_GETOPT_VALUE_BOOL(context.v),
-        ECORE_GETOPT_VALUE_STR(output_filename),
-        ECORE_GETOPT_VALUE_LIST(a_files),
-        ECORE_GETOPT_VALUE_LIST(i_files),
-        ECORE_GETOPT_VALUE_LIST(groups),
-        ECORE_GETOPT_VALUE_NONE
-   };
-
-   /* START - Read command line args */
-   c = NULL;
-   for(k = 1; k < argc; k++)
-     {  /* Run through args, count how many groups per file */
-        if(IS_GROUP(argv[k]))
-          {
-             if (!c)
-               return _edje_pick_cleanup(files, NULL,
-                     EDJE_PICK_INCLUDE_MISSING);
-
-             (*c)++;
-             continue;
-          }
-
-        if(IS_INCLUDE(argv[k]))
-          {
-             c = calloc(1, sizeof(int));
-             gpf = eina_list_append(gpf, c);
-             continue;
-          }
-
-        show_help |= IS_HELP(argv[k]);
-     }
-
-   if (show_help)
-     puts(EDJE_PICK_HELP_STRING);
-
-   if (ecore_getopt_parse(&optdesc, values, argc, argv) < 0)
-     {
-        EINA_LIST_FREE(gpf, c)
-           free(c);
-
-        return _edje_pick_cleanup(files, NULL, EDJE_PICK_PARSE_FAILED);
-     }
-
-   if (show_help)
+#define IS_HELP(x)    ((!strcmp(x, "-h")) || (!strcmp(x, "--help")))
+  static const Ecore_Getopt optdesc = {
+     "edje_pick",
+     NULL,
+     "0.0",
+     "(C) 2012 Enlightenment",
+     "Public domain?",
+     "Edje Pick - the \"edj\" merging tool.",
+
+     EINA_TRUE,
      {
-        EINA_LIST_FREE(gpf, c)
-           free(c);
-
-        ecore_getopt_list_free(i_files);
-        ecore_getopt_list_free(groups);
-        return _edje_pick_cleanup(files, NULL, EDJE_PICK_HELP_SHOWN);
+        ECORE_GETOPT_STORE_TRUE('v', "verbose", "Verbose"),
+        ECORE_GETOPT_STORE('o', "output", "Output File",
+                           ECORE_GETOPT_TYPE_STR),
+        ECORE_GETOPT_APPEND_METAVAR('a', "append", "Append File",
+                                    "STRING", ECORE_GETOPT_TYPE_STR),
+        ECORE_GETOPT_APPEND_METAVAR('i', "include", "Include File",
+                                    "STRING", ECORE_GETOPT_TYPE_STR),
+        ECORE_GETOPT_APPEND_METAVAR('g', "group", "Add Group",
+                                    "STRING", ECORE_GETOPT_TYPE_STR),
+        ECORE_GETOPT_HELP('h', "help"),
+        ECORE_GETOPT_SENTINEL
      }
+  };
 
-   if (context.v)  /* Changed to INFO if verbose */
-     eina_log_level_set(EINA_LOG_LEVEL_INFO);
-
-   EINA_LIST_FOREACH(a_files, l, str)
-     {
-        current_inp = calloc(1, sizeof(*current_inp));
-        current_inp->append = EINA_TRUE;
-        current_inp->name = eina_stringshare_add(str);
-        files = eina_list_append(files, current_inp);
-     }
-   ecore_getopt_list_free(a_files);
-
-   ll = gpf;
-   cg = groups;
-   EINA_LIST_FOREACH(i_files, l, str)
-     {  /* Now match groups from groups-list with included files */
-        current_inp = calloc(1, sizeof(*current_inp));
-        current_inp->name = eina_stringshare_add(str);
-        files = eina_list_append(files, current_inp);
-        c = eina_list_data_get(ll);
-        if (c)
-          {
-             while(*c)
-               {
-                  char *g_name;
-                  if (!cg)
-                    {
-                       EINA_LIST_FREE(gpf, c)
-                          free(c);
-
-                       ecore_getopt_list_free(i_files);
-                       ecore_getopt_list_free(groups);
-                       return _edje_pick_cleanup(files, NULL,
-                             EDJE_PICK_GROUP_MISSING);
-                    }
-
+  Ecore_Getopt_Value values[] = {
+     ECORE_GETOPT_VALUE_BOOL(context.v),
+     ECORE_GETOPT_VALUE_STR(output_filename),
+     ECORE_GETOPT_VALUE_LIST(a_files),
+     ECORE_GETOPT_VALUE_LIST(i_files),
+     ECORE_GETOPT_VALUE_LIST(groups),
+     ECORE_GETOPT_VALUE_NONE
+  };
 
-                  g_name = eina_list_data_get(cg);
-                  if (_group_name_in_other_file(files, current_inp, g_name))
-                    return _edje_pick_cleanup(files, NULL, EDJE_PICK_DUP_GROUP);
+  /* START - Read command line args */
+  c = NULL;
+  for (k = 1; k < argc; k++)
+    {   /* Run through args, count how many groups per file */
+      if (IS_GROUP(argv[k]))
+        {
+           if (!c)
+             return _edje_pick_cleanup(files, NULL,
+                                       EDJE_PICK_INCLUDE_MISSING);
 
-                  if (!eina_list_search_unsorted(current_inp->groups,
-                           (Eina_Compare_Cb) strcmp, g_name))
-                    current_inp->groups = eina_list_append(
-                          current_inp->groups, eina_stringshare_add(g_name));
+           (*c)++;
+           continue;
+        }
 
-                  cg = eina_list_next(cg);
-                  (*c)--;
-               }
-          }
-        ll = eina_list_next(ll);
-     }
+      if (IS_INCLUDE(argv[k]))
+        {
+           c = calloc(1, sizeof(int));
+           gpf = eina_list_append(gpf, c);
+           continue;
+        }
 
-   EINA_LIST_FREE(gpf, c)
-      free(c);
+      show_help |= IS_HELP(argv[k]);
+    }
+
+  if (show_help)
+    puts(EDJE_PICK_HELP_STRING);
+
+  if (ecore_getopt_parse(&optdesc, values, argc, argv) < 0)
+    {
+       EINA_LIST_FREE(gpf, c)
+         free(c);
+
+       return _edje_pick_cleanup(files, NULL, EDJE_PICK_PARSE_FAILED);
+    }
+
+  if (show_help)
+    {
+       EINA_LIST_FREE(gpf, c)
+         free(c);
+
+       ecore_getopt_list_free(i_files);
+       ecore_getopt_list_free(groups);
+       return _edje_pick_cleanup(files, NULL, EDJE_PICK_HELP_SHOWN);
+    }
+
+  if (context.v) /* Changed to INFO if verbose */
+    eina_log_level_set(EINA_LOG_LEVEL_INFO);
+
+  EINA_LIST_FOREACH(a_files, l, str)
+    {
+       current_inp = calloc(1, sizeof(*current_inp));
+       current_inp->append = EINA_TRUE;
+       current_inp->name = eina_stringshare_add(str);
+       files = eina_list_append(files, current_inp);
+    }
+  ecore_getopt_list_free(a_files);
+
+  ll = gpf;
+  cg = groups;
+  EINA_LIST_FOREACH(i_files, l, str)
+    {   /* Now match groups from groups-list with included files */
+      current_inp = calloc(1, sizeof(*current_inp));
+      current_inp->name = eina_stringshare_add(str);
+      files = eina_list_append(files, current_inp);
+      c = eina_list_data_get(ll);
+      if (c)
+        {
+           while (*c)
+             {
+                char *g_name;
+                if (!cg)
+                  {
+                     EINA_LIST_FREE(gpf, c)
+                       free(c);
+
+                     ecore_getopt_list_free(i_files);
+                     ecore_getopt_list_free(groups);
+                     return _edje_pick_cleanup(files, NULL,
+                                               EDJE_PICK_GROUP_MISSING);
+                  }
+
+                g_name = eina_list_data_get(cg);
+                if (_group_name_in_other_file(files, current_inp, g_name))
+                  return _edje_pick_cleanup(files, NULL, EDJE_PICK_DUP_GROUP);
+
+                if (!eina_list_search_unsorted(current_inp->groups,
+                                               (Eina_Compare_Cb)strcmp, g_name))
+                  current_inp->groups = eina_list_append(
+                      current_inp->groups, eina_stringshare_add(g_name));
+
+                cg = eina_list_next(cg);
+                (*c)--;
+             }
+        }
+      ll = eina_list_next(ll);
+    }
 
-   ecore_getopt_list_free(i_files);
-   ecore_getopt_list_free(groups);
+  EINA_LIST_FREE(gpf, c)
+    free(c);
 
+  ecore_getopt_list_free(i_files);
+  ecore_getopt_list_free(groups);
 
-   if (!output_filename)
-     return _edje_pick_cleanup(files, NULL, EDJE_PICK_OUT_FILENAME_MISSING);
-   /* END   - Read command line args */
+  if (!output_filename)
+    return _edje_pick_cleanup(files, NULL, EDJE_PICK_OUT_FILENAME_MISSING);
+  /* END   - Read command line args */
 
-   /* Set output params, return OK */
-   *ifs = files;
-   *ofn = output_filename;
-   return EDJE_PICK_NO_ERROR;
+  /* Set output params, return OK */
+  *ifs = files;
+  *ofn = output_filename;
+  return EDJE_PICK_NO_ERROR;
 }
 
 static void
@@ -630,31 +635,31 @@ _edje_pick_header_dependencies_check(Edje_File *out_file, Edje_File *edf, Eina_L
         EINA_LOG_ERR("Failed to read group <%s> id <%d>\n", ce->entry, ce->id);
         goto exit;
      }
-#define GROUP_CHECK_AND_ADD(NAME) \
-   if (NAME) \
-     { \
-        Edje_Part_Collection_Directory_Entry *ce_cor; \
-        if (eina_list_search_unsorted(groups, (void *)strcmp, NAME)) goto exit; \
-        ce_cor = eina_hash_find(edf->collection, NAME); \
-        if (!eina_hash_find(out_file->collection, ce_cor->entry)) \
-          { \
-             dep_list_inner = _edje_pick_header_dependencies_check(out_file, edf, groups, ce_cor, current_id); \
-             dep_list = eina_list_merge(dep_list, dep_list_inner); \
-          } \
-        if ((ce_cor) && (!eina_hash_find(out_file->collection, NAME))) \
-          { \
-             Edje_Part_Collection_Directory_Entry *ce_out; \
-             ce_out = malloc(sizeof(*ce_out)); \
-             memcpy(ce_out, ce_cor, sizeof(*ce_out)); \
-             ce_out->id = *current_id; \
-             if (ce_out->group_alias) \
-               _edje_pick_header_alias_parent_add(out_file, edf, ce, ce_out); \
-             EINA_LOG_INFO("Changing ID of group <%d> to <%d>\n", ce->id, ce_out->id); \
-             eina_hash_direct_add(out_file->collection, ce_out->entry, ce_out); \
-             (*current_id)++; \
-             dep_list = eina_list_append(dep_list, eina_stringshare_add(ce_out->entry)); \
-          } \
-     }
+#define GROUP_CHECK_AND_ADD(NAME)                                                                             \
+  if (NAME)                                                                                                   \
+    {                                                                                                         \
+       Edje_Part_Collection_Directory_Entry *ce_cor;                                                          \
+       if (eina_list_search_unsorted(groups, (void *)strcmp, NAME)) goto exit;                                \
+       ce_cor = eina_hash_find(edf->collection, NAME);                                                        \
+       if (!eina_hash_find(out_file->collection, ce_cor->entry))                                              \
+         {                                                                                                    \
+            dep_list_inner = _edje_pick_header_dependencies_check(out_file, edf, groups, ce_cor, current_id); \
+            dep_list = eina_list_merge(dep_list, dep_list_inner);                                             \
+         }                                                                                                    \
+       if ((ce_cor) && (!eina_hash_find(out_file->collection, NAME)))                                         \
+         {                                                                                                    \
+            Edje_Part_Collection_Directory_Entry *ce_out;                                                     \
+            ce_out = malloc(sizeof(*ce_out));                                                                 \
+            memcpy(ce_out, ce_cor, sizeof(*ce_out));                                                          \
+            ce_out->id = *current_id;                                                                         \
+            if (ce_out->group_alias)                                                                          \
+              _edje_pick_header_alias_parent_add(out_file, edf, ce, ce_out);                                  \
+            EINA_LOG_INFO("Changing ID of group <%d> to <%d>\n", ce->id, ce_out->id);                         \
+            eina_hash_direct_add(out_file->collection, ce_out->entry, ce_out);                                \
+            (*current_id)++;                                                                                  \
+            dep_list = eina_list_append(dep_list, eina_stringshare_add(ce_out->entry));                       \
+         }                                                                                                    \
+    }
 
    for (i = 0; i < edc->parts_count; i++)
      {
@@ -679,7 +684,7 @@ exit:
 }
 
 static int
-_edje_pick_data_update(Edje_File *out_file , Edje_File *edf)
+_edje_pick_data_update(Edje_File *out_file, Edje_File *edf)
 {
    Eina_Bool status = EDJE_PICK_NO_ERROR;
    Eina_Iterator *i;
@@ -697,7 +702,7 @@ _edje_pick_data_update(Edje_File *out_file , Edje_File *edf)
 }
 
 static int
-_edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs)
+_edje_pick_header_make(Edje_File *out_file, Edje_File *edf, Eina_List *ifs)
 {
    static int current_group_id = 0;
    Edje_Part_Collection_Directory_Entry *ce;
@@ -721,7 +726,7 @@ _edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs)
              /* We SKIP group of file in append-mode if we got this group  */
              /* from file in include mode.                                 */
              if (_group_name_in_other_file(ifs, context.current_file, name1))
-               continue; /* Skip group of file in append mode */
+               continue;  /* Skip group of file in append mode */
 
              ce = eina_hash_find(edf->collection, name1);
              ce_out = malloc(sizeof(*ce_out));
@@ -736,7 +741,7 @@ _edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs)
 
              /* Add this group to groups to handle for this file */
              context.current_file->groups = eina_list_append(
-                   context.current_file->groups, eina_stringshare_add(name1));
+                 context.current_file->groups, eina_stringshare_add(name1));
           }
 
         eina_iterator_free(i);
@@ -761,7 +766,7 @@ _edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs)
      }
    else
      {
-        EINA_LIST_FOREACH(context.current_file->groups, l , name1)
+        EINA_LIST_FOREACH(context.current_file->groups, l, name1)
           {
              /* Verify group found then add to ouput file header */
              ce = eina_hash_find(edf->collection, name1);
@@ -786,7 +791,7 @@ _edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs)
                   EINA_LOG_INFO("Changing ID of group <%d> to <%d>\n", ce->id, ce_out->id);
                   current_group_id++;
 
-                  eina_hash_direct_add(out_file->collection,ce_out->entry,
+                  eina_hash_direct_add(out_file->collection, ce_out->entry,
                                        ce_out);
                   dep_list = _edje_pick_header_dependencies_check(out_file, edf, context.current_file->groups, ce, &current_group_id);
                   if (!deps) deps = dep_list;
@@ -794,7 +799,7 @@ _edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs)
                }
           }
         EINA_LIST_FREE(deps, name1)
-           context.current_file->groups = eina_list_append(context.current_file->groups, name1);
+          context.current_file->groups = eina_list_append(context.current_file->groups, name1);
      }
 
    return status;
@@ -804,14 +809,14 @@ static int
 _old_id_cmp(const void *d1, const void *d2)
 {
    /* Find currect ID struct */
-   return (((Edje_Pick_Data *) d1)->id.old_id - ((intptr_t) d2));
+   return ((Edje_Pick_Data *)d1)->id.old_id - ((intptr_t)d2);
 }
 
 static int
 _new_id_cmp(const void *d1, const void *d2)
 {
    /* Find currect ID struct */
-   return (((Edje_Pick_Data *) d1)->id.new_id - ((intptr_t) d2));
+   return ((Edje_Pick_Data *)d1)->id.new_id - ((intptr_t)d2);
 }
 
 static int
@@ -821,8 +826,7 @@ _edje_pick_new_id_get(Eina_List *id_list, int id, Eina_Bool set_used)
      {
         Edje_Pick_Data *p_id = eina_list_search_unsorted(id_list,
                                                          _old_id_cmp,
-                                                         (void *) (intptr_t) id);
-
+                                                         (void *)(intptr_t)id);
 
         if (p_id)
           {
@@ -843,7 +847,7 @@ _edje_pick_image_new_id_get(Eina_List *id_list, int id)
      {
         Edje_Pick_Data *p_id = eina_list_search_unsorted(id_list,
                                                          _old_id_cmp,
-                                                         (void *) (intptr_t) id);
+                                                         (void *)(intptr_t)id);
         if (p_id) return p_id->id.new_id;
      }
 
@@ -857,7 +861,7 @@ _edje_pick_image_old_id_get(Eina_List *id_list, int id)
      {
         Edje_Pick_Data *p_id = eina_list_search_unsorted(id_list,
                                                          _new_id_cmp,
-                                                         (void *) (intptr_t) id);
+                                                         (void *)(intptr_t)id);
         if (p_id) return p_id->id.old_id;
      }
 
@@ -874,8 +878,8 @@ _edje_pick_images_copy(Edje_File *edf, Edje_File *o)
 
    if (edf->image_dir)
      {
-        if (edf->image_dir->entries)
-          {  /* Copy image dir entries of current file */
+        if (edf->image_dir->entries) /* Copy image dir entries of current file */
+          {
              Edje_Image_Directory_Entry *entries = NULL;
 
              EINA_LIST_FOREACH(context.current_file->imagelist, l, image)
@@ -896,7 +900,7 @@ _edje_pick_images_copy(Edje_File *edf, Edje_File *o)
                        o->image_dir->entries = entries;
 
                        old_id = _edje_pick_image_old_id_get(
-                         context.current_file->imagelist, o->image_dir->entries_count - 1);
+                           context.current_file->imagelist, o->image_dir->entries_count - 1);
                        /* Concatenate current file entries to re-allocated array */
                        memcpy(&o->image_dir->entries[o->image_dir->entries_count - 1],
                               &edf->image_dir->entries[old_id],
@@ -906,8 +910,8 @@ _edje_pick_images_copy(Edje_File *edf, Edje_File *o)
                }
           }
 
-        if (edf->image_dir->sets)
-          {  /* Copy image dir sets of current file */
+        if (edf->image_dir->sets) /* Copy image dir sets of current file */
+          {
              Edje_Image_Directory_Set *sets;
 
              EINA_LIST_FOREACH(context.current_file->imagesetlist, l, set)
@@ -929,7 +933,7 @@ _edje_pick_images_copy(Edje_File *edf, Edje_File *o)
                        o->image_dir->sets = sets;
 
                        old_id = _edje_pick_image_old_id_get(
-                         context.current_file->imagesetlist, o->image_dir->sets_count - 1);
+                           context.current_file->imagesetlist, o->image_dir->sets_count - 1);
                        /* Concatenate current file sets to re-allocated array */
                        memcpy(&o->image_dir->sets[o->image_dir->sets_count - 1],
                               &edf->image_dir->sets[old_id],
@@ -938,14 +942,14 @@ _edje_pick_images_copy(Edje_File *edf, Edje_File *o)
 
                        EINA_LIST_FOREACH(o->image_dir->sets[o->image_dir->sets_count - 1].entries, l1, e)
                          e->id = _edje_pick_image_new_id_get(
-                           context.current_file->imagelist,
-                           e->id);
+                             context.current_file->imagelist,
+                             e->id);
                     }
                }
           }
 
-        if (edf->image_dir->vectors)
-          {  /* Copy vector dir entries of current file */
+        if (edf->image_dir->vectors) /* Copy vector dir entries of current file */
+          {
              Edje_Vector_Directory_Entry *vectors = NULL;
 
              EINA_LIST_FOREACH(context.current_file->vectorlist, l, vector)
@@ -966,7 +970,7 @@ _edje_pick_images_copy(Edje_File *edf, Edje_File *o)
                        o->image_dir->vectors = vectors;
 
                        old_id = _edje_pick_image_old_id_get(
-                         context.current_file->vectorlist, o->image_dir->vectors_count - 1);
+                           context.current_file->vectorlist, o->image_dir->vectors_count - 1);
                        /* Concatenate current file vectors to re-allocated array */
                        memcpy(&o->image_dir->vectors[o->image_dir->vectors_count - 1],
                               &edf->image_dir->vectors[old_id],
@@ -991,7 +995,7 @@ _edje_pick_sounds_add(Edje_File *edf)
 
    if (edf->sound_dir)  /* Copy Sounds */
      {
-        for (k = 0; k < (int) edf->sound_dir->samples_count; k++)
+        for (k = 0; k < (int)edf->sound_dir->samples_count; k++)
           {
              Edje_Sound_Sample *sample = &edf->sound_dir->samples[k];
 
@@ -1005,13 +1009,13 @@ _edje_pick_sounds_add(Edje_File *edf)
                   smpl->filename = eina_stringshare_add(sample->snd_src);
                   smpl->data = data;
                   smpl->size = size;
-                  smpl->entry = (void *) sample; /* for output file sound dir */
+                  smpl->entry = (void *)sample;  /* for output file sound dir */
                   smpl->id.old_id = sample->id;
                   sample->id = smpl->id.new_id = current_sample_id;
                   smpl->id.used = EINA_FALSE;
 
                   VERBOSE(EINA_LOG_INFO("Read <%s> sample data <%p> size <%d>\n",
-                                 buf, smpl->data, smpl->size));
+                                        buf, smpl->data, smpl->size));
 
                   current_sample_id++;
                   context.current_file->samplelist =
@@ -1020,14 +1024,14 @@ _edje_pick_sounds_add(Edje_File *edf)
              else
                {
                   EINA_LOG_ERR("Sample <%s> was not found in <%s> file.\n",
-                         sample->name, context.current_file->name);
+                               sample->name, context.current_file->name);
                   status = EDJE_PICK_SAMPLE_NOT_FOUND;
                   /* Should that really be freed? Or is some other handling needed? */
                   free(data);
                }
           }
 
-        for (k = 0; k < (int) edf->sound_dir->tones_count; k++)
+        for (k = 0; k < (int)edf->sound_dir->tones_count; k++)
           {
              /* Save all tones as well */
              Edje_Pick_Tone *t = malloc(sizeof(*t));
@@ -1056,7 +1060,7 @@ _edje_pick_vibrations_add(Edje_File *edf)
 
    if (edf->vibration_dir)  /* Copy Sounds */
      {
-        for (k = 0; k < (int) edf->vibration_dir->samples_count; k++)
+        for (k = 0; k < (int)edf->vibration_dir->samples_count; k++)
           {
              Edje_Vibration_Sample *sample = &edf->vibration_dir->samples[k];
 
@@ -1070,13 +1074,13 @@ _edje_pick_vibrations_add(Edje_File *edf)
                   smpl->filename = eina_stringshare_add(sample->name);
                   smpl->data = data;
                   smpl->size = size;
-                  smpl->entry = (void *) sample; /* for output file vibration dir */
+                  smpl->entry = (void *)sample;  /* for output file vibration dir */
                   smpl->id.old_id = sample->id;
                   sample->id = smpl->id.new_id = current_sample_id;
                   smpl->id.used = EINA_FALSE;
 
                   VERBOSE(EINA_LOG_INFO("Read <%s> sample data <%p> size <%d>\n",
-                                 buf, smpl->data, smpl->size));
+                                        buf, smpl->data, smpl->size));
 
                   current_sample_id++;
                   context.current_file->vibrationlist =
@@ -1085,7 +1089,7 @@ _edje_pick_vibrations_add(Edje_File *edf)
              else
                {
                   EINA_LOG_ERR("Sample <%s> was not found in <%s> file.\n",
-                         sample->name, context.current_file->name);
+                               sample->name, context.current_file->name);
                   status = EDJE_PICK_SAMPLE_NOT_FOUND;
                   /* Should that really be freed? Or is some other handling needed? */
                   free(data);
@@ -1103,8 +1107,8 @@ _font_cmp(const void *d1, const void *d2)
    const Edje_Font *f2 = d2;
 
    /* Same font if (d1->name == d2->name) AND (d1->file == d2->file) */
-   return (strcmp(f1->name, f2->name) |
-           strcmp(f1->file, f2->file));
+   return strcmp(f1->name, f2->name) |
+          strcmp(f1->file, f2->file);
 }
 
 static int
@@ -1124,12 +1128,12 @@ _Edje_Pick_Fonts_add(Edje_File *out_file, Edje_File *edf)
         if (!eina_list_search_unsorted(context.current_file->fontlist, _font_cmp, f))
           continue;
         /* Add only fonts that are NOT regestered in our list */
-        Edje_Pick_Font *ft =  malloc(sizeof(*ft));
+        Edje_Pick_Font *ft = malloc(sizeof(*ft));
         Edje_Font *st = malloc(sizeof(*st));
         ft->size = 0;
 
-        st->name = (char *) eina_stringshare_add(f->name);
-        st->file = (char *) eina_stringshare_add(f->file);
+        st->name = (char *)eina_stringshare_add(f->name);
+        st->file = (char *)eina_stringshare_add(f->file);
 
         snprintf(buf, sizeof(buf), "edje/fonts/%s", f->name);
         VERBOSE(EINA_LOG_INFO("Trying to read <%s>\n", f->name));
@@ -1148,7 +1152,7 @@ _Edje_Pick_Fonts_add(Edje_File *out_file, Edje_File *edf)
         ft->used = EINA_TRUE;  /* TODO: Fix this later */
         context.current_file->fontlist = eina_list_append(context.current_file->fontlist, ft);
         eina_hash_direct_add(out_file->fonts, st->name, st);
-     };
+     }
 
    eina_iterator_free(it);
 
@@ -1176,7 +1180,7 @@ _edje_pick_scripts_add(Edje_File *edf, int id, int new_id)
         s->id.used = EINA_TRUE;
 
         VERBOSE(EINA_LOG_INFO("Read embryo script <%s> data <%p> size <%d>\n",
-                       buf, s->data, s->size));
+                              buf, s->data, s->size));
         context.current_file->scriptlist = eina_list_append(context.current_file->scriptlist, s);
      }
    else
@@ -1209,7 +1213,7 @@ _edje_pick_lua_scripts_add(Edje_File *edf, int id, int new_id)
         s->id.used = EINA_TRUE;
 
         VERBOSE(EINA_LOG_INFO("Read lua script <%s> data <%p> size <%d>\n",
-                       buf, s->data, s->size));
+                              buf, s->data, s->size));
         context.current_file->luascriptlist = eina_list_append(context.current_file->luascriptlist, s);
      }
    else
@@ -1234,25 +1238,25 @@ _edje_pick_image_entry_add(int id, Edje_File *edf, Edje_File *o)
 
    if (edf->image_dir)
      {
-        if (!o->image_dir)  /* First time only */
+        if (!o->image_dir) /* First time only */
           o->image_dir = calloc(1, sizeof(*(o->image_dir)));
 
-        if (edf->image_dir->entries)
-          { /* Copy Images */
+        if (edf->image_dir->entries) /* Copy Images */
+          {
              Edje_Image_Directory_Entry *img = &edf->image_dir->entries[id];
 
              snprintf(buf, sizeof(buf), "edje/images/%i", img->id);
              VERBOSE(EINA_LOG_INFO("Trying to read <%s>\n", img->entry));
              data = eet_read(edf->ef, buf, &size);
-             if (size)
-               {  /* Advance image ID and register this in imagelist */
+             if (size) /* Advance image ID and register this in imagelist */
+               {
                   current_img_id++;
                   Edje_Pick_Data *image = malloc(sizeof(*image));
 
                   image->filename = eina_stringshare_add(img->entry);
                   image->data = data;
                   image->size = size;
-                  image->entry = (void *) img;  /* for output file image dir */
+                  image->entry = (void *)img;   /* for output file image dir */
                   image->id.old_id = img->id;
                   img->id = image->id.new_id = current_img_id;
                   image->id.used = EINA_TRUE;
@@ -1261,18 +1265,18 @@ _edje_pick_image_entry_add(int id, Edje_File *edf, Edje_File *o)
                                         buf, image->data, image->size, image->id.new_id));
 
                   context.current_file->imagelist = eina_list_append(
-                    context.current_file->imagelist, image);
+                      context.current_file->imagelist, image);
                }
              else
                {
                   if (img->entry)
                     {
                        EINA_LOG_ERR("Image <%s> was not found in <%s> file.\n",
-                                    img->entry , context.current_file->name);
+                                    img->entry, context.current_file->name);
                     }
                   else
                     {
-                       EINA_LOG_ERR("Image entry <%s> was not found in <%s> file.\n", buf , context.current_file->name);
+                       EINA_LOG_ERR("Image entry <%s> was not found in <%s> file.\n", buf, context.current_file->name);
                     }
                   /* Should that really be freed? Or is some other handling needed? */
                   free(data);
@@ -1295,11 +1299,11 @@ _edje_pick_image_set_add(int id, Edje_File *edf, Edje_File *o)
 
    if (edf->image_dir)
      {
-        if (!o->image_dir)  /* First time only */
+        if (!o->image_dir) /* First time only */
           o->image_dir = calloc(1, sizeof(*(o->image_dir)));
 
-        if (edf->image_dir->sets)
-          {  /* Fix IDs in sets to new assigned IDs of entries */
+        if (edf->image_dir->sets) /* Fix IDs in sets to new assigned IDs of entries */
+          {
              current_set_id++;
              Edje_Pick_Data *set = calloc(1, sizeof(*set));
              set->id.old_id = edf->image_dir->sets[id].id;
@@ -1308,7 +1312,7 @@ _edje_pick_image_set_add(int id, Edje_File *edf, Edje_File *o)
 
              /* Save IDs in set-list, used in Desc update later */
              context.current_file->imagesetlist = eina_list_append(
-               context.current_file->imagesetlist, set);
+                 context.current_file->imagesetlist, set);
              EINA_LIST_FOREACH(edf->image_dir->sets[id].entries, l, ent)
                {
                   _edje_pick_image_entry_add(ent->id, edf, o);
@@ -1332,25 +1336,25 @@ _edje_pick_vector_entry_add(int id, Edje_File *edf, Edje_File *o)
 
    if (edf->image_dir)
      {
-        if (!o->image_dir)  /* First time only */
+        if (!o->image_dir) /* First time only */
           o->image_dir = calloc(1, sizeof(*(o->image_dir)));
 
-        if (edf->image_dir->vectors)
-          { /* Copy Vectors */
+        if (edf->image_dir->vectors) /* Copy Vectors */
+          {
              Edje_Vector_Directory_Entry *vg = &edf->image_dir->vectors[id];
 
              snprintf(buf, sizeof(buf), "edje/vectors/%i", vg->id);
              VERBOSE(EINA_LOG_INFO("Trying to read <%s>\n", vg->entry));
              data = eet_read(edf->ef, buf, &size);
-             if (size)
-               {  /* Advance vector ID and register this in vectorlist */
+             if (size) /* Advance vector ID and register this in vectorlist */
+               {
                   current_vg_id++;
                   Edje_Pick_Data *vector = malloc(sizeof(*vector));
 
                   vector->filename = eina_stringshare_add(vg->entry);
                   vector->data = data;
                   vector->size = size;
-                  vector->entry = (void *) vg;  /* for output file vector dir */
+                  vector->entry = (void *)vg;   /* for output file vector dir */
                   vector->id.old_id = vg->id;
                   vg->id = vector->id.new_id = current_vg_id;
                   vector->id.used = EINA_TRUE;
@@ -1359,18 +1363,18 @@ _edje_pick_vector_entry_add(int id, Edje_File *edf, Edje_File *o)
                                         buf, vector->data, vector->size, vector->id.new_id));
 
                   context.current_file->vectorlist = eina_list_append(
-                    context.current_file->vectorlist, vector);
+                      context.current_file->vectorlist, vector);
                }
              else
                {
                   if (vg->entry)
                     {
                        EINA_LOG_ERR("Vector <%s> was not found in <%s> file.\n",
-                                    vg->entry , context.current_file->name);
+                                    vg->entry, context.current_file->name);
                     }
                   else
                     {
-                       EINA_LOG_ERR("Vector entry <%s> was not found in <%s> file.\n", buf , context.current_file->name);
+                       EINA_LOG_ERR("Vector entry <%s> was not found in <%s> file.\n", buf, context.current_file->name);
                     }
                   /* Should that really be freed? Or is some other handling needed? */
                   free(data);
@@ -1470,34 +1474,34 @@ _edje_pick_resources_process(Edje_Part_Collection *edc, Edje_File *edf, Edje_Fil
         Edje_Part *part = edc->parts[i];
 
         /* Update all color class in ALL descs of this part */
-        _edje_pick_color_class_desc_update((Edje_Part_Description_Common *) part->default_desc, edf, o);
+        _edje_pick_color_class_desc_update((Edje_Part_Description_Common *)part->default_desc, edf, o);
 
         for (k = 0; k < part->other.desc_count; k++)
-          _edje_pick_color_class_desc_update((Edje_Part_Description_Common *) part->other.desc[k], edf, o);
+          _edje_pick_color_class_desc_update((Edje_Part_Description_Common *)part->other.desc[k], edf, o);
 
         if (part->type == EDJE_PART_TYPE_IMAGE)
           {
              /* Update IDs of all images in ALL descs of this part */
-             _edje_pick_images_desc_update((Edje_Part_Description_Image *) part->default_desc, edf, o);
+             _edje_pick_images_desc_update((Edje_Part_Description_Image *)part->default_desc, edf, o);
 
              for (k = 0; k < part->other.desc_count; k++)
-               _edje_pick_images_desc_update((Edje_Part_Description_Image *) part->other.desc[k], edf, o);
+               _edje_pick_images_desc_update((Edje_Part_Description_Image *)part->other.desc[k], edf, o);
           }
         else if (part->type == EDJE_PART_TYPE_VECTOR)
           {
              /* Update IDs of all vectors in ALL descs of this part */
-             _edje_pick_vectors_desc_update((Edje_Part_Description_Vector *) part->default_desc, edf, o);
+             _edje_pick_vectors_desc_update((Edje_Part_Description_Vector *)part->default_desc, edf, o);
 
              for (k = 0; k < part->other.desc_count; k++)
-               _edje_pick_vectors_desc_update((Edje_Part_Description_Vector *) part->other.desc[k], edf, o);
+               _edje_pick_vectors_desc_update((Edje_Part_Description_Vector *)part->other.desc[k], edf, o);
           }
         else if (part->type == EDJE_PART_TYPE_TEXT || part->type == EDJE_PART_TYPE_TEXTBLOCK)
           {
              /* Update all styles in ALL descs of this part */
-             _edje_pick_styles_desc_update((Edje_Part_Description_Text *) part->default_desc, edf, o);
+             _edje_pick_styles_desc_update((Edje_Part_Description_Text *)part->default_desc, edf, o);
 
              for (k = 0; k < part->other.desc_count; k++)
-               _edje_pick_styles_desc_update((Edje_Part_Description_Text *) part->other.desc[k], edf, o);
+               _edje_pick_styles_desc_update((Edje_Part_Description_Text *)part->other.desc[k], edf, o);
           }
      }
 }
@@ -1508,7 +1512,7 @@ _sample_cmp(const void *d1, const void *d2)
    /* Locate sample by name */
    if (d2)
      {
-        Edje_Sound_Sample *sample = ((Edje_Pick_Data *) d1)->entry;
+        Edje_Sound_Sample *sample = ((Edje_Pick_Data *)d1)->entry;
 
         return strcmp(sample->name, d2);
      }
@@ -1522,7 +1526,7 @@ _tone_cmp(const void *d1, const void *d2)
    /* Locate tone by name */
    if (d2)
      {
-        Edje_Sound_Tone *tone = ((Edje_Pick_Tone *) d1)->tone;
+        Edje_Sound_Tone *tone = ((Edje_Pick_Tone *)d1)->tone;
 
         return strcmp(tone->name, d2);
      }
@@ -1538,7 +1542,7 @@ _edje_pick_program_update(Edje_Program *prog)
 
    /* Scan for used samples, update samples IDs */
    p = eina_list_search_unsorted(context.current_file->samplelist,
-                                 (Eina_Compare_Cb) _sample_cmp,
+                                 (Eina_Compare_Cb)_sample_cmp,
                                  prog->sample_name);
 
    /* Sample is used by program, should be saved */
@@ -1547,7 +1551,7 @@ _edje_pick_program_update(Edje_Program *prog)
 
    /* handle tones as well */
    t = eina_list_search_unsorted(context.current_file->tonelist,
-                                 (Eina_Compare_Cb) _tone_cmp,
+                                 (Eina_Compare_Cb)_tone_cmp,
                                  prog->tone_name);
 
    /* Tone is used by program, should be saved */
@@ -1561,19 +1565,19 @@ _edje_pick_programs_process(Edje_Part_Collection *edc)
    /* This wil mark which samples are used and should be saved */
    unsigned int i;
 
-   for(i = 0; i < edc->programs.fnmatch_count; i++)
+   for (i = 0; i < edc->programs.fnmatch_count; i++)
      _edje_pick_program_update(edc->programs.fnmatch[i]);
 
-   for(i = 0; i < edc->programs.strcmp_count; i++)
+   for (i = 0; i < edc->programs.strcmp_count; i++)
      _edje_pick_program_update(edc->programs.strcmp[i]);
 
-   for(i = 0; i < edc->programs.strncmp_count; i++)
+   for (i = 0; i < edc->programs.strncmp_count; i++)
      _edje_pick_program_update(edc->programs.strncmp[i]);
 
-   for(i = 0; i < edc->programs.strrncmp_count; i++)
+   for (i = 0; i < edc->programs.strrncmp_count; i++)
      _edje_pick_program_update(edc->programs.strrncmp[i]);
 
-   for(i = 0; i < edc->programs.nocmp_count; i++)
+   for (i = 0; i < edc->programs.nocmp_count; i++)
      _edje_pick_program_update(edc->programs.nocmp[i]);
 
    return EDJE_PICK_NO_ERROR;
@@ -1597,67 +1601,67 @@ _edje_pick_collection_process(Edje_Part_Collection *edc, Edje_File *edf, Edje_Fi
 static void
 _edje_pick_sound_dir_compose(Eina_List *samples, Eina_List *tones, Edje_File *o)
 {  /* Compose sound_dir array from all used samples, tones */
-   if (samples)
-     {
-        Edje_Sound_Sample *sample;
-        Edje_Sound_Sample *p;
-        Eina_List *l;
-
-        o->sound_dir = calloc(1, sizeof(*(o->sound_dir)));
-        o->sound_dir->samples = malloc(eina_list_count(samples) *
-                                       sizeof(Edje_Sound_Sample));
-
-        p = o->sound_dir->samples;
-        EINA_LIST_FOREACH(samples, l, sample)
-          {
-             memcpy(p, sample, sizeof(Edje_Sound_Sample));
-             p++;
-          }
-
-        o->sound_dir->samples_count = eina_list_count(samples);
-
-        if (tones)
-          {
-             Edje_Sound_Tone *tone;
-             Edje_Sound_Tone *t;
-
-             o->sound_dir->tones = malloc(eina_list_count(tones) *
-                                          sizeof(Edje_Sound_Tone));
-
-             t = o->sound_dir->tones;
-             EINA_LIST_FOREACH(tones, l, tone)
-               {
-                  memcpy(t, tone, sizeof(Edje_Sound_Tone));
-                  t++;
-               }
-
-             o->sound_dir->tones_count = eina_list_count(tones);
-          }
-     }
+  if (samples)
+    {
+       Edje_Sound_Sample *sample;
+       Edje_Sound_Sample *p;
+       Eina_List *l;
+
+       o->sound_dir = calloc(1, sizeof(*(o->sound_dir)));
+       o->sound_dir->samples = malloc(eina_list_count(samples) *
+                                      sizeof(Edje_Sound_Sample));
+
+       p = o->sound_dir->samples;
+       EINA_LIST_FOREACH(samples, l, sample)
+         {
+            memcpy(p, sample, sizeof(Edje_Sound_Sample));
+            p++;
+         }
+
+       o->sound_dir->samples_count = eina_list_count(samples);
+
+       if (tones)
+         {
+            Edje_Sound_Tone *tone;
+            Edje_Sound_Tone *t;
+
+            o->sound_dir->tones = malloc(eina_list_count(tones) *
+                                         sizeof(Edje_Sound_Tone));
+
+            t = o->sound_dir->tones;
+            EINA_LIST_FOREACH(tones, l, tone)
+              {
+                 memcpy(t, tone, sizeof(Edje_Sound_Tone));
+                 t++;
+              }
+
+            o->sound_dir->tones_count = eina_list_count(tones);
+         }
+    }
 }
 
 static void
 _edje_pick_vibration_dir_compose(Eina_List *vibrations, Edje_File *o)
 {  /* Compose vibrationdir array from all used vibrations */
-   if (vibrations)
-     {
-        Edje_Vibration_Sample *sample;
-        Edje_Vibration_Sample *p;
-        Eina_List *l;
-
-        o->vibration_dir = calloc(1, sizeof(*(o->vibration_dir)));
-        o->vibration_dir->samples = malloc(eina_list_count(vibrations) *
-                                       sizeof(Edje_Vibration_Sample));
-
-        p = o->vibration_dir->samples;
-        EINA_LIST_FOREACH(vibrations, l, sample)
-          {
-             memcpy(p, sample, sizeof(Edje_Vibration_Sample));
-             p++;
-          }
-
-        o->vibration_dir->samples_count = eina_list_count(vibrations);
-     }
+  if (vibrations)
+    {
+       Edje_Vibration_Sample *sample;
+       Edje_Vibration_Sample *p;
+       Eina_List *l;
+
+       o->vibration_dir = calloc(1, sizeof(*(o->vibration_dir)));
+       o->vibration_dir->samples = malloc(eina_list_count(vibrations) *
+                                          sizeof(Edje_Vibration_Sample));
+
+       p = o->vibration_dir->samples;
+       EINA_LIST_FOREACH(vibrations, l, sample)
+         {
+            memcpy(p, sample, sizeof(Edje_Vibration_Sample));
+            p++;
+         }
+
+       o->vibration_dir->samples_count = eina_list_count(vibrations);
+    }
 }
 
 int
@@ -1701,12 +1705,12 @@ main(int argc, char **argv)
         ef = eet_open(context.current_file->name, EET_FILE_MODE_READ);
         if (!ef)
           return _edje_pick_cleanup(inp_files, out_file,
-                EDJE_PICK_FAILED_OPEN_INP);
+                                    EDJE_PICK_FAILED_OPEN_INP);
 
         edf = eet_data_read(ef, _edje_edd_edje_file, "edje/file");
         if (!edf)
           return _edje_pick_cleanup(inp_files, out_file,
-                EDJE_PICK_FAILED_READ_INP);
+                                    EDJE_PICK_FAILED_READ_INP);
 
         context.current_file->edf = edf;
         edf->ef = ef;
@@ -1734,52 +1738,52 @@ main(int argc, char **argv)
         _edje_pick_data_update(out_file, edf);
 
         /* Process Groups */
-        EINA_LIST_FOREACH(context.current_file->groups, l , name1)
+        EINA_LIST_FOREACH(context.current_file->groups, l, name1)
           {  /* Read group info */
-             ce = eina_hash_find(edf->collection, name1);
-             if (!ce || (ce->id < 0))
-               {
-                  EINA_LOG_ERR("Failed to find group <%s> id\n", name1);
-                  _edje_cache_file_unref(edf);
-                  return _edje_pick_cleanup(inp_files, out_file,
-                                            EDJE_PICK_GROUP_NOT_FOUND);
-               }
-
-             VERBOSE(EINA_LOG_INFO("Copy group: <%s>\n", name1));
-
-             edje_cache_emp_alloc(ce);
-
-             snprintf(buf, sizeof(buf), "edje/collections/%i", ce->id);
-             EINA_LOG_INFO("Trying to read group <%s>\n", buf);
-             edc = eet_data_read(edf->ef, _edje_edd_edje_part_collection, buf);
-             if (!edc)
-               {
-                  EINA_LOG_ERR("Failed to read group <%s> id <%d>\n", name1, ce->id);
-                  _edje_cache_file_unref(edf);
-                  return _edje_pick_cleanup(inp_files, out_file,
-                                            EDJE_PICK_GROUP_NOT_FOUND);
-               }
-
-             /* Update IDs */
-             _edje_pick_collection_process(edc, edf, out_file);
-
-             /* Build lists of all scripts with new IDs */
-             _edje_pick_scripts_add(edf, ce->id, edc->id);
-             _edje_pick_lua_scripts_add(edf, ce->id, edc->id);
-
-             {
-                /* Write the group to output file using new id */
-                snprintf(buf, sizeof(buf),
-                         "edje/collections/%i", edc->id);
-                bytes = eet_data_write(out_file->ef,
-                                       _edje_edd_edje_part_collection,
-                                       buf, edc, comp_mode);
-                EINA_LOG_INFO("Wrote <%d> bytes for group <%s>\n", bytes,buf);
-             }
-
-             free(edc);
-             edje_cache_emp_free(ce);
-             eet_close(ef);
+            ce = eina_hash_find(edf->collection, name1);
+            if (!ce || (ce->id < 0))
+              {
+                 EINA_LOG_ERR("Failed to find group <%s> id\n", name1);
+                 _edje_cache_file_unref(edf);
+                 return _edje_pick_cleanup(inp_files, out_file,
+                                           EDJE_PICK_GROUP_NOT_FOUND);
+              }
+
+            VERBOSE(EINA_LOG_INFO("Copy group: <%s>\n", name1));
+
+            edje_cache_emp_alloc(ce);
+
+            snprintf(buf, sizeof(buf), "edje/collections/%i", ce->id);
+            EINA_LOG_INFO("Trying to read group <%s>\n", buf);
+            edc = eet_data_read(edf->ef, _edje_edd_edje_part_collection, buf);
+            if (!edc)
+              {
+                 EINA_LOG_ERR("Failed to read group <%s> id <%d>\n", name1, ce->id);
+                 _edje_cache_file_unref(edf);
+                 return _edje_pick_cleanup(inp_files, out_file,
+                                           EDJE_PICK_GROUP_NOT_FOUND);
+              }
+
+            /* Update IDs */
+            _edje_pick_collection_process(edc, edf, out_file);
+
+            /* Build lists of all scripts with new IDs */
+            _edje_pick_scripts_add(edf, ce->id, edc->id);
+            _edje_pick_lua_scripts_add(edf, ce->id, edc->id);
+
+            {
+               /* Write the group to output file using new id */
+               snprintf(buf, sizeof(buf),
+                        "edje/collections/%i", edc->id);
+               bytes = eet_data_write(out_file->ef,
+                                      _edje_edd_edje_part_collection,
+                                      buf, edc, comp_mode);
+               EINA_LOG_INFO("Wrote <%d> bytes for group <%s>\n", bytes, buf);
+            }
+
+            free(edc);
+            edje_cache_emp_free(ce);
+            eet_close(ef);
           }
 
         _edje_pick_images_copy(edf, out_file);  /* Add Images to imagelist */
@@ -1806,7 +1810,7 @@ main(int argc, char **argv)
              snprintf(buf, sizeof(buf),
                       "edje/scripts/embryo/compiled/%i", s->id.new_id);
              VERBOSE(EINA_LOG_INFO("wrote embryo scr <%s> data <%p> size <%d>\n",
-                            buf, s->data, s->size));
+                                   buf, s->data, s->size));
              eet_write(out_file->ef, buf, s->data, s->size, comp_mode);
           }
 
@@ -1816,7 +1820,7 @@ main(int argc, char **argv)
              snprintf(buf, sizeof(buf),
                       "edje/scripts/lua/%i", s->id.new_id);
              VERBOSE(EINA_LOG_INFO("wrote lua scr <%s> data <%p> size <%d>\n",
-                            buf, s->data, s->size));
+                                   buf, s->data, s->size));
              eet_write(out_file->ef, buf, s->data, s->size, comp_mode);
           }
 
@@ -1852,8 +1856,8 @@ main(int argc, char **argv)
 
         EINA_LIST_FOREACH(context.current_file->samplelist, l, s)
           {
-             if (context.current_file->append || s->id.used)
-               {  /* Write only used samples */
+             if (context.current_file->append || s->id.used) /* Write only used samples */
+               {
                   samples = eina_list_append(samples, s->entry);
 
                   snprintf(buf, sizeof(buf), "edje/sounds/%i",
@@ -1861,7 +1865,7 @@ main(int argc, char **argv)
                   eet_write(out_file->ef, buf,
                             s->data, s->size, EET_COMPRESSION_NONE);
                   VERBOSE(EINA_LOG_INFO("Wrote <%s> sample data <%p> size <%d>\n",
-                                 buf, s->data, s->size));
+                                        buf, s->data, s->size));
                }
           }
 
@@ -1873,16 +1877,16 @@ main(int argc, char **argv)
 
         EINA_LIST_FOREACH(context.current_file->vibrationlist, l, s)
           {
-             if (context.current_file->append || s->id.used)
-               {  /* Write only used vibrations */
+             if (context.current_file->append || s->id.used) /* Write only used vibrations */
+               {
                   vibrations = eina_list_append(vibrations, s->entry);
 
                   snprintf(buf, sizeof(buf), "edje/vibrations/%i",
                            s->id.new_id);
                   eet_write(out_file->ef, buf,
-                            s->data, s->size,EINA_TRUE);
+                            s->data, s->size, EINA_TRUE);
                   VERBOSE(EINA_LOG_INFO("Wrote <%s> vibration data <%p> size <%d>\n",
-                                 buf, s->data, s->size));
+                                        buf, s->data, s->size));
                }
           }
      }
@@ -1907,3 +1911,4 @@ main(int argc, char **argv)
 
    return _edje_pick_cleanup(inp_files, out_file, EDJE_PICK_NO_ERROR);
 }
+
diff --git a/src/bin/edje/edje_player.c b/src/bin/edje/edje_player.c
index 768f24e31d..079495a174 100644
--- a/src/bin/edje/edje_player.c
+++ b/src/bin/edje/edje_player.c
@@ -590,6 +590,7 @@ _slave_mode(void *data, Ecore_Fd_Handler *fd_handler)
 
    return ECORE_CALLBACK_RENEW;
 }
+
 #endif
 
 static void
@@ -1124,9 +1125,9 @@ main(int argc, char **argv)
    f = eina_file_open(opts.file, EINA_FALSE);
    if (edje_mmap_3d_has(f, group))
      {
-        Eina_List* engine_list, *n;
+        Eina_List *engine_list, *n;
         Eina_Bool opengl_x11_has = EINA_FALSE, wayland_egl_has = EINA_FALSE;
-        const char* engine;
+        const char *engine;
         engine_list = ecore_evas_engines_get();
         EINA_LIST_FOREACH(engine_list, n, engine)
           {
diff --git a/src/bin/edje/edje_watch.c b/src/bin/edje/edje_watch.c
index 043d3af295..7c049a609a 100644
--- a/src/bin/edje/edje_watch.c
+++ b/src/bin/edje/edje_watch.c
@@ -43,7 +43,7 @@ read_watch_file(const char *file)
         const char *path;
         Eina_Bool do_append = EINA_TRUE;
 
-	if (ln->length < 4) continue ;
+        if (ln->length < 4) continue;
         if (anotate)
           {
              path = eina_stringshare_add_length(ln->start + 3, ln->length - 3);
@@ -56,7 +56,7 @@ read_watch_file(const char *file)
              path = eina_stringshare_add_length(ln->start, ln->length);
           }
         if (do_append)
-	  r = eina_list_append(r, eio_monitor_add(path));
+          r = eina_list_append(r, eio_monitor_add(path));
         eina_stringshare_del(path);
      }
    eina_iterator_free(it);
@@ -65,7 +65,7 @@ read_watch_file(const char *file)
      eio_monitor_del(mon);
    watching = r;
 
- err:
+err:
    eina_file_close(f);
 }
 
@@ -150,3 +150,4 @@ main(int argc, char **argv)
 
    return 1;
 }
+