expedite: porting to Eo

Signed-off-by: Yakov Goldberg <yakov.goldberg@gmail.com>

SVN revision: 83180

121 files changed, 2265 insertions, 2248 deletions

diff --git a/src/bin/about.c b/src/bin/about.c
index f36fdbc..084bd41 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -8,10 +8,10 @@ _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = evas_object_textblock_add(evas);
-   evas_object_move(o, 10, 40);
-   evas_object_resize(o, win_w - 20, win_h - 50);
-   evas_object_show(o);
+   o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
+   eo_do(o, evas_obj_position_set(10, 40),
+            evas_obj_size_set(win_w - 20, win_h - 50),
+            evas_obj_visibility_set(EINA_TRUE));
    st = evas_textblock_style_new();
    evas_textblock_style_set
      (st,
@@ -21,12 +21,10 @@ _setup(void)
       "p='+ font=Vera font_size=10 align=left'"
       "/p='- \n \n'"
       );
-   evas_object_textblock_style_set(o, st);
-   evas_textblock_style_free(st);
-   evas_object_textblock_clear(o);
-   evas_object_textblock_text_markup_set
-     (o,
-      "<center>"
+   eo_do(o, evas_obj_textblock_style_set(st),
+            evas_obj_textblock_clear(),
+            evas_obj_textblock_text_markup_set
+     ("<center>"
       "Enlightenment used to be a window manager project, but "
       "since has changed a lot to become a miniature desktop and mobile "
       "device environment all of its own. It is now made up of many "
@@ -43,7 +41,8 @@ _setup(void)
       "layout descriptions that applications set up, dealing with the hard "
       "work of doing the drawing for them."
       "</center>"
-      );
+      ));
+   evas_textblock_style_free(st);
    o_text = o;
    ui_fps(0.0);
 }
@@ -51,7 +50,7 @@ _setup(void)
 static void
 _cleanup(void)
 {
-   evas_object_del(o_text);
+   eo_del(o_text);
    o_text = NULL;
 }
 
diff --git a/src/bin/filter_object_blur.c b/src/bin/filter_object_blur.c
index a7bac9b..27f6e2a 100644
--- a/src/bin/filter_object_blur.c
+++ b/src/bin/filter_object_blur.c
@@ -24,15 +24,15 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_filter_set(o, EVAS_FILTER_BLUR);
-        evas_object_filter_param_int_set(o, "radius", 3);
-        evas_object_show(o);
-        src = o;
-        o_images[i] = src;
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
+        evas_object_filter_set(o, EVAS_FILTER_BLUR);
+        evas_object_filter_param_int_set(o, "radius", 3);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+        src = o;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/filter_object_blur_solid.c b/src/bin/filter_object_blur_solid.c
index b61fd2c..c2e718e 100644
--- a/src/bin/filter_object_blur_solid.c
+++ b/src/bin/filter_object_blur_solid.c
@@ -24,16 +24,16 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_filter_set(o, EVAS_FILTER_BLUR);
-        evas_object_filter_param_int_set(o, "radius", 5);
-        evas_object_layer_set(o,1);
-        evas_object_show(o);
-        src = o;
-        o_images[i] = src;
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
+        evas_object_filter_set(o, EVAS_FILTER_BLUR);
+        evas_object_filter_param_int_set(o, "radius", 5);
+        eo_do(o, evas_obj_layer_set(1),
+                 evas_obj_visibility_set(EINA_TRUE));
+        src = o;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/filter_object_brightness.c b/src/bin/filter_object_brightness.c
index a1d5ef6..4606200 100644
--- a/src/bin/filter_object_brightness.c
+++ b/src/bin/filter_object_brightness.c
@@ -24,15 +24,15 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
-        evas_object_filter_param_float_set(o, "adjust", i / (double)OBNUM);
-        evas_object_show(o);
-        src = o;
-        o_images[i] = src;
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
+        evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
+        evas_object_filter_param_float_set(o, "adjust", i / (double)OBNUM);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+        src = o;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
         evas_object_filter_param_float_set(o_images[i], "adjust",
                         ((i + f) % OBNUM) / (2.0 * OBNUM) - 1);
      }
diff --git a/src/bin/filter_object_brightness_solid.c b/src/bin/filter_object_brightness_solid.c
index 849482e..43fd173 100644
--- a/src/bin/filter_object_brightness_solid.c
+++ b/src/bin/filter_object_brightness_solid.c
@@ -24,17 +24,17 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
-        evas_object_filter_param_float_set(o, "adjust",
-                        i / (2.0 * OBNUM) - 1.0);
-        evas_object_layer_set(o,1);
-        evas_object_show(o);
-        src = o;
-        o_images[i] = src;
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
+        evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
+        evas_object_filter_param_float_set(o, "adjust",
+              i / (2.0 * OBNUM) - 1.0);
+        eo_do(o, evas_obj_layer_set(1),
+                 evas_obj_visibility_set(EINA_TRUE));
+        src = o;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -44,7 +44,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -60,7 +60,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
         evas_object_filter_param_float_set(o_images[i], "adjust",
                         (((i + f) % OBNUM) * 2.0) / (OBNUM) - 1.0);
      }
diff --git a/src/bin/filter_object_colors.c b/src/bin/filter_object_colors.c
index 2b66799..f05c3cc 100644
--- a/src/bin/filter_object_colors.c
+++ b/src/bin/filter_object_colors.c
@@ -29,12 +29,12 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
         evas_object_filter_set(o, filters[i % 3]);
-        evas_object_show(o);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
         src = o;
         o_images[i] = src;
      }
@@ -46,7 +46,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/filter_object_colors_solid.c b/src/bin/filter_object_colors_solid.c
index 534ab81..95d18f8 100644
--- a/src/bin/filter_object_colors_solid.c
+++ b/src/bin/filter_object_colors_solid.c
@@ -29,13 +29,13 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
         evas_object_filter_set(o, filters[i % 3]);
-        evas_object_layer_set(o,1);
-        evas_object_show(o);
+        eo_do(o, evas_obj_layer_set(1),
+                 evas_obj_visibility_set(EINA_TRUE));
         src = o;
         o_images[i] = src;
      }
@@ -47,7 +47,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -63,7 +63,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/filter_object_greyscale.c b/src/bin/filter_object_greyscale.c
index 0d41ddd..749f89c 100644
--- a/src/bin/filter_object_greyscale.c
+++ b/src/bin/filter_object_greyscale.c
@@ -24,14 +24,14 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
-        evas_object_show(o);
-        src = o;
-        o_images[i] = src;
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
+        evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+        src = o;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/filter_object_greyscale_solid.c b/src/bin/filter_object_greyscale_solid.c
index 98373f5..b2695d5 100644
--- a/src/bin/filter_object_greyscale_solid.c
+++ b/src/bin/filter_object_greyscale_solid.c
@@ -24,15 +24,15 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
-        evas_object_layer_set(o,1);
-        evas_object_show(o);
-        src = o;
-        o_images[i] = src;
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
+        evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
+        eo_do(o, evas_obj_layer_set(1),
+                 evas_obj_visibility_set(EINA_TRUE));
+        src = o;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/filter_object_invert.c b/src/bin/filter_object_invert.c
index 506dd59..4f3c0a1 100644
--- a/src/bin/filter_object_invert.c
+++ b/src/bin/filter_object_invert.c
@@ -24,14 +24,14 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_filter_set(o, EVAS_FILTER_INVERT);
-        evas_object_show(o);
-        src = o;
-        o_images[i] = src;
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
+        evas_object_filter_set(o, EVAS_FILTER_INVERT);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+        src = o;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/filter_object_invert_solid.c b/src/bin/filter_object_invert_solid.c
index 03e4eaa..a67a4ae 100644
--- a/src/bin/filter_object_invert_solid.c
+++ b/src/bin/filter_object_invert_solid.c
@@ -24,15 +24,15 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_filter_set(o, EVAS_FILTER_INVERT);
-        evas_object_layer_set(o,1);
-        evas_object_show(o);
-        src = o;
-        o_images[i] = src;
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
+        evas_object_filter_set(o, EVAS_FILTER_INVERT);
+        eo_do(o, evas_obj_layer_set(1),
+                 evas_obj_visibility_set(EINA_TRUE));
+        src = o;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/filter_object_sepia.c b/src/bin/filter_object_sepia.c
index e9db58a..01a6239 100644
--- a/src/bin/filter_object_sepia.c
+++ b/src/bin/filter_object_sepia.c
@@ -24,14 +24,14 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_filter_set(o, EVAS_FILTER_SEPIA);
-        evas_object_show(o);
-        src = o;
-        o_images[i] = src;
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
+        evas_object_filter_set(o, EVAS_FILTER_SEPIA);
+        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+        src = o;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/filter_object_sepia_solid.c b/src/bin/filter_object_sepia_solid.c
index 3f092cf..3e7c20c 100644
--- a/src/bin/filter_object_sepia_solid.c
+++ b/src/bin/filter_object_sepia_solid.c
@@ -24,15 +24,15 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_filter_set(o, EVAS_FILTER_SEPIA);
-        evas_object_layer_set(o,1);
-        evas_object_show(o);
-        src = o;
-        o_images[i] = src;
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
+        evas_object_filter_set(o, EVAS_FILTER_SEPIA);
+        eo_do(o, evas_obj_layer_set(1),
+                 evas_obj_visibility_set(EINA_TRUE));
+        src = o;
+        o_images[i] = src;
      }
 
    done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 10d5b85..b5e683d 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("bar.png"), NULL);
-        evas_object_image_border_set(o, 6, 6, 6, 6);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
+                 evas_obj_image_border_set(6, 6, 6, 6),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 3e11840..b05d263 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -23,12 +23,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("pan.png"), NULL);
-        evas_object_color_set(o, 64, 64, 64, 255);
-        evas_object_image_border_set(o, 3, 3, 3, 3);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("pan.png"), NULL),
+                 evas_obj_color_set(64, 64, 64, 255),
+                 evas_obj_image_border_set(3, 3, 3, 3),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -48,16 +48,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index f31acaa..c5d649b 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -24,16 +24,16 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
+
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        evas_object_color_set(o, a, a, a, a);
-        evas_object_show(o);
+        eo_do(o, evas_obj_color_set(a, a, a, a),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -53,12 +53,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-        h = 160;
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        h = 160;
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index 658110f..1361c53 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -24,15 +24,14 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
         a = rnd()&0xff;
-        evas_object_color_set(o, a, a, a, a);
-        evas_object_show(o);
+        eo_do(o, evas_obj_color_set(a, a, a, a),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -41,7 +40,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -52,12 +51,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-        h = 160;
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        h = 160;
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 52ba6d7..f2bad8b 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_smooth_scale_set(o, 0);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_smooth_scale_set(0),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 40 + ((i % 3) * (w0 / 2));
-        h = 40 + ((i % 3) * (h0 / 2));
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 40 + ((i % 3) * (w0 / 2));
+        h = 40 + ((i % 3) * (h0 / 2));
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 47a431e..951645e 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_smooth_scale_set(o, 0);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_smooth_scale_set(0),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index e8979b4..21cb4be 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_smooth_scale_set(o, 0);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_smooth_scale_set(0),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 40 + ((i % 3) * (w0 / 2));
-        h = 40 + ((i % 3) * (h0 / 2));
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 40 + ((i % 3) * (w0 / 2));
+        h = 40 + ((i % 3) * (h0 / 2));
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 1bd75df..d0af1a5 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_smooth_scale_set(o, 0);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_smooth_scale_set(0),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 098ee57..cefe973 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -24,22 +24,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i < (OBNUM / 2))
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i < (OBNUM / 2))
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,7 +48,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i < (OBNUM / 2))
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i < (OBNUM / 2))
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index c0ba2dc..830e181 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i < (OBNUM / 2))
-          evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/logo.png", NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i < (OBNUM / 2))
+          eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i < (OBNUM / 2))
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i < (OBNUM / 2))
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 02a0f09..1953967 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i < (OBNUM / 2))
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i < (OBNUM / 2))
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i < (OBNUM / 2))
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i < (OBNUM / 2))
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 51b44f8..856d5a5 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i < (OBNUM / 2))
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i < (OBNUM / 2))
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i < (OBNUM / 2))
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i < (OBNUM / 2))
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 4557bce..578f030 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -24,22 +24,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i & 0x1)
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i & 0x1)
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,7 +48,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i & 0x1)
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i & 0x1)
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 8aca4b1..d0eb4bd 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i & 0x1)
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i & 0x1)
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i & 0x1)
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i & 0x1)
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index b0ab9ba..405f5ca 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i & 0x1)
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i & 0x1)
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i & 0x1)
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i & 0x1)
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 776ada8..d15445a 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i & 0x1)
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i & 0x1)
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i & 0x1)
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i & 0x1)
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index fa69b97..db7edc7 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -24,22 +24,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i > (OBNUM / 2))
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i > (OBNUM / 2))
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -48,7 +48,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i > (OBNUM / 2))
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i > (OBNUM / 2))
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 92166f1..57888fc 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i > (OBNUM / 2))
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i > (OBNUM / 2))
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i > (OBNUM / 2))
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i > (OBNUM / 2))
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index aecb5ee..3dd41a4 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i > (OBNUM / 2))
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i > (OBNUM / 2))
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i > (OBNUM / 2))
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i > (OBNUM / 2))
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index ea353ba..43d3642 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        if (i > (OBNUM / 2))
-          evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        else
-          {
-             Evas_Coord x, y;
-
-             evas_object_image_file_set(o, build_path("image.png"), NULL);
-             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
-             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             evas_object_move(o, x, y);
-          }
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        if (i > (OBNUM / 2))
+          eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+        else
+          {
+             Evas_Coord x, y;
+
+             eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+             x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+             y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+             eo_do(o, evas_obj_position_set(x, y));
+          }
+        eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -51,7 +51,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (i > (OBNUM / 2))
-          {
-             w = 120;
-             h = 160;
-             x = (win_w / 2) - (w / 2);
-             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-             y = (win_h / 2) - (h / 2);
-             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             evas_object_move(o_images[i], x, y);
-          }
+        if (i > (OBNUM / 2))
+          {
+             w = 120;
+             h = 160;
+             x = (win_w / 2) - (w / 2);
+             x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+             y = (win_h / 2) - (h / 2);
+             y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+             eo_do(o_images[i], evas_obj_position_set(x, y));
+          }
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index a1e6fc3..2301899 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_smooth_scale_set(o, 1);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_smooth_scale_set(1),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 40 + ((i % 3) * (w0 / 2));
-        h = 40 + ((i % 3) * (h0 / 2));
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 40 + ((i % 3) * (w0 / 2));
+        h = 40 + ((i % 3) * (h0 / 2));
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index b2086f0..afa2b5d 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_smooth_scale_set(o, 1);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_smooth_scale_set(1),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 41366a3..fe0763c 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_smooth_scale_set(o, 1);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_smooth_scale_set(1),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 40 + ((i % 3) * (w0 / 2));
-        h = 40 + ((i % 3) * (h0 / 2));
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 40 + ((i % 3) * (w0 / 2));
+        h = 40 + ((i % 3) * (h0 / 2));
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index e4028bd..db13620 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_smooth_scale_set(o, 1);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_smooth_scale_set(1),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 2e1b0bb..7e05605 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("frame.png"), NULL);
-        evas_object_image_border_set(o, 8, 8, 8, 8);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("frame.png"), NULL),
+                 evas_obj_image_border_set(8, 8, 8, 8),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2);
-        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2);
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 1af71db..01e6e59 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -24,16 +24,16 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
+
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        evas_object_color_set(o, a, a, a, a);
-        evas_object_show(o);
+        eo_do(o, evas_obj_color_set(a, a, a, a),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -42,7 +42,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -53,12 +53,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-        h = 160;
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        h = 160;
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 6a6cb9f..769d59c 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -24,15 +24,15 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
+
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160));
         a = rnd()&0xff;
-        evas_object_color_set(o, a, a, a, a);
-        evas_object_show(o);
+        eo_do(o, evas_obj_color_set(a, a, a, a),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -52,12 +52,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-        h = 160;
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        h = 160;
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 5a7d6f9..86c4a5f 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -23,12 +23,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("bar.png"), NULL);
-        evas_object_image_border_set(o, 6, 6, 6, 6);
-        evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
+                 evas_obj_image_border_set(6, 6, 6, 6),
+                 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -48,16 +48,16 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-        h0 = 80;
-        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
-        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index b2a30ca..82860e8 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_image_border_set(o, 43, 48, 48, 83);
-        evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_image_border_set(43, 48, 48, 83),
+                 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -39,7 +39,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -50,12 +50,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-        h = 160;
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        h = 160;
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 136323e..e53b20f 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -23,12 +23,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("image.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -48,12 +48,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-        h = 160;
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        h = 160;
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 02feb60..65f3f6b 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -23,12 +23,12 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_file_set(o, build_path("logo.png"), NULL);
-        evas_object_image_fill_set(o, 0, 0, 120, 160);
-        evas_object_resize(o, 120, 160);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+                 evas_obj_image_fill_set(0, 0, 120, 160),
+                 evas_obj_size_set(120, 160),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -37,7 +37,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -48,12 +48,12 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w = 120;
-        h = 160;
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        evas_object_move(o_images[i], x, y);
+        h = 160;
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 3a824a8..b5694c3 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -22,19 +22,19 @@ static void _setup(void)
 {
    Evas_Object *o;
 
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_images[0] = o;
-   evas_object_image_file_set(o, build_path("im1.png"), NULL);
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
-   evas_object_resize(o, 720, 420);
-   evas_object_show(o);
+   eo_do(o, evas_obj_image_file_set(build_path("im1.png"), NULL),
+            evas_obj_image_fill_set(0, 0, 720, 420),
+            evas_obj_size_set(720, 420),
+            evas_obj_visibility_set(EINA_TRUE));
 
-   o = evas_object_image_add(evas);
+   o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
    o_images[1] = o;
-   evas_object_image_file_set(o, build_path("im2.png"), NULL);
-   evas_object_image_fill_set(o, 0, 0, 720, 420);
-   evas_object_resize(o, 720, 420);
-   evas_object_show(o);
+   eo_do(o, evas_obj_image_file_set(build_path("im2.png"), NULL),
+            evas_obj_image_fill_set(0, 0, 720, 420),
+            evas_obj_size_set(720, 420),
+            evas_obj_visibility_set(EINA_TRUE));
 
    done = 0;
 }
@@ -43,7 +43,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 2; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 2; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -53,7 +53,7 @@ static void _loop(double t, int f)
 
    a = f & 0x1f;
    a = ((a << 3) | (a >> 2)) & 0xff;
-   evas_object_color_set(o_images[1], a, a, a, a);
+   eo_do(o_images[1], evas_obj_color_set(a, a, a, a));
    FPS_STD(NAME);
 }
 
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 90f6779..6bdbc2f 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -24,15 +24,15 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
-        evas_object_image_size_set(o, 640, 480);
-        evas_object_image_alpha_set(o, 0);
-        evas_object_image_fill_set(o, 0, 0, 640, 480);
-        evas_object_resize(o, 640, 480);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
+                 evas_obj_image_size_set(640, 480),
+                 evas_obj_image_alpha_set(0),
+                 evas_obj_image_fill_set(0, 0, 640, 480),
+                 evas_obj_size_set(640, 480),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -51,29 +51,30 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < 1; i++)
      {
-        unsigned int *data, *p;
+        unsigned int *data, *p;
 
         w = 640;
-        h = 480;
-        x = (win_w / 2) - (w / 2);
-        y = (win_h / 2) - (h / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
-        data = evas_object_image_data_get(o_images[i], 1);
-        st = evas_object_image_stride_get(o_images[i]) >> 2;
-        p = data;
-        for (y = 0; y < h; y++)
-          {
-             for (x = 0; x < w; x++)
-               {
-                  *p = ((((x * y) + f) << 8) ^ (x - y - f)) | 0xff000000;
-                  p++;
-               }
+        h = 480;
+        x = (win_w / 2) - (w / 2);
+        y = (win_h / 2) - (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h),
+                           evas_obj_image_data_get(1, (void **) &data),
+                           evas_obj_image_stride_get(&st));
+        st = st >> 2;
+        p = data;
+        for (y = 0; y < h; y++)
+          {
+             for (x = 0; x < w; x++)
+               {
+                  *p = ((((x * y) + f) << 8) ^ (x - y - f)) | 0xff000000;
+                  p++;
+               }
              p += (st - w);
-          }
-        evas_object_image_data_set(o_images[i], data);
-        evas_object_image_data_update_add(o_images[i], 0, 0, w, h);
+          }
+        eo_do(o_images[i], evas_obj_image_data_set(data),
+                           evas_obj_image_data_update_add( 0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 1498fb7..1dae2f1 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -24,15 +24,15 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
-        evas_object_image_size_set(o, 640, 480);
-        evas_object_image_alpha_set(o, 1);
-        evas_object_image_fill_set(o, 0, 0, 640, 480);
-        evas_object_resize(o, 640, 480);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
+                 evas_obj_image_size_set(640, 480),
+                 evas_obj_image_alpha_set(1),
+                 evas_obj_image_fill_set(0, 0, 640, 480),
+                 evas_obj_size_set(640, 480),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -41,7 +41,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -51,40 +51,41 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < 1; i++)
      {
-        unsigned int *data, *p;
-        int a, r, g, b;
+        unsigned int *data, *p;
+        int a, r, g, b;
         w = 640;
-        h = 480;
-        x = (win_w / 2) - (w / 2);
-        y = (win_h / 2) - (h / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
-        data = evas_object_image_data_get(o_images[i], 1);
-        st = evas_object_image_stride_get(o_images[i]) >> 2;
-        p = data;
-        for (y = 0; y < h; y++)
-          {
-             for (x = 0; x < w; x++)
-               {
-                  r = (x * y / 7) + f;
-                  g = (x / 2);
-                  b = (y / 2);
-                  a = (x + y);
-                  r &= 0xff;
-                  g &= 0xff;
-                  b &= 0xff;
-                  a &= 0xff;
-                  r = (a * r) / 255;
-                  g = (a * g) / 255;
-                  b = (a * b) / 255;
-                  *p = (a << 24) | (r << 16) | (g << 8) | b;
-                  p++;
-               }
+        h = 480;
+        x = (win_w / 2) - (w / 2);
+        y = (win_h / 2) - (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h),
+                           evas_obj_image_data_get(1, (void **) &data),
+                           evas_obj_image_stride_get(&st));
+        st = st >> 2;
+        p = data;
+        for (y = 0; y < h; y++)
+          {
+             for (x = 0; x < w; x++)
+               {
+                  r = (x * y / 7) + f;
+                  g = (x / 2);
+                  b = (y / 2);
+                  a = (x + y);
+                  r &= 0xff;
+                  g &= 0xff;
+                  b &= 0xff;
+                  a &= 0xff;
+                  r = (a * r) / 255;
+                  g = (a * g) / 255;
+                  b = (a * b) / 255;
+                  *p = (a << 24) | (r << 16) | (g << 8) | b;
+                  p++;
+               }
              p += (st - w);
-          }
-        evas_object_image_data_set(o_images[i], data);
-        evas_object_image_data_update_add(o_images[i], 0, 0, w, h);
+          }
+        eo_do(o_images[i], evas_obj_image_data_set(data),
+                           evas_obj_image_data_update_add( 0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index d3be38f..3ecbc8b 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -28,44 +28,44 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
-        evas_object_image_size_set(o, 640, 480);
-        evas_object_image_alpha_set(o, 0);
-        evas_object_image_fill_set(o, 0, 0, 640, 480);
-        evas_object_resize(o, 640, 480);
-        evas_object_show(o);
-        yp = malloc(640 * 480);
-        up = malloc(320 * 240);
-        vp = malloc(320 * 240);
-        f = fopen(build_path("tp.yuv"), "rb");
-        if (f)
-          {
-             r = fread(yp, 640 * 480, 1, f);
-             r = fread(up, 320 * 240, 1, f);
-             r = fread(vp, 320 * 240, 1, f);
-             fclose(f);
-          }
-        data = evas_object_image_data_get(o_images[i], 1);
-        lp = data;
-        for (y = 0; y < 480; y++)
-          {
-             *lp = yp + (y * 640);
-             lp++;
-          }
-        for (y = 0; y < 240; y++)
-          {
-             *lp = up + (y * 320);
-             lp++;
-          }
-        for (y = 0; y < 240; y++)
-          {
-             *lp = vp + (y * 320);
-             lp++;
-          }
-        evas_object_image_data_set(o_images[i], data);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+                 evas_obj_image_size_set(640, 480),
+                 evas_obj_image_alpha_set(0),
+                 evas_obj_image_fill_set(0, 0, 640, 480),
+                 evas_obj_size_set(640, 480),
+                 evas_obj_visibility_set(EINA_TRUE));
+        yp = malloc(640 * 480);
+        up = malloc(320 * 240);
+        vp = malloc(320 * 240);
+        f = fopen(build_path("tp.yuv"), "rb");
+        if (f)
+          {
+             r = fread(yp, 640 * 480, 1, f);
+             r = fread(up, 320 * 240, 1, f);
+             r = fread(vp, 320 * 240, 1, f);
+             fclose(f);
+          }
+        data = evas_object_image_data_get(o_images[i], 1);
+        lp = data;
+        for (y = 0; y < 480; y++)
+          {
+             *lp = yp + (y * 640);
+             lp++;
+          }
+        for (y = 0; y < 240; y++)
+          {
+             *lp = up + (y * 320);
+             lp++;
+          }
+        for (y = 0; y < 240; y++)
+          {
+             *lp = vp + (y * 320);
+             lp++;
+          }
+        eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
 }
@@ -74,7 +74,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    free(yp);
    free(up);
    free(vp);
@@ -88,13 +88,13 @@ static void _loop(double t, int f)
    for (i = 0; i < 1; i++)
      {
         w = 640;
-        h = 480;
-        x = (win_w / 2) - (w / 2);
-        y = (win_h / 2) - (h / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
-        evas_object_image_data_update_add(o_images[i], 0, 0, 640, 480);
+        h = 480;
+        x = (win_w / 2) - (w / 2);
+        y = (win_h / 2) - (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y),
+                           evas_obj_size_set(w, h),
+                           evas_obj_image_fill_set(0, 0, w, h),
+                           evas_obj_image_data_update_add( 0, 0, 640, 480));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index 3b827fa..14cc7a9 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -28,16 +28,16 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
-        evas_object_image_size_set(o, 640, 480);
-        evas_object_image_alpha_set(o, 0);
-        evas_object_image_fill_set(o, 0, 0, 640, 480);
-        evas_object_resize(o, 640, 480);
-        evas_object_image_smooth_scale_set(o, 0);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+                 evas_obj_image_size_set(640, 480),
+                 evas_obj_image_alpha_set(0),
+                 evas_obj_image_fill_set(0, 0, 640, 480),
+                 evas_obj_size_set(640, 480),
+                 evas_obj_image_smooth_scale_set(0),
+                 evas_obj_visibility_set(EINA_TRUE));
         yp = malloc(640 * 480);
         up = malloc(320 * 240);
         vp = malloc(320 * 240);
@@ -66,7 +66,7 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        evas_object_image_data_set(o_images[i], data);
+        eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
 }
@@ -75,7 +75,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    free(yp);
    free(up);
    free(vp);
@@ -100,8 +100,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
-        evas_object_map_set(o_images[i], m);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 290f716..17558dd 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -28,15 +28,15 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
-        evas_object_image_size_set(o, 640, 480);
-        evas_object_image_alpha_set(o, 0);
-        evas_object_image_fill_set(o, 0, 0, 640, 480);
-        evas_object_resize(o, 640, 480);
-        evas_object_show(o);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+                 evas_obj_image_size_set(640, 480),
+                 evas_obj_image_alpha_set(0),
+                 evas_obj_image_fill_set(0, 0, 640, 480),
+                 evas_obj_size_set(640, 480),
+                 evas_obj_visibility_set(EINA_TRUE));
         yp = malloc(640 * 480);
         up = malloc(320 * 240);
         vp = malloc(320 * 240);
@@ -65,7 +65,7 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        evas_object_image_data_set(o_images[i], data);
+        eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
 }
@@ -74,7 +74,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    free(yp);
    free(up);
    free(vp);
@@ -98,8 +98,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        evas_object_map_enable_set(o_images[i], 1);
-        evas_object_map_set(o_images[i], m);
+        eo_do(o_images[i], evas_obj_map_enable_set(1),
+                           evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index e46e94b..88deeaf 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -28,48 +28,48 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        o = evas_object_image_add(evas);
-        o_images[i] = o;
-        evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-        evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
-        evas_object_image_size_set(o, 320, 480);
-        evas_object_image_alpha_set(o, 0);
-        evas_object_image_fill_set(o, 0, 0, 640, 480);
-        evas_object_resize(o, 640, 480);
-        evas_object_show(o);
-        yp = malloc(640 * 480);
-        up = malloc(320 * 240);
-        vp = malloc(320 * 240);
-        f = fopen(build_path("tp.yuv"), "rb");
-        if (f)
-          {
-             r = fread(yp, 640 * 480, 1, f);
-             r = fread(up, 320 * 240, 1, f);
-             r = fread(vp, 320 * 240, 1, f);
-             fclose(f);
-          }
-        data = evas_object_image_data_get(o_images[i], 1);
-        if (data)
-          {
-             lp = data;
-             for (y = 0; y < 480; y++)
-               {
-                  *lp = yp + (y * 640);
-                  lp++;
-               }
-             for (y = 0; y < 240; y++)
-               {
-                  *lp = up + (y * 320);
-                  lp++;
-               }
-             for (y = 0; y < 240; y++)
-               {
-                  *lp = vp + (y * 320);
-                  lp++;
-               }
-             evas_object_image_data_set(o_images[i], data);
-             evas_object_image_data_update_add(o_images[i], 0, 0, 320, 480);
-          }
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+                 evas_obj_image_size_set(320, 480),
+                 evas_obj_image_alpha_set(0),
+                 evas_obj_image_fill_set(0, 0, 640, 480),
+                 evas_obj_size_set(640, 480),
+                 evas_obj_visibility_set(EINA_TRUE));
+        yp = malloc(640 * 480);
+        up = malloc(320 * 240);
+        vp = malloc(320 * 240);
+        f = fopen(build_path("tp.yuv"), "rb");
+        if (f)
+          {
+             r = fread(yp, 640 * 480, 1, f);
+             r = fread(up, 320 * 240, 1, f);
+             r = fread(vp, 320 * 240, 1, f);
+             fclose(f);
+          }
+        data = evas_object_image_data_get(o_images[i], 1);
+        if (data)
+          {
+             lp = data;
+             for (y = 0; y < 480; y++)
+               {
+                  *lp = yp + (y * 640);
+                  lp++;
+               }
+             for (y = 0; y < 240; y++)
+               {
+                  *lp = up + (y * 320);
+                  lp++;
+               }
+             for (y = 0; y < 240; y++)
+               {
+                  *lp = vp + (y * 320);
+                  lp++;
+               }
+             eo_do(o_images[i], evas_obj_image_data_set(data),
+                                evas_obj_image_data_update_add( 0, 0, 320, 480));
+          }
      }
    done = 0;
 }
@@ -78,7 +78,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < 1; i++) eo_del(o_images[i]);
    free(yp);
    free(up);
    free(vp);
@@ -97,9 +97,9 @@ static void _loop(double t, int f)
         h = 480;
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
-        evas_object_move(o_images[i], x, y);
-        evas_object_resize(o_images[i], w, h);
-        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], evas_obj_size_set(w, h));
+        eo_do(o_images[i], evas_obj_image_fill_set(0, 0, w, h));
 
         w = 320 - 16 + f;
         if (w < 1) w = 1;
@@ -107,7 +107,7 @@ static void _loop(double t, int f)
 
         w &= ~0x1;
 
-        evas_object_image_size_set(o_images[i], w, 480);
+        eo_do(o_images[i], evas_obj_image_size_set(w, 480));
         data = evas_object_image_data_get(o_images[i], 1);
         if (data)
           {
@@ -127,8 +127,8 @@ static void _loop(double t, int f)
                   *lp = vp + (y * 320);
                   lp++;
                }
-             evas_object_image_data_set(o_images[i], data);
-             evas_object_image_data_update_add(o_images[i], 0, 0, w, 480);
+             eo_do(o_images[i], evas_obj_image_data_set(data));
+             eo_do(o_images[i], evas_obj_image_data_update_add( 0, 0, w, 480));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index d3b65b8..b4ad6b6 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -54,14 +54,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        evas_object_image_file_set(o, build_path(buf), NULL);
-        evas_object_image_fill_set(o, 0, 0, 256, 256);
-        evas_object_resize(o, 256, 256);
-        evas_object_image_smooth_scale_set(o, 0);
-        evas_object_show(o);
+        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+                 evas_obj_image_fill_set(0, 0, 256, 256),
+                 evas_obj_size_set(256, 256),
+                 evas_obj_image_smooth_scale_set(0),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 256,   0);
@@ -72,7 +72,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(1, 1,  w, -h,  d, 256,   0);
    POINT(1, 2,  w,  h,  d, 256, 256);
    POINT(1, 3,  w,  h, -d,   0, 256);
-   
+
    POINT(2, 0,  w, -h,  d,   0,   0);
    POINT(2, 1, -w, -h,  d, 256,   0);
    POINT(2, 2, -w,  h,  d, 256, 256);
@@ -82,17 +82,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
    POINT(3, 1, -w, -h, -d, 256,   0);
    POINT(3, 2, -w,  h, -d, 256, 256);
    POINT(3, 3, -w,  h,  d,   0, 256);
-   
+
    POINT(4, 0, -w, -h,  d,   0,   0);
    POINT(4, 1,  w, -h,  d, 256,   0);
    POINT(4, 2,  w, -h, -d, 256, 256);
    POINT(4, 3, -w, -h, -d,   0, 256);
-   
+
    POINT(5, 0, -w,  h, -d,   0,   0);
    POINT(5, 1,  w,  h, -d, 256,   0);
    POINT(5, 2,  w,  h,  d, 256, 256);
    POINT(5, 3, -w,  h,  d,   0, 256);
-   
+
    return c;
 }
 
@@ -104,19 +104,19 @@ _cube_pos(Cube *c,
    static Evas_Map *m = NULL;
    int i, j, order[6], sorted;
    Evas_Coord mz[6];
-   
+
    if (!m) m = evas_map_new(4);
    evas_map_smooth_set(m, 0);
 
    for (i = 0; i < 6; i++)
      {
         Evas_Coord tz[4];
-        
+
         for (j = 0; j < 4; j++)
           {
              evas_map_point_coord_set(m, j,
-                                      c->side[i].pt[j].x + x, 
-                                      c->side[i].pt[j].y + y, 
+                                      c->side[i].pt[j].x + x,
+                                      c->side[i].pt[j].y + y,
                                       c->side[i].pt[j].z + z);
              evas_map_point_image_uv_set(m, j,
                                       c->side[i].pt[j].u,
@@ -130,13 +130,13 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
         if (evas_map_util_clockwise_get(m))
           {
-             evas_object_map_enable_set(c->side[i].o, 1);
-             evas_object_map_set(c->side[i].o, m);
-             evas_object_show(c->side[i].o);
+             eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+                                 evas_obj_map_set(m),
+                                 evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          evas_object_hide(c->side[i].o);
-        
+          eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+
         order[i] = i;
         for (j = 0; j < 4; j++)
           evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -159,17 +159,17 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   evas_object_raise(c->side[order[0]].o);
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
 _cube_free(Cube *c)
 {
    int i;
-   
-   for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+
+   for (i = 0; i < 6; i++) eo_del(c->side[i].o);
    free(c);
 }
 
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 9d10462..dde2c0d 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -54,13 +54,13 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        o = evas_object_image_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        evas_object_image_file_set(o, build_path(buf), NULL);
-        evas_object_image_fill_set(o, 0, 0, 256, 256);
+        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+