diff --git a/mozilla/editor/dialogs/imagedlog.xml b/mozilla/editor/dialogs/imagedlog.xml
index dba9efe2b99..4940597b705 100644
--- a/mozilla/editor/dialogs/imagedlog.xml
+++ b/mozilla/editor/dialogs/imagedlog.xml
@@ -1,41 +1,54 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="EditorDialog.css" type="text/css"?>
-<!DOCTYPE dialog>
+<!DOCTYPE window SYSTEM "imagedlog.dtd">
 <window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/TR/REC-html40">
 
   <table xmlns="http://www.w3.org/TR/REC-html40">
     <tr>
-      <td width=500>
+      <td width="500">
         <fieldset><legend> Image Location and Name </legend>
           <input type="file" value=" Choose File... " size="50" length="50" maxlength="255" name="image.url" />
           <p/>
-          <xul:checkbox value="Leave Image at Original Location" disabled />
-          <xul:label>Leave Image at Original Location</xul:label>
-          <xul:checkbox value="Page Background" disabled />
-          <xul:label>Page Background</xul:label>
-          <input type="button" class=genericbutton value=" Edit Image " disabled />
+          <p>
+            <xul:checkbox value="Leave Image at Original Location" disabled />
+            Leave Image at Original Location
+
+            <xul:checkbox value="Page Background" disabled />
+            Page Background
+
+            <input type="button" class="genericbutton" value=" Edit Image " disabled />
+          </p>
+          
           <p/>
-          <xul:label>Alternative Text</xul:label>
-          <input type="text" size="30" length="30" maxlength="255" name="image.alttext" />
+          <p>
+            Alternative Text
+            <input type="text" size="30" length="30" maxlength="255" name="image.alttext" />
+          </p>
+
         </fieldset>
 
-        <table cellspacing=0 cellpadding=0 width="100%">
+        <table cellspacing="0" cellpadding="0" width="100%">
           <tr>
-            <td width="55%" valign=top>
+            <td width="55%" valign="top">
               <fieldset><legend> Dimensions </legend>
                 <p />
-                <xul:radio name="image.dimensionType" value="Original Size" checked />
-                <xul:label>Original Size</xul:label>
-                <br />
-                <xul:radio name="image.dimensionType" value="Custom Size" />
-                <xul:label>Custom Size</xul:label>
+                <p>
+                  <xul:radio name="image.dimensionType" value="Original Size" checked />
+                  Original Size
+                </p>
+                <p>
+                  <xul:radio name="image.dimensionType" value="Custom Size" />
+                  Custom Size
+                </p>
 
-                <table cellspacing=0 cellpadding=2 width="100%" valign=top>
+                <table cellspacing="0" cellpadding="2" width="100%" valign="top">
                   <tr>
-                    <td width=8></td>
-                    <td width=40 valign=middle align=right> Height </td>
-                    <td valign=middle>
+                    <td width="8"></td>
+                    <td width="40" valign="middle" align="right">
+                      <p>Height</p>
+                    </td>
+                    <td valign="middle">
                       <input type="text" size="4" length="4" maxlength="4" name="image.height" />
                       <select size="1" name="image.heightType">
                         <optgroup label="pixels">
@@ -48,8 +61,8 @@
 
                   <tr>
                   <td/>
-                  <td valign=middle align=right>
-                    <xul:label>Width</xul:label>
+                  <td valign="middle" align="right">
+                    <p>Width</p>
                   </td>
                   <td>
                     <input type="text" size="4" length="4" maxlength="4" name="image.width" />
@@ -66,8 +79,10 @@
                     <td/>
                     <td/>
                     <td>
-                      <xul:checkbox value="Constrain" disabled />
-                      <xul:label>Constrain</xul:label>
+                      <p>
+                        <xul:checkbox value="Constrain" disabled />
+                        Constrain
+                      </p>
                     </td>
                   </tr>
                 </table>
@@ -90,40 +105,40 @@
               <p/>
 
               <fieldset><legend> Space Around Image </legend>
-                <table cellspacing=0 cellpadding=2 width="100%">
-                  <tr valign=middle>
-                    <td align=right>
-                      <xul:label>Left and Right</xul:label>
+                <table cellspacing="0" cellpadding="2" width="100%">
+                  <tr valign="middle">
+                    <td align="right">
+                      <p>Left and Right</p>
                     </td>
                     <td>
                       <input type="text" size="4" length="4" maxlength="4" name="image.leftRightSpacing" />
                     </td>
                     <td>
-                      <xul:label>pixels</xul:label>
+                      <p>pixels</p>
                     </td>
                   </tr>
 
-                  <tr valign=middle>
+                  <tr valign="middle">
                     <td>
-                      <xul:label>Top and Bottom</xul:label>
+                      <p>Top and Bottom</p>
                     </td>
                     <td>
                       <input type="text" size="4" length="4" maxlength="4" name="image.topBottomSpacing" />
                     </td>
                     <td>
-                      <xul:label>pixels</xul:label>
+                      <p>pixels</p>
                     </td>
                   </tr>
 
-                  <tr valign=middle>
-                    <td align=right>
-                      <xul:label>Solid Border</xul:label>
+                  <tr valign="middle">
+                    <td align="right">
+                      <p>Solid Border</p>
                     </td>
                     <td>
                       <input type="text" size="4" length="4" maxlength="4" name="image.borderWidth" />
                     </td>
                     <td>
-                      <xul:label>pixels</xul:label>
+                      <p>pixels</p>
                     </td>
                   </tr>
                 </table>
@@ -134,10 +149,10 @@
 
           <tr>
             <td>
-              <input type="button" class=genericbutton value=" Remove Image Map " disabled />
+              <input type="button" class="genericbutton" value=" Remove Image Map " disabled />
             </td>
-            <td align=right>
-              <input type="button" class=genericbutton value=" Extra HTML... " disabled />
+            <td align="right">
+              <input type="button" class="genericbutton" value=" Extra HTML... " disabled />
             </td>
           </tr>
         </table>
diff --git a/mozilla/editor/dialogs/imageformatdlog.xml b/mozilla/editor/dialogs/imageformatdlog.xml
index e6c8ad7c539..5b31919223c 100644
--- a/mozilla/editor/dialogs/imageformatdlog.xml
+++ b/mozilla/editor/dialogs/imageformatdlog.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="EditorDialog.css" type="text/css"?>
-<!DOCTYPE dialog>
+<!DOCTYPE window SYSTEM "imageformatdlog.dtd">
 <window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/TR/REC-html40">
 
-  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing=10>
+  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing="10">
     <tr>
       <td>
 
-        <xul:label>File Name:</xul:label>
-        <br/>
+        <p>File Name:</p>
         <input type="text" size="40" length="40" maxlength="40" />
         <p/>
-        <xul:label>Pick a Format:</xul:label>
         <br/>
+        <p>Pick a Format:</p>
         <select width="100%" size="8" name="fileFormatList">
           <optgroup label="format">
             <option label="format1" value="format 1">Format 1</option>
diff --git a/mozilla/editor/dialogs/imagequalitydlog.xml b/mozilla/editor/dialogs/imagequalitydlog.xml
index 0245e80b562..dd0f8ba9a6a 100644
--- a/mozilla/editor/dialogs/imagequalitydlog.xml
+++ b/mozilla/editor/dialogs/imagequalitydlog.xml
@@ -1,23 +1,29 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="EditorDialog.css" type="text/css"?>
-<!DOCTYPE dialog>
+<!DOCTYPE window SYSTEM "imagequalitydlog.dtd">
 <window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/TR/REC-html40">
 
-  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing=20>
+  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing="20">
     <tr>
       <td>
-        <xul:label>Choose the quality for this image:</xul:label>
+        <p>Choose the quality for this image:</p>
         <p/>
         <xul:box>
-          <xul:radio name="imageQualityType" value="High" />
-          <xul:label>High Quality (bigger image file size, longest time to view)</xul:label>
-          <p/>
-          <xul:radio checked="true" name="imageQualityType" value="Medium" />
-          <xul:label>Medium Quality</xul:label>
-          <p/>
-          <xul:radio name="imageQualityType" value="Low" />
-          <xul:label>Low Quality (smaller image file size, shortest time to view</xul:label>
+          <p>
+            <xul:radio name="imageQualityType" value="High" />
+            High Quality (bigger image file size, longest time to view)
+          </p>
+          <br/>
+          <p>
+            <xul:radio checked="true" name="imageQualityType" value="Medium" />
+            Medium Quality
+          </p>
+          <br/>
+          <p>
+            <xul:radio name="imageQualityType" value="Low" />
+            Low Quality (smaller image file size, shortest time to view)
+          </p>
         </xul:box>
 
         <p/>
diff --git a/mozilla/editor/dialogs/linkdlog.xml b/mozilla/editor/dialogs/linkdlog.xml
index d2b92694aa6..2d7810d0e34 100644
--- a/mozilla/editor/dialogs/linkdlog.xml
+++ b/mozilla/editor/dialogs/linkdlog.xml
@@ -1,61 +1,70 @@
-<?xml version="1.0"?> 
-<?xml-stylesheet href="EditorDialog.css" type="text/css"?> 
-<!DOCTYPE dialog> 
+<?xml version="1.0"?>
+<?xml-stylesheet href="EditorDialog.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "linkdlog.dtd">
 <window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/TR/REC-html40"> 
+        xmlns:html="http://www.w3.org/TR/REC-html40">
 
-<table xmlns="http://www.w3.org/TR/REC-html40" > <tr> <td>
-  <p/>Linked Text
-  <input type="text" style="width:400px; margin:10px"/>
+  <table xmlns="http://www.w3.org/TR/REC-html40">
+    <tr>
+      <td>
+        <p>Linked Text</p>
+        <input type="text" style="width:400px; margin:10px"/>
 
-  <fieldset id=linkToSet><legend align="left"> Link to </legend>
-    <p/> URL or file location
-    <input type="file" id="linkURL" value=" Choose FileÉ " size="40" maxlength="255" cols="40" />
-    <input type="button" id="clearbutton" value=" Clear " disabled />
-  </fieldset>
+        <fieldset id="linkToSet"><legend align="left"> Link to </legend>
+          <p>URL or file location</p>
+          <input type="file" id="linkURL" value=" Choose FileÉ " size="40" maxlength="255" cols="40" />
+          <input type="button" id="clearbutton" value=" Clear " disabled />
+        </fieldset>
 
-  <fieldset id=targetSet><legend> Targets (optional) </legend>
-    
-    <table cellspacing=0 cellpadding=0 width="100%" valign=top >
-      <tr>
-        <td valign=top>
-          <fieldset id=targetLocation border-width=0><legend> Show Targets in: </legend>
-            <p/>
-            <xul:radio checked="true" name="linkTargettype" value="Current Page" />Current Page
-            <br/>
-            <xul:radio name="linkTargettype" value="Destination Page" />Destination Page
-            <p/>
-          </fieldset>
-        </td>
+        <fieldset id="targetSet"><legend> Targets (optional) </legend>
 
-        <td>
-          <fieldset id=targetList><legend> Link to a target on the page </legend>
-            <p/>
-            <select width="100%" size="5" name="linkTargetlist">
-              <optgroup label="dummy">
-                <option label="dummy1" value="Dummy 1">Item 1</option>
-                <option label="dummy2" value="Dummy 2">Item 2</option>
-                <option label="dummy3" value="Dummy 3">Item 3</option>
-                <option label="dummy4" value="Dummy 4">Item 4</option>
-                <option label="dummy5" value="Dummy 5">Item 5</option>
-                <option label="dummy6" value="Dummy 6">Item 6</option>
-              </optgroup>
-            </select>
-          </fieldset>
-        </td>
-      </tr>
-    
-    </table>
+          <table cellspacing="0" cellpadding="0" width="100%" valign="top">
+            <tr>
+              <td valign="top">
+                <fieldset id="targetLocation" border-width="0"><legend> Show Targets in: </legend>
+                  <p/>
+                  <p>
+                    <xul:radio checked="true" name="linkTargettype" value="Current Page" />
+                    Current Page
+                  </p>
+                  <br/>
+                  <p>
+                    <xul:radio name="linkTargettype" value="Destination Page" />
+                    Destination Page
+                  </p>
+                  <p/>
+                </fieldset>
+              </td>
 
-  </fieldset>
+              <td>
+                <fieldset id="targetList"><legend> Link to a target on the page </legend>
+                  <p/>
+                  <select width="100%" size="5" name="linkTargetlist">
+                    <optgroup label="dummy">
+                      <option label="dummy1" value="Dummy 1">Item 1</option>
+                      <option label="dummy2" value="Dummy 2">Item 2</option>
+                      <option label="dummy3" value="Dummy 3">Item 3</option>
+                      <option label="dummy4" value="Dummy 4">Item 4</option>
+                      <option label="dummy5" value="Dummy 5">Item 5</option>
+                      <option label="dummy6" value="Dummy 6">Item 6</option>
+                    </optgroup>
+                  </select>
+                </fieldset>
+              </td>
+            </tr>
 
-  <p/>
-  <input type="button" id="extrahtmlbutton" value=" Extra HTMLÉ " disabled />
-  <p/>
-  <input type="button" id="helpbutton" value=" Help " disabled />
-  <input type="button" id="cancelbutton" value=" Cancel " />
-  <input type="button" id="applybutton" value=" Apply " disabled />
-  <input type="button" id="okbutton" value=" OK " disabled />
-</td> </tr> </table>
+          </table>
+
+        </fieldset>
+
+        <p/>
+        <input type="button" id="extrahtmlbutton" value=" Extra HTMLÉ " disabled />
+        <p/>
+        <input type="button" id="helpbutton" value=" Help " disabled />
+        <input type="button" id="cancelbutton" value=" Cancel " />
+        <input type="button" id="applybutton" value=" Apply " disabled />
+        <input type="button" id="okbutton" value=" OK " disabled />
+      </td>
+    </tr>
+  </table>
 </window>
-
diff --git a/mozilla/editor/dialogs/numrangedlog.xml b/mozilla/editor/dialogs/numrangedlog.xml
index 8677d02e88b..8de3a382951 100644
--- a/mozilla/editor/dialogs/numrangedlog.xml
+++ b/mozilla/editor/dialogs/numrangedlog.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="EditorDialog.css" type="text/css"?>
-<!DOCTYPE dialog>
+<!DOCTYPE window SYSTEM "numrangedlog.dtd">
 <window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/TR/REC-html40">
 
-  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing=20>
+  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing="20">
     <tr>
       <td>
         image
       </td>
 
       <td>
-        <xul:label>The number you have entered is out of range.</xul:label>
+        <p>The number you have entered is out of range.</p>
         <p/>
-        <xul:label>Please enter a number between:</xul:label>
+        <p>Please enter a number between:</p>
         <br/>
-        <xul:label>Minimum Number:  1</xul:label>
+        <p>Minimum Number:  1</p>
         <br/>
-        <xul:label>Maximum Number:  100</xul:label>
+        <p>Maximum Number:  100</p>
       </td>
     </tr>
 
diff --git a/mozilla/editor/dialogs/opendlog.xml b/mozilla/editor/dialogs/opendlog.xml
index bc90ac77f1d..a5a1551e75d 100644
--- a/mozilla/editor/dialogs/opendlog.xml
+++ b/mozilla/editor/dialogs/opendlog.xml
@@ -1,29 +1,31 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="EditorDialog.css" type="text/css"?>
-<!DOCTYPE dialog>
+<!DOCTYPE window SYSTEM "opendlog.dtd">
 <window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/TR/REC-html40">
 
-  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing=20>
+  <table xmlns="http://www.w3.org/TR/REC-html40" cellspacing="20">
     <tr>
       <td>
-        <xul:label>Open page in</xul:label>
-        <select size="1" name="open.where">
-          <optgroup label="prevTargets">
-            <option label="Navigator" value="Navigator">Navigator</option>
-            <option label="Composer" value="Composer">Composer</option>
-            <option label="New Message" value="New Message">New Message</option>
-          </optgroup>
-        </select>
+        <p>
+          Open page in
+          <select size="1" name="open.where">
+            <optgroup label="prevTargets">
+              <option label="Navigator" value="Navigator">Navigator</option>
+              <option label="Composer" value="Composer">Composer</option>
+              <option label="New Message" value="New Message">New Message</option>
+            </optgroup>
+          </select>
+        </p>
       </td>
     </tr>
 
     <tr>
       <td>
-        <xul:label>Enter the URL or location of the local file you would like to open</xul:label>
+        <p>Enter the URL or location of the local file you would like to open</p>
         <p/>
         <input type="file" value=" Choose File... " size="50" length="50" maxlength="255" name="image.url" />
-        <xul:label> [don't forget to add the recent popdown list] </xul:label>
+        <p> [don't forget to add the recent popdown list] </p>
       </td>
     </tr>