diff --git a/common/locale/en-US/autocommands.xml b/common/locale/en-US/autocommands.xml
index 359aeacc..260eb074 100644
--- a/common/locale/en-US/autocommands.xml
+++ b/common/locale/en-US/autocommands.xml
@@ -90,16 +90,20 @@
 
 <p>Enable <em>passthrough</em> mode on all Google sites:</p>
 
-<code><ex>:autocmd LocationChange</ex> <str delim="'">google\.com</str> <hl key="HelpArg">-js</hl> modes.set(modes.PASS_THROUGH)</code>
+<code><ex>:autocmd LocationChange</ex> <str delim="">google.com</str> <ex>:normal!</ex> <k name="C-z"/></code>
 
 <p>Enable <em>passthrough</em> mode on <em>some</em> Google sites:</p>
 
-<code><ex>:autocmd LocationChange</ex> <str delim="'">(www|mail)\.google\.com</str> <hl key="HelpArg">-js</hl> modes.set(modes.PASS_THROUGH)</code>
+<code><ex>:autocmd LocationChange</ex> <str delim="'">^https?://(www|mail)\.google\.com/</str> <ex>:normal!</ex> <k name="C-z"/></code>
+
+<p>or</p>
+
+<code><ex>:autocmd LocationChange</ex> <str delim="">www.google.com</str>,<str delim="">mail.google.com</str> <ex>:normal!</ex> <k name="C-z"/></code>
 
 <p>Set the filetype to mail when editing email at Gmail:</p>
 
-<code><ex>:autocmd LocationChange</ex> !<str delim="'">mail\.google\.com</str> <se opt="editor"><str>gvim -f</str></se>
-<ex>:autocmd LocationChange</ex> <str delim="'">mail\.google\.com</str> <se opt="editor"><str>gvim -f -c 'set ft=mail'</str></se></code>
+<code><ex>:autocmd LocationChange</ex> !<str delim="">mail.google.com</str>,<str delim="">*</str> <se opt="editor" op="&amp;"/>
+<ex>:autocmd LocationChange</ex> <str delim="'">mail.google.com</str> <se opt="editor"><str>gvim -f -c 'set ft=mail' +&lt;line></str></se></code>
 
 </document>
 
diff --git a/common/locale/en-US/eval.xml b/common/locale/en-US/eval.xml
index 79dd021a..d10fd02f 100644
--- a/common/locale/en-US/eval.xml
+++ b/common/locale/en-US/eval.xml
@@ -89,7 +89,10 @@
 <item>
     <tags>:js :javas :javascript</tags>
     <spec>:javas<oa>cript</oa> <a>cmd</a></spec>
-    <spec>:javascript &lt;&lt;<a>endpattern</a>\n<a>cmd</a>\n<a>endpattern</a></spec>
+    <spec style="white-space: pre; height: 1.6em; overflow: visible;">:javascript &lt;&lt;<a>endpattern</a>
+  <a>cmd</a>
+  ...
+<a>endpattern</a></spec>
     <description>
         <p>
             Evaluates the given <a>cmd</a> as JavaScript. Behaves exactly as
@@ -197,6 +200,7 @@
 
 <item>
     <tags>:if</tags>
+    <strut/>
     <spec>:if <a>expr</a></spec>
     <description>
         <p>
@@ -210,7 +214,7 @@
 <item>
     <tags>:endif :en :fi</tags>
     <spec>:en<oa>dif</oa></spec>
-    <description>
+    <description short="true">
         <p>
             Ends a string of <ex>:if</ex>/<ex>:elseif</ex>/<ex>:else</ex>
             conditionals.
@@ -232,6 +236,7 @@
 
 <item>
     <tags>:else :el</tags>
+    <strut/>
     <spec>:el<oa>se</oa></spec>
     <description>
         <p>
diff --git a/common/locale/en-US/gui.xml b/common/locale/en-US/gui.xml
index ed6e13e9..9bb1151c 100644
--- a/common/locale/en-US/gui.xml
+++ b/common/locale/en-US/gui.xml
@@ -248,7 +248,7 @@
         as per &dactyl.host;. The color of the status bar also changes to reflect the
         current security status of the loaded page.
         <dl>
-            <dt style="border:1px solid white" dactyl:highlight="StatusLine">black</dt>
+            <dt style="border:1px solid white" dactyl:highlight="StatusLineNormal">black</dt>
             <dd>The site's identity is unverified and the connection is unencrypted</dd>
 
             <dt style="border:1px solid white" dactyl:highlight="StatusLineBroken">red</dt>
diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index c046d553..f83b99b1 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -154,23 +154,23 @@
 </item>
 
 <item>
-    <tags>:unm :unmap</tags>
     <spec>:unmap <a>lhs</a></spec>
+    <tags>:unm :unmap</tags>
     <spec>:unmap!</spec>
-    <tags>:nun :nunmap</tags>
     <spec>:nun<oa>map</oa> <a>lhs</a></spec>
+    <tags>:nun :nunmap</tags>
     <spec>:nun<oa>map</oa>!</spec>
-    <tags>:vun :vunmap</tags>
     <spec>:vun<oa>map</oa> <a>lhs</a></spec>
+    <tags>:vun :vunmap</tags>
     <spec>:vun<oa>map</oa>!</spec>
-    <tags>:iu :iunmap</tags>
     <spec>:iu<oa>nmap</oa> <a>lhs</a></spec>
+    <tags>:iu :iunmap</tags>
     <spec>:iu<oa>nmap</oa>!</spec>
-    <tags>:tu :tunmap</tags>
     <spec>:tu<oa>nmap</oa> <a>lhs</a></spec>
+    <tags>:tu :tunmap</tags>
     <spec>:tu<oa>nmap</oa>!</spec>
-    <tags>:cu :cunmap</tags>
     <spec>:cu<oa>nmap</oa> <a>lhs</a></spec>
+    <tags>:cu :cunmap</tags>
     <spec>:cu<oa>nmap</oa>!</spec>
     <description>
         <p>Remove the mapping of <a>lhs</a> (or all mappings if <oa>!</oa> is
diff --git a/common/locale/en-US/repeat.xml b/common/locale/en-US/repeat.xml
index 3170c1c6..b14b8a8a 100644
--- a/common/locale/en-US/repeat.xml
+++ b/common/locale/en-US/repeat.xml
@@ -110,9 +110,8 @@
 
 <item>
     <tags><![CDATA[<sleep> <A-m>s]]></tags>
-    <strut/>
     <spec><a>count</a><![CDATA[<A-m>s]]></spec>
-    <description>
+    <description short="true">
         <p>
             Sleep for <a>count</a> milliseconds before resuming playback.
         </p>
diff --git a/common/locale/en-US/styling.xml b/common/locale/en-US/styling.xml
index ecd89d18..eda39bbf 100644
--- a/common/locale/en-US/styling.xml
+++ b/common/locale/en-US/styling.xml
@@ -185,15 +185,16 @@
 
 <item>
     <tags>:dels :delstyle</tags>
+    <strut/>
     <spec>:dels<oa>tyle</oa><oa>!</oa> <oa>-name=<a>name</a></oa> <oa>-index=<a>index</a></oa> <oa>filter</oa> <oa>css</oa></spec>
     <description>
         <p>
             Delete any matching styles. With <oa>!</oa>, delete all styles.
             If <oa>filter</oa> is provided, only matching elements of the
             filter are disabled. For instance, when run with a filter
-            <str>mozilla.org</str>, an existing style with a filter
-            <str>www.google.com,mozilla.org</str>, will result in a style for
-            <str>www.google.com</str>.
+            <str delim="">mozilla.org</str>, an existing style with a filter
+            <str delim="">www.google.com,mozilla.org</str>, will result in a style for
+            <str delim="">www.google.com</str>.
         </p>
 
         <p>The available options are:</p>