diff --git a/src/modules/conf_borders/module.desktop.in b/src/modules/conf_borders/module.desktop.in
index 292fbfe2a..448d842b9 100644
--- a/src/modules/conf_borders/module.desktop.in
+++ b/src/modules/conf_borders/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Borders
 Icon=e-module-conf_borders
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to select a default border<br>style.
diff --git a/src/modules/conf_clientlist/module.desktop.in b/src/modules/conf_clientlist/module.desktop.in
index fa31445bf..505a7731b 100644
--- a/src/modules/conf_clientlist/module.desktop.in
+++ b/src/modules/conf_clientlist/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Client List Menu
 Icon=e-module-conf_clientlist
+Comment=<hilight>E17 Configuration Applet</hilight><br>Allows customization of the client<br>list menu.
diff --git a/src/modules/conf_colors/module.desktop.in b/src/modules/conf_colors/module.desktop.in
index 8b15ed4bb..836f0c355 100644
--- a/src/modules/conf_colors/module.desktop.in
+++ b/src/modules/conf_colors/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Colors
 Icon=e-module-conf_colors
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to customize the color classes.
diff --git a/src/modules/conf_desk/module.desktop.in b/src/modules/conf_desk/module.desktop.in
index 7a6e511e8..ffa7f8bab 100644
--- a/src/modules/conf_desk/module.desktop.in
+++ b/src/modules/conf_desk/module.desktop.in
@@ -2,3 +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.
diff --git a/src/modules/conf_desklock/module.desktop.in b/src/modules/conf_desklock/module.desktop.in
index 5e92f49ba..6ada99d8b 100644
--- a/src/modules/conf_desklock/module.desktop.in
+++ b/src/modules/conf_desklock/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Screen Lock
 Icon=e-module-conf_desklock
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configures the integrated desk lock.
diff --git a/src/modules/conf_desks/module.desktop.in b/src/modules/conf_desks/module.desktop.in
index 79f3c5a53..d5c89b337 100644
--- a/src/modules/conf_desks/module.desktop.in
+++ b/src/modules/conf_desks/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Virtual Desktops
 Icon=e-module-conf_desks
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configure the the virtual desktop<br>properties.
diff --git a/src/modules/conf_dialogs/module.desktop.in b/src/modules/conf_dialogs/module.desktop.in
index bcda8627c..df2721a17 100644
--- a/src/modules/conf_dialogs/module.desktop.in
+++ b/src/modules/conf_dialogs/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Dialogs
 Icon=e-module-conf_dialogs
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configure default dialog properties.
diff --git a/src/modules/conf_display/module.desktop.in b/src/modules/conf_display/module.desktop.in
index 7f2c26284..d924b1dde 100644
--- a/src/modules/conf_display/module.desktop.in
+++ b/src/modules/conf_display/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Screen Resolution
 Icon=e-module-conf_display
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to configure your screen's<br>resolution.
diff --git a/src/modules/conf_dpms/module.desktop.in b/src/modules/conf_dpms/module.desktop.in
index 1584ea546..9a9fc421d 100644
--- a/src/modules/conf_dpms/module.desktop.in
+++ b/src/modules/conf_dpms/module.desktop.in
@@ -2,3 +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.
diff --git a/src/modules/conf_engine/module.desktop.in b/src/modules/conf_engine/module.desktop.in
index 7737484ff..b7daab2e3 100644
--- a/src/modules/conf_engine/module.desktop.in
+++ b/src/modules/conf_engine/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Engine
 Icon=e-module-conf_engine
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to select the rendering engine.
diff --git a/src/modules/conf_exebuf/module.desktop.in b/src/modules/conf_exebuf/module.desktop.in
index a933fa547..48f926ac7 100644
--- a/src/modules/conf_exebuf/module.desktop.in
+++ b/src/modules/conf_exebuf/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Run Command
 Icon=e-module-conf_exebuf
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to configure the settings of<br>the run command GUI.
diff --git a/src/modules/conf_fonts/module.desktop.in b/src/modules/conf_fonts/module.desktop.in
index aeb15ce32..8ee5eefb7 100644
--- a/src/modules/conf_fonts/module.desktop.in
+++ b/src/modules/conf_fonts/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Fonts
 Icon=e-module-conf_fonts
+Comment=<hilight>E17 Configuration Applet</hilight><br>Font configuration dialog.
diff --git a/src/modules/conf_icon_theme/module.desktop.in b/src/modules/conf_icon_theme/module.desktop.in
index b538e60de..2e7d73e94 100644
--- a/src/modules/conf_icon_theme/module.desktop.in
+++ b/src/modules/conf_icon_theme/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Icon Theme
 Icon=e-module-conf_icon_theme
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configuration applet used to select<br>an icon theme for E17.
diff --git a/src/modules/conf_imc/module.desktop.in b/src/modules/conf_imc/module.desktop.in
index 13c8b7bc4..e20170e6a 100644
--- a/src/modules/conf_imc/module.desktop.in
+++ b/src/modules/conf_imc/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Input Methods
 Icon=e-module-conf_imc
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to select an input method.
diff --git a/src/modules/conf_intl/module.desktop.in b/src/modules/conf_intl/module.desktop.in
index fdea31acd..2300ecb3e 100644
--- a/src/modules/conf_intl/module.desktop.in
+++ b/src/modules/conf_intl/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Language
 Icon=e-module-conf_intl
+Comment=<hilight>E17 Configuration Applet</hilight><br>Used to select a default language.
diff --git a/src/modules/conf_keybindings/module.desktop.in b/src/modules/conf_keybindings/module.desktop.in
index df73307f3..4c2764640 100644
--- a/src/modules/conf_keybindings/module.desktop.in
+++ b/src/modules/conf_keybindings/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Key Bindings
 Icon=e-module-conf_keybindings
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configure your keybindings here.
diff --git a/src/modules/conf_menus/module.desktop.in b/src/modules/conf_menus/module.desktop.in
index 3485bae3a..65fc6e08d 100644
--- a/src/modules/conf_menus/module.desktop.in
+++ b/src/modules/conf_menus/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Menu Settings
 Icon=e-module-conf_menus
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configures menu behavior.
diff --git a/src/modules/conf_mime/module.desktop.in b/src/modules/conf_mime/module.desktop.in
index a93625d29..44b2a2e63 100644
--- a/src/modules/conf_mime/module.desktop.in
+++ b/src/modules/conf_mime/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - File Icons
 Icon=e-module-conf_mime
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configure E17 mime icons.
diff --git a/src/modules/conf_mouse/module.desktop.in b/src/modules/conf_mouse/module.desktop.in
index 1bc72936d..488ae9d21 100644
--- a/src/modules/conf_mouse/module.desktop.in
+++ b/src/modules/conf_mouse/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Mouse Acceleration
 Icon=e-module-conf_mouse
+Comment=<hilight>E17 Configuration Applet</hilight><br>Configure mouse cursor acceleration.
diff --git a/src/modules/conf_mouse_cursor/module.desktop.in b/src/modules/conf_mouse_cursor/module.desktop.in
index 44eb9ff53..cbfbe94ef 100644
--- a/src/modules/conf_mouse_cursor/module.desktop.in
+++ b/src/modules/conf_mouse_cursor/module.desktop.in
@@ -2,3 +2,4 @@
 Type=Link
 Name=Configuration - Mouse Cursor
 Icon=e-module-conf_mouse_cursor
+Comment=<hilight>E17 Configuration Applet</hilight><br>Select the mouse cursor style.