diff --git a/common/content/help.xsl b/common/content/help.xsl
index 87c1597b..55dde166 100644
--- a/common/content/help.xsl
+++ b/common/content/help.xsl
@@ -296,11 +296,15 @@
         <xsl:param name="contents" select="text()"/>
         <xsl:variable name="tag" select="$contents"/>
         <a style="color: inherit;">
-            <xsl:if test="@link != 'false'">
-                <xsl:attribute name="href">dactyl://help-tag/<xsl:value-of select="$tag"/></xsl:attribute>
-            </xsl:if>
-            <xsl:if test="contains(ancestor::*/@document-tags, concat(' ', $tag, ' '))">
-                <xsl:attribute name="href">#<xsl:value-of select="$tag"/></xsl:attribute>
+            <xsl:if test="1">
+                <xsl:choose>
+                    <xsl:when test="contains(ancestor::*/@document-tags, concat(' ', $tag, ' '))">
+                        <xsl:attribute name="href">#<xsl:value-of select="$tag"/></xsl:attribute>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:attribute name="href">dactyl://help-tag/<xsl:value-of select="$tag"/></xsl:attribute>
+                    </xsl:otherwise>
+                </xsl:choose>
             </xsl:if>
             <xsl:value-of select="$contents"/>
         </a>
diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS
index b7c7806a..5e039a46 100644
--- a/pentadactyl/NEWS
+++ b/pentadactyl/NEWS
@@ -157,7 +157,8 @@
         a boolean. [b2]
       - 'mapleader' is now an option rather than a :let
         variable. [b4]
-      - 'passkeys' is now a sitemap rather than a regexpmap. [b6]
+      - 'passkeys' is now a sitemap with key chain support rather
+        than a regexpmap. [b6]
       - 'showmode' is now a regexplist. [b6]
       - 'showstatuslinks' and 'showtabline' are now string options. [b4]
     • IMPORTANT: Command script files now use the *.penta file extension. [b2]
diff --git a/pentadactyl/locale/en-US/intro.xml b/pentadactyl/locale/en-US/intro.xml
index 68823d47..b388c460 100644
--- a/pentadactyl/locale/en-US/intro.xml
+++ b/pentadactyl/locale/en-US/intro.xml
@@ -126,25 +126,25 @@
 </ol>
 
 <ul tag="features-list" replace="features-list">
-    <li>Vim-like keybindings (<k>h</k>, <k>j</k>, <k>gg</k>, <k>ZZ</k>, <k name="C-f"/>, etc.)</li>
-    <li>Ex commands (<ex>:quit</ex>, <ex>:open www.foo.com</ex>, …)</li>
-    <li>Tab completion for all commands, highly configurable via <o>wildmode</o>, <o>autocomplete</o>, ...</li>
-    <li>Hit-a-hint like navigation of links (start with <k>f</k> to follow a link)</li>
-    <li>Advanced completion of bookmark and history URLs</li>
-    <li>Vim-like status line with a Wget-like progress bar</li>
-    <li>Minimal GUI (easily hide superfluous menubar and toolbar with <se opt="guioptions"/>)</li>
+    <li>Vim-like key bindings (<k>h</k>, <k>j</k>, <k>gg</k>, <k>ZZ</k>, <k name="C-f"/>, etc.)</li>
+    <li><link topic="cmdline.xml">Ex commands</link> (<ex>:quit</ex>, <ex>:open www.foo.com</ex>, …)</li>
+    <li>Powerful tab completion for all commands and options</li>
+    <li>Powerful <t>privacy</t> features</li>
+    <li><link topic="pattern.xml">Page search</link> with many fixes for long-standing Firefox annoyances</li>
+    <li>Quick and powerful <link topic="hints">keyboard navigation</link> for links, input fields, etc.</li>
+    <li>Vim-like <link topic="status-line">status line</link></li>
+    <li>Keyboard <t>macros</t>, along with custom key mappings and commands</li>
+    <li>Minimal GUI, along with commands to <link href=":toolbarhide">hide</link> and <link href=":toolbartoggle">toggle</link> toolbars and menus</li>
     <li>Ability to <ex>:source</ex> JavaScript, CSS, and &dactyl.appName; command files</li>
-    <li>Easy quick searches (see <ex>:open</ex>)</li>
-    <li>Count supported for many commands (<em>3</em><k name="C-o"/> will go back 3 pages)</li>
+    <li>Ability to <link topic="marks">mark</link> the current page position and return to it</li>
+    <li>Count support for many commands (<tt>3</tt><k name="C-o"/> will go back <tt>3</tt> pages)</li>
     <li>Visual bell for errors (<o>visualbell</o>)</li>
-    <li>Marks support (<k>m</k><em>a</em> to set mark a, <k>'</k><em>a</em> to jump to it)</li>
+    <li><link topic="marks">Marks</link> support (<k>m</k><tt>M</tt> to set mark <tt>M</tt>, <k>'</k><tt>M</tt> to jump to it)</li>
     <li><link topic="quickmarks">QuickMark</link> support</li>
-    <li><ex>:map</ex>, <ex>:command</ex>, <ex>:normal</ex>, and <t>macros</t></li>
     <li><link topic="i_&lt;C-i>">Editing of text fields</link> with an <link topic="'editor'">external editor</link></li>
-    <li>AutoCommands to execute actions on certain events</li>
-    <li>A comprehensive help system, explaining all commands, mappings, options, and plugins</li>
+    <li><link topic="autocommands">AutoCommands</link> to execute actions on certain events</li>
+    <li>A comprehensive help system, explaining all <link topic="cmdline.xml">commands</link>, <link topic="mapping">mappings</link>, <t>options</t>, and <t>plugins</t></li>
 </ul>
-
 </overlay>
 
 <!-- vim:se sts=4 sw=4 et: -->