diff --git a/common/components/protocols.js b/common/components/protocols.js
index 201d410f..4de60567 100644
--- a/common/components/protocols.js
+++ b/common/components/protocols.js
@@ -151,16 +151,16 @@ function Liberator()
 
     function parseHelpTags(namespaces)
     {
+        HELP_FILES = [];
         NAMESPACES = Array.slice(namespaces);
-        let files = xpath(
-                XSLTProcessor("chrome://liberator/content/overlay.xsl")
-                        .transformToDocument(httpGet(self.FILE_MAP.all).responseXML),
-                "//liberator:include/@href");
-        self.HELP_TAGS.all = "all";
         const XSLT = XSLTProcessor("chrome://liberator/content/help.xsl");
-        for each (let file in files)
+        self.HELP_TAGS.all = "all";
+        for each (let namespace in NAMESPACES)
         {
-            try
+            let files = xpath(
+                    httpGet("chrome://" + namespace + "/locale/all.xml").responseXML,
+                    "//liberator:include/@href");
+            for each (let file in files)
             {
                 let [url, doc] = findHelpFile(file.value);
                 if (doc)
@@ -168,14 +168,9 @@ function Liberator()
                 doc = XSLT.transformToDocument(doc);
                 for (let elem in xpath(doc, "//liberator:tag/text()"))
                     self.HELP_TAGS[elem.textContent] = file.value;
-            }
-            catch (e)
-            {
-                Components.utils.reportError(e);
-                dump(e + "\n");
+                HELP_FILES.push(file.value);
             }
         }
-        HELP_FILES = Array.slice(files);
     }
 }
 Liberator.prototype = {
diff --git a/common/locale/en-US/all.xml b/common/locale/en-US/all.xml
index a84c618f..1398c78c 100644
--- a/common/locale/en-US/all.xml
+++ b/common/locale/en-US/all.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="chrome://liberator/content/help.xsl"?>
+<?xml-stylesheet type="text/xsl" href="chrome://liberator/content/overlay.xsl"?>
 
 <!DOCTYPE document SYSTEM "chrome://liberator/content/liberator.dtd">
 
@@ -11,47 +11,26 @@
 <tags>all</tags>
 
 <include href="intro" tag="intro.html"/>
-
 <include href="starting" tag="starting.html"/>
-
 <include href="browsing" tag="browsing.html"/>
-
 <include href="buffer" tag="buffer.html"/>
-
 <include href="cmdline" tag="cmdline.html"/>
-
 <include href="insert" tag="insert.html"/>
-
 <include href="options" tag="options.html"/>
-
 <include href="pattern" tag="pattern.html"/>
-
 <include href="tabs" tag="tabs.html"/>
-
 <include href="hints" tag="hints.html"/>
-
 <include href="map" tag="map.html"/>
-
 <include href="eval" tag="eval.html"/>
-
 <include href="marks" tag="marks.html"/>
-
 <include href="repeat" tag="repeat.html"/>
-
 <include href="autocommands" tag="autocommands.html"/>
-
 <include href="print" tag="print.html"/>
-
 <include href="gui" tag="gui.html"/>
-
 <include href="styling" tag="styling.html"/>
-
 <include href="message" tag="message.html"/>
-
 <include href="developer" tag="developer.html"/>
-
 <include href="various" tag="various.html"/>
-
 <include href="index" tag="index.html"/>
 
 </document>