diff --git a/modules/diskfree.php b/modules/diskfree.php
index b5a3373..9f7b101 100644
--- a/modules/diskfree.php
+++ b/modules/diskfree.php
@@ -22,5 +22,5 @@ function _diskfree(array $opts=[]) {
     } while (true);
 }
 
-module("diskfree", "Show disk free space", [ "info", "disk" ]);
-option("si", DISKFREE_UNITS_SI, OPT_TYPE_BOOL, "Use SI magnitudes (MiB,KiB etc)", true);
\ No newline at end of file
+module("diskfree", "Display the amount of free disk space for the current path", [ "info", "disk" ]);
+option("si", DISKFREE_UNITS_SI, OPT_TYPE_BOOL, "Use SI magnitudes (MiB,KiB etc)", true);
diff --git a/modules/git.php b/modules/git.php
index c72f2cd..e825485 100644
--- a/modules/git.php
+++ b/modules/git.php
@@ -46,7 +46,7 @@ function _git(array $opts) {
     return panel(sprintf("%s%s %s", icon('git.branch'), $branch, join(" ",$marks)), ['class'=>'vcs'], 'git');
 }
 
-module("git", "Git VCS status", [ "git", "vcs" ]);
+module("git", "Show status from git repositories", [ "git", "vcs" ]);
 option("tag", GIT_SHOW_TAG, OPT_TYPE_BOOL, "Show tag", false);
 option("status", GIT_SHOW_STATUS, OPT_TYPE_BOOL, "Show branch and status", true);
 seticon("git.branch"," "); // "⑂");
diff --git a/modules/hostname.php b/modules/hostname.php
index daadf21..2c9128c 100644
--- a/modules/hostname.php
+++ b/modules/hostname.php
@@ -6,8 +6,8 @@ function _hostname(array $opts) {
     $attr = [
         'class' => $opts[HOSTNAME_CLASS]
     ];
-    $host = trim(exec("whoami"));
+    $host = trim(exec("hostname"));
     return panel($host, $attr, 'hostname');
 }
-module("hostname", "Hostname");
-option("class", HOSTNAME_CLASS, "string", "The class to use", "system");
\ No newline at end of file
+module("hostname", "Show the hostname of the system");
+option("class", HOSTNAME_CLASS, "string", "The class to use", "system");
diff --git a/modules/ip.php b/modules/ip.php
index 5060286..6c21e7d 100644
--- a/modules/ip.php
+++ b/modules/ip.php
@@ -10,5 +10,5 @@ function _ip(array $opts) {
     ];
     return panel($ip, $attr, 'ip');
 }
-module("ip", "Show the IP of a network device");
+module("ip", "Show the IP of a networking device");
 option("interface", IP_INTERFACE, "string", "The interface to dispaly", "eth0");
diff --git a/modules/status.php b/modules/status.php
index 0959622..0328a08 100644
--- a/modules/status.php
+++ b/modules/status.php
@@ -19,4 +19,4 @@ function _status(array $opts=[]) {
     return panel( $character, [ 'class'=>'shell', 'status' => ((LAST_STATUS>0)?'bad':'good') ], 'status' );
 }
 
-module("status", "Command status and root indicator");
+module("status", "Last command status and uid/root indicator");
diff --git a/modules/text.php b/modules/text.php
index b1db164..b4fe734 100644
--- a/modules/text.php
+++ b/modules/text.php
@@ -8,6 +8,6 @@ function _text(array $opts) {
     if ($opts[TEXT_CLASS]) $attr['class'] = $opts[TEXT_CLASS];
     return panel($opts[TEXT_TEXT], $attr, 'text');
 }
-module("text", "Show a text");
+module("text", "Show a static text");
 option("text", TEXT_TEXT, "string", "The text to dispaly", "Text");
-option("class", TEXT_CLASS, "string", "The class to use", "info");
\ No newline at end of file
+option("class", TEXT_CLASS, "string", "The class to use", "info");
diff --git a/modules/thermal.php b/modules/thermal.php
index 21899b3..e81539d 100644
--- a/modules/thermal.php
+++ b/modules/thermal.php
@@ -13,8 +13,8 @@ function _thermal(array $opts) {
     $attr['class'] = $opts[THERMAL_CLASS];
     return panel($text, $attr, 'thermal');
 }
-module("thermal", "Show thermal zone info");
+module("thermal", "Show thermal zone (cpu/gpu/chassis temperature) info from sysfs");
 option("zone", THERMAL_ZONE, OPT_TYPE_STRING, "Thermal zone (from /sys/class/thermal)", "thermal_zone0");
 option("format", THERMAL_FORMAT, OPT_TYPE_STRING, "Format", "%.1fºc");
 option("class", THERMAL_CLASS, OPT_TYPE_STRING, "The class to use", "system");
-seticon("thermal.icon", "");
\ No newline at end of file
+seticon("thermal.icon", "");
diff --git a/modules/time.php b/modules/time.php
index 8de9226..af1e14c 100644
--- a/modules/time.php
+++ b/modules/time.php
@@ -16,7 +16,7 @@ function _time(array $opts) {
     if ($opts[TIME_CLASS]) $attr['class'] = $opts[TIME_CLASS];
     return panel($time.@date($opts['format']), $attr, 'time');
 }
-module("time", "Show the current time and/or date");
+module("time", "Show the current time and/or date, and optionally an analog clock");
 option("format", TIME_FORMAT, OPT_TYPE_STRING, "The time format", "H:i");
 option("class", TIME_CLASS, OPT_TYPE_STRING, "The class to use", "info");
-option("analog", TIME_ANALOG, OPT_TYPE_BOOL, "Show an analog watch", false);
\ No newline at end of file
+option("analog", TIME_ANALOG, OPT_TYPE_BOOL, "Show an analog clock", false);
diff --git a/modules/tux.php b/modules/tux.php
index 1624631..6a3fe47 100644
--- a/modules/tux.php
+++ b/modules/tux.php
@@ -9,6 +9,6 @@ function _tux(array $opts) {
     if ($opts[TUX_CLASS]) $attr['class'] = $opts[TUX_CLASS];
     return panel(icon("tux.icon"), $attr, 'text');
 }
-module("tux", "Show a tux");
+module("tux", "Add a cute penguin to your prompt");
 option("class", TUX_CLASS, "string", "The class to use", "tux");
 seticon("tux.icon", "🐧");
diff --git a/modules/username.php b/modules/username.php
index 3078633..47bea13 100644
--- a/modules/username.php
+++ b/modules/username.php
@@ -9,6 +9,6 @@ function _username(array $opts) {
     $user = trim(exec("whoami"));
     return panel(icon("username.icon").$user, $attr, 'username');
 }
-module("username", "Username");
+module("username", "The currently logged in/active username");
 option("class", USERNAME_CLASS, "string", "The class to use", "user");
-seticon("username.icon", "");
\ No newline at end of file
+seticon("username.icon", "");