diff --git a/config/illume/e.src b/config/illume/e.src
index 06c476d8c..a6c57571b 100644
--- a/config/illume/e.src
+++ b/config/illume/e.src
@@ -55,14 +55,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desk";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_dialogs";
@@ -183,14 +175,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desks";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_scale";
diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index 0de88ef88..5c01c7430 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -105,30 +105,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desk";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desklock";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desks";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_dialogs";
@@ -145,14 +121,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_dpms";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_fonts";
@@ -265,14 +233,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_screensaver";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_shelves";
diff --git a/config/netbook/e.src b/config/netbook/e.src
index 51e2e7cc2..f925cca70 100644
--- a/config/netbook/e.src
+++ b/config/netbook/e.src
@@ -137,30 +137,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desk";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desklock";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desks";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_dialogs";
@@ -177,14 +153,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_dpms";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_fonts";
@@ -297,14 +265,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_screensaver";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_shelves";
diff --git a/config/scaleable/e.src b/config/scaleable/e.src
index 9441ff7c7..6e41639ed 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -152,14 +152,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_screensaver";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_profiles";
@@ -272,14 +264,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_dpms";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_display";
@@ -296,30 +280,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desks";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desklock";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desk";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_colors";
diff --git a/config/standard/e.src b/config/standard/e.src
index d9f5c2978..552262768 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -152,14 +152,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_screensaver";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_profiles";
@@ -272,14 +264,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_dpms";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_display";
@@ -296,30 +280,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desks";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desklock";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_desk";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_colors";
diff --git a/configure.ac b/configure.ac
index 690581f7d..286f0f143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -642,12 +642,7 @@ AC_E_OPTIONAL_MODULE([conf_profiles], true)
 AC_E_OPTIONAL_MODULE([msgbus], true)
 AC_E_OPTIONAL_MODULE([conf_engine], true)
 AC_E_OPTIONAL_MODULE([conf_applications], true)
-AC_E_OPTIONAL_MODULE([conf_desks], true)
-AC_E_OPTIONAL_MODULE([conf_desk], true)
 AC_E_OPTIONAL_MODULE([conf_display], true)
-AC_E_OPTIONAL_MODULE([conf_desklock], true)
-AC_E_OPTIONAL_MODULE([conf_screensaver], true)
-AC_E_OPTIONAL_MODULE([conf_dpms], true)
 AC_E_OPTIONAL_MODULE([conf_shelves], true)
 AC_E_OPTIONAL_MODULE([conf_keybindings], true)
 AC_E_OPTIONAL_MODULE([conf_mousebindings], true)
@@ -782,18 +777,8 @@ src/modules/conf_engine/Makefile
 src/modules/conf_engine/module.desktop
 src/modules/conf_applications/Makefile
 src/modules/conf_applications/module.desktop
-src/modules/conf_desks/Makefile
-src/modules/conf_desks/module.desktop
-src/modules/conf_desk/Makefile
-src/modules/conf_desk/module.desktop
 src/modules/conf_display/Makefile
 src/modules/conf_display/module.desktop
-src/modules/conf_desklock/Makefile
-src/modules/conf_desklock/module.desktop
-src/modules/conf_screensaver/Makefile
-src/modules/conf_screensaver/module.desktop
-src/modules/conf_dpms/Makefile
-src/modules/conf_dpms/module.desktop
 src/modules/conf_shelves/Makefile
 src/modules/conf_shelves/module.desktop
 src/modules/conf_keybindings/Makefile
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 093de5454..4c1b995e2 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -122,30 +122,10 @@ if USE_MODULE_CONF_APPLICATIONS
 SUBDIRS += conf_applications
 endif
 
-if USE_MODULE_CONF_DESKS
-SUBDIRS += conf_desks
-endif
-
-if USE_MODULE_CONF_DESK
-SUBDIRS += conf_desk
-endif
-
 if USE_MODULE_CONF_DISPLAY
 SUBDIRS += conf_display
 endif
 
-if USE_MODULE_CONF_DESKLOCK
-SUBDIRS += conf_desklock
-endif
-
-if USE_MODULE_CONF_SCREENSAVER
-SUBDIRS += conf_screensaver
-endif
-
-if USE_MODULE_CONF_DPMS
-SUBDIRS += conf_dpms
-endif
-
 if USE_MODULE_CONF_SHELVES
 SUBDIRS += conf_shelves
 endif
diff --git a/src/modules/conf_desk/.cvsignore b/src/modules/conf_desk/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_desk/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_desk/Makefile.am b/src/modules/conf_desk/Makefile.am
deleted file mode 100644
index 7a55e7e9d..000000000
--- a/src/modules/conf_desk/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_desk
-
-# 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_builddir)/src/bin \
-                         -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_desk.c \
-                         e_int_config_desk.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_desk/e-module-conf_desk.edj b/src/modules/conf_desk/e-module-conf_desk.edj
deleted file mode 100644
index 75aa3dc0b..000000000
Binary files a/src/modules/conf_desk/e-module-conf_desk.edj and /dev/null differ
diff --git a/src/modules/conf_desk/e_mod_main.c b/src/modules/conf_desk/e_mod_main.c
deleted file mode 100644
index 976f54e56..000000000
--- a/src/modules/conf_desk/e_mod_main.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#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,
-     "Settings - Desk"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("internal", -1, _("Internal"), NULL, 
-                                     "enlightenment/internal");
-   e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, 
-                                 "preferences-system-windows", 
-                                 e_int_config_desk);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "internal/desk"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("internal/desk");
-   e_configure_registry_category_del("internal");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_desk/e_mod_main.h b/src/modules/conf_desk/e_mod_main.h
deleted file mode 100644
index 86c15e8b4..000000000
--- a/src/modules/conf_desk/e_mod_main.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_desk.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_desk.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);
-
-#endif
diff --git a/src/modules/conf_desk/module.desktop.in b/src/modules/conf_desk/module.desktop.in
deleted file mode 100644
index 6cb64b2a3..000000000
--- a/src/modules/conf_desk/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Desk
-Name[ru]=Столы
-Name[cs]=Plocha
-Name[de]=
-Name[eo]=Labortablo
-Name[es]=Escritorio
-Name[fr]=Bureau
-Name[hu]=Munkaasztal
-Name[it]=Desktop
-Name[ja]=
-Name[pt]=Ambiente de trabalho
-Name[pt_BR]=
-Name[tr]=Masaüstü
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_desk
-Comment=Used to configure the desktop name and wallpaper for individual virtual desktops.
-Comment[ru]=Используется для настройки имени и фона для индивидуальных виртуальных рабочих столов.
-Comment[cs]=Použit pro nastavení jména plochy a pozadí pro každou virtuální plochu.
-Comment[de]=
-Comment[eo]=Agordi la labortablan nomon kaj etoson por ĉiu virtuala labortablo.
-Comment[es]=Usado para configurar el nombre del escritorio y los fondos de pantalla para cada escritorio virtual individualmente.
-Comment[fr]=Permet de définir le nom et le fond d'écran de chaque bureau virtuel.
-Comment[hu]=Itt a munkaasztalod beállításait végezheted el. Beállíthatod a háttérképet és kezelheted a virtuális munkaasztalokat.
-Comment[it]=Usato per configurare il nome e lo sfondo per ogni singolo desktop virtuale.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar o nome e a imagem de cada ambiente de trabalho
-Comment[pt_BR]=
-Comment[tr]=Masaüstü adı ve her sanal masaüstüne ait duvarkağıtlarını yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_desklock/.cvsignore b/src/modules/conf_desklock/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_desklock/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_desklock/Makefile.am b/src/modules/conf_desklock/Makefile.am
deleted file mode 100644
index 0c20dbcdd..000000000
--- a/src/modules/conf_desklock/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_desklock
-
-# 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_builddir)/src/bin \
-                         -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_desklock.c \
-			 e_int_config_desklock.h \
-                         e_int_config_desklock_fsel.c \
-                         e_int_config_desklock_fsel.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_desklock/e-module-conf_desklock.edj b/src/modules/conf_desklock/e-module-conf_desklock.edj
deleted file mode 100644
index a9854df75..000000000
Binary files a/src/modules/conf_desklock/e-module-conf_desklock.edj and /dev/null differ
diff --git a/src/modules/conf_desklock/e_mod_main.c b/src/modules/conf_desklock/e_mod_main.c
deleted file mode 100644
index f20a020eb..000000000
--- a/src/modules/conf_desklock/e_mod_main.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#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,
-     "Settings - Screen Lock"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, 
-                                     "preferences-desktop-display");
-   e_configure_registry_item_add("screen/screen_lock", 30, _("Screen Lock"), 
-                                 NULL, "preferences-desklock", 
-                                 e_int_config_desklock);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "screen/screen_lock"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("screen/screen_lock");
-   e_configure_registry_category_del("screen");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_desklock/e_mod_main.h b/src/modules/conf_desklock/e_mod_main.h
deleted file mode 100644
index d2625c9cc..000000000
--- a/src/modules/conf_desklock/e_mod_main.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_desklock.h"
-#include "e_int_config_desklock_fsel.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_desklock.h"
-#include "e_int_config_desklock_fsel.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);
-
-#endif
diff --git a/src/modules/conf_desklock/module.desktop.in b/src/modules/conf_desklock/module.desktop.in
deleted file mode 100644
index 86c05eda9..000000000
--- a/src/modules/conf_desklock/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Screen Lock
-Name[ru]=Блокировка экрана
-Name[cs]=Uzamčení obrazovky
-Name[de]=
-Name[eo]=Ekranŝlosilo
-Name[es]=Bloqueo de pantalla
-Name[fr]=Verrouillage de l'écran
-Name[hu]=Képernyő zárolása
-Name[it]=Bloccaschermo
-Name[ja]=
-Name[pt]=Bloqueio do ecrã
-Name[pt_BR]=
-Name[tr]=Ekran Kilidi
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_desklock
-Comment=Configures the integrated desk lock.
-Comment[ru]=Настройка встроенной функции блокировки экрана.
-Comment[cs]=Volby pro integrovanou funkci zamčení obrazovky.
-Comment[de]=
-Comment[eo]=Agordi la integritan labortablan ŝlosilon.
-Comment[es]=Configura el bloqueador de escritorio integrado.
-Comment[fr]=Configure le verrouillage de l'écran intégré.
-Comment[hu]=A beépített asztal zároló beállításai.
-Comment[it]=Configura il bloccaschermo integrato.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar o bloqueio do ecrã
-Comment[pt_BR]=
-Comment[tr]=Dahili masaüstü kilidini yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_desks/.cvsignore b/src/modules/conf_desks/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_desks/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_desks/Makefile.am b/src/modules/conf_desks/Makefile.am
deleted file mode 100644
index e1797ea8a..000000000
--- a/src/modules/conf_desks/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_desks
-
-# 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_builddir)/src/bin \
-                         -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_desks.c \
-                         e_int_config_desks.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_desks/e-module-conf_desks.edj b/src/modules/conf_desks/e-module-conf_desks.edj
deleted file mode 100644
index 1465fcfb7..000000000
Binary files a/src/modules/conf_desks/e-module-conf_desks.edj and /dev/null differ
diff --git a/src/modules/conf_desks/e_mod_main.c b/src/modules/conf_desks/e_mod_main.c
deleted file mode 100644
index 2902d3b11..000000000
--- a/src/modules/conf_desks/e_mod_main.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#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,
-     "Settings - Virtual Desktops"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, 
-                                     "preferences-desktop-display");
-   e_configure_registry_item_add("screen/virtual_desktops", 10, 
-                                 _("Virtual Desktops"), NULL, 
-                                 "preferences-desktop", e_int_config_desks);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "screen/virtual_desktops"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("screen/virtual_desktops");
-   e_configure_registry_category_del("screen");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_desks/e_mod_main.h b/src/modules/conf_desks/e_mod_main.h
deleted file mode 100644
index d73f63479..000000000
--- a/src/modules/conf_desks/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_desks.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_desks.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);
-
-#endif
diff --git a/src/modules/conf_desks/module.desktop.in b/src/modules/conf_desks/module.desktop.in
deleted file mode 100644
index 7feaf5d29..000000000
--- a/src/modules/conf_desks/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Virtual Desktops
-Name[ru]=Виртуальные столы
-Name[cs]=Virtuální plochy
-Name[de]=
-Name[eo]=Virtualaj labortabloj
-Name[es]=Escritorios virtuales
-Name[fr]=Bureaux virtuels
-Name[hu]=Virtuális munkaasztalok
-Name[it]=Desktop virtuali
-Name[ja]=
-Name[pt]=Ambientes virtuais
-Name[pt_BR]=
-Name[tr]=Sanal Masaüstleri
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_desks
-Comment=Configure the virtual desktop properties.
-Comment[ru]=Конфигурация и настройки виртуальных рабочих столов.
-Comment[cs]=Volby pro virtuální plochy.
-Comment[de]=
-Comment[eo]=Agordi la ecojn de la virtualaj labortablaj.
-Comment[es]=Configura las propiedades de los escritorios virtuales.
-Comment[fr]=Configure les propriétés des bureaux virtuels.
-Comment[hu]=Virtuális munkaasztalok beállítása.
-Comment[it]=Configura le proprietà dei desktop virtuali.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar as propriedades dos ambientes virtuais
-Comment[pt_BR]=
-Comment[tr]=Sanal masaüstü özelliklerini yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_display/Makefile.am b/src/modules/conf_display/Makefile.am
index 8b6b47fc5..93cd4e331 100644
--- a/src/modules/conf_display/Makefile.am
+++ b/src/modules/conf_display/Makefile.am
@@ -4,7 +4,7 @@ MODULE = conf_display
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-e-module-$(MODULE).edj module.desktop
+module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
@@ -20,9 +20,21 @@ 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_display.c \
-                         e_int_config_display.h
-
+                         e_int_config_display.c \
+                         e_int_config_display.h \
+                         e_int_config_screensaver.c \
+                         e_int_config_screensaver.h \
+                         e_int_config_dpms.c \
+                         e_int_config_dpms.h \
+                         e_int_config_desklock.c \
+                         e_int_config_desklock.h \
+                         e_int_config_desklock_fsel.c \
+                         e_int_config_desklock_fsel.h \
+                         e_int_config_desks.c \
+                         e_int_config_desks.h \
+                         e_int_config_desk.c \
+                         e_int_config_desk.h
+                                                  
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
diff --git a/src/modules/conf_display/e-module-conf_display.edj b/src/modules/conf_display/e-module-conf_display.edj
deleted file mode 100644
index f9f211792..000000000
Binary files a/src/modules/conf_display/e-module-conf_display.edj and /dev/null differ
diff --git a/src/modules/conf_desk/e_int_config_desk.c b/src/modules/conf_display/e_int_config_desk.c
similarity index 100%
rename from src/modules/conf_desk/e_int_config_desk.c
rename to src/modules/conf_display/e_int_config_desk.c
diff --git a/src/modules/conf_desk/e_int_config_desk.h b/src/modules/conf_display/e_int_config_desk.h
similarity index 100%
rename from src/modules/conf_desk/e_int_config_desk.h
rename to src/modules/conf_display/e_int_config_desk.h
diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_display/e_int_config_desklock.c
similarity index 100%
rename from src/modules/conf_desklock/e_int_config_desklock.c
rename to src/modules/conf_display/e_int_config_desklock.c
diff --git a/src/modules/conf_desklock/e_int_config_desklock.h b/src/modules/conf_display/e_int_config_desklock.h
similarity index 100%
rename from src/modules/conf_desklock/e_int_config_desklock.h
rename to src/modules/conf_display/e_int_config_desklock.h
diff --git a/src/modules/conf_desklock/e_int_config_desklock_fsel.c b/src/modules/conf_display/e_int_config_desklock_fsel.c
similarity index 100%
rename from src/modules/conf_desklock/e_int_config_desklock_fsel.c
rename to src/modules/conf_display/e_int_config_desklock_fsel.c
diff --git a/src/modules/conf_desklock/e_int_config_desklock_fsel.h b/src/modules/conf_display/e_int_config_desklock_fsel.h
similarity index 100%
rename from src/modules/conf_desklock/e_int_config_desklock_fsel.h
rename to src/modules/conf_display/e_int_config_desklock_fsel.h
diff --git a/src/modules/conf_desks/e_int_config_desks.c b/src/modules/conf_display/e_int_config_desks.c
similarity index 100%
rename from src/modules/conf_desks/e_int_config_desks.c
rename to src/modules/conf_display/e_int_config_desks.c
diff --git a/src/modules/conf_desks/e_int_config_desks.h b/src/modules/conf_display/e_int_config_desks.h
similarity index 100%
rename from src/modules/conf_desks/e_int_config_desks.h
rename to src/modules/conf_display/e_int_config_desks.h
diff --git a/src/modules/conf_dpms/e_int_config_dpms.c b/src/modules/conf_display/e_int_config_dpms.c
similarity index 100%
rename from src/modules/conf_dpms/e_int_config_dpms.c
rename to src/modules/conf_display/e_int_config_dpms.c
diff --git a/src/modules/conf_dpms/e_int_config_dpms.h b/src/modules/conf_display/e_int_config_dpms.h
similarity index 100%
rename from src/modules/conf_dpms/e_int_config_dpms.h
rename to src/modules/conf_display/e_int_config_dpms.h
diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.c b/src/modules/conf_display/e_int_config_screensaver.c
similarity index 100%
rename from src/modules/conf_screensaver/e_int_config_screensaver.c
rename to src/modules/conf_display/e_int_config_screensaver.c
diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.h b/src/modules/conf_display/e_int_config_screensaver.h
similarity index 100%
rename from src/modules/conf_screensaver/e_int_config_screensaver.h
rename to src/modules/conf_display/e_int_config_screensaver.h
diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c
index 0aadcfbf2..914855e69 100644
--- a/src/modules/conf_display/e_mod_main.c
+++ b/src/modules/conf_display/e_mod_main.c
@@ -8,7 +8,7 @@ static E_Module *conf_module = NULL;
 EAPI E_Module_Api e_modapi =
 {
    E_MODULE_API_VERSION,
-     "Settings - Screen Resolution"
+     "Settings - Screen"
 };
 
 EAPI void *
@@ -16,10 +16,35 @@ e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("screen", 30, _("Screen"), NULL, 
                                      "preferences-desktop-display");
+   
+   e_configure_registry_item_add("screen/virtual_desktops", 10,
+                                 _("Virtual Desktops"), NULL,
+                                 "preferences-desktop", e_int_config_desks);
    e_configure_registry_item_add("screen/screen_resolution", 20, 
                                  _("Screen Resolution"), NULL, 
                                  "preferences-system-screen-resolution", 
                                  e_int_config_display);
+   e_configure_registry_item_add("screen/screen_lock", 30,
+                                 _("Screen Lock"), NULL,
+                                 "preferences-desklock",
+                                 e_int_config_desklock);
+   e_configure_registry_item_add("screen/screen_saver", 40, 
+                                 _("Screen Saver"), NULL, 
+                                 "preferences-desktop-screensaver", 
+                                 e_int_config_screensaver);
+   e_configure_registry_item_add("screen/power_management", 50, 
+                                 _("Power Management"), NULL, 
+                                 "preferences-system-power-management",
+                                 e_int_config_dpms);
+   
+   e_configure_registry_category_add("internal", -1, _("Internal"), NULL,
+                                     "enlightenment/internal");
+   
+   e_configure_registry_item_add("internal/desk", -1,
+                                 _("Desk"), NULL,
+                                 "preferences-system-windows",
+                                 e_int_config_desk);
+   
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -30,9 +55,30 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
 
+   while ((cfd = e_config_dialog_get("E", "internal/desk")))
+      e_object_del(E_OBJECT(cfd));
+   
+   e_configure_registry_item_del("internal/desk");
+   
+   e_configure_registry_category_del("internal");
+   
+   while ((cfd = e_config_dialog_get("E", "screen/power_management")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "screen/screen_saver")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "screen/screen_lock")))
+      e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "screen/screen_resolution"))) 
-     e_object_del(E_OBJECT(cfd));
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "screen/virtual_desktops")))
+      e_object_del(E_OBJECT(cfd));
+
+   e_configure_registry_item_del("screen/power_management");
+   e_configure_registry_item_del("screen/screen_saver");
+   e_configure_registry_item_del("screen/screen_lock");
    e_configure_registry_item_del("screen/screen_resolution");
+   e_configure_registry_item_del("screen/virtual_desktops");
+   
    e_configure_registry_category_del("screen");
    conf_module = NULL;
    return 1;
diff --git a/src/modules/conf_display/e_mod_main.h b/src/modules/conf_display/e_mod_main.h
index 90487c1af..4c429178b 100644
--- a/src/modules/conf_display/e_mod_main.h
+++ b/src/modules/conf_display/e_mod_main.h
@@ -3,9 +3,21 @@
 
 #define E_TYPEDEFS 1
 #include "e_int_config_display.h"
+#include "e_int_config_screensaver.h"
+#include "e_int_config_dpms.h"
+#include "e_int_config_desklock.h"
+#include "e_int_config_desklock_fsel.h"
+#include "e_int_config_desks.h"
+#include "e_int_config_desk.h"
 
 #undef E_TYPEDEFS
 #include "e_int_config_display.h"
+#include "e_int_config_screensaver.h"
+#include "e_int_config_dpms.h"
+#include "e_int_config_desklock.h"
+#include "e_int_config_desklock_fsel.h"
+#include "e_int_config_desks.h"
+#include "e_int_config_desk.h"
 
 EAPI extern E_Module_Api e_modapi;
 
diff --git a/src/modules/conf_display/module.desktop.in b/src/modules/conf_display/module.desktop.in
index 4d91e3b38..c311ec085 100644
--- a/src/modules/conf_display/module.desktop.in
+++ b/src/modules/conf_display/module.desktop.in
@@ -1,34 +1,34 @@
 [Desktop Entry]
 Type=Link
-Name=Screen Resolution
+Name=Screen
 Name[ru]=Резолюция экрана
-Name[cs]=Rozlišení obrazovky
+Name[cs]=
 Name[de]=
-Name[eo]=Ekrandistingivo
-Name[es]=Resolución de pantalla
-Name[fr]=Résolution de l'écran
-Name[hu]=Képernyő felbontása
-Name[it]=Risoluzione schermo
+Name[eo]=
+Name[es]=
+Name[fr]=
+Name[hu]=
+Name[it]=
 Name[ja]=
-Name[pt]=Resolução do ecrã
+Name[pt]=
 Name[pt_BR]=
-Name[tr]=Ekran Çözünürlüğü
+Name[tr]=
 Name[zh_CN]=
 Name[zh_TW]=
-Icon=e-module-conf_display
-Comment=Used to configure your screen's resolution.
+Icon=preferences-desktop-screensaver
+Comment=Used to configure your screen.
 Comment[ru]=Используется для настройки резолюции Вашего экрана.
-Comment[cs]=Použit k nastavení rozlišení obrazovky.
+Comment[cs]=
 Comment[de]=
-Comment[eo]=Agordi sian ekrandistingivon.
-Comment[es]=Usado para configurar su resolución de pantalla.
-Comment[fr]=Permet de configurer la résolution de l'écran.
-Comment[hu]=Segítségével beállíthatod a képernyőd felbontását.
-Comment[it]=Usato per configurare la risoluzione del vostro schermo.
+Comment[eo]=
+Comment[es]=
+Comment[fr]=
+Comment[hu]=
+Comment[it]=
 Comment[ja]=
-Comment[pt]=Permite-lhe configurar a resolução do ecrã
+Comment[pt]=
 Comment[pt_BR]=
-Comment[tr]=Ekranınızın çözünürlüğünü yapılandırır.
+Comment[tr]=
 Comment[zh_CN]=
 Comment[zh_TW]=
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_dpms/.cvsignore b/src/modules/conf_dpms/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_dpms/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_dpms/Makefile.am b/src/modules/conf_dpms/Makefile.am
deleted file mode 100644
index b9fac7e36..000000000
--- a/src/modules/conf_dpms/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_dpms
-
-# 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_builddir)/src/bin \
-                         -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_dpms.c \
-                         e_int_config_dpms.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_dpms/e-module-conf_dpms.edj b/src/modules/conf_dpms/e-module-conf_dpms.edj
deleted file mode 100644
index f11abaac6..000000000
Binary files a/src/modules/conf_dpms/e-module-conf_dpms.edj and /dev/null differ
diff --git a/src/modules/conf_dpms/e_mod_main.c b/src/modules/conf_dpms/e_mod_main.c
deleted file mode 100644
index aa169ffeb..000000000
--- a/src/modules/conf_dpms/e_mod_main.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#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,
-     "Settings - Power Management"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
-   e_configure_registry_item_add("screen/power_management", 50, _("Power Management"), NULL, "preferences-system-power-management", e_int_config_dpms);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "screen/power_management"))) e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("screen/power_management");
-   e_configure_registry_category_del("screen");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_dpms/e_mod_main.h b/src/modules/conf_dpms/e_mod_main.h
deleted file mode 100644
index 8c0d2880a..000000000
--- a/src/modules/conf_dpms/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_dpms.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_dpms.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);
-
-#endif
diff --git a/src/modules/conf_dpms/module.desktop.in b/src/modules/conf_dpms/module.desktop.in
deleted file mode 100644
index c9969e339..000000000
--- a/src/modules/conf_dpms/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Power Management
-Name[ru]=Управление питанием
-Name[cs]=Správa napájení
-Name[de]=
-Name[eo]=Potenca Administrado
-Name[es]=Administración de energía
-Name[fr]=Gestion de l'énergie
-Name[hu]=Energiakezelés
-Name[it]=Gestione energetica
-Name[ja]=
-Name[pt]=Gestão de energia
-Name[pt_BR]=
-Name[tr]=Güç Yönetimi
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_dpms
-Comment=Configure the DPMS settings of your system.
-Comment[ru]=Конфигурация и настройка DPMS (управление питанием экрана) для Вашей системы.
-Comment[cs]=Volby DPMS v systému.
-Comment[de]=
-Comment[eo]=Agordi la parametrojn de DPMS (Signalado de potenca administrado de ekrano) de sia sistemo.
-Comment[es]=Configura las opciones de DPMS de su sistema.
-Comment[fr]=Paramétrage du DPMS.
-Comment[hu]=DPMS beállítások elvégzése.
-Comment[it]=Configura le impostazioni DPMS del vostro sistema.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar as definições de energia do seu sistema
-Comment[pt_BR]=
-Comment[tr]=Sisteminizin DPMS ayarlarını yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_screensaver/.cvsignore b/src/modules/conf_screensaver/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_screensaver/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_screensaver/Makefile.am b/src/modules/conf_screensaver/Makefile.am
deleted file mode 100644
index 263255d5e..000000000
--- a/src/modules/conf_screensaver/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_screensaver
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-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_builddir)/src/bin \
-                         -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_screensaver.c \
-                         e_int_config_screensaver.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_screensaver/e_mod_main.c b/src/modules/conf_screensaver/e_mod_main.c
deleted file mode 100644
index 4e97cdf0e..000000000
--- a/src/modules/conf_screensaver/e_mod_main.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#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,
-     "Settings - Screen Saver"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
-   e_configure_registry_item_add("screen/screen_saver", 40, _("Screen Saver"), NULL, "preferences-desktop-screensaver", e_int_config_screensaver);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "screen/screen_saver"))) e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("screen/screen_saver");
-   e_configure_registry_category_del("screen");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_screensaver/e_mod_main.h b/src/modules/conf_screensaver/e_mod_main.h
deleted file mode 100644
index b739a4365..000000000
--- a/src/modules/conf_screensaver/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_screensaver.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_screensaver.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);
-
-#endif
diff --git a/src/modules/conf_screensaver/module.desktop.in b/src/modules/conf_screensaver/module.desktop.in
deleted file mode 100644
index ca63e68d6..000000000
--- a/src/modules/conf_screensaver/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Screen Saver
-Name[ru]=Хранитель экрана
-Name[cs]=Spořič obrazovky
-Name[de]=
-Name[eo]=Ekrankurtenoj
-Name[es]=Salvapantallas
-Name[fr]=Écran de veille
-Name[hu]=Képernyővédő
-Name[it]=Screensaver
-Name[ja]=
-Name[pt]=Proteção de ecrã
-Name[pt_BR]=
-Name[tr]=Ekran Koruyucu
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=preferences-desktop-screensaver
-Comment=Configures the X screensaver.
-Comment[ru]=Настройка хранителя экрана X.
-Comment[cs]=Umožňuje nastavení X spořiče.
-Comment[de]=
-Comment[eo]=Agordi la ekrankurtenon de X.
-Comment[es]=Configura el salvapantallas de X.
-Comment[fr]=Paramétrage de l'écran de veille de X.
-Comment[hu]=Az X képernyővédő beállítása.
-Comment[it]=Configura lo screensaver di X.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar a proteção do ecrã
-Comment[pt_BR]=
-Comment[tr]=X ekran koruyucuyu yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings