diff --git a/content/completion.js b/content/completion.js
index 1bb8e8cb..daeaf0f5 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -290,7 +290,7 @@ vimperator.Completion = function () //{{{
         {
             var res = [];
             // they are sorted by relevance, not alphabetically
-            var files = ["intro.html", "starting.html", "browsing.html", "motion.html",
+            var files = ["intro.html", "starting.html", "browsing.html", "buffer.html",
                          "options.html", "tabs.html", "marks.html", "repeat.html",
                          "autocommands.html", "developer.html", "various.html"];
 
@@ -299,12 +299,12 @@ vimperator.Completion = function () //{{{
                 try
                 {
                     var xmlhttp = new XMLHttpRequest();
-                    xmlhttp.open("GET", "chrome://vimperator/locale/" + files[file], false);
+                    xmlhttp.open("GET", "chrome://" + vimperator.config.name.toLowerCase() + "/locale/" + files[file], false);
                     xmlhttp.send(null);
                 }
                 catch (e)
                 {
-                    vimperator.log("Error opening chrome://vimperator/locale/" + files[file], 1);
+                    vimperator.log("Error opening chrome://" + vimperator.config.name.toLowerCase() + "/locale/" + files[file], 1);
                     continue;
                 }
                 var doc = xmlhttp.responseXML;
diff --git a/content/muttator.js b/content/muttator.js
index 8bd867ca..2d5c7dff 100644
--- a/content/muttator.js
+++ b/content/muttator.js
@@ -27,13 +27,14 @@ the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
 vimperator.config = {
+    /*** required options, no checks done if they really exist, so be careful ***/
     name: "Muttator",
     hostApplication: "Thunderbird",
 
-	// this widget is focused when focusContent() is called
-	get mainWidget() { return GetThreadTree(); },
-    dialogs: [],
+    /*** optional options, there are checked for existance and a fallback provided  ***/
     features: ["mail", "hints"],
+	get mainWidget() { return GetThreadTree(); }, // focusContent() focuses this widget
+    dialogs: [],
     guioptions: { m: ["mail-toolbar-menubar2"], T: ["mail-bar2"], f: ["folderPaneBox", "folderpane_splitter"], F: ["folderPaneHeader"] }
 }
 
diff --git a/content/vimperator.js b/content/vimperator.js
index 553aec50..7b094c46 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -27,10 +27,13 @@ the terms of any one of the MPL, the GPL or the LGPL.
 }}} ***** END LICENSE BLOCK *****/
 
 vimperator.config = {
+    /*** required options, no checks done if they really exist, so be careful ***/
     name: "Vimperator",
     hostApplication: "Firefox",
-    dialogs: [],
+
+    /*** optional options, there are checked for existance and a fallback provided  ***/
     features: ["bookmarks", "history", "marks", "quickmarks", "hints", "tabs"],
+    dialogs: [],
     guioptions: { m: ["toolbar-menubar"], T: ["nav-bar"], b: ["PersonalToolbar"] }
 }
 
diff --git a/locale/en-US/buffer.txt b/locale/en-US/buffer.txt
new file mode 100644
index 00000000..819d7006
--- /dev/null
+++ b/locale/en-US/buffer.txt
@@ -0,0 +1,18 @@
+HEADER
+
+|buffer| |document| +
+
+Vimperator holds exactly one buffer object for each tab. It is usually an
+(X)HTML document with advanced features.
+
+section:Motion{nbsp}Commands[motion,scrolling]
+
+List mappings how to scroll the window.
+
+section:Copying{nbsp}Text[copying,yanking]
+
+When running in X11 the text of the following commands is not only copyied to
+the clipboard, but also put into the X11 selection, which can be pasted with
+the middle mouse button:
+
+// vim: set syntax=asciidoc:
diff --git a/locale/en-US/intro.txt b/locale/en-US/intro.txt
index ad668198..93e924a5 100644
--- a/locale/en-US/intro.txt
+++ b/locale/en-US/intro.txt
@@ -48,10 +48,10 @@ section:Help{nbsp}topics[overview]
 - help:Initialization[starting.html]: How vimperator starts up, where it reads the config file...
 - help:Browsing[browsing.html]: Basic mappings and commands needed for
   a browsing session (how to open a web page or go back in history).
-- help:Motion{nbsp}commands[motion.html]: How to efficiently scroll in
-  Vimperator.
-- help:Options[options.html]: A description of all options.
+- help:Buffer{nbsp}commands[buffer.html]: Operations on the current document like
+  scrolling or copying text.
 - help:Tabs[tabs.html]: Manage your tabbed browsing session.
+- help:Options[options.html]: A description of all options.
 - help:Marks[marks.html]: Usage of bookmarks, QuickMarks, and history.
 - help:Repeating{nbsp}commands[repeat.html]: Usage of macros to repeat
   recurring workflows.
diff --git a/locale/en-US/motion.txt b/locale/en-US/motion.txt
deleted file mode 100644
index 9e61aa82..00000000
--- a/locale/en-US/motion.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-HEADER
-
-|motion|
-
-List mappings how to scroll the window.
-
-// vim: set syntax=asciidoc: