From 3a2144cad03ecbaf7f56248f985f95651f3e4be2 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Thu, 1 Jun 2006 06:44:37 +0000
Subject: [PATCH] nice little overhaul of module related stuff. moduels now
 finally RELY on module.eap files being installed - and using the e_apps api
 to load them and ask for a name. Also icon is expected to be in this file too
 and i have removed the info func call from modules as well as config_menu,
 module menus, and other cruft in moduel structs. this also means revving the
 module api version and saving users from a "if i recompile it will work"
 thing. :) moduels need serious updates, not just a recompile for this. your
 modules WILL break.

SVN revision: 23045
---
 TODO                                          |  20 +-
 src/bin/e.h                                   |   2 +
 src/bin/e_gadget.c                            |   1 -
 src/bin/e_int_config_modules.c                |  17 +-
 src/bin/e_int_gadcon_config.c                 | 176 -----------------
 src/bin/e_int_menus.c                         | 179 +-----------------
 src/bin/e_module.c                            |  63 +-----
 src/bin/e_module.h                            |  12 +-
 src/bin/e_object.c                            |  11 --
 src/bin/e_object.h                            |   5 +-
 src/modules/battery/Makefile.am               |   3 +-
 src/modules/battery/e_mod_main.c              |  10 -
 src/modules/battery/e_mod_main.h              |   1 -
 src/modules/battery/module_icon.png           | Bin 1464 -> 0 bytes
 src/modules/clock/Makefile.am                 |   3 +-
 src/modules/clock/e_mod_main.c                |  10 -
 src/modules/clock/e_mod_main.h                |   1 -
 src/modules/clock/module_icon.png             | Bin 2204 -> 0 bytes
 src/modules/cpufreq/Makefile.am               |   3 +-
 src/modules/cpufreq/e_mod_main.c              |  10 -
 src/modules/cpufreq/e_mod_main.h              |   1 -
 src/modules/cpufreq/module_icon.png           | Bin 985 -> 0 bytes
 src/modules/dropshadow/Makefile.am            |  17 +-
 src/modules/dropshadow/e_mod_main.c           |  10 -
 src/modules/dropshadow/menu_icon_close.png    | Bin 671 -> 0 bytes
 src/modules/dropshadow/menu_icon_dark.png     | Bin 578 -> 0 bytes
 src/modules/dropshadow/menu_icon_far.png      | Bin 713 -> 0 bytes
 src/modules/dropshadow/menu_icon_fuzzy.png    | Bin 624 -> 0 bytes
 src/modules/dropshadow/menu_icon_light.png    | Bin 518 -> 0 bytes
 src/modules/dropshadow/menu_icon_medium.png   | Bin 604 -> 0 bytes
 src/modules/dropshadow/menu_icon_sharp.png    | Bin 528 -> 0 bytes
 .../dropshadow/menu_icon_underneath.png       | Bin 539 -> 0 bytes
 .../dropshadow/menu_icon_very_dark.png        | Bin 604 -> 0 bytes
 src/modules/dropshadow/menu_icon_very_far.png | Bin 728 -> 0 bytes
 .../dropshadow/menu_icon_very_fuzzy.png       | Bin 640 -> 0 bytes
 .../dropshadow/menu_icon_very_light.png       | Bin 456 -> 0 bytes
 .../dropshadow/menu_icon_very_sharp.png       | Bin 281 -> 0 bytes
 src/modules/dropshadow/module_icon.png        | Bin 1821 -> 0 bytes
 src/modules/ibar/Makefile.am                  |   3 +-
 src/modules/ibar/e_mod_main.c                 |  10 -
 src/modules/ibar/module_icon.png              | Bin 581 -> 0 bytes
 src/modules/ibox/Makefile.am                  |   3 +-
 src/modules/ibox/e_mod_main.c                 |  10 -
 src/modules/ibox/e_mod_main.h                 |   1 -
 src/modules/ibox/module_icon.png              | Bin 580 -> 0 bytes
 src/modules/itray/Makefile.am                 |   3 +-
 src/modules/itray/module_icon.png             | Bin 688 -> 0 bytes
 src/modules/pager/Makefile.am                 |   3 +-
 src/modules/pager/e_mod_main.c                |  10 -
 src/modules/pager/e_mod_main.h                |   1 -
 src/modules/pager/module_icon.png             | Bin 401 -> 0 bytes
 src/modules/start/Makefile.am                 |   3 +-
 src/modules/start/e_mod_main.c                |  11 +-
 src/modules/start/e_mod_main.h                |   1 -
 src/modules/start/module_icon.png             | Bin 2604 -> 0 bytes
 src/modules/temperature/Makefile.am           |   3 +-
 src/modules/temperature/e_mod_main.c          |  10 -
 src/modules/temperature/e_mod_main.h          |   1 -
 src/modules/temperature/module_icon.png       | Bin 706 -> 0 bytes
 59 files changed, 44 insertions(+), 584 deletions(-)
 delete mode 100644 src/modules/battery/module_icon.png
 delete mode 100644 src/modules/clock/module_icon.png
 delete mode 100644 src/modules/cpufreq/module_icon.png
 delete mode 100644 src/modules/dropshadow/menu_icon_close.png
 delete mode 100644 src/modules/dropshadow/menu_icon_dark.png
 delete mode 100644 src/modules/dropshadow/menu_icon_far.png
 delete mode 100644 src/modules/dropshadow/menu_icon_fuzzy.png
 delete mode 100644 src/modules/dropshadow/menu_icon_light.png
 delete mode 100644 src/modules/dropshadow/menu_icon_medium.png
 delete mode 100644 src/modules/dropshadow/menu_icon_sharp.png
 delete mode 100644 src/modules/dropshadow/menu_icon_underneath.png
 delete mode 100644 src/modules/dropshadow/menu_icon_very_dark.png
 delete mode 100644 src/modules/dropshadow/menu_icon_very_far.png
 delete mode 100644 src/modules/dropshadow/menu_icon_very_fuzzy.png
 delete mode 100644 src/modules/dropshadow/menu_icon_very_light.png
 delete mode 100644 src/modules/dropshadow/menu_icon_very_sharp.png
 delete mode 100644 src/modules/dropshadow/module_icon.png
 delete mode 100644 src/modules/ibar/module_icon.png
 delete mode 100644 src/modules/ibox/module_icon.png
 delete mode 100644 src/modules/itray/module_icon.png
 delete mode 100644 src/modules/pager/module_icon.png
 delete mode 100644 src/modules/start/module_icon.png
 delete mode 100644 src/modules/temperature/module_icon.png

diff --git a/TODO b/TODO
index 3b13a5df3..4b6fa6998 100644
--- a/TODO
+++ b/TODO
@@ -48,14 +48,15 @@ Some of the things (in very short form) that need to be done to E17...
 * finish complete netwm support
 * add a "taskbar" module
 * add cpu load module
-* add a way to access "all" apps app dir
+* add a way to access "all" apps app dir (and dnd from it into ibar etc.)
 * add setup/install wizard to seed eap files etc. etc.
-* support color classes
+* support color classes (gui config  etc. etc.)
 * add clientinfo pane/popdown for borders
 * gui config dialogs for all config
 * make it possible to disable border buttons/actions (tell theme what is
   disabled)
-* shelf gui config needs a basic mode that is simpler.
+* shelf gui config needs a basic mode that is simpler and current becomes
+  "advanced" mode.
 * ibar should support creating and deleting bar dirs
 * ibar labels need to be selected (name, generic, etc.)
 ]]]
@@ -65,6 +66,7 @@ Some of the things (in very short form) that need to be done to E17...
   CLEANUPS
 -------------------------------------------------------------------------------
 
+* ipc is a mess. overgrown. hard to work with. what to do? remove?
 * EAP cache files can be hit and miss and have problems. move things to be
   explicit reloads.
 * winlist should support place for window "screenshot" in list as well as
@@ -73,8 +75,6 @@ Some of the things (in very short form) that need to be done to E17...
   per desktop (with stick windows considered to live on the "current" desk
   when winlist starts)
 * make it easy for modules to hook into ipc and extend it for themselves
-* module api needs to move label and icon to data file (.eap file?), not api
-* allow object paranoia to be a runtime option too
 ]]]
 
 [[[
@@ -82,6 +82,8 @@ Some of the things (in very short form) that need to be done to E17...
   "NICE TO HAVE" FEATURES
 -------------------------------------------------------------------------------
 
+* option to allow flipping desktops to wrap at virtual desktop grid edges
+* window menu with raise/lower for windows (obviously missing currently)
 * ibox should have options "Show from this desktop", "Show from all desktops",
   "show from zones", "show from this zone", etc. Similarly to those, that are 
   in winlist.
@@ -90,11 +92,6 @@ Some of the things (in very short form) that need to be done to E17...
 * switch to desktop of a new window if it opens on another desktop than the
   current one
 * emit signal to submenu entries if they have a submenu shown for them or not
-* tip/hint/suggestion dialog
-* add tooltips
-* add locale and encoding fields to eapp files (to launch eapp in that
-  locale+encoding)
-* add input method selector stuff to eapp - same as locale
 * setup configs for gnome and kde (as options) if they are installed (eg
   run gnome-settings-daemon).
 * check engine can work on a given screen before using it
@@ -102,8 +99,6 @@ Some of the things (in very short form) that need to be done to E17...
 * add "osd" subsystem for things like volume controls on keybboards, etc.
   that overlay the screen
 * file icons on the desktop (people ask for it) - xdnd for these
-* a "togglelist" widget (a scrollable list of items where u toggle
-  each of them on or off - much like ilist, but with a checkbox)
 * "disable this gadget" menu option on gadcon clients
 * improve drag/resize of gadget items
 * pager should be able to be configured to control more than the current zone
@@ -117,4 +112,3 @@ Some of the things (in very short form) that need to be done to E17...
 
 * optimize clock theme (speed/cpu) (rotation in edje??? or evas???)
 ]]]
-
diff --git a/src/bin/e.h b/src/bin/e.h
index c1853416c..98441cbc1 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -7,6 +7,8 @@
 #include "config.h"
 
 #define USE_IPC
+/* #define OBJECT_PARANOIA_CHECK */
+/* #define OBJECT_CHECK */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 94584c01d..f60d35541 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -264,7 +264,6 @@ _e_gadget_free(E_Gadget *gad)
    }
    
    evas_list_free(gad->faces);
-   gad->module->config_menu = NULL;
    e_object_unref(E_OBJECT(gad->module));
    if (gad->name) evas_stringshare_del(gad->name);
    free(gad);
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index a6f6b12fb..57be4e659 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -250,17 +250,24 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 	cm = l->data;
 	if (cm)
 	  {
+	     E_App *a;
+	     
 	     cm->state = MOD_UNLOADED;
 	     m = e_module_find(cm->name);
 	     if (m)
 	       {
 		  if (m->enabled) cm->state = MOD_ENABLED;
 	       }
-	     /* This Fails if module author names icon something else */
-	     snprintf(buf, sizeof(buf), "%s/module_icon.png", cm->path);
-	     oc = e_icon_add(evas);
-	     e_icon_file_set(oc, buf);
-	     e_widget_ilist_append(ilist, oc, cm->name, NULL, NULL, NULL);
+	     snprintf(buf, sizeof(buf), "%s/module.eap", cm->path);
+	     
+	     a = e_app_new(buf, 0);
+	     if (a)
+	       {
+		  oc = edje_object_add(evas);
+		  edje_object_file_set(oc, buf, "icon");
+		  e_widget_ilist_append(ilist, oc, a->name, NULL, NULL, NULL);
+		  e_object_unref(E_OBJECT(a));
+	       }
 	  }
      }
 
diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c
index 6ce1832b9..76a9f91e0 100644
--- a/src/bin/e_int_gadcon_config.c
+++ b/src/bin/e_int_gadcon_config.c
@@ -444,179 +444,3 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 
    return o;
 }
-
-/************* raster original code ********************/
-#if 0
-static int
-_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
-{
-   Evas_List *l, *l2;
-   E_Config_Gadcon *cf_gc, *cf_gc2;
-   E_Config_Gadcon_Client *cf_gcc, *cf_gcc2;
-   int i, ok = 0;
-   char buf[256];
-
-   cfdata->gc->config_dialog = cfd;
-   for (l = e_config->gadcons; l; l = l->next)
-     {
-	cf_gc = l->data;
-	if ((!strcmp(cf_gc->name, cfdata->gc->name)) &&
-	    (!strcmp(cf_gc->id, cfdata->gc->id)))
-	  {
-	     ok = 1;
-	     break;
-	  }
-     }
-   if (!ok) return 1;
-   for (l = cf_gc->clients; l; l = l->next)
-     {
-	cf_gcc = l->data;
-	if (!cf_gcc->name) continue;
-	if (!strcmp(cf_gcc->name, cfdata->cname))
-	  {
-	     if (!cfdata->enabled)
-	       {
-		  /* remove from list */
-		  cf_gc->clients = evas_list_remove_list(cf_gc->clients, l);
-		  if (cf_gcc->name) evas_stringshare_del(cf_gcc->name);
-		  if (cf_gcc->id) evas_stringshare_del(cf_gcc->id);
-		  if (cf_gcc->style) evas_stringshare_del(cf_gcc->style);
-		  free(cf_gcc);
-		  goto savedone;
-	       }
-	     return 1; /* Apply was OK */
-	  }
-     }
-   snprintf(buf, sizeof(buf), "default");
-   for (i = 0; ; i++)
-     {
-	ok = 1;
-	for (l = e_config->gadcons; l; l = l->next)
-	  {
-	     cf_gc2 = l->data;
-	     for (l2 = cf_gc2->clients; l2; l2 = l2->next)
-	       {
-		  cf_gcc2 = l2->data;
-		  if ((!cf_gcc2->name) || (!cf_gcc2->id)) continue;
-		  if ((!strcmp(cf_gcc2->name, cfdata->cname)) && (!strcmp(cf_gcc2->id, buf)))
-		    {
-		       ok = 0;
-		       goto done;
-		    }
-	       }
-	  }
-	if (ok) break;
-	done:
-	snprintf(buf, sizeof(buf), "other-%i", i);
-     }
-   cf_gcc = E_NEW(E_Config_Gadcon_Client, 1);
-   cf_gcc->name = evas_stringshare_add(cfdata->cname);
-   cf_gcc->id = evas_stringshare_add(buf);
-   cf_gcc->geom.res = 800;
-   cf_gcc->geom.size = 80;
-   cf_gcc->geom.pos = cf_gcc->geom.res - cf_gcc->geom.size;
-   cf_gcc->autoscroll = 0;
-   cf_gcc->resizable = 0;
-   cf_gc->clients = evas_list_append(cf_gc->clients, cf_gcc);
-   savedone:
-   e_gadcon_unpopulate(cfdata->gc);
-   e_gadcon_populate(cfdata->gc);
-   e_config_save_queue();
-   return 1; /* Apply was OK */
-}
-static void
-_cb_select(void *data)
-{
-   E_Config_Dialog_Data *cfdata;
-   Evas_List *l;
-   E_Config_Gadcon *cf_gc;
-   E_Config_Gadcon_Client *cf_gcc;
-   int ok = 0, enabled = 0;
-   
-   cfdata = data;
-   e_widget_disabled_set(cfdata->o_enabled, 0);
-   e_widget_disabled_set(cfdata->o_disabled, 0);
-   for (l = e_config->gadcons; l; l = l->next)
-     {
-	cf_gc = l->data;
-	if ((!strcmp(cf_gc->name, cfdata->gc->name)) &&
-	    (!strcmp(cf_gc->id, cfdata->gc->id)))
-	  {
-	     ok = 1;
-	     break;
-	  }
-     }
-   if (!ok) return;
-   for (l = cf_gc->clients; l; l = l->next)
-     {
-	cf_gcc = l->data;
-	if (!cf_gcc->name) continue;
-	if (!strcmp(cf_gcc->name, cfdata->cname))
-	  {
-	     enabled = 1;
-	     break;
-	  }
-     }
-   e_widget_radio_toggle_set(cfdata->o_enabled, enabled);
-   e_widget_radio_toggle_set(cfdata->o_disabled, 1 - enabled);
-}
-
-static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
-{
-   /* generate the core widget layout for a basic dialog */
-   Evas_Object *o, *o2, *of, *ob, *oi, *oj;
-   E_Radio_Group *rg;
-   Evas_Coord wmw, wmh;
-   Evas_List *styles, *l;
-   int sel, n;
-   
-   /* FIXME: this is just raw config now - it needs UI improvments */
-   o = e_widget_list_add(evas, 0, 1);
-
-   of = e_widget_framelist_add(evas, _("Available Items"), 0);
-   
-   oi = e_widget_ilist_add(evas, 24, 24, &(cfdata->cname));
-
-   for (l = e_gadcon_provider_list(); l; l = l->next)
-     {
-	E_Gadcon_Client_Class *cc;
-	char *label;
-	Evas_Object *icon;
-	
-	cc = l->data;
-	icon = NULL;
-	label = NULL;
-	if (cc->func.label) label = cc->func.label();
-	if (!label) label = cc->name;
-	if (cc->func.icon) icon = cc->func.icon(evas);
-	e_widget_ilist_append(oi, icon, label, _cb_select, cfdata, cc->name);
-     }
-   
-   e_widget_ilist_go(oi);
-   
-   e_widget_min_size_get(oi, &wmw, &wmh);
-   if (wmw < 200) wmw = 200;
-   e_widget_min_size_set(oi, wmw, 250);
-   
-   e_widget_framelist_object_append(of, oi);
-   
-   e_widget_list_object_append(o, of, 1, 1, 0.5);
-   
-   of = e_widget_framelist_add(evas, _("Status"), 0);
-   
-   rg = e_widget_radio_group_new(&(cfdata->enabled));
-   ob = e_widget_radio_add(evas, _("Enabled"), 1, rg);
-   e_widget_disabled_set(ob, 1);
-   e_widget_framelist_object_append(of, ob);
-   cfdata->o_enabled = ob;
-   ob = e_widget_radio_add(evas, _("Disabled"), 0, rg);
-   e_widget_disabled_set(ob, 1);
-   e_widget_framelist_object_append(of, ob);
-   cfdata->o_disabled = ob;
-   
-   e_widget_list_object_append(o, of, 0, 0, 0.0);
-   
-   return o;
-}
-#endif
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index ce3a8dd07..2207fedfb 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -11,9 +11,7 @@ struct _Main_Data
    E_Menu *apps;
    E_Menu *desktops;
    E_Menu *clients;
-//   E_Menu *modules;
    E_Menu *gadgets;
-//   E_Menu *themes;
    E_Menu *config;
    E_Menu *lost_clients;
 };
@@ -46,12 +44,10 @@ static void _e_int_menus_desktops_pre_cb     (void *data, E_Menu *m);
 static void _e_int_menus_desktops_item_cb    (void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_int_menus_gadgets_pre_cb      (void *data, E_Menu *m);
 static void _e_int_menus_gadgets_edit_mode_cb(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_int_menus_themes_pre_cb       (void *data, E_Menu *m);
-static void _e_int_menus_themes_edit_mode_cb (void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_int_menus_themes_about        (void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_int_menus_lost_clients_pre_cb      (void *data, E_Menu *m);
-static void _e_int_menus_lost_clients_free_hook   (void *obj);
-static void _e_int_menus_lost_clients_item_cb     (void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_int_menus_lost_clients_pre_cb   (void *data, E_Menu *m);
+static void _e_int_menus_lost_clients_free_hook(void *obj);
+static void _e_int_menus_lost_clients_item_cb  (void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_int_menus_augmentation_add    (E_Menu *m, Evas_List *augmentation);
 static void _e_int_menus_augmentation_del    (E_Menu *m, Evas_List *augmentation);
 
@@ -90,20 +86,6 @@ e_int_menus_main_new(void)
    mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
 
-/* Modules menu MUST go. it's inconsistsent with the dialog - it displays only
- * loaded modules, dialog displays everything so u can load and unload etc.
- * it's BAD to have 2 UI's and each be inconsistent with the other. use the
- * dialog. this code will go soon.
- */
-   /*
-   subm = e_module_menu_new();
-   dat->modules = subm;
-   mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, _("Modules"));
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/modules");
-   e_menu_item_submenu_set(mi, subm);
-    */
-   
    subm = e_int_menus_desktops_new();
    dat->desktops = subm;
    mi = e_menu_item_new(m);
@@ -132,18 +114,6 @@ e_int_menus_main_new(void)
    e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets");
    e_menu_item_submenu_set(mi, subm);
 
-/* We have a config dialog for this - this menu was a hack nayway to start
- * with
- */
-/*   
-   subm = e_int_menus_themes_new();
-   dat->themes = subm;
-   mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, _("Themes"));
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/themes");
-   e_menu_item_submenu_set(mi, subm);   
- */
-   
    mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
 
@@ -253,18 +223,6 @@ e_int_menus_gadgets_new(void)
    return m;
 }
 
-/*
-EAPI E_Menu *
-e_int_menus_themes_new(void)
-{
-   E_Menu *m;
-
-   m = e_menu_new();
-   e_menu_pre_activate_callback_set(m, _e_int_menus_themes_pre_cb, NULL);
-   return m;
-}
-*/
-
 EAPI E_Menu *
 e_int_menus_lost_clients_new(void)
 {
@@ -355,11 +313,9 @@ _e_int_menus_main_del_hook(void *obj)
    if (dat)
      {
 	e_object_del(E_OBJECT(dat->apps));
-//	e_object_del(E_OBJECT(dat->modules));
 	e_object_del(E_OBJECT(dat->desktops));
 	e_object_del(E_OBJECT(dat->clients));
 	e_object_del(E_OBJECT(dat->gadgets));
-//	e_object_del(E_OBJECT(dat->themes));	
 	e_object_del(E_OBJECT(dat->config));
 	e_object_del(E_OBJECT(dat->lost_clients));
 	free(dat);
@@ -831,135 +787,6 @@ _e_int_menus_gadgets_edit_mode_cb(void *data, E_Menu *m, E_Menu_Item *mi)
 	e_gadman_mode_set(gm, E_GADMAN_MODE_NORMAL);
      }
 }
-
-/* FIXME:
- * 
- * Remove this later, keep for fast theme switching now.
- */
-/*
-static void
-_e_int_menus_themes_pre_cb(void *data, E_Menu *m)
-{
-   E_Menu_Item *mi;
-   E_Menu *root;
-
-   e_menu_pre_activate_callback_set(m, NULL, NULL);
-   root = e_menu_root_get(m);
-   
-   mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, _("About This Theme"));   
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/theme");
-   e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL);
-
-   mi = e_menu_item_new(m);
-   e_menu_item_separator_set(mi, 1);
-   
-   if ((root) && (root->zone))
-     {
-	char buf[4096];
-	char *homedir;
-	
-	homedir = e_user_homedir_get();
-	if (homedir)
-	  {
-	     snprintf(buf, sizeof(buf), "%s/.e/e/themes", homedir);
-	     free(homedir);
-	  }
-	
-	if (ecore_file_is_dir(buf))
-	  {
-	     Ecore_List *themes;
-	     
-	     themes = ecore_file_ls(buf);
-	     if (themes)
-	       {
-		  char *theme, *deftheme = NULL;
-		  char fulltheme[PATH_MAX];
-		  Evas_Object *o;
-		  Ecore_Evas *eebuf;
-		  Evas *evasbuf;
-		  Evas_List *l;
-	  
-		  for (l = e_config->themes; l; l = l->next)
-		    {
-		       E_Config_Theme *et;
-		       
-		       et = l->data;
-		       if (!strcmp(et->category, "theme")) deftheme = et->file;
-		    }		  		  
-
-		  mi = e_menu_item_new(m);
-		  e_menu_item_radio_set(mi, 1);
-		  e_menu_item_radio_group_set(mi, 1);
-		  if (((deftheme) && (!strcmp("default", deftheme))) || 
-		      (!deftheme))
-		    e_menu_item_toggle_set(mi, 1);
-		  e_menu_item_label_set(mi, "default");
-		  e_menu_item_callback_set(mi, _e_int_menus_themes_edit_mode_cb, NULL);
-		  
-		  eebuf = ecore_evas_buffer_new(1, 1);
-		  evasbuf = ecore_evas_get(eebuf);
-		  o = edje_object_add(evasbuf);
-		  
-		  while ((theme = ecore_list_next(themes)))
-		    {
-		       snprintf(fulltheme, sizeof(fulltheme), "%s/%s", buf, theme);
-		       if (ecore_file_is_dir(fulltheme)) continue;
-		       
-		       if(edje_object_file_set(o, fulltheme, "widgets/border/default/border"))
-			 {
-			    mi = e_menu_item_new(m);
-			    e_menu_item_radio_set(mi, 1);
-			    e_menu_item_radio_group_set(mi, 1);
-			    if (deftheme)
-			      {			  
-				 if (!strcmp(theme, deftheme))
-				   e_menu_item_toggle_set(mi, 1);
-			      }			    
-			    e_menu_item_label_set(mi, theme);
-			    e_menu_item_callback_set(mi, _e_int_menus_themes_edit_mode_cb, NULL);
-			 }
-		    }
-		  
-		  evas_object_del(o);
-		  ecore_evas_free(eebuf);
-		  ecore_list_destroy(themes);
-	       }
-	  }
-     }
-}
-
-static void
-_e_int_menus_themes_edit_mode_cb(void *data, E_Menu *m, E_Menu_Item *mi)
-{
-   E_Config_Theme *et;
-   Evas_List *l;
-   E_Action *a;
-	
-   for (l = e_config->themes; l; l = l->next)
-     {
-	et = l->data;
-	if (!strcmp(et->category, "theme"))
-	  {
-	     e_config->themes = evas_list_remove_list(e_config->themes, l);
-	     evas_stringshare_del(et->category);
-	     evas_stringshare_del(et->file);
-	     E_FREE(et);
-	     break;
-	  }
-     }
-
-   et = E_NEW(E_Config_Theme, 1);
-   et->category = evas_stringshare_add("theme");
-   et->file = evas_stringshare_add(mi->label);
-   e_config->themes = evas_list_append(e_config->themes, et);
-   
-   e_config_save_queue();
-
-   a = e_action_find("restart");
-   if ((a) && (a->func.go)) a->func.go(NULL, NULL);
-}
-*/
 		       
 static void
 _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m)
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 261073cad..9bb785b1c 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -130,16 +130,19 @@ e_module_new(const char *name)
    m->func.init = dlsym(m->handle, "e_modapi_init");
    m->func.shutdown = dlsym(m->handle, "e_modapi_shutdown");
    m->func.save = dlsym(m->handle, "e_modapi_save");
-   m->func.info = dlsym(m->handle, "e_modapi_info");
    m->func.about = dlsym(m->handle, "e_modapi_about");
    m->func.config = dlsym(m->handle, "e_modapi_config");
 
    if ((!m->func.init) ||
        (!m->func.shutdown) ||
        (!m->func.save) ||
-       (!m->func.info) ||
        (!m->func.about) ||
-       (!m->api)
+       (!m->api) ||
+       
+       // this is to more forcibly catch old/bad modules. will go - eventually,
+       // but for now is a good check to have
+       (dlsym(m->handle, "e_modapi_info"))
+       
        )
      {
 	snprintf(body, sizeof(body), _("There was an error loading module named: %s<br>"
@@ -153,7 +156,6 @@ e_module_new(const char *name)
 	m->func.init = NULL;
 	m->func.shutdown = NULL;
 	m->func.save = NULL;
-	m->func.info = NULL;
 	m->func.about = NULL;
 	m->func.config = NULL;
 
@@ -176,7 +178,6 @@ e_module_new(const char *name)
 	m->func.init = NULL;
 	m->func.shutdown = NULL;
 	m->func.save = NULL;
-	m->func.info = NULL;
 	m->func.about = NULL;
 	m->func.config = NULL;
 	dlclose(m->handle);
@@ -205,8 +206,6 @@ init_done:
 	       }
 	  }
      }
-   if (m->func.info)
-     m->func.info(m);
    for (l = e_config->modules; l; l = l->next)
      {
 	E_Config_Module *em;
@@ -356,53 +355,6 @@ e_module_list(void)
    return _e_modules;
 }
 
-EAPI E_Menu *
-e_module_menu_new(void)
-{
-   E_Menu *m, *subm;
-   E_Menu_Item *mi;
-   Evas_List *l;
-   Module_Menu_Data *dat;
-   int mod_count = 0;
-   
-   dat = calloc(1, sizeof(Module_Menu_Data));
-   m = e_menu_new();
-   e_object_data_set(E_OBJECT(m), dat);
-   e_object_free_attach_func_set(E_OBJECT(m), _e_module_menu_free);
-   for (l = _e_modules; l; l = l->next)
-     {
-	E_Module *mod;
-	
-	mod = l->data;
-	mi = e_menu_item_new(m);
-	if ((mod->api) && (mod->api->name))
-	  e_menu_item_label_set(mi, mod->api->name);
-	else e_menu_item_label_set(mi, mod->name);
-	if (mod->edje_icon_file)
-	  {
-	     if (mod->edje_icon_key)
-	       e_menu_item_icon_edje_set(mi, mod->edje_icon_file, mod->edje_icon_key);
-	     else
-	       e_menu_item_icon_edje_set(mi, mod->edje_icon_file, "icon");
-	  }
-	else if (mod->icon_file)
-	  e_menu_item_icon_file_set(mi, mod->icon_file);
-	subm = _e_module_control_menu_new(mod);
-	if (subm)
-	  {
-	     e_menu_item_submenu_set(mi, subm);
-	     dat->submenus = evas_list_append(dat->submenus, subm);
-	  }
-	++mod_count;
-     }
-   if (mod_count == 0)
-     {
-	mi = e_menu_item_new(m);
-	e_menu_item_label_set(mi, _("(No Loaded Modules)"));
-     }
-   return m;
-}
-
 EAPI void
 e_module_dialog_show(const char *title, const char *body)
 {
@@ -455,9 +407,6 @@ _e_module_free(E_Module *m)
    if (m->dir) evas_stringshare_del(m->dir);
    if (m->handle) dlclose(m->handle);
    _e_modules = evas_list_remove(_e_modules, m);
-   if (m->icon_file) free(m->icon_file);
-   if (m->edje_icon_file) free(m->edje_icon_file);
-   if (m->edje_icon_key) free(m->edje_icon_key);
    free(m);
 }
 
diff --git a/src/bin/e_module.h b/src/bin/e_module.h
index 182e57d3f..789d92049 100644
--- a/src/bin/e_module.h
+++ b/src/bin/e_module.h
@@ -3,7 +3,7 @@
  */
 #ifdef E_TYPEDEFS
 
-#define E_MODULE_API_VERSION 2
+#define E_MODULE_API_VERSION 3
 
 typedef struct _E_Module     E_Module;
 typedef struct _E_Module_Api E_Module_Api;
@@ -28,7 +28,6 @@ struct _E_Module
       void * (*init)        (E_Module *m);
       int    (*shutdown)    (E_Module *m);
       int    (*save)        (E_Module *m);
-      int    (*info)        (E_Module *m);
       int    (*about)       (E_Module *m);
       int    (*config)      (E_Module *m);
    } func;
@@ -38,14 +37,6 @@ struct _E_Module
    
    /* the module is allowed to modify these */
    void                *data;
-   E_Menu              *config_menu;
-
-   /* modify these but only set them up when the info func is called */
-   /* e_module will free them when the module is freed. */
-   /* note you will need to malloc (strdup) these fields due to the free */
-   char                *icon_file;
-   char                *edje_icon_file;
-   char                *edje_icon_key;
 };
 
 struct _E_Module_Api
@@ -66,7 +57,6 @@ EAPI int          e_module_enabled_get(E_Module *m);
 EAPI int          e_module_save_all(void);
 EAPI E_Module    *e_module_find(const char *name);
 EAPI Evas_List   *e_module_list(void);
-EAPI E_Menu      *e_module_menu_new(void);
 EAPI void         e_module_dialog_show(const char *title, const char *body);
 
 #endif
diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index 08fccaad3..d8006e5a8 100644
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -3,17 +3,6 @@
  */
 #include "e.h"
 
-/* TODO List:
- * 
- * * fix a lot of parts of e17's code to use e_object_del NOT e_object_unref.
- *   there is a subtle difference. unref means u had a reference and you stop
- *   referencing the object - thats ALL. if you created it and now literally
- *   want to destroy it - del is the way to go. there is a separate handler for
- *   this so on del it can go and clean up objects that may reference this one
- *   etc.
- * 
- */
-
 /* yes - i know. glibc specific... but i like being able to do my own */
 /* backtraces! NB: you need CFLAGS="-rdynamic -g" LDFLAGS="-rdynamic -g" */
 #ifdef OBJECT_PARANOIA_CHECK
diff --git a/src/bin/e_object.h b/src/bin/e_object.h
index 13b69d8af..5e392cdc4 100644
--- a/src/bin/e_object.h
+++ b/src/bin/e_object.h
@@ -6,15 +6,12 @@
 /* Object safety/debugging checks */
 /* */
 /* OBJECT_PARANOIA_CHECK is paranoid and checkes pointers and traps segv's */
-/* incase they dont work... very paranoid and slow. NB for backtrace to */
+/* in case they dont work... very paranoid and slow. NB for backtrace to */
 /* work you need gcc, glibc and you need to compile with compile options of */
 /* -g -rdynamic and link with them too */
 /* OBJECT_CHECK is a simple null pointer and magic number check with no */
 /* debug output */
 
-/* #define OBJECT_PARANOIA_CHECK */
-/* #define OBJECT_CHECK */
-
 #ifndef __GLIBC__
 # ifdef OBJECT_PARANOIA_CHECK
 #  warning "Your system doesn't have glibc. Paranoid object checking disabled."
diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
index be83812ca..d3234a8bc 100644
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@@ -4,8 +4,7 @@ MODULE = battery
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap \
-module_icon.png
+module.eap
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 7d5264cc0..89c5627e8 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -1424,16 +1424,6 @@ e_modapi_save(E_Module *m)
    return 1;
 }
 
-EAPI int
-e_modapi_info(E_Module *m)
-{
-   char buf[4096];
-
-   snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
-   m->icon_file = strdup(buf);
-   return 1;
-}
-
 EAPI int
 e_modapi_about(E_Module *m)
 {
diff --git a/src/modules/battery/e_mod_main.h b/src/modules/battery/e_mod_main.h
index 9da342e46..e97247a06 100644
--- a/src/modules/battery/e_mod_main.h
+++ b/src/modules/battery/e_mod_main.h
@@ -63,7 +63,6 @@ EAPI extern E_Module_Api e_modapi;
 EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
-EAPI int   e_modapi_info     (E_Module *m);
 EAPI int   e_modapi_about    (E_Module *m);
 EAPI int   e_modapi_config   (E_Module *m);
 
diff --git a/src/modules/battery/module_icon.png b/src/modules/battery/module_icon.png
deleted file mode 100644
index 4ae49b9a72ab9b270a8de32a78d68515cd2e21b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1464
zcmV;p1xNacP)<h;3K|Lk000e1NJLTq000#L001Be1^@s6{h%|500006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_00kyVL_t(Y$BmZDj~rJS#ecWDYq~qr
z)6?U49OF194`SgUg#-*i0!6IC3YP5n6F~V7ShE3%Y!K`bY*|F0gas%O5sxTNtb{0z
zjm3Dzp7ivix}Nv(eJrY~yFIo<u5?vZ-M7v?=R4=#y72j%Y5M0Hc)CSE4D_4cYn~%O
zfdEuM*>v0drVj&+fYGDl?XO>WZ2Y|^zA(P}!gCj&e(KB5@15PhG!pF)8RcYhxcv0v
z_owe&zjgcIXm;(+-PxPdMgA`ESu@!Rw6i<xedRk>zx2yX7j|EM=KQvaq8JzNFt3Ir
zh2i*k!r8ND7!PCiwjG+EkQD`olT;6mW`BR{pP&9T&F$Mj+Jf%===(4Hx!>P<@nqph
z!wzw;j|4}*7xUwvyvobpeT6^$;dlJ%*T13i5O4Jfu4G`A?2o%FlJb+^|MC4F0@tI4
z?e5v}_KQv;Dv7DAqsR+_D8rpSMx!ytz;HBXxHCpnDa#V)1*cuAV0iZ8=vm-tpxbSj
z#=AXXu+`zhqkXJIOp-ua1hV9qU;O-M?CcC#EE39c$#`2C#KL2{5$A@FFzSJ=0>A)>
zT2N7uqVi#Irl(xFu+K~1{ubx1yn<(pb&e1M#wguL=-Q8%e()D=-nd1QWE56ey5QOr
zw4gymD^&)$^&A|}(0Bg9*V2?LFMX5f@ylQaV2{W?ewUA~y~lqK4k)r535qIsAAA$9
z6{r9zfCvN;taW60hMj#ze>{Y457Hxw#f+k?a6TZSs4Aic=QRKh&{d$b(#=ps6hs8)
zJb7M_&ll*)3Ct(RbWWM3xXKcO5JYQWl&o^)X{NzoR24)ah~m5_%?sv>gx+LIzZa9w
z7Nl8@ttz|^1W}CEtW;6J-zR^W+kCJyKvf9=ybF|N$vj!o?F|@gb;*_qNt)xF!v{gM
z1{Dm`q{=tt1BAa`J1mRRujPABRa%l|#$u5$o6ngi329#9oI`>jqKH76JKp*5uC$;n
zQ=Kfz@cP@gxctREE?*k4J%}kQOPb}xaZKFpP!>6PQDU7Zh;lry`1kFEe|<7zGB2to
zQmk{TI=4>v;Kq~>Z_XHx9^t8rXL$1Qg7f<+TXBax&$)Z=gu{DNZXYd3GK)bmMp0GU
zFkOLa6DvSb3|Zm$&*743W*FWn>2xB>vLsCsvMi;ld^48XEY%0XFCv<E+8I<E!vya<
z)>cGOgtHbOJR*YXYWu7+shXdzsfcQ3>S%xgRUt^gIfu1fqR7;)`>+D7hpxcobWPhG
zeLcG>B7*lG=PZ$laNZ*lkd|e8H6TILCZ}sq5uI%yq6!j(5CYzLOk@b&6M~?kE5Hr5
zq4njIQSCs}tmy_cc#IfABV8Kl8yt|jruWMi)oeX;eJ7#>5xfsX#t`KGdTxG?RB3a%
z4!<@=wY*i=bqygP#-Ji==QrH1jn(R5^8I~Ap({`^24f5=p^1{N6t&l&4>8IIJ=p{_
zTGv%u(2e}oOk3^R$}d}{?S>*D$PG|?I#w&Tjd9u}qvon@$ej;zlX^d8a}ia*`EK0#
zDwtJyjWP9OD|@q+&AW@Vdc!*TEpP{r&c>hC`fy!E2XQyL0w%^7jM+TKXyZ>UUsTG)
zvV1)&{cFHA>SNFYXQ?i5-Wa~I6?cEI6?d<0#hoWQooL5kB2bYasrCMD<-+x<@^32q
z4Y&cM8)0~$8R~=C7&r&)H}}29h!i*h?g0}ZJDr^WcQlNex_36l2G&bbANJD!0Cnig
zVIL}>@Bjb+CVEs@bVF}#ZDnqB004N}b1q6vEJ;mKD9<d(PzcFLRdDz84FCXA=LaK@
S%Vlr?0000<MNUMnLSTZ%yS~i;

diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am
index 7c61731c6..ad705b987 100644
--- a/src/modules/clock/Makefile.am
+++ b/src/modules/clock/Makefile.am
@@ -4,8 +4,7 @@ MODULE = clock
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap \
-module_icon.png
+module.eap
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index 300c9e227..d7be1810c 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -143,16 +143,6 @@ e_modapi_save(E_Module *m)
    return 1;
 }
 
-EAPI int
-e_modapi_info(E_Module *m)
-{
-   char buf[4096];
-
-   snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
-   m->icon_file = strdup(buf);
-   return 1;
-}
-
 EAPI int
 e_modapi_about(E_Module *m)
 {
diff --git a/src/modules/clock/e_mod_main.h b/src/modules/clock/e_mod_main.h
index f00a37985..a24ec2e3e 100644
--- a/src/modules/clock/e_mod_main.h
+++ b/src/modules/clock/e_mod_main.h
@@ -9,7 +9,6 @@ EAPI extern E_Module_Api e_modapi;
 EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
-EAPI int   e_modapi_info     (E_Module *m);
 EAPI int   e_modapi_about    (E_Module *m);
 EAPI int   e_modapi_config   (E_Module *m);
 
diff --git a/src/modules/clock/module_icon.png b/src/modules/clock/module_icon.png
deleted file mode 100644
index dde70fdbc4bf08774b97a2f5937236ee728a0685..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2204
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

diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am
index 2e034006f..ce709142b 100644
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@@ -4,8 +4,7 @@ MODULE = cpufreq
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap \
-module_icon.png
+module.eap
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index 6e9e824b6..ee8c9ae34 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -933,16 +933,6 @@ e_modapi_save(E_Module *m)
    return 1;
 }
 
-EAPI int
-e_modapi_info(E_Module *m)
-{
-   char buf[4096];
-   
-   snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
-   m->icon_file = strdup(buf);
-   return 1;
-}
-
 EAPI int
 e_modapi_about(E_Module *m)
 {
diff --git a/src/modules/cpufreq/e_mod_main.h b/src/modules/cpufreq/e_mod_main.h
index 973c0b9af..6ae392f8a 100644
--- a/src/modules/cpufreq/e_mod_main.h
+++ b/src/modules/cpufreq/e_mod_main.h
@@ -37,7 +37,6 @@ EAPI extern E_Module_Api e_modapi;
 EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
-EAPI int   e_modapi_info     (E_Module *m);
 EAPI int   e_modapi_about    (E_Module *m);
 EAPI int   e_modapi_config   (E_Module *m);
 
diff --git a/src/modules/cpufreq/module_icon.png b/src/modules/cpufreq/module_icon.png
deleted file mode 100644
index 2b9bc6562f8285fd1a459876ea0aa1a5c4ab9765..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 985
zcmV;~119{5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&vp<9x0Tc-EaT^03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00TWqL_t(o!|j*9Z&XJR
z$3J^Mz#?a(2oOA5q=H<c(4ajjsbZj^F$EG7{s&%7preY5NECpOQbd=6CVeQV$u9~d
z^i~j|h!l~iZZ`!#EWJb67~iB|p0zo>A3o&BO-5SH)84(E+3%bA&J6r7J1piu{J(7H
zfm6B+(2Cxb5-q@nE@^VaY{9`P;6q@4<cO#vqY^E^3t$CU*S%4dBdrDp+Q2@bD<V&T
zQzG&^a9TtjRp`gSap17NyGNaFRT-!=eh~N+_}qIB@TKa727Ma%2p9l=0e=H)z}xZ9
zVrrn@3!Lcp`}e%}gb*f**5V!K+y&qv@C<mZPK=rmXagN!-g}R8jy%r+7!HRMIRSj3
z0r>|IqIi(17$}17W8jkz0(qV@91iJryL37o0Iap7X-bkLn|tFDLLkes%Odh4kO0$q
zIa7x~8`v)*zj^OjUS0+uNfNBJo5lg0bB(C<dcC{A0}aOAdg)eyf+_j-dw`?BNnjyO
z)ANO)NyRxwmStFLF~*z)9s|#T)q*El6#>{1k#7fs!TGAg(=^3eOOhnDPV{=cUyU)>
z_1t*X@_-m)F3!)-->wU=e&2ED>rez+sbpEUAR?C|CN)h&WPm9Vxj7gN&Q%>8LIC#;
z=DHMB1a8Es*W`czqb3C6AgmKb;8GRZbumzjfcG98?^bgRY(D}a1eSh2M(_I_LI7ZP
zb{1>xCNDH(!A4o1P=&xo6#_9Km9b#)dqLe%7RWdaS23XgA|f|qChT-Nbi3Vu-PT%*
za}Mu4d7d*fGsE26+&BV10QZ%E*2fVjW5Qj)0pK&><l^Gul}RdLaq~RSi}d^kxCcB{
zCtj%|8)XQHmdh33Phd8L!26WrI9`F5YWR&B9yPULZD0oI0_T9QfbX&_6W}M+zclDu
zz$M@ea7<geX=TJlX=&x!2OI%T081hwz*W`PR9_#{#eNDbXh(Gj_+Y#gH+4h>61%iJ
zI;aQj*1e)(jT=%EHKEUR<=P3Yjdw#^>57Zm-PSTat;S0WOPodey;oJQml@ycTwo$c
zrlM!lFqDj<`CwEvBTO>sn5vpygMu^-C+0oUYTL)N9hH9o>z}Wm=fGB%00000NkvXX
Hu0mjfIn}8A

diff --git a/src/modules/dropshadow/Makefile.am b/src/modules/dropshadow/Makefile.am
index e284bf9f2..8d4223746 100644
--- a/src/modules/dropshadow/Makefile.am
+++ b/src/modules/dropshadow/Makefile.am
@@ -4,21 +4,8 @@ MODULE = dropshadow
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap \
-module_icon.png \
-menu_icon_close.png \
-menu_icon_dark.png \
-menu_icon_far.png \
-menu_icon_fuzzy.png \
-menu_icon_light.png \
-menu_icon_medium.png \
-menu_icon_sharp.png \
-menu_icon_underneath.png \
-menu_icon_very_dark.png \
-menu_icon_very_far.png \
-menu_icon_very_fuzzy.png \
-menu_icon_very_light.png \
-menu_icon_very_sharp.png
+module.eap
+
 EXTRA_DIST = $(files_DATA)
 
 # the module .so file
diff --git a/src/modules/dropshadow/e_mod_main.c b/src/modules/dropshadow/e_mod_main.c
index 5b3516255..445e61753 100644
--- a/src/modules/dropshadow/e_mod_main.c
+++ b/src/modules/dropshadow/e_mod_main.c
@@ -151,16 +151,6 @@ e_modapi_save(E_Module *m)
    return 1;
 }
 
-EAPI int
-e_modapi_info(E_Module *m)
-{
-   char buf[4096];
-   
-   snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
-   m->icon_file = strdup(buf);
-   return 1;
-}
-
 EAPI int
 e_modapi_about(E_Module *m)
 {
diff --git a/src/modules/dropshadow/menu_icon_close.png b/src/modules/dropshadow/menu_icon_close.png
deleted file mode 100644
index deb7f2d1ff8375670f4b0db4a76c2a581aa8cb06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`BquhJa_j&A03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00IL^L_t(|+QpSWZ_{89
z#(zoEng(Gd0;v*_7(&FvZYdH81D&FL0WW+4I+}%US+g-SMV=56Um%maz<|V(HEIR6
zWMQb0TL<uKmUCqVH;F|HC%w|0bb9W+KhGUpvsC`VH@%7gRq@%%=^3~JlAK;DKn7X^
zG~foXBR0S<;0F)`3$c?jS#1M4(6Vj&sq4B&Q55-66#4V{{QYP&dJa4S9s(`#-QJ|+
z8F<68tZp2~etL<7VR+i__n!eh;6BjUBuEX=Ez9aANuts<k|c>T4C4^kmmqqsjD-!|
z1zM|qzAQlyM8JV$(h`hn9yG6OwrxMrH0{o&v)gPo>!xWw2JQh(8H#FA?RS7Z*L9E5
zlHxdy2UwEDo?ul9GthPYL0PtTI-Le^8@RQcLA7A^OG}!j6`(HQTlq=)qgKA}&&vjw
z&1UDTCMUmJlF4N9x@>^)czg_;39AbkebHo~7lz^KrVaKy?<eqfU6ZqgwE%+QaQH$g
zwRW#4rRa9MAAl3!GY|-dD$3%5Xh6>}jKd%ZqE$a{x7+W4SF4CtxGIG9`@n%|nr|G(
z@jTCqUDsVqr_*nP!Qi8m<)wgMx+*FKy{G{<Wv*Mo(7R&S#qSLGB4s%SK8YR4>P}bP
zgDl9d5T_|mmpMo390FhEeFx5$!T-s@`EMul%8vfE%Wp9Giz{~@rN{sP002ovPDHLk
FV1m1?B76V<

diff --git a/src/modules/dropshadow/menu_icon_dark.png b/src/modules/dropshadow/menu_icon_dark.png
deleted file mode 100644
index 2858748a197f0d38ef890817febcd2f33a1fbe9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 578
zcmV-I0=@l-P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`9XY}p!ZiQ@03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00E{+L_t(|+P#%)OT#c2
zg`f4ZZj%iJog#xF`2T;CV}hvrAnR`Jveqvr@{(1DxGoTqG;hyI&U*>8+&cfTt<OOa
z$;OWz16~7_8UIA!L1Q2Vx*B8cAAmhjYCIUSlLQ?BWk4Sos$Yo&fv$mEeG3#Ks(&N!
z;5}dj+yZ0ZM(a#=1+WAbz&r4v^)4hy8Z^%Y_5e(QiAaW$3Q3a-d}MA`8<Hb}Nb9~%
zJ_VjcaINoFqOHJt=35Ck>-Z#)C)G*E0-gYOM*m2*m4N+?c9O`;<UD8`Xx|t36nF&g
zjrLIxuCXC>z)A!w-KK83K^GVZbf|e^!q(bW+8fArq<Pl{Pt*|msZN{;AP(&8zp-q*
zeQIubM9@l$g4$9^ze3%aEDc+wJ!kCqVMd1pC9sjRa?M>(ckJBBCf7e3Vboz1Ssx?{
z!GUpF6coBjKx<|59GC&GBJ(#nBCy1Xak7`BGD(&T`~`Rx$wGVI<s$x}z8?&rGdg=Y
zK2;{>0-phI%7N1QENO6@FJwObm!{^NDt1K}5En1k7kO|l@?@Uv(Qmzd0cIDdl-jh&
QKL7v#07*qoM6N<$f=}P-CIA2c

diff --git a/src/modules/dropshadow/menu_icon_far.png b/src/modules/dropshadow/menu_icon_far.png
deleted file mode 100644
index 7d66d1d8cf6bb73bfbdabb8a8f2a3fe902e58b1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 713
zcmV;)0yh1LP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`Bo`1!LO=ij03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00J#ZL_t(|+U=FijuJr>
zg+G3pk%^8`79@_6pj#8&NHk&EXK>F0uyUtsSmWO3FuVaF!37Ik7^CinX%v%zjE?j`
z(_L;(CnYfaI9qR0sV=BG=hnGD1^?|TW{h!-F->F4u|{(?n>_~-*7zsjLt~6*F0n8S
z2kmzI0dNh-04X533wUTYTUf8xp8$E_rpVG8Z?(?zMVm|}r@#^L5I6)50LLatEou(D
z+*V4*ak9hVaN6y517U^0T(e<?Zm)KYSEW*U0XzjB1NVU(kd2*BFYJG`D?zbX%n5v7
zKTUxPAONEDRZ}^Nq9jnzasrGregnaxL?3n~==FLDWl<iu2iyT}1A9R7FM=Ql-t0=y
zXf%v!;f8>7`d%i;WHPNNioR_NJ{SyWwOR=U)KPHv1)c&DOV!uubdG>%3+*YDN@ml(
zC4zFf?A2<uXTI-`)_Gni6pZJ2$eB=C<15fpyB2IqNY6arR;$&w?RNXS=XpWD-w&J3
zX5_kVsKaql&44rDEAS3@4Y<O{tm+$S;5u+u`5hNgLD{lr-8_=FXTUMg1Kw*s0nSrv
z<g<h4SdA=}WTspn0|Vd-@Dcc|^*JzKMPRJimLm|T5Bw7F4|yJgf6{s!$KkR{4h3{-
zmH$YGb5>iJXwN|Zd0P9zSlhc3k|nFcxutQSIK;$1<?&cI^A&u<7EfLrhqOTB7c9Pc
voJAKRn=hv4wr^_EB1>B5j1_dVszCn$|KLZ-Ac~fp00000NkvXXu0mjf!v`&|

diff --git a/src/modules/dropshadow/menu_icon_fuzzy.png b/src/modules/dropshadow/menu_icon_fuzzy.png
deleted file mode 100644
index 90cbaab63c1e62f69df4868b2e2f6c9bbd4ca6e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`8Zm=_+`s?;03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00GoVL_t(|+P#)bZyG@m
zgumSx1Af5)!6ix#{{O$qaukWg2e1t+uxu{XR(ZVGK3I&@YP8c+)z29!K3`R#V|9i8
z@bIa<+H_s)A0?gXFA+FkE~GZ_Lm|gLqUr>A1_r<gxRf61I|6KgEwGW^8By0q5a1UA
zya6VXF>s|lfIYAVR=`s7ETX-W<Q~sQ0-XYL$rQL%6v+E0;1O8pd$OXxMp6<C<@pr&
z0sNAlD~gfqxAJ}=;)tv*YSCqZSB3X;f!|5bL@*H0P6QK+YOlz4mZmBqsCx(^f}e`$
zx~RdeMHDGpNpB)e9>Ik=W^DPN>Gwo?$x@LmT}$AvQg*3=H)RA#;a-U(y60Ml1~v!D
z+I3uXS`@tQ>!Ku}p=2PN)HBV==Ed!k-2m^#|Jzr#-aRU}JLRvj>1-`6nC+p*zU>>d
zIM5Umx>C2~BKNI2<)yG)3nNI#F%W9KjSOQ#C)SFGqD^097v1xyvm5PqK$nX9K3Vay
z6|2>ut$>%nKj05=FL@BrN_K~s<j(Go=;@((+vwY=tKzo^7P5N<_q!;H+-OLWrQ%6x
z_~^2W6vcqOD{^O#$kqzkn5SR8uHU=~XMJ$a@?@Un(f`)JE&l<s=G#Z4=x;{=0000<
KMNUMnLSTZ?U>Gj|

diff --git a/src/modules/dropshadow/menu_icon_light.png b/src/modules/dropshadow/menu_icon_light.png
deleted file mode 100644
index adc8024cf63c1e9d580980b5d021956df4df5cea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`9vRYEu|5C*03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00C-AL_t(|+P#%=Pr@(|
z#eZ!#2NJ-9kof(-9-62KbFdBnc{OKUAw<TKOS9YCd+qi53L`)6AK23^1l&MG@-(gz
zh-4lp6hZF*J<tKIqR$Dr40$B3fQgA9Ob2|KXcD2UKqN1LM_>*tHBOZWI07}W1>QC8
zmH#DD3<wk=e*)IP3Rp-W;#&!PC?8k0lgOZe6R^^Z*TAy`X23&IqJt(<n%tlL7!sJM
zEGxxQqD9h0rTIUWtd?*W1$@#qg_b;5S!N<Hg>}h3Rl+RHJ{7j5b0wN8D&<_J<Idr+
zE3h3DG`l!!f1#bd!G{#@$MzzhcuPE?N7K`N#tKg6d&GC=&cR85#&kp@jL!%R;X5l3
z2K*<e=c}YWT|(Z9a0|QwFTk6Geni3<_Y8@_*%BV)L6Ll;@l)UWp%su=ai5U3hIl6r
zisT#FMlD>{i{jGv=J?lFm|c6xO-HxuyIeSTxiW8d>5u+=1G~+dIU{!?vH$=807*qo
IM6N<$g7$#Y!vFvP

diff --git a/src/modules/dropshadow/menu_icon_medium.png b/src/modules/dropshadow/menu_icon_medium.png
deleted file mode 100644
index 6298cf631bc37479290b3d66b311f898c51b8f0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`8X7M=C4c|`03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00F>BL_t(|+QpSkZ__{!
zh97?<rGXIP9FSV22M(3E@&Eq^LU05TsYppg(<XIVJ6xVcBjZ*en%2@vyX$x6oq2b5
z77qMn|AE~<20<>S2=nB;1)4DbCxYa(1df0gz|b|o9k2s#fZBD_msNI;^Ab1)#=slL
zYst{*C9ra=fvrUQhX|7Mm%tP_1<rsI*CTNoU;)g5ufTWL*IkmbLr@s`6nF=`2hM>R
zP$?Bkvjo1mpE7GDzw0B&fq}A|>imNQZ-G~y1L}X($*Pw4R-(3#;7GmCbbRi7;=epZ
zItr0*%xI}hiR8CI76>XepBec?*-9lWLJ>^F%(SUOAlZExj7`0AKJ;JSQyfDvl{Vu}
zrhga}0!BtS2$w8jvS3??IS!H)u{!fZ_oBShTN<lj<HfmkuML=eIOs;qR-3weqa#5p
zVC|(@I^Tt|+lSuM`fn|E;k=H$sq8ebTJYRUG!3QLEz=tK30#PsYg>n4C?05Z14rpz
zl4NJCuXOqa_y~M<eHGh9(bM14Su{c8ojR{|{KFoUoPTn?3g^(<iy9p*!u4Nj{5Q>R
q8=XH(yMB@f=SiN-M|<=S{`~@bvZ}ltcw4;y0000<MNUMnLSTYg-~%ZD

diff --git a/src/modules/dropshadow/menu_icon_sharp.png b/src/modules/dropshadow/menu_icon_sharp.png
deleted file mode 100644
index 9cebd1c10781f39b8b0fc7503879f66ba0d4073a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 528
zcmV+r0`L8aP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`8U>;>D0Kh;03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00DGKL_t(|+U?apYgADX
z1@PZ{n*{Sm*qFse3!9`cc3O&GAbw=4U}0xtEMlP`fe0Hmkht0CX4mFCcs$<Q4HCp6
z15?eJbLP(6xtDueV#O^ny?BM6<0d};TY&;=c!(WrV?D7ejBthv{OS_w5-72OCwPv1
zJd22sf5Q<z;{;>OZX-}&6T5hW*Vw}#qCz&rG2Y`4U+}Yel9d*LH9QUZTf9I&*fN+c
zJi_C|s<wT_b)Br&(waVA;sCGG|JB5bc$wS>nGu}EC-qa54S`+=_tTcD@}k36g4s*X
zPP6E;<pkRq=pdCZnw4M%wM$Sg6Ic&$qgLsnt6T(IUE_rUcWzCAS#62N8P=jrt>WY4
zTs3#0O`uw$A%540+Q<bnOwMSTz)jZwC`)vXX|2+xPlGv5&RIA*_n>;jrdhat?)hqC
z;ImXd!Y91L2mDBGr$CiF!DVAB=ZRgX>hJg%^24-f@?Si5|Kz#8vk&Lqmf9a}m~;Jj
SK;C2k0000<MNUMnLSTX?|K&~q

diff --git a/src/modules/dropshadow/menu_icon_underneath.png b/src/modules/dropshadow/menu_icon_underneath.png
deleted file mode 100644
index 5ba9a40fdfca61efc1010ca551d41e4e9358ff95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`B?e>TQ}X}-03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00DnVL_t(|+QpSYYQjJi
zhCfrSid0fJT@>87bw3Nioe=N}9$+rv0eS-QEIq_rAgk=U2m_7KrgSFVJRyXr4K?<`
zzzn?q|KGfs`3G8#&L47%YX}6Ab61)l$vxmo^F{(k(k{>k2Ee_n0ltAR;1kGY?do>b
zIYHh9hQI^xC}S*Q2<bauWn{pI2o;xF)&oLd1}uS%)_P}*iPJRA(lpJCF|pQq2W%u~
zCYau(ws)n{8L(1HZLPJ3;zU?$4@#*muoBF;)W+Ha9Rkn5QYp1{&iUd(IOn{GECo9h
zuG;EDU=D1~RbICfY1dphy5*{my$|FNCtB-87>1+YK9DdBM_TIzFcFTRdKMkIic?^1
zjEReeVT_4^wQvlM0zu8)?@y=Gr>2%5n7(jysx4|Qf{M2|AWxFyttpXU^6HB&3wTM$
z_WS*7Qvtzb!r^azP0Ks5KoUjKi}(JbC429SD2iTyM6mfecWu=wS~0uU?fPFnoSS@^
dSNrr^j~`M*hxF8&%!dE~002ovPDHLkV1j!s;i&)s

diff --git a/src/modules/dropshadow/menu_icon_very_dark.png b/src/modules/dropshadow/menu_icon_very_dark.png
deleted file mode 100644
index ce31f6e1fc84c0567a28d951724e828e22fc85ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`8!+vh-4_4=03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00F>BL_t(|+QpSkZ__{!
zh97?<rGXIP9FSV22M(3E@&Eq^LU05TsYppg(<XIVJ6xVcBjZ*en%2@vyX$x6oq2b5
z77qMn|AE~<20<>S2=nB;1)4DbCxYa(1df0gz|b|o9k2s#fZBD_msNI;^Ab1)#=slL
zYst{*C9ra=fvrUQhX|7Mm%tP_1<rsI*CTNoU;)g5ufTWL*IkmbLr@s`6nF=`2hM>R
zP$?Bkvjo1mpE7GDzw0B&fq}A|>imNQZ-G~y1L}X($*Pw4R-(3#;7GmCbbRi7;=epZ
zItr0*%xI}hiR8CI76>XepBec?*-9lWLJ>^F%(SUOAlZExj7`0AKJ;JSQyfDvl{Vu}
zrhga}0!BtS2$w8jvS3??IS!H)u{!fZ_oBShTN<lj<HfmkuML=eIOs;qR-3weqa#5p
zVC|(@I^Tt|+lSuM`fn|E;k=H$sq8ebTJYRUG!3QLEz=tK30#PsYg>n4C?05Z14rpz
zl4NJCuXOqa_y~M<eHGh9(bM14Su{c8ojR{|{KFoUoPTn?3g^(<iy9p*!u4Nj{5Q>R
q8=XH(yMB@f=SiN-M|<=S{`~@bvZ}ltcw4;y0000<MNUMnLSTYwBm}Jh

diff --git a/src/modules/dropshadow/menu_icon_very_far.png b/src/modules/dropshadow/menu_icon_very_far.png
deleted file mode 100644
index 7b1793f5dfeb49a12f7f638fcd0145baeac4e982..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 728
zcmV;}0w?{6P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`AqoyT+S~vD03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00KNoL_t(|+TE2wi_=gL
z$A3xMt!|C7E(#j02NgUh-g;QD{Q!z*KT^Suv$VYnil9(LbXh&vR$eW_rmWkh+qB7e
znZUE!nzEi8c#xNuH~*Rc{AU9Ht%*oYMD|6buWMgKYX8D<AR<Oqn-P)VEY1`8yCsv!
z<ObmA$_-#7rzJ@;0L}yFfGxlS+-0Ax%{g#AZ!oUwUTZd+Pk}4I4sbz%3V+N>i@1?>
zyWKayW8e{R9|(YpKrsU;SQrmCt(oup_kbF31Pp*aV01qL7KO7YE{@|ZU=Ij^ufS!X
zq{k@`*#Pf=o0|Z1IvoeN1B`)PU|Wx7z$q}d0iFX-HUVff8jcot+loBWj6z`IEXy>n
zk_LkTK@g;XC>>MaJMa;B3A_dlmvvj!kJnn7rc|p{QKh)Lwg6x2u&d9dUjQ7(F;NuV
zO4Ib)y2vY)iWp<;E_SuiirRb`W!`U{S1y;0=XtkVt=6+%ulF_#!|`x9jN9$@yk4&_
zf*=rMOzt{4E8dlWtH1-*`5tf=xTH}o2bKbJ;28J}yaHYT@7+~2tJF@kX+nLD^(-r{
zSo>JN3H8niF!R=AmT_9v_V;zL*+Wf$L^Xe`-TVnS0KNbtF9(GgP|+G>sXC5zB#bQQ
zAAm#Mk5>W6QiR!>tJA4cFjDRJE$0Wi9|5y<vnWwVM^^iXdf6Te(TZU=1rjF*MFrKi
zuVZ0HYf`d+e`v%b&1?!R0C93k*;AmB^#{wcUnp&-3bxSf1>h$zQHR_3y%oCv0000<
KMNUMnLSTZwI5PVH

diff --git a/src/modules/dropshadow/menu_icon_very_fuzzy.png b/src/modules/dropshadow/menu_icon_very_fuzzy.png
deleted file mode 100644
index a374fc30dc64030538347687801824f71d1cb409..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~`8wkaoWr+X)03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00HDlL_t(|+O?K#Z__{!
zgdfLe(>6(^78Q{A|340@7F6e@_?0iS(Xfpwkcg$#`7W24z1`V8SG;{H8!KRC@A2DW
zHrqQk0#MF?2j~i@Wh*lT8aByd{s&1p10JAFvXTf!U`Q5ZCz4{|;b8-`z?JM;V=H0=
z(gUx+QRA!D{DezMVQGL5zzwhgwz9QI8UYLf+ykAgwj2%l1QG96;J3gX@KNKf)?4lG
zfdlXY{LuQ!LKBIfN(#-DJiiA%$sR<qNd!BAU(3<zOwvyws*PZ41Yd#Anx7-^wGsFw
z>ouR9pp`dUdHf*oFACK<5$x0aDAK(pd@L6Kq7$qw2ltkTO-gb;%}*0UiTWv~pkne2
z6}jCcf*AexkaIX*<vOUX4q8dJO~n>ZllH{E+S<!WS{Hjt((a^V_p(sLU}3@LzNfc#
zF?*pc)?1?d4@z8EV_^w`U9y9#$Lk<GAFceOLbLX>OrL;f?R_zcj&YJW!DL$QtU?{|
zT%kP!-+)K`rxQjm%*6?!fpt<wd8cZ<RXhUUMb-&paDrKq3WAW?qN5&FMDI1bCyhHJ
zm?K139(rrJvw8YA?K%?Oo03i{3c$f+J4u53f4p!8zo)AUU74qkfa(I5zJFo7A^7i~
aEx!S?)BK-|)l$>|0000<MNUMnLSTZGyA>$_

diff --git a/src/modules/dropshadow/menu_icon_very_light.png b/src/modules/dropshadow/menu_icon_very_light.png
deleted file mode 100644
index 8b698115d3d8522ad4ebcf67f0545b0780ff4472..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 456
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYYs>cdx@v7EBh5rNftR{&PNq5fI_k*t`Q~9`MJ5Nc_j?aMX8A;sVNHO
znI#ztAsML(?w-B@?^9Is7#J9JJY5_^DsEj3z0KETz+)@x-23tW|0~=aSEg@Xa*c1<
zMfT|?zHXMwzcc=?Tk^5`tl!)^%Sz@L29+)erKLJkv^v)`luyYyBIM(i*0s$g;6OEl
zH3R#rc@rDr?lbl<<X!3T_{8;t@xa7Q%h#&TVBp!aU!q5SlFXAmi;ufAsK1)`eOdzF
zqN<gh{R$uTKHU?uWNq0em&nqZ;Qrv=Qnxv^YCq=vPq~(+DY#?-+f9b@sgVNV#=rY>
zL~nlE_x}Hiqv5%i*N3}uxy8r2XQX<~&QWgaY@HS3pPkBn_T7B-CcP8cMcPWNrU8%7
za6CAbxcg&XCx^;~pw1$*2jUFruP&Z*5OI96^z2sO;|}M!e<bX=9yNQ_=LJ3)r#J21
wu4C;V#9<eA{nJu*_xrU4`@W_8`(Md0{Xx5^dZ6tZU;s0Cy85}Sb4q9e06;vq$^ZZW

diff --git a/src/modules/dropshadow/menu_icon_very_sharp.png b/src/modules/dropshadow/menu_icon_very_sharp.png
deleted file mode 100644
index bc111bc6f56619bf890e2ff8a732093855035817..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYYs>cdx@v7EBh5rNft?Cx5e-DfkLt+t`Q~9`MJ5Nc_j?aMX8A;sVNHO
znI#ztAsML(?w-B@?^9IsfC_6pT^vIyZoQpi$aO%0$5sBWP4o5Qx3*Qv=O4auEZNd6
z%dDo$b(Ft;;tX*+sT;SLYzi1TSKM7W|L69z%mEE*JHAL2e>QuO(79BD!L{qP0E7Ai
z5$2tB=@FiWe;+Sl3}If7rS!{3NI|+Pl~+NEq41<}?6-@{)^ur}&U?+ii?PNm!#RRA
R^CHk844$rjF6*2UngArzU4Q@p

diff --git a/src/modules/dropshadow/module_icon.png b/src/modules/dropshadow/module_icon.png
deleted file mode 100644
index 1e811c4144b4751968b2db249db0e8c1ced76fb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1821
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
LNkvXXu0mjfKg>;X

diff --git a/src/modules/ibar/Makefile.am b/src/modules/ibar/Makefile.am
index 560cc3d73..38276aa59 100644
--- a/src/modules/ibar/Makefile.am
+++ b/src/modules/ibar/Makefile.am
@@ -4,8 +4,7 @@ MODULE = ibar
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap \
-module_icon.png
+module.eap
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index b95b11281..7d052ffd3 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -1333,16 +1333,6 @@ e_modapi_save(E_Module *m)
    return 1;
 }
 
-EAPI int
-e_modapi_info(E_Module *m)
-{
-   char buf[4096];
-   
-   snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
-   m->icon_file = strdup(buf);
-   return 1;
-}
-
 EAPI int
 e_modapi_about(E_Module *m)
 {
diff --git a/src/modules/ibar/module_icon.png b/src/modules/ibar/module_icon.png
deleted file mode 100644
index e2900e1baf868e47b391ff48d92787bfe4f7e36b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq001BW000OG1^@s6n1%hX00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_00HGmL_t(I%Z-!4YEwZJhQGN<492<;
zDu~pb3l}aFbQ209>Y{}r_yoR$8y}$UPQ*fd0x3jrBiUx>1Go#g5K-uD(xmB4@4Yi~
z=NuR2wl}e$Kl~i{XPE!Y%=r!HXaHA$I$$cg&dFS_uKh2xQVSpje0d<PR_o^O&i3x+
z=EkFDvwle>7!?n}qrvIXXy{jO-L2JXwMbRZPgO<#fKp%9MC42p5#l&L>2x|DyWQ?v
z;0U0(_wLQUN>B}jYOtzBs_Ley*`aFkLz7=$wS<WL#Sp>*i=xn?DAaqe-g|Y<skK(E
zwVLO-CP^ae>+7$9W&~V)zV+-W>OnFnW?(0f9zyaHCf~3JgYp&&6p^zViU=WuGkWjw
z-eaxBT1%eiWLZX*WjN<dyWQRZR_Xxp_b=Jn^%d|la3_!-Lpp)e5u`It501HZ@5O};
zR2vB)EY#)w<rjqzh~wA;rVb?AJ9{7Y-><%E)Eb6#46_l;#$a<0A)TJ!oLew1O_t58
z#--uHG^#Qf3|z0*`vfHAM6cezbK~XX2e+Rz441`uBSk?7f~Yc_=6>zrmWiUMK5xKO
z%`2~AE*MBt9nQ&QlJxui&*Sm93k<7~Y5=WD3{53IGOtl3j{m~)o-)p53?0C4GLr3f
TlTJxd00000NkvXXu0mjfYG?=3

diff --git a/src/modules/ibox/Makefile.am b/src/modules/ibox/Makefile.am
index 736c60501..1d500f233 100644
--- a/src/modules/ibox/Makefile.am
+++ b/src/modules/ibox/Makefile.am
@@ -4,8 +4,7 @@ MODULE = ibox
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap \
-module_icon.png
+module.eap
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index aa206923e..a3f2c190f 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -1263,16 +1263,6 @@ e_modapi_save(E_Module *m)
    return 1;
 }
 
-EAPI int
-e_modapi_info(E_Module *m)
-{
-   char buf[4096];
-   
-   snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
-   m->icon_file = strdup(buf);
-   return 1;
-}
-
 EAPI int
 e_modapi_about(E_Module *m)
 {
diff --git a/src/modules/ibox/e_mod_main.h b/src/modules/ibox/e_mod_main.h
index d7deed5a0..b7d0f9e0c 100644
--- a/src/modules/ibox/e_mod_main.h
+++ b/src/modules/ibox/e_mod_main.h
@@ -29,7 +29,6 @@ EAPI extern E_Module_Api e_modapi;
 EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
-EAPI int   e_modapi_info     (E_Module *m);
 EAPI int   e_modapi_about    (E_Module *m);
 
 void _ibox_config_update(void);
diff --git a/src/modules/ibox/module_icon.png b/src/modules/ibox/module_icon.png
deleted file mode 100644
index 77e235fa5bbd76794c69da8252f99edd67e8a2cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 580
zcmV-K0=xZ*P)<h*8VUda018P+L{b0%03ZMW00;;M0001(h5fGp000JJOGiWi00000
z0Qp0^e*gdg32;bRa{vGf6951U69E94oEQKA0p&?VK~y-)jg!G@Q$ZAlzqv^a#<~zH
zh}4}67cLZZ6AB{gqJ<*(1ipkDAE50{#6o-mDMWB1*=FYhxC^)tQRr>br0GrXy)$#?
z92e%cH?g2U{2cganE%Yo`3mP~09SxIU@E%K$y~3l{V%jq3m^r2c_6J;>*nsx_U`89
z#-nDlen}-56%WCq!RgUx=vQyut<`F^NL9~IRYm`RQeW0Y<V+J0;y6C(bUGiq-R@i9
z2%x$5?#;eRPzr@=u&PC>>ZYpMp=$C&lV4x8goymb5W)hBqR^r!)O)Yqdv(sKwN|aQ
zn&-JDNh0g(>#u=k1YCW-_3SC?K{6<2U?-3sLh=(P->?UR@)ipek+U0$2qA<sdhhYx
zW39znOP=RsSw@y+IOj~e-QECJ>HzWgFWK7l74S1~Cy*aQI)T#>q%%$rj=6U4#f1t~
z8wnvS)aCu<7ljar<JbeH4kX(<dmr}SufA&38isTXvk}b3U~>>5ou1&FTQDw7md&fi
zrQyOfsxlZ1T(8&r1SI7|uin3N<K^QAx1Tf&m&JJ_ML`IHs4|@9e(m9wiK3`JZ@^T|
zE3aWL7)Vnc&dFqw^!xqK<MFr)46Bi90If<4O(i}uuTdqA|HAT~GR|cT9l&oglI?br
SPDxP!0000<MNUMnLSTYAV+Xnb

diff --git a/src/modules/itray/Makefile.am b/src/modules/itray/Makefile.am
index dd77d6519..590689c7a 100644
--- a/src/modules/itray/Makefile.am
+++ b/src/modules/itray/Makefile.am
@@ -3,8 +3,7 @@ MODULE = itray
 
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module_icon.png
+files_DATA =
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/itray/module_icon.png b/src/modules/itray/module_icon.png
deleted file mode 100644
index 7365900fd09c274fcdef78d363c28bc6d6e18675..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0GR-p
z0GVDyR)GKj010qNS#tmY3ljhU3ljkVnw%H_000McNliru)Cm~{G#t#D<E{Vz03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00I<AL_t(|+U=CRZWB=u
zg};qWg3=&l1%W7e08&%tB}h#RL`dmLP45>#qM-FN&=O(^nh*sgAVFfhUjOc&_s*g4
zU1t@XL?{wfjx@S+ckj-*b7pqn1~<4af(xE60X6@A>5}sT%=_j|-WK8k@UwF0U+ow0
z2v|OMv3YPcn@x4QU6lZI71A`-{{Fspc6Lglbzrqh5&);oX7jI)0huJ{obo(Zk|df;
zCK`{&8V!f)_xtK}IyyQ&((cDyZN1zQ&;uR<EA@)z_ck{-&+;k0gMI+e3qxdvGs8?s
z4rfAU6wV<t(llW>8nV9r7~n2&9~hMcHGoE=;e#K5wZTpR$g>QSFtfSM2_>8>$g?SF
znxM1#t^vpOg{9UmxX+*v0B43wm>kZ{Rx7hH!xfG!&xqrMI8Mqat3a(@X)(euq;cm9
z6dz#v6|4h5mS@Q1C7Rv7%)~iImSqeE0|tWuVXs$hVd|C5@AvPv*PcJ?L-GmI9uzqM
zos$kGLlS1ftjxesObg;9C5j@Venfk34<H66fU6QbdGYG)0ZD_W8$%kdfZ<Hf!*7Qm
zFqK7~X>V>ul;=5N7}9RHX|-AaZ-6e4SKD;O_iy(aKiU|04Q!Nc8k`#sw<|5S<_mS}
zim_6Tim8{S3!DNGkOm88P~B&<?ET;h0#(++%aVEDf=h;Aupnq~LGbGS(qVUl|BpWa
W*SgO1Taiit0000<MNUMnLSTZco*)(g

diff --git a/src/modules/pager/Makefile.am b/src/modules/pager/Makefile.am
index 7c5283e4f..f701feb8a 100644
--- a/src/modules/pager/Makefile.am
+++ b/src/modules/pager/Makefile.am
@@ -4,8 +4,7 @@ MODULE = pager
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap \
-module_icon.png
+module.eap
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 69f551a9f..844d38ce4 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -1822,16 +1822,6 @@ e_modapi_save(E_Module *m)
    return 1;
 }
 
-EAPI int
-e_modapi_info(E_Module *m)
-{
-   char buf[4096];
-
-   snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
-   m->icon_file = strdup(buf);
-   return 1;
-}
-
 EAPI int
 e_modapi_about(E_Module *m)
 {
diff --git a/src/modules/pager/e_mod_main.h b/src/modules/pager/e_mod_main.h
index 2d68b5714..1cf5948a3 100644
--- a/src/modules/pager/e_mod_main.h
+++ b/src/modules/pager/e_mod_main.h
@@ -46,7 +46,6 @@ EAPI extern E_Module_Api e_modapi;
 EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
-EAPI int   e_modapi_info     (E_Module *m);
 EAPI int   e_modapi_about    (E_Module *m);
 
 void  _pager_cb_config_updated(void);
diff --git a/src/modules/pager/module_icon.png b/src/modules/pager/module_icon.png
deleted file mode 100644
index 244f8a4821b873cf44fdc2841e77a318fb62a555..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmeAS@N?&q;$mQ6;PUiv2?EjzAk4uAB#W!6z5pq<ByV>YhW{YAVDIwDKoQOYkH}&M
z25w;xW@MN(M*=9wUgGKN%6^TNlgC(8_xs!HKq2E2*N775{M_8syb=cIqSVBa)D(rJ
zN`;`r;*!*&+{8Qun<6mN0YU*q^pf*)?G!`#+<@92c)B=-L>zv5eWMq%qe$z+{Oi4;
z0!NQ&Wx6)$FL?i-;g#@_DCJIt*%Nxs@^opeGZ*73o+Uf&@B2SK8{0GYEd81EH}X<@
z`V3w9{(>&UsQc=P&F)_;I5+TD=n1833dAH!rK~TA=sBJ=^O3~~zYAM`vfO$wA<y58
z=YP~H2hkNw|Kk+ip59iuk&iF(nNe3tYsjq+9Mhlvx7iRheaBHIamH_KpY`^?DV)Ey
zEi7xkc|GSQ{~K4W)|JMvf^?VuS^lcxTeH{Qr;O!0ubyjuv!}9rsocYa0}VwrPp8fP
ebWE`9H&>mi;8o_mECxWoGI+ZBxvX<aXaWG-GoTy*

diff --git a/src/modules/start/Makefile.am b/src/modules/start/Makefile.am
index e2146f5b5..4b57ce848 100644
--- a/src/modules/start/Makefile.am
+++ b/src/modules/start/Makefile.am
@@ -4,8 +4,7 @@ MODULE = start
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap \
-module_icon.png
+module.eap
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c
index 6a60229dd..10317b600 100644
--- a/src/modules/start/e_mod_main.c
+++ b/src/modules/start/e_mod_main.c
@@ -249,16 +249,6 @@ e_modapi_save(E_Module *m)
    return 1;
 }
 
-EAPI int
-e_modapi_info(E_Module *m)
-{
-   char buf[4096];
-   
-   snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
-   m->icon_file = strdup(buf);
-   return 1;
-}
-
 EAPI int
 e_modapi_about(E_Module *m)
 {
@@ -268,3 +258,4 @@ e_modapi_about(E_Module *m)
 }
 /**/
 /***************************************************************************/
+
diff --git a/src/modules/start/e_mod_main.h b/src/modules/start/e_mod_main.h
index a0b7c22f3..9e598fcb8 100644
--- a/src/modules/start/e_mod_main.h
+++ b/src/modules/start/e_mod_main.h
@@ -9,7 +9,6 @@ EAPI extern E_Module_Api e_modapi;
 EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
-EAPI int   e_modapi_info     (E_Module *m);
 EAPI int   e_modapi_about    (E_Module *m);
 
 #endif
diff --git a/src/modules/start/module_icon.png b/src/modules/start/module_icon.png
deleted file mode 100644
index 1fb7bff0b5476cf1bf7ca82e7607c35aa810e608..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2604
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
O0000<MNUMnLSTY=rybD%

diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am
index 7abc3c00e..e2c102c94 100644
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@@ -4,8 +4,7 @@ MODULE = temperature
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap \
-module_icon.png
+module.eap
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c
index e6953c741..20511e3bb 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -443,16 +443,6 @@ e_modapi_save(E_Module *m)
    return 1;
 }
 
-EAPI int
-e_modapi_info(E_Module *m)
-{
-   char buf[4096];
-
-   snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
-   m->icon_file = strdup(buf);
-   return 1;
-}
-
 EAPI int
 e_modapi_about(E_Module *m)
 {
diff --git a/src/modules/temperature/e_mod_main.h b/src/modules/temperature/e_mod_main.h
index 446fc3725..7192edc95 100644
--- a/src/modules/temperature/e_mod_main.h
+++ b/src/modules/temperature/e_mod_main.h
@@ -33,7 +33,6 @@ EAPI extern E_Module_Api e_modapi;
 EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
-EAPI int   e_modapi_info     (E_Module *m);
 EAPI int   e_modapi_about    (E_Module *m);
 EAPI int   e_modapi_config   (E_Module *m);
 
diff --git a/src/modules/temperature/module_icon.png b/src/modules/temperature/module_icon.png
deleted file mode 100644
index 9d1e14ab8634e7082c0e41aeb9f763ca3425d473..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 706
zcmV;z0zLhSP)<h;3K|Lk000e1NJLTq000aC001Be1^@s6CL5Wm00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&&U+3nd(}VSoSt03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00JgSL_t(I%bk=zOB-Pv
z$3MU4&Xm-P&9z3fwXZ-29UK%|?c$O^!KH5?bSZT56&UE|SQK2cC^+cgAfkw+Ll-G+
z^|GWSIpu_dwATMEYJ58M&ZgF2;xjxC+&$mt`{&{LLW9G&=35ic0$6|m6+qWIATl&G
z^n7Y+>eJ-p<YsSg?@ORH0RA^bL>^_c*}PXM=&u_adSYV26OpIDop6(?21KJ#I~I$z
z@668fZgdpewjY?L`4}*-0{|FWYuWRC_I#f}N~BuSRRCK5@pnaZO@M@x)JR2L;~W+I
zP)gMYkZ={b8K9K<%Tg~xD5)-nh9rr|Ka%QZP(iE>rKB24snL4~Pj4utx=r8u;^a1_
zZvu#jm`W*BVB9ba5s^ssKBMX#+)Jm^uTrVh6T7ul5`BFny1SL<d8dx!d<6D@i_5kc
z85v2tu6uTn&+GlwRb5_K(BB<LyRLgaI5_wQXagjqx;s2P{KD{kbANgoSy|y=e4Gyh
z1DqC%MlzX90uKSh4CFLfmeqDtDq*-Tx?JX$=TSL4WOr+ecsy<cv5-LnXO821Ztm$J
zzqUqUd715Ek#c7z9sT{RudkPY!|Dc%Boc{db8~asTe+NmpULReOh&u8oSvDP`DR(x
z>(E1((#6Ti$?nq9(q_dl?l*UJwH(>@&)NC;FJoh4Z;y|U7Xcrr$d!tT0_{LYP>;L7
o4)6mwr$+r;KItI$i)!t^0bXsc%;Xtzk^lez07*qoM6N<$g7HN*%m4rY