diff --git a/data/themes/default.edc b/data/themes/default.edc
index df571d20e..65cfbdd19 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -29505,6 +29505,15 @@ collections {
ICON("system-file-manager","icon_efm_folder.png",64) // "enlightenment/fileman"
ICON("application-exit","icon_logout.png",64) // "enlightenment/exit"
ICON("enlightenment","logo_white_128.png",64) // *** // "enlightenment/e"
+ //Standard Module Category Icons
+ ICON("modules-utils","icon_gadget.png",64)
+ ICON("modules-system","icon_gadget.png",64)
+ ICON("modules-look","icon_look.png",64)
+ ICON("modules-files","icon_efm_folder.png",64)
+ ICON("modules-launcher","icon_run.png",64)
+ ICON("modules-core","logo_white_128.png",64)
+ ICON("modules-mobile","icon_globe.png",64)
+ ICON("modules-settings","icon_config.png",64)
//Standard Emblem Icons
ICON("emblem-symbolic-link","icon_dummy.png",64) // EFMBUTTON("symlink")
//Standard Place Icons
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index fa23fbcea..b86c0b71e 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -49,12 +49,14 @@ static const CFTypes _types[] =
{
#define _CFT(k, n, i) \
{sizeof(k) - 1, k, n, i}
- _CFT("utils", N_("Utilities"), "preferences-utils"),
- _CFT("look", N_("Look"), "preferences-look"),
- _CFT("system", N_("System"), "system"),
- _CFT("config", N_("Settings"), "preferences-system"),
- _CFT("everything", N_("Launcher"), "system-run"),
- _CFT("fileman", N_("Fileman"), "system-file-manager"),
+ _CFT("utils", N_("Utilities"), "modules-utils"),
+ _CFT("system", N_("System"), "modules-system"),
+ _CFT("look", N_("Look"), "modules-look"),
+ _CFT("files", N_("Files"), "modules-files"),
+ _CFT("launcher", N_("Launcher"), "modules-launcher"),
+ _CFT("core", N_("Core"), "modules-core"),
+ _CFT("mobile", N_("Mobile"), "modules-mobile"),
+ _CFT("settings", N_("Settings"), "modules-settings"),
#undef _CFT
{0, NULL, NULL, NULL}
};
diff --git a/src/modules/conf/module.desktop.in b/src/modules/conf/module.desktop.in
index adca21d42..665872661 100644
--- a/src/modules/conf/module.desktop.in
+++ b/src/modules/conf/module.desktop.in
@@ -31,4 +31,4 @@ Comment[pt_BR]=
Comment[tr]=
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=core
diff --git a/src/modules/conf_acpibindings/module.desktop.in b/src/modules/conf_acpibindings/module.desktop.in
index 2b943155d..d2463c33a 100644
--- a/src/modules/conf_acpibindings/module.desktop.in
+++ b/src/modules/conf_acpibindings/module.desktop.in
@@ -7,4 +7,4 @@ Icon=preferences-system-power-management
Comment=Configure your ACPI bindings here.
Comment[fr]=Permet de configurer vos raccourcis ACPI.
Comment[it]=Configurate qui le vostre associazioni con ACPI.
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_applications/module.desktop.in b/src/modules/conf_applications/module.desktop.in
index d5c1d9643..eab6be0a6 100644
--- a/src/modules/conf_applications/module.desktop.in
+++ b/src/modules/conf_applications/module.desktop.in
@@ -31,4 +31,4 @@ Comment[pt_BR]=
Comment[tr]=IBar, Açılış ve Yeniden Başlat uygulamalarının yapılandırılmasına izin verir.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_borders/module.desktop.in b/src/modules/conf_borders/module.desktop.in
index 2ee148b0e..da55deadd 100644
--- a/src/modules/conf_borders/module.desktop.in
+++ b/src/modules/conf_borders/module.desktop.in
@@ -31,4 +31,4 @@ Comment[pt_BR]=
Comment[tr]=Öntanımlı sınır biçimini seçmekte kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_clientlist/module.desktop.in b/src/modules/conf_clientlist/module.desktop.in
index 0bd1bf326..44063530f 100644
--- a/src/modules/conf_clientlist/module.desktop.in
+++ b/src/modules/conf_clientlist/module.desktop.in
@@ -31,4 +31,4 @@ Comment[pt_BR]=
Comment[tr]=İstemci listesi menüsünün özelleştirilmesine izin verir.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_colors/module.desktop.in b/src/modules/conf_colors/module.desktop.in
index 9a24cc2a0..2bd7a155e 100644
--- a/src/modules/conf_colors/module.desktop.in
+++ b/src/modules/conf_colors/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Renkleri özelleştirmekte kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_desk/module.desktop.in b/src/modules/conf_desk/module.desktop.in
index 70b61edc2..ef61146b2 100644
--- a/src/modules/conf_desk/module.desktop.in
+++ b/src/modules/conf_desk/module.desktop.in
@@ -29,4 +29,4 @@ 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=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_desklock/module.desktop.in b/src/modules/conf_desklock/module.desktop.in
index 6ddfe09e2..e0ff383c2 100644
--- a/src/modules/conf_desklock/module.desktop.in
+++ b/src/modules/conf_desklock/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Dahili masaüstü kilidini yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_desks/module.desktop.in b/src/modules/conf_desks/module.desktop.in
index c899be124..a783290b0 100644
--- a/src/modules/conf_desks/module.desktop.in
+++ b/src/modules/conf_desks/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Sanal masaüstü özelliklerini yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_dialogs/module.desktop.in b/src/modules/conf_dialogs/module.desktop.in
index 3d50b738a..3cc72716c 100644
--- a/src/modules/conf_dialogs/module.desktop.in
+++ b/src/modules/conf_dialogs/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Öntanımlı pencere özelliklerini yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_display/module.desktop.in b/src/modules/conf_display/module.desktop.in
index 44716ea62..ef89efff6 100644
--- a/src/modules/conf_display/module.desktop.in
+++ b/src/modules/conf_display/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Ekranınızın çözünürlüğünü yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_dpms/module.desktop.in b/src/modules/conf_dpms/module.desktop.in
index f785fddc4..63aee3bf5 100644
--- a/src/modules/conf_dpms/module.desktop.in
+++ b/src/modules/conf_dpms/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Sisteminizin DPMS ayarlarını yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_edgebindings/module.desktop.in b/src/modules/conf_edgebindings/module.desktop.in
index 22cec9168..c2a63a096 100644
--- a/src/modules/conf_edgebindings/module.desktop.in
+++ b/src/modules/conf_edgebindings/module.desktop.in
@@ -13,4 +13,4 @@ Comment[eo]=Agordas la fulmklavoj de ekranrandoj.
Comment[fr]=Configure les raccourcis des bords de l'écran.
Comment[it]=Configurate qui le azioni da associare ai confini dello schermo.
Comment[tr]=.Kenar kısayollarını yapılandırır.
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_engine/module.desktop.in b/src/modules/conf_engine/module.desktop.in
index 78db617be..627e05e42 100644
--- a/src/modules/conf_engine/module.desktop.in
+++ b/src/modules/conf_engine/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Render motorunu seçmekte kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_fonts/module.desktop.in b/src/modules/conf_fonts/module.desktop.in
index 9320a1860..cc2144a9e 100644
--- a/src/modules/conf_fonts/module.desktop.in
+++ b/src/modules/conf_fonts/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Yazıtipi yapılandırma diyaloğu.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_icon_theme/module.desktop.in b/src/modules/conf_icon_theme/module.desktop.in
index c42e56022..74ea40158 100644
--- a/src/modules/conf_icon_theme/module.desktop.in
+++ b/src/modules/conf_icon_theme/module.desktop.in
@@ -30,4 +30,4 @@ Comment[tr]=E17 simge temasını seçmek için kullanılan programcık.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_imc/module.desktop.in b/src/modules/conf_imc/module.desktop.in
index abe0eaa3b..25d8cb9d2 100644
--- a/src/modules/conf_imc/module.desktop.in
+++ b/src/modules/conf_imc/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Girdi metodu seçmekte kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_interaction/module.desktop.in b/src/modules/conf_interaction/module.desktop.in
index 4201729d5..85f7aec63 100644
--- a/src/modules/conf_interaction/module.desktop.in
+++ b/src/modules/conf_interaction/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Öntanımlı kullanıcı etkileşim ayarlarını yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_intl/module.desktop.in b/src/modules/conf_intl/module.desktop.in
index 6f75d0743..e934735b0 100644
--- a/src/modules/conf_intl/module.desktop.in
+++ b/src/modules/conf_intl/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Öntanımlı dil seçmek için kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_keybindings/module.desktop.in b/src/modules/conf_keybindings/module.desktop.in
index c8728c608..59725afcb 100644
--- a/src/modules/conf_keybindings/module.desktop.in
+++ b/src/modules/conf_keybindings/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Tuş bağlayıcılarınızı buradan yapılandırın.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_menus/module.desktop.in b/src/modules/conf_menus/module.desktop.in
index d2c199caf..800ba0c47 100644
--- a/src/modules/conf_menus/module.desktop.in
+++ b/src/modules/conf_menus/module.desktop.in
@@ -29,5 +29,5 @@ Comment[pt_BR]=
Comment[tr]=Menü davranışını yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_mime/module.desktop.in b/src/modules/conf_mime/module.desktop.in
index ffe12449a..89a586e0c 100644
--- a/src/modules/conf_mime/module.desktop.in
+++ b/src/modules/conf_mime/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=E17 mime simgelerini yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_mouse/module.desktop.in b/src/modules/conf_mouse/module.desktop.in
index a1edf686f..c9b9b48f0 100644
--- a/src/modules/conf_mouse/module.desktop.in
+++ b/src/modules/conf_mouse/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Fare davranışını yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_mouse_cursor/module.desktop.in b/src/modules/conf_mouse_cursor/module.desktop.in
index 3f9b3b165..92f6c6e71 100644
--- a/src/modules/conf_mouse_cursor/module.desktop.in
+++ b/src/modules/conf_mouse_cursor/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Fare imleci biçemini seçin.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_mousebindings/module.desktop.in b/src/modules/conf_mousebindings/module.desktop.in
index 562c7917d..bc404eccd 100644
--- a/src/modules/conf_mousebindings/module.desktop.in
+++ b/src/modules/conf_mousebindings/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Farenizin bağlayıcılarını yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_paths/module.desktop.in b/src/modules/conf_paths/module.desktop.in
index c6f270099..8dc2055d9 100644
--- a/src/modules/conf_paths/module.desktop.in
+++ b/src/modules/conf_paths/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=E17 aranacak yollar ve öntanımlı dizinleri belirtir.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_performance/module.desktop.in b/src/modules/conf_performance/module.desktop.in
index 096fefdd0..31c734e42 100644
--- a/src/modules/conf_performance/module.desktop.in
+++ b/src/modules/conf_performance/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Kare oranı ve önbellek ayarları gibi performans ile ilgili öğeleri yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_profiles/module.desktop.in b/src/modules/conf_profiles/module.desktop.in
index 1d6c113e5..4d7ea5963 100644
--- a/src/modules/conf_profiles/module.desktop.in
+++ b/src/modules/conf_profiles/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Profillerin yapılandırmasını yönetir.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_scale/module.desktop.in b/src/modules/conf_scale/module.desktop.in
index 7b330e208..bf679f56e 100644
--- a/src/modules/conf_scale/module.desktop.in
+++ b/src/modules/conf_scale/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Görünüm ölçeklemesinin yapılandırmak için kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_screensaver/module.desktop.in b/src/modules/conf_screensaver/module.desktop.in
index d4f35b567..6a1e2837d 100644
--- a/src/modules/conf_screensaver/module.desktop.in
+++ b/src/modules/conf_screensaver/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=X ekran koruyucuyu yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_shelves/module.desktop.in b/src/modules/conf_shelves/module.desktop.in
index 6b6736f85..9db2426fc 100644
--- a/src/modules/conf_shelves/module.desktop.in
+++ b/src/modules/conf_shelves/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Raf yapılandırma diyaloğu.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_startup/module.desktop.in b/src/modules/conf_startup/module.desktop.in
index 210f253d0..710c695ba 100644
--- a/src/modules/conf_startup/module.desktop.in
+++ b/src/modules/conf_startup/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=E17 açılış ekranını yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_theme/module.desktop.in b/src/modules/conf_theme/module.desktop.in
index dad967ff4..6832fcec8 100644
--- a/src/modules/conf_theme/module.desktop.in
+++ b/src/modules/conf_theme/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Tema seçimlerinizi yapılandırmakta kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_transitions/module.desktop.in b/src/modules/conf_transitions/module.desktop.in
index 0afed490e..64d72d3cc 100644
--- a/src/modules/conf_transitions/module.desktop.in
+++ b/src/modules/conf_transitions/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Öntanımlı geçişi seçmekte kullanılır. Geçişler duvarkağıdı değişimleri gibi geçişlerde görünürler.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_wallpaper/module.desktop.in b/src/modules/conf_wallpaper/module.desktop.in
index f42a94f86..08dd96239 100644
--- a/src/modules/conf_wallpaper/module.desktop.in
+++ b/src/modules/conf_wallpaper/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Duvarkağıdı seçiminde kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_wallpaper2/module.desktop.in b/src/modules/conf_wallpaper2/module.desktop.in
index cd5497a01..7264cd963 100644
--- a/src/modules/conf_wallpaper2/module.desktop.in
+++ b/src/modules/conf_wallpaper2/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Duvarkağıdı seçiminde kullanılır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_window_display/module.desktop.in b/src/modules/conf_window_display/module.desktop.in
index 652aa4392..7225d7b16 100644
--- a/src/modules/conf_window_display/module.desktop.in
+++ b/src/modules/conf_window_display/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Öntanımlı boyut, simge, yerleşim biçimleri vs. gibi pencere özelliklerini yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_window_focus/module.desktop.in b/src/modules/conf_window_focus/module.desktop.in
index ce90e4ba9..a6a3d51d8 100644
--- a/src/modules/conf_window_focus/module.desktop.in
+++ b/src/modules/conf_window_focus/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Pencere odaklanma davranışını yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_window_manipulation/module.desktop.in b/src/modules/conf_window_manipulation/module.desktop.in
index 393560f0a..8c402d2a1 100644
--- a/src/modules/conf_window_manipulation/module.desktop.in
+++ b/src/modules/conf_window_manipulation/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Pencere yükseltmesi, direnci ve ekranı kaplama kurallarını yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_window_remembers/module.desktop.in b/src/modules/conf_window_remembers/module.desktop.in
index 90f4f726f..1ce1e774a 100644
--- a/src/modules/conf_window_remembers/module.desktop.in
+++ b/src/modules/conf_window_remembers/module.desktop.in
@@ -15,4 +15,4 @@ Comment[it]=Rimuove le impostazioni da ricordare delle finestre.
Comment[hu]=Meglévő ablak emlékek törlése.
Comment[fr]=Permet d'effacer les mémorisations.
Comment[tr]=Mevcut pencere hatırlamalarını sil.
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_winlist/module.desktop.in b/src/modules/conf_winlist/module.desktop.in
index a7b89333d..f8417f03e 100644
--- a/src/modules/conf_winlist/module.desktop.in
+++ b/src/modules/conf_winlist/module.desktop.in
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=Pencere listesi özelliklerini yapılandırır.
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=config
+X-Enlightenment-ModuleType=settings
diff --git a/src/modules/everything-apps/module.desktop.in b/src/modules/everything-apps/module.desktop.in
index 54a42c754..acf9ae2f4 100644
--- a/src/modules/everything-apps/module.desktop.in
+++ b/src/modules/everything-apps/module.desktop.in
@@ -4,6 +4,6 @@ Name=Everything Applications
Name[fr]=Omni - Applications
Name[it]=Everything - Applicazioni
Icon=e-module
-X-Enlightenment-ModuleType=everything
Comment[fr]=Actions sur les applications.
Comment[it]=Azioni con le applicazioni.
+X-Enlightenment-ModuleType=launcher
diff --git a/src/modules/everything-aspell/module.desktop.in b/src/modules/everything-aspell/module.desktop.in
index 27bfce3eb..6a863e2e8 100644
--- a/src/modules/everything-aspell/module.desktop.in
+++ b/src/modules/everything-aspell/module.desktop.in
@@ -4,7 +4,7 @@ Name=Everything Aspell
Name[fr]=Omni - Aspell
Name[it]=Everything - Aspell
Icon=accessories-dictionary
-X-Enlightenment-ModuleType=everything
Comment=Aspell Frontend, use 'aspell ' as trigger.
Comment[fr]=Frontal pour Aspell, utilise « aspell » comme déclencheur.
Comment[it]=Frontend, usa 'aspell' come richiamo.
+X-Enlightenment-ModuleType=launcher
diff --git a/src/modules/everything-calc/module.desktop.in b/src/modules/everything-calc/module.desktop.in
index ed7308787..915694d6b 100644
--- a/src/modules/everything-calc/module.desktop.in
+++ b/src/modules/everything-calc/module.desktop.in
@@ -4,7 +4,7 @@ Name=Everything Calculator
Name[fr]=Omni - Calculatrice
Name[it]=Everything - Calcolatrice
Icon=accessories-calculator
-X-Enlightenment-ModuleType=everything
Comment=Frontend for bc. Use '=' as trigger.
Comment[fr]=Frontal pour bc, utilise « = » comme déclencheur.
Comment[it]=Frontend per bc, usa '=' come richiamo.
+X-Enlightenment-ModuleType=launcher
diff --git a/src/modules/everything-files/module.desktop.in b/src/modules/everything-files/module.desktop.in
index ce35e40b6..0391c6042 100644
--- a/src/modules/everything-files/module.desktop.in
+++ b/src/modules/everything-files/module.desktop.in
@@ -4,6 +4,6 @@ Name=Everything Files
Name[fr]=Omni - Fichiers
Name[it]=Everything - File
Icon=system-file-manager
-X-Enlightenment-ModuleType=everything
Comment[fr]=Actions sur les fichiers.
Comment[it]=Azioni sui file.
+X-Enlightenment-ModuleType=launcher
diff --git a/src/modules/everything-settings/module.desktop.in b/src/modules/everything-settings/module.desktop.in
index 20160b973..06262cd6a 100644
--- a/src/modules/everything-settings/module.desktop.in
+++ b/src/modules/everything-settings/module.desktop.in
@@ -4,7 +4,7 @@ Name=Everything Settings
Name[fr]=Omni - Configuration
Name[it]=Everything - Impostazioni
Icon=configure
-X-Enlightenment-ModuleType=everything
Comment=Quickly open e17 settings dialogs.
Comment[fr]=Accès rapide au panneau de configuration de E17.
Comment[it]=Apre rapidamente il pannello impostazioni di e17.
+X-Enlightenment-ModuleType=launcher
diff --git a/src/modules/everything-windows/module.desktop.in b/src/modules/everything-windows/module.desktop.in
index 1c8bbe596..466787c79 100644
--- a/src/modules/everything-windows/module.desktop.in
+++ b/src/modules/everything-windows/module.desktop.in
@@ -4,7 +4,7 @@ Name=Everything Windows
Name[fr]=Omni - Fenêtres
Name[it]=Everything - Finestre
Icon=preferences-system-windows
-X-Enlightenment-ModuleType=everything
Comment=Window actions
Comment[fr]=Actions sur les fenêtres.
Comment[it]=Azioni sulle finestre.
+X-Enlightenment-ModuleType=launcher
diff --git a/src/modules/everything/module.desktop.in b/src/modules/everything/module.desktop.in
index b1bdf3854..bb84c4e88 100644
--- a/src/modules/everything/module.desktop.in
+++ b/src/modules/everything/module.desktop.in
@@ -1,17 +1,17 @@
[Desktop Entry]
Type=Link
-Name=Run Everything
-Name[cs]=Dialog Spustit
+Name=Everything (Starter)
+Name[cs]=
Name[de]=
-Name[eo]=Lanĉi komandojn
-Name[es]=Ejecutar comando
-Name[fr]=Omni
-Name[hu]=Parancs futtatása
-Name[it]=Pannello di Everything
+Name[eo]=
+Name[es]=
+Name[fr]=
+Name[hu]=
+Name[it]=
Name[ja]=
Name[pt]=
Name[pt_BR]=
-Name[tr]=Herşeyi Çalıştır
+Name[tr]=
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-everything
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=everything
+X-Enlightenment-ModuleType=launcher
diff --git a/src/modules/fileman/module.desktop.in b/src/modules/fileman/module.desktop.in
index c2464d1c2..871efb9b5 100644
--- a/src/modules/fileman/module.desktop.in
+++ b/src/modules/fileman/module.desktop.in
@@ -1,17 +1,17 @@
[Desktop Entry]
Type=Link
-Name=File Manager
-Name[cs]=Správce souborů
+Name=EFM (Starter)
+Name[cs]=
Name[de]=
-Name[eo]=Dosieradministrilo
-Name[es]=Administrador de archivos
-Name[fr]=Gestionnaire de fichiers
-Name[hu]=Fájlkezelõ
-Name[it]=File manager
+Name[eo]=
+Name[es]=
+Name[fr]=
+Name[hu]=
+Name[it]=
Name[ja]=
Name[pt]=
Name[pt_BR]=
-Name[tr]=Dosya Yönetici
+Name[tr]=
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-fileman
@@ -29,4 +29,4 @@ Comment[pt_BR]=
Comment[tr]=E17'nin dahili pencere yöneticisi.
Yapım Aşamasında!
Comment[zh_CN]=
Comment[zh_TW]=
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=files
diff --git a/src/modules/fileman_opinfo/module.desktop.in b/src/modules/fileman_opinfo/module.desktop.in
index 8e2474cfa..10bca9f69 100644
--- a/src/modules/fileman_opinfo/module.desktop.in
+++ b/src/modules/fileman_opinfo/module.desktop.in
@@ -13,4 +13,4 @@ Comment[it]=Può essere messo sul desktop o su una mensola.
Comment[eo]=Enmetebla sur la labortablon aŭ en breton.
Comment[fr]=Peut être placé sur le bureau ou dans un rack.
Comment[tr]=Masaüstüne ya da rafa yerleşebilir.
-X-Enlightenment-ModuleType=fileman
+X-Enlightenment-ModuleType=files
diff --git a/src/modules/gadman/module.desktop.in b/src/modules/gadman/module.desktop.in
index 6ca64f812..8e8e36562 100644
--- a/src/modules/gadman/module.desktop.in
+++ b/src/modules/gadman/module.desktop.in
@@ -7,7 +7,7 @@ Name[it]=Gestore gadget
Name[hu]=Bigyók az asztalon
Name[tr]=Aletler
Icon=e-module-gadman
-X-Enlightenment-ModuleType=appearance
+X-Enlightenment-ModuleType=core
Comment=Module to manage gadgets on the desktop.
Comment[cs]=Modul pro správu gadgetů na ploše.
Comment[eo]=
diff --git a/src/modules/illume-bluetooth/module.desktop.in b/src/modules/illume-bluetooth/module.desktop.in
index c80225307..2e8e687d4 100644
--- a/src/modules/illume-bluetooth/module.desktop.in
+++ b/src/modules/illume-bluetooth/module.desktop.in
@@ -2,7 +2,7 @@
Type=Link
Name=Illume-Bluetooth
Icon=e-module-illume-bluetooth
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=mobile
Comment=
Comment[fr]=
Comment[it]=
diff --git a/src/modules/illume-home-toggle/module.desktop.in b/src/modules/illume-home-toggle/module.desktop.in
index 81916647d..5d257d131 100644
--- a/src/modules/illume-home-toggle/module.desktop.in
+++ b/src/modules/illume-home-toggle/module.desktop.in
@@ -2,7 +2,7 @@
Type=Link
Name=Illume-Home-Toggle
Icon=e-module-illume-home-toggle
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=mobile
Comment=
Comment[fr]=
Comment[it]=
diff --git a/src/modules/illume-home/module.desktop.in b/src/modules/illume-home/module.desktop.in
index a8055a5ef..6bb27d27b 100644
--- a/src/modules/illume-home/module.desktop.in
+++ b/src/modules/illume-home/module.desktop.in
@@ -2,7 +2,7 @@
Type=Link
Name=Illume-Home
Icon=e-module-illume-home
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=mobile
Comment=
Comment[fr]=
Comment[it]=
diff --git a/src/modules/illume-indicator/module.desktop.in b/src/modules/illume-indicator/module.desktop.in
index 0bde3a4ff..43e58f3ba 100644
--- a/src/modules/illume-indicator/module.desktop.in
+++ b/src/modules/illume-indicator/module.desktop.in
@@ -2,7 +2,7 @@
Type=Link
Name=Illume-Indicator
Icon=e-module-illume-indicator
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=mobile
Comment=
Comment[fr]=
Comment[it]=
diff --git a/src/modules/illume-kbd-toggle/module.desktop.in b/src/modules/illume-kbd-toggle/module.desktop.in
index f2ba089e3..b359fdcc8 100644
--- a/src/modules/illume-kbd-toggle/module.desktop.in
+++ b/src/modules/illume-kbd-toggle/module.desktop.in
@@ -2,7 +2,7 @@
Type=Link
Name=Illume-Keyboard-Toggle
Icon=e-module-illume-kbd-toggle
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=mobile
Comment=
Comment[fr]=
Comment[it]=
diff --git a/src/modules/illume-keyboard/module.desktop.in b/src/modules/illume-keyboard/module.desktop.in
index 2cc0d754a..f9ce69768 100644
--- a/src/modules/illume-keyboard/module.desktop.in
+++ b/src/modules/illume-keyboard/module.desktop.in
@@ -2,7 +2,7 @@
Type=Link
Name=Illume-Keyboard
Icon=e-module-illume-keyboard
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=mobile
Comment=
Comment[fr]=
Comment[it]=
diff --git a/src/modules/illume-mode-toggle/module.desktop.in b/src/modules/illume-mode-toggle/module.desktop.in
index d4f7f092b..1a2224198 100644
--- a/src/modules/illume-mode-toggle/module.desktop.in
+++ b/src/modules/illume-mode-toggle/module.desktop.in
@@ -2,7 +2,7 @@
Type=Link
Name=Illume-Mode-Toggle
Icon=e-module-illume-mode-toggle
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=mobile
Comment=
Comment[fr]=
Comment[it]=
diff --git a/src/modules/illume-softkey/module.desktop.in b/src/modules/illume-softkey/module.desktop.in
index c03b1e911..dd92124ac 100644
--- a/src/modules/illume-softkey/module.desktop.in
+++ b/src/modules/illume-softkey/module.desktop.in
@@ -2,7 +2,7 @@
Type=Link
Name=Illume-Softkey
Icon=e-module-illume-softkey
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=mobile
Comment=
Comment[fr]=
Comment[it]=
diff --git a/src/modules/illume/module.desktop.in b/src/modules/illume/module.desktop.in
index 61b972054..dcf9efe39 100644
--- a/src/modules/illume/module.desktop.in
+++ b/src/modules/illume/module.desktop.in
@@ -5,7 +5,7 @@ Name[eo]=Illume
Name[hu]=Érintő
Name[tr]=Illume
Icon=e-module-illume
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=mobile
Comment=This is a module to make Enlightenment tuned for embedded touchscreen
displays such as on phones and web-pads with windows always
being fullscreen and having a simplified application
launcher and manager.
Comment[cs]=Modul, který přemění UI Enlightenmentu pro dotykové
displeje na zařízeních jako telefony, PDA, kde jsou okna
vždy celoobrazovková, a také zjednodušený
spouštěč a správce.
Comment[it]=Questo è un modulo per rendere Enlightenment adatto ai display touchscreen
embedded, come sui cellulari e i web-pad, con finestre sempre
a tutto schermo e con gestori e lanciatori di applicazioni semplificati.
diff --git a/src/modules/illume2/module.desktop.in b/src/modules/illume2/module.desktop.in
index 58accc020..1694a7929 100644
--- a/src/modules/illume2/module.desktop.in
+++ b/src/modules/illume2/module.desktop.in
@@ -2,7 +2,7 @@
Type=Link
Name=Illume2
Icon=e-module-illume2
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=mobile
Comment=
Comment[fr]=
Comment[it]=
diff --git a/src/modules/syscon/module.desktop.in b/src/modules/syscon/module.desktop.in
index 7593fa0b4..a897a1614 100644
--- a/src/modules/syscon/module.desktop.in
+++ b/src/modules/syscon/module.desktop.in
@@ -15,4 +15,4 @@ Comment[it]=Questo modulo fornisce una finestra di dialogo popup
unificata pe
Comment[hu]=Ez a modul egy felugró ablakocskát
biztosít, amely segítségével az
e17 folyamatait kísérhetjük figyelemmel
Comment[fr]=Fournit une fenêtre de dialogue pop-up
regroupant toutes les actions système
dans Enlightenment.
Comment[tr]=Tüm sistem eylemleri için özelleştirilmiş
açılır pencere diyaloğu sunan Enlightenment modülü.
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=core
diff --git a/src/modules/winlist/module.desktop.in b/src/modules/winlist/module.desktop.in
index 0970c67bd..e1137cedb 100644
--- a/src/modules/winlist/module.desktop.in
+++ b/src/modules/winlist/module.desktop.in
@@ -17,4 +17,4 @@ Comment[hu]=A modul megmutatja az éppen futó alkalmazások ablakainak listáj
Comment[it]=Un modulo per la visualizzazione e la navigazione tra le finestre aperte.
Comment[fr]=Affiche la liste des applications ouvertes et permet de basculer d'une application à l'autre.
Comment[tr]=Mevcut çalışan istemci uygulamaların listesini gösteren modül.
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=core