diff --git a/common/content/base.dtd b/common/content/base.dtd
index cd548f6a..aed97f89 100644
--- a/common/content/base.dtd
+++ b/common/content/base.dtd
@@ -11,6 +11,7 @@
 <!ENTITY dactyl.plugins "http://dactyl.sf.net/&dactyl.name;/plugins">
 <!ENTITY dactyl.list.mailto "&dactyl.name;@googlegroups.com">
 <!ENTITY dactyl.list.href "http://groups.google.com/group/&dactyl.name;">
+<!ENTITY dactyl.faq "&dactyl.home;&dactyl.name;/faq">
 
 <!ENTITY xmlns.dactyl "http://vimperator.org/namespaces/liberator">
 <!ENTITY xmlns.html   "http://www.w3.org/1999/xhtml">
diff --git a/common/locale/en-US/autocommands.xml b/common/locale/en-US/autocommands.xml
index e11bce4e..eeddb675 100644
--- a/common/locale/en-US/autocommands.xml
+++ b/common/locale/en-US/autocommands.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Autocommands"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="autocommands">Automatic commands</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/browsing.xml b/common/locale/en-US/browsing.xml
index a3845904..0b2ebe7e 100644
--- a/common/locale/en-US/browsing.xml
+++ b/common/locale/en-US/browsing.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Browsing"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="surfing browsing">Browsing</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/buffer.xml b/common/locale/en-US/buffer.xml
index ba03a5d0..4f2ca2db 100644
--- a/common/locale/en-US/buffer.xml
+++ b/common/locale/en-US/buffer.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Buffer"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="buffer document">Buffer</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/cmdline.xml b/common/locale/en-US/cmdline.xml
index 6331a911..2a9e3e1c 100644
--- a/common/locale/en-US/cmdline.xml
+++ b/common/locale/en-US/cmdline.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Command-line"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="command-line-mode command-line mode-cmdline">Command-line mode</h1>
 <toc start="2"/>
 
@@ -247,7 +248,7 @@
     <dd>
         This is the most basic quoting character. When it is encountered
         outside of single or double quotes, it forces the next character to be
-        interpreted literally. So, for instance, <tt>\\</tt> ⇒ <tt>\</tt>, 
+        interpreted literally. So, for instance, <tt>\\</tt> ⇒ <tt>\</tt>,
         <tt>\'</tt> ⇒ <tt>'</tt>, <tt>\a</tt> ⇒ <tt>a</tt>, and
         <tt>\␣</tt> ⇒ <tt>␣</tt>.
     </dd>
diff --git a/common/locale/en-US/developer.xml b/common/locale/en-US/developer.xml
index c9002018..32e443f9 100644
--- a/common/locale/en-US/developer.xml
+++ b/common/locale/en-US/developer.xml
@@ -10,6 +10,7 @@
     title="&dactyl.appName; Developer information"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="developer-information developer">Developer information</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/eval.xml b/common/locale/en-US/eval.xml
index a5baf115..22350366 100644
--- a/common/locale/en-US/eval.xml
+++ b/common/locale/en-US/eval.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Expression Evaluation"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="expression expr eval javascript">Expression evaluation</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/gui.xml b/common/locale/en-US/gui.xml
index 4ffb610e..0db9b588 100644
--- a/common/locale/en-US/gui.xml
+++ b/common/locale/en-US/gui.xml
@@ -9,6 +9,7 @@
     xmlns="&xmlns.dactyl;"
     xmlns:dactyl="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="gui">&dactyl.host;'s GUI</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/hints.xml b/common/locale/en-US/hints.xml
index 0bbc3785..df356602 100644
--- a/common/locale/en-US/hints.xml
+++ b/common/locale/en-US/hints.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Hints"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="quick-hints hints">Hints</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/index.xml b/common/locale/en-US/index.xml
index d3ceee99..19a2c28e 100644
--- a/common/locale/en-US/index.xml
+++ b/common/locale/en-US/index.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Index"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="index">Index</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/insert.xml b/common/locale/en-US/insert.xml
index 4c6d6b1e..26658d16 100644
--- a/common/locale/en-US/insert.xml
+++ b/common/locale/en-US/insert.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Insert Mode"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="insert-mode insert mode-insert">Insert mode</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index a2db7d05..14d35358 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Key Mappings"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="keyboard-shortcuts">Keyboard shortcuts and commands</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/marks.xml b/common/locale/en-US/marks.xml
index 3e628196..bafc80fc 100644
--- a/common/locale/en-US/marks.xml
+++ b/common/locale/en-US/marks.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Marks"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="marks">Marks</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/message.xml b/common/locale/en-US/message.xml
index 39cb55ce..10dd79a8 100644
--- a/common/locale/en-US/message.xml
+++ b/common/locale/en-US/message.xml
@@ -9,6 +9,7 @@
     xmlns="&xmlns.dactyl;"
     xmlns:dactyl="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="messages">Error and informational messages</h1>
 
 <tags>message-history</tags>
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index d260f7df..43718186 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -16,6 +16,7 @@
     title="&dactyl.appName; Options"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="options">Options</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/pattern.xml b/common/locale/en-US/pattern.xml
index f25a754f..a123093d 100644
--- a/common/locale/en-US/pattern.xml
+++ b/common/locale/en-US/pattern.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Patterns"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="text-search-commands">Text search commands</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/print.xml b/common/locale/en-US/print.xml
index 2df3ee7e..0712aa23 100644
--- a/common/locale/en-US/print.xml
+++ b/common/locale/en-US/print.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Printing"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="printing">Printing</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/repeat.xml b/common/locale/en-US/repeat.xml
index 5533f47c..2581d7b1 100644
--- a/common/locale/en-US/repeat.xml
+++ b/common/locale/en-US/repeat.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Repeating Commands"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="repeating">Repeating commands</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/starting.xml b/common/locale/en-US/starting.xml
index 661cb2c2..04371481 100644
--- a/common/locale/en-US/starting.xml
+++ b/common/locale/en-US/starting.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Starting"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="starting">Starting &dactyl.appName;</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/styling.xml b/common/locale/en-US/styling.xml
index 0776c7e0..b06b478b 100644
--- a/common/locale/en-US/styling.xml
+++ b/common/locale/en-US/styling.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Styling"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="styling">Styling the GUI and web pages</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/tabs.xml b/common/locale/en-US/tabs.xml
index c84a89f8..8d3e36c5 100644
--- a/common/locale/en-US/tabs.xml
+++ b/common/locale/en-US/tabs.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Tabs"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1 tag="tabs buffers">Tabs and buffers</h1>
 <toc start="2"/>
 
diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml
index 701b0f0c..a491b58c 100644
--- a/common/locale/en-US/various.xml
+++ b/common/locale/en-US/various.xml
@@ -8,6 +8,7 @@
     title="&dactyl.appName; Other"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
+
 <h1>Other help</h1>
 <toc start="2"/>
 
diff --git a/melodactyl/locale/en-US/all.xml b/melodactyl/locale/en-US/all.xml
index c94a1a9c..6af00427 100644
--- a/melodactyl/locale/en-US/all.xml
+++ b/melodactyl/locale/en-US/all.xml
@@ -4,8 +4,8 @@
 <!DOCTYPE overlay SYSTEM "chrome://dactyl/content/dactyl.dtd">
 
 <overlay
-    xmlns="http://vimperator.org/namespaces/liberator"
-    xmlns:html="http://www.w3.org/1999/xhtml">
+    xmlns="&xmlns.dactyl;"
+    xmlns:html="&xmlns.html;">
 
 <include href="player" tag="player.html" insertafter="intro.html"/>
 
diff --git a/melodactyl/locale/en-US/autocommands.xml b/melodactyl/locale/en-US/autocommands.xml
index 83df5128..41b455be 100644
--- a/melodactyl/locale/en-US/autocommands.xml
+++ b/melodactyl/locale/en-US/autocommands.xml
@@ -4,8 +4,8 @@
 <!DOCTYPE overlay SYSTEM "chrome://dactyl/content/dactyl.dtd">
 
 <overlay
-    xmlns="http://vimperator.org/namespaces/liberator"
-    xmlns:html="http://www.w3.org/1999/xhtml">
+    xmlns="&xmlns.dactyl;"
+    xmlns:html="&xmlns.html;">
 
 <dl tag="autocommand-list" replace="autocommand-list">
     <dt>BookmarkAdd</dt>   <dd>Triggered after a page is bookmarked</dd>
diff --git a/melodactyl/locale/en-US/browsing.xml b/melodactyl/locale/en-US/browsing.xml
index b97a400a..94c384da 100644
--- a/melodactyl/locale/en-US/browsing.xml
+++ b/melodactyl/locale/en-US/browsing.xml
@@ -4,8 +4,8 @@
 <!DOCTYPE overlay SYSTEM "chrome://dactyl/content/dactyl.dtd">
 
 <overlay
-    xmlns="http://vimperator.org/namespaces/liberator"
-    xmlns:html="http://www.w3.org/1999/xhtml">
+    xmlns="&xmlns.dactyl;"
+    xmlns:html="&xmlns.html;">
 
 <span replace="w"/>
 <span replace="W"/>
diff --git a/melodactyl/locale/en-US/gui.xml b/melodactyl/locale/en-US/gui.xml
index 2947895e..0bbff3cc 100644
--- a/melodactyl/locale/en-US/gui.xml
+++ b/melodactyl/locale/en-US/gui.xml
@@ -4,8 +4,8 @@
 <!DOCTYPE overlay SYSTEM "chrome://dactyl/content/dactyl.dtd">
 
 <overlay
-    xmlns="http://vimperator.org/namespaces/liberator"
-    xmlns:html="http://www.w3.org/1999/xhtml">
+    xmlns="&xmlns.dactyl;"
+    xmlns:html="&xmlns.html;">
 
 <dl tag="dialog-list" replace="dialog-list">
     <dt>about</dt>           <dd>About &dactyl.host;</dd>
diff --git a/melodactyl/locale/en-US/player.xml b/melodactyl/locale/en-US/player.xml
index 4342a897..7951276c 100644
--- a/melodactyl/locale/en-US/player.xml
+++ b/melodactyl/locale/en-US/player.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
-    name="browsing"
-    title="&dactyl.appName; Browsing"
-    xmlns="http://vimperator.org/namespaces/liberator"
-    xmlns:html="http://www.w3.org/1999/xhtml">
+    name="player"
+    title="&dactyl.appName; Player mode"
+    xmlns="&xmlns.dactyl;"
+    xmlns:html="&xmlns.html;">
+
 <h1 tag="player-mode player">Player mode</h1>
 <toc start="2"/>
 
diff --git a/melodactyl/locale/en-US/tabs.xml b/melodactyl/locale/en-US/tabs.xml
index 677d0e65..6f376b4d 100644
--- a/melodactyl/locale/en-US/tabs.xml
+++ b/melodactyl/locale/en-US/tabs.xml
@@ -4,8 +4,8 @@
 <!DOCTYPE overlay SYSTEM "chrome://dactyl/content/dactyl.dtd">
 
 <overlay
-    xmlns="http://vimperator.org/namespaces/liberator"
-    xmlns:html="http://www.w3.org/1999/xhtml">
+    xmlns="&xmlns.dactyl;"
+    xmlns:html="&xmlns.html;">
 
 <span replace=":window"/>
 <span replace=":u"/>
diff --git a/pentadactyl/locale/en-US/intro.xml b/pentadactyl/locale/en-US/intro.xml
index 0544a8ca..74187959 100644
--- a/pentadactyl/locale/en-US/intro.xml
+++ b/pentadactyl/locale/en-US/intro.xml
@@ -172,7 +172,7 @@
     where we will do our best to answer any inquiries. You can also
     check the
     <link topic="http://code.google.com/p/dactyl/wiki">wiki</link> or
-    <link topic="http://dactyl.sourceforge.net/pentadactyl/faq">FAQ</link>.
+    <link topic="&dactyl.faq;">FAQ</link>.
     Issue reports can be entered in the
     <link topic="&dactyl.issues;">issue tracker</link>.
 </p>
diff --git a/pentadactyl/locale/en-US/tutorial.xml b/pentadactyl/locale/en-US/tutorial.xml
index dbe609ba..8d5a6e3a 100644
--- a/pentadactyl/locale/en-US/tutorial.xml
+++ b/pentadactyl/locale/en-US/tutorial.xml
@@ -8,8 +8,8 @@
     title="&dactyl.appName; Tutorial"
     xmlns="&xmlns.dactyl;"
     xmlns:html="&xmlns.html;">
-<!-- Initial revision: Sun Jun  8 10:07:05 UTC 2008 (penryu) -->
 
+<!-- Initial revision: Sun Jun  8 10:07:05 UTC 2008 (penryu) -->
 <h1 tag="tutorial">Quick-start tutorial</h1>
 
 <html:p style="text-align: center">
diff --git a/teledactyl/locale/en-US/all.xml b/teledactyl/locale/en-US/all.xml
index b5dd23e2..cd195af1 100644
--- a/teledactyl/locale/en-US/all.xml
+++ b/teledactyl/locale/en-US/all.xml
@@ -4,8 +4,8 @@
 <!DOCTYPE overlay SYSTEM "chrome://dactyl/content/dactyl.dtd">
 
 <overlay
-    xmlns="http://vimperator.org/namespaces/liberator"
-    xmlns:html="http://www.w3.org/1999/xhtml">
+    xmlns="&xmlns.dactyl;"
+    xmlns:html="&xmlns.html;">
 </overlay>
 
 <!-- vim:se sts=4 sw=4 et: -->
diff --git a/teledactyl/locale/en-US/autocommands.xml b/teledactyl/locale/en-US/autocommands.xml
index 54cbe21c..638d1950 100644
--- a/teledactyl/locale/en-US/autocommands.xml
+++ b/teledactyl/locale/en-US/autocommands.xml
@@ -4,8 +4,8 @@
 <!DOCTYPE overlay SYSTEM "chrome://dactyl/content/dactyl.dtd">
 
 <overlay
-    xmlns="http://vimperator.org/namespaces/liberator"
-    xmlns:html="http://www.w3.org/1999/xhtml">
+    xmlns="&xmlns.dactyl;"
+    xmlns:html="&xmlns.html;">
 
 <dl tag="autocommand-list" replace="autocommand-list">
     <dt>ColorScheme</dt>       <dd>Triggered after a color scheme has been loaded</dd>
diff --git a/teledactyl/locale/en-US/gui.xml b/teledactyl/locale/en-US/gui.xml
index 67985296..32c7d8be 100644
--- a/teledactyl/locale/en-US/gui.xml
+++ b/teledactyl/locale/en-US/gui.xml
@@ -4,8 +4,8 @@
 <!DOCTYPE overlay SYSTEM "chrome://dactyl/content/dactyl.dtd">
 
 <overlay
-    xmlns="http://vimperator.org/namespaces/liberator"
-    xmlns:html="http://www.w3.org/1999/xhtml">
+    xmlns="&xmlns.dactyl;"
+    xmlns:html="&xmlns.html;">
 
 <dl tag="dialog-list" replace="dialog-list">
     <dt>about</dt>           <dd>About &dactyl.host;</dd>