diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c
index 5ccdd9f12..64694c27c 100644
--- a/src/modules/backlight/e_mod_main.c
+++ b/src/modules/backlight/e_mod_main.c
@@ -455,13 +455,13 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(E_Gadcon_Client_Class *client_class)
 {
-   char buf[PATH_MAX];
+   static char buf[PATH_MAX];
 
    snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
-            eina_list_count(backlight_instances));
-   return strdup(buf);
+            eina_list_count(backlight_instances) + 1);
+   return buf;
 }
 
 static void
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 50616dcf7..37f40cce1 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -167,11 +167,11 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 static const char *
 _gc_id_new(E_Gadcon_Client_Class *client_class)
 {
-   char buf[PATH_MAX];
+   static char buf[PATH_MAX];
 
    snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
-            eina_list_count(battery_config->instances));
-   return strdup(buf);
+            eina_list_count(battery_config->instances) + 1);
+   return buf;
 }
 
 static void
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index f1f890197..765339fe7 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -677,13 +677,12 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class)
+_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
-   char buf[PATH_MAX];
+   Config_Item *ci = NULL;
 
-   snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
-            eina_list_count(clock_instances));
-   return strdup(buf);
+   ci = _conf_item_get(NULL);
+   return ci->id;
 }
 
 static Config_Item *
diff --git a/src/modules/everything/evry_gadget.c b/src/modules/everything/evry_gadget.c
index 000f9f3d5..060abc5b6 100644
--- a/src/modules/everything/evry_gadget.c
+++ b/src/modules/everything/evry_gadget.c
@@ -201,13 +201,12 @@ _conf_item_get(const char *id)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class)
+_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
-   char buf[PATH_MAX];
+   Gadget_Config *ci = NULL;
 
-   snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
-            eina_inlist_count(instances));
-   return strdup(buf);
+   ci = _conf_item_get(NULL);
+   return ci->id;
 }
 
 /***************************************************************************/
diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c
index 77f99d4d2..c437f5b04 100644
--- a/src/modules/fileman/e_fwin_nav.c
+++ b/src/modules/fileman/e_fwin_nav.c
@@ -272,11 +272,11 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 static const char *
 _gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
-   char buf[PATH_MAX];
+   static char buf[PATH_MAX];
 
    snprintf(buf, sizeof(buf), "%s.%d", _gc_class.name,
 	    (eina_list_count(instances) + 1));
-   return strdup(buf);
+   return buf;
 }
 
 /* local functions */
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 2fcf3a733..3832acf7c 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -225,13 +225,13 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 }
 
 static const char *
-_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+_gc_id_new(E_Gadcon_Client_Class *client_class)
 {
-   char buf[PATH_MAX];
+   static char buf[PATH_MAX];
 
    snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
-            eina_list_count(ibar_config->instances));
-   return strdup(buf);
+            eina_list_count(ibar_config->instances) + 1);
+   return buf;
 }
 
 static void
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index 20191f88d..ca9d7b361 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -232,11 +232,11 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 static const char *
 _gc_id_new(E_Gadcon_Client_Class *client_class)
 {
-   char buf[PATH_MAX];
+   static char buf[PATH_MAX];
 
    snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
-            eina_list_count(ibox_config->instances));
-   return strdup(buf);
+            eina_list_count(ibox_config->instances) + 1);
+   return buf;
 }
 
 static void
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index f6725f7f3..52d3d0a31 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -273,11 +273,11 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
 static const char *
 _gc_id_new(E_Gadcon_Client_Class *client_class)
 {
-   char buf[PATH_MAX];
+   static char buf[PATH_MAX];
 
    snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
-            eina_list_count(pager_config->instances));
-   return strdup(buf);
+            eina_list_count(pager_config->instances) + 1);
+   return buf;
 }
 
 static Pager *
diff --git a/src/modules/xkbswitch/e_mod_main.c b/src/modules/xkbswitch/e_mod_main.c
index 693ca4532..f615bcfed 100644
--- a/src/modules/xkbswitch/e_mod_main.c
+++ b/src/modules/xkbswitch/e_mod_main.c
@@ -257,11 +257,11 @@ _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 static const char *
 _gc_id_new(E_Gadcon_Client_Class *client_class) 
 {
-   char buf[PATH_MAX];
+   static char buf[PATH_MAX];
 
    snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 
-            eina_list_count(instances));
-   return strdup(buf);
+            eina_list_count(instances) + 1);
+   return buf;
 }
 
 static Evas_Object *