diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 4045b7e1a..6a2718761 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -7588,7 +7588,7 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
              sl = e_fm2_selected_list_get(ic->sd->obj);
              if (eina_list_count(sl) > 1)
                {
-                  layout = e_layout_add(e_util_comp_current_get()->evas);
+                  layout = e_layout_add(e_comp->evas);
                   e_layout_freeze(layout);
                   e_layout_virtual_size_set(layout, ic->sd->w, ic->sd->h);
                }
@@ -7611,7 +7611,7 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
                   if (ici->ic->obj) evas_object_hide(ici->ic->obj);
                   if (ici->ic->obj_icon) evas_object_hide(ici->ic->obj_icon);
 
-                  o = edje_object_add(e_util_comp_current_get()->evas);
+                  o = edje_object_add(e_comp->evas);
                   if (_e_fm2_view_mode_get(ici->ic->sd) == E_FM2_VIEW_MODE_LIST)
                     {
                        if (ici->ic->sd->config->icon.fixed.w)
@@ -8970,8 +8970,8 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
           sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn, NULL);
      }
 
-   ecore_evas_pointer_xy_get(e_util_comp_current_get()->ee, &x, &y);
-   zone = e_zone_current_get(e_util_comp_current_get());
+   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
+   zone = e_zone_current_get(e_comp);
    if (!zone)
      {
         e_object_del(E_OBJECT(mn));
@@ -9303,8 +9303,8 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
           sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn, &(ic->info));
      }
 
-   ecore_evas_pointer_xy_get(e_util_comp_current_get()->ee, &x, &y);
-   zone = e_zone_current_get(e_util_comp_current_get());
+   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
+   zone = e_zone_current_get(e_comp);
    if (!zone)
      {
         e_object_del(E_OBJECT(mn));
@@ -11733,8 +11733,8 @@ e_fm2_drop_menu(Evas_Object *obj, char *args)
                                                    "e/fileman/default/button/abort"),
                              "e/fileman/default/button/abort");
 
-   ecore_evas_pointer_xy_get(e_util_comp_current_get()->ee, &x, &y);
-   zone = e_zone_current_get(e_util_comp_current_get());
+   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
+   zone = e_zone_current_get(e_comp);
    if (!zone) goto error;
    e_menu_activate_mouse(menu, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN, 0);
    return;
diff --git a/src/bin/e_font.c b/src/bin/e_font.c
index 43aa7f235..00de82873 100644
--- a/src/bin/e_font.c
+++ b/src/bin/e_font.c
@@ -86,7 +86,7 @@ e_font_available_list(void)
    const char *evas_font;
    E_Comp *c;
 
-   c = e_util_comp_current_get();
+   c = e_comp;
 
    evas_fonts = evas_font_available_list(c->evas);
 
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index fffb4a69a..6351af5dc 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -587,7 +587,7 @@ _e_int_menus_main_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item
 {
    E_About *about;
 
-   about = e_about_new(e_util_comp_current_get());
+   about = e_about_new(e_comp);
    if (about) e_about_show(about);
 }
 
@@ -596,7 +596,7 @@ _e_int_menus_themes_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_It
 {
    E_Theme_About *about;
 
-   about = e_theme_about_new(e_util_comp_current_get());
+   about = e_theme_about_new(e_comp);
    if (about) e_theme_about_show(about);
 }
 
@@ -1414,7 +1414,7 @@ _e_int_menus_clients_pre_cb(void *data __UNUSED__, E_Menu *m)
 
    e_menu_pre_activate_callback_set(m, NULL, NULL);
    /* get the current clients */
-   zone = e_zone_current_get(e_util_comp_current_get());
+   zone = e_zone_current_get(e_comp);
    desk = e_desk_current_get(zone);
 
    if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_MOST_RECENT)
@@ -1721,7 +1721,7 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
    E_Comp *c;
 
    e_menu_pre_activate_callback_set(m, NULL, NULL);
-   c = e_util_comp_current_get();
+   c = e_comp;
    zone = e_zone_current_get(c);
 
    /* get the current clients */
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 16db8829b..8eb27893c 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -831,7 +831,7 @@ e_shelf_desk_visible(const E_Shelf *es, const E_Desk *desk)
    EINA_SAFETY_ON_NULL_RETURN_VAL(es, EINA_FALSE);
    if (!desk)
      {
-        EINA_LIST_FOREACH(e_util_comp_current_get()->zones, ll, zone)
+        EINA_LIST_FOREACH(e_comp->zones, ll, zone)
           {
              desk = e_desk_current_get(zone);
              if (e_shelf_desk_visible(es, desk)) return EINA_TRUE;
diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
index d65a69312..3d6c916f4 100644
--- a/src/bin/e_sys.c
+++ b/src/bin/e_sys.c
@@ -766,7 +766,7 @@ _e_sys_logout_begin(E_Sys_Action a_after, Eina_Bool raw)
    /* start logout - at end do the a_after action */
    if (!raw)
      {
-        od = e_obj_dialog_new(e_util_comp_current_get(),
+        od = e_obj_dialog_new(e_comp,
                               _("Logout in progress"), "E", "_sys_logout");
         e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/logout");
         e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index f2d67721f..998224941 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -929,7 +929,7 @@ _evry_cb_mouse(void *data, int type, void *event)
              memcpy(sel + sel_length + s_len, "\r\n", 2);
              sel_length += s_len + 2;
 
-             d = e_drag_new(e_util_comp_current_get()),
+             d = e_drag_new(e_comp),
                             ev->x, ev->y,
                             drag_types, 1, sel, sel_length, NULL,
                             _evry_cb_drag_finished);
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index ac1c5f46c..a9dad2c07 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -1916,7 +1916,7 @@ _e_fwin_cb_key_down(void *data,
              E_Comp *comp;
              const char *dev, *path;
 
-             comp = e_util_comp_current_get();
+             comp = e_comp;
              e_fm2_path_get(page->fm_obj, &dev, &path);
              e_fwin_new(comp, dev, path);
              return;
diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index 9258b882c..0d666c73a 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -112,7 +112,7 @@ gadman_init(E_Module *m)
 
    Man->module = m;
    gadman_locked = e_module_loading_get();
-   Man->comp = e_util_comp_current_get();
+   Man->comp = e_comp;
    Man->width = Man->comp->man->w;
    Man->height = Man->comp->man->h;
 
diff --git a/src/modules/illume2/e_mod_quickpanel.c b/src/modules/illume2/e_mod_quickpanel.c
index c78187011..29cc87508 100644
--- a/src/modules/illume2/e_mod_quickpanel.c
+++ b/src/modules/illume2/e_mod_quickpanel.c
@@ -249,7 +249,7 @@ _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void
         int zn = 0;
 
         /* find this zone */
-        if (!(comp = e_util_comp_current_get()))
+        if (!(comp = e_comp))
           return ECORE_CALLBACK_PASS_ON;
         zn = ev->ec->illume.quickpanel.zone;
         zone = e_comp_zone_number_get(zn);
@@ -300,7 +300,7 @@ _e_mod_quickpanel_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, v
         int zn = 0;
 
         /* find this zone */
-        if (!(comp = e_util_comp_current_get()))
+        if (!(comp = e_comp))
           return ECORE_CALLBACK_PASS_ON;
         zn = ev->ec->illume.quickpanel.zone;
         zone = e_comp_zone_number_get(zn);
diff --git a/src/modules/lokker/lokker.c b/src/modules/lokker/lokker.c
index d074f44b0..9b60e9c72 100644
--- a/src/modules/lokker/lokker.c
+++ b/src/modules/lokker/lokker.c
@@ -564,7 +564,7 @@ _lokker_cb_zone_del(void *data EINA_UNUSED,
    E_Event_Zone_Del *ev = event;
    Eina_List *l;
    if (!edd) return ECORE_CALLBACK_PASS_ON;
-   if ((eina_list_count(e_util_comp_current_get()->zones) == 1) && (e_config->desklock_login_box_zone == -2))
+   if ((eina_list_count(e_comp->zones) == 1) && (e_config->desklock_login_box_zone == -2))
      edd->move_handler = ecore_event_handler_del(edd->move_handler);
 
    l = _lokker_popup_find(ev->zone);
diff --git a/src/modules/notification/e_mod_popup.c b/src/modules/notification/e_mod_popup.c
index 866c465c0..d6cdd251f 100644
--- a/src/modules/notification/e_mod_popup.c
+++ b/src/modules/notification/e_mod_popup.c
@@ -309,9 +309,9 @@ _notification_popup_new(E_Notification_Notify *n, unsigned id)
       case POPUP_DISPLAY_POLICY_MULTI:
         if ((notification_cfg->corner == CORNER_BR) ||
             (notification_cfg->corner == CORNER_TR))
-          zone = eina_list_last_data_get(e_util_comp_current_get()->zones);
+          zone = eina_list_last_data_get(e_comp->zones);
         else
-          zone = eina_list_data_get(e_util_comp_current_get()->zones);
+          zone = eina_list_data_get(e_comp->zones);
         break;
      }
 
diff --git a/src/modules/pager_plain/e_mod_main.c b/src/modules/pager_plain/e_mod_main.c
index a1f698ff9..f06e340fd 100644
--- a/src/modules/pager_plain/e_mod_main.c
+++ b/src/modules/pager_plain/e_mod_main.c
@@ -1974,7 +1974,7 @@ _pager_window_cb_drag_finished(E_Drag *drag, int dropped)
         int zx, zy, zw, zh;
 
         /* wasn't dropped (on pager). move it to position of mouse on screen */
-        comp = e_util_comp_current_get();
+        comp = e_comp;
         zone = e_zone_current_get(comp);
         desk = e_desk_current_get(zone);
 
diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c
index 2a70b6d4e..ff5248ffe 100644
--- a/src/modules/teamwork/e_mod_tw.c
+++ b/src/modules/teamwork/e_mod_tw.c
@@ -779,7 +779,7 @@ tw_show_helper(Evas_Object *o, int w, int h)
    int px, py, pw, ph;
    double ratio = tw_config->popup_size / 100.;
    E_Client *ec = NULL;
-   E_Zone *zone = e_zone_current_get(e_util_comp_current_get());
+   E_Zone *zone = e_zone_current_get(e_comp);
 
    evas_object_hide(tw_mod->pop);
    evas_object_del(tw_mod->pop);
@@ -885,7 +885,7 @@ tw_video_opened_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
         return;
      }
 
-   zone = e_zone_current_get(e_util_comp_current_get());
+   zone = e_zone_current_get(e_comp);
    w = MIN(zone->w, (ratio * (double)zone->w));
    ratio = emotion_object_ratio_get(obj);
    if (ratio > 0.0) iw = (ih * ratio) + 0.5;
@@ -948,7 +948,7 @@ tw_video_thread_done_cb(void *data, Ecore_Thread *eth)
    close(tw_tmpfd);
    tw_tmpfd = -1;
    i->tmpfile = eina_stringshare_ref(tw_tmpfile);
-   prev = e_livethumb_add(e_util_comp_current_get()->evas);
+   prev = e_livethumb_add(e_comp->evas);
    tw_show_video(prev, tw_tmpfile);
    download_media_cleanup();
 }
@@ -1028,7 +1028,7 @@ tw_show(Media *i)
                }
              eina_stringshare_del(tw_tmpfile);
              tw_tmpfile = eina_stringshare_ref(i->tmpfile);
-             prev = e_livethumb_add(e_util_comp_current_get()->evas);
+             prev = e_livethumb_add(e_comp->evas);
              tw_show_video(prev, tw_tmpfile);
              return;
           }
@@ -1061,7 +1061,7 @@ tw_show(Media *i)
      }
    else
      {
-        prev = e_livethumb_add(e_util_comp_current_get()->evas);
+        prev = e_livethumb_add(e_comp->evas);
         o = evas_object_image_filled_add(e_livethumb_evas_get(prev));
         evas_object_image_memfile_set(o, (void*)eina_binbuf_string_get(i->buf), eina_binbuf_length_get(i->buf), NULL, NULL);
         evas_object_image_size_get(o, &w, &h);
@@ -1098,7 +1098,7 @@ tw_show_local_file(const char *uri)
      {
         if (!evas_object_image_extension_can_load_get(uri)) return;
      }
-   prev = e_livethumb_add(e_util_comp_current_get()->evas);
+   prev = e_livethumb_add(e_comp->evas);
    if (video)
      {
         tw_show_video(prev, uri);
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index 883df4fc8..f858cdaa7 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -284,7 +284,7 @@ e_winlist_hide(void)
           }
         if (e_config->winlist_list_move_after_select)
           {
-             e_client_zone_set(ec, e_zone_current_get(e_util_comp_current_get()));
+             e_client_zone_set(ec, e_zone_current_get(e_comp));
              e_client_desk_set(ec, e_desk_current_get(ec->zone));
           }
         else if (ec->desk)