diff --git a/configure.in b/configure.in
index 1029a7ab2..88837dbb8 100644
--- a/configure.in
+++ b/configure.in
@@ -258,6 +258,16 @@ src/modules/conf_colors/Makefile
 src/modules/conf_colors/module.desktop
 src/modules/conf_fonts/Makefile
 src/modules/conf_fonts/module.desktop
+src/modules/conf_borders/Makefile
+src/modules/conf_borders/module.desktop
+src/modules/conf_icon_theme/Makefile
+src/modules/conf_icon_theme/module.desktop
+src/modules/conf_mouse_cursor/Makefile
+src/modules/conf_mouse_cursor/module.desktop
+src/modules/conf_transitions/Makefile
+src/modules/conf_transitions/module.desktop
+src/modules/conf_startup/Makefile
+src/modules/conf_startup/module.desktop
 src/preload/Makefile
 data/Makefile
 data/fonts/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 413ab7e58..5a673b98c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,41 +1,65 @@
-src/bin/e.h
 src/bin/e_about.c
 src/bin/e_actions.c
+src/bin/e_alert.c
+src/bin/e_atoms.c
+src/bin/e_bg.c
+src/bin/e_bindings.c
+src/bin/e_border.c
+src/bin/e_box.c
+src/bin/e_canvas.c
+src/bin/e_color.c
+src/bin/e_color_class.c
+src/bin/e_color_dialog.c
 src/bin/e_config.c
 src/bin/e_config_dialog.c
 src/bin/e_configure.c
 src/bin/e_confirm_dialog.c
 src/bin/e_container.c
+src/bin/e_datastore.c
 src/bin/e_desk.c
 src/bin/e_desklock.c
+src/bin/e_dialog.c
+src/bin/e_dnd.c
+src/bin/e_dpms.c
 src/bin/e_eap_editor.c
+src/bin/e_editable.c
+src/bin/e_entry.c
 src/bin/e_entry_dialog.c
-src/bin/e_main.c
+src/bin/e_error.c
+src/bin/e_exebuf.c
+src/bin/e_exec.c
+src/bin/e_exehist.c
+src/bin/e_filereg.c
+src/bin/e_flowlayout.c
 src/bin/e_fm.c
+src/bin/e_fm_custom.c
+src/bin/e_fm_main.c
+src/bin/e_fm_mime.c
 src/bin/e_fm_prop.c
+src/bin/e_focus.c
+src/bin/e_font.c
 src/bin/e_fwin.c
 src/bin/e_gadcon.c
+src/bin/e_grabinput.c
 src/bin/e_hints.c
+src/bin/e_icon.c
+src/bin/e_ilist.c
+src/bin/e_imc_main.c
 src/bin/e_init.c
 src/bin/e_int_border_locks.c
 src/bin/e_int_border_menu.c
 src/bin/e_int_border_prop.c
 src/bin/e_int_border_remember.c
 src/bin/e_int_config_apps.c
-src/bin/e_int_config_borders.c
-src/bin/e_int_config_dialogs.c
 src/bin/e_int_config_clientlist.c
-src/bin/e_int_config_color_classes.c
-src/bin/e_int_config_cursor.c
 src/bin/e_int_config_desk.c
 src/bin/e_int_config_desklock.c
 src/bin/e_int_config_desks.c
+src/bin/e_int_config_dialogs.c
 src/bin/e_int_config_display.c
 src/bin/e_int_config_dpms.c
 src/bin/e_int_config_exebuf.c
 src/bin/e_int_config_focus.c
-src/bin/e_int_config_fonts.c
-src/bin/e_int_config_icon_themes.c
 src/bin/e_int_config_imc.c
 src/bin/e_int_config_imc_import.c
 src/bin/e_int_config_intl.c
@@ -43,47 +67,128 @@ src/bin/e_int_config_keybindings.c
 src/bin/e_int_config_menus.c
 src/bin/e_int_config_mime.c
 src/bin/e_int_config_mime_edit.c
-src/bin/e_int_config_mouse.c
+src/bin/e_int_config_modules.c
 src/bin/e_int_config_mousebindings.c
+src/bin/e_int_config_mouse.c
 src/bin/e_int_config_paths.c
 src/bin/e_int_config_performance.c
 src/bin/e_int_config_screensaver.c
 src/bin/e_int_config_shelf.c
-src/bin/e_int_config_startup.c
-src/bin/e_int_config_theme.c
-src/bin/e_int_config_theme_import.c
-src/bin/e_int_config_transitions.c
 src/bin/e_int_config_window_display.c
 src/bin/e_int_config_window_manipulation.c
 src/bin/e_int_config_winlist.c
 src/bin/e_int_gadcon_config.c
+src/bin/e_intl.c
 src/bin/e_int_menus.c
 src/bin/e_int_shelf_config.c
-src/bin/e_intl.c
-src/bin/e_intl.h
 src/bin/e_ipc.c
+src/bin/e_ipc_codec.c
+src/bin/e_layout.c
+src/bin/e_livethumb.c
+src/bin/e_main.c
+src/bin/e_manager.c
+src/bin/e_maximize.c
+src/bin/e_menu.c
 src/bin/e_module.c
+src/bin/e_mouse.c
+src/bin/e_moveresize.c
+src/bin/e_msg.c
+src/bin/e_obj_dialog.c
+src/bin/e_object.c
+src/bin/e_order.c
+src/bin/e_pan.c
+src/bin/e_path.c
+src/bin/e_place.c
+src/bin/e_pointer.c
+src/bin/e_popup.c
+src/bin/e_prefix.c
+src/bin/e_remember.c
+src/bin/e_remote_main.c
+src/bin/e_resist.c
+src/bin/e_screensaver.c
+src/bin/e_scrollframe.c
+src/bin/e_sha1.c
 src/bin/e_shelf.c
+src/bin/e_signals.c
+src/bin/e_slider.c
+src/bin/e_spectrum.c
+src/bin/e_start_main.c
 src/bin/e_startup.c
+src/bin/e_stolen.c
 src/bin/e_sys.c
+src/bin/e_sys_main.c
+src/bin/e_table.c
+src/bin/e_test.c
 src/bin/e_theme_about.c
-src/bin/e_widget_config_list.c
-src/bin/e_widget_fsel.c
-src/bin/e_winlist.c
+src/bin/e_theme.c
+src/bin/e_thumb.c
+src/bin/e_thumb_main.c
+src/bin/e_tlist.c
+src/bin/e_user.c
 src/bin/e_utils.c
-src/bin/e_int_config_modules.c
-src/bin/e_exec.c
-src/bin/e_entry.c
+src/bin/e_widget_aspect.c
+src/bin/e_widget_button.c
+src/bin/e_widget.c
+src/bin/e_widget_check.c
+src/bin/e_widget_color_well.c
+src/bin/e_widget_config_list.c
+src/bin/e_widget_csel.c
+src/bin/e_widget_cslider.c
+src/bin/e_widget_desk_preview.c
+src/bin/e_widget_entry.c
+src/bin/e_widget_font_preview.c
+src/bin/e_widget_framelist.c
+src/bin/e_widget_frametable.c
+src/bin/e_widget_fsel.c
+src/bin/e_widget_ilist.c
+src/bin/e_widget_image.c
+src/bin/e_widget_label.c
+src/bin/e_widget_list.c
+src/bin/e_widget_preview.c
+src/bin/e_widget_radio.c
+src/bin/e_widget_scrollframe.c
+src/bin/e_widget_slider.c
+src/bin/e_widget_spectrum.c
+src/bin/e_widget_table.c
+src/bin/e_widget_textblock.c
+src/bin/e_widget_tlist.c
+src/bin/e_win.c
+src/bin/e_winlist.c
+src/bin/e_xinerama.c
+src/bin/e_zone.c
 src/modules/battery/e_mod_config.c
 src/modules/battery/e_mod_main.c
 src/modules/clock/e_mod_main.c
+src/modules/conf_borders/e_int_config_borders.c
+src/modules/conf_borders/e_mod_main.c
+src/modules/conf_colors/e_int_config_color_classes.c
+src/modules/conf_colors/e_mod_main.c
+src/modules/conf_fonts/e_int_config_fonts.c
+src/modules/conf_fonts/e_mod_main.c
+src/modules/conf_icon_theme/e_int_config_icon_themes.c
+src/modules/conf_icon_theme/e_mod_main.c
+src/modules/conf_mouse_cursor/e_int_config_cursor.c
+src/modules/conf_mouse_cursor/e_mod_main.c
+src/modules/conf_startup/e_int_config_startup.c
+src/modules/conf_startup/e_mod_main.c
+src/modules/conf_theme/e_int_config_theme.c
+src/modules/conf_theme/e_int_config_theme_import.c
+src/modules/conf_theme/e_mod_main.c
+src/modules/conf_transitions/e_int_config_transitions.c
+src/modules/conf_transitions/e_mod_main.c
+src/modules/conf_wallpaper/e_int_config_wallpaper.c
+src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
+src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
+src/modules/conf_wallpaper/e_mod_main.c
 src/modules/cpufreq/e_mod_main.c
+src/modules/cpufreq/freqset.c
 src/modules/dropshadow/e_mod_config.c
 src/modules/dropshadow/e_mod_main.c
 src/modules/ibar/e_mod_config.c
 src/modules/ibar/e_mod_main.c
 src/modules/ibox/e_mod_config.c
 src/modules/ibox/e_mod_main.c
+src/modules/layout/e_mod_main.c
 src/modules/pager/e_mod_config.c
 src/modules/pager/e_mod_main.c
 src/modules/start/e_mod_main.c
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 671648b10..a97fb964f 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -119,12 +119,9 @@ e_slider.h \
 e_widget_slider.h \
 e_int_config_window_manipulation.h \
 e_int_config_window_display.h \
-e_int_config_icon_themes.h \
 e_int_config_menus.h \
 e_int_config_keybindings.h \
 e_int_config_mousebindings.h \
-e_int_config_cursor.h \
-e_int_config_startup.h \
 e_int_config_performance.h \
 e_int_config_winlist.h \
 e_int_config_display.h \
@@ -169,22 +166,20 @@ e_widget_color_well.h \
 e_color_dialog.h  \
 e_sys.h \
 e_obj_dialog.h \
-e_int_config_transitions.h \
 e_fwin.h \
 e_widget_aspect.h \
 e_filereg.h \
 e_widget_desk_preview.h \
-e_int_config_borders.h \
 e_int_config_desk.h \
 e_int_config_clientlist.h \
 e_fm_prop.h \
-e_int_config_mouse.h \
 e_mouse.h \
 e_order.h \
 e_exec.h \
 e_widget_font_preview.h \
 e_fm_custom.h \
-e_fm_shared.h
+e_fm_shared.h \
+e_int_config_mouse.h
  
 enlightenment_src = \
 e_user.c \
@@ -275,12 +270,9 @@ e_slider.c \
 e_widget_slider.c \
 e_int_config_window_manipulation.c \
 e_int_config_window_display.c \
-e_int_config_icon_themes.c \
 e_int_config_menus.c \
 e_int_config_keybindings.c \
 e_int_config_mousebindings.c \
-e_int_config_cursor.c \
-e_int_config_startup.c \
 e_int_config_performance.c \
 e_int_config_winlist.c \
 e_int_config_display.c \
@@ -327,22 +319,20 @@ e_widget_csel.c \
 e_widget_color_well.c \
 e_color_dialog.c \
 e_sys.c \
-e_int_config_transitions.c \
 e_obj_dialog.c \
 e_fwin.c \
 e_widget_aspect.c \
 e_widget_desk_preview.c \
 e_filereg.c \
-e_int_config_borders.c \
 e_int_config_desk.c \
 e_fm_prop.c \
 e_int_config_clientlist.c \
-e_int_config_mouse.c \
 e_mouse.c \
 e_order.c \
 e_exec.c \
 e_widget_font_preview.c \
 e_fm_custom.c \
+e_int_config_mouse.c \
 $(ENLIGHTENMENTHEADERS)
 
 enlightenment_SOURCES = \
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index a8f0c453b..47560fa10 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -758,6 +758,11 @@ e_config_init(void)
 	CFG_MODULE("conf_theme", 1);
 	CFG_MODULE("conf_colors", 1);
 	CFG_MODULE("conf_fonts", 1);
+	CFG_MODULE("conf_borders", 1);
+	CFG_MODULE("conf_icon_theme", 1);
+	CFG_MODULE("conf_mouse_cursor", 1);
+	CFG_MODULE("conf_transitions", 1);
+	CFG_MODULE("conf_startup", 1);
      }
 #if 0
      {
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index 1e9565840..3ddc19341 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -421,16 +421,16 @@ EAPI void
 e_configure_init(void)
 {
    /* FIXME: hardcoded - need to move these into modules - except modules config */
-   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
+//   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
 //   e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, "enlightenment/background", e_int_config_wallpaper);
 //   e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "enlightenment/themes", e_int_config_theme);
 //   e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "enlightenment/colors", e_int_config_color_classes);
 //   e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, "enlightenment/fonts", e_int_config_fonts);
-   e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "enlightenment/windows", e_int_config_borders);
-   e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "enlightenment/icon_theme", e_int_config_icon_themes);
-   e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "enlightenment/mouse", e_int_config_cursor);
-   e_configure_registry_item_add("appearance/transitions", 80, _("Transitions"), NULL, "enlightenment/transitions", e_int_config_transitions);
-   e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL, "enlightenment/startup", e_int_config_startup);
+//   e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "enlightenment/windows", e_int_config_borders);
+//   e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "enlightenment/icon_theme", e_int_config_icon_themes);
+//   e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "enlightenment/mouse", e_int_config_cursor);
+//   e_configure_registry_item_add("appearance/transitions", 80, _("Transitions"), NULL, "enlightenment/transitions", e_int_config_transitions);
+//   e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL, "enlightenment/startup", e_int_config_startup);
    
    e_configure_registry_category_add("applications", 20, _("Applications"), NULL, "enlightenment/applications");
    e_configure_registry_item_add("applications/new_application", 10, _("New Application"), NULL, "enlightenment/add_application", e_int_config_apps_add);
@@ -485,7 +485,7 @@ e_configure_init(void)
     * set properly
     */
    e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
-   e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "enlightenment/windows", e_int_config_borders_border);
+//   e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "enlightenment/windows", e_int_config_borders_border);
 //   e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk);
    e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, "enlightenment/windows", e_int_config_desk);
    e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "enlightenment/windows", e_int_config_apps_ibar_other);
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 3625e7d13..0ec17f6ba 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -88,12 +88,9 @@
 #include "e_widget_slider.h"
 #include "e_int_config_window_manipulation.h"
 #include "e_int_config_window_display.h"
-#include "e_int_config_icon_themes.h"
 #include "e_int_config_menus.h"
 #include "e_int_config_keybindings.h"
 #include "e_int_config_mousebindings.h"
-#include "e_int_config_cursor.h"
-#include "e_int_config_startup.h"
 #include "e_int_config_performance.h"
 #include "e_int_config_winlist.h"
 #include "e_int_config_display.h"
@@ -143,13 +140,11 @@
 #include "e_widget_csel.h"
 #include "e_color_dialog.h"
 #include "e_sys.h"
-#include "e_int_config_transitions.h"
 #include "e_obj_dialog.h"
 #include "e_fwin.h"
 #include "e_filereg.h"
 #include "e_widget_aspect.h"
 #include "e_widget_desk_preview.h"
-#include "e_int_config_borders.h"
 #include "e_int_config_desk.h"
 #include "e_int_config_clientlist.h"
 #include "e_fm_prop.h"
diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c
index 796e26389..1eaaf2d27 100644
--- a/src/bin/e_int_border_menu.c
+++ b/src/bin/e_int_border_menu.c
@@ -164,13 +164,16 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
 			     "e/widgets/border/default/remember");
    if (!bd->lock_border)
      {
-	mi = e_menu_item_new(m);
-	e_menu_item_label_set(mi, _("Borders"));
-	e_menu_item_callback_set(mi, _e_border_menu_cb_border, bd);
-	e_menu_item_icon_edje_set(mi,
-				  e_theme_edje_file_get("base/theme/borders",
+	if (e_configure_registry_exists("internal/borders_border"))
+	  {
+	     mi = e_menu_item_new(m);
+	     e_menu_item_label_set(mi, _("Borders"));
+	     e_menu_item_callback_set(mi, _e_border_menu_cb_border, bd);
+	     e_menu_item_icon_edje_set(mi,
+				       e_theme_edje_file_get("base/theme/borders",
 							"e/widgets/border/default/borderless"),
-				  "e/widgets/border/default/borderless");
+				       "e/widgets/border/default/borderless");
+	  }
      }
 
    if (!bd->sticky)
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index e5710a2a6..b067506cb 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -13,4 +13,9 @@ layout \
 conf_wallpaper \
 conf_theme \
 conf_colors \
-conf_fonts
+conf_fonts \
+conf_borders \
+conf_icon_theme \
+conf_mouse_cursor \
+conf_transitions \
+conf_startup
diff --git a/src/modules/conf_borders/.cvsignore b/src/modules/conf_borders/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_borders/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_borders/Makefile.am b/src/modules/conf_borders/Makefile.am
new file mode 100644
index 000000000..e89935eeb
--- /dev/null
+++ b/src/modules/conf_borders/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_borders
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_borders.c \
+                         e_int_config_borders.h
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_borders/e-module-conf_borders.edj b/src/modules/conf_borders/e-module-conf_borders.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_borders/e-module-conf_borders.edj differ
diff --git a/src/bin/e_int_config_borders.c b/src/modules/conf_borders/e_int_config_borders.c
similarity index 100%
rename from src/bin/e_int_config_borders.c
rename to src/modules/conf_borders/e_int_config_borders.c
diff --git a/src/bin/e_int_config_borders.h b/src/modules/conf_borders/e_int_config_borders.h
similarity index 100%
rename from src/bin/e_int_config_borders.h
rename to src/modules/conf_borders/e_int_config_borders.h
diff --git a/src/modules/conf_borders/e_mod_main.c b/src/modules/conf_borders/e_mod_main.c
new file mode 100644
index 000000000..007f2c38a
--- /dev/null
+++ b/src/modules/conf_borders/e_mod_main.c
@@ -0,0 +1,66 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Borders"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
+   e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "enlightenment/windows", e_int_config_borders);
+   e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
+   e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "enlightenment/windows", e_int_config_borders_border);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   e_configure_registry_item_del("internal/borders_border");
+   e_configure_registry_category_del("internal");
+   e_configure_registry_item_del("appearance/borders");
+   e_configure_registry_category_del("appearance");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Borders"),
+			_("Configuration dialog for borders."));
+   return 1;
+}
diff --git a/src/modules/conf_borders/e_mod_main.h b/src/modules/conf_borders/e_mod_main.h
new file mode 100644
index 000000000..ae030ce64
--- /dev/null
+++ b/src/modules/conf_borders/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_borders.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_borders.h"
+
+
+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_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_borders/module.desktop.in b/src/modules/conf_borders/module.desktop.in
new file mode 100644
index 000000000..292fbfe2a
--- /dev/null
+++ b/src/modules/conf_borders/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Borders
+Icon=e-module-conf_borders
diff --git a/src/modules/conf_icon_theme/.cvsignore b/src/modules/conf_icon_theme/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_icon_theme/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_icon_theme/Makefile.am b/src/modules/conf_icon_theme/Makefile.am
new file mode 100644
index 000000000..6545f0e0d
--- /dev/null
+++ b/src/modules/conf_icon_theme/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_icon_theme
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_icon_themes.c \
+                         e_int_config_icon_themes.h
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_icon_theme/e-module-conf_icon_theme.edj b/src/modules/conf_icon_theme/e-module-conf_icon_theme.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_icon_theme/e-module-conf_icon_theme.edj differ
diff --git a/src/bin/e_int_config_icon_themes.c b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
similarity index 100%
rename from src/bin/e_int_config_icon_themes.c
rename to src/modules/conf_icon_theme/e_int_config_icon_themes.c
diff --git a/src/bin/e_int_config_icon_themes.h b/src/modules/conf_icon_theme/e_int_config_icon_themes.h
similarity index 100%
rename from src/bin/e_int_config_icon_themes.h
rename to src/modules/conf_icon_theme/e_int_config_icon_themes.h
diff --git a/src/modules/conf_icon_theme/e_mod_main.c b/src/modules/conf_icon_theme/e_mod_main.c
new file mode 100644
index 000000000..7ec5dcef7
--- /dev/null
+++ b/src/modules/conf_icon_theme/e_mod_main.c
@@ -0,0 +1,62 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Icon Theme"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
+   e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "enlightenment/icon_theme", e_int_config_icon_themes);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   e_configure_registry_item_del("appearance/icon_theme");
+   e_configure_registry_category_del("appearance");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Icon Theme"),
+			_("Configuration dialog for icon theme."));
+   return 1;
+}
diff --git a/src/modules/conf_icon_theme/e_mod_main.h b/src/modules/conf_icon_theme/e_mod_main.h
new file mode 100644
index 000000000..5848f76b3
--- /dev/null
+++ b/src/modules/conf_icon_theme/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_icon_themes.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_icon_themes.h"
+
+
+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_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_icon_theme/module.desktop.in b/src/modules/conf_icon_theme/module.desktop.in
new file mode 100644
index 000000000..b538e60de
--- /dev/null
+++ b/src/modules/conf_icon_theme/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Icon Theme
+Icon=e-module-conf_icon_theme
diff --git a/src/modules/conf_mouse_cursor/.cvsignore b/src/modules/conf_mouse_cursor/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_mouse_cursor/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_mouse_cursor/Makefile.am b/src/modules/conf_mouse_cursor/Makefile.am
new file mode 100644
index 000000000..cea578b25
--- /dev/null
+++ b/src/modules/conf_mouse_cursor/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_mouse_cursor
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_cursor.c \
+                         e_int_config_cursor.h
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_mouse_cursor/e-module-conf_mouse_cursor.edj b/src/modules/conf_mouse_cursor/e-module-conf_mouse_cursor.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_mouse_cursor/e-module-conf_mouse_cursor.edj differ
diff --git a/src/bin/e_int_config_cursor.c b/src/modules/conf_mouse_cursor/e_int_config_cursor.c
similarity index 100%
rename from src/bin/e_int_config_cursor.c
rename to src/modules/conf_mouse_cursor/e_int_config_cursor.c
diff --git a/src/bin/e_int_config_cursor.h b/src/modules/conf_mouse_cursor/e_int_config_cursor.h
similarity index 100%
rename from src/bin/e_int_config_cursor.h
rename to src/modules/conf_mouse_cursor/e_int_config_cursor.h
diff --git a/src/modules/conf_mouse_cursor/e_mod_main.c b/src/modules/conf_mouse_cursor/e_mod_main.c
new file mode 100644
index 000000000..cc22a5826
--- /dev/null
+++ b/src/modules/conf_mouse_cursor/e_mod_main.c
@@ -0,0 +1,62 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Mouse Cursor"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
+//   e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "enlightenment/mouse", e_int_config_cursor);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   e_configure_registry_item_del("appearance/mouse_cursor");
+   e_configure_registry_category_del("appearance");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Mouse Cursor"),
+			_("Configuration dialog for mouse cursor."));
+   return 1;
+}
diff --git a/src/modules/conf_mouse_cursor/e_mod_main.h b/src/modules/conf_mouse_cursor/e_mod_main.h
new file mode 100644
index 000000000..632e3acc4
--- /dev/null
+++ b/src/modules/conf_mouse_cursor/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_cursor.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_cursor.h"
+
+
+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_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_mouse_cursor/module.desktop.in b/src/modules/conf_mouse_cursor/module.desktop.in
new file mode 100644
index 000000000..44eb9ff53
--- /dev/null
+++ b/src/modules/conf_mouse_cursor/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Mouse Cursor
+Icon=e-module-conf_mouse_cursor
diff --git a/src/modules/conf_startup/.cvsignore b/src/modules/conf_startup/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_startup/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_startup/Makefile.am b/src/modules/conf_startup/Makefile.am
new file mode 100644
index 000000000..48262eb92
--- /dev/null
+++ b/src/modules/conf_startup/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_startup
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_startup.c \
+                         e_int_config_startup.h
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_startup/e-module-conf_startup.edj b/src/modules/conf_startup/e-module-conf_startup.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_startup/e-module-conf_startup.edj differ
diff --git a/src/bin/e_int_config_startup.c b/src/modules/conf_startup/e_int_config_startup.c
similarity index 100%
rename from src/bin/e_int_config_startup.c
rename to src/modules/conf_startup/e_int_config_startup.c
diff --git a/src/bin/e_int_config_startup.h b/src/modules/conf_startup/e_int_config_startup.h
similarity index 100%
rename from src/bin/e_int_config_startup.h
rename to src/modules/conf_startup/e_int_config_startup.h
diff --git a/src/modules/conf_startup/e_mod_main.c b/src/modules/conf_startup/e_mod_main.c
new file mode 100644
index 000000000..7983341e2
--- /dev/null
+++ b/src/modules/conf_startup/e_mod_main.c
@@ -0,0 +1,62 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Startup"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
+   e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL, "enlightenment/startup", e_int_config_startup);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   e_configure_registry_item_del("appearance/startup");
+   e_configure_registry_category_del("appearance");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Startup"),
+			_("Configuration dialog for startup."));
+   return 1;
+}
diff --git a/src/modules/conf_startup/e_mod_main.h b/src/modules/conf_startup/e_mod_main.h
new file mode 100644
index 000000000..a7d3bf2a8
--- /dev/null
+++ b/src/modules/conf_startup/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_startup.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_startup.h"
+
+
+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_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_startup/module.desktop.in b/src/modules/conf_startup/module.desktop.in
new file mode 100644
index 000000000..cb47f55ef
--- /dev/null
+++ b/src/modules/conf_startup/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Startup
+Icon=e-module-conf_startup
diff --git a/src/modules/conf_transitions/.cvsignore b/src/modules/conf_transitions/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_transitions/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_transitions/Makefile.am b/src/modules/conf_transitions/Makefile.am
new file mode 100644
index 000000000..00b59b6d8
--- /dev/null
+++ b/src/modules/conf_transitions/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_transitions
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_transitions.c \
+                         e_int_config_transitions.h
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_transitions/e-module-conf_transitions.edj b/src/modules/conf_transitions/e-module-conf_transitions.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_transitions/e-module-conf_transitions.edj differ
diff --git a/src/bin/e_int_config_transitions.c b/src/modules/conf_transitions/e_int_config_transitions.c
similarity index 100%
rename from src/bin/e_int_config_transitions.c
rename to src/modules/conf_transitions/e_int_config_transitions.c
diff --git a/src/bin/e_int_config_transitions.h b/src/modules/conf_transitions/e_int_config_transitions.h
similarity index 100%
rename from src/bin/e_int_config_transitions.h
rename to src/modules/conf_transitions/e_int_config_transitions.h
diff --git a/src/modules/conf_transitions/e_mod_main.c b/src/modules/conf_transitions/e_mod_main.c
new file mode 100644
index 000000000..a98ebeb05
--- /dev/null
+++ b/src/modules/conf_transitions/e_mod_main.c
@@ -0,0 +1,62 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Transitions"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
+   e_configure_registry_item_add("appearance/transitions", 80, _("Transitions"), NULL, "enlightenment/transitions", e_int_config_transitions);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   e_configure_registry_item_del("appearance/transitions");
+   e_configure_registry_category_del("appearance");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Transitions"),
+			_("Configuration dialog for transitions."));
+   return 1;
+}
diff --git a/src/modules/conf_transitions/e_mod_main.h b/src/modules/conf_transitions/e_mod_main.h
new file mode 100644
index 000000000..c636be1ad
--- /dev/null
+++ b/src/modules/conf_transitions/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_transitions.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_transitions.h"
+
+
+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_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_transitions/module.desktop.in b/src/modules/conf_transitions/module.desktop.in
new file mode 100644
index 000000000..efc60205a
--- /dev/null
+++ b/src/modules/conf_transitions/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Transitions
+Icon=e-module-conf_transitions