diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js
index feabc514..8cea3067 100644
--- a/chrome/content/vimperator/help.js
+++ b/chrome/content/vimperator/help.js
@@ -164,15 +164,16 @@ table.settings th {\
                 ret += "<code>" +beg+ usage +end+ '</code><br/>';
             }
             ret += '</td><td>';
-            if (func)
-                ret += func.call(this, commands[i]);
             if (commands[i][SHORTHELP])
             {
-                if(func)
-                    ret += "<br/>";
                 ret += "<b>";
                 ret += commands[i][SHORTHELP]; // the help description
                 ret += "</b><br>";
+                if(func) // for settings whe print default values here, e.g.
+                {
+                    ret += func.call(this, commands[i]);
+                    ret += "<br/>";
+                }
                 if (commands[i][HELP])
                     ret += commands[i][HELP]; // the help description
             }
diff --git a/chrome/content/vimperator/settings.js b/chrome/content/vimperator/settings.js
index 4388800e..de6638d6 100644
--- a/chrome/content/vimperator/settings.js
+++ b/chrome/content/vimperator/settings.js
@@ -91,7 +91,7 @@ var g_settings = [/*{{{*/
         ["focusedhintstyle", "fhs"],
         ["focusedhintstyle", "fhs"],
         "CSS specification of focused hints appearance",
-        "null",
+        null,
         "string",
         null,
         function(value) { set_pref("focusedhintstyle", value); },
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 2f647608..209ec618 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -26,7 +26,7 @@ the provisions above, a recipient may use your version of this file under
 the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
-var g_vimperator_version  = "0.4 (CVS) [>=28/04/2007]";
+var g_vimperator_version  = "###VERSION### (created: ###date###)";
 
 const MODE_NORMAL = 1;
 const MODE_INSERT = 2;
diff --git a/install.rdf b/install.rdf
index de975f0f..99e4fab3 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
     <Description about="urn:mozilla:install-manifest">
 	<em:id>vimperator@mozdev.org</em:id>
 	<em:name>Vimperator</em:name>
-	<em:version>0.4</em:version>
+	<em:version>###VERSION###</em:version>
 	<em:description>Make Firefox work like Vim</em:description>
 	<em:creator>Martin Stubenschrott</em:creator>
 	<em:homepageURL>http://vimperator.mozdev.org</em:homepageURL>