diff --git a/configure.in b/configure.in
index 003d2cd2b..1fb9aa5ce 100644
--- a/configure.in
+++ b/configure.in
@@ -252,6 +252,7 @@ AC_ARG_WITH(edje-cc,
 ])
 AC_SUBST(edje_cc)
 
+
 AC_OUTPUT([
 Makefile
 enlightenment.spec
@@ -259,14 +260,23 @@ src/Makefile
 src/bin/Makefile
 src/modules/Makefile
 src/modules/ibar/Makefile
+src/modules/ibar/module.desktop
 src/modules/dropshadow/Makefile
+src/modules/dropshadow/module.desktop
 src/modules/clock/Makefile
+src/modules/clock/module.desktop
 src/modules/pager/Makefile
+src/modules/pager/module.desktop
 src/modules/battery/Makefile
+src/modules/battery/module.desktop
 src/modules/temperature/Makefile
+src/modules/temperature/module.desktop
 src/modules/cpufreq/Makefile
+src/modules/cpufreq/module.desktop
 src/modules/ibox/Makefile
+src/modules/ibox/module.desktop
 src/modules/start/Makefile
+src/modules/start/module.desktop
 data/Makefile
 data/fonts/Makefile
 data/images/Makefile
diff --git a/src/modules/battery/.cvsignore b/src/modules/battery/.cvsignore
index ecfe52690..91e51953a 100644
--- a/src/modules/battery/.cvsignore
+++ b/src/modules/battery/.cvsignore
@@ -6,3 +6,4 @@ e_mod_main.lo
 module.la
 *.lo
 *.la
+module.desktop
diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
index d3234a8bc..c8b4bc057 100644
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@@ -4,7 +4,7 @@ MODULE = battery
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap
+module.edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
@@ -25,3 +25,6 @@ module_la_SOURCES      = e_mod_main.c \
 module_la_LIBADD       = @e_libs@ @cf_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/battery/e_mod_config.c b/src/modules/battery/e_mod_config.c
index fc436ee7e..ed40b7672 100644
--- a/src/modules/battery/e_mod_config.c
+++ b/src/modules/battery/e_mod_config.c
@@ -32,7 +32,7 @@ _config_battery_module(void)
    v->advanced.apply_cfdata = _advanced_apply_data;
    v->advanced.create_widgets = _advanced_create_widgets;
 
-   snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(battery_config->module));
+   snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(battery_config->module));
    cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
 			     _("Battery Monitor Configuration"), 
 			     "E", "_e_mod_battery_config_dialog",
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 201a34137..dd59bafdb 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -142,7 +142,7 @@ _gc_icon(Evas *evas)
    char buf[4096];
    
    o = edje_object_add(evas);
-   snprintf(buf, sizeof(buf), "%s/module.eap",
+   snprintf(buf, sizeof(buf), "%s/module.edj",
 	    e_module_dir_get(battery_config->module));
    edje_object_file_set(o, buf, "icon");
    return o;
diff --git a/src/modules/battery/module.desktop.in b/src/modules/battery/module.desktop.in
new file mode 100644
index 000000000..26b47bb04
--- /dev/null
+++ b/src/modules/battery/module.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Battery
+Exec=enlightenment
+X-Enlightenment-IconClass=battery,gadget
+Icon=./module.edj
diff --git a/src/modules/battery/module.edj b/src/modules/battery/module.edj
new file mode 100644
index 000000000..5e54ad803
Binary files /dev/null and b/src/modules/battery/module.edj differ
diff --git a/src/modules/clock/.cvsignore b/src/modules/clock/.cvsignore
index 60ebc832f..06d064a84 100644
--- a/src/modules/clock/.cvsignore
+++ b/src/modules/clock/.cvsignore
@@ -4,3 +4,4 @@ Makefile
 Makefile.in
 *.lo
 module.la
+module.desktop
diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am
index ad705b987..9e7d2c28f 100644
--- a/src/modules/clock/Makefile.am
+++ b/src/modules/clock/Makefile.am
@@ -4,7 +4,7 @@ MODULE = clock
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap
+module.edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
@@ -23,3 +23,6 @@ module_la_SOURCES      = e_mod_main.c \
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index b2a91ce5c..d5c50e039 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -97,7 +97,7 @@ _gc_icon(Evas *evas)
    char buf[4096];
    
    o = edje_object_add(evas);
-   snprintf(buf, sizeof(buf), "%s/module.eap",
+   snprintf(buf, sizeof(buf), "%s/module.edj",
 	    e_module_dir_get(clock_module));
    edje_object_file_set(o, buf, "icon");
    return o;
diff --git a/src/modules/clock/module.desktop.in b/src/modules/clock/module.desktop.in
new file mode 100644
index 000000000..0aa0677c4
--- /dev/null
+++ b/src/modules/clock/module.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Clock
+Exec=enlightenment
+X-Enlightenment-IconClass=clock,gadget
+Icon=./module.edj
diff --git a/src/modules/clock/module.edj b/src/modules/clock/module.edj
new file mode 100644
index 000000000..27a983a53
Binary files /dev/null and b/src/modules/clock/module.edj differ
diff --git a/src/modules/cpufreq/.cvsignore b/src/modules/cpufreq/.cvsignore
index 3d0324c13..b8fa82827 100644
--- a/src/modules/cpufreq/.cvsignore
+++ b/src/modules/cpufreq/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
 *.lo
 module.la
 freqset
+module.desktop
diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am
index 347597530..c7e33340a 100644
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@@ -4,7 +4,7 @@ MODULE = cpufreq
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap
+module.edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
@@ -34,3 +34,6 @@ install-data-hook:
 
 noinst_PROGRAMS        = freqset
 freqset_SOURCES        = freqset.c
+
+uninstall:
+	rm -rf $(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index cb9338286..43744eadb 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -136,7 +136,7 @@ _gc_icon(Evas *evas)
    char buf[4096];
    
    o = edje_object_add(evas);
-   snprintf(buf, sizeof(buf), "%s/module.eap",
+   snprintf(buf, sizeof(buf), "%s/module.edj",
 	    e_module_dir_get(cpufreq_config->module));
    edje_object_file_set(o, buf, "icon");
    return o;
diff --git a/src/modules/cpufreq/module.desktop.in b/src/modules/cpufreq/module.desktop.in
new file mode 100644
index 000000000..21809eb29
--- /dev/null
+++ b/src/modules/cpufreq/module.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Cpufreq
+Exec=enlightenment
+X-Enlightenment-IconClass=cpufreq,gadget
+Icon=./module.edj
diff --git a/src/modules/cpufreq/module.edj b/src/modules/cpufreq/module.edj
new file mode 100644
index 000000000..cfe58f8c8
Binary files /dev/null and b/src/modules/cpufreq/module.edj differ
diff --git a/src/modules/dropshadow/.cvsignore b/src/modules/dropshadow/.cvsignore
index 60ebc832f..06d064a84 100644
--- a/src/modules/dropshadow/.cvsignore
+++ b/src/modules/dropshadow/.cvsignore
@@ -4,3 +4,4 @@ Makefile
 Makefile.in
 *.lo
 module.la
+module.desktop
diff --git a/src/modules/dropshadow/Makefile.am b/src/modules/dropshadow/Makefile.am
index 8d4223746..8423162e8 100644
--- a/src/modules/dropshadow/Makefile.am
+++ b/src/modules/dropshadow/Makefile.am
@@ -4,7 +4,7 @@ MODULE = dropshadow
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap
+module.edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
@@ -25,3 +25,6 @@ module_la_SOURCES      = e_mod_main.c \
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/dropshadow/e_mod_config.c b/src/modules/dropshadow/e_mod_config.c
index 25eee9499..e116f0e3d 100644
--- a/src/modules/dropshadow/e_mod_config.c
+++ b/src/modules/dropshadow/e_mod_config.c
@@ -32,7 +32,7 @@ _config_dropshadow_module(E_Container *con, Dropshadow *ds)
    v->basic.apply_cfdata = _basic_apply_data;
    v->basic.create_widgets = _basic_create_widgets;
 
-   snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(ds->module));
+   snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(ds->module));
    cfd = e_config_dialog_new(con,
 			     _("Dropshadow Configuration"),
 			     "E", "_e_mod_dropshadow_config_dialog",
diff --git a/src/modules/dropshadow/module.desktop.in b/src/modules/dropshadow/module.desktop.in
new file mode 100644
index 000000000..37fa451e8
--- /dev/null
+++ b/src/modules/dropshadow/module.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Dropshadow
+Exec=enlightenment
+X-Enlightenment-IconClass=dropshadow,gadget
+Icon=./module.edj
diff --git a/src/modules/dropshadow/module.edj b/src/modules/dropshadow/module.edj
new file mode 100644
index 000000000..7d44ec1d4
Binary files /dev/null and b/src/modules/dropshadow/module.edj differ
diff --git a/src/modules/ibar/.cvsignore b/src/modules/ibar/.cvsignore
index 60ebc832f..06d064a84 100644
--- a/src/modules/ibar/.cvsignore
+++ b/src/modules/ibar/.cvsignore
@@ -4,3 +4,4 @@ Makefile
 Makefile.in
 *.lo
 module.la
+module.desktop
diff --git a/src/modules/ibar/Makefile.am b/src/modules/ibar/Makefile.am
index 38276aa59..aa5cf58be 100644
--- a/src/modules/ibar/Makefile.am
+++ b/src/modules/ibar/Makefile.am
@@ -4,7 +4,7 @@ MODULE = ibar
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap
+module.edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
@@ -23,3 +23,6 @@ module_la_SOURCES      = e_mod_main.c \
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c
index 26aad61b3..0b22831a4 100644
--- a/src/modules/ibar/e_mod_config.c
+++ b/src/modules/ibar/e_mod_config.c
@@ -46,7 +46,7 @@ _config_ibar_module(Config_Item *ci)
    v->advanced.apply_cfdata = NULL;
    v->advanced.create_widgets = NULL;
 
-   snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(ibar_config->module));
+   snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(ibar_config->module));
    /* Create The Dialog */
    cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
 			     _("IBar Configuration"),
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 321ee7730..10a803e9a 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -228,7 +228,7 @@ _gc_icon(Evas *evas)
    char buf[4096];
    
    o = edje_object_add(evas);
-   snprintf(buf, sizeof(buf), "%s/module.eap",
+   snprintf(buf, sizeof(buf), "%s/module.edj",
 	    e_module_dir_get(ibar_config->module));
    edje_object_file_set(o, buf, "icon");
    return o;
diff --git a/src/modules/ibar/module.desktop.in b/src/modules/ibar/module.desktop.in
new file mode 100644
index 000000000..18f21e79e
--- /dev/null
+++ b/src/modules/ibar/module.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=IBar
+Exec=enlightenment
+X-Enlightenment-IconClass=ibar,gadget
+Icon=./module.edj
diff --git a/src/modules/ibar/module.edj b/src/modules/ibar/module.edj
new file mode 100644
index 000000000..17bcf7fd3
Binary files /dev/null and b/src/modules/ibar/module.edj differ
diff --git a/src/modules/ibox/.cvsignore b/src/modules/ibox/.cvsignore
index 60ebc832f..06d064a84 100644
--- a/src/modules/ibox/.cvsignore
+++ b/src/modules/ibox/.cvsignore
@@ -4,3 +4,4 @@ Makefile
 Makefile.in
 *.lo
 module.la
+module.desktop
diff --git a/src/modules/ibox/Makefile.am b/src/modules/ibox/Makefile.am
index 1d500f233..6210e3517 100644
--- a/src/modules/ibox/Makefile.am
+++ b/src/modules/ibox/Makefile.am
@@ -4,7 +4,7 @@ MODULE = ibox
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap
+module.edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
@@ -24,3 +24,6 @@ module_la_SOURCES      = e_mod_main.c \
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/ibox/e_mod_config.c b/src/modules/ibox/e_mod_config.c
index f2d109cc6..aacd75e4f 100644
--- a/src/modules/ibox/e_mod_config.c
+++ b/src/modules/ibox/e_mod_config.c
@@ -46,7 +46,7 @@ _config_ibox_module(Config_Item *ci)
    v->advanced.create_widgets = NULL;
    
    /* Create The Dialog */
-   snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(ibox_config->module));
+   snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(ibox_config->module));
    cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
 			     _("IBox Configuration"),
 			     "E", "_e_mod_ibox_config_dialog",
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index 3f8209e8a..dc4e7d40e 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -237,7 +237,7 @@ _gc_icon(Evas *evas)
    char buf[4096];
    
    o = edje_object_add(evas);
-   snprintf(buf, sizeof(buf), "%s/module.eap",
+   snprintf(buf, sizeof(buf), "%s/module.edj",
 	    e_module_dir_get(ibox_config->module));
    edje_object_file_set(o, buf, "icon");
    return o;
diff --git a/src/modules/ibox/module.desktop.in b/src/modules/ibox/module.desktop.in
new file mode 100644
index 000000000..e7d9490e2
--- /dev/null
+++ b/src/modules/ibox/module.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=IBox
+Exec=enlightenment
+X-Enlightenment-IconClass=ibox,gadget
+Icon=./module.edj
diff --git a/src/modules/ibox/module.edj b/src/modules/ibox/module.edj
new file mode 100644
index 000000000..ceebb63e0
Binary files /dev/null and b/src/modules/ibox/module.edj differ
diff --git a/src/modules/itray/Makefile.am b/src/modules/itray/Makefile.am
index 590689c7a..ea7784ca7 100644
--- a/src/modules/itray/Makefile.am
+++ b/src/modules/itray/Makefile.am
@@ -24,3 +24,6 @@ module_la_SOURCES      = e_mod_main.c \
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/pager/.cvsignore b/src/modules/pager/.cvsignore
index 60ebc832f..06d064a84 100644
--- a/src/modules/pager/.cvsignore
+++ b/src/modules/pager/.cvsignore
@@ -4,3 +4,4 @@ Makefile
 Makefile.in
 *.lo
 module.la
+module.desktop
diff --git a/src/modules/pager/Makefile.am b/src/modules/pager/Makefile.am
index f701feb8a..b1423d798 100644
--- a/src/modules/pager/Makefile.am
+++ b/src/modules/pager/Makefile.am
@@ -4,7 +4,7 @@ MODULE = pager
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap
+module.edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
@@ -24,3 +24,6 @@ module_la_SOURCES      = e_mod_main.c \
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index 8ea6974cc..050d1b4cd 100644
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -32,7 +32,7 @@ _config_pager_module(Config_Item *ci)
    v->advanced.apply_cfdata = _advanced_apply_data;
    v->advanced.create_widgets = _advanced_create_widgets;
 
-   snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(pager_config->module));
+   snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(pager_config->module));
    cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
 			     _("Pager Configuration"),
 			     "E", "_e_mod_pager_config_dialog",
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 4c1f82e7c..0391539f0 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -232,7 +232,7 @@ _gc_icon(Evas *evas)
    char buf[4096];
    
    o = edje_object_add(evas);
-   snprintf(buf, sizeof(buf), "%s/module.eap",
+   snprintf(buf, sizeof(buf), "%s/module.edj",
 	    e_module_dir_get(pager_config->module));
    edje_object_file_set(o, buf, "icon");
    return o;
diff --git a/src/modules/pager/module.desktop.in b/src/modules/pager/module.desktop.in
new file mode 100644
index 000000000..31533c31d
--- /dev/null
+++ b/src/modules/pager/module.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Pager
+Exec=enlightenment
+X-Enlightenment-IconClass=pager,gadget
+Icon=./module.edj
diff --git a/src/modules/pager/module.edj b/src/modules/pager/module.edj
new file mode 100644
index 000000000..b42428d6b
Binary files /dev/null and b/src/modules/pager/module.edj differ
diff --git a/src/modules/start/.cvsignore b/src/modules/start/.cvsignore
index a2de6f194..bb0ec768d 100644
--- a/src/modules/start/.cvsignore
+++ b/src/modules/start/.cvsignore
@@ -4,4 +4,4 @@ Makefile.in
 Makefile
 .libs
 .deps
-
+module.desktop
diff --git a/src/modules/start/Makefile.am b/src/modules/start/Makefile.am
index 4b57ce848..f7a3eaea1 100644
--- a/src/modules/start/Makefile.am
+++ b/src/modules/start/Makefile.am
@@ -4,7 +4,7 @@ MODULE = start
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap
+module.edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
@@ -24,3 +24,5 @@ module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
+uninstall:
+	rm -rf $(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c
index bfb500d67..4c4627ae8 100644
--- a/src/modules/start/e_mod_main.c
+++ b/src/modules/start/e_mod_main.c
@@ -109,7 +109,7 @@ _gc_icon(Evas *evas)
    char buf[4096];
    
    o = edje_object_add(evas);
-   snprintf(buf, sizeof(buf), "%s/module.eap",
+   snprintf(buf, sizeof(buf), "%s/module.edj",
 	    e_module_dir_get(start_module));
    edje_object_file_set(o, buf, "icon");
    return o;
diff --git a/src/modules/start/module.desktop.in b/src/modules/start/module.desktop.in
new file mode 100644
index 000000000..246ce9121
--- /dev/null
+++ b/src/modules/start/module.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Start
+Exec=enlightenment
+X-Enlightenment-IconClass=start,gadget
+Icon=./module.edj
diff --git a/src/modules/start/module.edj b/src/modules/start/module.edj
new file mode 100644
index 000000000..66ca3c390
Binary files /dev/null and b/src/modules/start/module.edj differ
diff --git a/src/modules/temperature/.cvsignore b/src/modules/temperature/.cvsignore
index f5b72a3f6..0724a7804 100644
--- a/src/modules/temperature/.cvsignore
+++ b/src/modules/temperature/.cvsignore
@@ -6,4 +6,4 @@ e_mod_main.lo
 module.la
 *.la
 *.lo
-
+module.desktop
diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am
index e2c102c94..d10a62b0f 100644
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@@ -4,7 +4,7 @@ MODULE = temperature
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.eap
+module.edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
@@ -24,3 +24,6 @@ module_la_SOURCES      = e_mod_main.c \
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/temperature/e_mod_config.c b/src/modules/temperature/e_mod_config.c
index bdda8fe01..a7ca970f3 100644
--- a/src/modules/temperature/e_mod_config.c
+++ b/src/modules/temperature/e_mod_config.c
@@ -55,7 +55,7 @@ _config_temperature_module(void)
    v->advanced.apply_cfdata = _advanced_apply_data;
    v->advanced.create_widgets = _advanced_create_widgets;
 
-   snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(temperature_config->module));
+   snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(temperature_config->module));
    cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
 			     _("Temperature Configuration"),
 			     "E", "_e_mod_temperature_config_dialog",
diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c
index 2f41030c9..d9efebdca 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -113,7 +113,7 @@ _gc_icon(Evas *evas)
    char buf[4096];
    
    o = edje_object_add(evas);
-   snprintf(buf, sizeof(buf), "%s/module.eap",
+   snprintf(buf, sizeof(buf), "%s/module.edj",
 	    e_module_dir_get(temperature_config->module));
    edje_object_file_set(o, buf, "icon");
    return o;
diff --git a/src/modules/temperature/module.desktop.in b/src/modules/temperature/module.desktop.in
new file mode 100644
index 000000000..12d90b795
--- /dev/null
+++ b/src/modules/temperature/module.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Temperature
+Exec=enlightenment
+X-Enlightenment-IconClass=temperature,gadget
+Icon=./module.edj
diff --git a/src/modules/temperature/module.edj b/src/modules/temperature/module.edj
new file mode 100644
index 000000000..1178e42d2
Binary files /dev/null and b/src/modules/temperature/module.edj differ