elm genlist: Fixed flipmode cache issue. Renamed nocache to nocache_once and adopted...
[framework/uifw/elementary.git] / src / lib / elm_genlist.c
index b9c7c92..5006cd7 100644 (file)
 #include <assert.h>
-
+#include <fnmatch.h>
 #include <Elementary.h>
 #include <Elementary_Cursor.h>
 #include "elm_priv.h"
 #include "els_scroller.h"
+#include "elm_gen_common.h"
 
-#define SWIPE_MOVES         12
 #define MAX_ITEMS_PER_BLOCK 32
 #define REORDER_EFFECT_TIME 0.5
 
-typedef struct _Widget_Data Widget_Data;
+#define ELM_GEN_SETUP(wd) \
+   (wd)->calc_cb = (Ecore_Cb)_calc_job; \
+   (wd)->clear_cb = (Ecore_Cb)_clear_cb; \
+   (wd)->sizing_cb = (Ecore_Cb)_sizing_eval
+
+#define ELM_GEN_ITEM_SETUP(it) \
+   (it)->del_cb = (Ecore_Cb)_item_del; \
+   (it)->highlight_cb = (Ecore_Cb)_item_highlight; \
+   (it)->unsel_cb = (Ecore_Cb)_item_unselect; \
+   (it)->unhighlight_cb = (Ecore_Cb)_item_unhighlight; \
+   (it)->unrealize_cb = (Ecore_Cb)_item_unrealize_cb
+
+#define ELM_GENLIST_CHECK_ITC_VER(itc) \
+   do \
+     { \
+        if (!itc) \
+          { \
+             ERR("Genlist_Item_Class(itc) is NULL"); \
+             return; \
+          } \
+        if (itc->version != ELM_GENLIST_ITEM_CLASS_VERSION) \
+          { \
+             ERR("Genlist_Item_Class version mismatched! required = (%d), current  = (%d)", itc->version, ELM_GENLIST_ITEM_CLASS_VERSION); \
+             return; \
+          } \
+     } \
+   while(0)
+
 typedef struct _Item_Block  Item_Block;
-typedef struct _Pan         Pan;
 typedef struct _Item_Cache  Item_Cache;
 
-struct _Elm_Genlist_Item
+struct Elm_Gen_Item_Type
 {
-   Elm_Widget_Item               base;
-   EINA_INLIST;
-   Widget_Data                  *wd;
-   const Elm_Genlist_Item_Class *itc;
-   Elm_Genlist_Item             *parent;
+   Elm_Gen_Item                 *it;
    Item_Block                   *block;
    Eina_List                    *items;
-   Evas_Coord                    x, y, w, h, minw, minh;
-   Elm_Genlist_Item             *group_item;
-   Elm_Genlist_Item_Flags        flags;
-   struct
-   {
-      Evas_Smart_Cb func;
-      const void   *data;
-   } func;
-
-   Evas_Object                  *spacer;
-   Eina_List                    *labels, *icons, *states, *icon_objs;
-   Eina_List                    *mode_labels, *mode_icons, *mode_states, *mode_icon_objs;
-   Ecore_Timer                  *long_timer;
+   Evas_Coord                    w, h, minw, minh;
+   Elm_Gen_Item                 *group_item;
+   Elm_Genlist_Item_Type        type;
+   Eina_List                    *mode_texts, *mode_contents, *mode_states, *mode_content_objs;
+   Eina_List                    *edit_texts, *edit_contents, *edit_states, *edit_content_objs;
    Ecore_Timer                  *swipe_timer;
-   Evas_Coord                    dx, dy;
    Evas_Coord                    scrl_x, scrl_y, old_scrl_y;
 
-   Elm_Genlist_Item             *rel;
+   Elm_Gen_Item                 *rel;
    Evas_Object                  *mode_view;
-
-   struct
-   {
-      const void                 *data;
-      Elm_Tooltip_Item_Content_Cb content_cb;
-      Evas_Smart_Cb               del_cb;
-      const char                 *style;
-      Eina_Bool                   free_size : 1;
-   } tooltip;
-
-   const char                   *mouse_cursor;
-
-   int                           relcount;
-   int                           walking;
    int                           expanded_depth;
    int                           order_num_in;
 
    Eina_Bool                     before : 1;
 
-   Eina_Bool                     want_unrealize : 1;
    Eina_Bool                     want_realize : 1;
-   Eina_Bool                     realized : 1;
-   Eina_Bool                     selected : 1;
-   Eina_Bool                     highlighted : 1;
    Eina_Bool                     expanded : 1;
-   Eina_Bool                     disabled : 1;
-   Eina_Bool                     display_only : 1;
    Eina_Bool                     mincalcd : 1;
    Eina_Bool                     queued : 1;
    Eina_Bool                     showme : 1;
-   Eina_Bool                     delete_me : 1;
-   Eina_Bool                     down : 1;
-   Eina_Bool                     dragging : 1;
    Eina_Bool                     updateme : 1;
-   Eina_Bool                     nocache : 1;
+   Eina_Bool                     nocache : 1; /* do not use cache for this item */
+   Eina_Bool                     nocache_once : 1; /* do not use cache for this item only once */
    Eina_Bool                     stacking_even : 1;
    Eina_Bool                     nostacking : 1;
    Eina_Bool                     move_effect_enabled : 1;
-};
-
-struct _Widget_Data
-{
-   Eina_Inlist_Sorted_State *state;
-   Evas_Object      *obj; /* the genlist object */
-   Evas_Object      *scr; /* a smart scroller object which is used internally in genlist */
-   Evas_Object      *pan_smart; /* "elm_genlist_pan" evas smart object. this is an extern pan of smart scroller(scr). */
-   Eina_Inlist      *items; /* inlist of all items */
-   Eina_Inlist      *blocks; /* inlist of all blocks. a block consists of a certain number of items. maximum number of items in a block is 'max_items_per_block'. */
-   Eina_List        *group_items; /* list of groups index items */
-   Pan              *pan; /* pan_smart object's smart data */
-   Evas_Coord        pan_x, pan_y, reorder_old_pan_y, w, h, minw, minh, realminw, prev_viewport_w;
-   Ecore_Job        *calc_job, *update_job;
-   Ecore_Idle_Enterer *queue_idle_enterer;
-   Ecore_Idler        *must_recalc_idler;
-   Eina_List        *queue, *selected;
-   Elm_Genlist_Item *show_item, *anchor_item, *mode_item, *reorder_rel, *expanded_item;
-   Elm_Genlist_Item *last_selected_item; /* the last selected it. */
-   Elm_Genlist_Item *reorder_it; /* an it which is longpressed and in the moving state. */
-   Eina_Inlist      *item_cache; /* an inlist of edje object it cache. */
-   Evas_Coord        anchor_y;
-   Evas_Coord        reorder_start_y; /* reorder it's initial y coordinate in the pan. */
-   Elm_List_Mode     mode;
-   Ecore_Timer      *multi_timer, *scr_hold_timer;
-   Ecore_Animator   *reorder_move_animator;
-   const char       *mode_type;
-   unsigned int      start_time;
-   Evas_Coord        prev_x, prev_y, prev_mx, prev_my;
-   Evas_Coord        cur_x, cur_y, cur_mx, cur_my;
-   Eina_Bool         mouse_down : 1;
-   Eina_Bool         multi_down : 1;
-   Eina_Bool         multi_timeout : 1;
-   Eina_Bool         multitouched : 1;
-   Eina_Bool         on_hold : 1;
-   Eina_Bool         multi : 1;
-   Eina_Bool         always_select : 1;
-   Eina_Bool         longpressed : 1;
-   Eina_Bool         wasselected : 1;
-   Eina_Bool         no_select : 1;
-   Eina_Bool         bring_in : 1;
-   Eina_Bool         compress : 1;
-   Eina_Bool         height_for_width : 1;
-   Eina_Bool         homogeneous : 1;
-   Eina_Bool         clear_me : 1;
-   Eina_Bool         swipe : 1;
-   Eina_Bool         reorder_mode : 1;
-   Eina_Bool         reorder_pan_move : 1;
-   Eina_Bool         auto_scroll_enabled : 1;
-   Eina_Bool         pan_resized : 1;
-   struct
-   {
-      Evas_Coord x, y;
-   } history[SWIPE_MOVES];
-   int               multi_device;
-   int               item_cache_count;
-   int               item_cache_max; /* maximum number of cached items */
-   int               movements;
-   int               walking;
-   int               item_width;
-   int               item_height;
-   int               group_item_width;
-   int               group_item_height;
-   int               max_items_per_block; /* maximum number of items per block */
-   double            longpress_timeout; /* longpress timeout. this value comes from _elm_config by default. this can be changed by elm_genlist_longpress_timeout_set() */
+   Eina_Bool                     edit_mode_item_realized : 1;
 };
 
 struct _Item_Block
@@ -156,6 +83,10 @@ struct _Item_Block
    Widget_Data *wd;
    Eina_List   *items;
    Evas_Coord   x, y, w, h, minw, minh;
+   int          position;
+   int          item_position_stamp;
+
+   Eina_Bool    position_update : 1;
    Eina_Bool    want_unrealize : 1;
    Eina_Bool    realized : 1;
    Eina_Bool    changed : 1;
@@ -171,22 +102,12 @@ struct _Item_Cache
    Evas_Object *base_view, *spacer;
 
    const char  *item_style; // it->itc->item_style
-   Eina_Bool    tree : 1; // it->flags & ELM_GENLIST_ITEM_SUBITEMS
+   Eina_Bool    tree : 1; // it->group
    Eina_Bool    compress : 1; // it->wd->compress
 
    Eina_Bool    selected : 1; // it->selected
    Eina_Bool    disabled : 1; // it->disabled
-   Eina_Bool    expanded : 1; // it->expanded
-};
-
-#define ELM_GENLIST_ITEM_FROM_INLIST(it) \
-  ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Genlist_Item) : NULL)
-
-struct _Pan
-{
-   Evas_Object_Smart_Clipped_Data __clipped_data;
-   Widget_Data                   *wd;
-   Ecore_Job                     *resize_job;
+   Eina_Bool    expanded : 1; // it->item->expanded
 };
 
 static const char *widtype = NULL;
@@ -198,11 +119,10 @@ static void      _theme_hook(Evas_Object *obj);
 static void      _show_region_hook(void        *data,
                                    Evas_Object *obj);
 static void      _sizing_eval(Evas_Object *obj);
-static void      _item_realize(Elm_Genlist_Item *it,
-                               int               in,
-                               Eina_Bool         calc);
-static void      _item_unrealize(Elm_Genlist_Item *it,
-                                 Eina_Bool         calc);
+static void      _item_realize(Elm_Gen_Item *it,
+                               int           in,
+                               Eina_Bool     calc);
+static void      _item_unrealize_cb(Elm_Gen_Item *it);
 static void      _item_block_unrealize(Item_Block *itb);
 static void      _calc_job(void *data);
 static void      _on_focus_hook(void        *data,
@@ -216,27 +136,35 @@ static Eina_Bool _event_hook(Evas_Object       *obj,
                              Evas_Callback_Type type,
                              void              *event_info);
 static void      _signal_emit_hook(Evas_Object *obj,
-                                   const char *emission,
-                                   const char *source);
+                                   const char  *emission,
+                                   const char  *source);
 static Eina_Bool _deselect_all_items(Widget_Data *wd);
 static void      _pan_calculate(Evas_Object *obj);
 static void      _pan_max_get(Evas_Object *obj,
                               Evas_Coord  *x,
                               Evas_Coord  *y);
-static void      _item_position(Elm_Genlist_Item *it,
-                                Evas_Object      *obj,
-                                Evas_Coord        it_x,
-                                Evas_Coord        it_y);
-static void      _mode_item_realize(Elm_Genlist_Item *it);
-static void      _mode_item_unrealize(Elm_Genlist_Item *it);
-static void      _item_mode_set(Elm_Genlist_Item *it);
+static void      _item_position(Elm_Gen_Item *it,
+                                Evas_Object  *obj,
+                                Evas_Coord    it_x,
+                                Evas_Coord    it_y);
+static void      _mode_item_realize(Elm_Gen_Item *it);
+static void      _mode_item_unrealize(Elm_Gen_Item *it);
+static void      _item_mode_set(Elm_Gen_Item *it);
 static void      _item_mode_unset(Widget_Data *wd);
+static void      _edit_mode_item_position(Elm_Gen_Item *it, int itx, int ity);
+static void      _edit_mode_item_realize(Elm_Gen_Item *it, Eina_Bool effect_on);
+static void      _edit_mode_item_unrealize(Elm_Gen_Item *it);
 static void      _group_items_recalc(void *data);
-static void      _item_move_after(Elm_Genlist_Item *it,
-                                  Elm_Genlist_Item *after);
-static void      _item_move_before(Elm_Genlist_Item *it,
-                                   Elm_Genlist_Item *before);
+static void      _item_move_after(Elm_Gen_Item *it,
+                                  Elm_Gen_Item *after);
+static void      _item_move_before(Elm_Gen_Item *it,
+                                   Elm_Gen_Item *before);
 static void      _item_auto_scroll(Widget_Data *wd);
+static void      _elm_genlist_clear(Evas_Object *obj,
+                                    Eina_Bool    standby);
+static void      _pan_child_size_get(Evas_Object *obj,
+                                     Evas_Coord  *w,
+                                     Evas_Coord  *h);
 
 static Evas_Smart_Class _pan_sc = EVAS_SMART_CLASS_INIT_VERSION;
 
@@ -261,10 +189,6 @@ static const char SIG_SCROLL_ANIM_START[] = "scroll,anim,start";
 static const char SIG_SCROLL_ANIM_STOP[] = "scroll,anim,stop";
 static const char SIG_SCROLL_DRAG_START[] = "scroll,drag,start";
 static const char SIG_SCROLL_DRAG_STOP[] = "scroll,drag,stop";
-static const char SIG_SCROLL_EDGE_TOP[] = "scroll,edge,top"; // TODO : remove this 
-static const char SIG_SCROLL_EDGE_BOTTOM[] = "scroll,edge,bottom"; // TODO : remove this 
-static const char SIG_SCROLL_EDGE_LEFT[] = "scroll,edge,left"; // TODO : remove this 
-static const char SIG_SCROLL_EDGE_RIGHT[] = "scroll,edge,right"; // TODO : remove this 
 static const char SIG_EDGE_TOP[] = "edge,top";
 static const char SIG_EDGE_BOTTOM[] = "edge,bottom";
 static const char SIG_EDGE_LEFT[] = "edge,left";
@@ -276,6 +200,8 @@ static const char SIG_MULTI_SWIPE_DOWN[] = "multi,swipe,down";
 static const char SIG_MULTI_PINCH_OUT[] = "multi,pinch,out";
 static const char SIG_MULTI_PINCH_IN[] = "multi,pinch,in";
 static const char SIG_SWIPE[] = "swipe";
+static const char SIG_MOVED[] = "moved";
+static const char SIG_INDEX_UPDATE[] = "index,update";
 
 static const Evas_Smart_Cb_Description _signals[] = {
    {SIG_CLICKED_DOUBLE, ""},
@@ -299,10 +225,6 @@ static const Evas_Smart_Cb_Description _signals[] = {
    {SIG_SCROLL_ANIM_STOP, ""},
    {SIG_SCROLL_DRAG_START, ""},
    {SIG_SCROLL_DRAG_STOP, ""},
-   {SIG_SCROLL_EDGE_TOP, ""},
-   {SIG_SCROLL_EDGE_BOTTOM, ""},
-   {SIG_SCROLL_EDGE_LEFT, ""},
-   {SIG_SCROLL_EDGE_RIGHT, ""},
    {SIG_EDGE_TOP, ""},
    {SIG_EDGE_BOTTOM, ""},
    {SIG_EDGE_LEFT, ""},
@@ -314,11 +236,49 @@ static const Evas_Smart_Cb_Description _signals[] = {
    {SIG_MULTI_PINCH_OUT, ""},
    {SIG_MULTI_PINCH_IN, ""},
    {SIG_SWIPE, ""},
+   {SIG_MOVED, ""},
    {NULL, NULL}
 };
 
-static Eina_Compare_Cb _elm_genlist_item_compare_cb;
-static Eina_Compare_Cb _elm_genlist_item_compare_data_cb;
+/* TEMPORARY */
+#undef ELM_CHECK_WIDTYPE
+#define ELM_CHECK_WIDTYPE(obj, widtype) \
+   if ((!obj) || (!elm_genlist_type_check((obj), __func__))) return
+#undef ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN
+#define ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, ...)                \
+   ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, __VA_ARGS__); \
+   ELM_CHECK_WIDTYPE(WIDGET((it)), widtype) __VA_ARGS__;
+
+static const char *_gengrid = NULL;
+static const char *_genlist = NULL;
+
+/* THIS FUNCTION IS HACKY AND TEMPORARY!!! */
+Eina_Bool
+elm_genlist_type_check(const Evas_Object *obj,
+                       const char        *func)
+{
+   const char *provided, *expected = "(unknown)";
+   static int abort_on_warn = -1;
+   provided = elm_widget_type_get(obj);
+   if (!_genlist) _genlist = eina_stringshare_add("genlist");
+   if (!_gengrid) _gengrid = eina_stringshare_add("gengrid");
+   if (EINA_LIKELY(provided == _genlist) || EINA_LIKELY(provided == _gengrid))
+     return EINA_TRUE;
+   if ((!provided) || (!provided[0]))
+     {
+        provided = evas_object_type_get(obj);
+        if ((!provided) || (!provided[0]))
+          provided = "(unknown)";
+     }
+   ERR("Passing Object: %p in function: %s, of type: '%s' when expecting type: '%s'", obj, func, provided, expected);
+   if (abort_on_warn == -1)
+     {
+        if (getenv("ELM_ERROR_ABORT")) abort_on_warn = 1;
+        else abort_on_warn = 0;
+     }
+   if (abort_on_warn == 1) abort();
+   return EINA_FALSE;
+}
 
 static Eina_Bool
 _event_hook(Evas_Object       *obj,
@@ -335,7 +295,7 @@ _event_hook(Evas_Object       *obj,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
    if (elm_widget_disabled_get(obj)) return EINA_FALSE;
 
-   Elm_Genlist_Item *it = NULL;
+   Elm_Object_Item *it = NULL;
    Evas_Coord x = 0;
    Evas_Coord y = 0;
    Evas_Coord step_x = 0;
@@ -386,6 +346,7 @@ _event_hook(Evas_Object       *obj,
      {
         it = elm_genlist_first_item_get(obj);
         elm_genlist_item_bring_in(it);
+        elm_genlist_item_selected_set(it, EINA_TRUE);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         return EINA_TRUE;
      }
@@ -393,6 +354,7 @@ _event_hook(Evas_Object       *obj,
      {
         it = elm_genlist_last_item_get(obj);
         elm_genlist_item_bring_in(it);
+        elm_genlist_item_selected_set(it, EINA_TRUE);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         return EINA_TRUE;
      }
@@ -417,14 +379,14 @@ _event_hook(Evas_Object       *obj,
         return EINA_TRUE;
      }
    else if (((!strcmp(ev->keyname, "Return")) ||
-            (!strcmp(ev->keyname, "KP_Enter")) ||
-            (!strcmp(ev->keyname, "space")))
-           && (!wd->multi) && (wd->selected))
+             (!strcmp(ev->keyname, "KP_Enter")) ||
+             (!strcmp(ev->keyname, "space")))
+            && (!wd->multi) && (wd->selected))
      {
         it = elm_genlist_selected_item_get(obj);
         elm_genlist_item_expanded_set(it,
                                       !elm_genlist_item_expanded_get(it));
-        evas_object_smart_callback_call(it->base.widget, SIG_ACTIVATED, it);
+        evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it);
      }
    else return EINA_FALSE;
 
@@ -454,7 +416,7 @@ _item_multi_select_up(Widget_Data *wd)
    if (!wd->selected) return EINA_FALSE;
    if (!wd->multi) return EINA_FALSE;
 
-   Elm_Genlist_Item *prev = elm_genlist_item_prev_get(wd->last_selected_item);
+   Elm_Object_Item *prev = elm_genlist_item_prev_get(wd->last_selected_item);
    if (!prev) return EINA_TRUE;
 
    if (elm_genlist_item_selected_get(prev))
@@ -477,7 +439,8 @@ _item_multi_select_down(Widget_Data *wd)
    if (!wd->selected) return EINA_FALSE;
    if (!wd->multi) return EINA_FALSE;
 
-   Elm_Genlist_Item *next = elm_genlist_item_next_get(wd->last_selected_item);
+   Elm_Object_Item *next;
+   next = elm_genlist_item_next_get(wd->last_selected_item);
    if (!next) return EINA_TRUE;
 
    if (elm_genlist_item_selected_get(next))
@@ -497,42 +460,42 @@ _item_multi_select_down(Widget_Data *wd)
 static Eina_Bool
 _item_single_select_up(Widget_Data *wd)
 {
-   Elm_Genlist_Item *prev;
+   Elm_Gen_Item *prev;
    if (!wd->selected)
      {
-        prev = ELM_GENLIST_ITEM_FROM_INLIST(wd->items->last);
-        while ((prev) && (prev->delete_me))
-          prev = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
+        prev = ELM_GEN_ITEM_FROM_INLIST(wd->items->last);
+        while ((prev) && (prev->generation < wd->generation))
+          prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
      }
-   else prev = elm_genlist_item_prev_get(wd->last_selected_item);
+   else prev = (Elm_Gen_Item *) elm_genlist_item_prev_get(wd->last_selected_item);
 
    if (!prev) return EINA_FALSE;
 
    _deselect_all_items(wd);
 
-   elm_genlist_item_selected_set(prev, EINA_TRUE);
-   elm_genlist_item_show(prev);
+   elm_genlist_item_selected_set((Elm_Object_Item *) prev, EINA_TRUE);
+   elm_genlist_item_show((Elm_Object_Item *) prev);
    return EINA_TRUE;
 }
 
 static Eina_Bool
 _item_single_select_down(Widget_Data *wd)
 {
-   Elm_Genlist_Item *next;
+   Elm_Gen_Item *next;
    if (!wd->selected)
      {
-        next = ELM_GENLIST_ITEM_FROM_INLIST(wd->items);
-        while ((next) && (next->delete_me))
-          next = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
+        next = ELM_GEN_ITEM_FROM_INLIST(wd->items);
+        while ((next) && (next->generation < wd->generation))
+          next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
      }
-   else next = elm_genlist_item_next_get(wd->last_selected_item);
+   else next = (Elm_Gen_Item *) elm_genlist_item_next_get(wd->last_selected_item);
 
    if (!next) return EINA_FALSE;
 
    _deselect_all_items(wd);
 
-   elm_genlist_item_selected_set(next, EINA_TRUE);
-   elm_genlist_item_show(next);
+   elm_genlist_item_selected_set((Elm_Object_Item *) next, EINA_TRUE);
+   elm_genlist_item_show((Elm_Object_Item *) next);
    return EINA_TRUE;
 }
 
@@ -577,6 +540,7 @@ _del_pre_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
+   if (wd->edit_mode) elm_genlist_edit_mode_set(wd->obj, EINA_FALSE);
    elm_genlist_clear(obj);
    evas_object_del(wd->pan_smart);
    wd->pan_smart = NULL;
@@ -611,11 +575,11 @@ _theme_hook(Evas_Object *obj)
    EINA_INLIST_FOREACH(wd->blocks, itb)
      {
         Eina_List *l;
-        Elm_Genlist_Item *it;
+        Elm_Gen_Item *it;
 
         if (itb->realized) _item_block_unrealize(itb);
         EINA_LIST_FOREACH(itb->items, l, it)
-          it->mincalcd = EINA_FALSE;
+          it->item->mincalcd = EINA_FALSE;
 
         itb->changed = EINA_TRUE;
      }
@@ -675,14 +639,11 @@ _sizing_eval(Evas_Object *obj)
      }
    if (wd->mode == ELM_LIST_LIMIT)
      {
-        Evas_Coord vmw, vmh, vw, vh;
+        Evas_Coord vmw, vmh;
 
         minw = wd->realminw;
         maxw = -1;
-        elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
-        if ((minw > 0) && (vw < minw)) vw = minw;
-        else if ((maxw > 0) && (vw > maxw))
-          vw = maxw;
+        elm_smart_scroller_child_viewport_size_get(wd->scr, &vmw, &vmh);
         edje_object_size_min_calc
           (elm_smart_scroller_edje_object_get(wd->scr), &vmw, &vmh);
         minw = vmw + minw;
@@ -711,44 +672,78 @@ _signal_emit_hook(Evas_Object *obj,
 }
 
 static void
-_item_highlight(Elm_Genlist_Item *it)
+_item_highlight(Elm_Gen_Item *it)
 {
    const char *selectraise;
-   if ((it->wd->no_select) || (it->delete_me) || (it->highlighted) ||
-       (it->disabled) || (it->display_only) || (it->mode_view))
+   if ((it->wd->no_select) || (it->generation < it->wd->generation) ||
+       (it->highlighted) || elm_widget_item_disabled_get(it) ||
+       (it->display_only) || (it->item->mode_view))
      return;
-   edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
-   selectraise = edje_object_data_get(it->base.view, "selectraise");
+   edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
+   if (it->edit_obj) edje_object_signal_emit(it->edit_obj, "elm,state,selected", "elm");
+   selectraise = edje_object_data_get(VIEW(it), "selectraise");
    if ((selectraise) && (!strcmp(selectraise, "on")))
      {
-        evas_object_raise(it->base.view);
-        if ((it->group_item) && (it->group_item->realized))
-          evas_object_raise(it->group_item->base.view);
+        if (it->edit_obj) evas_object_raise(it->edit_obj);
+        else evas_object_raise(VIEW(it));
+        if ((it->item->group_item) && (it->item->group_item->realized))
+          evas_object_raise(it->item->VIEW(group_item));
      }
    it->highlighted = EINA_TRUE;
 }
 
 static void
-_item_unhighlight(Elm_Genlist_Item *it)
+_item_unhighlight(Elm_Gen_Item *it)
+{
+   if ((it->generation < it->wd->generation) || (!it->highlighted)) return;
+   edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
+   if (it->edit_obj) edje_object_signal_emit(it->edit_obj, "elm,state,unselected", "elm");
+   if (!it->item->nostacking)
+     {
+       if ((it->item->order_num_in & 0x1) ^ it->item->stacking_even)
+         {
+             if (it->edit_obj) evas_object_lower(it->edit_obj);
+             else evas_object_lower(VIEW(it));
+         }
+       else
+         {
+             if (it->edit_obj) evas_object_raise(it->edit_obj);
+             else evas_object_raise(VIEW(it));
+         }
+     }
+   it->highlighted = EINA_FALSE;
+}
+
+static void
+_item_block_position_update(Eina_Inlist *list, int idx)
 {
-   const char *stacking, *selectraise;
-   if ((it->delete_me) || (!it->highlighted)) return;
-   edje_object_signal_emit(it->base.view, "elm,state,unselected", "elm");
-   stacking = edje_object_data_get(it->base.view, "stacking");
-   selectraise = edje_object_data_get(it->base.view, "selectraise");
-   if (!it->nostacking)
+   Item_Block *tmp;
+
+   EINA_INLIST_FOREACH(list, tmp)
      {
-       if ((it->order_num_in & 0x1) ^ it->stacking_even) evas_object_lower(it->base.view);
-       else evas_object_raise(it->base.view);
+        tmp->position = idx++;
+        tmp->position_update = EINA_TRUE;
+     }
+}
+
+static void
+_item_position_update(Eina_List *list, int idx)
+{
+   Elm_Gen_Item *it;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(list, l, it)
+     {
+        it->position = idx++;
+        it->position_update = EINA_TRUE;
      }
-   it->highlighted = EINA_FALSE;
 }
 
 static void
-_item_block_del(Elm_Genlist_Item *it)
+_item_block_del(Elm_Gen_Item *it)
 {
    Eina_Inlist *il;
-   Item_Block *itb = it->block;
+   Item_Block *itb = it->item->block;
 
    itb->items = eina_list_remove(itb->items, it);
    itb->count--;
@@ -760,9 +755,12 @@ _item_block_del(Elm_Genlist_Item *it)
         il = EINA_INLIST_GET(itb);
         Item_Block *itbn = (Item_Block *)(il->next);
         if (it->parent)
-          it->parent->items = eina_list_remove(it->parent->items, it);
+          it->parent->item->items = eina_list_remove(it->parent->item->items, it);
         else
-          it->wd->blocks = eina_inlist_remove(it->wd->blocks, il);
+          {
+             _item_block_position_update(il->next, itb->position);
+             it->wd->blocks = eina_inlist_remove(it->wd->blocks, il);
+          }
         free(itb);
         if (itbn) itbn->changed = EINA_TRUE;
      }
@@ -775,15 +773,17 @@ _item_block_del(Elm_Genlist_Item *it)
              Item_Block *itbn = (Item_Block *)(il->next);
              if ((itbp) && ((itbp->count + itb->count) < itb->wd->max_items_per_block + itb->wd->max_items_per_block/2))
                {
-                  Elm_Genlist_Item *it2;
+                  Elm_Gen_Item *it2;
 
                   EINA_LIST_FREE(itb->items, it2)
                     {
-                       it2->block = itbp;
+                       it2->item->block = itbp;
                        itbp->items = eina_list_append(itbp->items, it2);
                        itbp->count++;
                        itbp->changed = EINA_TRUE;
                     }
+                  _item_block_position_update(EINA_INLIST_GET(itb)->next,
+                                              itb->position);
                   it->wd->blocks = eina_inlist_remove(it->wd->blocks,
                                                       EINA_INLIST_GET(itb));
                   free(itb);
@@ -793,14 +793,16 @@ _item_block_del(Elm_Genlist_Item *it)
                   while (itb->items)
                     {
                        Eina_List *last = eina_list_last(itb->items);
-                       Elm_Genlist_Item *it2 = last->data;
+                       Elm_Gen_Item *it2 = last->data;
 
-                       it2->block = itbn;
+                       it2->item->block = itbn;
                        itb->items = eina_list_remove_list(itb->items, last);
                        itbn->items = eina_list_prepend(itbn->items, it2);
                        itbn->count++;
                        itbn->changed = EINA_TRUE;
                     }
+                  _item_block_position_update(EINA_INLIST_GET(itb)->next,
+                                              itb->position);
                   it->wd->blocks =
                     eina_inlist_remove(it->wd->blocks, EINA_INLIST_GET(itb));
                   free(itb);
@@ -810,94 +812,73 @@ _item_block_del(Elm_Genlist_Item *it)
 }
 
 static void
-_item_del(Elm_Genlist_Item *it)
+_item_del(Elm_Gen_Item *it)
 {
-   Evas_Object *tob = it->wd->obj;
+   Evas_Object *obj = WIDGET(it);
 
-   evas_event_freeze(evas_object_evas_get(tob));
-   elm_widget_item_pre_notify_del(it);
-   elm_genlist_item_subitems_clear(it);
-   it->wd->walking -= it->walking;
+   evas_event_freeze(evas_object_evas_get(obj));
+   elm_genlist_item_subitems_clear((Elm_Object_Item *)it);
    if (it->wd->show_item == it) it->wd->show_item = NULL;
-   if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it);
-   if (it->realized) _item_unrealize(it, EINA_FALSE);
-   if (it->block) _item_block_del(it);
-   if ((!it->delete_me) && (it->itc->func.del))
-     it->itc->func.del((void *)it->base.data, it->base.widget);
-   it->delete_me = EINA_TRUE;
-   if (it->queued)
+   if (it->realized) _elm_genlist_item_unrealize(it, EINA_FALSE);
+   if (it->item->edit_mode_item_realized) _edit_mode_item_unrealize(it);
+   if (it->item->block) _item_block_del(it);
+   if (it->item->queued)
      it->wd->queue = eina_list_remove(it->wd->queue, it);
    if (it->wd->anchor_item == it)
      {
-        it->wd->anchor_item = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
+        it->wd->anchor_item = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
         if (!it->wd->anchor_item)
-          it->wd->anchor_item = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
+          it->wd->anchor_item = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
      }
-   it->wd->items = eina_inlist_remove(it->wd->items, EINA_INLIST_GET(it));
+   if (it->wd->expanded_item == it) it->wd->expanded_item = NULL;
    if (it->parent)
-     it->parent->items = eina_list_remove(it->parent->items, it);
-   if (it->flags & ELM_GENLIST_ITEM_GROUP)
-     it->wd->group_items = eina_list_remove(it->wd->group_items, it);
-   if (it->long_timer) ecore_timer_del(it->long_timer);
-   if (it->swipe_timer) ecore_timer_del(it->swipe_timer);
-
-   if (it->tooltip.del_cb)
-     it->tooltip.del_cb((void *)it->tooltip.data, it->base.widget, it);
-
-   evas_event_thaw(evas_object_evas_get(tob));
-   evas_event_thaw_eval(evas_object_evas_get(tob));
-
-   elm_widget_item_del(it);
+     it->parent->item->items = eina_list_remove(it->parent->item->items, it);
+   if (it->item->swipe_timer) ecore_timer_del(it->item->swipe_timer);
+   _elm_genlist_item_del_serious(it);
+   elm_genlist_item_class_unref((Elm_Genlist_Item_Class *)it->itc);
+   evas_event_thaw(evas_object_evas_get(obj));
+   evas_event_thaw_eval(evas_object_evas_get(obj));
 }
 
 static void
-_item_select(Elm_Genlist_Item *it)
+_clear_cb(Widget_Data *wd)
 {
-   Evas_Object *parent = it->base.widget;
+   wd->anchor_item = NULL;
+   while (wd->blocks)
+     {
+        Item_Block *itb = (Item_Block *)(wd->blocks);
 
-   if ((it->wd->no_select) || (it->delete_me) || (it->mode_view)) return;
-   if (it->selected)
+        wd->blocks = eina_inlist_remove(wd->blocks, wd->blocks);
+        if (itb->items) eina_list_free(itb->items);
+        free(itb);
+     }
+   if (wd->queue_idle_enterer)
      {
-        if (it->wd->always_select) goto call;
-        return;
+        ecore_idle_enterer_del(wd->queue_idle_enterer);
+        wd->queue_idle_enterer = NULL;
      }
-   it->selected = EINA_TRUE;
-   it->wd->selected = eina_list_append(it->wd->selected, it);
-call:
-   evas_object_ref(parent);
-   it->walking++;
-   it->wd->walking++;
-   if (it->func.func) it->func.func((void *)it->func.data, parent, it);
-   if (!it->delete_me)
-     evas_object_smart_callback_call(parent, SIG_SELECTED, it);
-   it->walking--;
-   it->wd->walking--;
-   if ((it->wd->clear_me) && (!it->wd->walking))
+   if (wd->must_recalc_idler)
      {
-        elm_genlist_clear(parent);
-        goto end;
+        ecore_idler_del(wd->must_recalc_idler);
+        wd->must_recalc_idler = NULL;
      }
-   else
+   if (wd->queue) wd->queue = eina_list_free(wd->queue);
+   if (wd->reorder_move_animator)
      {
-        if ((!it->walking) && (it->delete_me))
-          {
-             if (!it->relcount) _item_del(it);
-             goto end;
-          }
+        ecore_animator_del(wd->reorder_move_animator);
+        wd->reorder_move_animator = NULL;
      }
-   it->wd->last_selected_item = it;
-
-end:
-   evas_object_unref(parent);
+   wd->show_item = NULL;
+   wd->reorder_old_pan_y = 0;
 }
 
 static void
-_item_unselect(Elm_Genlist_Item *it)
+_item_unselect(Elm_Gen_Item *it)
 {
-   if ((it->delete_me) || (!it->selected)) return;
+   if ((it->generation < it->wd->generation) || (!it->selected)) return;
    it->selected = EINA_FALSE;
    it->wd->selected = eina_list_remove(it->wd->selected, it);
-   evas_object_smart_callback_call(it->base.widget, SIG_UNSELECTED, it);
+   evas_object_smart_callback_call(WIDGET(it), SIG_UNSELECTED, it);
 }
 
 static void
@@ -906,7 +887,7 @@ _mouse_move(void        *data,
             Evas_Object *obj,
             void        *event_info)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
    Evas_Event_Mouse_Move *ev = event_info;
    Evas_Coord minw = 0, minh = 0, x, y, dx, dy, adx, ady;
    Evas_Coord ox, oy, ow, oh, it_scrl_y, y_pos;
@@ -916,7 +897,7 @@ _mouse_move(void        *data,
         if (!it->wd->on_hold)
           {
              it->wd->on_hold = EINA_TRUE;
-             if (!it->wd->wasselected)
+             if ((!it->wd->wasselected) && (!it->flipped))
                {
                   _item_unhighlight(it);
                   _item_unselect(it);
@@ -947,7 +928,7 @@ _mouse_move(void        *data,
              ecore_timer_del(it->long_timer);
              it->long_timer = NULL;
           }
-        evas_object_smart_callback_call(it->base.widget, SIG_DRAG, it);
+        evas_object_smart_callback_call(WIDGET(it), SIG_DRAG, it);
         return;
      }
    if ((!it->down) /* || (it->wd->on_hold)*/ || (it->wd->longpressed))
@@ -963,16 +944,19 @@ _mouse_move(void        *data,
              it_scrl_y = ev->cur.canvas.y - it->wd->reorder_it->dy;
 
              if (!it->wd->reorder_start_y)
-               it->wd->reorder_start_y = it->block->y + it->y;
+               it->wd->reorder_start_y = it->item->block->y + it->y;
 
              if (it_scrl_y < oy)
                y_pos = oy;
-             else if (it_scrl_y + it->wd->reorder_it->h > oy + oh)
-               y_pos = oy + oh - it->wd->reorder_it->h;
+             else if (it_scrl_y + it->wd->reorder_it->item->h > oy + oh)
+               y_pos = oy + oh - it->wd->reorder_it->item->h;
              else
                y_pos = it_scrl_y;
 
-             _item_position(it, it->base.view, it->scrl_x, y_pos);
+             if (it->edit_obj)
+               _item_position(it, it->edit_obj, it->item->scrl_x, y_pos);
+             else
+             _item_position(it, VIEW(it), it->item->scrl_x, y_pos);
 
              if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
              it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
@@ -1008,30 +992,30 @@ _mouse_move(void        *data,
         if (dy < 0)
           {
              if (ady > adx)
-               evas_object_smart_callback_call(it->base.widget,
+               evas_object_smart_callback_call(WIDGET(it),
                                                SIG_DRAG_START_UP, it);
              else
                {
                   if (dx < 0)
-                    evas_object_smart_callback_call(it->base.widget,
+                    evas_object_smart_callback_call(WIDGET(it),
                                                     SIG_DRAG_START_LEFT, it);
                   else
-                    evas_object_smart_callback_call(it->base.widget,
+                    evas_object_smart_callback_call(WIDGET(it),
                                                     SIG_DRAG_START_RIGHT, it);
                }
           }
         else
           {
              if (ady > adx)
-               evas_object_smart_callback_call(it->base.widget,
+               evas_object_smart_callback_call(WIDGET(it),
                                                SIG_DRAG_START_DOWN, it);
              else
                {
                   if (dx < 0)
-                    evas_object_smart_callback_call(it->base.widget,
+                    evas_object_smart_callback_call(WIDGET(it),
                                                     SIG_DRAG_START_LEFT, it);
                   else
-                    evas_object_smart_callback_call(it->base.widget,
+                    evas_object_smart_callback_call(WIDGET(it),
                                                     SIG_DRAG_START_RIGHT, it);
                }
           }
@@ -1041,20 +1025,23 @@ _mouse_move(void        *data,
 static Eina_Bool
 _long_press(void *data)
 {
-   Elm_Genlist_Item *it = data, *it_tmp;
+   Elm_Gen_Item *it = data, *it_tmp;
    Eina_List *list, *l;
 
    it->long_timer = NULL;
-   if ((it->disabled) || (it->dragging) || (it->display_only))
+   if (elm_widget_item_disabled_get(it) || (it->dragging) || (it->display_only))
      return ECORE_CALLBACK_CANCEL;
    it->wd->longpressed = EINA_TRUE;
-   evas_object_smart_callback_call(it->base.widget, SIG_LONGPRESSED, it);
-   if ((it->wd->reorder_mode) && (it->flags != ELM_GENLIST_ITEM_GROUP))
+   evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, it);
+   if ((it->wd->reorder_mode) && (!it->group))
      {
         it->wd->reorder_it = it;
         it->wd->reorder_start_y = 0;
+        if (it->edit_obj)
+          evas_object_raise(it->edit_obj);
+        else
+          evas_object_raise(VIEW(it));
 
-        evas_object_raise(it->base.view);
         elm_smart_scroller_hold_set(it->wd->scr, EINA_TRUE);
         elm_smart_scroller_bounce_allow_set(it->wd->scr, EINA_FALSE, EINA_FALSE);
 
@@ -1063,23 +1050,25 @@ _long_press(void *data)
           {
              if (it != it_tmp) _item_unselect(it_tmp);
           }
-        if (elm_genlist_item_expanded_get(it))
+        if (elm_genlist_item_expanded_get((Elm_Object_Item *)it))
           {
-             elm_genlist_item_expanded_set(it, EINA_FALSE);
+             elm_genlist_item_expanded_set((Elm_Object_Item *)it, EINA_FALSE);
              return ECORE_CALLBACK_RENEW;
           }
-        edje_object_signal_emit(it->base.view, "elm,state,reorder,enabled", "elm");
+
+        if (!it->wd->edit_mode)
+          edje_object_signal_emit(VIEW(it), "elm,state,reorder,enabled", "elm");
      }
    return ECORE_CALLBACK_CANCEL;
 }
 
 static void
-_swipe(Elm_Genlist_Item *it)
+_swipe(Elm_Gen_Item *it)
 {
    int i, sum = 0;
 
    if (!it) return;
-   if ((it->display_only) || (it->disabled)) return;
+   if ((it->display_only) || elm_widget_item_disabled_get(it)) return;
    it->wd->swipe = EINA_FALSE;
    for (i = 0; i < it->wd->movements; i++)
      {
@@ -1089,13 +1078,13 @@ _swipe(Elm_Genlist_Item *it)
 
    sum /= it->wd->movements;
    if (abs(sum - it->wd->history[0].x) <= 10) return;
-   evas_object_smart_callback_call(it->base.widget, SIG_SWIPE, it);
+   evas_object_smart_callback_call(WIDGET(it), SIG_SWIPE, it);
 }
 
 static Eina_Bool
 _swipe_cancel(void *data)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
 
    if (!it) return ECORE_CALLBACK_CANCEL;
    it->wd->swipe = EINA_FALSE;
@@ -1116,7 +1105,7 @@ _multi_cancel(void *data)
 static void
 _multi_touch_gesture_eval(void *data)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
 
    it->wd->multitouched = EINA_FALSE;
    if (it->wd->multi_timer)
@@ -1144,31 +1133,31 @@ _multi_touch_gesture_eval(void *data)
         if ((off_x + off_mx) > (off_y + off_my))
           {
              if ((it->wd->cur_x > it->wd->prev_x) && (it->wd->cur_mx > it->wd->prev_mx))
-               evas_object_smart_callback_call(it->base.widget,
+               evas_object_smart_callback_call(WIDGET(it),
                                                SIG_MULTI_SWIPE_RIGHT, it);
              else if ((it->wd->cur_x < it->wd->prev_x) && (it->wd->cur_mx < it->wd->prev_mx))
-               evas_object_smart_callback_call(it->base.widget,
+               evas_object_smart_callback_call(WIDGET(it),
                                                SIG_MULTI_SWIPE_LEFT, it);
              else if (abs(it->wd->cur_x - it->wd->cur_mx) > abs(it->wd->prev_x - it->wd->prev_mx))
-               evas_object_smart_callback_call(it->base.widget,
+               evas_object_smart_callback_call(WIDGET(it),
                                                SIG_MULTI_PINCH_OUT, it);
              else
-               evas_object_smart_callback_call(it->base.widget,
+               evas_object_smart_callback_call(WIDGET(it),
                                                SIG_MULTI_PINCH_IN, it);
           }
         else
           {
              if ((it->wd->cur_y > it->wd->prev_y) && (it->wd->cur_my > it->wd->prev_my))
-               evas_object_smart_callback_call(it->base.widget,
+               evas_object_smart_callback_call(WIDGET(it),
                                                SIG_MULTI_SWIPE_DOWN, it);
              else if ((it->wd->cur_y < it->wd->prev_y) && (it->wd->cur_my < it->wd->prev_my))
-               evas_object_smart_callback_call(it->base.widget,
+               evas_object_smart_callback_call(WIDGET(it),
                                                SIG_MULTI_SWIPE_UP, it);
              else if (abs(it->wd->cur_y - it->wd->cur_my) > abs(it->wd->prev_y - it->wd->prev_my))
-               evas_object_smart_callback_call(it->base.widget,
+               evas_object_smart_callback_call(WIDGET(it),
                                                SIG_MULTI_PINCH_OUT, it);
              else
-               evas_object_smart_callback_call(it->base.widget,
+               evas_object_smart_callback_call(WIDGET(it),
                                                SIG_MULTI_PINCH_IN, it);
           }
      }
@@ -1181,7 +1170,7 @@ _multi_down(void        *data,
             Evas_Object *obj __UNUSED__,
             void        *event_info)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
    Evas_Event_Multi_Down *ev = event_info;
 
    if ((it->wd->multi_device != 0) || (it->wd->multitouched) || (it->wd->multi_timeout)) return;
@@ -1205,12 +1194,12 @@ _multi_down(void        *data,
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        evas_object_smart_callback_call(it->base.widget, SIG_DRAG_STOP, it);
+        evas_object_smart_callback_call(WIDGET(it), SIG_DRAG_STOP, it);
      }
-   if (it->swipe_timer)
+   if (it->item->swipe_timer)
      {
-        ecore_timer_del(it->swipe_timer);
-        it->swipe_timer = NULL;
+        ecore_timer_del(it->item->swipe_timer);
+        it->item->swipe_timer = NULL;
      }
    if (it->wd->on_hold)
      {
@@ -1226,7 +1215,7 @@ _multi_up(void        *data,
           Evas_Object *obj __UNUSED__,
           void        *event_info)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
    Evas_Event_Multi_Up *ev = event_info;
 
    if (it->wd->multi_device != ev->device) return;
@@ -1242,7 +1231,7 @@ _multi_move(void        *data,
             Evas_Object *obj __UNUSED__,
             void        *event_info)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
    Evas_Event_Multi_Move *ev = event_info;
 
    if (it->wd->multi_device != ev->device) return;
@@ -1256,7 +1245,7 @@ _mouse_down(void        *data,
             Evas_Object *obj,
             void        *event_info)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
    Evas_Event_Mouse_Down *ev = event_info;
    Evas_Coord x, y;
 
@@ -1287,14 +1276,14 @@ _mouse_down(void        *data,
    it->wd->wasselected = it->selected;
    _item_highlight(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     if ((!it->disabled) && (!it->display_only))
+     if ((!elm_widget_item_disabled_get(it)) && (!it->display_only))
        {
-          evas_object_smart_callback_call(it->base.widget, SIG_CLICKED_DOUBLE, it);
-          evas_object_smart_callback_call(it->base.widget, SIG_ACTIVATED, it);
+          evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_DOUBLE, it);
+          evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it);
        }
    if (it->long_timer) ecore_timer_del(it->long_timer);
-   if (it->swipe_timer) ecore_timer_del(it->swipe_timer);
-   it->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it);
+   if (it->item->swipe_timer) ecore_timer_del(it->item->swipe_timer);
+   it->item->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it);
    if (it->realized)
      it->long_timer = ecore_timer_add(it->wd->longpress_timeout, _long_press,
                                       it);
@@ -1310,7 +1299,7 @@ _mouse_up(void        *data,
           Evas_Object *obj __UNUSED__,
           void        *event_info)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
    Evas_Event_Mouse_Up *ev = event_info;
    Eina_Bool dragged = EINA_FALSE;
 
@@ -1334,13 +1323,13 @@ _mouse_up(void        *data,
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        evas_object_smart_callback_call(it->base.widget, SIG_DRAG_STOP, it);
+        evas_object_smart_callback_call(WIDGET(it), SIG_DRAG_STOP, it);
         dragged = 1;
      }
-   if (it->swipe_timer)
+   if (it->item->swipe_timer)
      {
-        ecore_timer_del(it->swipe_timer);
-        it->swipe_timer = NULL;
+        ecore_timer_del(it->item->swipe_timer);
+        it->item->swipe_timer = NULL;
      }
    if (it->wd->multi_timer)
      {
@@ -1361,7 +1350,7 @@ _mouse_up(void        *data,
 
         if (it->wd->reorder_rel && (it->wd->reorder_it->parent == it->wd->reorder_rel->parent))
           {
-             if (it_scrl_y <= it->wd->reorder_rel->scrl_y)
+             if (it_scrl_y <= it->wd->reorder_rel->item->scrl_y)
                _item_move_before(it->wd->reorder_it, it->wd->reorder_rel);
              else
                _item_move_after(it->wd->reorder_it, it->wd->reorder_rel);
@@ -1371,15 +1360,15 @@ _mouse_up(void        *data,
              if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
              it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
           }
-        edje_object_signal_emit(it->base.view, "elm,state,reorder,disabled", "elm");
+        edje_object_signal_emit(VIEW(it), "elm,state,reorder,disabled", "elm");
         it->wd->reorder_it = it->wd->reorder_rel = NULL;
         elm_smart_scroller_hold_set(it->wd->scr, EINA_FALSE);
-        elm_smart_scroller_bounce_allow_set(it->wd->scr, EINA_FALSE, EINA_TRUE);
+        elm_smart_scroller_bounce_allow_set(it->wd->scr, it->wd->h_bounce, it->wd->v_bounce);
      }
    if (it->wd->longpressed)
      {
         it->wd->longpressed = EINA_FALSE;
-        if (!it->wd->wasselected)
+        if ((!it->wd->wasselected) && (!it->flipped))
           {
              _item_unhighlight(it);
              _item_unselect(it);
@@ -1391,19 +1380,20 @@ _mouse_up(void        *data,
      {
         if (it->want_unrealize)
           {
-             _item_unrealize(it, EINA_FALSE);
-             if (it->block->want_unrealize)
-               _item_block_unrealize(it->block);
+             _elm_genlist_item_unrealize(it, EINA_FALSE);
+             if (it->item->block->want_unrealize)
+               _item_block_unrealize(it->item->block);
           }
      }
-   if ((it->disabled) || (dragged) || (it->display_only)) return;
+   if (elm_widget_item_disabled_get(it) || (dragged) || (it->display_only))
+     return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (it->wd->multi)
      {
         if (!it->selected)
           {
              _item_highlight(it);
-             _item_select(it);
+             it->sel_cb(it);
           }
         else
           {
@@ -1428,10 +1418,10 @@ _mouse_up(void        *data,
         else
           {
              const Eina_List *l, *l_next;
-             Elm_Genlist_Item *it2;
+             Elm_Gen_Item *it2;
 
              EINA_LIST_FOREACH_SAFE(it->wd->selected, l, l_next, it2)
-                if (it2 != it)
+               if (it2 != it)
                   {
                      _item_unhighlight(it2);
                      _item_unselect(it2);
@@ -1440,7 +1430,7 @@ _mouse_up(void        *data,
              //_item_select(it);
           }
         _item_highlight(it);
-        _item_select(it);
+        it->sel_cb(it);
      }
 }
 
@@ -1450,12 +1440,12 @@ _signal_expand_toggle(void        *data,
                       const char  *emission __UNUSED__,
                       const char  *source __UNUSED__)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
 
-   if (it->expanded)
-     evas_object_smart_callback_call(it->base.widget, SIG_CONTRACT_REQUEST, it);
+   if (it->item->expanded)
+     evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACT_REQUEST, it);
    else
-     evas_object_smart_callback_call(it->base.widget, SIG_EXPAND_REQUEST, it);
+     evas_object_smart_callback_call(WIDGET(it), SIG_EXPAND_REQUEST, it);
 }
 
 static void
@@ -1464,10 +1454,10 @@ _signal_expand(void        *data,
                const char  *emission __UNUSED__,
                const char  *source __UNUSED__)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
 
-   if (!it->expanded)
-     evas_object_smart_callback_call(it->base.widget, SIG_EXPAND_REQUEST, it);
+   if (!it->item->expanded)
+     evas_object_smart_callback_call(WIDGET(it), SIG_EXPAND_REQUEST, it);
 }
 
 static void
@@ -1476,10 +1466,10 @@ _signal_contract(void        *data,
                  const char  *emission __UNUSED__,
                  const char  *source __UNUSED__)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
 
-   if (it->expanded)
-     evas_object_smart_callback_call(it->base.widget, SIG_CONTRACT_REQUEST, it);
+   if (it->item->expanded)
+     evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACT_REQUEST, it);
 }
 
 static Eina_Bool
@@ -1500,16 +1490,16 @@ _mode_finished_signal_cb(void        *data,
 {
    if (!data) return;
    if (!obj) return;
-   Elm_Genlist_Item *it = data;
-   if ((it->delete_me) || (!it->realized) || (!it->mode_view)) return;
+   Elm_Gen_Item *it = data;
+   if ((it->generation < it->wd->generation) || (!it->realized) || (!it->item->mode_view)) return;
    char buf[1024];
    Evas *te = evas_object_evas_get(obj);
 
    evas_event_freeze(te);
-   it->nocache = EINA_FALSE;
+   it->item->nocache_once = EINA_FALSE;
    _mode_item_unrealize(it);
-   if (it->group_item)
-     evas_object_raise(it->group_item->base.view);
+   if (it->item->group_item)
+     evas_object_raise(it->item->VIEW(group_item));
    snprintf(buf, sizeof(buf), "elm,state,%s,passive,finished", it->wd->mode_type);
    edje_object_signal_callback_del_full(obj, buf, "elm", _mode_finished_signal_cb, it);
    evas_event_thaw(te);
@@ -1530,7 +1520,7 @@ _item_cache_clean(Widget_Data *wd)
         wd->item_cache_count--;
         if (itc->spacer) evas_object_del(itc->spacer);
         if (itc->base_view) evas_object_del(itc->base_view);
-        if (itc->item_style) eina_stringshare_del(itc->item_style);
+        eina_stringshare_del(itc->item_style);
         free(itc);
      }
    evas_event_thaw(evas_object_evas_get(wd->obj));
@@ -1547,15 +1537,15 @@ _item_cache_zero(Widget_Data *wd)
 }
 
 static void
-_item_cache_add(Elm_Genlist_Item *it)
+_item_cache_add(Elm_Gen_Item *it)
 {
    Item_Cache *itc;
 
    evas_event_freeze(evas_object_evas_get(it->wd->obj));
    if (it->wd->item_cache_max <= 0)
      {
-        evas_object_del(it->base.view);
-        it->base.view = NULL;
+        evas_object_del(VIEW(it));
+        VIEW(it) = NULL;
         evas_object_del(it->spacer);
         it->spacer = NULL;
         evas_event_thaw(evas_object_evas_get(it->wd->obj));
@@ -1565,29 +1555,36 @@ _item_cache_add(Elm_Genlist_Item *it)
 
    it->wd->item_cache_count++;
    itc = calloc(1, sizeof(Item_Cache));
+   if (!itc)
+     {
+        evas_event_thaw(evas_object_evas_get(it->wd->obj));
+        evas_event_thaw_eval(evas_object_evas_get(it->wd->obj));
+        return;
+     }
    it->wd->item_cache = eina_inlist_prepend(it->wd->item_cache,
                                             EINA_INLIST_GET(itc));
    itc->spacer = it->spacer;
    it->spacer = NULL;
-   itc->base_view = it->base.view;
-   it->base.view = NULL;
+   itc->base_view = VIEW(it);
+   VIEW(it) = NULL;
+   edje_object_signal_emit(itc->base_view, "elm,state,unselected", "elm");
    evas_object_hide(itc->base_view);
    evas_object_move(itc->base_view, -9999, -9999);
    itc->item_style = eina_stringshare_add(it->itc->item_style);
-   if (it->flags & ELM_GENLIST_ITEM_SUBITEMS) itc->tree = 1;
+   if (it->item->type & ELM_GENLIST_ITEM_SUBITEMS) itc->tree = 1;
    itc->compress = (it->wd->compress);
    itc->selected = it->selected;
-   itc->disabled = it->disabled;
-   itc->expanded = it->expanded;
+   itc->disabled = elm_widget_item_disabled_get(it);
+   itc->expanded = it->item->expanded;
    if (it->long_timer)
      {
         ecore_timer_del(it->long_timer);
         it->long_timer = NULL;
      }
-   if (it->swipe_timer)
+   if (it->item->swipe_timer)
      {
-        ecore_timer_del(it->swipe_timer);
-        it->swipe_timer = NULL;
+        ecore_timer_del(it->item->swipe_timer);
+        it->item->swipe_timer = NULL;
      }
    // FIXME: other callbacks?
    edje_object_signal_callback_del_full(itc->base_view,
@@ -1616,19 +1613,21 @@ _item_cache_add(Elm_Genlist_Item *it)
 }
 
 static Item_Cache *
-_item_cache_find(Elm_Genlist_Item *it)
+_item_cache_find(Elm_Gen_Item *it)
 {
    Item_Cache *itc;
    Eina_Bool tree = 0;
 
-   if (it->flags & ELM_GENLIST_ITEM_SUBITEMS) tree = 1;
+   if (it->item->type & ELM_GENLIST_ITEM_SUBITEMS) tree = 1;
    EINA_INLIST_FOREACH(it->wd->item_cache, itc)
      {
         if ((itc->selected) || (itc->disabled) || (itc->expanded))
           continue;
         if ((itc->tree == tree) &&
             (itc->compress == it->wd->compress) &&
-            (!strcmp(it->itc->item_style, itc->item_style)))
+            (((!it->itc->item_style) && (!itc->item_style)) ||
+             (it->itc->item_style && itc->item_style &&
+            (!strcmp(it->itc->item_style, itc->item_style)))))
           {
              it->wd->item_cache = eina_inlist_remove(it->wd->item_cache,
                                                      EINA_INLIST_GET(itc));
@@ -1640,57 +1639,105 @@ _item_cache_find(Elm_Genlist_Item *it)
 }
 
 static void
-_elm_genlist_item_odd_even_update(Elm_Genlist_Item *it)
+_elm_genlist_item_index_update(Elm_Gen_Item *it)
+{
+   if (it->position_update || it->item->block->position_update)
+     {
+        evas_object_smart_callback_call(WIDGET(it), SIG_INDEX_UPDATE, it);
+        it->position_update = EINA_FALSE;
+     }
+}
+
+static void
+_elm_genlist_item_odd_even_update(Elm_Gen_Item *it)
 {
-   if (!it->nostacking)
+   if (!it->item->nostacking)
      {
-        if ((it->order_num_in & 0x1) ^ it->stacking_even)
-          evas_object_lower(it->base.view);
+        if ((it->item->order_num_in & 0x1) ^ it->item->stacking_even)
+          {
+             if (it->edit_obj) evas_object_lower(it->edit_obj);
+             else evas_object_lower(VIEW(it));
+          }
         else
-          evas_object_raise(it->base.view);
+          {
+             if (it->edit_obj) evas_object_raise(it->edit_obj);
+             else evas_object_raise(VIEW(it));
+          }
      }
 
-   if (it->order_num_in & 0x1)
-     edje_object_signal_emit(it->base.view, "elm,state,odd", "elm");
+   if (it->item->order_num_in & 0x1)
+     {
+        edje_object_signal_emit(VIEW(it), "elm,state,odd", "elm");
+        if (it->edit_obj) edje_object_signal_emit(it->edit_obj, "elm,state,odd", "elm");
+     }
    else
-     edje_object_signal_emit(it->base.view, "elm,state,even", "elm");
+     {
+        edje_object_signal_emit(VIEW(it), "elm,state,even", "elm");
+        if (it->edit_obj) edje_object_signal_emit(it->edit_obj, "elm,state,even", "elm");
+     }
 }
 
 static void
-_elm_genlist_item_state_update(Elm_Genlist_Item *it, Item_Cache *itc)
+_elm_genlist_item_state_update(Elm_Gen_Item *it, Item_Cache *itc)
 {
    if (itc)
      {
         if (it->selected != itc->selected)
           {
              if (it->selected)
-               edje_object_signal_emit(it->base.view,
+               edje_object_signal_emit(VIEW(it),
+                                       "elm,state,selected", "elm");
+
+             if (it->edit_obj)
+               edje_object_signal_emit(it->edit_obj,
                                        "elm,state,selected", "elm");
           }
-        if (it->disabled != itc->disabled)
+        if (elm_widget_item_disabled_get(it) != itc->disabled)
           {
-             if (it->disabled)
-               edje_object_signal_emit(it->base.view,
+             if (elm_widget_item_disabled_get(it))
+               edje_object_signal_emit(VIEW(it),
+                                       "elm,state,disabled", "elm");
+             if (it->edit_obj)
+               edje_object_signal_emit(it->edit_obj,
                                        "elm,state,disabled", "elm");
           }
-        if (it->expanded != itc->expanded)
+        if (it->item->expanded != itc->expanded)
           {
-             if (it->expanded)
-               edje_object_signal_emit(it->base.view,
+             if (it->item->expanded)
+               edje_object_signal_emit(VIEW(it),
+                                       "elm,state,expanded", "elm");
+             if (it->edit_obj)
+               edje_object_signal_emit(it->edit_obj,
                                        "elm,state,expanded", "elm");
           }
      }
    else
      {
         if (it->selected)
-          edje_object_signal_emit(it->base.view,
-                                  "elm,state,selected", "elm");
-        if (it->disabled)
-          edje_object_signal_emit(it->base.view,
-                                  "elm,state,disabled", "elm");
-        if (it->expanded)
-          edje_object_signal_emit(it->base.view,
-                                  "elm,state,expanded", "elm");
+          {
+             edje_object_signal_emit(VIEW(it),
+                                     "elm,state,selected", "elm");
+             if (it->edit_obj)
+               edje_object_signal_emit(it->edit_obj,
+                                       "elm,state,selected", "elm");
+          }
+
+        if (elm_widget_item_disabled_get(it))
+          {
+             edje_object_signal_emit(VIEW(it),
+                                     "elm,state,disabled", "elm");
+             if (it->edit_obj)
+               edje_object_signal_emit(it->edit_obj,
+                                       "elm,state,disabled", "elm");
+          }
+        if (it->item->expanded)
+          {
+             edje_object_signal_emit(VIEW(it),
+                                     "elm,state,expanded", "elm");
+             if (it->edit_obj)
+               edje_object_signal_emit(it->edit_obj,
+                                       "elm,state,expanded", "elm");
+          }
      }
 }
 
@@ -1699,41 +1746,29 @@ _item_cache_free(Item_Cache *itc)
 {
    if (itc->spacer) evas_object_del(itc->spacer);
    if (itc->base_view) evas_object_del(itc->base_view);
-   if (itc->item_style) eina_stringshare_del(itc->item_style);
+   eina_stringshare_del(itc->item_style);
    free(itc);
 }
 
-static const char *
-_item_label_hook(Elm_Genlist_Item *it, const char *part)
-{
-   if (!it->itc->func.label_get) return NULL;
-   return edje_object_part_text_get(it->base.view, part);
-}
-
-static void
-_item_del_hook(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
-{
-   Elm_Genlist_Item *it = event_info;
-   if (!it) return;
-   if (it->wd->last_selected_item == it)
-     it->wd->last_selected_item = NULL;
-}
-
 static void
-_item_label_realize(Elm_Genlist_Item *it,
+_item_text_realize(Elm_Gen_Item *it,
                     Evas_Object *target,
-                    Eina_List **source)
+                    Eina_List **source,
+                    const char *parts)
 {
-   if (it->itc->func.label_get)
+   if (it->itc->func.text_get)
      {
         const Eina_List *l;
         const char *key;
 
-        *source = elm_widget_stringlist_get(edje_object_data_get(target, "labels"));
+        *source = elm_widget_stringlist_get(edje_object_data_get(target, "texts"));
         EINA_LIST_FOREACH(*source, l, key)
           {
-             char *s = it->itc->func.label_get
-                ((void *)it->base.data, it->base.widget, key);
+             if (parts && fnmatch(parts, key, FNM_PERIOD))
+               continue;
+
+             char *s = it->itc->func.text_get
+                ((void *)it->base.data, WIDGET(it), key);
 
              if (s)
                {
@@ -1749,30 +1784,71 @@ _item_label_realize(Elm_Genlist_Item *it,
 }
 
 static Eina_List *
-_item_icon_realize(Elm_Genlist_Item *it,
+_item_content_unrealize(Elm_Gen_Item *it,
+                   Evas_Object *target,
+                   Eina_List **source,
+                   const char *parts)
+{
+   Eina_List *res = it->content_objs;
+
+   if (it->itc->func.content_get)
+     {
+        const Eina_List *l;
+        const char *key;
+        Evas_Object *ic = NULL;
+
+        EINA_LIST_FOREACH(*source, l, key)
+          {
+             if (parts && fnmatch(parts, key, FNM_PERIOD))
+               continue;
+
+             ic = edje_object_part_swallow_get(target, key);
+             if (ic)
+               {
+                  res = eina_list_remove(res, ic);
+                  edje_object_part_unswallow(target, ic);
+                  evas_object_del(ic);
+               }
+          }
+     }
+
+   return res;
+}
+
+static Eina_List *
+_item_content_realize(Elm_Gen_Item *it,
                    Evas_Object *target,
-                   Eina_List **source)
+                   Eina_List **source,
+                   const char *parts)
 {
    Eina_List *res = NULL;
 
-   if (it->itc->func.icon_get)
+   if (it->itc->func.content_get)
      {
         const Eina_List *l;
         const char *key;
+        Evas_Object *ic = NULL;
+
+        *source = elm_widget_stringlist_get(edje_object_data_get(target, "contents"));
+
+        if (parts && (eina_list_count(*source) != eina_list_count(it->content_objs)))
+          res = it->content_objs;
 
-        *source = elm_widget_stringlist_get(edje_object_data_get(target, "icons"));
         EINA_LIST_FOREACH(*source, l, key)
           {
-             Evas_Object *ic = it->itc->func.icon_get
-                ((void *)it->base.data, it->base.widget, key);
+             if (parts && fnmatch(parts, key, FNM_PERIOD))
+               continue;
 
+             if (it->itc->func.content_get)
+               ic = it->itc->func.content_get
+                  ((void *)it->base.data, WIDGET(it), key);
              if (ic)
                {
                   res = eina_list_append(res, ic);
                   edje_object_part_swallow(target, key, ic);
                   evas_object_show(ic);
-                  elm_widget_sub_object_add(it->base.widget, ic);
-                  if (it->disabled)
+                  elm_widget_sub_object_add(WIDGET(it), ic);
+                  if (elm_widget_item_disabled_get(it))
                     elm_widget_disabled_set(ic, EINA_TRUE);
                }
           }
@@ -1782,9 +1858,10 @@ _item_icon_realize(Elm_Genlist_Item *it,
 }
 
 static void
-_item_state_realize(Elm_Genlist_Item *it,
+_item_state_realize(Elm_Gen_Item *it,
                     Evas_Object *target,
-                    Eina_List **source)
+                    Eina_List **source,
+                    const char *parts)
 {
    if (it->itc->func.state_get)
      {
@@ -1795,8 +1872,11 @@ _item_state_realize(Elm_Genlist_Item *it,
         *source = elm_widget_stringlist_get(edje_object_data_get(target, "states"));
         EINA_LIST_FOREACH(*source, l, key)
           {
+             if (parts && fnmatch(parts, key, FNM_PERIOD))
+               continue;
+
              Eina_Bool on = it->itc->func.state_get
-                ((void *)it->base.data, it->base.widget, key);
+                ((void *)it->base.data, WIDGET(it), key);
 
              if (on)
                {
@@ -1812,40 +1892,75 @@ _item_state_realize(Elm_Genlist_Item *it,
      }
 }
 
+static Eina_List *
+_item_flips_realize(Elm_Gen_Item *it,
+                    Evas_Object *target,
+                    Eina_List **source)
+{
+   Eina_List *res = NULL;
+
+   if (it->itc->func.content_get)
+     {
+        const Eina_List *l;
+        const char *key;
+        Evas_Object *ic = NULL;
+
+        *source = elm_widget_stringlist_get(edje_object_data_get(target, "flips"));
+
+        EINA_LIST_FOREACH(*source, l, key)
+          {
+             if (it->itc->func.content_get)
+               ic = it->itc->func.content_get
+                  ((void *)it->base.data, WIDGET(it), key);
+             if (ic)
+               {
+                  res = eina_list_append(res, ic);
+                  edje_object_part_swallow(target, key, ic);
+                  evas_object_show(ic);
+                  elm_widget_sub_object_add(WIDGET(it), ic);
+                  if (elm_widget_item_disabled_get(it))
+                    elm_widget_disabled_set(ic, EINA_TRUE);
+               }
+          }
+     }
+
+   return res;
+}
+
 static void
-_item_realize(Elm_Genlist_Item *it,
+_item_realize(Elm_Gen_Item *it,
               int               in,
               Eina_Bool         calc)
 {
-   Elm_Genlist_Item *it2;
    const char *treesize;
    char buf[1024];
-   int depth, tsize = 20;
+   int tsize = 20;
    Item_Cache *itc = NULL;
 
-   if (it->delete_me) return;
+   if (it->generation < it->wd->generation) return;
    //evas_event_freeze(evas_object_evas_get(it->wd->obj));
    if (it->realized)
      {
-        if (it->order_num_in != in)
+        if (it->item->order_num_in != in)
           {
-             it->order_num_in = in;
+             it->item->order_num_in = in;
              _elm_genlist_item_odd_even_update(it);
              _elm_genlist_item_state_update(it, NULL);
+             _elm_genlist_item_index_update(it);
           }
         //evas_event_thaw(evas_object_evas_get(it->wd->obj));
         //evas_event_thaw_eval(evas_object_evas_get(it->wd->obj));
         return;
      }
-   it->order_num_in = in;
+   it->item->order_num_in = in;
 
-   if (it->nocache)
-     it->nocache = EINA_FALSE;
-   else
+   if (it->item->nocache_once)
+     it->item->nocache_once = EINA_FALSE;
+   else if (!it->item->nocache)
      itc = _item_cache_find(it);
    if (itc)
      {
-        it->base.view = itc->base_view;
+        VIEW(it) = itc->base_view;
         itc->base_view = NULL;
         it->spacer = itc->spacer;
         itc->spacer = NULL;
@@ -1855,76 +1970,72 @@ _item_realize(Elm_Genlist_Item *it,
         const char *stacking_even;
         const char *stacking;
 
-        it->base.view = edje_object_add(evas_object_evas_get(it->base.widget));
-        edje_object_scale_set(it->base.view,
-                              elm_widget_scale_get(it->base.widget) *
+        VIEW(it) = edje_object_add(evas_object_evas_get(WIDGET(it)));
+        edje_object_scale_set(VIEW(it),
+                              elm_widget_scale_get(WIDGET(it)) *
                               _elm_config->scale);
-        evas_object_smart_member_add(it->base.view, it->wd->pan_smart);
-        elm_widget_sub_object_add(it->base.widget, it->base.view);
+        evas_object_smart_member_add(VIEW(it), it->wd->pan_smart);
+        elm_widget_sub_object_add(WIDGET(it), VIEW(it));
 
-        if (it->flags & ELM_GENLIST_ITEM_SUBITEMS)
-          strncpy(buf, "tree", sizeof(buf));
-        else strncpy(buf, "it", sizeof(buf));
-        if (it->wd->compress)
-          strncat(buf, "_compress", sizeof(buf) - strlen(buf));
-
-        strncat(buf, "/", sizeof(buf) - strlen(buf));
-        strncat(buf, it->itc->item_style, sizeof(buf) - strlen(buf));
+        if (it->item->type & ELM_GENLIST_ITEM_SUBITEMS)
+          snprintf(buf, sizeof(buf), "tree%s/%s", it->wd->compress ? "_compress" : "", it->itc->item_style ?: "default");
+        else
+          snprintf(buf, sizeof(buf), "item%s/%s", it->wd->compress ? "_compress" : "", it->itc->item_style ?: "default");
 
-        _elm_theme_object_set(it->base.widget, it->base.view, "genlist", buf,
-                              elm_widget_style_get(it->base.widget));
+        _elm_theme_object_set(WIDGET(it), VIEW(it), "genlist", buf,
+                              elm_widget_style_get(WIDGET(it)));
 
-        stacking_even = edje_object_data_get(it->base.view, "stacking_even");
+        stacking_even = edje_object_data_get(VIEW(it), "stacking_even");
         if (!stacking_even) stacking_even = "above";
-        it->stacking_even = !!strcmp("above", stacking_even);
+        it->item->stacking_even = !!strcmp("above", stacking_even);
 
-        stacking = edje_object_data_get(it->base.view, "stacking");
+        stacking = edje_object_data_get(VIEW(it), "stacking");
         if (!stacking) stacking = "yes";
-        it->nostacking = !!strcmp("yes", stacking);
+        it->item->nostacking = !!strcmp("yes", stacking);
 
-        edje_object_mirrored_set(it->base.view,
-                                 elm_widget_mirrored_get(it->base.widget));
+        edje_object_mirrored_set(VIEW(it),
+                                 elm_widget_mirrored_get(WIDGET(it)));
         it->spacer =
-          evas_object_rectangle_add(evas_object_evas_get(it->base.widget));
+          evas_object_rectangle_add(evas_object_evas_get(WIDGET(it)));
         evas_object_color_set(it->spacer, 0, 0, 0, 0);
-        elm_widget_sub_object_add(it->base.widget, it->spacer);
+        elm_widget_sub_object_add(WIDGET(it), it->spacer);
      }
 
    _elm_genlist_item_odd_even_update(it);
 
-   for (it2 = it, depth = 0; it2->parent; it2 = it2->parent)
-     {
-        if (it2->parent->flags != ELM_GENLIST_ITEM_GROUP) depth += 1;
-     }
-   it->expanded_depth = depth;
-   treesize = edje_object_data_get(it->base.view, "treesize");
+   treesize = edje_object_data_get(VIEW(it), "treesize");
    if (treesize) tsize = atoi(treesize);
    evas_object_size_hint_min_set(it->spacer,
-                                 (depth * tsize) * _elm_config->scale, 1);
-   edje_object_part_swallow(it->base.view, "elm.swallow.pad", it->spacer);
+                                 (it->item->expanded_depth * tsize) * _elm_config->scale, 1);
+   edje_object_part_swallow(VIEW(it), "elm.swallow.pad", it->spacer);
    if (!calc)
      {
-        edje_object_signal_callback_add(it->base.view,
+        edje_object_signal_callback_add(VIEW(it),
                                         "elm,action,expand,toggle",
                                         "elm", _signal_expand_toggle, it);
-        edje_object_signal_callback_add(it->base.view, "elm,action,expand",
+        edje_object_signal_callback_add(VIEW(it), "elm,action,expand",
                                         "elm", _signal_expand, it);
-        edje_object_signal_callback_add(it->base.view, "elm,action,contract",
+        edje_object_signal_callback_add(VIEW(it), "elm,action,contract",
                                         "elm", _signal_contract, it);
-        evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_DOWN,
+        evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_DOWN,
                                        _mouse_down, it);
-        evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_UP,
+        evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_UP,
                                        _mouse_up, it);
-        evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_MOVE,
+        evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_MOVE,
                                        _mouse_move, it);
-        evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MULTI_DOWN,
+        evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MULTI_DOWN,
                                        _multi_down, it);
-        evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MULTI_UP,
+        evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MULTI_UP,
                                        _multi_up, it);
-        evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MULTI_MOVE,
+        evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MULTI_MOVE,
                                        _multi_move, it);
 
+        if ((it->wd->edit_mode) && (!it->edit_obj) &&
+            (it->item->type != ELM_GENLIST_ITEM_GROUP) && (it->itc->edit_item_style))
+          _edit_mode_item_realize(it, EINA_FALSE);
+
         _elm_genlist_item_state_update(it, itc);
+        _elm_genlist_item_index_update(it);
      }
 
    if ((calc) && (it->wd->homogeneous) &&
@@ -1932,58 +2043,63 @@ _item_realize(Elm_Genlist_Item *it,
         ((it->wd->item_width) && (it->wd->group_item_width))))
      {
         /* homogenous genlist shortcut */
-        if (!it->mincalcd)
+        if (!it->item->mincalcd)
           {
-             if (it->flags & ELM_GENLIST_ITEM_GROUP)
+             if (it->group)
                {
-                  it->w = it->minw = it->wd->group_item_width;
-                  it->h = it->minh = it->wd->group_item_height;
+                  it->item->w = it->item->minw = it->wd->group_item_width;
+                  it->item->h = it->item->minh = it->wd->group_item_height;
                }
              else
                {
-                  it->w = it->minw = it->wd->item_width;
-                  it->h = it->minh = it->wd->item_height;
+                  it->item->w = it->item->minw = it->wd->item_width;
+                  it->item->h = it->item->minh = it->wd->item_height;
                }
-             it->mincalcd = EINA_TRUE;
+             it->item->mincalcd = EINA_TRUE;
           }
      }
    else
      {
         /* FIXME: If you see that assert, please notify us and we
            will clean our mess */
-        assert(eina_list_count(it->icon_objs) == 0);
+        assert(eina_list_count(it->content_objs) == 0);
 
-        _item_label_realize(it, it->base.view, &it->labels);
-        it->icon_objs = _item_icon_realize(it, it->base.view, &it->icons);
-        _item_state_realize(it, it->base.view, &it->states);
+        _item_text_realize(it, VIEW(it), &it->texts, NULL);
+        it->content_objs = _item_content_realize(it, VIEW(it), &it->contents, NULL);
+        _item_state_realize(it, VIEW(it), &it->states, NULL);
+        if (it->flipped)
+          {
+             edje_object_signal_emit(VIEW(it), "elm,state,flip,enabled", "elm");
+             it->content_objs = _item_flips_realize(it, VIEW(it), &it->contents);
+          }
 
-        if (!it->mincalcd)
+        if (!it->item->mincalcd)
           {
              Evas_Coord mw = -1, mh = -1;
 
              if (!it->display_only)
                elm_coords_finger_size_adjust(1, &mw, 1, &mh);
              if (it->wd->height_for_width) mw = it->wd->prev_viewport_w;
-             edje_object_size_min_restricted_calc(it->base.view, &mw, &mh, mw,
+             edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw,
                                                   mh);
              if (!it->display_only)
                elm_coords_finger_size_adjust(1, &mw, 1, &mh);
-             it->w = it->minw = mw;
-             it->h = it->minh = mh;
-             it->mincalcd = EINA_TRUE;
+             it->item->w = it->item->minw = mw;
+             it->item->h = it->item->minh = mh;
+             it->item->mincalcd = EINA_TRUE;
 
-             if ((!it->wd->group_item_width) && (it->flags == ELM_GENLIST_ITEM_GROUP))
+             if ((!it->wd->group_item_width) && (it->group))
                {
                   it->wd->group_item_width = mw;
                   it->wd->group_item_height = mh;
                }
-             else if ((!it->wd->item_width) && (it->flags == ELM_GENLIST_ITEM_NONE))
+             else if ((!it->wd->item_width) && (it->item->type == ELM_GENLIST_ITEM_NONE))
                {
                   it->wd->item_width = mw;
                   it->wd->item_height = mh;
                }
           }
-        if (!calc) evas_object_show(it->base.view);
+        if (!calc) evas_object_show(VIEW(it));
      }
 
    if (it->tooltip.content_cb)
@@ -1992,7 +2108,7 @@ _item_realize(Elm_Genlist_Item *it,
                                                it->tooltip.content_cb,
                                                it->tooltip.data, NULL);
         elm_widget_item_tooltip_style_set(it, it->tooltip.style);
-        elm_widget_item_tooltip_size_restrict_disable(it, it->tooltip.free_size);
+        elm_widget_item_tooltip_window_mode_set(it, it->tooltip.free_size);
      }
 
    if (it->mouse_cursor)
@@ -2005,57 +2121,44 @@ _item_realize(Elm_Genlist_Item *it,
    //evas_event_thaw(evas_object_evas_get(it->wd->obj));
    //evas_event_thaw_eval(evas_object_evas_get(it->wd->obj));
    if (!calc)
-     evas_object_smart_callback_call(it->base.widget, SIG_REALIZED, it);
-   edje_object_message_signal_process(it->base.view);
+     evas_object_smart_callback_call(WIDGET(it), SIG_REALIZED, it);
+
+   if ((!calc) && (it->wd->edit_mode) && (it->item->type != ELM_GENLIST_ITEM_GROUP))
+     {
+        if (it->itc->edit_item_style)
+          {
+             if (!it->edit_obj) _edit_mode_item_realize(it, EINA_FALSE);
+             edje_object_message_signal_process(it->edit_obj);
+          }
+     }
+   edje_object_message_signal_process(VIEW(it));
 }
 
 static void
-_item_unrealize(Elm_Genlist_Item *it,
-                Eina_Bool         calc)
+_item_unrealize_cb(Elm_Gen_Item *it)
 {
-   Evas_Object *icon;
-
-   if (!it->realized) return;
-   if (it->wd->reorder_it == it) return;
-   evas_event_freeze(evas_object_evas_get(it->wd->obj));
-   if (!calc)
-     evas_object_smart_callback_call(it->base.widget, SIG_UNREALIZED, it);
-   if (it->long_timer)
-     {
-        ecore_timer_del(it->long_timer);
-        it->long_timer = NULL;
-     }
-   if (it->nocache)
+   if (it->item->nocache_once || it->item->nocache)
      {
-        evas_object_del(it->base.view);
-        it->base.view = NULL;
+        evas_object_del(VIEW(it));
+        VIEW(it) = NULL;
         evas_object_del(it->spacer);
         it->spacer = NULL;
      }
    else
      {
-        edje_object_mirrored_set(it->base.view,
-                                 elm_widget_mirrored_get(it->base.widget));
-        edje_object_scale_set(it->base.view,
-                              elm_widget_scale_get(it->base.widget)
+        edje_object_mirrored_set(VIEW(it),
+                                 elm_widget_mirrored_get(WIDGET(it)));
+        edje_object_scale_set(VIEW(it),
+                              elm_widget_scale_get(WIDGET(it))
                               * _elm_config->scale);
         _item_cache_add(it);
      }
-   elm_widget_stringlist_free(it->labels);
-   it->labels = NULL;
-   elm_widget_stringlist_free(it->icons);
-   it->icons = NULL;
-   elm_widget_stringlist_free(it->states);
-
-   EINA_LIST_FREE(it->icon_objs, icon)
-     evas_object_del(icon);
 
    _mode_item_unrealize(it);
    it->states = NULL;
    it->realized = EINA_FALSE;
    it->want_unrealize = EINA_FALSE;
-   evas_event_thaw(evas_object_evas_get(it->wd->obj));
-   evas_event_thaw_eval(evas_object_evas_get(it->wd->obj));
+   if (it->wd->edit_mode) _edit_mode_item_unrealize(it);
 }
 
 static Eina_Bool
@@ -2064,7 +2167,7 @@ _item_block_recalc(Item_Block *itb,
                    Eina_Bool   qadd)
 {
    const Eina_List *l;
-   Elm_Genlist_Item *it;
+   Elm_Gen_Item *it;
    Evas_Coord minw = 0, minh = 0;
    Eina_Bool showme = EINA_FALSE, changed = EINA_FALSE;
    Evas_Coord y = 0;
@@ -2073,37 +2176,38 @@ _item_block_recalc(Item_Block *itb,
    itb->num = in;
    EINA_LIST_FOREACH(itb->items, l, it)
      {
-        if (it->delete_me) continue;
-        showme |= it->showme;
+        if (it->generation < it->wd->generation) continue;
+        showme |= it->item->showme;
         if (!itb->realized)
           {
              if (qadd)
                {
-                  if (!it->mincalcd) changed = EINA_TRUE;
+                  if (!it->item->mincalcd) changed = EINA_TRUE;
                   if (changed)
                     {
                        _item_realize(it, in, EINA_TRUE);
-                       _item_unrealize(it, EINA_TRUE);
+                       _elm_genlist_item_unrealize(it, EINA_TRUE);
                     }
                }
              else
                {
                   _item_realize(it, in, EINA_TRUE);
-                  _item_unrealize(it, EINA_TRUE);
+                  _elm_genlist_item_unrealize(it, EINA_TRUE);
                }
           }
         else
           _item_realize(it, in, EINA_FALSE);
-        minh += it->minh;
-        if (minw < it->minw) minw = it->minw;
+        minh += it->item->minh;
+        if (minw < it->item->minw) minw = it->item->minw;
         in++;
         it->x = 0;
         it->y = y;
-        y += it->h;
+        y += it->item->h;
      }
    itb->minw = minw;
    itb->minh = minh;
    itb->changed = EINA_FALSE;
+   itb->position_update = EINA_FALSE;
    //evas_event_thaw(evas_object_evas_get(itb->wd->obj));
    //evas_event_thaw_eval(evas_object_evas_get(itb->wd->obj));
    return showme;
@@ -2121,14 +2225,14 @@ static void
 _item_block_unrealize(Item_Block *itb)
 {
    const Eina_List *l;
-   Elm_Genlist_Item *it;
+   Elm_Gen_Item *it;
    Eina_Bool dragging = EINA_FALSE;
 
    if (!itb->realized) return;
    evas_event_freeze(evas_object_evas_get(itb->wd->obj));
    EINA_LIST_FOREACH(itb->items, l, it)
      {
-        if (it->flags != ELM_GENLIST_ITEM_GROUP)
+        if (itb->must_recalc || !it->group)
           {
              if (it->dragging)
                {
@@ -2136,7 +2240,7 @@ _item_block_unrealize(Item_Block *itb)
                   it->want_unrealize = EINA_TRUE;
                }
              else
-               _item_unrealize(it, EINA_FALSE);
+               _elm_genlist_item_unrealize(it, EINA_FALSE);
           }
      }
    if (!dragging)
@@ -2151,40 +2255,40 @@ _item_block_unrealize(Item_Block *itb)
 }
 
 static int
-_get_space_for_reorder_item(Elm_Genlist_Item *it)
+_get_space_for_reorder_item(Elm_Gen_Item *it)
 {
    Evas_Coord rox, roy, row, roh, oy, oh;
    Eina_Bool top = EINA_FALSE;
-   Elm_Genlist_Item *reorder_it = it->wd->reorder_it;
+   Elm_Gen_Item *reorder_it = it->wd->reorder_it;
    if (!reorder_it) return 0;
 
    evas_object_geometry_get(it->wd->pan_smart, NULL, &oy, NULL, &oh);
-   evas_object_geometry_get(it->wd->reorder_it->base.view, &rox, &roy, &row, &roh);
+   evas_object_geometry_get(it->wd->VIEW(reorder_it), &rox, &roy, &row, &roh);
 
-   if ((it->wd->reorder_start_y < it->block->y) &&
-       (roy - oy + (roh / 2) >= it->block->y - it->wd->pan_y))
+   if ((it->wd->reorder_start_y < it->item->block->y) &&
+       (roy - oy + (roh / 2) >= it->item->block->y - it->wd->pan_y))
      {
-        it->block->reorder_offset = it->wd->reorder_it->h * -1;
-        if (it->block->count == 1)
+        it->item->block->reorder_offset = it->wd->reorder_it->item->h * -1;
+        if (it->item->block->count == 1)
           it->wd->reorder_rel = it;
      }
-   else if ((it->wd->reorder_start_y >= it->block->y) &&
-            (roy - oy + (roh / 2) <= it->block->y - it->wd->pan_y))
+   else if ((it->wd->reorder_start_y >= it->item->block->y) &&
+            (roy - oy + (roh / 2) <= it->item->block->y - it->wd->pan_y))
      {
-        it->block->reorder_offset = it->wd->reorder_it->h;
+        it->item->block->reorder_offset = it->wd->reorder_it->item->h;
      }
    else
-     it->block->reorder_offset = 0;
+     it->item->block->reorder_offset = 0;
 
-   it->scrl_y += it->block->reorder_offset;
+   it->item->scrl_y += it->item->block->reorder_offset;
 
-   top = (ELM_RECTS_INTERSECT(it->scrl_x, it->scrl_y, it->w, it->h,
+   top = (ELM_RECTS_INTERSECT(it->item->scrl_x, it->item->scrl_y, it->item->w, it->item->h,
                               rox, roy + (roh / 2), row, 1));
    if (top)
      {
         it->wd->reorder_rel = it;
-        it->scrl_y += it->wd->reorder_it->h;
-        return it->wd->reorder_it->h;
+        it->item->scrl_y += it->wd->reorder_it->item->h;
+        return it->wd->reorder_it->item->h;
      }
    else
      return 0;
@@ -2193,38 +2297,42 @@ _get_space_for_reorder_item(Elm_Genlist_Item *it)
 static Eina_Bool
 _reorder_move_animator_cb(void *data)
 {
-   Elm_Genlist_Item *it = data;
+   Elm_Gen_Item *it = data;
    Eina_Bool down = EINA_FALSE;
    double t;
-   int y, dy = it->h / 10 * _elm_config->scale, diff;
+   int y, dy = it->item->h / 10 * _elm_config->scale, diff;
 
    t = ((0.0 > (t = ecore_loop_time_get()-it->wd->start_time)) ? 0.0 : t);
 
    if (t <= REORDER_EFFECT_TIME) y = (1 * sin((t / REORDER_EFFECT_TIME) * (M_PI / 2)) * dy);
    else y = dy;
 
-   diff = abs(it->old_scrl_y - it->scrl_y);
-   if (diff > it->h) y = diff / 2;
+   diff = abs(it->item->old_scrl_y - it->item->scrl_y);
+   if (diff > it->item->h) y = diff / 2;
 
-   if (it->old_scrl_y < it->scrl_y)
+   if (it->item->old_scrl_y < it->item->scrl_y)
      {
-        it->old_scrl_y += y;
+        it->item->old_scrl_y += y;
         down = EINA_TRUE;
      }
-   else if (it->old_scrl_y > it->scrl_y)
+   else if (it->item->old_scrl_y > it->item->scrl_y)
      {
-        it->old_scrl_y -= y;
+        it->item->old_scrl_y -= y;
         down = EINA_FALSE;
      }
-   _item_position(it, it->base.view, it->scrl_x, it->old_scrl_y);
+
+   if (it->edit_obj)
+     _item_position(it, it->edit_obj, it->item->scrl_x, it->item->old_scrl_y);
+   else
+     _item_position(it, VIEW(it), it->item->scrl_x, it->item->old_scrl_y);
    _group_items_recalc(it->wd);
 
    if ((it->wd->reorder_pan_move) ||
-       (down && it->old_scrl_y >= it->scrl_y) ||
-       (!down && it->old_scrl_y <= it->scrl_y))
+       (down && it->item->old_scrl_y >= it->item->scrl_y) ||
+       (!down && it->item->old_scrl_y <= it->item->scrl_y))
      {
-        it->old_scrl_y = it->scrl_y;
-        it->move_effect_enabled = EINA_FALSE;
+        it->item->old_scrl_y = it->item->scrl_y;
+        it->item->move_effect_enabled = EINA_FALSE;
         it->wd->reorder_move_animator = NULL;
         return ECORE_CALLBACK_CANCEL;
      }
@@ -2232,7 +2340,7 @@ _reorder_move_animator_cb(void *data)
 }
 
 static void
-_item_position(Elm_Genlist_Item *it,
+_item_position(Elm_Gen_Item *it,
                Evas_Object      *view,
                Evas_Coord        it_x,
                Evas_Coord        it_y)
@@ -2241,7 +2349,7 @@ _item_position(Elm_Genlist_Item *it,
    if (!view) return;
 
    evas_event_freeze(evas_object_evas_get(it->wd->obj));
-   evas_object_resize(view, it->w, it->h);
+   evas_object_resize(view, it->item->w, it->item->h);
    evas_object_move(view, it_x, it_y);
    evas_object_show(view);
    evas_event_thaw(evas_object_evas_get(it->wd->obj));
@@ -2253,10 +2361,10 @@ _item_block_position(Item_Block *itb,
                      int         in)
 {
    const Eina_List *l;
-   Elm_Genlist_Item *it;
-   Elm_Genlist_Item *git;
+   Elm_Gen_Item *it;
+   Elm_Gen_Item *git;
    Evas_Coord y = 0, ox, oy, ow, oh, cvx, cvy, cvw, cvh;
-   int vis;
+   Eina_Bool vis = EINA_FALSE;
 
    evas_event_freeze(evas_object_evas_get(itb->wd->obj));
    evas_object_geometry_get(itb->wd->pan_smart, &ox, &oy, &ow, &oh);
@@ -2264,17 +2372,17 @@ _item_block_position(Item_Block *itb,
                             &cvw, &cvh);
    EINA_LIST_FOREACH(itb->items, l, it)
      {
-        if (it->delete_me) continue;
+        if (it->generation < it->wd->generation) continue;
         else if (it->wd->reorder_it == it) continue;
         it->x = 0;
         it->y = y;
-        it->w = itb->w;
-        it->scrl_x = itb->x + it->x - it->wd->pan_x + ox;
-        it->scrl_y = itb->y + it->y - it->wd->pan_y + oy;
+        it->item->w = itb->w;
+        it->item->scrl_x = itb->x + it->x - it->wd->pan_x + ox;
+        it->item->scrl_y = itb->y + it->y - it->wd->pan_y + oy;
 
-        vis = (ELM_RECTS_INTERSECT(it->scrl_x, it->scrl_y, it->w, it->h,
+        vis = (ELM_RECTS_INTERSECT(it->item->scrl_x, it->item->scrl_y, it->item->w, it->item->h,
                                    cvx, cvy, cvw, cvh));
-        if (it->flags != ELM_GENLIST_ITEM_GROUP)
+        if (!it->group)
           {
              if ((itb->realized) && (!it->realized))
                {
@@ -2282,52 +2390,59 @@ _item_block_position(Item_Block *itb,
                }
              if (it->realized)
                {
-                  if (vis)
+                  if (vis || it->dragging)
                     {
                        if (it->wd->reorder_mode)
                          y += _get_space_for_reorder_item(it);
-                       git = it->group_item;
+                       git = it->item->group_item;
                        if (git)
                          {
-                            if (git->scrl_y < oy)
-                              git->scrl_y = oy;
-                            if ((git->scrl_y + git->h) > (it->scrl_y + it->h))
-                              git->scrl_y = (it->scrl_y + it->h) - git->h;
-                            git->want_realize = EINA_TRUE;
+                            if (git->item->scrl_y < oy)
+                              git->item->scrl_y = oy;
+                            if ((git->item->scrl_y + git->item->h) > (it->item->scrl_y + it->item->h))
+                              git->item->scrl_y = (it->item->scrl_y + it->item->h) - git->item->h;
+                            git->item->want_realize = EINA_TRUE;
                          }
-                       if ((it->wd->reorder_it) && (it->old_scrl_y != it->scrl_y))
+                       if ((it->wd->reorder_it) && (it->item->old_scrl_y != it->item->scrl_y))
                          {
-                            if (!it->move_effect_enabled)
+                            if (!it->item->move_effect_enabled)
                               {
-                                 it->move_effect_enabled = EINA_TRUE;
+                                 it->item->move_effect_enabled = EINA_TRUE;
                                  it->wd->reorder_move_animator =
                                     ecore_animator_add(
                                        _reorder_move_animator_cb, it);
                               }
                          }
-                       if (!it->move_effect_enabled)
+                       if (!it->item->move_effect_enabled)
                          {
-                            if (it->mode_view)
-                               _item_position(it, it->mode_view, it->scrl_x,
-                                              it->scrl_y);
+                            if ((it->wd->edit_mode) && (it->itc->edit_item_style))
+                              _edit_mode_item_position(it, it->item->scrl_x,
+                                                       it->item->scrl_y);
                             else
-                               _item_position(it, it->base.view, it->scrl_x,
-                                              it->scrl_y);
-                            it->old_scrl_y = it->scrl_y;
+                              {
+                                 if (it->item->mode_view)
+                                   _item_position(it, it->item->mode_view,
+                                                  it->item->scrl_x,
+                                                  it->item->scrl_y);
+                                 else
+                                   _item_position(it, VIEW(it), it->item->scrl_x,
+                                                  it->item->scrl_y);
+                              }
+                            it->item->old_scrl_y = it->item->scrl_y;
                          }
                     }
                   else
                     {
-                       if (!it->dragging) _item_unrealize(it, EINA_FALSE);
+                       _elm_genlist_item_unrealize(it, EINA_FALSE);
                     }
                }
              in++;
           }
         else
           {
-             if (vis) it->want_realize = EINA_TRUE;
+             if (vis) it->item->want_realize = EINA_TRUE;
           }
-        y += it->h;
+        y += it->item->h;
      }
    evas_event_thaw(evas_object_evas_get(itb->wd->obj));
    evas_event_thaw_eval(evas_object_evas_get(itb->wd->obj));
@@ -2338,24 +2453,24 @@ _group_items_recalc(void *data)
 {
    Widget_Data *wd = data;
    Eina_List *l;
-   Elm_Genlist_Item *git;
+   Elm_Gen_Item *git;
 
    evas_event_freeze(evas_object_evas_get(wd->obj));
    EINA_LIST_FOREACH(wd->group_items, l, git)
      {
-        if (git->want_realize)
+        if (git->item->want_realize)
           {
              if (!git->realized)
                _item_realize(git, 0, EINA_FALSE);
-             evas_object_resize(git->base.view, wd->minw, git->h);
-             evas_object_move(git->base.view, git->scrl_x, git->scrl_y);
-             evas_object_show(git->base.view);
-             evas_object_raise(git->base.view);
+             evas_object_resize(VIEW(git), wd->minw, git->item->h);
+             evas_object_move(VIEW(git), git->item->scrl_x, git->item->scrl_y);
+             evas_object_show(VIEW(git));
+             evas_object_raise(VIEW(git));
           }
-        else if (!git->want_realize && git->realized)
+        else if (!git->item->want_realize && git->realized)
           {
              if (!git->dragging)
-               _item_unrealize(git, EINA_FALSE);
+               _elm_genlist_item_unrealize(git, EINA_FALSE);
           }
      }
    evas_event_thaw(evas_object_evas_get(wd->obj));
@@ -2373,19 +2488,74 @@ _must_recalc_idler(void *data)
 }
 
 static void
+_scroll_item(Widget_Data *wd)
+{
+   Elm_Gen_Item *it = NULL;
+   Evas_Coord gith = 0;
+   Evas_Coord ow, oh, dx = 0, dy = 0, dw = 0, dh = 0;
+
+   evas_object_geometry_get(wd->pan_smart, NULL, NULL, &ow, &oh);
+   it = wd->show_item;
+   dx = it->x + it->item->block->x;
+   dy = it->y + it->item->block->y;
+   dw = it->item->block->w;
+   dh = oh;
+   switch (wd->scrollto_type)
+     {
+      case ELM_GENLIST_ITEM_SCROLLTO_TOP:
+         if (it->item->group_item) gith = it->item->group_item->item->h;
+         dy -= gith;
+         break;
+      case ELM_GENLIST_ITEM_SCROLLTO_MIDDLE:
+         dy += (it->item->h / 2 - oh / 2);
+         break;
+      case ELM_GENLIST_ITEM_SCROLLTO_IN:
+      default:
+         if ((wd->expanded_item) &&
+             ((wd->show_item->y + wd->show_item->item->block->y + wd->show_item->item->h)
+              - (wd->expanded_item->y + wd->expanded_item->item->block->y) > oh))
+           {
+              it = wd->expanded_item;
+              if (it->item->group_item) gith = it->item->group_item->item->h;
+              dx = it->x + it->item->block->x;
+              dy = it->y + it->item->block->y - gith;
+              dw = it->item->block->w;
+           }
+         else
+           {
+              if ((it->item->group_item) && (wd->pan_y > (it->y + it->item->block->y)))
+                gith = it->item->group_item->item->h;
+              dy -= gith;
+              dh = it->item->h;
+           }
+         break;
+     }
+   if (wd->bring_in)
+     elm_smart_scroller_region_bring_in(wd->scr, dx, dy, dw, dh);
+   else
+     elm_smart_scroller_child_region_show(wd->scr, dx, dy, dw, dh);
+
+   it->item->showme = EINA_FALSE;
+   wd->show_item = NULL;
+   wd->auto_scroll_enabled = EINA_FALSE;
+   wd->check_scroll = EINA_FALSE;
+}
+
+static void
 _calc_job(void *data)
 {
    Widget_Data *wd = data;
    Item_Block *itb, *chb = NULL;
-   Evas_Coord minw = -1, minh = 0, y = 0, ow;
+   Evas_Coord minw = -1, minh = 0, y = 0, ow, dy = 0, vw;
+   Evas_Coord pan_w = 0, pan_h = 0;
    int in = 0;
-   double t0, t;
    Eina_Bool minw_change = EINA_FALSE;
    Eina_Bool did_must_recalc = EINA_FALSE;
    if (!wd) return;
 
-   t0 = ecore_time_get();
    evas_object_geometry_get(wd->pan_smart, NULL, NULL, &ow, &wd->h);
+   elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, NULL);
+
    if (wd->w != ow)
      wd->w = ow;
 
@@ -2406,14 +2576,14 @@ _calc_job(void *data)
              if (itb->must_recalc)
                {
                   Eina_List *l;
-                  Elm_Genlist_Item *it;
+                  Elm_Gen_Item *it;
                   EINA_LIST_FOREACH(itb->items, l, it)
-                    if (it->mincalcd) it->mincalcd = EINA_FALSE;
+                    if (it->item->mincalcd) it->item->mincalcd = EINA_FALSE;
                   itb->changed = EINA_TRUE;
                   if (itb->must_recalc) did_must_recalc = EINA_TRUE;
+                  if (itb->realized) _item_block_unrealize(itb);
                   itb->must_recalc = EINA_FALSE;
                }
-             if (itb->realized) _item_block_unrealize(itb);
              showme = _item_block_recalc(itb, in, EINA_FALSE);
              chb = itb;
           }
@@ -2426,31 +2596,17 @@ _calc_job(void *data)
              minw = itb->minw;
              minw_change = EINA_TRUE;
           }
+        if (minw > vw)
+          {
+             minw = vw;
+             minw_change = EINA_TRUE;
+          }
         itb->w = minw;
         itb->h = itb->minh;
         y += itb->h;
         in += itb->count;
-        if ((showme) && (wd->show_item) && (!wd->show_item->queued))
-          {
-             wd->show_item->showme = EINA_FALSE;
-             if (wd->bring_in)
-               elm_smart_scroller_region_bring_in(wd->scr,
-                                                  wd->show_item->x +
-                                                  wd->show_item->block->x,
-                                                  wd->show_item->y +
-                                                  wd->show_item->block->y,
-                                                  wd->show_item->block->w,
-                                                  wd->show_item->h);
-             else
-               elm_smart_scroller_child_region_show(wd->scr,
-                                                    wd->show_item->x +
-                                                    wd->show_item->block->x,
-                                                    wd->show_item->y +
-                                                    wd->show_item->block->y,
-                                                    wd->show_item->block->w,
-                                                    wd->show_item->h);
-             wd->show_item = NULL;
-          }
+        if ((showme) && (wd->show_item) && (!wd->show_item->item->queued))
+          wd->check_scroll = EINA_TRUE;
      }
    if (minw_change)
      {
@@ -2475,25 +2631,48 @@ _calc_job(void *data)
         wd->minh = minh;
         evas_object_smart_callback_call(wd->pan_smart, "changed", NULL);
         _sizing_eval(wd->obj);
-        if ((wd->anchor_item) && (wd->anchor_item->block) && (!wd->auto_scroll_enabled))
+        if ((wd->anchor_item) && (wd->anchor_item->item->block) && (!wd->auto_scroll_enabled))
           {
-             Elm_Genlist_Item *it;
+             Elm_Gen_Item *it;
              Evas_Coord it_y;
 
              it = wd->anchor_item;
              it_y = wd->anchor_y;
              elm_smart_scroller_child_pos_set(wd->scr, wd->pan_x,
-                                              it->block->y + it->y + it_y);
+                                              it->item->block->y + it->y + it_y);
              wd->anchor_item = it;
              wd->anchor_y = it_y;
           }
      }
-   t = ecore_time_get();
    if (did_must_recalc)
      {
         if (!wd->must_recalc_idler)
           wd->must_recalc_idler = ecore_idler_add(_must_recalc_idler, wd);
      }
+   if (wd->check_scroll)
+     {
+        _pan_child_size_get(wd->pan_smart, &pan_w, &pan_h);
+        if (EINA_INLIST_GET(wd->show_item) == wd->items->last)
+          wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_IN;
+       switch (wd->scrollto_type)
+          {
+           case ELM_GENLIST_ITEM_SCROLLTO_TOP:
+              dy = wd->h;
+              break;
+           case ELM_GENLIST_ITEM_SCROLLTO_MIDDLE:
+              dy = wd->h / 2;
+              break;
+           case ELM_GENLIST_ITEM_SCROLLTO_IN:
+           default:
+              dy = 0;
+              break;
+          }
+        if ((pan_w > (wd->show_item->x + wd->show_item->item->block->x)) &&
+            (pan_h > (wd->show_item->y + wd->show_item->item->block->y + dy)))
+          {
+             _scroll_item(wd);
+          }
+     }
    wd->calc_job = NULL;
    evas_object_smart_changed(wd->pan_smart);
    evas_event_thaw(evas_object_evas_get(wd->obj));
@@ -2516,7 +2695,7 @@ _update_job(void *data)
    EINA_INLIST_FOREACH(wd->blocks, itb)
      {
         Evas_Coord itminw, itminh;
-        Elm_Genlist_Item *it;
+        Elm_Gen_Item *it;
 
         if (!itb->updateme)
           {
@@ -2529,24 +2708,24 @@ _update_job(void *data)
         recalc = EINA_FALSE;
         EINA_LIST_FOREACH(itb->items, l2, it)
           {
-             if (it->updateme)
+             if (it->item->updateme)
                {
-                  itminw = it->minw;
-                  itminh = it->minh;
+                  itminw = it->item->minw;
+                  itminh = it->item->minh;
 
-                  it->updateme = EINA_FALSE;
+                  it->item->updateme = EINA_FALSE;
                   if (it->realized)
                     {
-                       _item_unrealize(it, EINA_FALSE);
+                       _elm_genlist_item_unrealize(it, EINA_FALSE);
                        _item_realize(it, num, EINA_FALSE);
                        position = EINA_TRUE;
                     }
                   else
                     {
                        _item_realize(it, num, EINA_TRUE);
-                       _item_unrealize(it, EINA_TRUE);
+                       _elm_genlist_item_unrealize(it, EINA_TRUE);
                     }
-                  if ((it->minw != itminw) || (it->minh != itminh))
+                  if ((it->item->minw != itminw) || (it->item->minh != itminh))
                     recalc = EINA_TRUE;
                }
              num++;
@@ -2596,7 +2775,7 @@ _pan_set(Evas_Object *obj,
      {
         if ((itb->y + itb->h) > y)
           {
-             Elm_Genlist_Item *it;
+             Elm_Gen_Item *it;
              Eina_List *l2;
 
              EINA_LIST_FOREACH(itb->items, l2, it)
@@ -2720,7 +2899,7 @@ _pan_resize(Evas_Object *obj,
         if (sd->resize_job) ecore_job_del(sd->resize_job);
         sd->resize_job = ecore_job_add(_pan_resize_job, sd);
      }
-   sd->wd->pan_resized = EINA_TRUE;
+   sd->wd->pan_changed = EINA_TRUE;
    evas_object_smart_changed(obj);
    if (sd->wd->calc_job) ecore_job_del(sd->wd->calc_job);
    sd->wd->calc_job = NULL;
@@ -2737,23 +2916,23 @@ _pan_calculate(Evas_Object *obj)
    Item_Block *itb;
    Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh;
    int in = 0;
-   Elm_Genlist_Item *git;
+   Elm_Gen_Item *git;
    Eina_List *l;
 
    if (!sd) return;
    evas_event_freeze(evas_object_evas_get(obj));
-   
-   if (sd->wd->pan_resized)
+
+   if (sd->wd->pan_changed)
      {
         _calc_job(sd->wd);
-        sd->wd->pan_resized = EINA_FALSE;
+        sd->wd->pan_changed = EINA_FALSE;
      }
-   
+
    evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
    evas_output_viewport_get(evas_object_evas_get(obj), &cvx, &cvy, &cvw, &cvh);
    EINA_LIST_FOREACH(sd->wd->group_items, l, git)
      {
-        git->want_realize = EINA_FALSE;
+        git->item->want_realize = EINA_FALSE;
      }
    EINA_INLIST_FOREACH(sd->wd->blocks, itb)
      {
@@ -2780,7 +2959,7 @@ _pan_calculate(Evas_Object *obj)
         if (sd->wd->pan_y != sd->wd->reorder_old_pan_y)
            sd->wd->reorder_pan_move = EINA_TRUE;
         else sd->wd->reorder_pan_move = EINA_FALSE;
-        evas_object_raise(sd->wd->reorder_it->base.view);
+        evas_object_raise(sd->wd->VIEW(reorder_it));
         sd->wd->reorder_old_pan_y = sd->wd->pan_y;
         sd->wd->start_time = ecore_loop_time_get();
      }
@@ -2797,8 +2976,11 @@ _pan_move(Evas_Object *obj,
    Pan *sd = evas_object_smart_data_get(obj);
 
    if (!sd) return;
+
+   sd->wd->pan_changed = EINA_TRUE;
+   evas_object_smart_changed(obj);
    if (sd->wd->calc_job) ecore_job_del(sd->wd->calc_job);
-   sd->wd->calc_job = ecore_job_add(_calc_job, sd->wd);
+   sd->wd->calc_job = NULL;
 }
 
 static void
@@ -2879,7 +3061,6 @@ _edge_left(void        *data,
            void        *event_info __UNUSED__)
 {
    Evas_Object *obj = data;
-   evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_LEFT, NULL);
    evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL);
 }
 
@@ -2889,7 +3070,6 @@ _edge_right(void        *data,
             void        *event_info __UNUSED__)
 {
    Evas_Object *obj = data;
-   evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_RIGHT, NULL);
    evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL);
 }
 
@@ -2899,7 +3079,6 @@ _edge_top(void        *data,
           void        *event_info __UNUSED__)
 {
    Evas_Object *obj = data;
-   evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_TOP, NULL);
    evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL);
 }
 
@@ -2909,60 +3088,59 @@ _edge_bottom(void        *data,
              void        *event_info __UNUSED__)
 {
    Evas_Object *obj = data;
-   evas_object_smart_callback_call(obj, SIG_SCROLL_EDGE_BOTTOM, NULL);
    evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL);
 }
 
 static void
-_mode_item_realize(Elm_Genlist_Item *it)
+_mode_item_realize(Elm_Gen_Item *it)
 {
    char buf[1024];
 
-   if ((it->mode_view) || (it->delete_me)) return;
+   if ((it->item->mode_view) || (it->generation < it->wd->generation)) return;
 
    evas_event_freeze(evas_object_evas_get(it->wd->obj));
-   it->mode_view = edje_object_add(evas_object_evas_get(it->base.widget));
-   edje_object_scale_set(it->mode_view,
-                         elm_widget_scale_get(it->base.widget) *
+   it->item->mode_view = edje_object_add(evas_object_evas_get(WIDGET(it)));
+   edje_object_scale_set(it->item->mode_view,
+                         elm_widget_scale_get(WIDGET(it)) *
                          _elm_config->scale);
-   evas_object_smart_member_add(it->mode_view, it->wd->pan_smart);
-   elm_widget_sub_object_add(it->base.widget, it->mode_view);
+   evas_object_smart_member_add(it->item->mode_view, it->wd->pan_smart);
+   elm_widget_sub_object_add(WIDGET(it), it->item->mode_view);
 
-   strncpy(buf, "it", sizeof(buf));
+   strncpy(buf, "item", sizeof(buf));
    if (it->wd->compress)
      strncat(buf, "_compress", sizeof(buf) - strlen(buf));
 
-   if (it->order_num_in & 0x1) strncat(buf, "_odd", sizeof(buf) - strlen(buf));
+   if (it->item->order_num_in & 0x1) strncat(buf, "_odd", sizeof(buf) - strlen(buf));
    strncat(buf, "/", sizeof(buf) - strlen(buf));
    strncat(buf, it->itc->mode_item_style, sizeof(buf) - strlen(buf));
 
-   _elm_theme_object_set(it->base.widget, it->mode_view, "genlist", buf,
-                         elm_widget_style_get(it->base.widget));
-   edje_object_mirrored_set(it->mode_view,
-                            elm_widget_mirrored_get(it->base.widget));
+   _elm_theme_object_set(WIDGET(it), it->item->mode_view, "genlist", buf,
+                         elm_widget_style_get(WIDGET(it)));
+   edje_object_mirrored_set(it->item->mode_view,
+                            elm_widget_mirrored_get(WIDGET(it)));
 
    /* signal callback add */
-   evas_object_event_callback_add(it->mode_view, EVAS_CALLBACK_MOUSE_DOWN,
+   evas_object_event_callback_add(it->item->mode_view, EVAS_CALLBACK_MOUSE_DOWN,
                                   _mouse_down, it);
-   evas_object_event_callback_add(it->mode_view, EVAS_CALLBACK_MOUSE_UP,
+   evas_object_event_callback_add(it->item->mode_view, EVAS_CALLBACK_MOUSE_UP,
                                   _mouse_up, it);
-   evas_object_event_callback_add(it->mode_view, EVAS_CALLBACK_MOUSE_MOVE,
+   evas_object_event_callback_add(it->item->mode_view, EVAS_CALLBACK_MOUSE_MOVE,
                                   _mouse_move, it);
 
-   /* label_get, icon_get, state_get */
+   /* text_get, content_get, state_get */
    /* FIXME: If you see that assert, please notify us and we
       will clean our mess */
-   assert(eina_list_count(it->mode_icon_objs) == 0);
+   assert(eina_list_count(it->item->mode_content_objs) == 0);
 
-   _item_label_realize(it, it->mode_view, &it->mode_labels);
-   it->mode_icon_objs = _item_icon_realize(it,
-                                          it->mode_view,
-                                          &it->mode_icons);
-   _item_state_realize(it, it->mode_view, &it->mode_states);
+   _item_text_realize(it, it->item->mode_view, &it->item->mode_texts, NULL);
+   it->item->mode_content_objs =
+     _item_content_realize(it, it->item->mode_view,
+                           &it->item->mode_contents, NULL);
+   _item_state_realize(it, it->item->mode_view, &it->item->mode_states, NULL);
 
-   edje_object_part_swallow(it->mode_view,
-                            edje_object_data_get(it->mode_view, "mode_part"),
-                            it->base.view);
+   edje_object_part_swallow(it->item->mode_view,
+                            edje_object_data_get(it->item->mode_view, "mode_part"),
+                            VIEW(it));
 
    it->want_unrealize = EINA_FALSE;
    evas_event_thaw(evas_object_evas_get(it->wd->obj));
@@ -2970,26 +3148,26 @@ _mode_item_realize(Elm_Genlist_Item *it)
 }
 
 static void
-_mode_item_unrealize(Elm_Genlist_Item *it)
+_mode_item_unrealize(Elm_Gen_Item *it)
 {
    Widget_Data *wd = it->wd;
-   Evas_Object *icon;
-   if (!it->mode_view) return;
+   Evas_Object *content;
+   if (!it->item->mode_view) return;
 
    evas_event_freeze(evas_object_evas_get(it->wd->obj));
-   elm_widget_stringlist_free(it->mode_labels);
-   it->mode_labels = NULL;
-   elm_widget_stringlist_free(it->mode_icons);
-   it->mode_icons = NULL;
-   elm_widget_stringlist_free(it->mode_states);
+   elm_widget_stringlist_free(it->item->mode_texts);
+   it->item->mode_texts = NULL;
+   elm_widget_stringlist_free(it->item->mode_contents);
+   it->item->mode_contents = NULL;
+   elm_widget_stringlist_free(it->item->mode_states);
 
-   EINA_LIST_FREE(it->mode_icon_objs, icon)
-     evas_object_del(icon);
+   EINA_LIST_FREE(it->item->mode_content_objs, content)
+     evas_object_del(content);
 
-   edje_object_part_unswallow(it->mode_view, it->base.view);
-   evas_object_smart_member_add(it->base.view, wd->pan_smart);
-   evas_object_del(it->mode_view);
-   it->mode_view = NULL;
+   edje_object_part_unswallow(it->item->mode_view, VIEW(it));
+   evas_object_smart_member_add(VIEW(it), wd->pan_smart);
+   evas_object_del(it->item->mode_view);
+   it->item->mode_view = NULL;
 
    if (wd->mode_item == it)
      wd->mode_item = NULL;
@@ -2998,7 +3176,7 @@ _mode_item_unrealize(Elm_Genlist_Item *it)
 }
 
 static void
-_item_mode_set(Elm_Genlist_Item *it)
+_item_mode_set(Elm_Gen_Item *it)
 {
    if (!it) return;
    Widget_Data *wd = it->wd;
@@ -3006,7 +3184,7 @@ _item_mode_set(Elm_Genlist_Item *it)
    char buf[1024];
 
    wd->mode_item = it;
-   it->nocache = EINA_TRUE;
+   it->item->nocache_once = EINA_TRUE;
 
    if (wd->scr_hold_timer)
      {
@@ -3018,14 +3196,14 @@ _item_mode_set(Elm_Genlist_Item *it)
 
    evas_event_freeze(evas_object_evas_get(it->wd->obj));
    _mode_item_realize(it);
-   if (it->group_item)
-     evas_object_raise(it->group_item->base.view);
-   _item_position(it, it->mode_view, it->scrl_x, it->scrl_y);
+   if (it->item->group_item)
+     evas_object_raise(it->item->VIEW(group_item));
+   _item_position(it, it->item->mode_view, it->item->scrl_x, it->item->scrl_y);
    evas_event_thaw(evas_object_evas_get(it->wd->obj));
    evas_event_thaw_eval(evas_object_evas_get(it->wd->obj));
 
    snprintf(buf, sizeof(buf), "elm,state,%s,active", wd->mode_type);
-   edje_object_signal_emit(it->mode_view, buf, "elm");
+   edje_object_signal_emit(it->item->mode_view, buf, "elm");
 }
 
 static void
@@ -3034,37 +3212,160 @@ _item_mode_unset(Widget_Data *wd)
    if (!wd) return;
    if (!wd->mode_item) return;
    char buf[1024], buf2[1024];
-   Elm_Genlist_Item *it;
+   Elm_Gen_Item *it;
 
    it = wd->mode_item;
-   it->nocache = EINA_TRUE;
+   it->item->nocache_once = EINA_TRUE;
 
    snprintf(buf, sizeof(buf), "elm,state,%s,passive", wd->mode_type);
    snprintf(buf2, sizeof(buf2), "elm,state,%s,passive,finished", wd->mode_type);
 
-   edje_object_signal_emit(it->mode_view, buf, "elm");
-   edje_object_signal_callback_add(it->mode_view, buf2, "elm", _mode_finished_signal_cb, it);
+   edje_object_signal_emit(it->item->mode_view, buf, "elm");
+   edje_object_signal_callback_add(it->item->mode_view, buf2, "elm", _mode_finished_signal_cb, it);
 
    wd->mode_item = NULL;
 }
 
 static void
-_item_auto_scroll(Widget_Data *wd)
+_edit_mode_item_position(Elm_Gen_Item *it, int itx, int ity)
 {
-   if (!wd) return;
-   Elm_Genlist_Item  *it;
-   Eina_List *l;
-   Evas_Coord ox, oy, ow, oh;
+   if ((!it) || (!it->wd->edit_mode)) return;
+   evas_object_resize(it->edit_obj, it->item->w, it->item->h);
+   evas_object_move(it->edit_obj, itx, ity);
+}
 
-   if ((wd->expanded_item) && (wd->auto_scroll_enabled))
-     {
-        evas_object_geometry_get(wd->obj, &ox, &oy, &ow, &oh);
-        if (wd->expanded_item->scrl_y > (oh + oy) / 2)
-          {
-             EINA_LIST_FOREACH(wd->expanded_item->items, l, it)
-                elm_genlist_item_bring_in(it);
+static void
+_edit_mode_item_realize(Elm_Gen_Item *it, Eina_Bool effect_on)
+{
+   char buf[1024];
+   const char *stacking_even;
+   const char *stacking;
+
+   if ((!it) || (it->item->edit_mode_item_realized) ||
+       (it->generation < it->wd->generation))
+     return;
+
+   it->edit_obj = edje_object_add(evas_object_evas_get(WIDGET(it)));
+   edje_object_scale_set(it->edit_obj, elm_widget_scale_get(WIDGET(it)) *
+                         _elm_config->scale);
+   evas_object_smart_member_add(it->edit_obj, it->wd->pan_smart);
+   elm_widget_sub_object_add(WIDGET(it), it->edit_obj);
+
+   if (it->item->type & ELM_GENLIST_ITEM_SUBITEMS)
+      strncpy(buf, "tree", sizeof(buf));
+   else strncpy(buf, "item", sizeof(buf));
+   if (it->wd->compress)
+      strncat(buf, "_compress", sizeof(buf) - strlen(buf));
+
+   strncat(buf, "/", sizeof(buf) - strlen(buf));
+   strncat(buf, it->itc->edit_item_style, sizeof(buf) - strlen(buf));
+
+   _elm_theme_object_set(WIDGET(it),  it->edit_obj, "genlist", buf,
+                         elm_widget_style_get(WIDGET(it)));
+
+   stacking_even = edje_object_data_get(VIEW(it), "stacking_even");
+   if (!stacking_even) stacking_even = "above";
+   it->item->stacking_even = !!strcmp("above", stacking_even);
+
+   stacking = edje_object_data_get(VIEW(it), "stacking");
+   if (!stacking) stacking = "yes";
+   it->item->nostacking = !!strcmp("yes", stacking);
+
+   edje_object_mirrored_set(it->edit_obj,
+                            elm_widget_mirrored_get(WIDGET(it)));
+
+   _elm_genlist_item_odd_even_update(it);
+   _elm_genlist_item_state_update(it, NULL);
+
+   if (effect_on) edje_object_signal_emit(it->edit_obj, "elm,state,edit,enabled,effect", "elm");
+   else edje_object_signal_emit(it->edit_obj, "elm,state,edit,enabled", "elm");
+
+   evas_object_event_callback_add(it->edit_obj, EVAS_CALLBACK_MOUSE_DOWN,
+                                  _mouse_down, it);
+   evas_object_event_callback_add(it->edit_obj, EVAS_CALLBACK_MOUSE_UP,
+                                  _mouse_up, it);
+   evas_object_event_callback_add(it->edit_obj, EVAS_CALLBACK_MOUSE_MOVE,
+                                  _mouse_move, it);
+   evas_object_event_callback_add(it->edit_obj, EVAS_CALLBACK_MULTI_DOWN,
+                                  _multi_down, it);
+   evas_object_event_callback_add(it->edit_obj, EVAS_CALLBACK_MULTI_UP,
+                                  _multi_up, it);
+   evas_object_event_callback_add(it->edit_obj, EVAS_CALLBACK_MULTI_MOVE,
+                                  _multi_move, it);
+
+   _item_text_realize(it, it->edit_obj, &it->item->edit_texts, NULL);
+   if (it->flipped)  edje_object_signal_emit(it->edit_obj, "elm,state,flip,enabled", "elm");
+   it->item->edit_content_objs =
+     _item_content_realize(it, it->edit_obj, &it->item->edit_contents, NULL);
+   _item_state_realize(it, it->edit_obj, &it->item->edit_states, NULL);
+   edje_object_part_swallow(it->edit_obj, "elm.swallow.edit.content", VIEW(it));
+
+   _edit_mode_item_position(it, it->item->scrl_x, it->item->scrl_y);
+   evas_object_show(it->edit_obj);
+
+   it->item->edit_mode_item_realized = EINA_TRUE;
+   it->want_unrealize = EINA_FALSE;
+}
+
+static void
+_edit_mode_item_unrealize(Elm_Gen_Item *it)
+{
+   Evas_Object *icon;
+   if ((!it) || (!it->item->edit_mode_item_realized)) return;
+
+   edje_object_part_unswallow(it->edit_obj, VIEW(it));
+   evas_object_smart_member_add(VIEW(it), it->wd->pan_smart);
+   elm_widget_sub_object_add(WIDGET(it), VIEW(it));
+   _elm_genlist_item_odd_even_update(it);
+   _elm_genlist_item_state_update(it, NULL);
+
+   evas_object_del(it->edit_obj);
+   it->edit_obj = NULL;
+   elm_widget_stringlist_free(it->item->edit_texts);
+   it->item->edit_texts = NULL;
+   elm_widget_stringlist_free(it->item->edit_contents);
+   it->item->edit_contents = NULL;
+   elm_widget_stringlist_free(it->item->edit_states);
+   it->item->edit_states = NULL;
+   EINA_LIST_FREE(it->item->edit_content_objs, icon)
+     evas_object_del(icon);
+   edje_object_message_signal_process(it->edit_obj);
+
+   evas_object_event_callback_del_full(it->edit_obj, EVAS_CALLBACK_MOUSE_DOWN,
+                                       _mouse_down, it);
+   evas_object_event_callback_del_full(it->edit_obj, EVAS_CALLBACK_MOUSE_UP,
+                                       _mouse_up, it);
+   evas_object_event_callback_del_full(it->edit_obj, EVAS_CALLBACK_MOUSE_MOVE,
+                                       _mouse_move, it);
+   evas_object_event_callback_del_full(it->edit_obj, EVAS_CALLBACK_MULTI_DOWN,
+                                       _multi_down, it);
+   evas_object_event_callback_del_full(it->edit_obj, EVAS_CALLBACK_MULTI_UP,
+                                       _multi_up, it);
+   evas_object_event_callback_del_full(it->edit_obj, EVAS_CALLBACK_MULTI_MOVE,
+                                       _multi_move, it);
+   it->item->edit_mode_item_realized = EINA_FALSE;
+}
+
+static void
+_item_auto_scroll(Widget_Data *wd)
+{
+   if (!wd) return;
+   Elm_Gen_Item  *tmp_item = NULL;
+
+   if ((wd->expanded_item) && (wd->auto_scroll_enabled))
+     {
+        tmp_item = eina_list_data_get(eina_list_last(wd->expanded_item->item->items));
+        if (!tmp_item) return;
+        wd->show_item = tmp_item;
+        wd->bring_in = EINA_TRUE;
+        wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_IN;
+        if ((wd->show_item->item->queued) || (!wd->show_item->item->mincalcd))
+          {
+             wd->show_item->item->showme = EINA_TRUE;
+             wd->auto_scroll_enabled = EINA_FALSE;
           }
-        wd->auto_scroll_enabled = EINA_FALSE;
+        else
+          _scroll_item(wd);
      }
 }
 
@@ -3096,6 +3397,7 @@ elm_genlist_add(Evas_Object *parent)
    ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
 
    ELM_SET_WIDTYPE(widtype, "genlist");
+   ELM_GEN_SETUP(wd);
    elm_widget_type_set(obj, "genlist");
    elm_widget_sub_object_add(parent, obj);
    elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
@@ -3109,6 +3411,7 @@ elm_genlist_add(Evas_Object *parent)
    elm_widget_on_show_region_hook_set(obj, _show_region_hook, obj);
    elm_widget_translate_hook_set(obj, _translate_hook);
 
+   wd->generation = 1;
    wd->scr = elm_smart_scroller_add(e);
    elm_smart_scroller_widget_set(wd->scr, obj);
    elm_smart_scroller_object_theme_set(obj, wd->scr, "genlist", "base",
@@ -3156,107 +3459,319 @@ elm_genlist_add(Evas_Object *parent)
    return obj;
 }
 
-static Elm_Genlist_Item *
-_item_new(Widget_Data                  *wd,
-          const Elm_Genlist_Item_Class *itc,
-          const void                   *data,
-          Elm_Genlist_Item             *parent,
-          Elm_Genlist_Item_Flags        flags,
-          Evas_Smart_Cb                 func,
-          const void                   *func_data)
+void
+_item_select(Elm_Gen_Item *it)
 {
-   Elm_Genlist_Item *it;
+   if ((it->wd->no_select) || (it->generation < it->wd->generation) || (it->mode_set)) return;
+   if (!it->selected)
+     {
+        it->selected = EINA_TRUE;
+        it->wd->selected = eina_list_append(it->wd->selected, it);
+     }
+   else if (!it->wd->always_select) return;
 
-   it = elm_widget_item_new(wd->obj, Elm_Genlist_Item);
+   evas_object_ref(WIDGET(it));
+   it->walking++;
+   it->wd->walking++;
+   if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), it);
+   if (it->generation == it->wd->generation)
+     evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, it);
+   it->walking--;
+   it->wd->walking--;
+   evas_object_unref(WIDGET(it));
+   if ((it->wd->clear_me) && (!it->wd->walking))
+     _elm_genlist_clear(WIDGET(it), EINA_TRUE);
+   else
+     {
+        if ((!it->walking) && (it->generation < it->wd->generation))
+          {
+             if (!it->relcount)
+               {
+                  it->del_cb(it);
+                  elm_widget_item_free(it);
+               }
+          }
+        else
+          it->wd->last_selected_item = (Elm_Object_Item *)it;
+     }
+}
+
+static Evas_Object *
+_item_content_get_hook(Elm_Gen_Item *it, const char *part)
+{
+   return edje_object_part_swallow_get(VIEW(it), part);
+}
+
+static void
+_item_content_set_hook(Elm_Gen_Item *it, const char *part, Evas_Object *content)
+{
+   if (content && part)
+     {
+        it->content_objs = eina_list_append(it->content_objs, content);
+        edje_object_part_swallow(VIEW(it), part, content);
+     }
+}
+
+static Evas_Object *
+_item_content_unset_hook(Elm_Gen_Item *it, const char *part)
+{
+   Evas_Object *obj;
+   obj = edje_object_part_swallow_get(VIEW(it), part);
+   if (!obj) return NULL;
+   it->content_objs = eina_list_remove(it->content_objs, obj);
+   edje_object_part_unswallow(VIEW(it), obj);
+   return obj;
+}
+
+static const char *
+_item_text_hook(Elm_Gen_Item *it, const char *part)
+{
+   if (!it->itc->func.text_get) return NULL;
+   return edje_object_part_text_get(VIEW(it), part);
+}
+
+static void
+_item_disable_hook(Elm_Object_Item *it)
+{
+   Eina_List *l;
+   Evas_Object *obj;
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+
+   if (_it->generation < _it->wd->generation) return;
+
+   if (_it->selected)
+     elm_genlist_item_selected_set(it, EINA_FALSE);
+
+   if (_it->realized)
+     {
+        if (elm_widget_item_disabled_get(it))
+          {
+             edje_object_signal_emit(VIEW(_it), "elm,state,disabled", "elm");
+             if (_it->edit_obj)
+               edje_object_signal_emit(_it->edit_obj, "elm,state,disabled", "elm");
+          }
+        else
+          {
+             edje_object_signal_emit(VIEW(_it), "elm,state,enabled", "elm");
+             if (_it->edit_obj)
+               edje_object_signal_emit(_it->edit_obj, "elm,state,enabled", "elm");
+          }
+        EINA_LIST_FOREACH(_it->content_objs, l, obj)
+          elm_widget_disabled_set(obj, elm_widget_item_disabled_get(_it));
+     }
+}
+
+static Eina_Bool
+_item_del_pre_hook(Elm_Object_Item *it)
+{
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+
+   if ((_it->relcount > 0) || (_it->walking > 0))
+     {
+        elm_genlist_item_subitems_clear(it);
+        if (_it->wd->show_item == _it) _it->wd->show_item = NULL;
+        _elm_genlist_item_del_notserious(_it);
+        if (_it->item->block)
+          {
+             if (_it->realized) _elm_genlist_item_unrealize(_it, EINA_FALSE);
+             _it->item->block->changed = EINA_TRUE;
+             if (_it->wd->calc_job) ecore_job_del(_it->wd->calc_job);
+             _it->wd->calc_job = ecore_job_add(_calc_job, _it->wd);
+          }
+        if (_it->parent)
+          {
+             _it->parent->item->items =
+                eina_list_remove(_it->parent->item->items, it);
+             _it->parent = NULL;
+          }
+        return EINA_FALSE;
+     }
+   _item_del(_it);
+   return EINA_TRUE;
+}
+
+Elm_Gen_Item *
+_elm_genlist_item_new(Widget_Data              *wd,
+                      const Elm_Gen_Item_Class *itc,
+                      const void               *data,
+                      Elm_Gen_Item             *parent,
+                      Evas_Smart_Cb             func,
+                      const void               *func_data)
+{
+   Elm_Gen_Item *it;
+
+   it = elm_widget_item_new(wd->obj, Elm_Gen_Item);
    if (!it) return NULL;
    it->wd = wd;
+   it->generation = wd->generation;
    it->itc = itc;
+   elm_genlist_item_class_ref((Elm_Genlist_Item_Class *)itc);
    it->base.data = data;
    it->parent = parent;
-   it->flags = flags;
    it->func.func = func;
    it->func.data = func_data;
-   it->mouse_cursor = NULL;
-   it->expanded_depth = 0;
-   elm_widget_item_text_get_hook_set(it, _item_label_hook);
-   elm_widget_item_del_cb_set(it, _item_del_hook);
+   elm_widget_item_content_get_hook_set(it, _item_content_get_hook);
+   elm_widget_item_content_set_hook_set(it, _item_content_set_hook);
+   elm_widget_item_content_unset_hook_set(it, _item_content_unset_hook);
+   elm_widget_item_text_get_hook_set(it, _item_text_hook);
+   elm_widget_item_disable_hook_set(it, _item_disable_hook);
+   elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook);
+   /* TEMPORARY */
+   it->sel_cb = (Ecore_Cb)_item_select;
+
+   return it;
+}
+
+static Elm_Gen_Item *
+_item_new(Widget_Data                  *wd,
+          const Elm_Genlist_Item_Class *itc,
+          const void                   *data,
+          Elm_Gen_Item                 *parent,
+          Elm_Genlist_Item_Type         type,
+          Evas_Smart_Cb                 func,
+          const void                   *func_data)
+{
+   Elm_Gen_Item *it, *it2;
+   int depth = 0;
 
+   it = _elm_genlist_item_new(wd, itc, data, parent, func, func_data);
+   if (!it) return NULL;
+   it->item = ELM_NEW(Elm_Gen_Item_Type);
+   it->item->type = type;
+   if (type & ELM_GENLIST_ITEM_GROUP) it->group++;
+   it->item->expanded_depth = 0;
+   ELM_GEN_ITEM_SETUP(it);
    if (it->parent)
      {
-        if (it->parent->flags & ELM_GENLIST_ITEM_GROUP)
-          it->group_item = parent;
-        else if (it->parent->group_item)
-          it->group_item = it->parent->group_item;
+        if (it->parent->group)
+          it->item->group_item = parent;
+        else if (it->parent->item->group_item)
+          it->item->group_item = it->parent->item->group_item;
      }
+   for (it2 = it, depth = 0; it2->parent; it2 = it2->parent)
+     {
+        if (!it2->parent->group) depth += 1;
+     }
+   it->item->expanded_depth = depth;
+   wd->item_count++;
    return it;
 }
 
-static void
-_item_block_add(Widget_Data      *wd,
-                Elm_Genlist_Item *it)
+static Item_Block *
+_item_block_new(Widget_Data *wd, Eina_Bool prepend)
+{
+   Item_Block *itb;
+
+   itb = calloc(1, sizeof(Item_Block));
+   if (!itb) return NULL;
+   itb->wd = wd;
+   if (prepend)
+     {
+        wd->blocks = eina_inlist_prepend(wd->blocks, EINA_INLIST_GET(itb));
+        _item_block_position_update(wd->blocks, 0);
+     }
+   else
+     {
+        wd->blocks = eina_inlist_append(wd->blocks, EINA_INLIST_GET(itb));
+        itb->position_update = EINA_TRUE;
+        if (wd->blocks != EINA_INLIST_GET(itb))
+          {
+             itb->position = ((Item_Block *) (EINA_INLIST_GET(itb)->prev))->position + 1;
+          }
+        else
+          {
+             itb->position = 0;
+          }
+     }
+   return itb;
+}
+
+static Eina_Bool
+_item_block_add(Widget_Data *wd,
+                Elm_Gen_Item *it)
 {
    Item_Block *itb = NULL;
 
-   if (!it->rel)
+   if (!it->item->rel)
      {
 newblock:
-        if (it->rel)
+        if (it->item->rel)
           {
              itb = calloc(1, sizeof(Item_Block));
-             if (!itb) return;
+             if (!itb) return EINA_FALSE;
              itb->wd = wd;
-             if (!it->rel->block)
+             if (!it->item->rel->item->block)
                {
                   wd->blocks =
                     eina_inlist_append(wd->blocks, EINA_INLIST_GET(itb));
                   itb->items = eina_list_append(itb->items, it);
+                  itb->position_update = EINA_TRUE;
+                  it->position = eina_list_count(itb->items);
+                  it->position_update = EINA_TRUE;
+
+                  if (wd->blocks != EINA_INLIST_GET(itb))
+                    {
+                       itb->position = ((Item_Block *) (EINA_INLIST_GET(itb)->prev))->position + 1;
+                    }
+                  else
+                    {
+                       itb->position = 0;
+                    }
                }
              else
                {
-                  if (it->before)
+                  Eina_List *tmp;
+
+                  tmp = eina_list_data_find_list(itb->items, it->item->rel);
+                  if (it->item->before)
                     {
                        wd->blocks = eina_inlist_prepend_relative
                            (wd->blocks, EINA_INLIST_GET(itb),
-                           EINA_INLIST_GET(it->rel->block));
+                           EINA_INLIST_GET(it->item->rel->item->block));
                        itb->items =
-                         eina_list_prepend_relative(itb->items, it, it->rel);
+                         eina_list_prepend_relative_list(itb->items, it, tmp);
+
+                       /* Update index from where we prepended */
+                       _item_position_update(eina_list_prev(tmp), it->item->rel->position);
+                       _item_block_position_update(EINA_INLIST_GET(itb),
+                                                   it->item->rel->item->block->position);
                     }
                   else
                     {
                        wd->blocks = eina_inlist_append_relative
                            (wd->blocks, EINA_INLIST_GET(itb),
-                           EINA_INLIST_GET(it->rel->block));
+                           EINA_INLIST_GET(it->item->rel->item->block));
                        itb->items =
-                         eina_list_append_relative(itb->items, it, it->rel);
+                         eina_list_append_relative_list(itb->items, it, tmp);
+
+                       /* Update block index from where we appended */
+                       _item_position_update(eina_list_next(tmp), it->item->rel->position + 1);
+                       _item_block_position_update(EINA_INLIST_GET(itb),
+                                                   it->item->rel->item->block->position + 1);
                     }
                }
           }
         else
           {
-             if (it->before)
+             if (it->item->before)
                {
                   if (wd->blocks)
                     {
                        itb = (Item_Block *)(wd->blocks);
                        if (itb->count >= wd->max_items_per_block)
                          {
-                            itb = calloc(1, sizeof(Item_Block));
-                            if (!itb) return;
-                            itb->wd = wd;
-                            wd->blocks =
-                              eina_inlist_prepend(wd->blocks,
-                                                  EINA_INLIST_GET(itb));
+                            itb = _item_block_new(wd, EINA_TRUE);
+                            if (!itb) return EINA_FALSE;
                          }
                     }
                   else
                     {
-                       itb = calloc(1, sizeof(Item_Block));
-                       if (!itb) return;
-                       itb->wd = wd;
-                       wd->blocks =
-                         eina_inlist_prepend(wd->blocks, EINA_INLIST_GET(itb));
+                       itb = _item_block_new(wd, EINA_TRUE);
+                       if (!itb) return EINA_FALSE;
                     }
                   itb->items = eina_list_prepend(itb->items, it);
+
+                  _item_position_update(itb->items, 0);
                }
              else
                {
@@ -3265,75 +3780,149 @@ newblock:
                        itb = (Item_Block *)(wd->blocks->last);
                        if (itb->count >= wd->max_items_per_block)
                          {
-                            itb = calloc(1, sizeof(Item_Block));
-                            if (!itb) return;
-                            itb->wd = wd;
-                            wd->blocks =
-                              eina_inlist_append(wd->blocks,
-                                                 EINA_INLIST_GET(itb));
+                            itb = _item_block_new(wd, EINA_FALSE);
+                            if (!itb) return EINA_FALSE;
                          }
                     }
                   else
                     {
-                       itb = calloc(1, sizeof(Item_Block));
-                       if (!itb) return;
-                       itb->wd = wd;
-                       wd->blocks =
-                         eina_inlist_append(wd->blocks, EINA_INLIST_GET(itb));
+                       itb = _item_block_new(wd, EINA_FALSE);
+                       if (!itb) return EINA_FALSE;
                     }
                   itb->items = eina_list_append(itb->items, it);
+                  it->position = eina_list_count(itb->items);
                }
           }
      }
    else
      {
-        itb = it->rel->block;
+        Eina_List *tmp;
+
+        if (it->item->rel->item->queued)
+          {
+             /* NOTE: for a strange reason eina_list and eina_inlist don't have the same property
+                on sorted insertion order, so the queue is not always ordered like the item list.
+                This lead to issue where we depend on an item that is not yet created. As a quick
+                work around, we reschedule the calc of the item and stop reordering the list to
+                prevent any nasty issue to show up here.
+              */
+             wd->queue = eina_list_append(wd->queue, it);
+             wd->requeued = EINA_TRUE;
+             it->item->queued = EINA_TRUE;
+             return EINA_FALSE;
+          }
+        itb = it->item->rel->item->block;
         if (!itb) goto newblock;
-        if (it->before)
-          itb->items = eina_list_prepend_relative(itb->items, it, it->rel);
+        tmp = eina_list_data_find_list(itb->items, it->item->rel);
+        if (it->item->before)
+          {
+             itb->items = eina_list_prepend_relative_list(itb->items, it, tmp);
+             _item_position_update(eina_list_prev(tmp), it->item->rel->position);
+          }
         else
-          itb->items = eina_list_append_relative(itb->items, it, it->rel);
+          {
+             itb->items = eina_list_append_relative_list(itb->items, it, tmp);
+             _item_position_update(eina_list_next(tmp), it->item->rel->position + 1);
+          }
      }
    itb->count++;
    itb->changed = EINA_TRUE;
-   it->block = itb;
+   it->item->block = itb;
    if (itb->wd->calc_job) ecore_job_del(itb->wd->calc_job);
    itb->wd->calc_job = ecore_job_add(_calc_job, itb->wd);
-   if (it->rel)
+   if (it->item->rel)
      {
-        it->rel->relcount--;
-        if ((it->rel->delete_me) && (!it->rel->relcount))
-          _item_del(it->rel);
-        it->rel = NULL;
+        it->item->rel->relcount--;
+        if ((it->item->rel->generation < it->wd->generation) && (!it->item->rel->relcount))
+          {
+             _item_del(it->item->rel);
+             elm_widget_item_free(it->item->rel);
+          }
+        it->item->rel = NULL;
      }
    if (itb->count > itb->wd->max_items_per_block)
      {
-        int newc;
         Item_Block *itb2;
-        Elm_Genlist_Item *it2;
+        Elm_Gen_Item *it2;
+        int newc;
+        Eina_Bool done = EINA_FALSE;
 
         newc = itb->count / 2;
-        itb2 = calloc(1, sizeof(Item_Block));
-        if (!itb2) return;
-        itb2->wd = wd;
-        wd->blocks =
-          eina_inlist_append_relative(wd->blocks, EINA_INLIST_GET(itb2),
-                                      EINA_INLIST_GET(itb));
-        itb2->changed = EINA_TRUE;
-        while ((itb->count > newc) && (itb->items))
+
+        if (EINA_INLIST_GET(itb)->prev)
           {
-             Eina_List *l;
+             Item_Block *itbp = (Item_Block *)(EINA_INLIST_GET(itb)->prev);
 
-             l = eina_list_last(itb->items);
-             it2 = l->data;
-             itb->items = eina_list_remove_list(itb->items, l);
-             itb->count--;
+             if (itbp->count + newc < wd->max_items_per_block / 2)
+               {
+                  /* moving items to previous block */
+                  while ((itb->count > newc) && (itb->items))
+                    {
+                       it2 = eina_list_data_get(itb->items);
+                       itb->items = eina_list_remove_list(itb->items, itb->items);
+                       itb->count--;
+
+                       itbp->items = eina_list_append(itbp->items, it2);
+                       it2->item->block = itbp;
+                       itbp->count++;
+                    }
+
+                  done = EINA_TRUE;
+               }
+          }
+
+        if (!done && EINA_INLIST_GET(itb)->next)
+          {
+             Item_Block *itbn = (Item_Block *)(EINA_INLIST_GET(itb)->next);
+
+             if (itbn->count + newc < wd->max_items_per_block / 2)
+               {
+                  /* moving items to next block */
+                  while ((itb->count > newc) && (itb->items))
+                    {
+                       Eina_List *l;
+
+                       l = eina_list_last(itb->items);
+                       it2 = eina_list_data_get(l);
+                       itb->items = eina_list_remove_list(itb->items, l);
+                       itb->count--;
 
-             itb2->items = eina_list_prepend(itb2->items, it2);
-             it2->block = itb2;
-             itb2->count++;
+                       itbn->items = eina_list_prepend(itbn->items, it2);
+                       it2->item->block = itbn;
+                       itbn->count++;
+                    }
+
+                  done = EINA_TRUE;
+               }
+          }
+
+        if (!done)
+          {
+             /* moving items to new block */
+             itb2 = calloc(1, sizeof(Item_Block));
+             if (!itb2) return EINA_FALSE;
+             itb2->wd = wd;
+             wd->blocks =
+               eina_inlist_append_relative(wd->blocks, EINA_INLIST_GET(itb2),
+                                           EINA_INLIST_GET(itb));
+             itb2->changed = EINA_TRUE;
+             while ((itb->count > newc) && (itb->items))
+               {
+                  Eina_List *l;
+
+                  l = eina_list_last(itb->items);
+                  it2 = l->data;
+                  itb->items = eina_list_remove_list(itb->items, l);
+                  itb->count--;
+
+                  itb2->items = eina_list_prepend(itb2->items, it2);
+                  it2->item->block = itb2;
+                  itb2->count++;
+               }
           }
      }
+
+   return EINA_TRUE;
 }
 
 static int
@@ -3343,24 +3932,34 @@ _queue_process(Widget_Data *wd)
    Eina_Bool showme = EINA_FALSE;
    double t0, t;
 
-   t0 = ecore_time_get();
+   t0 = ecore_loop_time_get();
    //evas_event_freeze(evas_object_evas_get(wd->obj));
    for (n = 0; (wd->queue) && (n < 128); n++)
      {
-        Elm_Genlist_Item *it;
+        Elm_Gen_Item *it;
 
-        it = wd->queue->data;
+        it = eina_list_data_get(wd->queue);
         wd->queue = eina_list_remove_list(wd->queue, wd->queue);
-        it->queued = EINA_FALSE;
-        _item_block_add(wd, it);
+        it->item->queued = EINA_FALSE;
+        if (!_item_block_add(wd, it)) continue;
+        if (!wd->blocks)
+          _item_block_realize(it->item->block);
         t = ecore_time_get();
-        if (it->block->changed)
+        if (it->item->block->changed)
           {
-             showme = _item_block_recalc(it->block, it->block->num, EINA_TRUE);
-             it->block->changed = 0;
+             showme = _item_block_recalc(it->item->block, it->item->block->num, EINA_TRUE);
+             it->item->block->changed = 0;
+             if (wd->pan_changed)
+               {
+                  if (wd->calc_job) ecore_job_del(wd->calc_job);
+                  wd->calc_job = NULL;
+                  _calc_job(wd);
+                  wd->pan_changed = EINA_FALSE;
+               }
           }
-        if (showme) it->block->showme = EINA_TRUE;
-        if (eina_inlist_count(wd->blocks) > 1)
+        if (showme) it->item->block->showme = EINA_TRUE;
+        /* same as eina_inlist_count > 1 */
+        if (wd->blocks && wd->blocks->next)
           {
              if ((t - t0) > (ecore_animator_frametime_get())) break;
           }
@@ -3408,12 +4007,16 @@ _item_idle_enterer(void *data)
 }
 
 static void
-_item_queue(Widget_Data      *wd,
-            Elm_Genlist_Item *it)
-{
-   if (it->queued) return;
-   it->queued = EINA_TRUE;
-   wd->queue = eina_list_append(wd->queue, it);
+_item_queue(Widget_Data *wd,
+            Elm_Gen_Item *it,
+            Eina_Compare_Cb cb)
+{
+   if (it->item->queued) return;
+   it->item->queued = EINA_TRUE;
+   if (cb && !wd->requeued)
+     wd->queue = eina_list_sorted_insert(wd->queue, cb, it);
+   else
+     wd->queue = eina_list_append(wd->queue, it);
 // FIXME: why does a freeze then thaw here cause some genlist
 // elm_genlist_item_append() to be much much slower?
 //   evas_event_freeze(evas_object_evas_get(wd->obj));
@@ -3433,33 +4036,24 @@ _item_queue(Widget_Data      *wd,
 }
 
 static int
-_elm_genlist_item_compare_data(const void *data, const void *data1)
-{
-   const Elm_Genlist_Item *it = data;
-   const Elm_Genlist_Item *item1 = data1;
-
-   return _elm_genlist_item_compare_data_cb(it->base.data, item1->base.data);
-}
-
-static int
 _elm_genlist_item_compare(const void *data, const void *data1)
 {
-   const Elm_Genlist_Item *it, *item1;
-   it = ELM_GENLIST_ITEM_FROM_INLIST(data);
-   item1 = ELM_GENLIST_ITEM_FROM_INLIST(data1);
-   return _elm_genlist_item_compare_cb(it, item1);
+   const Elm_Gen_Item *it, *item1;
+   it = ELM_GEN_ITEM_FROM_INLIST(data);
+   item1 = ELM_GEN_ITEM_FROM_INLIST(data1);
+   return it->wd->item_compare_cb(it, item1);
 }
 
 static int
 _elm_genlist_item_list_compare(const void *data, const void *data1)
 {
-   const Elm_Genlist_Item *it = data;
-   const Elm_Genlist_Item *item1 = data1;
-   return _elm_genlist_item_compare_cb(it, item1);
+   const Elm_Gen_Item *it = data;
+   const Elm_Gen_Item *item1 = data1;
+   return it->wd->item_compare_cb(it, item1);
 }
 
 static void
-_item_move_after(Elm_Genlist_Item *it, Elm_Genlist_Item *after)
+_item_move_after(Elm_Gen_Item *it, Elm_Gen_Item *after)
 {
    if (!it) return;
    if (!after) return;
@@ -3468,19 +4062,17 @@ _item_move_after(Elm_Genlist_Item *it, Elm_Genlist_Item *after)
    _item_block_del(it);
 
    it->wd->items = eina_inlist_append_relative(it->wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(after));
-   it->rel = after;
-   it->rel->relcount++;
-   it->before = EINA_FALSE;
-   if (after->group_item) it->group_item = after->group_item;
-   _item_queue(it->wd, it);
+   it->item->rel = after;
+   it->item->rel->relcount++;
+   it->item->before = EINA_FALSE;
+   if (after->item->group_item) it->item->group_item = after->item->group_item;
+   _item_queue(it->wd, it, NULL);
 
-   // TODO: change this to smart callback
-   if (it->itc->func.moved)
-     it->itc->func.moved(it->base.widget, it, after, EINA_TRUE);
+   evas_object_smart_callback_call(WIDGET(it), SIG_MOVED, it);
 }
 
 static void
-_item_move_before(Elm_Genlist_Item *it, Elm_Genlist_Item *before)
+_item_move_before(Elm_Gen_Item *it, Elm_Gen_Item *before)
 {
    if (!it) return;
    if (!before) return;
@@ -3488,206 +4080,214 @@ _item_move_before(Elm_Genlist_Item *it, Elm_Genlist_Item *before)
    it->wd->items = eina_inlist_remove(it->wd->items, EINA_INLIST_GET(it));
    _item_block_del(it);
    it->wd->items = eina_inlist_prepend_relative(it->wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(before));
-   it->rel = before;
-   it->rel->relcount++;
-   it->before = EINA_TRUE;
-   if (before->group_item) it->group_item = before->group_item;
-   _item_queue(it->wd, it);
+   it->item->rel = before;
+   it->item->rel->relcount++;
+   it->item->before = EINA_TRUE;
+   if (before->item->group_item) it->item->group_item = before->item->group_item;
+   _item_queue(it->wd, it, NULL);
 
-   // TODO: change this to smart callback
-   if (it->itc->func.moved)
-     it->itc->func.moved(it->base.widget, it, before, EINA_FALSE);
+   evas_object_smart_callback_call(WIDGET(it), SIG_MOVED, it);
 }
 
-EAPI Elm_Genlist_Item *
+EAPI unsigned int
+elm_genlist_items_count(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return 0;
+   return wd->item_count;
+}
+
+EAPI Elm_Object_Item *
 elm_genlist_item_append(Evas_Object                  *obj,
                         const Elm_Genlist_Item_Class *itc,
                         const void                   *data,
-                        Elm_Genlist_Item             *parent,
-                        Elm_Genlist_Item_Flags        flags,
+                        Elm_Object_Item              *parent,
+                        Elm_Genlist_Item_Type         type,
                         Evas_Smart_Cb                 func,
                         const void                   *func_data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-   Elm_Genlist_Item *it = _item_new(wd, itc, data, parent, flags, func,
-                                    func_data);
+   Elm_Gen_Item *it = _item_new(wd, itc, data, (Elm_Gen_Item *) parent, type,
+                                func, func_data);
    if (!it) return NULL;
    if (!it->parent)
      {
-        if (flags & ELM_GENLIST_ITEM_GROUP)
+        if (it->group)
           wd->group_items = eina_list_append(wd->group_items, it);
         wd->items = eina_inlist_append(wd->items, EINA_INLIST_GET(it));
-        it->rel = NULL;
+        it->item->rel = NULL;
      }
    else
      {
-        Elm_Genlist_Item *it2 = NULL;
-        Eina_List *ll = eina_list_last(it->parent->items);
+        Elm_Gen_Item *it2 = NULL;
+        Eina_List *ll = eina_list_last(it->parent->item->items);
         if (ll) it2 = ll->data;
-        it->parent->items = eina_list_append(it->parent->items, it);
+        it->parent->item->items = eina_list_append(it->parent->item->items, it);
         if (!it2) it2 = it->parent;
         wd->items =
           eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it),
                                       EINA_INLIST_GET(it2));
-        it->rel = it2;
-        it->rel->relcount++;
+        it->item->rel = it2;
+        it->item->rel->relcount++;
      }
-   it->before = EINA_FALSE;
-   _item_queue(wd, it);
-   return it;
+   it->item->before = EINA_FALSE;
+   _item_queue(wd, it, NULL);
+   return (Elm_Object_Item *)it;
 }
 
-EAPI Elm_Genlist_Item *
+EAPI Elm_Object_Item *
 elm_genlist_item_prepend(Evas_Object                  *obj,
                          const Elm_Genlist_Item_Class *itc,
                          const void                   *data,
-                         Elm_Genlist_Item             *parent,
-                         Elm_Genlist_Item_Flags        flags,
+                         Elm_Object_Item              *parent,
+                         Elm_Genlist_Item_Type         type,
                          Evas_Smart_Cb                 func,
                          const void                   *func_data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-   Elm_Genlist_Item *it = _item_new(wd, itc, data, parent, flags, func,
-                                    func_data);
+   Elm_Gen_Item *it = _item_new(wd, itc, data, (Elm_Gen_Item *) parent, type,
+                                func, func_data);
    if (!it) return NULL;
    if (!it->parent)
      {
-        if (flags & ELM_GENLIST_ITEM_GROUP)
+        if (it->group)
           wd->group_items = eina_list_prepend(wd->group_items, it);
         wd->items = eina_inlist_prepend(wd->items, EINA_INLIST_GET(it));
-        it->rel = NULL;
+        it->item->rel = NULL;
      }
    else
      {
-        Elm_Genlist_Item *it2 = NULL;
-        Eina_List *ll = it->parent->items;
+        Elm_Gen_Item *it2 = NULL;
+        Eina_List *ll = it->parent->item->items;
         if (ll) it2 = ll->data;
-        it->parent->items = eina_list_prepend(it->parent->items, it);
+        it->parent->item->items = eina_list_prepend(it->parent->item->items, it);
         if (!it2) it2 = it->parent;
         wd->items =
           eina_inlist_prepend_relative(wd->items, EINA_INLIST_GET(it),
                                        EINA_INLIST_GET(it2));
-        it->rel = it2;
-        it->rel->relcount++;
+        it->item->rel = it2;
+        it->item->rel->relcount++;
      }
-   it->before = EINA_TRUE;
-   _item_queue(wd, it);
-   return it;
+   it->item->before = EINA_TRUE;
+   _item_queue(wd, it, NULL);
+   return (Elm_Object_Item *)it;
 }
 
-EAPI Elm_Genlist_Item *
+EAPI Elm_Object_Item *
 elm_genlist_item_insert_after(Evas_Object                  *obj,
                               const Elm_Genlist_Item_Class *itc,
                               const void                   *data,
-                              Elm_Genlist_Item             *parent,
-                              Elm_Genlist_Item             *after,
-                              Elm_Genlist_Item_Flags        flags,
+                              Elm_Object_Item              *parent,
+                              Elm_Object_Item              *after,
+                              Elm_Genlist_Item_Type         type,
                               Evas_Smart_Cb                 func,
                               const void                   *func_data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   EINA_SAFETY_ON_NULL_RETURN_VAL(after, NULL);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(after, NULL);
    Widget_Data *wd = elm_widget_data_get(obj);
+   Elm_Gen_Item *_after = (Elm_Gen_Item *) after;
    if (!wd) return NULL;
-   Elm_Genlist_Item *it = _item_new(wd, itc, data, parent, flags, func,
-                                    func_data);
-   if (!it) return NULL;
    /* It makes no sense to insert after in an empty list with after != NULL, something really bad is happening in your app. */
    EINA_SAFETY_ON_NULL_RETURN_VAL(wd->items, NULL);
 
+   Elm_Gen_Item *it = _item_new(wd, itc, data, (Elm_Gen_Item *) parent, type,
+                                func, func_data);
+   if (!it) return NULL;
    if (!it->parent)
      {
-        if ((flags & ELM_GENLIST_ITEM_GROUP) &&
-            (after->flags & ELM_GENLIST_ITEM_GROUP))
+        if ((it->group) && (_after->group))
           wd->group_items = eina_list_append_relative(wd->group_items, it,
-                                                      after);
+                                                      _after);
      }
    else
      {
-        it->parent->items = eina_list_append_relative(it->parent->items, it,
-                                                      after);
+        it->parent->item->items =
+           eina_list_append_relative(it->parent->item->items, it, _after);
      }
    wd->items = eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it),
-                                           EINA_INLIST_GET(after));
-   it->rel = after;
-   it->rel->relcount++;
-   it->before = EINA_FALSE;
-   _item_queue(wd, it);
-   return it;
+                                           EINA_INLIST_GET(_after));
+   it->item->rel = _after;
+   it->item->rel->relcount++;
+   it->item->before = EINA_FALSE;
+   _item_queue(wd, it, NULL);
+   return (Elm_Object_Item *)it;
 }
 
-EAPI Elm_Genlist_Item *
+EAPI Elm_Object_Item *
 elm_genlist_item_insert_before(Evas_Object                  *obj,
                                const Elm_Genlist_Item_Class *itc,
                                const void                   *data,
-                               Elm_Genlist_Item             *parent,
-                               Elm_Genlist_Item             *before,
-                               Elm_Genlist_Item_Flags        flags,
+                               Elm_Object_Item              *parent,
+                               Elm_Object_Item              *before,
+                               Elm_Genlist_Item_Type         type,
                                Evas_Smart_Cb                 func,
                                const void                   *func_data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   EINA_SAFETY_ON_NULL_RETURN_VAL(before, NULL);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(before, NULL);
    Widget_Data *wd = elm_widget_data_get(obj);
+   Elm_Gen_Item *_before = (Elm_Gen_Item *) before;
    if (!wd) return NULL;
-   Elm_Genlist_Item *it = _item_new(wd, itc, data, parent, flags, func,
-                                    func_data);
-   if (!it) return NULL;
    /* It makes no sense to insert before in an empty list with before != NULL, something really bad is happening in your app. */
    EINA_SAFETY_ON_NULL_RETURN_VAL(wd->items, NULL);
 
+   Elm_Gen_Item *it = _item_new(wd, itc, data, (Elm_Gen_Item *) parent, type,
+                                func, func_data);
+   if (!it) return NULL;
    if (!it->parent)
      {
-        if ((flags & ELM_GENLIST_ITEM_GROUP) &&
-            (before->flags & ELM_GENLIST_ITEM_GROUP))
+        if (it->group && _before->group)
           wd->group_items = eina_list_prepend_relative(wd->group_items, it,
-                                                       before);
+                                                       _before);
      }
    else
      {
-        it->parent->items = eina_list_prepend_relative(it->parent->items, it,
-                                                       before);
+        it->parent->item->items =
+           eina_list_prepend_relative(it->parent->item->items, it, _before);
      }
    wd->items = eina_inlist_prepend_relative(wd->items, EINA_INLIST_GET(it),
-                                            EINA_INLIST_GET(before));
-   it->rel = before;
-   it->rel->relcount++;
-   it->before = EINA_TRUE;
-   _item_queue(wd, it);
-   return it;
+                                            EINA_INLIST_GET(_before));
+   it->item->rel = _before;
+   it->item->rel->relcount++;
+   it->item->before = EINA_TRUE;
+   _item_queue(wd, it, NULL);
+   return (Elm_Object_Item *)it;
 }
 
-EAPI Elm_Genlist_Item *
-elm_genlist_item_direct_sorted_insert(Evas_Object                  *obj,
-                                      const Elm_Genlist_Item_Class *itc,
-                                      const void                   *data,
-                                      Elm_Genlist_Item             *parent,
-                                      Elm_Genlist_Item_Flags        flags,
-                                      Eina_Compare_Cb               comp,
-                                      Evas_Smart_Cb                 func,
-                                      const void                   *func_data)
+EAPI Elm_Object_Item *
+elm_genlist_item_sorted_insert(Evas_Object                  *obj,
+                               const Elm_Genlist_Item_Class *itc,
+                               const void                   *data,
+                               Elm_Object_Item              *parent,
+                               Elm_Genlist_Item_Type         type,
+                               Eina_Compare_Cb               comp,
+                               Evas_Smart_Cb                 func,
+                               const void                   *func_data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-   Elm_Genlist_Item *rel = NULL;
-   Elm_Genlist_Item *it = _item_new(wd, itc, data, parent, flags, func,
-                                    func_data);
+   Elm_Gen_Item *rel = NULL;
+   Elm_Gen_Item *it = _item_new(wd, itc, data, (Elm_Gen_Item *) parent, type,
+                                func, func_data);
    if (!it) return NULL;
 
-   _elm_genlist_item_compare_cb = comp;
+   wd->item_compare_cb = comp;
 
    if (it->parent)
      {
         Eina_List *l;
         int cmp_result;
 
-        l = eina_list_search_sorted_near_list(it->parent->items,
-                                              _elm_genlist_item_list_compare, it,
+        l = eina_list_search_sorted_near_list(it->parent->item->items,
+                                              _elm_genlist_item_list_compare,
+                                              it,
                                               &cmp_result);
         if (l)
           rel = eina_list_data_get(l);
@@ -3696,15 +4296,15 @@ elm_genlist_item_direct_sorted_insert(Evas_Object                  *obj,
 
         if (cmp_result >= 0)
           {
-             it->parent->items = eina_list_prepend_relative_list(it->parent->items, it, l);
+             it->parent->item->items = eina_list_prepend_relative_list(it->parent->item->items, it, l);
              wd->items = eina_inlist_prepend_relative(wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(rel));
-             it->before = EINA_FALSE;
+             it->item->before = EINA_FALSE;
           }
         else if (cmp_result < 0)
           {
-             it->parent->items = eina_list_append_relative_list(it->parent->items, it, l);
+             it->parent->item->items = eina_list_append_relative_list(it->parent->item->items, it, l);
              wd->items = eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(rel));
-             it->before = EINA_TRUE;
+             it->item->before = EINA_TRUE;
           }
      }
    else
@@ -3712,9 +4312,11 @@ elm_genlist_item_direct_sorted_insert(Evas_Object                  *obj,
         if (!wd->state)
           {
              wd->state = eina_inlist_sorted_state_new();
+             eina_inlist_sorted_state_init(wd->state, wd->items);
+             wd->requeued = EINA_FALSE;
           }
 
-        if (flags & ELM_GENLIST_ITEM_GROUP)
+        if (it->group)
           wd->group_items = eina_list_append(wd->group_items, it);
 
         wd->items = eina_inlist_sorted_state_insert(wd->items, EINA_INLIST_GET(it),
@@ -3722,132 +4324,78 @@ elm_genlist_item_direct_sorted_insert(Evas_Object                  *obj,
 
         if (EINA_INLIST_GET(it)->next)
           {
-             rel = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
-             it->before = EINA_TRUE;
+             rel = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
+             it->item->before = EINA_TRUE;
           }
         else if (EINA_INLIST_GET(it)->prev)
           {
-             rel = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
-             it->before = EINA_FALSE;
+             rel = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
+             it->item->before = EINA_FALSE;
           }
      }
 
    if (rel)
      {
-        it->rel = rel;
-        it->rel->relcount++;
+        it->item->rel = rel;
+        it->item->rel->relcount++;
      }
 
-   _item_queue(wd, it);
+   _item_queue(wd, it, _elm_genlist_item_list_compare);
 
-   return it;
+   return (Elm_Object_Item *)it;
 }
 
-EAPI Elm_Genlist_Item *
-elm_genlist_item_sorted_insert(Evas_Object                  *obj,
-                               const Elm_Genlist_Item_Class *itc,
-                               const void                   *data,
-                               Elm_Genlist_Item             *parent,
-                               Elm_Genlist_Item_Flags        flags,
-                               Eina_Compare_Cb               comp,
-                               Evas_Smart_Cb                 func,
-                               const void                   *func_data)
+static void
+_elm_genlist_clear(Evas_Object *obj, Eina_Bool standby)
 {
-   _elm_genlist_item_compare_data_cb = comp;
-
-   return elm_genlist_item_direct_sorted_insert(obj, itc, data, parent, flags,
-                                                _elm_genlist_item_compare_data, func, func_data);
-}
+   Eina_Inlist *next, *l;
 
-EAPI void
-elm_genlist_clear(Evas_Object *obj)
-{
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
+
+   if (!standby) wd->generation++;
+
    if (wd->state)
      {
         eina_inlist_sorted_state_free(wd->state);
         wd->state = NULL;
      }
+
    if (wd->walking > 0)
      {
-        Elm_Genlist_Item *it;
-
         wd->clear_me = EINA_TRUE;
-        EINA_INLIST_FOREACH(wd->items, it)
-          {
-             it->delete_me = EINA_TRUE;
-          }
         return;
      }
    evas_event_freeze(evas_object_evas_get(wd->obj));
-   while (wd->items)
+   for (l = wd->items, next = l ? l->next : NULL;
+        l;
+        l = next, next = next ? next->next : NULL)
      {
-        Elm_Genlist_Item *it = ELM_GENLIST_ITEM_FROM_INLIST(wd->items);
+        Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(l);
 
-        if (wd->anchor_item == it)
+        if (it->generation < wd->generation)
           {
-             wd->anchor_item = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
-             if (!wd->anchor_item)
-               wd->anchor_item =
-                 ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
+             Elm_Gen_Item *itn = NULL;
+
+             if (next) itn = ELM_GEN_ITEM_FROM_INLIST(next);
+             if (itn) itn->walking++; /* prevent early death of subitem */
+             it->del_cb(it);
+             elm_widget_item_free(it);
+             if (itn) itn->walking--;
           }
-        wd->items = eina_inlist_remove(wd->items, wd->items);
-        if (it->flags & ELM_GENLIST_ITEM_GROUP)
-          it->wd->group_items = eina_list_remove(it->wd->group_items, it);
-        elm_widget_item_pre_notify_del(it);
-        if (it->realized) _item_unrealize(it, EINA_FALSE);
-        if (((wd->clear_me) || (!it->delete_me)) && (it->itc->func.del))
-          it->itc->func.del((void *)it->base.data, it->base.widget);
-        if (it->long_timer) ecore_timer_del(it->long_timer);
-        if (it->swipe_timer) ecore_timer_del(it->swipe_timer);
-        elm_widget_item_del(it);
      }
    wd->clear_me = EINA_FALSE;
-   wd->anchor_item = NULL;
-   while (wd->blocks)
-     {
-        Item_Block *itb = (Item_Block *)(wd->blocks);
-
-        wd->blocks = eina_inlist_remove(wd->blocks, wd->blocks);
-        if (itb->items) eina_list_free(itb->items);
-        free(itb);
-     }
+   wd->pan_changed = EINA_TRUE;
    if (wd->calc_job)
      {
         ecore_job_del(wd->calc_job);
         wd->calc_job = NULL;
      }
-   if (wd->queue_idle_enterer)
-     {
-        ecore_idle_enterer_del(wd->queue_idle_enterer);
-        wd->queue_idle_enterer = NULL;
-     }
-   if (wd->must_recalc_idler)
-     {
-        ecore_idler_del(wd->must_recalc_idler);
-        wd->must_recalc_idler = NULL;
-     }
-   if (wd->queue)
-     {
-        eina_list_free(wd->queue);
-        wd->queue = NULL;
-     }
-   if (wd->selected)
-     {
-        eina_list_free(wd->selected);
-        wd->selected = NULL;
-     }
-   if (wd->reorder_move_animator)
-     {
-        ecore_animator_del(wd->reorder_move_animator);
-        wd->reorder_move_animator = NULL;
-     }
-   wd->show_item = NULL;
+   if (wd->selected) wd->selected = eina_list_free(wd->selected);
+   if (wd->clear_cb) wd->clear_cb(wd);
    wd->pan_x = 0;
    wd->pan_y = 0;
-   wd->reorder_old_pan_y = 0;
    wd->minw = 0;
    wd->minh = 0;
    if (wd->pan_smart)
@@ -3855,20 +4403,26 @@ elm_genlist_clear(Evas_Object *obj)
         evas_object_size_hint_min_set(wd->pan_smart, wd->minw, wd->minh);
         evas_object_smart_callback_call(wd->pan_smart, "changed", NULL);
      }
-   _sizing_eval(obj);
+   if (wd->sizing_cb) wd->sizing_cb(wd->obj);
    elm_smart_scroller_child_region_show(wd->scr, 0, 0, 0, 0);
    evas_event_thaw(evas_object_evas_get(wd->obj));
    evas_event_thaw_eval(evas_object_evas_get(wd->obj));
 }
 
 EAPI void
+elm_genlist_clear(Evas_Object *obj)
+{
+   _elm_genlist_clear(obj, EINA_FALSE);
+}
+
+EAPI void
 elm_genlist_multi_select_set(Evas_Object *obj,
                              Eina_Bool    multi)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   wd->multi = multi;
+   wd->multi = !!multi;
 }
 
 EAPI Eina_Bool
@@ -3880,7 +4434,7 @@ elm_genlist_multi_select_get(const Evas_Object *obj)
    return wd->multi;
 }
 
-EAPI Elm_Genlist_Item *
+EAPI Elm_Object_Item *
 elm_genlist_selected_item_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
@@ -3913,9 +4467,9 @@ elm_genlist_realized_items_get(const Evas_Object *obj)
         if (itb->realized)
           {
              Eina_List *l;
-             Elm_Genlist_Item *it;
+             Elm_Gen_Item *it;
 
-             done = 1;
+             done = EINA_TRUE;
              EINA_LIST_FOREACH(itb->items, l, it)
                {
                   if (it->realized) list = eina_list_append(list, it);
@@ -3929,7 +4483,7 @@ elm_genlist_realized_items_get(const Evas_Object *obj)
    return list;
 }
 
-EAPI Elm_Genlist_Item *
+EAPI Elm_Object_Item *
 elm_genlist_at_xy_item_get(const Evas_Object *obj,
                            Evas_Coord         x,
                            Evas_Coord         y,
@@ -3946,7 +4500,7 @@ elm_genlist_at_xy_item_get(const Evas_Object *obj,
    EINA_INLIST_FOREACH(wd->blocks, itb)
      {
         Eina_List *l;
-        Elm_Genlist_Item *it;
+        Elm_Gen_Item *it;
 
         if (!ELM_RECTS_INTERSECT(ox + itb->x - itb->wd->pan_x,
                                  oy + itb->y - itb->wd->pan_y,
@@ -3958,18 +4512,18 @@ elm_genlist_at_xy_item_get(const Evas_Object *obj,
 
              itx = ox + itb->x + it->x - itb->wd->pan_x;
              ity = oy + itb->y + it->y - itb->wd->pan_y;
-             if (ELM_RECTS_INTERSECT(itx, ity, it->w, it->h, x, y, 1, 1))
+             if (ELM_RECTS_INTERSECT(itx, ity, it->item->w, it->item->h, x, y, 1, 1))
                {
                   if (posret)
                     {
-                       if (y <= (ity + (it->h / 4))) *posret = -1;
-                       else if (y >= (ity + it->h - (it->h / 4)))
+                       if (y <= (ity + (it->item->h / 4))) *posret = -1;
+                       else if (y >= (ity + it->item->h - (it->item->h / 4)))
                          *posret = 1;
                        else *posret = 0;
                     }
-                  return it;
+                  return (Elm_Object_Item *)it;
                }
-             lasty = ity + it->h;
+             lasty = ity + it->item->h;
           }
      }
    if (posret)
@@ -3980,93 +4534,98 @@ elm_genlist_at_xy_item_get(const Evas_Object *obj,
    return NULL;
 }
 
-EAPI Elm_Genlist_Item *
+EAPI Elm_Object_Item *
 elm_genlist_first_item_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
    if (!wd->items) return NULL;
-   Elm_Genlist_Item *it = ELM_GENLIST_ITEM_FROM_INLIST(wd->items);
-   while ((it) && (it->delete_me))
-     it = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
-   return it;
+   Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items);
+   while ((it) && (it->generation < wd->generation))
+     it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
+   return (Elm_Object_Item *)it;
 }
 
-EAPI Elm_Genlist_Item *
+EAPI Elm_Object_Item *
 elm_genlist_last_item_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
    if (!wd->items) return NULL;
-   Elm_Genlist_Item *it = ELM_GENLIST_ITEM_FROM_INLIST(wd->items->last);
-   while ((it) && (it->delete_me))
-     it = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
-   return it;
+   Elm_Gen_Item *it = ELM_GEN_ITEM_FROM_INLIST(wd->items->last);
+   while ((it) && (it->generation < wd->generation))
+     it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
+   return (Elm_Object_Item *)it;
 }
 
-EAPI Elm_Genlist_Item *
-elm_genlist_item_next_get(const Elm_Genlist_Item *it)
+EAPI Elm_Object_Item *
+elm_genlist_item_next_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
-   while (it)
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   while (_it)
      {
-        it = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
-        if ((it) && (!it->delete_me)) break;
+        _it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(_it)->next);
+        if ((_it) && (_it->generation == _it->wd->generation)) break;
      }
-   return (Elm_Genlist_Item *)it;
+   return (Elm_Object_Item *) _it;
 }
 
-EAPI Elm_Genlist_Item *
-elm_genlist_item_prev_get(const Elm_Genlist_Item *it)
+EAPI Elm_Object_Item *
+elm_genlist_item_prev_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
-   while (it)
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   while (_it)
      {
-        it = ELM_GENLIST_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
-        if ((it) && (!it->delete_me)) break;
+        _it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(_it)->prev);
+        if ((_it) && (_it->generation == _it->wd->generation)) break;
      }
-   return (Elm_Genlist_Item *)it;
+   return (Elm_Object_Item *) _it;
 }
 
-EAPI Evas_Object *
-elm_genlist_item_genlist_get(const Elm_Genlist_Item *it)
+EINA_DEPRECATED EAPI Evas_Object *
+elm_genlist_item_genlist_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
-   return it->base.widget;
+   return elm_object_item_widget_get(it);
 }
 
-EAPI Elm_Genlist_Item *
-elm_genlist_item_parent_get(const Elm_Genlist_Item *it)
+EAPI Elm_Object_Item *
+elm_genlist_item_parent_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
-   return it->parent;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   return (Elm_Object_Item *) ((Elm_Gen_Item *)it)->parent;
 }
 
 EAPI void
-elm_genlist_item_subitems_clear(Elm_Genlist_Item *it)
+elm_genlist_item_subitems_clear(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
    Eina_List *tl = NULL, *l;
-   Elm_Genlist_Item *it2;
+   Elm_Gen_Item *_it;
+   Elm_Object_Item *it2;
+   _it = (Elm_Gen_Item *)it;
 
-   EINA_LIST_FOREACH(it->items, l, it2)
+   EINA_LIST_FOREACH(_it->item->items, l, it2)
      tl = eina_list_append(tl, it2);
    EINA_LIST_FREE(tl, it2)
-     elm_genlist_item_del(it2);
+     elm_object_item_del(it2);
 }
 
 EAPI void
-elm_genlist_item_selected_set(Elm_Genlist_Item *it,
-                              Eina_Bool         selected)
+elm_genlist_item_selected_set(Elm_Object_Item *it,
+                              Eina_Bool selected)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   Widget_Data *wd = elm_widget_data_get(it->base.widget);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   Widget_Data *wd = _it->wd;
    if (!wd) return;
-   if ((it->delete_me) || (it->disabled)) return;
+   if ((_it->generation < wd->generation) || elm_widget_item_disabled_get(_it))
+     return;
    selected = !!selected;
-   if (it->selected == selected) return;
+   if (_it->selected == selected) return;
 
    if (selected)
      {
@@ -4074,373 +4633,408 @@ elm_genlist_item_selected_set(Elm_Genlist_Item *it,
           {
              while (wd->selected)
                {
-                  _item_unhighlight(wd->selected->data);
-                  _item_unselect(wd->selected->data);
+                  if (_it->unhighlight_cb) _it->unhighlight_cb(wd->selected->data);
+                  _it->unsel_cb(wd->selected->data);
                }
           }
-        _item_highlight(it);
-        _item_select(it);
-     }
-   else
-     {
-        _item_unhighlight(it);
-        _item_unselect(it);
+        _it->highlight_cb(_it);
+        _item_select(_it);
+        return;
      }
+   if (_it->unhighlight_cb) _it->unhighlight_cb(_it);
+   _it->unsel_cb(_it);
 }
 
 EAPI Eina_Bool
-elm_genlist_item_selected_get(const Elm_Genlist_Item *it)
+elm_genlist_item_selected_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
-   return it->selected;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+   return ((Elm_Gen_Item *)it)->selected;
 }
 
 EAPI void
-elm_genlist_item_expanded_set(Elm_Genlist_Item *it,
+elm_genlist_item_expanded_set(Elm_Object_Item  *it,
                               Eina_Bool         expanded)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   if (it->expanded == expanded) return;
-   it->expanded = expanded;
-   it->wd->expanded_item = it;
-   if (it->expanded)
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   expanded = !!expanded;
+   if (_it->item->expanded == expanded) return;
+   _it->item->expanded = expanded;
+   if (_it->item->expanded)
      {
-        if (it->realized)
-          edje_object_signal_emit(it->base.view, "elm,state,expanded", "elm");
-        evas_object_smart_callback_call(it->base.widget, SIG_EXPANDED, it);
-        it->wd->auto_scroll_enabled = EINA_TRUE;
+        if (_it->realized)
+          edje_object_signal_emit(VIEW(_it), "elm,state,expanded", "elm");
+        evas_object_smart_callback_call(WIDGET(_it), SIG_EXPANDED, _it);
+        _it->wd->auto_scroll_enabled = EINA_TRUE;
+        _it->wd->expanded_item = _it;
      }
    else
      {
-        if (it->realized)
-          edje_object_signal_emit(it->base.view, "elm,state,contracted", "elm");
-        evas_object_smart_callback_call(it->base.widget, SIG_CONTRACTED, it);
-        it->wd->auto_scroll_enabled = EINA_FALSE;
+        if (_it->realized)
+          edje_object_signal_emit(VIEW(_it), "elm,state,contracted", "elm");
+        evas_object_smart_callback_call(WIDGET(_it), SIG_CONTRACTED, _it);
+        _it->wd->auto_scroll_enabled = EINA_FALSE;
+        _it->wd->expanded_item = NULL;
      }
 }
 
 EAPI Eina_Bool
-elm_genlist_item_expanded_get(const Elm_Genlist_Item *it)
+elm_genlist_item_expanded_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
-   return it->expanded;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+   return ((Elm_Gen_Item *)it)->item->expanded;
 }
 
 EAPI int
-elm_genlist_item_expanded_depth_get(const Elm_Genlist_Item *it)
+elm_genlist_item_expanded_depth_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, 0);
-   return it->expanded_depth;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, 0);
+   return ((Elm_Gen_Item *)it)->item->expanded_depth;
 }
-
-EAPI void
-elm_genlist_item_disabled_set(Elm_Genlist_Item *it,
-                              Eina_Bool         disabled)
-{
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   Eina_List *l;
-   Evas_Object *obj;
-   if (it->disabled == disabled) return;
-   if (it->delete_me) return;
-   it->disabled = !!disabled;
-   if (it->selected)
-     elm_genlist_item_selected_set(it, EINA_FALSE);
-   if (it->realized)
-     {
-        if (it->disabled)
-          edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm");
-        else
-          edje_object_signal_emit(it->base.view, "elm,state,enabled", "elm");
-        EINA_LIST_FOREACH(it->icon_objs, l, obj)
-          elm_widget_disabled_set(obj, disabled);
-     }
+
+EINA_DEPRECATED EAPI void
+elm_genlist_item_disabled_set(Elm_Object_Item  *it,
+                              Eina_Bool         disabled)
+{
+   elm_object_item_disabled_set(it, disabled);
 }
 
-EAPI Eina_Bool
-elm_genlist_item_disabled_get(const Elm_Genlist_Item *it)
+EINA_DEPRECATED EAPI Eina_Bool
+elm_genlist_item_disabled_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
-   if (it->delete_me) return EINA_FALSE;
-   return it->disabled;
+   return elm_object_item_disabled_get(it);
 }
 
 EAPI void
-elm_genlist_item_display_only_set(Elm_Genlist_Item *it,
+elm_genlist_item_display_only_set(Elm_Object_Item  *it,
                                   Eina_Bool         display_only)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   if (it->display_only == display_only) return;
-   if (it->delete_me) return;
-   it->display_only = display_only;
-   it->mincalcd = EINA_FALSE;
-   it->updateme = EINA_TRUE;
-   if (it->block) it->block->updateme = EINA_TRUE;
-   if (it->wd->update_job) ecore_job_del(it->wd->update_job);
-   it->wd->update_job = ecore_job_add(_update_job, it->wd);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   display_only = !!display_only;
+   if (_it->display_only == display_only) return;
+   if (_it->generation < _it->wd->generation) return;
+   _it->display_only = display_only;
+   _it->item->mincalcd = EINA_FALSE;
+   _it->item->updateme = EINA_TRUE;
+   if (_it->item->block) _it->item->block->updateme = EINA_TRUE;
+   if (_it->wd->update_job) ecore_job_del(_it->wd->update_job);
+   _it->wd->update_job = ecore_job_add(_update_job, _it->wd);
 }
 
 EAPI Eina_Bool
-elm_genlist_item_display_only_get(const Elm_Genlist_Item *it)
+elm_genlist_item_display_only_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
-   if (it->delete_me) return EINA_FALSE;
-   return it->display_only;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   if (_it->generation < _it->wd->generation) return EINA_FALSE;
+   return _it->display_only;
 }
 
 EAPI void
-elm_genlist_item_show(Elm_Genlist_Item *it)
+elm_genlist_item_show(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
    Evas_Coord gith = 0;
-   if (it->delete_me) return;
-   if ((it->queued) || (!it->mincalcd))
+   if (_it->generation < _it->wd->generation) return;
+   if ((_it->item->queued) || (!_it->item->mincalcd))
      {
-        it->wd->show_item = it;
-        it->wd->bring_in = EINA_TRUE;
-        it->showme = EINA_TRUE;
+        _it->wd->show_item = _it;
+        _it->wd->bring_in = EINA_FALSE;
+        _it->wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_IN;
+        _it->item->showme = EINA_TRUE;
         return;
      }
-   if (it->wd->show_item)
+   if (_it->wd->show_item)
      {
-        it->wd->show_item->showme = EINA_FALSE;
-        it->wd->show_item = NULL;
+        _it->wd->show_item->item->showme = EINA_FALSE;
+        _it->wd->show_item = NULL;
      }
-   if ((it->group_item) && (it->wd->pan_y > (it->y + it->block->y)))
-     gith = it->group_item->h;
-   elm_smart_scroller_child_region_show(it->wd->scr,
-                                        it->x + it->block->x,
-                                        it->y + it->block->y - gith,
-                                        it->block->w, it->h);
+   if ((_it->item->group_item) &&
+       (_it->wd->pan_y > (_it->y + _it->item->block->y)))
+     gith = _it->item->group_item->item->h;
+   elm_smart_scroller_child_region_show(_it->wd->scr,
+                                        _it->x + _it->item->block->x,
+                                        _it->y + _it->item->block->y - gith,
+                                        _it->item->block->w, _it->item->h);
+}
+
+EAPI void
+elm_genlist_item_promote(Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   if (_it->generation < _it->wd->generation) return;
+   _item_move_before(_it,
+                     (Elm_Gen_Item *) elm_genlist_first_item_get(WIDGET(_it)));
 }
 
 EAPI void
-elm_genlist_item_bring_in(Elm_Genlist_Item *it)
+elm_genlist_item_demote(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   if (_it->generation < _it->wd->generation) return;
+   _item_move_after(_it,
+                    (Elm_Gen_Item *) elm_genlist_last_item_get(WIDGET(_it)));
+}
+
+EAPI void
+elm_genlist_item_bring_in(Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
    Evas_Coord gith = 0;
-   if (it->delete_me) return;
-   if ((it->queued) || (!it->mincalcd))
+   if (_it->generation < _it->wd->generation) return;
+   if ((_it->item->queued) || (!_it->item->mincalcd))
      {
-        it->wd->show_item = it;
-        it->wd->bring_in = EINA_TRUE;
-        it->showme = EINA_TRUE;
+        _it->wd->show_item = _it;
+        _it->wd->bring_in = EINA_TRUE;
+        _it->wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_IN;
+        _it->item->showme = EINA_TRUE;
         return;
      }
-   if (it->wd->show_item)
+   if (_it->wd->show_item)
      {
-        it->wd->show_item->showme = EINA_FALSE;
-        it->wd->show_item = NULL;
+        _it->wd->show_item->item->showme = EINA_FALSE;
+        _it->wd->show_item = NULL;
      }
-   if ((it->group_item) && (it->wd->pan_y > (it->y + it->block->y)))
-     gith = it->group_item->h;
-   elm_smart_scroller_region_bring_in(it->wd->scr,
-                                      it->x + it->block->x,
-                                      it->y + it->block->y - gith,
-                                      it->block->w, it->h);
+   if ((_it->item->group_item) &&
+       (_it->wd->pan_y > (_it->y + _it->item->block->y)))
+     gith = _it->item->group_item->item->h;
+   elm_smart_scroller_region_bring_in(_it->wd->scr,
+                                      _it->x + _it->item->block->x,
+                                      _it->y + _it->item->block->y - gith,
+                                      _it->item->block->w, _it->item->h);
 }
 
 EAPI void
-elm_genlist_item_top_show(Elm_Genlist_Item *it)
+elm_genlist_item_top_show(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
    Evas_Coord ow, oh;
    Evas_Coord gith = 0;
 
-   if (it->delete_me) return;
-   if ((it->queued) || (!it->mincalcd))
+   if (_it->generation < _it->wd->generation) return;
+   if ((_it->item->queued) || (!_it->item->mincalcd))
      {
-        it->wd->show_item = it;
-        it->wd->bring_in = EINA_TRUE;
-        it->showme = EINA_TRUE;
+        _it->wd->show_item = _it;
+        _it->wd->bring_in = EINA_FALSE;
+        _it->wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_TOP;
+        _it->item->showme = EINA_TRUE;
         return;
      }
-   if (it->wd->show_item)
+   if (_it->wd->show_item)
      {
-        it->wd->show_item->showme = EINA_FALSE;
-        it->wd->show_item = NULL;
+        _it->wd->show_item->item->showme = EINA_FALSE;
+        _it->wd->show_item = NULL;
      }
-   evas_object_geometry_get(it->wd->pan_smart, NULL, NULL, &ow, &oh);
-   if (it->group_item) gith = it->group_item->h;
-   elm_smart_scroller_child_region_show(it->wd->scr,
-                                        it->x + it->block->x,
-                                        it->y + it->block->y - gith,
-                                        it->block->w, oh);
+   evas_object_geometry_get(_it->wd->pan_smart, NULL, NULL, &ow, &oh);
+   if (_it->item->group_item) gith = _it->item->group_item->item->h;
+   elm_smart_scroller_child_region_show(_it->wd->scr,
+                                        _it->x + _it->item->block->x,
+                                        _it->y + _it->item->block->y - gith,
+                                        _it->item->block->w, oh);
 }
 
 EAPI void
-elm_genlist_item_top_bring_in(Elm_Genlist_Item *it)
+elm_genlist_item_top_bring_in(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
    Evas_Coord ow, oh;
    Evas_Coord gith = 0;
 
-   if (it->delete_me) return;
-   if ((it->queued) || (!it->mincalcd))
+   if (_it->generation < _it->wd->generation) return;
+   if ((_it->item->queued) || (!_it->item->mincalcd))
      {
-        it->wd->show_item = it;
-        it->wd->bring_in = EINA_TRUE;
-        it->showme = EINA_TRUE;
+        _it->wd->show_item = _it;
+        _it->wd->bring_in = EINA_TRUE;
+        _it->wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_TOP;
+        _it->item->showme = EINA_TRUE;
         return;
      }
-   if (it->wd->show_item)
+   if (_it->wd->show_item)
      {
-        it->wd->show_item->showme = EINA_FALSE;
-        it->wd->show_item = NULL;
+        _it->wd->show_item->item->showme = EINA_FALSE;
+        _it->wd->show_item = NULL;
      }
-   evas_object_geometry_get(it->wd->pan_smart, NULL, NULL, &ow, &oh);
-   if (it->group_item) gith = it->group_item->h;
-   elm_smart_scroller_region_bring_in(it->wd->scr,
-                                      it->x + it->block->x,
-                                      it->y + it->block->y - gith,
-                                      it->block->w, oh);
+   evas_object_geometry_get(_it->wd->pan_smart, NULL, NULL, &ow, &oh);
+   if (_it->item->group_item) gith = _it->item->group_item->item->h;
+   elm_smart_scroller_region_bring_in(_it->wd->scr,
+                                      _it->x + _it->item->block->x,
+                                      _it->y + _it->item->block->y - gith,
+                                      _it->item->block->w, oh);
 }
 
 EAPI void
-elm_genlist_item_middle_show(Elm_Genlist_Item *it)
+elm_genlist_item_middle_show(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
    Evas_Coord ow, oh;
 
-   if (it->delete_me) return;
-   if ((it->queued) || (!it->mincalcd))
+   if (_it->generation < _it->wd->generation) return;
+   if ((_it->item->queued) || (!_it->item->mincalcd))
      {
-        it->wd->show_item = it;
-        it->wd->bring_in = EINA_TRUE;
-        it->showme = EINA_TRUE;
+        _it->wd->show_item = _it;
+        _it->wd->bring_in = EINA_FALSE;
+        _it->wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_MIDDLE;
+        _it->item->showme = EINA_TRUE;
         return;
      }
-   if (it->wd->show_item)
+   if (_it->wd->show_item)
      {
-        it->wd->show_item->showme = EINA_FALSE;
-        it->wd->show_item = NULL;
+        _it->wd->show_item->item->showme = EINA_FALSE;
+        _it->wd->show_item = NULL;
      }
-   evas_object_geometry_get(it->wd->pan_smart, NULL, NULL, &ow, &oh);
-   elm_smart_scroller_child_region_show(it->wd->scr,
-                                        it->x + it->block->x,
-                                        it->y + it->block->y - oh / 2 +
-                                        it->h / 2, it->block->w, oh);
+   evas_object_geometry_get(_it->wd->pan_smart, NULL, NULL, &ow, &oh);
+   elm_smart_scroller_child_region_show(_it->wd->scr,
+                                        _it->x + _it->item->block->x,
+                                        _it->y + _it->item->block->y - oh / 2 +
+                                        _it->item->h / 2, _it->item->block->w,
+                                        oh);
 }
 
 EAPI void
-elm_genlist_item_middle_bring_in(Elm_Genlist_Item *it)
+elm_genlist_item_middle_bring_in(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
    Evas_Coord ow, oh;
 
-   if (it->delete_me) return;
-   if ((it->queued) || (!it->mincalcd))
+   if (_it->generation < _it->wd->generation) return;
+   if ((_it->item->queued) || (!_it->item->mincalcd))
      {
-        it->wd->show_item = it;
-        it->wd->bring_in = EINA_TRUE;
-        it->showme = EINA_TRUE;
+        _it->wd->show_item = _it;
+        _it->wd->bring_in = EINA_TRUE;
+        _it->wd->scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_MIDDLE;
+        _it->item->showme = EINA_TRUE;
         return;
      }
-   if (it->wd->show_item)
+   if (_it->wd->show_item)
      {
-        it->wd->show_item->showme = EINA_FALSE;
-        it->wd->show_item = NULL;
+        _it->wd->show_item->item->showme = EINA_FALSE;
+        _it->wd->show_item = NULL;
      }
-   evas_object_geometry_get(it->wd->pan_smart, NULL, NULL, &ow, &oh);
-   elm_smart_scroller_region_bring_in(it->wd->scr,
-                                      it->x + it->block->x,
-                                      it->y + it->block->y - oh / 2 + it->h / 2,
-                                      it->block->w, oh);
+   evas_object_geometry_get(_it->wd->pan_smart, NULL, NULL, &ow, &oh);
+   elm_smart_scroller_region_bring_in(_it->wd->scr,
+                                      _it->x + _it->item->block->x,
+                                      _it->y + _it->item->block->y - oh / 2 +
+                                      _it->item->h / 2, _it->item->block->w,
+                                      oh);
 }
 
 EAPI void
-elm_genlist_item_del(Elm_Genlist_Item *it)
+elm_genlist_item_del(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   if ((it->relcount > 0) || (it->walking > 0))
-     {
-        elm_widget_item_pre_notify_del(it);
-        elm_genlist_item_subitems_clear(it);
-        it->delete_me = EINA_TRUE;
-        if (it->wd->show_item == it) it->wd->show_item = NULL;
-        if (it->selected)
-          it->wd->selected = eina_list_remove(it->wd->selected,
-                                              it);
-        if (it->block)
-          {
-             if (it->realized) _item_unrealize(it, EINA_FALSE);
-             it->block->changed = EINA_TRUE;
-             if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
-             it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
-          }
-        if (it->itc->func.del)
-          it->itc->func.del((void *)it->base.data, it->base.widget);
-        return;
-     }
-   _item_del(it);
+   elm_object_item_del(it);
 }
 
 EAPI void
-elm_genlist_item_data_set(Elm_Genlist_Item *it,
+elm_genlist_item_data_set(Elm_Object_Item  *it,
                           const void       *data)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   elm_widget_item_data_set(it, data);
+   elm_object_item_data_set(it, (void *) data);
 }
 
 EAPI void *
-elm_genlist_item_data_get(const Elm_Genlist_Item *it)
+elm_genlist_item_data_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
-   return elm_widget_item_data_get(it);
+   return elm_object_item_data_get(it);
 }
 
 EAPI void
-elm_genlist_item_icons_orphan(Elm_Genlist_Item *it)
+elm_genlist_item_icons_orphan(Elm_Object_Item *it)
 {
-   Evas_Object *icon;
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   EINA_LIST_FREE(it->icon_objs, icon)
+   elm_genlist_item_contents_orphan(it);
+}
+
+EAPI void
+elm_genlist_item_contents_orphan(Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+
+   Evas_Object *content;
+   EINA_LIST_FREE(((Elm_Gen_Item *)it)->content_objs, content)
      {
-        elm_widget_sub_object_del(it->base.widget, icon);
-        evas_object_smart_member_del(icon);
-        evas_object_hide(icon);
+        elm_widget_sub_object_del(WIDGET(it), content);
+        evas_object_smart_member_del(content);
+        evas_object_hide(content);
      }
 }
 
-EAPI const Evas_Object *
-elm_genlist_item_object_get(const Elm_Genlist_Item *it)
+EINA_DEPRECATED EAPI const Evas_Object *
+elm_genlist_item_object_get(const Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   return VIEW(it);
+}
+
+EAPI void
+elm_genlist_item_update(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
-   return it->base.view;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+
+   if (!_it->item->block) return;
+   if (_it->generation < _it->wd->generation) return;
+   _it->item->mincalcd = EINA_FALSE;
+   _it->item->updateme = EINA_TRUE;
+   _it->item->block->updateme = EINA_TRUE;
+   if (_it->wd->update_job) ecore_job_del(_it->wd->update_job);
+   _it->wd->update_job = ecore_job_add(_update_job, _it->wd);
 }
 
 EAPI void
-elm_genlist_item_update(Elm_Genlist_Item *it)
+elm_genlist_item_fields_update(Elm_Object_Item *it,
+                               const char *parts,
+                               Elm_Genlist_Item_Field_Type itf)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   if (!it->block) return;
-   if (it->delete_me) return;
-   it->mincalcd = EINA_FALSE;
-   it->updateme = EINA_TRUE;
-   it->block->updateme = EINA_TRUE;
-   if (it->wd->update_job) ecore_job_del(it->wd->update_job);
-   it->wd->update_job = ecore_job_add(_update_job, it->wd);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+
+   if (!_it->item->block) return;
+   if (_it->generation < _it->wd->generation) return;
+
+   if ((!itf) || (itf & ELM_GENLIST_ITEM_FIELD_TEXT))
+     _item_text_realize(_it, VIEW(_it), &_it->texts, parts);
+   if ((!itf) || (itf & ELM_GENLIST_ITEM_FIELD_CONTENT))
+     {
+        _it->content_objs = _item_content_unrealize(_it, VIEW(_it),
+                                                   &_it->contents, parts);
+        _it->content_objs = _item_content_realize(_it, VIEW(_it),
+                                                 &_it->contents, parts);
+     }
+   if ((!itf) || (itf & ELM_GENLIST_ITEM_FIELD_STATE))
+     _item_state_realize(_it, VIEW(_it), &_it->states, parts);
 }
 
 EAPI void
-elm_genlist_item_item_class_update(Elm_Genlist_Item             *it,
+elm_genlist_item_item_class_update(Elm_Object_Item *it,
                                    const Elm_Genlist_Item_Class *itc)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   if (!it->block) return;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+
+   if (!_it->item->block) return;
    EINA_SAFETY_ON_NULL_RETURN(itc);
-   if (it->delete_me) return;
-   it->itc = itc;
-   it->nocache = EINA_TRUE;
+   if (_it->generation < _it->wd->generation) return;
+   _it->itc = itc;
+   _it->item->nocache_once = EINA_TRUE;
    elm_genlist_item_update(it);
 }
 
 EAPI const Elm_Genlist_Item_Class *
-elm_genlist_item_item_class_get(const Elm_Genlist_Item *it)
+elm_genlist_item_item_class_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
-   if (it->delete_me) return NULL;
-   return it->itc;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   if (_it->generation < _it->wd->generation) return NULL;
+   return _it->itc;
 }
 
 static Evas_Object *
@@ -4466,10 +5060,10 @@ _elm_genlist_item_label_del_cb(void        *data,
 }
 
 EAPI void
-elm_genlist_item_tooltip_text_set(Elm_Genlist_Item *it,
-                                  const char       *text)
+elm_genlist_item_tooltip_text_set(Elm_Object_Item *it,
+                                  const char      *text)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
    text = eina_stringshare_add(text);
    elm_genlist_item_tooltip_content_cb_set(it, _elm_genlist_item_label_create,
                                            text,
@@ -4477,31 +5071,31 @@ elm_genlist_item_tooltip_text_set(Elm_Genlist_Item *it,
 }
 
 EAPI void
-elm_genlist_item_tooltip_content_cb_set(Elm_Genlist_Item           *it,
+elm_genlist_item_tooltip_content_cb_set(Elm_Object_Item           *it,
                                         Elm_Tooltip_Item_Content_Cb func,
                                         const void                 *data,
                                         Evas_Smart_Cb               del_cb)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_GOTO(it, error);
+   ELM_OBJ_ITEM_CHECK_OR_GOTO(it, error);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
 
-   if ((it->tooltip.content_cb == func) && (it->tooltip.data == data))
+   if ((_it->tooltip.content_cb == func) && (_it->tooltip.data == data))
      return;
 
-   if (it->tooltip.del_cb)
-     it->tooltip.del_cb((void *)it->tooltip.data,
-                          it->base.widget, it);
+   if (_it->tooltip.del_cb)
+     _it->tooltip.del_cb((void *) _it->tooltip.data, WIDGET(it), it);
 
-   it->tooltip.content_cb = func;
-   it->tooltip.data = data;
-   it->tooltip.del_cb = del_cb;
+   _it->tooltip.content_cb = func;
+   _it->tooltip.data = data;
+   _it->tooltip.del_cb = del_cb;
 
-   if (it->base.view)
+   if (VIEW(_it))
      {
-        elm_widget_item_tooltip_content_cb_set(it,
-                                               it->tooltip.content_cb,
-                                               it->tooltip.data, NULL);
-        elm_widget_item_tooltip_style_set(it, it->tooltip.style);
-        elm_widget_item_tooltip_size_restrict_disable(it, it->tooltip.free_size);
+        elm_widget_item_tooltip_content_cb_set(_it,
+                                               _it->tooltip.content_cb,
+                                               _it->tooltip.data, NULL);
+        elm_widget_item_tooltip_style_set(_it, _it->tooltip.style);
+        elm_widget_item_tooltip_window_mode_set(_it, _it->tooltip.free_size);
      }
 
    return;
@@ -4511,117 +5105,129 @@ error:
 }
 
 EAPI void
-elm_genlist_item_tooltip_unset(Elm_Genlist_Item *it)
+elm_genlist_item_tooltip_unset(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   if ((it->base.view) && (it->tooltip.content_cb))
-     elm_widget_item_tooltip_unset(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
 
-   if (it->tooltip.del_cb)
-     it->tooltip.del_cb((void *)it->tooltip.data, it->base.widget, it);
-   it->tooltip.del_cb = NULL;
-   it->tooltip.content_cb = NULL;
-   it->tooltip.data = NULL;
-   it->tooltip.free_size = EINA_FALSE;
-   if (it->tooltip.style)
+   if ((VIEW(_it)) && (_it->tooltip.content_cb))
+     elm_widget_item_tooltip_unset(_it);
+
+   if (_it->tooltip.del_cb)
+     _it->tooltip.del_cb((void *) _it->tooltip.data, WIDGET(_it), _it);
+   _it->tooltip.del_cb = NULL;
+   _it->tooltip.content_cb = NULL;
+   _it->tooltip.data = NULL;
+   _it->tooltip.free_size = EINA_FALSE;
+   if (_it->tooltip.style)
      elm_genlist_item_tooltip_style_set(it, NULL);
 }
 
 EAPI void
-elm_genlist_item_tooltip_style_set(Elm_Genlist_Item *it,
+elm_genlist_item_tooltip_style_set(Elm_Object_Item  *it,
                                    const char       *style)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   eina_stringshare_replace(&it->tooltip.style, style);
-   if (it->base.view) elm_widget_item_tooltip_style_set(it, style);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+
+   eina_stringshare_replace(&_it->tooltip.style, style);
+   if (VIEW(_it)) elm_widget_item_tooltip_style_set(_it, style);
 }
 
 EAPI const char *
-elm_genlist_item_tooltip_style_get(const Elm_Genlist_Item *it)
+elm_genlist_item_tooltip_style_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
-   return it->tooltip.style;
+   return elm_object_item_tooltip_style_get(it);
 }
 
 EAPI Eina_Bool
-elm_genlist_item_tooltip_size_restrict_disable(Elm_Genlist_Item *it, Eina_Bool disable)
+elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *it,
+                                         Eina_Bool disable)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
-   it->tooltip.free_size = disable;
-   if (it->base.view) return elm_widget_item_tooltip_size_restrict_disable(it, disable);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+
+   _it->tooltip.free_size = disable;
+   if (VIEW(_it)) return elm_widget_item_tooltip_window_mode_set(_it, disable);
    return EINA_TRUE;
 }
 
 EAPI Eina_Bool
-elm_genlist_item_tooltip_size_restrict_disabled_get(const Elm_Genlist_Item *it)
+elm_genlist_item_tooltip_window_mode_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
-   return it->tooltip.free_size;
+   return elm_object_tooltip_window_mode_get(VIEW(it));
 }
 
 EAPI void
-elm_genlist_item_cursor_set(Elm_Genlist_Item *it,
+elm_genlist_item_cursor_set(Elm_Object_Item  *it,
                             const char       *cursor)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   eina_stringshare_replace(&it->mouse_cursor, cursor);
-   if (it->base.view) elm_widget_item_cursor_set(it, cursor);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   eina_stringshare_replace(&_it->mouse_cursor, cursor);
+   if (VIEW(_it)) elm_widget_item_cursor_set(_it, cursor);
 }
 
 EAPI const char *
-elm_genlist_item_cursor_get(const Elm_Genlist_Item *it)
+elm_genlist_item_cursor_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
    return elm_widget_item_cursor_get(it);
 }
 
 EAPI void
-elm_genlist_item_cursor_unset(Elm_Genlist_Item *it)
+elm_genlist_item_cursor_unset(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   if (!it->mouse_cursor)
-     return;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
 
-   if (it->base.view)
-     elm_widget_item_cursor_unset(it);
+   if (!_it->mouse_cursor) return;
 
-   eina_stringshare_del(it->mouse_cursor);
-   it->mouse_cursor = NULL;
+   if (VIEW(_it)) elm_widget_item_cursor_unset(_it);
+
+   eina_stringshare_del(_it->mouse_cursor);
+   _it->mouse_cursor = NULL;
 }
 
 EAPI void
-elm_genlist_item_cursor_style_set(Elm_Genlist_Item *it,
+elm_genlist_item_cursor_style_set(Elm_Object_Item  *it,
                                   const char       *style)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
    elm_widget_item_cursor_style_set(it, style);
 }
 
 EAPI const char *
-elm_genlist_item_cursor_style_get(const Elm_Genlist_Item *it)
+elm_genlist_item_cursor_style_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
    return elm_widget_item_cursor_style_get(it);
 }
 
 EAPI void
-elm_genlist_item_cursor_engine_only_set(Elm_Genlist_Item *it,
-                                        Eina_Bool         engine_only)
+elm_genlist_item_cursor_engine_only_set(Elm_Object_Item *it,
+                                        Eina_Bool        engine_only)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
    elm_widget_item_cursor_engine_only_set(it, engine_only);
 }
 
 EAPI Eina_Bool
-elm_genlist_item_cursor_engine_only_get(const Elm_Genlist_Item *it)
+elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
    return elm_widget_item_cursor_engine_only_get(it);
 }
 
+EAPI int
+elm_genlist_item_index_get(const Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, -1);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+
+   if (_it->item->block)
+     return _it->position + _it->item->block->position;
+   return -1;
+}
+
 EAPI void
-elm_genlist_horizontal_set(Evas_Object  *obj,
-                                Elm_List_Mode mode)
+elm_genlist_mode_set(Evas_Object  *obj,
+                     Elm_List_Mode mode)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -4632,14 +5238,21 @@ elm_genlist_horizontal_set(Evas_Object  *obj,
 }
 
 EAPI void
+elm_genlist_horizontal_set(Evas_Object  *obj,
+                           Elm_List_Mode mode)
+{
+   elm_genlist_mode_set(obj, mode);
+}
+
+EAPI void
 elm_genlist_horizontal_mode_set(Evas_Object  *obj,
                                 Elm_List_Mode mode)
 {
-   elm_genlist_horizontal_set(obj, mode);
+   elm_genlist_mode_set(obj, mode);
 }
 
 EAPI Elm_List_Mode
-elm_genlist_horizontal_get(const Evas_Object *obj)
+elm_genlist_mode_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) ELM_LIST_LAST;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -4647,10 +5260,16 @@ elm_genlist_horizontal_get(const Evas_Object *obj)
    return wd->mode;
 }
 
-EAPI Elm_List_Mode
+EINA_DEPRECATED EAPI Elm_List_Mode
+elm_genlist_horizontal_get(const Evas_Object *obj)
+{
+   return elm_genlist_mode_get(obj);
+}
+
+EINA_DEPRECATED EAPI Elm_List_Mode
 elm_genlist_horizontal_mode_get(const Evas_Object *obj)
 {
-   return elm_genlist_horizontal_get(obj);
+   return elm_genlist_mode_get(obj);
 }
 
 EAPI void
@@ -4660,7 +5279,7 @@ elm_genlist_always_select_mode_set(Evas_Object *obj,
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   wd->always_select = always_select;
+   wd->always_select = !!always_select;
 }
 
 EAPI Eina_Bool
@@ -4679,7 +5298,7 @@ elm_genlist_no_select_mode_set(Evas_Object *obj,
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   wd->no_select = no_select;
+   wd->no_select = !!no_select;
 }
 
 EAPI Eina_Bool
@@ -4698,7 +5317,7 @@ elm_genlist_compress_mode_set(Evas_Object *obj,
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   wd->compress = compress;
+   wd->compress = !!compress;
    if (!compress) elm_genlist_homogeneous_set(obj, EINA_FALSE);
 }
 
@@ -4743,7 +5362,9 @@ elm_genlist_bounce_set(Evas_Object *obj,
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
+   wd->h_bounce = !!h_bounce;
+   wd->v_bounce = !!v_bounce;
+   elm_smart_scroller_bounce_allow_set(wd->scr, wd->h_bounce, wd->v_bounce);
 }
 
 EAPI void
@@ -4754,7 +5375,8 @@ elm_genlist_bounce_get(const Evas_Object *obj,
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_smart_scroller_bounce_allow_get(wd->scr, h_bounce, v_bounce);
+   if (h_bounce) *h_bounce = wd->h_bounce;
+   if (v_bounce) *v_bounce = wd->v_bounce;
 }
 
 EAPI void
@@ -4765,7 +5387,7 @@ elm_genlist_homogeneous_set(Evas_Object *obj,
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    if (homogeneous) elm_genlist_compress_mode_set(obj, EINA_TRUE);
-   wd->homogeneous = homogeneous;
+   wd->homogeneous = !!homogeneous;
 }
 
 EAPI Eina_Bool
@@ -4779,12 +5401,12 @@ elm_genlist_homogeneous_get(const Evas_Object *obj)
 
 EAPI void
 elm_genlist_block_count_set(Evas_Object *obj,
-                            int          n)
+                            int          count)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   wd->max_items_per_block = n;
+   wd->max_items_per_block = count;
    wd->item_cache_max = wd->max_items_per_block * 2;
    _item_cache_clean(wd);
 }
@@ -4851,7 +5473,7 @@ elm_genlist_realized_items_update(Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype);
 
    Eina_List *list, *l;
-   Elm_Genlist_Item *it;
+   Elm_Object_Item *it;
 
    list = elm_genlist_realized_items_get(obj);
    EINA_LIST_FOREACH(list, l, it)
@@ -4859,49 +5481,77 @@ elm_genlist_realized_items_update(Evas_Object *obj)
 }
 
 EAPI void
-elm_genlist_item_mode_set(Elm_Genlist_Item *it,
+elm_genlist_item_mode_set(Elm_Object_Item  *it,
                           const char       *mode_type,
                           Eina_Bool         mode_set)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   Widget_Data *wd = it->wd;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+
+   Widget_Data *wd = _it->wd;
    Eina_List *l;
-   Elm_Genlist_Item *it2;
+   Elm_Object_Item *it2;
 
    if (!wd) return;
    if (!mode_type) return;
-   if ((it->delete_me) || (it->disabled)) return;
+   if ((_it->generation < _it->wd->generation) ||
+       elm_widget_item_disabled_get(_it)) return;
+   if (wd->edit_mode) return;
 
-   if ((wd->mode_item == it) &&
+   if ((wd->mode_item == _it) &&
        (!strcmp(mode_type, wd->mode_type)) &&
        (mode_set))
       return;
-   if (!it->itc->mode_item_style) return;
+   if (!_it->itc->mode_item_style) return;
+   _it->mode_set = mode_set;
 
    if (wd->multi)
      {
         EINA_LIST_FOREACH(wd->selected, l, it2)
-          if (it2->realized)
+          if (((Elm_Gen_Item *)it2)->realized)
             elm_genlist_item_selected_set(it2, EINA_FALSE);
      }
    else
      {
         it2 = elm_genlist_selected_item_get(wd->obj);
-        if ((it2) && (it2->realized))
+        if ((it2) && (((Elm_Gen_Item *)it2)->realized))
           elm_genlist_item_selected_set(it2, EINA_FALSE);
      }
 
    if (((wd->mode_type) && (strcmp(mode_type, wd->mode_type))) ||
        (mode_set) ||
-       ((it == wd->mode_item) && (!mode_set)))
+       ((_it == wd->mode_item) && (!mode_set)))
      _item_mode_unset(wd);
 
    eina_stringshare_replace(&wd->mode_type, mode_type);
-   if (mode_set) _item_mode_set(it);
+   if (mode_set) _item_mode_set(_it);
 }
 
 EAPI const char *
-elm_genlist_mode_get(const Evas_Object *obj)
+elm_genlist_mode_item_style_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   return wd->mode_item->itc->mode_item_style;
+}
+
+EAPI void
+elm_genlist_mode_item_style_set(Evas_Object *obj, const char *style)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   if ((style == wd->mode_item->itc->mode_item_style) ||
+       (style && wd->mode_item->itc->mode_item_style &&
+       (!strcmp(style, wd->mode_item->itc->mode_item_style))))
+     return;
+   eina_stringshare_replace((const char**)&wd->mode_item->itc->mode_item_style, style);
+   elm_genlist_realized_items_update(obj);
+}
+
+EAPI const char *
+elm_genlist_mode_type_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -4909,13 +5559,62 @@ elm_genlist_mode_get(const Evas_Object *obj)
    return wd->mode_type;
 }
 
-EAPI const Elm_Genlist_Item *
+EAPI const Elm_Object_Item *
 elm_genlist_mode_item_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-   return wd->mode_item;
+   return (Elm_Object_Item *) wd->mode_item;
+}
+
+EAPI Eina_Bool
+elm_genlist_edit_mode_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return EINA_FALSE;
+
+   return wd->edit_mode;
+}
+
+EAPI void
+elm_genlist_edit_mode_set(Evas_Object *obj, Eina_Bool edit_mode)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Eina_List *list, *l;
+   Elm_Gen_Item *it;
+
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   edit_mode = !!edit_mode;
+   if (wd->edit_mode == edit_mode) return;
+   wd->edit_mode = edit_mode;
+
+   list = elm_genlist_realized_items_get(obj);
+   if (!wd->edit_mode)
+     {
+        EINA_LIST_FOREACH(list, l, it)
+          {
+             if (it->item->type != ELM_GENLIST_ITEM_GROUP)
+               _edit_mode_item_unrealize(it);
+          }
+        _item_cache_zero(wd);
+     }
+   else
+     {
+        EINA_LIST_FOREACH(list, l, it)
+          {
+             if (it->item->type != ELM_GENLIST_ITEM_GROUP)
+               {
+                  if (it->selected) _item_unselect(it);
+                  if (it->itc->edit_item_style)
+                     _edit_mode_item_realize(it, EINA_TRUE);
+               }
+          }
+     }
+   if (wd->calc_job) ecore_job_del(wd->calc_job);
+   wd->calc_job = ecore_job_add(_calc_job, wd);
 }
 
 EAPI void
@@ -4925,7 +5624,7 @@ elm_genlist_reorder_mode_set(Evas_Object *obj,
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   wd->reorder_mode = reorder_mode;
+   wd->reorder_mode = !!reorder_mode;
 }
 
 EAPI Eina_Bool
@@ -4936,3 +5635,280 @@ elm_genlist_reorder_mode_get(const Evas_Object *obj)
    if (!wd) return EINA_FALSE;
    return wd->reorder_mode;
 }
+
+EAPI Elm_Genlist_Item_Type
+elm_genlist_item_type_get(const Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, ELM_GENLIST_ITEM_MAX);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   return _it->item->type;
+}
+
+EINA_DEPRECATED EAPI Elm_Genlist_Item_Type
+elm_genlist_item_flags_get(const Elm_Object_Item *it)
+{
+   return elm_genlist_item_type_get(it);
+}
+
+EAPI Elm_Genlist_Item_Class *
+elm_genlist_item_class_new(void)
+{
+   Elm_Genlist_Item_Class *itc;
+
+   itc = calloc(1, sizeof(Elm_Genlist_Item_Class));
+   if (!itc)
+     return NULL;
+   itc->version = ELM_GENLIST_ITEM_CLASS_VERSION;
+   itc->refcount = 1;
+   itc->delete_me = EINA_FALSE;
+
+   return itc;
+}
+
+EAPI void
+elm_genlist_item_class_free(Elm_Genlist_Item_Class *itc)
+{
+   if (itc && (itc->version == ELM_GENLIST_ITEM_CLASS_VERSION))
+     {
+        if (!itc->delete_me) itc->delete_me = EINA_TRUE;
+        if (itc->refcount > 0) elm_genlist_item_class_unref(itc);
+        else
+          {
+             itc->version = 0;
+             free(itc);
+          }
+     }
+}
+
+EAPI void
+elm_genlist_item_class_ref(Elm_Genlist_Item_Class *itc)
+{
+   if (itc && (itc->version == ELM_GENLIST_ITEM_CLASS_VERSION))
+     {
+        itc->refcount++;
+        if (itc->refcount == 0) itc->refcount--;
+     }
+}
+
+EAPI void
+elm_genlist_item_class_unref(Elm_Genlist_Item_Class *itc)
+{
+   if (itc && (itc->version == ELM_GENLIST_ITEM_CLASS_VERSION))
+     {
+        if (itc->refcount > 0) itc->refcount--;
+        if (itc->delete_me && (!itc->refcount))
+          elm_genlist_item_class_free(itc);
+     }
+}
+
+void _flip_job(void *data)
+{
+   Elm_Gen_Item *it = (Elm_Gen_Item *) data;
+   _elm_genlist_item_unrealize(it, EINA_FALSE);
+   if (it->selected) _item_unselect(it);
+   it->flipped = EINA_TRUE;
+   it->item->nocache = EINA_TRUE;
+}
+
+EAPI void
+elm_genlist_item_flip_set(Elm_Object_Item *it,
+                          Eina_Bool flip)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+
+   flip = !!flip;
+   if (_it->flipped == flip) return;
+
+   if (flip)
+     {
+        ecore_job_add(_flip_job, _it);
+        if (_it->wd->calc_job) ecore_job_del(_it->wd->calc_job);
+        _it->wd->calc_job = ecore_job_add(_calc_job, _it->wd);
+     }
+   else
+     {
+        _it->flipped = flip;
+        _item_cache_zero(_it->wd);
+        elm_genlist_item_update(it);
+        _it->item->nocache = EINA_FALSE;
+     }
+}
+
+EAPI Eina_Bool
+elm_genlist_item_flip_get(const Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+   Elm_Gen_Item *_it = (Elm_Gen_Item *)it;
+   return _it->flipped;
+}
+
+/* for gengrid as of now */
+void
+_elm_genlist_page_relative_set(Evas_Object *obj,
+                               double       h_pagerel,
+                               double       v_pagerel)
+{
+   Evas_Coord pagesize_h;
+   Evas_Coord pagesize_v;
+
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+
+   elm_smart_scroller_paging_get(wd->scr, NULL, NULL, &pagesize_h, &pagesize_v);
+   elm_smart_scroller_paging_set(wd->scr, h_pagerel, v_pagerel, pagesize_h,
+                                 pagesize_v);
+}
+
+/* for gengrid as of now */
+void
+_elm_genlist_page_relative_get(const Evas_Object *obj,
+                               double            *h_pagerel,
+                               double            *v_pagerel)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+
+   elm_smart_scroller_paging_get(wd->scr, h_pagerel, v_pagerel, NULL, NULL);
+}
+
+/* for gengrid as of now */
+void
+_elm_genlist_page_size_set(Evas_Object *obj,
+                           Evas_Coord   h_pagesize,
+                           Evas_Coord   v_pagesize)
+{
+   double pagerel_h;
+   double pagerel_v;
+
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_paging_get(wd->scr, &pagerel_h, &pagerel_v, NULL, NULL);
+   elm_smart_scroller_paging_set(wd->scr, pagerel_h, pagerel_v, h_pagesize,
+                                 v_pagesize);
+}
+
+/* for gengrid as of now */
+void
+_elm_genlist_current_page_get(const Evas_Object *obj,
+                              int               *h_pagenumber,
+                              int               *v_pagenumber)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_current_page_get(wd->scr, h_pagenumber, v_pagenumber);
+}
+
+/* for gengrid as of now */
+void
+_elm_genlist_last_page_get(const Evas_Object *obj,
+                           int               *h_pagenumber,
+                           int               *v_pagenumber)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_last_page_get(wd->scr, h_pagenumber, v_pagenumber);
+}
+
+/* for gengrid as of now */
+void
+_elm_genlist_page_show(const Evas_Object *obj,
+                       int                h_pagenumber,
+                       int                v_pagenumber)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_page_show(wd->scr, h_pagenumber, v_pagenumber);
+}
+
+/* for gengrid as of now */
+void
+_elm_genlist_page_bring_in(const Evas_Object *obj,
+                           int                h_pagenumber,
+                           int                v_pagenumber)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_page_bring_in(wd->scr, h_pagenumber, v_pagenumber);
+}
+
+void
+_elm_genlist_item_unrealize(Elm_Gen_Item *it,
+                            Eina_Bool     calc)
+{
+   Evas_Object *content;
+
+   if (!it->realized) return;
+   if (it->wd->reorder_it == it) return;
+
+   evas_event_freeze(evas_object_evas_get(WIDGET(it)));
+   if (!calc)
+     evas_object_smart_callback_call(WIDGET(it), SIG_UNREALIZED, it);
+   if (it->long_timer)
+     {
+        ecore_timer_del(it->long_timer);
+        it->long_timer = NULL;
+     }
+
+   elm_widget_stringlist_free(it->texts);
+   it->texts = NULL;
+   elm_widget_stringlist_free(it->contents);
+   it->contents = NULL;
+   elm_widget_stringlist_free(it->states);
+   it->states = NULL;
+
+   EINA_LIST_FREE(it->content_objs, content)
+     evas_object_del(content);
+
+   it->unrealize_cb(it);
+
+   it->realized = EINA_FALSE;
+   it->want_unrealize = EINA_FALSE;
+   evas_event_thaw(evas_object_evas_get(WIDGET(it)));
+   evas_event_thaw_eval(evas_object_evas_get(WIDGET(it)));
+}
+
+void
+_elm_genlist_item_del_notserious(Elm_Gen_Item *it)
+{
+   elm_widget_item_pre_notify_del(it);
+   it->generation = it->wd->generation - 1; /* This means that the item is deleted */
+   if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it);
+
+   if (it->itc->func.del)
+     it->itc->func.del((void *)it->base.data, WIDGET(it));
+}
+
+void
+_elm_genlist_item_del_serious(Elm_Gen_Item *it)
+{
+   _elm_genlist_item_del_notserious(it);
+   it->wd->items = eina_inlist_remove(it->wd->items, EINA_INLIST_GET(it));
+   if (it->tooltip.del_cb)
+     it->tooltip.del_cb((void *)it->tooltip.data, WIDGET(it), it);
+   it->wd->walking -= it->walking;
+   if (it->long_timer) ecore_timer_del(it->long_timer);
+   if (it->group)
+     it->wd->group_items = eina_list_remove(it->wd->group_items, it);
+
+   if (it->wd->state)
+     {
+        eina_inlist_sorted_state_free(it->wd->state);
+        it->wd->state = NULL;
+     }
+   if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
+   it->wd->calc_job = ecore_job_add(it->wd->calc_cb, it->wd);
+   free(it->item);
+
+   it->item = NULL;
+   if (it->wd->last_selected_item == (Elm_Object_Item *)it)
+     it->wd->last_selected_item = NULL;
+   it->wd->item_count--;
+}