diff --git a/src/modules/conf_display/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c
index 4c44568fb..267dc5247 100644
--- a/src/modules/conf_display/e_int_config_display.c
+++ b/src/modules/conf_display/e_int_config_display.c
@@ -282,21 +282,20 @@ static void
 _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) 
 {
    Eina_List *l, *ll;
+   Resolution *r;
 
    if (cfdata->surebox)
      _surebox_dialog_cb_delete(cfdata->surebox->dia->win);
 
-   for (l = cfdata->resolutions; l; l = l->next)
+   EINA_LIST_FREE(cfdata->resolutions, r)
      {
-	Resolution *r = l->data;
+	Ecore_X_Screen_Refresh_Rate *rt;
 
-	for (ll = r->rates; ll; ll = ll->next)
-	  E_FREE(ll->data);
+	EINA_LIST_FREE(r->rates, rt)
+	  E_FREE(rt);
 
-	r->rates = eina_list_free(r->rates);
 	E_FREE(r);
      }
-   cfdata->resolutions = eina_list_free(cfdata->resolutions);
    E_FREE(cfdata);
 }
 
@@ -309,11 +308,11 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
 
    r = e_widget_ilist_selected_get(cfdata->res_list);
    if (r < 0) return 0;
-   res = evas_list_nth(cfdata->resolutions, r);
+   res = eina_list_nth(cfdata->resolutions, r);
    if (!res) return 0;
    r = e_widget_ilist_selected_get(cfdata->rate_list);
    if (r < 0) return 0;
-   rt = evas_list_nth(res->rates, r);
+   rt = eina_list_nth(res->rates, r);
    if (!rt) return 0;
 
    return (e_config->display_res_restore != cfdata->restore) ||
@@ -338,9 +337,9 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    E_Manager *man;
 
    r = e_widget_ilist_selected_get(cfdata->res_list);
-   res = evas_list_nth(cfdata->resolutions, r);
+   res = eina_list_nth(cfdata->resolutions, r);
    r = e_widget_ilist_selected_get(cfdata->rate_list);
-   rate = evas_list_nth(res->rates, r);
+   rate = eina_list_nth(res->rates, r);
 
    man = e_manager_current_get();
 
@@ -370,7 +369,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      {
 	int rot;
 
-	cfdata->flip = cfdata->rotation;	
+	cfdata->flip = cfdata->rotation;
 	if (cfdata->flip_x)
 	  cfdata->flip = (cfdata->flip | ECORE_X_RANDR_FLIP_X);
 	if (cfdata->flip_y)
@@ -588,6 +587,7 @@ _load_rates(E_Config_Dialog_Data *cfdata)
    int r, k = 0, sel = 0;
    char buf[16];
    Evas *evas;
+   Resolution *res;
    Eina_List *l;
 
    evas = evas_object_evas_get(cfdata->rate_list);
@@ -598,34 +598,29 @@ _load_rates(E_Config_Dialog_Data *cfdata)
 
    r = e_widget_ilist_selected_get(cfdata->res_list);
 
-   for (l = cfdata->resolutions; l; l = l->next) 
-     {
-	Resolution *res = l->data;
+   EINA_LIST_FOREACH(cfdata->resolutions, l, res)
+     if (res->id == r)
+       {
+	  Ecore_X_Screen_Refresh_Rate *rt;
+	  Eina_List *ll;
 
-	if (res->id == r)
-	  {
-	     Eina_List *ll;
+	  EINA_LIST_FOREACH(res->rates, ll, rt)
+	    {
+	       Evas_Object *ob = NULL;
 
-	     for (ll = res->rates; ll; ll = ll->next)
-	       {
-		  Ecore_X_Screen_Refresh_Rate *rt;
-		  Evas_Object *ob = NULL;
+	       snprintf(buf, sizeof(buf), "%i Hz", rt->rate);
 
-		  rt = ll->data;
-		  snprintf(buf, sizeof(buf), "%i Hz", rt->rate);
-
-		  if (rt->rate == cfdata->orig_rate.rate)
-		    {
-		       ob = edje_object_add(evas);
-		       e_util_edje_icon_set(ob, "enlightenment/check");
-		       sel = k;
-		    }
-		  e_widget_ilist_append(cfdata->rate_list, ob, buf, NULL, NULL, NULL);
-		  k++;
-	       }
-	     break;
-	  }
-     }   
+	       if (rt->rate == cfdata->orig_rate.rate)
+		 {
+		    ob = edje_object_add(evas);
+		    e_util_edje_icon_set(ob, "enlightenment/check");
+		    sel = k;
+		 }
+	       e_widget_ilist_append(cfdata->rate_list, ob, buf, NULL, NULL, NULL);
+	       k++;
+	    }
+	  break;
+       }
 
    e_widget_ilist_go(cfdata->rate_list);
    e_widget_ilist_selected_set(cfdata->rate_list, sel);
diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c
index 537a3f28a..adc2f2d01 100644
--- a/src/modules/conf_profiles/e_int_config_profiles.c
+++ b/src/modules/conf_profiles/e_int_config_profiles.c
@@ -206,7 +206,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
         free(prof);
         if (desk) efreet_desktop_free(desk);
      }
-   if (profiles) evas_list_free(profiles);
+   if (profiles) eina_list_free(profiles);
    if (selected >= 0)
      e_widget_ilist_selected_set(cfdata->o_list, selected);   
    e_widget_min_size_set(cfdata->o_list, 155, 250);
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 730d5f325..0895f444a 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -1277,18 +1277,18 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 		  if (ici->link)
 		    {
 		      f = e_fm_mime_filename_get(ici->link);
-		      eina_hash_del(mimes, f, (void *)1);
 		      if (!mimes)
 			mimes = eina_hash_string_superfast_new(NULL);
+		      eina_hash_del(mimes, f, (void *)1);
 		      eina_hash_direct_add(mimes, f, (void *)1);
 		    }
 		  else
 		    {
 		      snprintf(buf, sizeof(buf), "%s/%s",
 			       e_fm2_real_path_get(fwin->fm_obj), ici->file);
-		      eina_hash_del(mimes, ici->mime, (void *)1);
 		      if (!mimes)
 			mimes = eina_hash_string_superfast_new(NULL);
+		      eina_hash_del(mimes, ici->mime, (void *)1);
 		      eina_hash_direct_add(mimes, ici->mime, (void *)1);
 		    }
 	       }
diff --git a/src/modules/illume/e_appwin.c b/src/modules/illume/e_appwin.c
index 6c77e0258..fdf91b669 100644
--- a/src/modules/illume/e_appwin.c
+++ b/src/modules/illume/e_appwin.c
@@ -169,7 +169,7 @@ e_appwin_show(E_Appwin *esw)
 	ent->appwin = esw;
 	ent->border = bd;
 	ent->icon = ic;
-	esw->borders = evas_list_append(esw->borders, ent);
+	esw->borders = eina_list_append(esw->borders, ent);
 	e_widget_ilist_append(esw->ilist_obj, ic, title, _e_appwin_cb_item_sel, ent, NULL);
 	if (bd == e_border_focused_get()) selnum = i;
 	i++;
diff --git a/src/modules/illume/e_slipwin.c b/src/modules/illume/e_slipwin.c
index 892601bf0..4a63d9e31 100644
--- a/src/modules/illume/e_slipwin.c
+++ b/src/modules/illume/e_slipwin.c
@@ -157,7 +157,7 @@ e_slipwin_show(E_Slipwin *esw)
 	ent->slipwin = esw;
 	ent->border = bd;
 	ent->icon = ic;
-	esw->borders = evas_list_append(esw->borders, ent);
+	esw->borders = eina_list_append(esw->borders, ent);
 	e_widget_ilist_append(esw->ilist_obj, ic, title, _e_slipwin_cb_item_sel, ent, NULL);
 	if (bd == e_border_focused_get()) selnum = i;
 	i++;
diff --git a/src/modules/illume/e_syswin.c b/src/modules/illume/e_syswin.c
index 85c0e5ea7..80db84469 100644
--- a/src/modules/illume/e_syswin.c
+++ b/src/modules/illume/e_syswin.c
@@ -157,7 +157,7 @@ e_syswin_show(E_Syswin *esw)
 	ent->syswin = esw;
 	ent->border = bd;
 	ent->icon = ic;
-	esw->borders = evas_list_append(esw->borders, ent);
+	esw->borders = eina_list_append(esw->borders, ent);
 	e_widget_ilist_append(esw->ilist_obj, ic, title, _e_syswin_cb_item_sel, ent, NULL);
 	if (bd == e_border_focused_get()) selnum = i;
 	i++;
diff --git a/src/modules/wizard/page_020.c b/src/modules/wizard/page_020.c
index bb6cf132e..23864d15d 100644
--- a/src/modules/wizard/page_020.c
+++ b/src/modules/wizard/page_020.c
@@ -108,7 +108,7 @@ wizard_page_show(E_Wizard_Page *pg)
 	free(prof);
         if (desk) efreet_desktop_free(desk);
      }
-   if (profiles) evas_list_free(profiles);
+   if (profiles) eina_list_free(profiles);
 
    e_widget_ilist_go(ob);
    e_widget_ilist_thaw(ob);
diff --git a/src/modules/wizard/page_030.c b/src/modules/wizard/page_030.c
index 8569fe89c..b6f7132ca 100644
--- a/src/modules/wizard/page_030.c
+++ b/src/modules/wizard/page_030.c
@@ -71,7 +71,9 @@ wizard_page_show(E_Wizard_Page *pg)
 {
    Evas_Object *o, *of, *ob;
    Eina_List *l;
-   int i, sel = -1;
+   char *file;
+   int sel = -1;
+   int i = 0;
    
    o = e_widget_list_add(pg->evas, 1, 0);
    e_wizard_title_set(_("Menus"));
@@ -108,12 +110,12 @@ wizard_page_show(E_Wizard_Page *pg)
 	e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale);
 	
 	e_widget_ilist_freeze(ob);
-	for (i = 0, l = menus; l; l = l->next, i++)
+
+	EINA_LIST_FREE(menus, file)
 	  {
-	     char buf[PATH_MAX], *file, *p, *p2, *tlabel, *tdesc;
+	     char buf[PATH_MAX], *p, *p2, *tlabel, *tdesc;
 	     const char *label;
-	     
-	     file = l->data;
+
 	     label = file;
 	     tlabel = NULL;
 	     tdesc = NULL;
@@ -169,9 +171,8 @@ wizard_page_show(E_Wizard_Page *pg)
 	     if (tlabel) free(tlabel);
 	     if (tdesc) free(tdesc);
 	     free(file);
+	     i++;
 	  }
-	evas_list_free(menus);
-	menus = NULL;
 	e_widget_ilist_go(ob);
 	e_widget_ilist_thaw(ob);