diff --git a/src/modules/conf_borders/e_int_config_borders.c b/src/modules/conf_borders/e_int_config_borders.c
index 37c527466..5cc92d568 100644
--- a/src/modules/conf_borders/e_int_config_borders.c
+++ b/src/modules/conf_borders/e_int_config_borders.c
@@ -24,11 +24,11 @@ e_int_config_borders(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_border_style_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/borders")) return NULL;
    v = _config_view_new();
    if (!v) return NULL;
    cfd = e_config_dialog_new(con, _("Default Border Style"), 
-			     "E", "_config_border_style_dialog", 
+			     "E", "appearance/borders", 
 			     "preferences-system-windows", 0, v, con);
    return cfd;
 }
diff --git a/src/modules/conf_borders/e_mod_main.c b/src/modules/conf_borders/e_mod_main.c
index d1c9f1a95..85f84b0ea 100644
--- a/src/modules/conf_borders/e_mod_main.c
+++ b/src/modules/conf_borders/e_mod_main.c
@@ -30,8 +30,11 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_border_style_dialog"))) e_object_del(E_OBJECT(cfd));
-   while ((cfd = e_config_dialog_get("E", "_config_border_border_style_dialog"))) e_object_del(E_OBJECT(cfd));
+
+   while ((cfd = e_config_dialog_get("E", "internal/borders_border"))) 
+     e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/borders"))) 
+     e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("internal/borders_border");
    e_configure_registry_category_del("internal");
    e_configure_registry_item_del("appearance/borders");
diff --git a/src/modules/conf_clientlist/e_int_config_clientlist.c b/src/modules/conf_clientlist/e_int_config_clientlist.c
index 9807da928..0ddf47182 100644
--- a/src/modules/conf_clientlist/e_int_config_clientlist.c
+++ b/src/modules/conf_clientlist/e_int_config_clientlist.c
@@ -26,10 +26,11 @@ e_int_config_clientlist(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
-   
-   if (e_config_dialog_find("E", "_config_clientlist_dialog")) return NULL;
+
+   if (e_config_dialog_find("E", "menus/client_list_menu")) 
+     return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
-   
+
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
    v->basic.apply_cfdata = _basic_apply_data;
diff --git a/src/modules/conf_clientlist/e_mod_main.c b/src/modules/conf_clientlist/e_mod_main.c
index 63ec0e98f..7a09cad23 100644
--- a/src/modules/conf_clientlist/e_mod_main.c
+++ b/src/modules/conf_clientlist/e_mod_main.c
@@ -17,8 +17,12 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "preferences-menus");
-   e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "preferences-winlist", e_int_config_clientlist);
+   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, 
+                                     "preferences-menus");
+   e_configure_registry_item_add("menus/client_list_menu", 40, 
+                                 _("Client List Menu"), NULL, 
+                                 "preferences-winlist", 
+                                 e_int_config_clientlist);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -28,7 +32,9 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_clientlist_dialog"))) e_object_del(E_OBJECT(cfd));
+
+   while ((cfd = e_config_dialog_get("E", "menus/client_list_menu"))) 
+     e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("menus/client_list_menu");
    e_configure_registry_category_del("menus");
    conf_module = NULL;
diff --git a/src/modules/conf_colors/e_int_config_color_classes.c b/src/modules/conf_colors/e_int_config_color_classes.c
index a8ef0707d..95d09a6b2 100644
--- a/src/modules/conf_colors/e_int_config_color_classes.c
+++ b/src/modules/conf_colors/e_int_config_color_classes.c
@@ -127,8 +127,9 @@ e_int_config_color_classes(E_Container *con, const char *params __UNUSED__)
    v->advanced.apply_cfdata = _adv_apply_data;
    v->advanced.create_widgets = _adv_create_widgets;
    
-   cfd = e_config_dialog_new(con, _("Colors"), "E", "_config_color_classes_dialog",
-			     "preferences-desktop-color", 0, v, NULL);
+   cfd = 
+     e_config_dialog_new(con, _("Colors"), "E", "appearance/colors",
+                         "preferences-desktop-color", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_colors/e_mod_main.c b/src/modules/conf_colors/e_mod_main.c
index 05f75bb54..22356fdef 100644
--- a/src/modules/conf_colors/e_mod_main.c
+++ b/src/modules/conf_colors/e_mod_main.c
@@ -17,8 +17,11 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
-   e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "preferences-desktop-color", e_int_config_color_classes);
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
+                                     "preferences-appearance");
+   e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, 
+                                 "preferences-desktop-color", 
+                                 e_int_config_color_classes);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -28,7 +31,9 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_color_classes_dialog"))) e_object_del(E_OBJECT(cfd));
+
+   while ((cfd = e_config_dialog_get("E", "appearance/colors"))) 
+     e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("appearance/colors");
    e_configure_registry_category_del("appearance");
    conf_module = NULL;
diff --git a/src/modules/conf_desk/e_int_config_desk.c b/src/modules/conf_desk/e_int_config_desk.c
index eb8c08999..fc0b9b957 100644
--- a/src/modules/conf_desk/e_int_config_desk.c
+++ b/src/modules/conf_desk/e_int_config_desk.c
@@ -33,7 +33,7 @@ e_int_config_desk(E_Container *con, const char *params)
    if (sscanf(params, "%i %i %i %i", &con_num, &zone_num, &dx, &dy) != 4)
      return NULL;
    
-   if (e_config_dialog_find("E", "_config_desk_dialog")) return NULL;
+   if (e_config_dialog_find("E", "internal/desk")) return NULL;
 
    v = E_NEW(E_Config_Dialog_View, 1);
    
@@ -49,7 +49,7 @@ e_int_config_desk(E_Container *con, const char *params)
    v->basic.create_widgets = _basic_create;
    v->override_auto_apply = 1;
    
-   cfd = e_config_dialog_new(con, _("Desk Settings"), "E", "_config_desk_dialog",
+   cfd = e_config_dialog_new(con, _("Desk Settings"), "E", "internal/desk",
 			     "preferences-desktop", 0, v, cfdata);
    return cfd;
 }
diff --git a/src/modules/conf_desk/e_mod_main.c b/src/modules/conf_desk/e_mod_main.c
index dbbdef852..7db9e05f6 100644
--- a/src/modules/conf_desk/e_mod_main.c
+++ b/src/modules/conf_desk/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_desk_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "internal/desk"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("internal/desk");
    e_configure_registry_category_del("internal");
    conf_module = NULL;
diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_desklock/e_int_config_desklock.c
index 9847b436b..671c6ce21 100644
--- a/src/modules/conf_desklock/e_int_config_desklock.c
+++ b/src/modules/conf_desklock/e_int_config_desklock.c
@@ -79,7 +79,7 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_desklock_dialog")) return NULL;
+   if (e_config_dialog_find("E", "screen/screen_lock")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL;
    v->create_cfdata = _create_data;
@@ -94,7 +94,7 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Screen Lock Settings"), "E",
-			     "_config_desklock_dialog", "preferences-desklock",
+			     "screen/screen_lock", "preferences-desklock",
 			     0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_desklock/e_mod_main.c b/src/modules/conf_desklock/e_mod_main.c
index 5c603a1b9..4404ec697 100644
--- a/src/modules/conf_desklock/e_mod_main.c
+++ b/src/modules/conf_desklock/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_desklock_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "screen/screen_lock"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("screen/screen_lock");
    e_configure_registry_category_del("screen");
    conf_module = NULL;
diff --git a/src/modules/conf_desks/e_int_config_desks.c b/src/modules/conf_desks/e_int_config_desks.c
index 48e595eb9..7f4395994 100644
--- a/src/modules/conf_desks/e_int_config_desks.c
+++ b/src/modules/conf_desks/e_int_config_desks.c
@@ -49,18 +49,18 @@ e_int_config_desks(E_Container *con, const char *params __UNUSED__)
    v = E_NEW(E_Config_Dialog_View, 1);
    
    /* methods */
-   v->create_cfdata           = _create_data;
-   v->free_cfdata             = _free_data;
-   v->basic.apply_cfdata      = _basic_apply_data;
-   v->basic.create_widgets    = _basic_create_widgets;
-   v->basic.check_changed     = _basic_check_changed;
-   v->advanced.apply_cfdata   = _advanced_apply_data;
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.apply_cfdata = _basic_apply_data;
+   v->basic.create_widgets = _basic_create_widgets;
+   v->basic.check_changed = _basic_check_changed;
+   v->advanced.apply_cfdata = _advanced_apply_data;
    v->advanced.create_widgets = _advanced_create_widgets;
-   v->advanced.check_changed  = _advanced_check_changed;
+   v->advanced.check_changed = _advanced_check_changed;
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con,
 			     _("Virtual Desktops Settings"),
-			     "E", "_config_desks_dialog",
+			     "E", "screen/virtual_desktops",
 			     "preferences-desktop", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_desks/e_mod_main.c b/src/modules/conf_desks/e_mod_main.c
index a8b62881f..5d20b99d2 100644
--- a/src/modules/conf_desks/e_mod_main.c
+++ b/src/modules/conf_desks/e_mod_main.c
@@ -19,8 +19,11 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
-   e_configure_registry_item_add("screen/virtual_desktops", 10, _("Virtual Desktops"), NULL, "preferences-desktop", e_int_config_desks);
+   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, 
+                                     "preferences-desktop-display");
+   e_configure_registry_item_add("screen/virtual_desktops", 10, 
+                                 _("Virtual Desktops"), NULL, 
+                                 "preferences-desktop", e_int_config_desks);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -30,7 +33,9 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_desks_dialog"))) e_object_del(E_OBJECT(cfd));
+
+   while ((cfd = e_config_dialog_get("E", "screen/virtual_desktops"))) 
+     e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("screen/virtual_desktops");
    e_configure_registry_category_del("screen");
    conf_module = NULL;
diff --git a/src/modules/conf_dialogs/e_int_config_dialogs.c b/src/modules/conf_dialogs/e_int_config_dialogs.c
index 109a0bad9..85d68ffdc 100644
--- a/src/modules/conf_dialogs/e_int_config_dialogs.c
+++ b/src/modules/conf_dialogs/e_int_config_dialogs.c
@@ -24,7 +24,7 @@ e_int_config_dialogs(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_config_dialog_dialog")) return NULL;
+   if (e_config_dialog_find("E", "settings/dialogs")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -35,7 +35,7 @@ e_int_config_dialogs(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Dialog Settings"),
-			     "E", "_config_config_dialog_dialog",
+			     "E", "settings/dialogs",
 			     "preferences-dialogs", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_dialogs/e_mod_main.c b/src/modules/conf_dialogs/e_mod_main.c
index 5891f201c..14761429e 100644
--- a/src/modules/conf_dialogs/e_mod_main.c
+++ b/src/modules/conf_dialogs/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_config_dialog_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "settings/dialogs"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("settings/dialogs");
    e_configure_registry_category_del("settings");
    conf_module = NULL;
diff --git a/src/modules/conf_display/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c
index 3eddde31c..26560f693 100644
--- a/src/modules/conf_display/e_int_config_display.c
+++ b/src/modules/conf_display/e_int_config_display.c
@@ -216,7 +216,7 @@ e_int_config_display(E_Container *con, const char *params __UNUSED__)
         return NULL;
      }
 
-   if (e_config_dialog_find("E", "_config_display_dialog")) return NULL;
+   if (e_config_dialog_find("E", "screen/screen_resolution")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
@@ -226,7 +226,7 @@ e_int_config_display(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Screen Resolution Settings"),
-			     "E", "_config_display_dialog",
+			     "E", "screen/screen_resolution",
 			     "preferences-system-screen-resolution", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c
index f5e235d88..43f6f5cdd 100644
--- a/src/modules/conf_display/e_mod_main.c
+++ b/src/modules/conf_display/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_display_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "screen/screen_resolution"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("screen/screen_resolution");
    e_configure_registry_category_del("screen");
    conf_module = NULL;
diff --git a/src/modules/conf_dpms/e_int_config_dpms.c b/src/modules/conf_dpms/e_int_config_dpms.c
index 4e0ad2ef4..58a7dda83 100644
--- a/src/modules/conf_dpms/e_int_config_dpms.c
+++ b/src/modules/conf_dpms/e_int_config_dpms.c
@@ -95,7 +95,7 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if ((e_config_dialog_find("E", "_config_dpms_dialogt")) ||
+   if ((e_config_dialog_find("E", "screen/power_management")) ||
        (!_e_int_config_dpms_available()) ||
        (!_e_int_config_dpms_capable()))
      return NULL;
@@ -110,7 +110,7 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Display Power Management Settings"), "E",
-			     "_config_dpms_dialog", "preferences-system-power-management",
+			     "screen/power_management", "preferences-system-power-management",
 			     0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_dpms/e_mod_main.c b/src/modules/conf_dpms/e_mod_main.c
index c32b83382..12aceddc0 100644
--- a/src/modules/conf_dpms/e_mod_main.c
+++ b/src/modules/conf_dpms/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_dpms_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "screen/power_management"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("screen/power_management");
    e_configure_registry_category_del("screen");
    conf_module = NULL;
diff --git a/src/modules/conf_edgebindings/e_int_config_edgebindings.c b/src/modules/conf_edgebindings/e_int_config_edgebindings.c
index 54b754c55..48aded601 100644
--- a/src/modules/conf_edgebindings/e_int_config_edgebindings.c
+++ b/src/modules/conf_edgebindings/e_int_config_edgebindings.c
@@ -93,7 +93,7 @@ e_int_config_edgebindings(E_Container *con, const char *params)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_edgebindings_dialog")) return NULL;
+   if (e_config_dialog_find("E", "keyboard_and_mouse/edge_bindings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -103,7 +103,7 @@ e_int_config_edgebindings(E_Container *con, const char *params)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Edge Binding Settings"), "E", 
-			     "_config_edgebindings_dialog",
+			     "keyboard_and_mouse/edge_bindings",
 			     "enlightenment/edges", 0, v, NULL);
    if ((params) && (params[0]))
      {
diff --git a/src/modules/conf_edgebindings/e_mod_main.c b/src/modules/conf_edgebindings/e_mod_main.c
index 9d4c8b037..17d1694c7 100644
--- a/src/modules/conf_edgebindings/e_mod_main.c
+++ b/src/modules/conf_edgebindings/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_edgebindings_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/edge_bindings"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("keyboard_and_mouse/edge_bindings");
    e_configure_registry_category_del("keyboard_and_mouse");
    conf_module = NULL;
diff --git a/src/modules/conf_engine/e_int_config_engine.c b/src/modules/conf_engine/e_int_config_engine.c
index 62fe4fb14..08346ae1a 100644
--- a/src/modules/conf_engine/e_int_config_engine.c
+++ b/src/modules/conf_engine/e_int_config_engine.c
@@ -25,7 +25,7 @@ e_int_config_engine(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_engine_dialog")) return NULL;
+   if (e_config_dialog_find("E", "advanced/engine")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL;
    v->create_cfdata = _create_data;
@@ -36,7 +36,7 @@ e_int_config_engine(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Engine Settings"),
-			     "E", "_config_engine_dialog",
+			     "E", "advanced/engine",
 			     "preferences-engine", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_engine/e_mod_main.c b/src/modules/conf_engine/e_mod_main.c
index deb64367d..fb836809f 100644
--- a/src/modules/conf_engine/e_mod_main.c
+++ b/src/modules/conf_engine/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_engine_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "advanced/engine"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("advanced/engine");
    e_configure_registry_category_del("advanced");
    conf_module = NULL;
diff --git a/src/modules/conf_exebuf/e_int_config_exebuf.c b/src/modules/conf_exebuf/e_int_config_exebuf.c
index 737a7e7de..2f89346f6 100644
--- a/src/modules/conf_exebuf/e_int_config_exebuf.c
+++ b/src/modules/conf_exebuf/e_int_config_exebuf.c
@@ -36,7 +36,7 @@ e_int_config_exebuf(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_exebuf_dialog")) return NULL;
+   if (e_config_dialog_find("E", "advanced/run_command")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -47,7 +47,7 @@ e_int_config_exebuf(E_Container *con, const char *params __UNUSED__)
    v->advanced.create_widgets = _advanced_create_widgets;
    cfd = e_config_dialog_new(con,
 			     _("Run Command Settings"),
-			     "E", "_config_exebuf_dialog",
+			     "E", "advanced/run_command",
 			     "system-run", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_exebuf/e_mod_main.c b/src/modules/conf_exebuf/e_mod_main.c
index 18a47256e..b3587c74f 100644
--- a/src/modules/conf_exebuf/e_mod_main.c
+++ b/src/modules/conf_exebuf/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_exebuf_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "advanced/run_command"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("advanced/run_command");
    e_configure_registry_category_del("advanced");
    conf_module = NULL;
diff --git a/src/modules/conf_fonts/e_int_config_fonts.c b/src/modules/conf_fonts/e_int_config_fonts.c
index 824f715a9..183571744 100644
--- a/src/modules/conf_fonts/e_int_config_fonts.c
+++ b/src/modules/conf_fonts/e_int_config_fonts.c
@@ -155,18 +155,18 @@ e_int_config_fonts(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_fonts_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/fonts")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
-   v->create_cfdata           = _create_data;
-   v->free_cfdata             = _free_data;
-   v->basic.create_widgets    = _basic_create_widgets;
-   v->basic.apply_cfdata      = _basic_apply_data;
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.create_widgets = _basic_create_widgets;
+   v->basic.apply_cfdata = _basic_apply_data;
    v->advanced.create_widgets = _advanced_create_widgets;
-   v->advanced.apply_cfdata   = _advanced_apply_data;
+   v->advanced.apply_cfdata = _advanced_apply_data;
 
    cfd = e_config_dialog_new(con, _("Font Settings"),
-			     "E", "_config_fonts_dialog",
+			     "E", "appearance/fonts",
 			     "preferences-desktop-font", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_fonts/e_mod_main.c b/src/modules/conf_fonts/e_mod_main.c
index 744b866b3..4ea4041d6 100644
--- a/src/modules/conf_fonts/e_mod_main.c
+++ b/src/modules/conf_fonts/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_fonts_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/fonts"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("appearance/fonts");
    e_configure_registry_category_del("appearance");
    conf_module = NULL;
diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.c b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
index c48f1985d..3cd31be2b 100644
--- a/src/modules/conf_icon_theme/e_int_config_icon_themes.c
+++ b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
@@ -30,7 +30,7 @@ e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_icon_theme_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/icon_theme")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -41,7 +41,7 @@ e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Icon Theme Settings"),
-			     "E", "_config_icon_theme_dialog",
+			     "E", "appearance/icon_theme",
 			     "preferences-icon-theme", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_icon_theme/e_mod_main.c b/src/modules/conf_icon_theme/e_mod_main.c
index 75064fecc..7ea6ed6f2 100644
--- a/src/modules/conf_icon_theme/e_mod_main.c
+++ b/src/modules/conf_icon_theme/e_mod_main.c
@@ -30,7 +30,7 @@ e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
 
-   while ((cfd = e_config_dialog_get("E", "_config_icon_theme_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/icon_theme"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("appearance/icon_theme");
    e_configure_registry_category_del("appearance");
    conf_module = NULL;
diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c
index 68dc15794..0d38d3f1f 100644
--- a/src/modules/conf_imc/e_int_config_imc.c
+++ b/src/modules/conf_imc/e_int_config_imc.c
@@ -95,7 +95,7 @@ e_int_config_imc(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_imc_dialog")) return NULL;
+   if (e_config_dialog_find("E", "language/input_method_settings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -107,7 +107,7 @@ e_int_config_imc(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Input Method Settings"),
-			     "E", "_config_imc_dialog",
+			     "E", "language/input_method_settings",
 			     "preferences-imc", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_imc/e_mod_main.c b/src/modules/conf_imc/e_mod_main.c
index 765ded4c6..6e32bc4a5 100644
--- a/src/modules/conf_imc/e_mod_main.c
+++ b/src/modules/conf_imc/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_imc_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "language/input_method_settings"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("language/input_method_settings");
    e_configure_registry_category_del("language");
    conf_module = NULL;
diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c
index 44db4b89f..fe997f681 100644
--- a/src/modules/conf_interaction/e_int_config_interaction.c
+++ b/src/modules/conf_interaction/e_int_config_interaction.c
@@ -23,7 +23,7 @@ e_int_config_interaction(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_config_interaction_dialog")) return NULL;
+   if (e_config_dialog_find("E", "keyboard_and_mouse/interaction")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -35,7 +35,7 @@ e_int_config_interaction(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Interaction Settings"),
-			     "E", "_config_config_interaction_dialog",
+			     "E", "keyboard_and_mouse/interaction",
 			     "preferences-interaction", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_interaction/e_mod_main.c b/src/modules/conf_interaction/e_mod_main.c
index 0fda23ed1..c88686c7a 100644
--- a/src/modules/conf_interaction/e_mod_main.c
+++ b/src/modules/conf_interaction/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_config_interaction_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/interaction"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("keyboard_and_mouse/interaction");
    e_configure_registry_category_del("keyboard_and_mouse");
    conf_module = NULL;
diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c
index f7d503d9b..5f696d157 100644
--- a/src/modules/conf_intl/e_int_config_intl.c
+++ b/src/modules/conf_intl/e_int_config_intl.c
@@ -569,7 +569,7 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_intl_dialog")) return NULL;
+   if (e_config_dialog_find("E", "language/language_settings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -581,7 +581,7 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Language Settings"),
-			     "E", "_config_intl_dialog",
+			     "E", "language/language_settings",
 			     "preferences-desktop-locale", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_intl/e_mod_main.c b/src/modules/conf_intl/e_mod_main.c
index 0d8f33645..4f703bb5f 100644
--- a/src/modules/conf_intl/e_mod_main.c
+++ b/src/modules/conf_intl/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_intl_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "language/language_settings"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("language/language_settings");
    e_configure_registry_category_del("language");
    conf_module = NULL;
diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c
index 4ebf0374f..d419f8bb2 100644
--- a/src/modules/conf_keybindings/e_int_config_keybindings.c
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -80,7 +80,7 @@ e_int_config_keybindings(E_Container *con, const char *params)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_keybindings_dialog")) return NULL;
+   if (e_config_dialog_find("E", "keyboard_and_mouse/key_bindings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -90,7 +90,7 @@ e_int_config_keybindings(E_Container *con, const char *params)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Key Binding Settings"), "E", 
-			     "_config_keybindings_dialog",
+			     "keyboard_and_mouse/key_bindings",
 			     "preferences-desktop-keyboard", 0, v, NULL);
    if ((params) && (params[0]))
      {
diff --git a/src/modules/conf_keybindings/e_mod_main.c b/src/modules/conf_keybindings/e_mod_main.c
index 4735366be..34bf76173 100644
--- a/src/modules/conf_keybindings/e_mod_main.c
+++ b/src/modules/conf_keybindings/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_keybindings_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/key_bindings"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("keyboard_and_mouse/key_bindings");
    e_configure_registry_category_del("keyboard_and_mouse");
    conf_module = NULL;
diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c
index ef977a8a8..95a75343c 100644
--- a/src/modules/conf_menus/e_int_config_menus.c
+++ b/src/modules/conf_menus/e_int_config_menus.c
@@ -30,7 +30,7 @@ e_int_config_menus(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_menus_dialog")) return NULL;
+   if (e_config_dialog_find("E", "menus/menu_settings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -42,7 +42,7 @@ e_int_config_menus(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Menu Settings"),
-			     "E", "_config_menus_dialog",
+			     "E", "menus/menu_settings",
 			     "preferences-menus", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_menus/e_mod_main.c b/src/modules/conf_menus/e_mod_main.c
index 7e1ceec61..0c11d30f1 100644
--- a/src/modules/conf_menus/e_mod_main.c
+++ b/src/modules/conf_menus/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_menus_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "menus/menu_settings"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("menus/menu_settings");
    e_configure_registry_category_del("menus");
    conf_module = NULL;
diff --git a/src/modules/conf_mime/e_int_config_mime.c b/src/modules/conf_mime/e_int_config_mime.c
index 6057dc730..b6006bf12 100644
--- a/src/modules/conf_mime/e_int_config_mime.c
+++ b/src/modules/conf_mime/e_int_config_mime.c
@@ -54,14 +54,14 @@ e_int_config_mime(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_mime_dialog")) return NULL;
+   if (e_config_dialog_find("E", "fileman/file_icons")) return NULL;
    
    v = E_NEW(E_Config_Dialog_View, 1);
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
    v->basic.create_widgets = _basic_create;
    
-   cfd = e_config_dialog_new(con, _("File Icons"), "E", "_config_mime_dialog",
+   cfd = e_config_dialog_new(con, _("File Icons"), "E", "fileman/file_icons",
 			     "preferences-file-icons", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_mime/e_mod_main.c b/src/modules/conf_mime/e_mod_main.c
index ba15e78ac..a12618681 100644
--- a/src/modules/conf_mime/e_mod_main.c
+++ b/src/modules/conf_mime/e_mod_main.c
@@ -30,7 +30,7 @@ e_modapi_shutdown(E_Module *m)
    E_Config_Dialog *cfd;
 
    while ((cfd = e_config_dialog_get("E", "_config_mime_edit_dialog"))) e_object_del(E_OBJECT(cfd));
-   while ((cfd = e_config_dialog_get("E", "_config_mime_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "fileman/file_icons"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("fileman/file_icons");
    e_configure_registry_category_del("fileman");
    conf_module = NULL;
diff --git a/src/modules/conf_mouse/e_int_config_mouse.c b/src/modules/conf_mouse/e_int_config_mouse.c
index 9786e38c1..8aee863fe 100644
--- a/src/modules/conf_mouse/e_int_config_mouse.c
+++ b/src/modules/conf_mouse/e_int_config_mouse.c
@@ -23,7 +23,7 @@ e_int_config_mouse(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_mouse_dialog"))
+   if (e_config_dialog_find("E", "keyboard_and_mouse/mouse_settings"))
      return NULL;
 
    v = E_NEW(E_Config_Dialog_View, 1);
@@ -35,7 +35,7 @@ e_int_config_mouse(E_Container *con, const char *params __UNUSED__)
    v->basic.check_changed = _basic_check_changed;
 
    cfd = e_config_dialog_new(con, _("Mouse Settings"), "E",
-			     "_config_mouse_dialog",
+			     "keyboard_and_mouse/mouse_settings",
 			     "preferences-desktop-mouse", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_mouse/e_mod_main.c b/src/modules/conf_mouse/e_mod_main.c
index adea1f349..af2684be8 100644
--- a/src/modules/conf_mouse/e_mod_main.c
+++ b/src/modules/conf_mouse/e_mod_main.c
@@ -28,8 +28,8 @@ EAPI int
 e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_mouse_dialog"))) e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("keyboard_and_mouse/mouse_acceleration");
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_settings"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("keyboard_and_mouse/mouse_settings");
    e_configure_registry_category_del("keyboard_and_mouse");
    conf_module = NULL;
    return 1;
diff --git a/src/modules/conf_mouse_cursor/e_int_config_cursor.c b/src/modules/conf_mouse_cursor/e_int_config_cursor.c
index ddfba6f48..0e4aa9df6 100644
--- a/src/modules/conf_mouse_cursor/e_int_config_cursor.c
+++ b/src/modules/conf_mouse_cursor/e_int_config_cursor.c
@@ -31,7 +31,7 @@ e_int_config_cursor(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_cursor_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/mouse_cursor")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -43,7 +43,7 @@ e_int_config_cursor(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Cursor Settings"),
-			     "E", "_config_cursor_dialog",
+			     "E", "appearance/mouse_cursor",
 			     "preferences-desktop-pointer", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_mouse_cursor/e_mod_main.c b/src/modules/conf_mouse_cursor/e_mod_main.c
index e0e5a9987..22c108fb9 100644
--- a/src/modules/conf_mouse_cursor/e_mod_main.c
+++ b/src/modules/conf_mouse_cursor/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_cursor_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/mouse_cursor"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("appearance/mouse_cursor");
    e_configure_registry_category_del("appearance");
    conf_module = NULL;
diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
index e95050dc0..939c939bf 100644
--- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
@@ -99,7 +99,7 @@ e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_mousebindings_dialog")) return NULL;
+   if (e_config_dialog_find("E", "keyboard_and_mouse/mouse_bindings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -110,7 +110,7 @@ e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Mouse Binding Settings"),
-			     "E", "_config_mousebindings_dialog",
+			     "E", "keyboard_and_mouse/mouse_bindings",
 			     "preferences-desktop-mouse", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_mousebindings/e_mod_main.c b/src/modules/conf_mousebindings/e_mod_main.c
index b7e0e8c2a..8946f942f 100644
--- a/src/modules/conf_mousebindings/e_mod_main.c
+++ b/src/modules/conf_mousebindings/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_mousebindings_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_bindings"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("keyboard_and_mouse/mouse_bindings");
    e_configure_registry_category_del("keyboard_and_mouse");
    conf_module = NULL;
diff --git a/src/modules/conf_paths/e_int_config_paths.c b/src/modules/conf_paths/e_int_config_paths.c
index bbcb07fb2..8131b8533 100644
--- a/src/modules/conf_paths/e_int_config_paths.c
+++ b/src/modules/conf_paths/e_int_config_paths.c
@@ -51,7 +51,7 @@ e_int_config_paths(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_paths_dialog")) return NULL;
+   if (e_config_dialog_find("E", "advanced/search_directories")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata           = _create_data;
@@ -60,7 +60,7 @@ e_int_config_paths(E_Container *con, const char *params __UNUSED__)
    v->basic.apply_cfdata      = _basic_apply_data;
    
    cfd = e_config_dialog_new(con, _("Search Path Settings"),
-			     "E", "_config_paths_dialog",
+			     "E", "advanced/search_directories",
 			     "preferences-directories", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_paths/e_mod_main.c b/src/modules/conf_paths/e_mod_main.c
index 6cb0e2b67..fbdbe6097 100644
--- a/src/modules/conf_paths/e_mod_main.c
+++ b/src/modules/conf_paths/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_paths_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "advanced/search_directories"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("advanced/search_directories");
    e_configure_registry_category_del("advanced");
    conf_module = NULL;
diff --git a/src/modules/conf_performance/e_int_config_performance.c b/src/modules/conf_performance/e_int_config_performance.c
index 7a8d1c662..1ea07b33e 100644
--- a/src/modules/conf_performance/e_int_config_performance.c
+++ b/src/modules/conf_performance/e_int_config_performance.c
@@ -26,7 +26,7 @@ e_int_config_performance(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_performance_dialog")) return NULL;
+   if (e_config_dialog_find("E", "advanced/performance")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -38,7 +38,7 @@ e_int_config_performance(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Performance Settings"),
-			     "E", "_config_performance_dialog",
+			     "E", "advanced/performance",
 			     "preferences-system-performance", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c
index 4c43860f2..ef4695d1b 100644
--- a/src/modules/conf_performance/e_mod_main.c
+++ b/src/modules/conf_performance/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_performance_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "advanced/performance"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("advanced/performance");
    e_configure_registry_category_del("advanced");
    conf_module = NULL;
diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c
index 13f198efa..9cd410f54 100644
--- a/src/modules/conf_profiles/e_int_config_profiles.c
+++ b/src/modules/conf_profiles/e_int_config_profiles.c
@@ -43,7 +43,7 @@ e_int_config_profiles(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_profiles_dialog")) return NULL;
+   if (e_config_dialog_find("E", "settings/profiles")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL;
    v->create_cfdata = _create_data;
@@ -53,7 +53,7 @@ e_int_config_profiles(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Profile Selector"),
-			     "E", "_config_profiles_dialog",
+			     "E", "settings/profiles",
 			     "preferences-profiles", 0, v, NULL);
    e_config_dialog_changed_auto_set(cfd, 0);
    return cfd;
diff --git a/src/modules/conf_profiles/e_mod_main.c b/src/modules/conf_profiles/e_mod_main.c
index 2e954e053..da148b32a 100644
--- a/src/modules/conf_profiles/e_mod_main.c
+++ b/src/modules/conf_profiles/e_mod_main.c
@@ -32,7 +32,7 @@ e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
 
-   while ((cfd = e_config_dialog_get("E", "_config_profiles_dialog")))
+   while ((cfd = e_config_dialog_get("E", "settings/profiles")))
      e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("settings/profiles");
    e_configure_registry_category_del("settings");
diff --git a/src/modules/conf_scale/e_int_config_scale.c b/src/modules/conf_scale/e_int_config_scale.c
index 7100fa2a7..cce7b3f1b 100644
--- a/src/modules/conf_scale/e_int_config_scale.c
+++ b/src/modules/conf_scale/e_int_config_scale.c
@@ -45,7 +45,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_scale_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/scale")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -59,7 +59,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Scaling Settings"),
-			     "E", "_config_scale_dialog",
+			     "E", "appearance/scale",
 			     "preferences-scale", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_scale/e_mod_main.c b/src/modules/conf_scale/e_mod_main.c
index 6fb1eb97d..999fc3e77 100644
--- a/src/modules/conf_scale/e_mod_main.c
+++ b/src/modules/conf_scale/e_mod_main.c
@@ -29,7 +29,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_scale_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/scale"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("appearance/scale");
    e_configure_registry_category_del("appearance");
    conf_module = NULL;
diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.c b/src/modules/conf_screensaver/e_int_config_screensaver.c
index 946720e6d..5b1176fc7 100644
--- a/src/modules/conf_screensaver/e_int_config_screensaver.c
+++ b/src/modules/conf_screensaver/e_int_config_screensaver.c
@@ -52,7 +52,7 @@ e_int_config_screensaver(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_screensaver_dialog")) return NULL;
+   if (e_config_dialog_find("E", "screen/screen_saver")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -65,7 +65,7 @@ e_int_config_screensaver(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con,_("Screen Saver Settings"),
-			     "E", "_config_screensaver_dialog",
+			     "E", "screen/screen_saver",
 			     "preferences-desktop-screensaver", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_screensaver/e_mod_main.c b/src/modules/conf_screensaver/e_mod_main.c
index 51eebce69..91f23f446 100644
--- a/src/modules/conf_screensaver/e_mod_main.c
+++ b/src/modules/conf_screensaver/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_screensaver_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "screen/screen_saver"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("screen/screen_saver");
    e_configure_registry_category_del("screen");
    conf_module = NULL;
diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
index 0e6a75fcc..e2c1c7f92 100644
--- a/src/modules/conf_shelves/e_int_config_shelf.c
+++ b/src/modules/conf_shelves/e_int_config_shelf.c
@@ -33,7 +33,7 @@ e_int_config_shelf(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_shelf_dialog")) return NULL;
+   if (e_config_dialog_find("E", "extensions/shelves")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL; 
    v->create_cfdata = _create_data;
@@ -41,7 +41,7 @@ e_int_config_shelf(E_Container *con, const char *params __UNUSED__)
    v->basic.create_widgets = _basic_create;
 
    cfd = e_config_dialog_new(con, _("Shelf Settings"), "E", 
-			     "_config_shelf_dialog",
+			     "extensions/shelves",
 			     "preferences-desktop-shelf", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_shelves/e_mod_main.c b/src/modules/conf_shelves/e_mod_main.c
index e5efdb9c7..49a9bffc4 100644
--- a/src/modules/conf_shelves/e_mod_main.c
+++ b/src/modules/conf_shelves/e_mod_main.c
@@ -41,7 +41,7 @@ e_modapi_shutdown(E_Module *m)
 	e_int_menus_menu_augmentation_del("config/1", maug);
 	maug = NULL;
      }
-   while ((cfd = e_config_dialog_get("E", "_config_shelf_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "extensions/shelves"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("extensions/shelves");
    e_configure_registry_category_del("extensions");
    conf_module = NULL;
diff --git a/src/modules/conf_startup/e_int_config_startup.c b/src/modules/conf_startup/e_int_config_startup.c
index c7141ef15..4de11bf2d 100644
--- a/src/modules/conf_startup/e_int_config_startup.c
+++ b/src/modules/conf_startup/e_int_config_startup.c
@@ -27,7 +27,7 @@ e_int_config_startup(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_startup_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/startup")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -37,7 +37,7 @@ e_int_config_startup(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Startup Settings"),
-			     "E", "_config_startup_dialog",
+			     "E", "appearance/startup",
 			     "preferences-startup", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_startup/e_mod_main.c b/src/modules/conf_startup/e_mod_main.c
index a3c467c7e..8bad61d87 100644
--- a/src/modules/conf_startup/e_mod_main.c
+++ b/src/modules/conf_startup/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_startup_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/startup"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("appearance/startup");
    e_configure_registry_category_del("appearance");
    conf_module = NULL;
diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c
index 06670019e..4d89ada4a 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -77,7 +77,7 @@ e_int_config_theme(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_theme_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/theme")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -89,7 +89,7 @@ e_int_config_theme(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
    cfd = e_config_dialog_new(con,
 			     _("Theme Selector"),
-			     "E", "_config_theme_dialog",
+			     "E", "appearance/theme",
 			     "preferences-desktop-theme", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c
index 292bb4e65..52984bf62 100644
--- a/src/modules/conf_theme/e_mod_main.c
+++ b/src/modules/conf_theme/e_mod_main.c
@@ -48,7 +48,7 @@ e_modapi_shutdown(E_Module *m)
 	maug = NULL;
      }
 
-   while ((cfd = e_config_dialog_get("E", "_config_theme_dialog"))) 
+   while ((cfd = e_config_dialog_get("E", "apppearance/theme"))) 
      e_object_del(E_OBJECT(cfd));
 
    e_configure_registry_item_del("appearance/theme");
diff --git a/src/modules/conf_transitions/e_int_config_transitions.c b/src/modules/conf_transitions/e_int_config_transitions.c
index c99461305..fbd757327 100644
--- a/src/modules/conf_transitions/e_int_config_transitions.c
+++ b/src/modules/conf_transitions/e_int_config_transitions.c
@@ -32,7 +32,7 @@ e_int_config_transitions(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_transitions_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/transitions")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL;
    
@@ -42,7 +42,7 @@ e_int_config_transitions(E_Container *con, const char *params __UNUSED__)
    v->basic.create_widgets = _basic_create_widgets;
    
    cfd = e_config_dialog_new(con, _("Transition Settings"),
-			     "E", "_config_transitions_dialog",
+			     "E", "appearance/transitions",
 			     "preferences-transitions", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_transitions/e_mod_main.c b/src/modules/conf_transitions/e_mod_main.c
index 99359f010..891c1ec90 100644
--- a/src/modules/conf_transitions/e_mod_main.c
+++ b/src/modules/conf_transitions/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_transitions_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/transitions"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("appearance/transitions");
    e_configure_registry_category_del("appearance");
    conf_module = NULL;
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
index afdf6da7d..381088b7c 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
@@ -83,7 +83,7 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de
    E_Config_Dialog_View *v;
    E_Config_Wallpaper *cw;
 
-   if (e_config_dialog_find("E", "_config_wallpaper_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/wallpaper")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    cw = E_NEW(E_Config_Wallpaper, 1);
 
@@ -108,7 +108,7 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de
    cw->desk_y = desk_y;
 
    cfd = e_config_dialog_new(con, _("Wallpaper Settings"), "E", 
-			     "_config_wallpaper_dialog",
+			     "appearance/wallpaper",
 			     "preferences-desktop-wallpaper", 0, v, cw);
    return cfd;
 }
diff --git a/src/modules/conf_wallpaper/e_mod_main.c b/src/modules/conf_wallpaper/e_mod_main.c
index 6bbe4ffb6..b96a9ad0e 100644
--- a/src/modules/conf_wallpaper/e_mod_main.c
+++ b/src/modules/conf_wallpaper/e_mod_main.c
@@ -61,7 +61,7 @@ e_modapi_shutdown(E_Module *m)
 	e_int_menus_menu_augmentation_del("config/1", maug);
 	maug = NULL;
      }
-   while ((cfd = e_config_dialog_get("E", "_config_wallpaper_dialog"))) 
+   while ((cfd = e_config_dialog_get("E", "appearance/wallpaper"))) 
      e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("internal/wallpaper_desk");
    e_configure_registry_category_del("internal");
diff --git a/src/modules/conf_window_display/e_int_config_window_display.c b/src/modules/conf_window_display/e_int_config_window_display.c
index 0ee0e112f..93467f6e0 100644
--- a/src/modules/conf_window_display/e_int_config_window_display.c
+++ b/src/modules/conf_window_display/e_int_config_window_display.c
@@ -43,7 +43,7 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_window_display_dialog")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_display")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    /* methods */
@@ -57,7 +57,7 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__)
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con,
 			     _("Window Display"),
-			     "E", "_config_window_display_dialog",
+			     "E", "windows/window_display",
 			     "preferences-system-windows", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_window_display/e_mod_main.c b/src/modules/conf_window_display/e_mod_main.c
index 9e5f8da23..e6d3bf079 100644
--- a/src/modules/conf_window_display/e_mod_main.c
+++ b/src/modules/conf_window_display/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_window_display_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "windows/window_display"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("windows/window_display");
    e_configure_registry_category_del("windows");
    conf_module = NULL;
diff --git a/src/modules/conf_window_focus/e_int_config_focus.c b/src/modules/conf_window_focus/e_int_config_focus.c
index 503e44b1a..42e03a59c 100644
--- a/src/modules/conf_window_focus/e_int_config_focus.c
+++ b/src/modules/conf_window_focus/e_int_config_focus.c
@@ -35,7 +35,7 @@ e_int_config_focus(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_focus_dialog")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_focus")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    /* methods */
@@ -49,7 +49,7 @@ e_int_config_focus(E_Container *con, const char *params __UNUSED__)
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con,
 			     _("Focus Settings"),
-			     "E", "_config_focus_dialog",
+			     "E", "windows/window_focus",
 			     "preferences-focus", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_window_focus/e_mod_main.c b/src/modules/conf_window_focus/e_mod_main.c
index 4bd21e854..f34b1cf3a 100644
--- a/src/modules/conf_window_focus/e_mod_main.c
+++ b/src/modules/conf_window_focus/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_focus_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "windows/window_focus"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("windows/window_focus");
    e_configure_registry_category_del("windows");
    conf_module = NULL;
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
index 3d71fd13a..56b11692c 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
@@ -41,7 +41,7 @@ e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_window_geometry_dialog")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_geometry")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    /* methods */
@@ -53,7 +53,7 @@ e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__)
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con,
 			     _("Window Geometry"),
-			     "E", "_config_window_geometry_dialog",
+			     "E", "windows/window_geometry",
 			     "preferences-window-manipulation", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_window_manipulation/e_mod_main.c b/src/modules/conf_window_manipulation/e_mod_main.c
index 01827fc40..6d4dfb564 100644
--- a/src/modules/conf_window_manipulation/e_mod_main.c
+++ b/src/modules/conf_window_manipulation/e_mod_main.c
@@ -30,7 +30,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_window_geometry_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "windows/window_geometry"))) e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "_config_window_stacking_dialog"))) e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "_config_window_maxpolicy_dialog"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("windows/window_geometry");
diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.c b/src/modules/conf_window_remembers/e_int_config_remembers.c
index 8ec8f8396..42301252e 100644
--- a/src/modules/conf_window_remembers/e_int_config_remembers.c
+++ b/src/modules/conf_window_remembers/e_int_config_remembers.c
@@ -22,7 +22,7 @@ e_int_config_remembers(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_remember_dialog")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_remembers")) return NULL;
 
    v = E_NEW(E_Config_Dialog_View, 1);
    v->create_cfdata = _create_data;
@@ -31,7 +31,7 @@ e_int_config_remembers(E_Container *con, const char *params __UNUSED__)
    v->basic.create_widgets = _basic_create;
 
    cfd = e_config_dialog_new(con, _("Window Remembers"), "E", 
-                             "_config_remember_dialog", 
+                             "windows/window_remembers", 
                              "preferences-desktop-window-remember", 0, v, NULL);
    e_dialog_resizable_set(cfd->dia, 1);
    return cfd;
diff --git a/src/modules/conf_window_remembers/e_mod_main.c b/src/modules/conf_window_remembers/e_mod_main.c
index d0feaa526..7312a82a7 100644
--- a/src/modules/conf_window_remembers/e_mod_main.c
+++ b/src/modules/conf_window_remembers/e_mod_main.c
@@ -27,7 +27,7 @@ e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
 
-   while ((cfd = e_config_dialog_get("E", "_config_remember_dialog")))
+   while ((cfd = e_config_dialog_get("E", "windows/window_remembers")))
      e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("windows/window_remembers");
    e_configure_registry_category_del("windows");
diff --git a/src/modules/conf_winlist/e_int_config_winlist.c b/src/modules/conf_winlist/e_int_config_winlist.c
index be09336c0..d5b6b130d 100644
--- a/src/modules/conf_winlist/e_int_config_winlist.c
+++ b/src/modules/conf_winlist/e_int_config_winlist.c
@@ -48,7 +48,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_winlist_dialog")) return NULL;
+   if (e_config_dialog_find("E", "advanced/window_list")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -60,7 +60,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Window List Settings"),
-			     "E", "_config_winlist_dialog",
+			     "E", "advanced/window_list",
 			     "preferences-winlist", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_winlist/e_mod_main.c b/src/modules/conf_winlist/e_mod_main.c
index 47aea2a81..7942701e7 100644
--- a/src/modules/conf_winlist/e_mod_main.c
+++ b/src/modules/conf_winlist/e_mod_main.c
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "_config_winlist_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "advanced/window_list"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("advanced/window_list");
    e_configure_registry_category_del("advanced");
    conf_module = NULL;
diff --git a/src/modules/dropshadow/e_mod_config.c b/src/modules/dropshadow/e_mod_config.c
index e81ecac22..ecbc2a25f 100644
--- a/src/modules/dropshadow/e_mod_config.c
+++ b/src/modules/dropshadow/e_mod_config.c
@@ -27,7 +27,7 @@ e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__)
    Dropshadow *ds;
 
    ds = dropshadow_mod->data;
-   if (e_config_dialog_find("E", "_config_dropshadow")) return NULL;
+   if (e_config_dialog_find("E", "appearance/dropshadow")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -38,7 +38,7 @@ e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__)
    snprintf(buf, sizeof(buf), "%s/e-module-dropshadow.edj", e_module_dir_get(ds->module));
    cfd = e_config_dialog_new(con,
 			     _("Dropshadow Settings"),
-			     "E", "_config_dropshadow",
+			     "E", "appearance/dropshadow",
 			     buf, 0, v, ds);
    ds->config_dialog = cfd;
    return cfd;
diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c
index ddf3afab6..2e5240798 100644
--- a/src/modules/fileman/e_mod_config.c
+++ b/src/modules/fileman/e_mod_config.c
@@ -85,7 +85,7 @@ e_int_config_fileman(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_fileman")) return NULL;
+   if (e_config_dialog_find("E", "fileman/fileman")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
@@ -94,7 +94,7 @@ e_int_config_fileman(E_Container *con, const char *params __UNUSED__)
    v->basic.check_changed = _basic_check_changed;
 
    cfd = e_config_dialog_new(con, _("Fileman Settings"), "E", 
-			     "_config_fileman",
+			     "fileman/fileman",
 			     "system-file-manager", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c
index e0e9cea54..d340b04ff 100644
--- a/src/modules/gadman/e_mod_config.c
+++ b/src/modules/gadman/e_mod_config.c
@@ -42,7 +42,7 @@ _config_gadman_module(E_Container *con, const char *params __UNUSED__)
    char buf[4096];
 
    /* check if config dialog exists ... */
-   if (e_config_dialog_find("E", "_config_gadman"))
+   if (e_config_dialog_find("E", "extensions/gadman"))
      return NULL;
 
    /* ... else create it */
@@ -56,7 +56,7 @@ _config_gadman_module(E_Container *con, const char *params __UNUSED__)
 
    snprintf(buf, sizeof(buf), "%s/e-module-gadman.edj", Man->module->dir);
    cfd = e_config_dialog_new(con, _("Gadgets Manager"),
-                             "E", "_config_gadman",
+                             "E", "extensions/gadman",
                              buf, 0, v, Man);
 
    Man->config_dialog = cfd;