diff --git a/common/content/commands.js b/common/content/commands.js
index 5c16bc8e..7ab0d4ba 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -204,7 +204,7 @@ const Command = Class("Command", {
     /** @property {string[]} All of this command's long and short names. */
     names: null,
 
-    /** @property {string} This command's description, as shown in :exusage */
+    /** @property {string} This command's description, as shown in :listcommands */
     description: "",
     /**
      * @property {function (Args)} The function called to execute this command.
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index bf2b0bdc..70540692 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -1716,13 +1716,6 @@ const Dactyl = Module("dactyl", {
             },
             { argCount: "?" });
 
-        commands.add(["exu[sage]"],
-            "List all Ex commands with a short description",
-            function (args) { Dactyl.showHelpIndex("ex-cmd-index", commands, args.bang); }, {
-                argCount: "0",
-                bang: true
-            });
-
         [
             {
                 name: "h[elp]",
@@ -1777,14 +1770,6 @@ const Dactyl = Module("dactyl", {
                 literal: 0
             });
 
-        commands.add(["optionu[sage]"],
-            "List all options with a short description",
-            function (args) { Dactyl.showHelpIndex("option-index", options, args.bang); },
-            {
-                argCount: "0",
-                bang: true
-            });
-
         commands.add(["q[uit]"],
             dactyl.has("tabs") ? "Quit current tab" : "Quit application",
             function (args) {
@@ -1961,12 +1946,6 @@ const Dactyl = Module("dactyl", {
                 bang: true
             });
 
-        commands.add(["viu[sage]"],
-            "List all mappings with a short description",
-            function (args) { Dactyl.showHelpIndex("normal-index", mappings, args.bang); }, {
-                argCount: "0",
-                bang: true
-            });
     },
 
     completion: function () {
diff --git a/common/content/mappings.js b/common/content/mappings.js
index db256085..8ab8fcc2 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -50,7 +50,7 @@ const Map = Class("Map", {
     names: null,
     /** @property {function (number)} The function called to execute this mapping. */
     action: null,
-    /** @property {string} This mapping's description, as shown in :viusage. */
+    /** @property {string} This mapping's description, as shown in :listkeys. */
     description: "",
 
     /** @property {boolean} Whether this mapping accepts an argument. */
diff --git a/common/content/options.js b/common/content/options.js
index c620676b..5759122b 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -270,7 +270,7 @@ const Option = Class("Option", {
     scope: 1, // Option.SCOPE_GLOBAL // XXX set to BOTH by default someday? - kstep
 
     /**
-     * @property {string} This option's description, as shown in :optionusage.
+     * @property {string} This option's description, as shown in :listoptions.
      */
     description: "",
 
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index 6cea2fb0..95468c03 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -703,6 +703,22 @@
     </description>
 </item>
 
+<item>
+    <tags>'fc' 'findcase'</tags>
+    <spec>'findcase'</spec>
+    <type>string</type>
+    <default>smart</default>
+    <description>
+        <p>Find case matching mode.</p>
+
+        <dl>
+            <dt>ignore</dt> <dd>Case is never significant</dd>
+            <dt>match</dt> <dd>Case is always significant</dd>
+            <dt>smart</dt> <dd>Case is significant when capital letters are typed</dd>
+        </dl>
+    </description>
+</item>
+
 <item>
     <tags>'fh' 'followhints'</tags>
     <spec>'followhints' 'fh'</spec>
@@ -912,9 +928,9 @@
 </item>
 
 <item>
-    <tags>'nohls' 'nohlfind'</tags>
-    <tags>'hls' 'hlfind'</tags>
-    <spec>'hlfind' 'hls'</spec>
+    <tags>'nohlf' 'nohlfind'</tags>
+    <tags>'hlf' 'hlfind'</tags>
+    <spec>'hlfind' 'hlf'</spec>
     <type>boolean</type>
     <default>off</default>
     <description>
@@ -923,9 +939,9 @@
 </item>
 
 <item>
-    <tags>'nois' 'noincfind'</tags>
-    <tags>'is' 'incfind'</tags>
-    <spec>'incfind' 'is'</spec>
+    <tags>'noif' 'noincfind'</tags>
+    <tags>'if' 'incfind'</tags>
+    <spec>'incfind' 'if'</spec>
     <type>boolean</type>
     <default>on</default>
     <description>
@@ -1308,22 +1324,6 @@
     </description>
 </item>
 
-<item>
-    <tags>'sc' 'searchcase'</tags>
-    <spec>'searchcase'</spec>
-    <type>string</type>
-    <default>smart</default>
-    <description>
-        <p>Search case matching mode.</p>
-
-        <dl>
-            <dt>ignore</dt> <dd>Case is never significant</dd>
-            <dt>match</dt> <dd>Case is always significant</dd>
-            <dt>smart</dt> <dd>Case is significant when capital letters are typed</dd>
-        </dl>
-    </description>
-</item>
-
 <item>
     <tags>'shell' 'sh'</tags>
     <spec>'shell' 'sh'</spec>
diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml
index b45202ee..b3566a0a 100644
--- a/common/locale/en-US/various.xml
+++ b/common/locale/en-US/various.xml
@@ -285,34 +285,40 @@
 </item>
 
 <item>
-    <tags>:exu :exusage</tags>
-    <spec>:exu<oa>sage</oa><oa>!</oa></spec>
+    <tags>:lc :listcommands</tags>
+    <spec>:listc<oa>ommands</oa> <oa>filter</oa></spec>
+    <spec>:lc <oa>filter</oa></spec>
     <description>
         <p>
-            Show help on Ex commands. If <oa>!</oa> is given then the help is listed in the
-            command output window.
+            List all Ex commands matching <oa>filter</oa> along with their
+            short descriptions. The output contains links to the source code
+            definitions.
         </p>
     </description>
 </item>
 
 <item>
-    <tags>:optionu :optionusage</tags>
-    <spec>:optionu<oa>sage</oa><oa>!</oa></spec>
+    <tags>:lk :listkeys</tags>
+    <spec>:listk<oa>eys</oa> <oa>-mode <a>mode</a></oa> <oa>filter</oa></spec>
+    <spec>:lk <oa>-mode <a>mode</a></oa> <oa>filter</oa></spec>
     <description>
         <p>
-            Show help on options. If <oa>!</oa> is given then the help is listed in the command
-            output window.
+            List the key mappings defined for <a>mode</a> (Normal by default)
+            matching <oa>filter</oa> along with their short descriptions. The
+            output contains links to the source code definitions.
         </p>
     </description>
 </item>
 
 <item>
-    <tags>:viu :viusage</tags>
-    <spec>:viu<oa>sage</oa><oa>!</oa></spec>
+    <tags>:lo :listoptions</tags>
+    <spec>:listo<oa>ptions</oa> <oa>filter</oa></spec>
+    <spec>:lo <oa>filter</oa></spec>
     <description>
         <p>
-            Show help on Normal mode commands. If <oa>!</oa> is given then the help is listed in
-            the command output window.
+            List all options matching <oa>filter</oa> along with their short
+            descriptions. The output contains links to the source code
+            definitions.
         </p>
     </description>
 </item>
diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS
index 1b0a159a..3213a798 100644
--- a/pentadactyl/NEWS
+++ b/pentadactyl/NEWS
@@ -49,6 +49,11 @@
     * The concept of completion contexts is now exposed to the user
       (see :h :contexts), allowing for powerful and fine-grained
       completion system customization.
+    * :viusage, :optionusage and :exusage were replaced with :listkeys,
+      :listoptions and :listcommands, providing more powerful and
+      consistent interactive help facility (improvements include
+      listing keys for modes other than Normal, filtering the output
+      and linking to source locations).
     * IMPORTANT option changes:
       - 'cdpath' and 'runtimepath' no longer treat ",,"
         specially. Use "." instead.