diff --git a/src/modules/battery/e_mod_config.c b/src/modules/battery/e_mod_config.c
index f584d9ee7..146f3d2a4 100644
--- a/src/modules/battery/e_mod_config.c
+++ b/src/modules/battery/e_mod_config.c
@@ -27,16 +27,12 @@ static int           _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
 static Evas_Object   *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
 static int           _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
 
-Battery *b = NULL;
-
 void
 e_int_config_battery(E_Container *con, Battery *bat) 
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View v;
    
-   b = bat;
-   
    v.create_cfdata = _create_data;
    v.free_cfdata = _free_data;
    v.basic.apply_cfdata = _basic_apply_data;
@@ -44,11 +40,11 @@ e_int_config_battery(E_Container *con, Battery *bat)
    v.advanced.apply_cfdata = _advanced_apply_data;
    v.advanced.create_widgets = _advanced_create_widgets;
    
-   cfd = e_config_dialog_new(con, _("Battery Module"), NULL, 0, &v, bat);
+   cfd = e_config_dialog_new(con, _("Battery Configuration"), NULL, 0, &v, bat);
 }
 
 static void
-_fill_data(CFData *cfdata) 
+_fill_data(Battery *b, CFData *cfdata) 
 {
    cfdata->alarm_time = b->conf->alarm;
    cfdata->poll_time = b->conf->poll_time;
@@ -66,7 +62,11 @@ static void
 *_create_data(E_Config_Dialog *cfd) 
 {
    CFData *cfdata;
+   Battery *b;
+   
+   b = cfd->data;
    cfdata = E_NEW(CFData, 1);
+   _fill_data(b, cfdata);
    return cfdata;
 }
 
@@ -79,9 +79,11 @@ _free_data(E_Config_Dialog *cfd, CFData *cfdata)
 static Evas_Object
 *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
 {
+   Battery *b;
    Evas_Object *o, *of, *ob;
    
-   _fill_data(cfdata);
+   b = cfd->data;
+   _fill_data(b, cfdata);
    
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("Basic Settings"), 0);
@@ -94,6 +96,9 @@ static Evas_Object
 static int 
 _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
 {
+   Battery *b;
+   
+   b = cfd->data;
    e_border_button_bindings_ungrab_all();
    b->conf->poll_time = 10.0;   
    e_border_button_bindings_grab_all();
@@ -107,9 +112,11 @@ static Evas_Object
 *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
 {
    Evas_Object *o, *of, *ob, *ot;
+   Battery *b;
    
    /* Use Sliders for both cfg options */
-   _fill_data(cfdata);
+   b = cfd->data;
+   _fill_data(b, cfdata);
 
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_frametable_add(evas, _("Advanced Settings"), 1);
@@ -136,6 +143,9 @@ static Evas_Object
 static int 
 _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
 {
+   Battery *b;
+   
+   b = cfd->data;
    e_border_button_bindings_ungrab_all();
    
    b->conf->poll_time = cfdata->poll_time;
diff --git a/src/modules/clock/e_mod_config.c b/src/modules/clock/e_mod_config.c
index 1a794f781..0340d93e9 100644
--- a/src/modules/clock/e_mod_config.c
+++ b/src/modules/clock/e_mod_config.c
@@ -23,16 +23,12 @@ static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
 static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
 static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
 
-Clock_Face *clk = NULL;
-
 void 
 e_int_config_clock(E_Container *con, Clock_Face *c) 
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View v;
    
-   clk = c;
-   
    /* Dialog Methods */
    v.create_cfdata = _create_data;
    v.free_cfdata = _free_data;
@@ -46,7 +42,7 @@ e_int_config_clock(E_Container *con, Clock_Face *c)
 }
 
 static void 
-_fill_data(CFData *cfdata) 
+_fill_data(Clock_Face *clk, CFData *cfdata) 
 {
    cfdata->digital_style = clk->conf->digitalStyle;
 }
@@ -71,8 +67,10 @@ static Evas_Object
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
+   Clock_Face *c;
    
-   _fill_data(cfdata);
+   c = cfd->data;
+   _fill_data(c, cfdata);
    
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("General Settings"), 0);
@@ -90,6 +88,9 @@ static Evas_Object
 static int 
 _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 {
+   Clock_Face *clk;
+   
+   clk = cfd->data;
    e_border_button_bindings_ungrab_all();
    clk->conf->digitalStyle = cfdata->digital_style;
    e_border_button_bindings_grab_all();
diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index 1cafeecc6..56c30130a 100644
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -28,16 +28,12 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
 static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata);
 static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
 
-Pager *p = NULL;
-
 void 
 e_int_config_pager(E_Container *con, Pager *pager)
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View v;
    
-   p = pager;
-   
    v.create_cfdata = _create_data;
    v.free_cfdata = _free_data;
    v.basic.apply_cfdata = _basic_apply_data;
@@ -49,7 +45,7 @@ e_int_config_pager(E_Container *con, Pager *pager)
 }
 
 static void 
-_fill_data(CFData *cfdata) 
+_fill_data(Pager *p, CFData *cfdata) 
 {
    /* Name Pos, Show Popup, popup_speed */
    cfdata->name_pos = p->conf->deskname_pos;
@@ -87,8 +83,10 @@ static Evas_Object
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
+   Pager *p;
    
-   _fill_data(cfdata);
+   p = cfd->data;
+   _fill_data(p, cfdata);
    
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("General Settings"), 0);
@@ -119,6 +117,9 @@ static Evas_Object
 static int 
 _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 {
+   Pager *p;
+   
+   p = cfd->data;
    e_border_button_bindings_ungrab_all();
    p->conf->popup = cfdata->show_popup;
    
@@ -136,8 +137,10 @@ static Evas_Object
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
+   Pager *p;
    
-   _fill_data(cfdata);
+   p = cfd->data;
+   _fill_data(p, cfdata);
 
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("General Settings"), 0);
@@ -174,6 +177,9 @@ static Evas_Object
 static int 
 _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 {
+   Pager *p;
+   
+   p = cfd->data;
    e_border_button_bindings_ungrab_all();
    p->conf->popup = cfdata->show_popup;
    
diff --git a/src/modules/temperature/e_mod_config.c b/src/modules/temperature/e_mod_config.c
index 2e7290911..d8d7ad937 100644
--- a/src/modules/temperature/e_mod_config.c
+++ b/src/modules/temperature/e_mod_config.c
@@ -27,8 +27,6 @@ struct _Cfg_File_Data
    char *file;
 };
 
-Temperature *t = NULL;
-
 /* Protos */
 static Evas_Object   *_create_widgets(E_Config_Dialog *cfd, Evas *evas, Config *cfdata);
 static void          *_create_data(E_Config_Dialog *cfd);
@@ -44,8 +42,6 @@ e_int_config_temperature(E_Container *con, Temperature *temp)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View v;
    
-   t = temp;
-   
    v.create_cfdata = _create_data;
    v.free_cfdata = _free_data;
    v.basic.apply_cfdata = _basic_apply_data;
@@ -57,7 +53,7 @@ e_int_config_temperature(E_Container *con, Temperature *temp)
 }
 
 static void
-_fill_data(CFData *cfdata) 
+_fill_data(Temperature *t, CFData *cfdata) 
 {
    double p;
    
@@ -154,8 +150,11 @@ static Evas_Object
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
-
-   _fill_data(cfdata);
+   Temperature *t;
+   
+   t = cfd->data;
+   _fill_data(t, cfdata);
+   
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("Display Units"), 0);
    rg = e_widget_radio_group_new(&(cfdata->unit_method));
@@ -203,6 +202,9 @@ static Evas_Object
 static int
 _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
 {
+   Temperature *t;
+   
+   t = cfd->data;
    e_border_button_bindings_ungrab_all();
    if (cfdata->unit_method == 0) 
      {
@@ -253,8 +255,10 @@ static Evas_Object
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
-
-   _fill_data(cfdata);
+   Temperature *t;
+   
+   t = cfd->data;
+   _fill_data(t, cfdata);
    
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("Display Units"), 0);
@@ -328,6 +332,10 @@ static Evas_Object
 static int
 _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) 
 {
+   Temperature *t;
+   
+   t = cfd->data;
+   
    e_border_button_bindings_ungrab_all();
    if (cfdata->unit_method == 0) 
      {