diff --git a/src/modules/conf_desk/module.desktop.in b/src/modules/conf_desk/module.desktop.in
index ffa7f8bab..b393afc9d 100644
--- a/src/modules/conf_desk/module.desktop.in
+++ b/src/modules/conf_desk/module.desktop.in
@@ -2,4 +2,4 @@
 Type=Link
 Name=Configuration - Desk
 Icon=e-module-conf_desk
-Comment=<hilight>E17 Configuration Applet (internal)</hilight><br>Used to configure the desktop name<br>and wallpaper for individual<br>virtual desktops.
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to configure the desktop name<br>and wallpaper for individual<br>virtual desktops.
diff --git a/src/modules/conf_dpms/module.desktop.in b/src/modules/conf_dpms/module.desktop.in
index 9a9fc421d..5e62d3bcb 100644
--- a/src/modules/conf_dpms/module.desktop.in
+++ b/src/modules/conf_dpms/module.desktop.in
@@ -2,4 +2,4 @@
 Type=Link
 Name=Configuration - Power Management
 Icon=e-module-conf_dpms
-Comment=<hilight>E17 Configuration Applet</hilight><br>Configure the DPMS settings of your<br>system.
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configure the DPMS settings of<br>your system.
diff --git a/src/modules/conf_mouse/module.desktop.in b/src/modules/conf_mouse/module.desktop.in
index 488ae9d21..717470434 100644
--- a/src/modules/conf_mouse/module.desktop.in
+++ b/src/modules/conf_mouse/module.desktop.in
@@ -2,4 +2,4 @@
 Type=Link
 Name=Configuration - Mouse Acceleration
 Icon=e-module-conf_mouse
-Comment=<hilight>E17 Configuration Applet</hilight><br>Configure mouse cursor acceleration.
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configure mouse cursor<br>acceleration.
diff --git a/src/modules/conf_mousebindings/module.desktop.in b/src/modules/conf_mousebindings/module.desktop.in
index 24a5e4b8a..78bae6d36 100644
--- a/src/modules/conf_mousebindings/module.desktop.in
+++ b/src/modules/conf_mousebindings/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Mouse Bindings
 Icon=e-module-conf_mousebindings
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to configure your mouse<br>bindings.
diff --git a/src/modules/conf_paths/module.desktop.in b/src/modules/conf_paths/module.desktop.in
index 377e8f3d1..5fb519e5f 100644
--- a/src/modules/conf_paths/module.desktop.in
+++ b/src/modules/conf_paths/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Search Directories
 Icon=e-module-conf_paths
+Comment=<hilight>E17 Configuration Applet</hilight><br>Specifies the E17 search paths<br>and default directories.
diff --git a/src/modules/conf_performance/module.desktop.in b/src/modules/conf_performance/module.desktop.in
index 75533fd2b..a0be60c58 100644
--- a/src/modules/conf_performance/module.desktop.in
+++ b/src/modules/conf_performance/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Performance
 Icon=e-module-conf_performance
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to configure certain<br>performance related items as<br>frame rates and cache settings.
diff --git a/src/modules/conf_screensaver/module.desktop.in b/src/modules/conf_screensaver/module.desktop.in
index 9eed78edb..70d0ff91e 100644
--- a/src/modules/conf_screensaver/module.desktop.in
+++ b/src/modules/conf_screensaver/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Screen Saver
 Icon=e-module-conf_screensaver
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configures the X screensaver.
diff --git a/src/modules/conf_shelves/module.desktop.in b/src/modules/conf_shelves/module.desktop.in
index 733eba9f4..6ef2efbb1 100644
--- a/src/modules/conf_shelves/module.desktop.in
+++ b/src/modules/conf_shelves/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Shelves
 Icon=e-module-conf_shelves
+Comment=<hilight>E17 Configuration Applet</hilight><br>Shelf configuration dialog.
diff --git a/src/modules/conf_startup/module.desktop.in b/src/modules/conf_startup/module.desktop.in
index cb47f55ef..42d88a510 100644
--- a/src/modules/conf_startup/module.desktop.in
+++ b/src/modules/conf_startup/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Startup
 Icon=e-module-conf_startup
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to configure the E17 splash<br>screen.
diff --git a/src/modules/conf_theme/module.desktop.in b/src/modules/conf_theme/module.desktop.in
index 061a5fe36..68bd902f3 100644
--- a/src/modules/conf_theme/module.desktop.in
+++ b/src/modules/conf_theme/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Theme
 Icon=e-module-conf_theme
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to configure your theme<br>preferences.
diff --git a/src/modules/conf_transitions/module.desktop.in b/src/modules/conf_transitions/module.desktop.in
index efc60205a..3921b9109 100644
--- a/src/modules/conf_transitions/module.desktop.in
+++ b/src/modules/conf_transitions/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Transitions
 Icon=e-module-conf_transitions
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to choose a default transition.<br>Transitions are used  upon wallpaper<br>changes, among other things.
diff --git a/src/modules/conf_wallpaper/module.desktop.in b/src/modules/conf_wallpaper/module.desktop.in
index aaaddfe82..4b630d6a9 100644
--- a/src/modules/conf_wallpaper/module.desktop.in
+++ b/src/modules/conf_wallpaper/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Wallpaper
 Icon=e-module-conf_wallpaper
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to pick a wallpaper.
diff --git a/src/modules/conf_window_display/module.desktop.in b/src/modules/conf_window_display/module.desktop.in
index de23ec09f..f5c63d84d 100644
--- a/src/modules/conf_window_display/module.desktop.in
+++ b/src/modules/conf_window_display/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Window Display
 Icon=e-module-conf_window_display
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configures default window<br>properties such as default<br>geometries, border icons,<br>placement styles, etc.
diff --git a/src/modules/conf_window_focus/module.desktop.in b/src/modules/conf_window_focus/module.desktop.in
index 77e54818a..f0b75a160 100644
--- a/src/modules/conf_window_focus/module.desktop.in
+++ b/src/modules/conf_window_focus/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Window Focus
 Icon=e-module-conf_window_focus
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configure window focus behavior.
diff --git a/src/modules/conf_window_manipulation/module.desktop.in b/src/modules/conf_window_manipulation/module.desktop.in
index bc5811603..5443d01e5 100644
--- a/src/modules/conf_window_manipulation/module.desktop.in
+++ b/src/modules/conf_window_manipulation/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Window Manipulation
 Icon=e-module-conf_winmanip
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configures window raise, resistance,<br>and maximize policies.
diff --git a/src/modules/conf_winlist/module.desktop.in b/src/modules/conf_winlist/module.desktop.in
index bfdecf779..cfa039bb0 100644
--- a/src/modules/conf_winlist/module.desktop.in
+++ b/src/modules/conf_winlist/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Window List
 Icon=e-module-conf_winlist
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configure your window list<br>properties.