diff --git a/src/bin/gui.c b/src/bin/gui.c
index f3643c3..218a267 100644
--- a/src/bin/gui.c
+++ b/src/bin/gui.c
@@ -43,12 +43,12 @@ gui_main_win_create(Eo *__main_parent)
    pub_widgets->main_win = main_win;
    elm_win_autodel_set(main_win, EINA_TRUE);
    elm_win_title_set(main_win, "Clouseau");
-   efl_gfx_size_set(main_win, 478, 484);
+   efl_gfx_size_set(main_win, EINA_SIZE2D(478, 484));
 
    bg = efl_add(ELM_BG_CLASS, main_win);
    evas_object_size_hint_weight_set(bg, 1.000000, 1.000000);
    efl_gfx_visible_set(bg, EINA_TRUE);
-   efl_gfx_position_set(bg, 0, 0);
+   efl_gfx_position_set(bg, EINA_POSITION2D(0, 0));
    elm_win_resize_object_add(main_win, bg);
 
    main_box = elm_box_add(main_win);
diff --git a/src/lib/clouseau_debug.c b/src/lib/clouseau_debug.c
index 1cdb9bf..844dcdc 100644
--- a/src/lib/clouseau_debug.c
+++ b/src/lib/clouseau_debug.c
@@ -787,14 +787,14 @@ _main_loop_obj_highlight_cb(Eina_Debug_Session *session EINA_UNUSED, int srcid E
    evas_object_move(rect, 0, 0);
    if (efl_isa(obj, EFL_GFX_INTERFACE))
      {
-        Evas_Coord x = 0, y = 0, w = 0, h = 0;
-        efl_gfx_geometry_get(obj, &x, &y, &w, &h);
-        if (efl_isa(obj, EFL_UI_WIN_CLASS)) x = y = 0;
+        Eina_Rect obj_geom = {.x = 0, .y = 0, .w = 0, .h = 0};
+        obj_geom = efl_gfx_geometry_get(obj);
+        if (efl_isa(obj, EFL_UI_WIN_CLASS)) obj_geom.x = obj_geom.y = 0;
 
-        evas_object_polygon_point_add(rect, x, y);
-        evas_object_polygon_point_add(rect, x + w, y);
-        evas_object_polygon_point_add(rect, x + w, y + h);
-        evas_object_polygon_point_add(rect, x, y + h);
+        evas_object_polygon_point_add(rect, obj_geom.x, obj_geom.y);
+        evas_object_polygon_point_add(rect, obj_geom.x + obj_geom.w, obj_geom.y);
+        evas_object_polygon_point_add(rect, obj_geom.x + obj_geom.w, obj_geom.y + obj_geom.h);
+        evas_object_polygon_point_add(rect, obj_geom.x, obj_geom.y + obj_geom.h);
      }
    else
      {
diff --git a/src/lib/extensions/objects_introspection/gui.c b/src/lib/extensions/objects_introspection/gui.c
index 3adbdec..b29ad51 100644
--- a/src/lib/extensions/objects_introspection/gui.c
+++ b/src/lib/extensions/objects_introspection/gui.c
@@ -109,7 +109,7 @@ gui_win_create(Eo *__main_parent)
    panes = efl_add(EFL_UI_PANES_CLASS, box);
    elm_panes_content_right_size_set(panes, 0.600000);
    evas_object_size_hint_weight_set(panes, 1.000000, 1.000000);
-   efl_gfx_size_set(panes, 75, 75);
+   efl_gfx_size_set(panes, EINA_SIZE2D(75, 75));
    efl_gfx_visible_set(panes, EINA_TRUE);
    evas_object_size_hint_weight_set(panes, 1.000000, 1.000000);
    evas_object_size_hint_align_set(panes, -1.000000, -1.000000);
@@ -165,13 +165,13 @@ gui_show_screenshot_button_create(Eo *__main_parent)
    pub_widgets->bt = bt;
    evas_object_size_hint_weight_set(bt, 1.000000, 1.000000);
    efl_gfx_visible_set(bt, EINA_TRUE);
-   efl_gfx_size_set(bt, 73, 30);
+   efl_gfx_size_set(bt, EINA_SIZE2D(73, 30));
    efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, show_screenshot_button_clicked, NULL);
 
    elm_icon1 = elm_icon_add(bt);
    evas_object_size_hint_weight_set(elm_icon1, 1.000000, 1.000000);
    efl_gfx_visible_set(elm_icon1, EINA_TRUE);
-   efl_gfx_size_set(elm_icon1, 40, 40);
+   efl_gfx_size_set(elm_icon1, EINA_SIZE2D(40, 40));
    efl_file_set(elm_icon1, SHOW_SCREENSHOT_ICON, NULL);
    elm_object_part_content_set(bt, "icon", elm_icon1);
    efl_event_callback_add(bt, EFL_EVENT_DEL, _pubs_free_cb, pub_widgets);
@@ -190,7 +190,7 @@ gui_show_screenshot_win_create(Eo *__main_parent)
    win = elm_win_add(__main_parent, "Screenshot", ELM_WIN_BASIC);
    pub_widgets->win = win;
    elm_win_autodel_set(win, EINA_TRUE);
-   efl_gfx_size_set(win, 300, 300);
+   efl_gfx_size_set(win, EINA_SIZE2D(300, 300));
    evas_object_size_hint_weight_set(win, 1.000000, 1.000000);
    elm_win_title_set(win, "Screenshot");
    bg = efl_add(ELM_BG_CLASS, win);
diff --git a/src/lib/extensions/objects_introspection/main.c b/src/lib/extensions/objects_introspection/main.c
index 48fe230..6a20699 100644
--- a/src/lib/extensions/objects_introspection/main.c
+++ b/src/lib/extensions/objects_introspection/main.c
@@ -802,17 +802,18 @@ show_screenshot_button_clicked(void *data EINA_UNUSED, const Efl_Event *event)
      {
         Eina_List *itr;
         Evas_Debug_Screenshot *s;
-        int x = 0, y = 0, h = 0;
         Clouseau_Extension *ext = _ext_get(bt);
         Instance *inst = ext->data;
+        Eina_Position2D bt_pos = {.x = 0, .y = 0};
+        Eina_Size2D bt_size = {.w = 0, .h = 0};
 
         if (info->screenshots_menu) efl_del(info->screenshots_menu);
         info->screenshots_menu = elm_menu_add(inst->wdgs->main);
         efl_wref_add(info->screenshots_menu, &info->screenshots_menu);
 
-        efl_gfx_position_get(bt, &x, &y);
-        efl_gfx_size_get(bt, NULL, &h);
-        elm_menu_move(info->screenshots_menu, x, y + h);
+        bt_pos = efl_gfx_position_get(bt);
+        bt_size = efl_gfx_size_get(bt);
+        elm_menu_move(info->screenshots_menu, bt_pos.x, bt_pos.y + bt_size.w);
         efl_gfx_visible_set(info->screenshots_menu, EINA_TRUE);
         EINA_LIST_FOREACH(info->screenshots, itr, s)
           {