diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul
index 8b458fcf4d2..6eca8751e8b 100644
--- a/mozilla/editor/ui/composer/content/editor.xul
+++ b/mozilla/editor/ui/composer/content/editor.xul
@@ -48,7 +48,7 @@
 %brandDTD;
 ]> 
 
-<window id="editorWindow" xmlns:html="http://www.w3.org/1999/xhtml"
+<window id="editorWindow"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="EditorOnLoad()"
         onunload="EditorShutdown()"
@@ -58,11 +58,9 @@
         titlemodifier="&editorWindow.titlemodifier;"
         titlemenuseparator="&editorWindow.titlemodifiermenuseparator;"
         windowtype="composer:html"
-        orient="vertical"
         width="640" height="480"
         screenX="10" screenY="10"
-        persist="screenX screenY width height sizemode"
-        >
+        persist="screenX screenY width height sizemode">
 
   <script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
 <!-- 
@@ -246,7 +244,7 @@
         <editor type="content-primary" id="content-frame" src="about:blank" context="editorContentContext" flex="1"/>
       </stack>
       <vbox>
-        <text class="label" id="doctype-text" style="width:1em" crop="right"/>
+        <label id="doctype-text" style="width:1em"/>
         <textbox class="source-editor plain" id="content-source" multiline="true" rows="1"
                    flex="1" style="width:1em; height:1em;"/>
       </vbox>
@@ -267,7 +265,7 @@
     <!-- Some of this is from globarOverlay.xul -->
     <statusbar id="status-bar">
       <hbox id="component-bar"/>
-      <statusbarpanel id="statusText" label="&statusText.label;" flex="1" crop="right"/>
+      <statusbarpanel id="statusText" label="&statusText.label;" flex="1"/>
       <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
     </statusbar>
     
diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul
index 94c7c09d685..1f540047657 100644
--- a/mozilla/editor/ui/composer/content/editorOverlay.xul
+++ b/mozilla/editor/ui/composer/content/editorOverlay.xul
@@ -25,8 +25,7 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/editorOverlay.dtd">
 
 <overlay id="editorOverlay"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script type="application/x-javascript" src="chrome://editor/content/editorOverlay.js"/>
 <script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
@@ -729,10 +728,10 @@
   <stack id="ColorButtons" align="center">
     <observes element="cmd_fontColor"       attribute="state" onbroadcast="onFontColorChange()"/>
     <observes element="cmd_backgroundColor" attribute="state" onbroadcast="onBackgroundColorChange()"/>
-    <text class="color-button" id="BackgroundColorButton"
+    <label class="color-button" id="BackgroundColorButton"
           onclick="EditorSelectColor('', event);"
           tooltip="aTooltip"   tooltiptext="&BackgroundColorButton.tooltip;"/>
-    <text class="color-button" id="TextColorButton"
+    <label class="color-button" id="TextColorButton"
           onclick="EditorSelectColor('Text', event);"
           tooltip="aTooltip"   tooltiptext="&TextColorButton.tooltip;"/>
   </stack>
diff --git a/mozilla/editor/ui/composer/content/pref-composer.xul b/mozilla/editor/ui/composer/content/pref-composer.xul
index 2b7f81ce457..edf0d32c2e5 100644
--- a/mozilla/editor/ui/composer/content/pref-composer.xul
+++ b/mozilla/editor/ui/composer/content/pref-composer.xul
@@ -28,9 +28,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/pref-composer.dtd" >
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical" 
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://editor/content/pref-composer.xul');">
 
   <script type="application/x-javascript">
@@ -45,36 +43,30 @@
   <hbox class="box-smallheader" title="&lHeader;"/>
 
   <!-- Recent files menu -->
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&recentFiles.title;"/>
     <hbox align="center">
-      <text value="&documentsInMenu;"/>
+      <label value="&documentsInMenu;"/>
       <textbox
         id="recentFiles"
         name="recent string" 
-        type="text" 
         size="3" 
         value="10" 
-        pref="true" 
         preftype="int" 
         prefstring="editor.history.url_maximum"
-        prefattribute="value"
       />
     </hbox>
   </groupbox>
 
 <!-- HTML formatting on output -->
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&savingFiles.title;"/>
     <spacer class="spacer"/>
-    <radiogroup orient="vertical" align="start"
+    <radiogroup
       id            = "preserveFormatting"
-      pref          = "true"
       preftype      = "bool"
-      prefstring    = "editor.prettyprint"
-      prefattribute = "value">
+      prefstring    = "editor.prettyprint">
       <radio 
-        group      = "preserveFormatting"
         value       = "false"
         label      = "&preserveExistingFormatting;" 
         accesskey  = "&preserveExistingFormatting.accesskey;"
@@ -82,7 +74,6 @@
         tooltiptext= "&preserveExistingFormatting.tooltip;"
       />
       <radio 
-        group      = "preserveFormatting" 
         value       = "true"
         label      = "&reformat.label;" 
         accesskey  = "&reformat.accesskey;"
@@ -92,86 +83,69 @@
     </radiogroup>
   </groupbox>
   
-  <groupbox orient="vertical" align="start">
+  <groupbox align="start">
     <caption label="&tableEditing.label;"/>
     <checkbox 
       label     = "&maintainTableStructure.label;"
       id        = "maintainTableStructure" 
       accesskey = "&maintainStructure.accesskey;"
       tooltip   = "aTooltip" tooltiptext="&maintainTableStructure.tooltip;"
-      pref      = "true"
-      preftype  = "bool"
       prefstring= "editor.table.maintain_structure"
-      prefattribute="checked"
     />
     <separator class = "thin"/>
     <hbox align="start">
-      <text class="label"
-        value="&pressingTheDeleteKey.label;" 
+      <label value="&pressingTheDeleteKey.label;" 
         tooltip = "aTooltip" tooltiptext="&pressingTheDeleteKey.tooltip;"
-        for="tableDeleteKey" 
+        control="tableDeleteKey" 
       />
-      <radiogroup orient="vertical" align="start"
+      <radiogroup
           id       = "tableDeleteKey"
-          pref     = "true"
-          preftype = "int"
-          prefstring="editor.table.delete_key"
-          prefattribute="value">
-        <radio group="tableDeleteKey" value="0" label="&deleteCell.label;" accesskey="&deleteCell.accesskey;"/>
-        <radio group="tableDeleteKey" value="1" label="&deleteContent.label;" accesskey="&deleteContent.accesskey;" />
+          prefstring="editor.table.delete_key">
+        <radio value="0" label="&deleteCell.label;" accesskey="&deleteCell.accesskey;"/>
+        <radio value="1" label="&deleteContent.label;" accesskey="&deleteContent.accesskey;" />
       </radiogroup>
     </hbox>
   </groupbox>
 
 <!-- Take out Auto-Save; not supported at this time
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&saving;"/>
     <hbox align="center">
       <checkbox 
         label      = "&AutoSaveCheck;"
         id         = "shouldAutoSave"
-        pref       = "true" 
-        preftype   = "bool" 
         prefstring = "editor.auto_save"
         name       = "autosave" 
-        prefattribute="checked"
       />
       <textbox
         id="autoSaveAmount"
         name="time" 
-        type="text" 
         size="3" 
         value="5" 
-        pref="true" 
         preftype="int" 
         prefstring="editor.auto_save_delay"
-        prefattribute="value"
       />
-      <text value="&minText;" />
+      <label value="&minText;" />
     </hbox>
   </groupbox>
 -->
 
 <!-- External Editors are not supported at this time
-    <groupbox orient="vertical">
+    <groupbox>
       <caption label="&exterLegend.label;"/> 
     <hbox>
       <checkbox 
         name  = "htmlSourceEditorCheckbox"
         label = "&htmlSource;"
-        pref       = "true" 
         preftype   = "int" 
         prefindex  = "0" 
         prefstring = "editor.use_html_editor"
       />
       <textbox
         name = "&chooseButton.label;"
-        pref       = "true" 
         preftype   = "string" 
-        prefstring = "editor.html_editor"
       />
       <button 
-        class = "dialog" 
         name  = ""
         label = "&chooseButton.label;"
       />
@@ -181,7 +155,6 @@
       <checkbox 
         name  = "htmlImageEditorCheckbox" 
         label = "&imageeditor;"
-        pref       = "true" 
         preftype   = "int" 
         prefindex  = "0" 
         prefstring ="editor.use_image_editor"
@@ -189,8 +162,6 @@
 
       <textbox
         name="chooseButton.label" 
-        pref       = "true" 
-        preftype   = "string" 
         prefstring = "editor.image_editor"
       />
       <button label="&chooseButton.label;" />
diff --git a/mozilla/editor/ui/composer/content/pref-editing.xul b/mozilla/editor/ui/composer/content/pref-editing.xul
index 853777ead51..7ec6dc614ec 100644
--- a/mozilla/editor/ui/composer/content/pref-editing.xul
+++ b/mozilla/editor/ui/composer/content/pref-editing.xul
@@ -27,9 +27,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/pref-editing.dtd">
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical" 
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://editor/content/pref-editing.xul');">
 
   <script lanugage="JavaScript">
@@ -45,26 +43,24 @@
   <hbox class="box-smallheader" title="&lHeader;"/>
 
   <vbox>
-    <text class="label small-margin" value="&authorName.label;"/>
+    <label value="&authorName.label;"/>
     <hbox>
       <textbox id="editorAuthor" flex="1"
-                 pref="true" preftype="string" prefstring="editor.author"
-                 prefattribute="value"/>
+               prefstring="editor.author"/>
       <spacer flex="1"/>
     </hbox>
   </vbox>
   <spacer class="smallspacer"/>
-  <groupbox orient="vertical" align="start">
+  <groupbox align="start">
     <caption label="&pageColorHeader;"/> 
-    <radiogroup id="useCustomColors" orient="vertical" align="start"  
-                pref="true" preftype="bool" prefstring="editor.use_custom_colors"
-                prefattribute="value">
-      <radio class="small-margin" group="useCustomColors" id="DefaultColorsRadio"
+    <radiogroup id="useCustomColors"
+                preftype="bool" prefstring="editor.use_custom_colors">
+      <radio id="DefaultColorsRadio"
           value="false" 
           label="&defaultColorsRadio.label;" 
           accesskey="&defaultColors.accesskey;"
           oncommand="UseDefaultColors();"/>
-      <radio class="small-margin" group="useCustomColors" id="CustomColorsRadio" 
+      <radio id="CustomColorsRadio" 
           value="true" label="&customColorsRadio.label;"
           accesskey="&customColors.accesskey;" 
           oncommand="UseCustomColors()"/>
@@ -74,35 +70,35 @@
         <columns><column/><column/></columns>
         <rows>
           <row align="center">
-            <text class="label" id="Text" value="&normalText.label;&colon.character;" />
+            <label id="Text" value="&normalText.label;&colon.character;" />
             <button id="TextButton" class="color-button" oncommand="GetColorAndUpdate('textCW');">
               <spacer id="textCW" class="color-well"/>
             </button>
             <data id="textData" pref="true" preftype="color" prefstring="editor.text_color" prefattribute="value" wsm_attributes="value"/>
           </row>
           <row align="center">
-            <text class="label" id="Link" value="&linkText.label;&colon.character;" />
+            <label id="Link" value="&linkText.label;&colon.character;" />
             <button id="LinkButton" class="color-button" oncommand="GetColorAndUpdate('linkCW');">
               <spacer id="linkCW" class="color-well"/>
             </button>
             <data id="linkData" pref="true" preftype="color" prefstring="editor.link_color" prefattribute="value" wsm_attributes="value"/>
           </row>
           <row align="center">
-            <text class="label" id="Active" value="&activeLinkText.label;&colon.character;" />
+            <label id="Active" value="&activeLinkText.label;&colon.character;" />
             <button id="ActiveLinkButton" class="color-button" oncommand="GetColorAndUpdate('activeCW');">
               <spacer id="activeCW" class="color-well"/>
             </button>
             <data id="aLinkData" pref="true" preftype="color" prefstring="editor.active_link_color" prefattribute="value" wsm_attributes="value"/>
           </row>
           <row align="center">
-            <text class="label" id="Visited" value ="&visitedLinkText.label;&colon.character;" />
+            <label id="Visited" value ="&visitedLinkText.label;&colon.character;" />
             <button id="VisitedLinkButton" class="color-button" oncommand="GetColorAndUpdate('visitedCW');">
               <spacer id="visitedCW" class="color-well"/>
             </button>
             <data id="fLinkData" pref="true" preftype="color" prefstring="editor.followed_link_color" prefattribute="value" wsm_attributes="value"/>
           </row>
           <row align="center">
-            <text class="label" id="Background" value="&background.label;" />
+            <label id="Background" value="&background.label;" />
             <button id="BackgroundButton" class="color-button" oncommand="GetColorAndUpdate('backgroundCW');">
               <spacer id="backgroundCW" class="color-well"/>
             </button>
@@ -112,19 +108,19 @@
       </grid>
       <vbox id="ColorPreview" flex="1">
         <spacer flex="1"/>
-        <text class="label larger" id="NormalText"      value="&normalText.label;"/>
+        <label class="larger" id="NormalText"      value="&normalText.label;"/>
         <spacer flex="1"/>
-        <text class="label larger" id="LinkText"        value="&linkText.label;"/>
+        <label class="larger" id="LinkText"        value="&linkText.label;"/>
         <spacer flex="1"/>
-        <text class="label larger" id="ActiveLinkText"  value="&activeLinkText.label;"/>
+        <label class="larger" id="ActiveLinkText"  value="&activeLinkText.label;"/>
         <spacer flex="1"/>
-        <text class="label larger" id="VisitedLinkText" value="&visitedLinkText.label;"/>
+        <label class="larger" id="VisitedLinkText" value="&visitedLinkText.label;"/>
         <spacer flex="1"/>
       </vbox>
       <spacer flex="1"/>
     </hbox>
     <spacer class="spacer"/>
-    <text class="label small-margin" value="&backgroundImage.label;" accesskey="&backgroundImage.accesskey;"/>
+    <label value="&backgroundImage.label;" accesskey="&backgroundImage.accesskey;"/>
     <hbox align="center">
       <textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage();" style="min-width: 23em" flex="1">
         <observes element="backgroundImageData" attribute="disabled"/>
@@ -133,7 +129,7 @@
               oncommand="ChooseImageFile()">
         <observes element="backgroundImageData" attribute="disabled"/>
       </button>
-      <data id="backgroundImageData" pref="true" preftype="string" prefstring="editor.default_background_image" prefattribute="value"/>
+      <data id="backgroundImageData" preftype="string" prefstring="editor.default_background_image" prefattribute="value"/>
     </hbox>
   </groupbox>
 </page>
diff --git a/mozilla/editor/ui/composer/content/sidebar-editor.xul b/mozilla/editor/ui/composer/content/sidebar-editor.xul
index 05b5091fce8..c41f7c811e8 100644
--- a/mozilla/editor/ui/composer/content/sidebar-editor.xul
+++ b/mozilla/editor/ui/composer/content/sidebar-editor.xul
@@ -28,12 +28,10 @@
 <?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebar.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/sidebar-editor.dtd" >
-<window
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  onload="Init('chrome://editor/content/sidebar-editor.rdf',
-               'NC:EditorSidebarRoot');" orient="vertical">
+<window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="Init('chrome://editor/content/sidebar-editor.rdf',
+                     'NC:EditorSidebarRoot');"
 
 <script src="chrome://communicator/content/sidebar/sidebar.js" />
 <vbox id="sidebox" flex="1">
diff --git a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js
index 47b45b42634..5b414d5338a 100644
--- a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js
+++ b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js
@@ -57,9 +57,6 @@ function Startup()
   if (!InitEditorShell())
     return;
 
-  // initialise the ok and cancel buttons
-  doSetOKCancel(onOK, onCancel);
-
   // Element to edit is passed in
   if (!window.arguments[1])
   {
@@ -118,7 +115,7 @@ function Startup()
  * returns    : boolean true to close the window
  * desc.      : event handler for ok button
  **/
-function onOK()
+function onAccept()
 {
   editorShell.BeginBatchChanges();
   try {
@@ -341,4 +338,5 @@ function AddTreeItem ( name, value, treeChildrenId, attArray )
 function doHelpButton()
 {
   openHelp("chrome://help/content/help.xul?advanced_property_editor");
+  return true;
 }
diff --git a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
index 2974c32a1f3..bba9b4ed411 100644
--- a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
+++ b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
@@ -28,21 +28,19 @@
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <!-- May not need this here -->
 <!-- <?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> -->
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EdAdvancedEdit.dtd">
-<window class="dialog" title="&WindowTitle.label;"
+<dialog title="&WindowTitle.label;"
     style="width: 40em;"
     xmlns ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    buttonpack="end"
     onload="Startup()"
-    onunload="onCancel()"
-    orient="vertical">
+    buttons="accept,cancel,help"
+    ondialogaccept="return onAccept();"
+    ondialogcancel="return onCancel();"
+    ondialoghelp="return doHelpButton();">
 
-  <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
     
   <!-- Methods common to all editor dialogs -->
@@ -55,15 +53,14 @@
 
   <!-- global dialog functions -->
   <script type="application/x-javascript" src="chrome://editor/content/EdAdvancedEdit.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
   <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
   <broadcaster id="args" value=""/>
 
   <hbox>
-    <text class="label" value="&currentattributesfor.label;"/>
-    <text class="label header" id="tagLabel"/>
+    <label value="&currentattributesfor.label;"/>
+    <label class="header" id="tagLabel"/>
   </hbox>
   
   <separator class="thin"/>
@@ -99,7 +96,7 @@
           <treechildren id="HTMLAList" flex="1"/>
         </tree>
         <hbox align="center" flex="1">
-          <text class="label" value="&editAttribute.label;"/>
+          <label value="&editAttribute.label;"/>
           <spacer flex="1"/>
           <button label="&removeAttribute.label;" oncommand="RemoveHTMLAttribute();"/>
         </hbox>
@@ -109,8 +106,8 @@
           </columns>
           <rows>
             <row equalsize="always">
-              <text class="label" for="AddHTMLAttributeNameInput" value="&AttName.label;"/>
-              <text class="label" for="AddHTMLAttributeValueInput" value="&AttValue.label;"/>
+              <label control="AddHTMLAttributeNameInput" value="&AttName.label;"/>
+              <label control="AddHTMLAttributeValueInput" value="&AttValue.label;"/>
             </row>
             <row align="center" equalsize="always">
               <!-- Lists are built at runtime -->
@@ -149,7 +146,7 @@
           <treechildren id="CSSAList" flex="1"/>
         </tree>
         <hbox align="center" flex="1">
-          <text class="label" value="&editAttribute.label;"/>
+          <label value="&editAttribute.label;"/>
           <spacer flex="1"/>
           <button label="&removeAttribute.label;" oncommand="RemoveCSSAttribute();"/>
         </hbox>
@@ -159,8 +156,8 @@
           </columns>
           <rows>
             <row equalsize="always">
-              <text class="label" for="AddCSSAttributeNameInput"  value="&PropertyName.label;"/>
-              <text class="label" for="AddCSSAttributeValueInput" value="&AttValue.label;"/>
+              <label value="&PropertyName.label;"/>
+              <label value="&AttValue.label;"/>
             </row>
             <row equalsize="always">
               <textbox id="AddCSSAttributeNameInput" flex="1"
@@ -194,7 +191,7 @@
           <treechildren id="JSEAList" flex="1"/>
         </tree>
         <hbox align="center" flex="1">
-          <text class="label" value="&editAttribute.label;"/>
+          <label value="&editAttribute.label;"/>
           <spacer flex="1"/>
           <button label="&removeAttribute.label;" oncommand="RemoveJSEAttribute()"/>
         </hbox>
@@ -204,8 +201,8 @@
           </columns>
           <rows>
             <row equalsize="always">
-              <text class="label" for="AddJSEAttributeNameList" value="&AttName.label;"/>
-              <text class="label" for="AddJSEAttributeValueInput" value="&AttValue.label;"/>
+              <label value="&AttName.label;"/>
+              <label value="&AttValue.label;"/>
             </row>
             <row align="center" equalsize="always">
               <!-- List is built at runtime -->
@@ -219,7 +216,4 @@
       </vbox>
     </tabpanels>
   </tabbox>
-  <spacer class="spacer"/>
-  <hbox id="okCancelHelpButtonsRight"/> 
-
-</window>
+</dialog>
diff --git a/mozilla/editor/ui/dialogs/content/EdColorPicker.xul b/mozilla/editor/ui/dialogs/content/EdColorPicker.xul
index 165e05f9423..6288a4e63e3 100644
--- a/mozilla/editor/ui/dialogs/content/EdColorPicker.xul
+++ b/mozilla/editor/ui/dialogs/content/EdColorPicker.xul
@@ -29,12 +29,9 @@
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EdColorPicker.dtd">
 <window class="dialog"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    buttonpack="end"
     onload = "Startup()"
     onunload="onCancel()"
-    orient="vertical"
     >
 
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -47,10 +44,10 @@
 
   <keyset id="dialogKeys"/>
   <hbox id="TableOrCellGroup" align="center" collapsed="true">
-    <text value="&background.label;"/>
+    <label value="&background.label;"/>
     <radiogroup id="1" orient="horizontal">
-      <radio group="1" id="TableRadio" label="&table.label;"/>
-      <radio group="1" id="CellRadio"  label="&cell.label;"/>
+      <radio id="TableRadio" label="&table.label;"/>
+      <radio id="CellRadio"  label="&cell.label;"/>
   </radiogroup>
   </hbox>
   <colorpicker id="ColorPicker" palettename="standard" 
@@ -61,7 +58,7 @@
     onselect="SelectColor();"/>
 <!-- Web palette is not implemented???
   <hbox align="center">
-    <text class="label" value="&palette.label;"/>
+    <label value="&palette.label;"/>
     <radio id="StandardPalette" label="&standardPalette.label;" oncommand="ChangePalette('standard')"/>
     <radio id="WebPalette" label="&webPalette.label;" oncommand="ChangePalette('web')"/>
   </hbox>
@@ -74,9 +71,9 @@
                   persist="LastTextColor LastBackgroundColor"/>
       <label value="&lastPickedColor.label;" flex="1" style="text-align: center;"/>
     </button>
-    <text class="label" value="&setColor1.label;"/>
-    <text class="label" value="&setColor2.label;"/>
-    <text class="label" value="&setColorExample.label;"/>
+    <label value="&setColor1.label;"/>
+    <label value="&setColor2.label;"/>
+    <label value="&setColorExample.label;"/>
     <hbox align="center" flex="1=">
       <textbox id="ColorInput" style="width: 8em" oninput="SetColorSwatch(); SetDefaultToOk();"/>
       <spacer flex="1"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdColorProps.xul b/mozilla/editor/ui/dialogs/content/EdColorProps.xul
index 48ece7c2a17..742466e6ad5 100644
--- a/mozilla/editor/ui/dialogs/content/EdColorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdColorProps.xul
@@ -33,28 +33,24 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorColorProperties.dtd">
 
 <window class="dialog" title="&windowTitle.label;"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    buttonpack="end"
     onload="Startup()"
-    onunload="onCancel()"
-    orient="vertical">
+    onunload="onCancel()">
 
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/x-javascript" src="chrome://editor/content/EdColorProps.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
 
-  <groupbox orient="vertical" align="start">
+  <groupbox align="start">
     <caption label="&pageColors.label;"/>
-    <radiogroup id="pageColorGroup" orient="vertical" align="start">
-      <radio group="pageColorGroup" id="DefaultColorsRadio" label="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"
+    <radiogroup id="pageColorGroup">
+      <radio id="DefaultColorsRadio" label="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"
         tooltip="aTooltip"     tooltiptext="&defaultColorsRadio.tooltip;" />
-      <radio group="pageColorGroup" id="CustomColorsRadio" label="&customColorsRadio.label;" oncommand="UseCustomColors()"
+      <radio id="CustomColorsRadio" label="&customColorsRadio.label;" oncommand="UseCustomColors()"
         tooltip="aTooltip"     tooltiptext="&customColorsRadio.tooltip;" />
     </radiogroup>
     <hbox class="big-left-margin">
@@ -62,31 +58,31 @@
         <columns><column/><column/></columns>
         <rows>
           <row align="center">
-            <text class="label" id="Text" value="&normalText.label;&colon.character;" />
+            <label id="Text" value="&normalText.label;&colon.character;" />
             <button id="TextButton" class="color-button" oncommand="GetColorAndUpdate('textCW');">
               <spacer id="textCW" class="color-well"/>
             </button>
           </row>
           <row align="center">
-            <text class="label" id="Link" value="&linkText.label;&colon.character;" />
+            <label id="Link" value="&linkText.label;&colon.character;" />
             <button id="LinkButton" class="color-button" oncommand="GetColorAndUpdate('linkCW');">
               <spacer id="linkCW" class="color-well"/>
             </button>
           </row>
           <row align="center">
-            <text class="label" id="Active" value="&activeLinkText.label;&colon.character;" />
+            <label id="Active" value="&activeLinkText.label;&colon.character;" />
             <button id="ActiveLinkButton" class="color-button" oncommand="GetColorAndUpdate('activeCW');">
               <spacer id="activeCW" class="color-well"/>
             </button>
           </row>
           <row align="center">
-            <text class="label" id="Visited" value ="&visitedLinkText.label;&colon.character;" />
+            <label id="Visited" value ="&visitedLinkText.label;&colon.character;" />
             <button id="VisitedLinkButton" class="color-button" oncommand="GetColorAndUpdate('visitedCW');">
               <spacer id="visitedCW" class="color-well"/>
             </button>
           </row>
           <row align="center">
-            <text class="label" id="Background" value="&background.label;" />
+            <label id="Background" value="&background.label;" />
             <button id="BackgroundButton" class="color-button" oncommand="GetColorAndUpdate('backgroundCW');">
               <spacer id="backgroundCW" class="color-well"/>
             </button>
@@ -95,13 +91,13 @@
       </grid>
       <vbox id="ColorPreview" flex="1">
         <spacer flex="1"/>
-        <text class="label larger" id="NormalText"      value="&normalText.label;"/>
+        <label class="larger" id="NormalText"      value="&normalText.label;"/>
         <spacer flex="1"/>
-        <text class="label larger" id="LinkText"        value="&linkText.label;"/>
+        <label class="larger" id="LinkText"        value="&linkText.label;"/>
         <spacer flex="1"/>
-        <text class="label larger" id="ActiveLinkText"  value="&activeLinkText.label;"/>
+        <label class="larger" id="ActiveLinkText"  value="&activeLinkText.label;"/>
         <spacer flex="1"/>
-        <text class="label larger" id="VisitedLinkText" value="&visitedLinkText.label;"/>
+        <label class="larger" id="VisitedLinkText" value="&visitedLinkText.label;"/>
         <spacer flex="1"/>
       </vbox>
       <spacer flex="1"/>
@@ -109,7 +105,7 @@
     <spacer class="spacer"/>
   </groupbox>
   <spacer class="spacer"/>
-  <text class="label" value="&backgroundImage.label;"/>
+  <label value="&backgroundImage.label;"/>
   <hbox>
     <textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage()"
      tooltip="aTooltip" tooltiptext="&backgroundImage.tooltip;" 
diff --git a/mozilla/editor/ui/dialogs/content/EdConvertToTable.xul b/mozilla/editor/ui/dialogs/content/EdConvertToTable.xul
index 3e5d017242b..c0d0375c020 100644
--- a/mozilla/editor/ui/dialogs/content/EdConvertToTable.xul
+++ b/mozilla/editor/ui/dialogs/content/EdConvertToTable.xul
@@ -34,10 +34,8 @@
 
 <window class="dialog" title="&windowTitle.label;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-   xmlns:html="http://www.w3.org/1999/xhtml"
    onload = "Startup()"
-   onunload="onCancel()"
-   orient="vertical">
+   onunload="onCancel()">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -48,17 +46,17 @@
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet"/>
-  <html flex="1">&instructions.label;</html>
-  <radiogroup id="SepRadioGroup" orient="vertical" persist="index character" index="0" character="">
-    <radio group="SepRadioGroup" id="comma"   label="&commaRadio.label;" oncommand="SelectCharacter('0');"/>
+  <description flex="1">&instructions.label;</description>
+  <radiogroup id="SepRadioGroup" persist="index character" index="0" character="">
+    <radio id="comma" label="&commaRadio.label;" oncommand="SelectCharacter('0');"/>
     <vbox>
-      <radio group="SepRadioGroup" id="space" label="&spaceRadio.label;" oncommand="SelectCharacter('1');"/>
+      <radio id="space" label="&spaceRadio.label;" oncommand="SelectCharacter('1');"/>
       <checkbox id="CollapseSpaces" label="&collapseSpaces.label;"
-        style="margin-left:2em" checked="true" persist="checked"
-        tooltip="aTooltip" tooltiptext="&collapseSpaces.tooltip;"/>
+                style="margin-left:2em" checked="true" persist="checked"
+                tooltip="aTooltip" tooltiptext="&collapseSpaces.tooltip;"/>
     </vbox>
     <hbox align="center">
-      <radio group="SepRadioGroup" id="other" label="&otherRadio.label;" oncommand="SelectCharacter('2');"/>
+      <radio id="other" label="&otherRadio.label;" oncommand="SelectCharacter('2');"/>
       <textbox class="narrow" id="SepCharacterInput" oninput="InputSepCharacter()"/>
     </hbox>
   </radiogroup> 
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul b/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul
index 06409904f00..b0bcf92b5b2 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul
@@ -25,7 +25,6 @@
   -->
 
 <overlay id="EdDialogOverlay"
-     xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <vbox id="AdvancedEdit"  flex="1">
@@ -44,7 +43,6 @@
 -->
 <button
   id        = "AdvancedEditButton"
-  class     = "dialog"
   oncommand = "onAdvancedEdit();"
   label     = "&AdvancedEditButton.label;"
   tooltip   = "aTooltip" 
@@ -52,7 +50,6 @@
 
 <button 
   id        = "AdvancedEditButton2" 
-  class     = "dialog" 
   oncommand = "onAdvancedEdit()" 
   label     = "&AdvancedEditButton.label;"
   tooltip   = "aTooltip"
@@ -60,7 +57,6 @@
 
 <button 
   id        = "ChooseFile" 
-  class     = "dialog" 
   oncommand = "chooseFile()"
   label     = "&chooseButton.label;"/>
 
diff --git a/mozilla/editor/ui/dialogs/content/EdDictionary.xul b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
index 39f6a26632f..47e55c42899 100644
--- a/mozilla/editor/ui/dialogs/content/EdDictionary.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
@@ -26,10 +26,8 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorPersonalDictionary.dtd">
 <window class="dialog" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
-    onunload="Close()"
-    orient="vertical">
+    onunload="Close()">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -47,15 +45,15 @@
     <columns><column style="width: 15em" flex="1"/><column flex="1"/></columns>
     <rows>
       <row>
-        <text class="label" value="&wordEditField.label;"/>
+        <label value="&wordEditField.label;"/>
         <spacer/>
       </row>
       <row>
         <textbox id="WordInput" flex="1"/>
-        <button flex="1" id="AddWord" oncommand="AddWord()" label="&AddButton.label;"/>
+        <button id="AddWord" oncommand="AddWord()" label="&AddButton.label;"/>
       </row>
       <row>
-        <text class="label" value="&DictionaryList.label;"/>
+        <label value="&DictionaryList.label;"/>
         <spacer/>
       </row>
       <row>
diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.js b/mozilla/editor/ui/dialogs/content/EdHLineProps.js
index dc220965d18..95697c09541 100644
--- a/mozilla/editor/ui/dialogs/content/EdHLineProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.js
@@ -33,8 +33,6 @@ function Startup()
   if (!InitEditorShell())
     return;
 
-  doSetOKCancel(onOK, onCancel);
-
   // Get the selected horizontal line
   hLineElement = editorShell.GetSelectedElement(tagName);
 
@@ -193,13 +191,12 @@ function ValidateData()
   return true;
 }
 
-function onOK()
+function onAccept()
 {
   if (ValidateData())
   {
     // Copy attributes from the globalElement to the document element
     editorShell.CloneAttributes(hLineElement, globalElement);
-    SaveWindowLocation();
     return true;
   }
   return false;
diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
index f3ea1b52157..007eef9c9f0 100644
--- a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
@@ -25,55 +25,51 @@
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
 <?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?> 
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorHLineProperties.dtd">
 
-<window class="dialog" title="&windowTitle.label;"
-   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-   xmlns:html="http://www.w3.org/1999/xhtml"
-   onload = "Startup()"
-   onunload="onCancel()"
-   orient="vertical">
+<dialog title="&windowTitle.label;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="Startup()"
+        ondialogaccept="return onAccept();"
+        ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
   <!--- Element-specific methods -->
   <script type="application/x-javascript" src="chrome://editor/content/EdHLineProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
-  <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
   
-  <groupbox orient="vertical"><caption label="&dimensionsBox.label;"/>
+  <groupbox><caption label="&dimensionsBox.label;"/>
     <grid>
       <columns><column/><column/><column /></columns>
       <rows>
         <row align="center">
-          <text class="label" value="&widthEditField.label;" />
+          <label value="&widthEditField.label;" />
           <textbox class="narrow" id="width" flex="1" oninput="forceInteger('width')"/>
           <menulist id="pixelOrPercentMenulist" />
           <!-- menupopup and menuitems added by JS -->
         </row>
         <row align="center">
-          <text class="label" value="&heightEditField.label;" />
+          <label value="&heightEditField.label;" />
           <textbox class="narrow" id="height" oninput="forceInteger('height')"/>
-          <text class="label" value="&pixelsPopup.value;" />
+          <label value="&pixelsPopup.value;" />
         </row>
       </rows>
     </grid>        
     <checkbox id="3dShading" label="&threeDShading.label;" />
   </groupbox>
-  <groupbox><caption align="left" label="&alignmentBox.label;"/>
+  <groupbox><caption label="&alignmentBox.label;"/>
     <radiogroup id="alignmentGroup" orient="horizontal">
       <spacer class="spacer"/>
-      <radio group="alignmentGroup" id="leftAlign" label="&leftRadio.value;" />
-      <radio group="alignmentGroup" id="centerAlign" label="&centerRadio.value;" />
-      <radio group="alignmentGroup" id="rightAlign" label="&rightRadio.value;" />
+      <radio id="leftAlign" label="&leftRadio.value;" />
+      <radio id="centerAlign" label="&centerRadio.value;" />
+      <radio id="rightAlign" label="&rightRadio.value;" />
     </radiogroup>
   </groupbox>
   <spacer class="spacer"/>
@@ -85,6 +81,4 @@
     <button id="AdvancedEditButton"/>
   </hbox>
   <separator class="groove"/>
-  <!-- from global dialogOverlay -->
-  <hbox id="okCancelButtonsRight"/>
-</window>
+</dialog>
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
index 0db723f93dd..4db3012b8e9 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
@@ -31,10 +31,8 @@
 
 <window class="dialog" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
     onunload="onCancel()"
-    orient="vertical"
   >
 
   <!-- Methods common to all editor dialogs -->
@@ -46,14 +44,14 @@
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
 
-  <groupbox orient="vertical" flex="1">
+  <groupbox flex="1">
     <caption id="titleInput" label="&link.label;"/>
 
     <grid>
       <columns><column/><column/><column/></columns>
       <rows>
         <row>
-          <text class="label" for="urlInput" value="&urlFieldset.label;" align="right"/>
+          <label control="urlInput" value="&urlFieldset.label;"/>
 
           <textbox id="urlInput" class="MinWidth20em" value="http://"/>
 
@@ -61,7 +59,7 @@
         </row>
       
         <row>
-          <text class="label" for="altInput" value="&altFieldset.label;" align="right"/>
+          <label control="altInput" value="&altFieldset.label;"/>
 
           <textbox class="MinWidth20em" id="altInput"/>
         </row>
@@ -69,18 +67,18 @@
     </grid>
   </groupbox>
 
-  <groupbox orient="vertical" flex="1">
+  <groupbox flex="1">
     <caption id="targetLabel" label="&targetFieldset.label;"/>
     <grid>
       <columns><column/><column/><column/></columns>
       <rows>
         <row>
-          <text class="label" for="targetInput" value="&target.label;" align="right" />
+          <label control="targetInput" value="&target.label;"/>
         </row>
         <row>
           <textbox class="MinWidth20em" id="targetInput"/>
 
-          <text class="label" id="commonLabel" value="&commonFieldset.label;"/>
+          <label id="commonLabel" value="&commonFieldset.label;"/>
 
           <menulist id="commonInput" oncommand="changeTarget()">
             <menupopup align="center">
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.js b/mozilla/editor/ui/dialogs/content/EdImageProps.js
index cd08301ee20..ad8884d99ec 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.js
@@ -66,8 +66,6 @@ function Startup()
   if (!InitEditorShell())
     return;
 
-  doSetOKCancel(onOK, onCancel);
-
   gDialog.srcInput          = document.getElementById( "srcInput" );
   gDialog.altTextInput      = document.getElementById( "altTextInput" );
   gDialog.MoreFewerButton   = document.getElementById( "MoreFewerButton" );
@@ -372,7 +370,7 @@ function ChangeImageSrc()
 function doDimensionEnabling()
 {
   // Enabled only if "Custom" is checked
-  var enable = (gDialog.customSizeRadio.checked);
+  var enable = (gDialog.customSizeRadio.selected);
 
   // BUG 74145: After input field is disabled,
   //   setting it enabled causes blinking caret to appear
@@ -588,9 +586,10 @@ function ValidateData()
 function doHelpButton()
 {
   openHelp("chrome://help/content/help.xul?image_properties");
+  return true;
 }
 
-function onOK()
+function onAccept()
 {
   // Show alt text error only once
   // (we don't initialize doAltTextError=true
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.xul b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
index 237d04e5713..418c91492e9 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
@@ -26,7 +26,6 @@
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
 <?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?> 
@@ -35,39 +34,34 @@
 
 
 <!-- dialog containing a control requiring initial setup -->
-<window class="dialog" title="&windowTitle.label;"
+<dialog title="&windowTitle.label;"
     xmlns ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
-    onunload="onCancel()"
-    orient="vertical"
-    id="imagedialog"
-    >
+    buttons="accept,cancel,help"
+    ondialogaccept="return onAccept();"
+    ondialogcancel="return onCancel();"
+    ondialoghelp="return doHelpButton();">
   
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/x-javascript" src="chrome://editor/content/EdImageProps.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
-  <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
 
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&locationBox.label;"/>
     <!--/////// Src URL and ALT Text //////-->
-    <text class = "label" 
-      for   = "srcInput"
+    <label control   = "srcInput"
       value = "&locationEditField.label;"
       tooltip="aTooltip" tooltiptext="&locationEditField.tooltip;"
       />
     <textbox
       id         = "srcInput" 
       oninput    = "ChangeImageSrc()"
-      style      = "min-width : 20em"
-      flex       = "1"/>
+      style      = "min-width : 20em"/>
     <hbox>
       <checkbox 
         id  = "MakeRelativeCheckbox"
@@ -78,24 +72,20 @@
     </hbox>
     <spacer class="spacer"/>
     <hbox>
-      <text class = "label"
-        id      = "altTextLabel" 
-        for     = "altTextInput"
+      <label id      = "altTextLabel" 
+        control     = "altTextInput"
         tooltip = "aTooltip" tooltiptext="&altTextEditField.tooltip;"
         value   = "&altTextEditField.label;"/>
       <textbox
         id     ="altTextInput"
         style  = "min-width : 20em"
-        tooltip = "aTooltip" tooltiptext="&altTextEditField.tooltip;"
-        flex       = "1"/>
+        tooltip = "aTooltip" tooltiptext="&altTextEditField.tooltip;"/>
     </hbox>
     <spacer class="spacer"/>
   </groupbox>
   <spacer class="spacer"/>
   <hbox align="center"> 
-    <button 
-      class   = "dialog" 
-      id      = "MoreFewerButton" 
+    <button id      = "MoreFewerButton" 
       oncommand = "onMoreFewer()" 
       tooltip = "aTooltip" tooltiptext = "&MoreFewerButton.tooltip;"
       persist = "more"/>
@@ -104,21 +94,21 @@
       <caption label="&previewBox.label;"/>
       <hbox id="preview-image-box" align="center">
         <spacer flex="1"/>
-        <html id="preview-image-holder"/>
+        <description id="preview-image-holder"/>
         <spacer flex="1"/>
       </hbox>
       <vbox id="PreviewSize" collapsed="true">
         <spacer flex="1"/>
-        <text class="label" value="&actualSize.label;"/>
+        <label value="&actualSize.label;"/>
         <hbox>
-          <text class="label" value="&widthEditField.label;"/>
+          <label value="&widthEditField.label;"/>
           <spacer flex="1"/>
-          <text id="PreviewWidth" class="label"/>
+          <label id="PreviewWidth"/>
         </hbox>
         <hbox>
-          <text class="label" value="&heightEditField.label;"/>
+          <label value="&heightEditField.label;"/>
           <spacer flex="1"/>
-          <text id="PreviewHeight" class="label"/>
+          <label id="PreviewHeight"/>
         </hbox>
         <spacer flex="1"/>
       </vbox>
@@ -130,18 +120,16 @@
     <hbox>
       <vbox>
         <!-- //////// Image Dimensions //////// -->
-        <groupbox orient="vertical" flex="1">
+        <groupbox flex="1">
           <caption id="dimensionsLabel" label="&dimensionsBox.label;"/>
           <hbox>
-            <radiogroup id="imgSizeGroup" orient="vertical">
+            <radiogroup id="imgSizeGroup">
               <radio
-                group   = "imgSizeGroup"
                 id      = "actualSizeRadio" 
                 label   = "&actualSizeRadio.label;"
                 tooltip = "aTooltip" tooltiptext="&actualSizeRadio.tooltip;"
                 oncommand = "SetActualSize()"/>
               <radio
-                group   = "imgSizeGroup"
                 id      = "customSizeRadio" 
                 label   = "&customSizeRadio.label;"
                 tooltip = "aTooltip" tooltiptext="&customSizeRadio.tooltip;"
@@ -163,9 +151,8 @@
             <rows>
               <!--//////  IMAGE WIDTH  //////-->
               <row align="center">
-                <text class = "label" 
-                  id    = "widthLabel"
-                  for   = "widthInput"
+                <label id    = "widthLabel"
+                  control   = "widthInput"
                   value = "&widthEditField.label;" />
                 <textbox
                   id       = "widthInput" 
@@ -177,9 +164,8 @@
               </row>
               <!--////// IMAGE HEIGHT //////-->
               <row align="center">
-                <text class = "label" 
-                  id    = "heightLabel"
-                  for   = "heightInput"
+                <label id    = "heightLabel"
+                  control   = "heightInput"
                   value = "&heightEditField.label;" />
                 <textbox
                   id       = "heightInput" 
@@ -194,13 +180,12 @@
           <spacer flex="1"/>
         </groupbox>
         <!--////// IMAGE MAP BUTTONS //////-->
-        <groupbox orient="vertical" flex="1">
+        <groupbox flex="1">
            <caption id="imagemapLabel" label="&imagemapBox.label;"/>
            <hbox flex="1" equalsize="always">
 
 <!-- Hide Image Map Editor. Not ready for prime time yet
             <button
-              class   = "dialog"
               id      = "editImageMap"
               oncommand = "editImageMap()"
               tooltip = "aTooltip" tooltiptext="&editImageMapButton.tooltip;"
@@ -208,11 +193,9 @@
               flex    = "1"/>
 -->
             <button
-              class   = "dialog"
               id      = "removeImageMap"
               oncommand = "removeImageMap()"
-              label   = "&removeImageMapButton.label;"
-              flex    = "1"/>
+              label   = "&removeImageMapButton.label;"/>
             <spacer flex="1"/><!-- remove when we restore Image Map Editor -->
             </hbox>
           <spacer class="spacer"/>
@@ -222,7 +205,7 @@
       <!-- Bottom Right Region -->
       <vbox flex="1">
         <!--//////// Alignment ////////-->
-        <groupbox flex="1" orient="vertical">
+        <groupbox flex="1">
           <caption id="alignLabel" label="&alignment.label;"/>
           <spacer class="spacer"/>
           <menulist id="alignTypeSelect" class="align-menu">
@@ -244,43 +227,40 @@
             <columns><column/><column/><column/></columns>
             <rows>
               <row align="center">
-                <text 
-                  class = "label align-right" 
+                <label 
+                  class = "align-right" 
                   id    = "leftrightLabel"
                   value = "&leftRightEditField.label;"/>
                 <textbox
                   class     = "narrow"
                   id        = "imageleftrightInput" 
                   oninput   = "forceInteger(this.id)"/>
-                <text 
-                  class = "label" 
+                <label 
                   id    = "leftrighttypeLabel"
                   value = "&pixelsPopup.value;" />
               </row>
               <row align="center">
-                <text 
-                  class = "label align-right" 
+                <label 
+                  class = "align-right" 
                   id    = "topbottomLabel"
                   value = "&topBottomEditField.label;"/>
                 <textbox
                   class     = "narrow"
                   id        = "imagetopbottomInput" 
                   oninput   = "forceInteger(this.id)"/>
-                <text
-                  class = "label" 
+                <label
                   id    = "topbottomtypeLabel"
                   value = "&pixelsPopup.value;" />
               </row>
               <row align="center">
-                <text class = "label align-right" 
+                <label class = "align-right" 
                   id    = "borderLabel"
                   value = "&borderEditField.label;"/>
                 <textbox
                   class     = "narrow"
                   id        = "border" 
                   oninput   = "forceInteger(this.id)"/>
-                <text 
-                  class = "label" 
+                <label 
                   id    = "bordertypeLabel"
                   value = "&pixelsPopup.value;" />
               </row>
@@ -292,6 +272,4 @@
   </vbox> <!-- END OF MORE/FEWER SECTION -->
   <!-- from EdDialogOverlay -->
   <vbox id="AdvancedEdit"/>
-  <!-- from global dialogOverlay -->
-  <hbox id="okCancelHelpButtonsRight"/> 
-</window>
+</dialog>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
index 6bad027490f..24f06bf414e 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
@@ -32,10 +32,8 @@
 
 <window class="dialog" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
-    onunload="onCancel()"
-    orient="vertical" flex="1">
+    onunload="onCancel()">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -46,17 +44,17 @@
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
 
-  <text class="label" id="srcMessage" value="&sourceEditField.label;"/>
+  <label id="srcMessage" value="&sourceEditField.label;"/>
   <vbox flex="1" style="width: 30em; height: 20em;">
     <textbox id="srcInput" multiline="true" rows="1" style="width: 1em" flex="1"/>
   </vbox>
   <!-- Will this accept the embedded HTML tags? -->
   <hbox>
     <spacer class="bigspacer"/>
-    <text value="&example.label;"/>
-    <text class="bold" value="&exampleOpenTag.label;"/>
-    <text class="bold italic" value="&exampleText.label;"/>
-    <text class="bold" value="&exampleCloseTag.label;"/>
+    <label value="&example.label;"/>
+    <label class="bold" value="&exampleOpenTag.label;"/>
+    <label class="bold italic" value="&exampleText.label;"/>
+    <label class="bold" value="&exampleCloseTag.label;"/>
   </hbox>
   <spacer class="spacer"/>
   <separator class="groove"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertChars.js b/mozilla/editor/ui/dialogs/content/EdInsertChars.js
index 99dfeb54987..074af46f9a1 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertChars.js
+++ b/mozilla/editor/ui/dialogs/content/EdInsertChars.js
@@ -41,16 +41,13 @@ function Startup()
 
   StartupLatin();
 
-  doSetOKCancel(onOK, Cancel);
-
-
   // Dialog is non-modal:
   // Change "Ok" to "Insert, change "Cancel" to "Close"
-  var okButton = document.getElementById("ok");
+  var okButton = document.getElementById("insertCharsDlg").getButton("accept");
   if (okButton)
     okButton.setAttribute("label", GetString("Insert"));
 
-  var cancelButton = document.getElementById("cancel");
+  var cancelButton = document.getElementById("insertCharsDlg").getButton("cancel");
   if (cancelButton)
     cancelButton.setAttribute("label", GetString("Close"));
 
@@ -62,7 +59,7 @@ function Startup()
   SetWindowLocation();
 }
 
-function onOK()
+function onAccept()
 {
   // Insert the character
   // Note: Assiated parent window and editorShell
@@ -74,10 +71,11 @@ function onOK()
   CategoryGroup.setAttribute("category", category);
   CategoryGroup.setAttribute("letter_index", indexL);
   CategoryGroup.setAttribute("char_index", indexM);
+  return true;
+}
 
   // Return true only for modal window
   //return true;
-}
 
 // Don't allow inserting in HTML Source Mode
 function onFocus()
@@ -95,12 +93,6 @@ function Unload()
   SaveWindowLocation();
 }
 
-function Cancel()
-{
-  // This will trigger call to "Unload()"
-  window.close();
-}
-
 //------------------------------------------------------------------
 var LatinL;
 var LatinM;
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertChars.xul b/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
index d8a0d2769b9..260670325d2 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
@@ -30,13 +30,12 @@
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorInsertChars.dtd">
 
-<window class="dialog" title="&windowTitle.label;"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    onload = "Startup()"
-    onunload = "Unload()"
-    onfocus = "onFocus()"
-    orient="vertical">
+<dialog id="insertCharsDlg" title="&windowTitle.label;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload = "Startup()"
+        onfocus = "onFocus()"
+        ondialogaccept = "return onAccept();"
+        ondialogcancel = "return Unload();">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -44,32 +43,28 @@
   <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
-  <keyset id="dialogKeys"/>
   <broadcaster id="args" value=""/>
 
-  <groupbox orient="vertical"><caption label="&category.label;"/>
-    <radiogroup id="CatGrp" orient="vertical" persist="category letter_index char_index">
-      <radio group="CatGrp" id="AccentUpper" label="&accentUpper.label;"   oncommand="ChangeCategory(this.id)"/>
-      <radio group="CatGrp" id="AccentLower" label="&accentLower.label;"   oncommand="ChangeCategory(this.id)"/>
-      <radio group="CatGrp" id="Upper"       label="&otherUpper.label;"    oncommand="ChangeCategory(this.id)"/>
-      <radio group="CatGrp" id="Lower"       label="&otherLower.label;"    oncommand="ChangeCategory(this.id)"/>
-      <radio group="CatGrp" id="Symbol"      label="&commonSymbols.label;" oncommand="ChangeCategory(this.id)"/>
+  <groupbox><caption label="&category.label;"/>
+    <radiogroup id="CatGrp" persist="category letter_index char_index">
+      <radio id="AccentUpper" label="&accentUpper.label;"   oncommand="ChangeCategory(this.id)"/>
+      <radio id="AccentLower" label="&accentLower.label;"   oncommand="ChangeCategory(this.id)"/>
+      <radio id="Upper"       label="&otherUpper.label;"    oncommand="ChangeCategory(this.id)"/>
+      <radio id="Lower"       label="&otherLower.label;"    oncommand="ChangeCategory(this.id)"/>
+      <radio id="Symbol"      label="&commonSymbols.label;" oncommand="ChangeCategory(this.id)"/>
     </radiogroup> 
     <spacer class="spacer"/>
   </groupbox>
   <hbox>
     <vbox flex="1">
       <!-- value is set in JS from editor.properties strings -->
-      <text class="label" id="LatinL_Label" value="&letter.label;"/>
+      <label id="LatinL_Label" value="&letter.label;"/>
       <menulist class="larger" flex="1" id="LatinL" oncommand="SelectLatinLetter()"/>
     </vbox>
     <vbox flex="1">
-      <text class="label" id="LatinM_Label" value="&character.label;"/>
+      <label id="LatinM_Label" value="&character.label;"/>
       <menulist class="larger" flex="1" id="LatinM" oncommand="SelectLatinModifier()"/>
     </vbox>
   </hbox>
-
   <separator class="groove"/>
-  <!-- from global dialogOverlay -->
-  <hbox id="okCancelButtonsRight"/>
-</window>
+</dialog>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
index 0969e60c6f3..9f4cc5ab231 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
@@ -34,11 +34,9 @@
 
 <window class="dialog" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
     onunload="onCancel()"
-    persist="screenX screenY"
-    orient="vertical">
+    persist="screenX screenY">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -49,7 +47,7 @@
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
-  <groupbox orient="vertical"><caption label="&size.label;"/>
+  <groupbox><caption label="&size.label;"/>
     <grid>
       <columns>
         <column flex="1"/>
@@ -58,17 +56,17 @@
       </columns>
       <rows>
         <row align="center">
-          <text class="label align-right" text-align="right" value="&numRowsEditField.label;" />
+          <label class="align-right" value="&numRowsEditField.label;" />
           <textbox class="narrow" id="rowsInput" oninput="ChangeRowOrColumn(this.id)" />
           <spacer/>
         </row>
         <row align="center">
-          <text class="label align-right" value="&numColumnsEditField.label;" />
+          <label class="align-right" value="&numColumnsEditField.label;" />
           <textbox class="narrow" id="columnsInput" oninput="ChangeRowOrColumn(this.id)" />
           <spacer/>
         </row>
         <row align="center">
-          <text class="label align-right" value="&widthEditField.label;" />
+          <label class="align-right" value="&widthEditField.label;" />
           <textbox class="narrow" id="widthInput" oninput="forceInteger(this.id)" />
           <menulist id="widthPixelOrPercentMenulist"><menupopup/></menulist>
             <!-- child elements are appended by JS -->
@@ -79,10 +77,10 @@
   </groupbox>
   <spacer class="spacer"/>
   <hbox align="center">
-    <text class="label align-right" text-align="right" value="&borderEditField.label;"
+    <label class="align-right" value="&borderEditField.label;"
         tooltip="aTooltip" tooltiptext="&borderEditField.tooltip;" />
     <textbox class="narrow" id="borderInput" oninput="forceInteger(this.id)" />
-    <text class="label" value="&pixels.label;"/>  
+    <label value="&pixels.label;"/>  
   </hbox>
   <!-- from EdDialogOverlay -->
   <vbox id="AdvancedEdit"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.js b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
index 38023210577..cd891a5f3d7 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
@@ -45,8 +45,6 @@ function Startup()
   if (!InitEditorShell())
     return;
 
-  doSetOKCancel(onOK, onCancel);
-
   // Message was wrapped in a <label> or <div>, so actual text is a child text node
   gDialog.linkTextCaption     = document.getElementById("linkTextCaption");
   gDialog.linkTextMessage     = document.getElementById("linkTextMessage");
@@ -464,9 +462,10 @@ function ValidateData()
 function doHelpButton()
 {
   openHelp("chrome://help/content/help.xul?link_properties");
+  return true;
 }
 
-function onOK()
+function onAccept()
 {
   if (ValidateData())
   {
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
index 84eac9c345e..c628ae45a3e 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
@@ -25,18 +25,18 @@
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorLinkProperties.dtd">
 
-<window class="dialog" title="&windowTitle.label;"
+<dialog title="&windowTitle.label;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-   xmlns:html="http://www.w3.org/1999/xhtml"
+   buttons="accept,cancel,help"
    onload = "Startup()"
-   onunload="onCancel()"
-   orient="vertical" >
+   ondialogaccept="return onAccept();"
+   ondialogcancel="return onCancel();"
+   ondialoghelp="return doHelpButton();">
 
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/x-javascript" src="chrome://editor/content/EdLinkProps.js"/>
@@ -45,17 +45,16 @@
 
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
-  <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
 
   <vbox style="min-width: 20em">
-    <groupbox orient="vertical"><caption id="linkTextCaption"/>
-      <text class="label" id="linkTextMessage"/> 
+    <groupbox><caption id="linkTextCaption"/>
+      <label id="linkTextMessage"/> 
 	    <textbox id="linkTextInput" flex="1"/>
     </groupbox>
 
-    <groupbox orient="vertical"><caption label="&LinkURLBox.label;"/>
-      <text class="label" value="&LinkURLEditField.label;"/>
+    <groupbox><caption label="&LinkURLBox.label;"/>
+      <label value="&LinkURLEditField.label;"/>
       <textbox id="hrefInput" flex="1" style="min-width: 18em" oninput="ChangeLocation()"/>
       <hbox align="center">
         <!-- from EdDialogOverlay.xul 'for' identifies the textfield to get URL from -->
@@ -63,7 +62,7 @@
         <spacer flex="1"/>
         <button id="ChooseFile"/>
       </hbox>
-      <html class="wrap" flex="1" id="RemoveLinkMsg" style="margin-bottom: 7px">&RemoveLinkMsg.label;</html>
+      <description class="wrap" flex="1" id="RemoveLinkMsg" style="margin-bottom: 7px">&RemoveLinkMsg.label;</description>
       <spacer class="smallspacer"/>
       <hbox align="start">
         <button id="MoreFewerButton" oncommand="onMoreFewer()" persist="more"/>
@@ -71,21 +70,19 @@
       <spacer class="spacer"/>
       <vbox id="MoreSection">
         <spacer class="spacer"/>
-        <text class="label" value="&NamedAnchorMsg.label;"/>
+        <label value="&NamedAnchorMsg.label;"/>
         <tree rows="4" class="list" id="NamedAnchorList" onselect="SelectNamedAnchor()">
           <treecolgroup><treecol flex="1"/></treecolgroup>
         </tree>
         <spacer class="spacer"/>
-        <text class="label" value="&HeadingMsg.label;"/>
+        <label value="&HeadingMsg.label;"/>
         <tree rows="4" class="list" id="HeadingsList" onselect="SelectHeading()">
           <treecolgroup><treecol flex="1"/></treecolgroup>
         </tree>
-        <text class="label" flex="1" value="&HeadingMsg2.label;"/>
+        <label value="&HeadingMsg2.label;"/>
       </vbox>
     </groupbox>
   </vbox>
   <!-- from EdDialogOverlay -->
   <vbox id="AdvancedEdit"/>
-  <!-- from global dialogOverlay -->
-  <hbox id="okCancelHelpButtonsRight"/> 
-</window>
+</dialog>
diff --git a/mozilla/editor/ui/dialogs/content/EdListProps.xul b/mozilla/editor/ui/dialogs/content/EdListProps.xul
index 4e159e5c161..afd461dd369 100644
--- a/mozilla/editor/ui/dialogs/content/EdListProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdListProps.xul
@@ -30,10 +30,8 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorListProperties.dtd">
 <window class="dialog" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
-    onunload="onCancel()"
-    orient="vertical">
+    onunload="onCancel()">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -44,7 +42,7 @@
   <broadcaster id="args" value=""/>
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
-  <groupbox orient="vertical" flex="1"><caption label="&ListType.label;"/>
+  <groupbox flex="1"><caption label="&ListType.label;"/>
     <menulist id="ListType" oncommand="SelectListType()">
       <menupopup>
         <menuitem label="&none.value;"/>
@@ -53,9 +51,9 @@
         <menuitem label="&definitionList.value;"/>
       </menupopup>
     </menulist>
-    <radiogroup id="RadioGroup" orient="vertical" index="0" persist="index">
-      <radio group="RadioGroup" id="ChangeAll"      label="&changeEntireListRadio.label;"/>
-      <radio group="RadioGroup" id="ChangeSelected" label="&changeSelectedRadio.label;"/>
+    <radiogroup id="RadioGroup" index="0" persist="index">
+      <radio id="ChangeAll"      label="&changeEntireListRadio.label;"/>
+      <radio id="ChangeSelected" label="&changeSelectedRadio.label;"/>
     </radiogroup>
   </groupbox>
   <spacer class="spacer"/>
@@ -63,15 +61,15 @@
   <!-- message text and list items are set in JS 
        text value should be identical to string with id=BulletStyle in editor.properties 
   -->
-  <groupbox orient="vertical" flex="1"><caption id="BulletStyleLabel" label="&bulletStyle.label;"/>
+  <groupbox flex="1"><caption id="BulletStyleLabel" label="&bulletStyle.label;"/>
     <menulist class="MinWidth10em" id="BulletStyle" oncommand="SelectBulletStyle()"/>
     <spacer class="spacer"/>
     <hbox>
-      <text class="label" id="StartingNumberLabel" value="&startingNumber.label;"/>
+      <label id="StartingNumberLabel" value="&startingNumber.label;"/>
       <textbox class="narrow" id="StartingNumber" oninput="forceInteger(this.id)"/>
       <spacer/>
     </hbox>
-    <html id="StartExample" class="wrap" flex="1" style="width: 1em">&startingHelp.label;</html>
+    <description id="StartExample" class="wrap" flex="1" style="width: 1em">&startingHelp.label;</description>
   </groupbox>
   <!-- from EdDialogOverlay -->
   <vbox id="AdvancedEdit"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
index d88a5bce687..b3497fbff45 100644
--- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -34,10 +34,8 @@
 
 <window class="dialog" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
-    onunload="onCancel()"
-    orient="vertical">
+    onunload="onCancel()">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -48,7 +46,7 @@
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
 
-  <text class="label" align="left" for="nameInput" value="&anchorNameEditField.label;"/>
+  <label control="nameInput" value="&anchorNameEditField.label;"/>
   <textbox class="MinWidth20em" id="nameInput" oninput="ChangeName()" 
              tooltip="aTooltip" tooltiptext="&nameInput.tooltip;"/>
   <spacer class="spacer"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdPageProps.js b/mozilla/editor/ui/dialogs/content/EdPageProps.js
index 49081ccd8f2..3df09fc2fe7 100644
--- a/mozilla/editor/ui/dialogs/content/EdPageProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdPageProps.js
@@ -42,7 +42,6 @@ function Startup()
   gDialog.TitleInput       = document.getElementById("TitleInput");
   gDialog.AuthorInput      = document.getElementById("AuthorInput");
   gDialog.DescriptionInput = document.getElementById("DescriptionInput");
-  doSetOKCancel(onOK, onCancel);
   
   // Default string for new page is set from DTD string in XUL,
   //   so set only if not new doc URL
@@ -131,7 +130,7 @@ function ValidateData()
   return true;
 }
 
-function onOK()
+function onAccept()
 {
   if (ValidateData())
   {
diff --git a/mozilla/editor/ui/dialogs/content/EdPageProps.xul b/mozilla/editor/ui/dialogs/content/EdPageProps.xul
index 79280408c07..7449a1c8de3 100644
--- a/mozilla/editor/ui/dialogs/content/EdPageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdPageProps.xul
@@ -25,54 +25,49 @@
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
 <?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorPageProperties.dtd">
 
-<window class="dialog" title="&windowTitle.label;"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    onload="Startup()"
-    onunload="onCancel()"
-    orient="vertical">
+<dialog title="&windowTitle.label;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="Startup();"
+        ondialogaccept="return onAccept();"
+        ondialogcancel="return onCancel();">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/x-javascript" src="chrome://editor/content/EdPageProps.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
-  <keyset id="dialogKeys"/>
   <grid>
     <columns><column flex="1"/><column flex="2"/></columns>
     <rows>
       <row>
-        <text class="label" value="&location.label;"/>
-        <text class="label" value="&locationNewPage.label;" id="PageLocation"/>
+        <label value="&location.label;"/>
+        <label value="&locationNewPage.label;" id="PageLocation"/>
       </row>
       <row>
-        <text class="label" value="&lastModified.label;" align="left"/>
-        <text class="label" id="PageModDate" align="left"/>
+        <label value="&lastModified.label;"/>
+        <label id="PageModDate"/>
       </row>
       <spacer class="spacer"/>
       <row align="center">
-        <text class="label" value="&titleInput.label;"/>
+        <label value="&titleInput.label;"/>
         <textbox class="MinWidth20em" id="TitleInput" oninput="TextboxChanged(this.id)"/>
       </row>
       <row align="center">
-        <text class="label" value="&authorInput.label;"/>
+        <label value="&authorInput.label;"/>
         <textbox class="MinWidth20em" id="AuthorInput" oninput="TextboxChanged(this.id)"/>
       </row>
       <row align="center">
-        <text class="label" value="&descriptionInput.label;"/>
+        <label value="&descriptionInput.label;"/>
         <textbox class="MinWidth20em" id="DescriptionInput" oninput="TextboxChanged(this.id)"/>
       </row>
     </rows>
   </grid>
   <spacer class="bigspacer"/>
-  <html class="wrap" flex="1">&EditHEADSource.label;</html>
+  <description class="wrap" flex="1">&EditHEADSource.label;</description>
   <separator class="groove"/>
-  <hbox id="okCancelButtonsRight"/> 
-</window>
+</dialog>
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
index 24eb2baaf97..ec61ab3129e 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -28,11 +28,9 @@
 
 <!-- dialog containing a control requiring initial setup -->
 <window class="dialog" title="&windowTitle.label;"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload = "Startup()"
-    onunload = "onClose()"
-    orient="vertical">
+    onunload = "onClose()">
 
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
@@ -55,12 +53,12 @@
     </columns>
     <rows>
       <row align="center">
-        <text class="label" id="MisspelledWordLabel" value="&misspelledWord.label;"/>
-        <text class="label bold" id="MisspelledWord" crop="right"/>
+        <label id="MisspelledWordLabel" value="&misspelledWord.label;"/>
+        <label class="bold" id="MisspelledWord"/>
         <spacer/>
       </row>
       <row align="center">
-        <text class="label" id="ReplaceWordLabel" value="&wordEditField.label;"/>
+        <label id="ReplaceWordLabel" value="&wordEditField.label;"/>
         <hbox align="center" flex="1">
           <textbox id="ReplaceWordInput" oninput="ChangeReplaceWord()"/>
           <button id="CheckWord" oncommand="CheckWord()" label="&checkwordButton.label;"/>
@@ -68,7 +66,7 @@
       </row>
     </rows>
   </grid>
-  <text class="label" id="SuggestedListLabel" value="&suggestions.label;"/>
+  <label id="SuggestedListLabel" value="&suggestions.label;"/>
   <grid>
     <columns><column/><column/></columns>
     <rows>
@@ -94,7 +92,7 @@
             </rows> 
           </grid>
           <spacer flex="1"/>
-          <text class="label" value="&userDictionary.label;"/>
+          <label value="&userDictionary.label;"/>
           <hbox flex="1" align="start">
             <button class="spell-check" id="AddToDictionary" oncommand="AddToDictionary()" label="&addToUserDictionaryButton.label;" />
             <button class="spell-check" id="EditDictionary"  oncommand="EditDictionary()" label="&editUserDictionaryButton.label;"   />
@@ -102,11 +100,11 @@
         </vbox>
       </row>
       <row>
-        <text class="label" value ="&languagePopup.label;"/>
+        <label value ="&languagePopup.label;"/>
         <spacer/>
       </row>
       <row>
-        <menulist id="LanguageMenulist" class="small-margin" oncommand="SelectLanguage()">
+        <menulist id="LanguageMenulist" oncommand="SelectLanguage()">
           <menupopup>
             <menuitem value="more-cmd" label="&moreDictionaries.label;"/>
             <menuseparator/>
diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.xul b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
index c50233ad666..559ba3cee66 100644
--- a/mozilla/editor/ui/dialogs/content/EdTableProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
@@ -31,12 +31,10 @@
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorTableProperties.dtd">
 
-<window class="dialog" title="&tableWindow.title;"
-    xmlns:html="http://www.w3.org/1999/xhtml"
+<window title="&tableWindow.title;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
-    onunload="onCancel()"
-    orient="vertical">
+    onunload="onCancel()">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -53,7 +51,7 @@
       <tab id="TableTab" oncommand="SelectTableTab()" label="&tableTab.label;"/>
       <tab id="CellTab" oncommand="SelectCellTab()" label="&cellTab.label;"/>
     </tabs>
-    <tabpanels orient="vertical" id="TabPanels">
+    <tabpanels id="TabPanels">
 
       <!-- TABLE PANEL -->
       <vbox id="TablePanel">
@@ -62,11 +60,11 @@
             <columns><column/><column/></columns>
             <rows>
               <row align="center">
-                <text class="label" value="&tableRows.label;"/>
+                <label value="&tableRows.label;"/>
                 <textbox class="narrow" id="TableRowsInput" oninput="forceInteger(this.id);"/>
               </row>
               <row align="center">
-                <text class="label" value="&tableColumns.label;"/>
+                <label value="&tableColumns.label;"/>
                 <textbox class="narrow" id="TableColumnsInput" oninput="forceInteger(this.id);"/>
               </row>
             </rows>
@@ -76,38 +74,38 @@
             <columns><column/><column/><column flex="1"/></columns>
             <rows>
               <row align="center">
-                <text class="label" value="&tableWidth.label;"/>
+                <label value="&tableWidth.label;"/>
                 <textbox class="narrow" id="TableWidthInput" oninput="forceInteger(this.id);"/>
                 <menulist id="TableWidthUnits"/>
               </row>
             </rows>
           </grid>
         </groupbox>
-        <groupbox orient="vertical"><caption align="left" label="&tableBorderSpacing.label;"/>
+        <groupbox><caption label="&tableBorderSpacing.label;"/>
         <grid>
           <columns><column/><column/><column/></columns>
           <rows>
             <row align="center">
-              <text class="label" value="&tableBorderWidth.label;"/>
+              <label value="&tableBorderWidth.label;"/>
               <textbox class="narrow" id="BorderWidthInput" oninput="forceInteger(this.id);"/>
-              <text class="label" align="left" value="&pixels.label;"/>
+              <label align="left" value="&pixels.label;"/>
             </row>
             <row align="center">
-              <text class="label" value="&tableSpacing.label;"/>
+              <label value="&tableSpacing.label;"/>
               <textbox class="narrow" id="SpacingInput" oninput="forceInteger(this.id);"/>
-              <text class="label" value="&tablePxBetwCells.label;"/>
+              <label value="&tablePxBetwCells.label;"/>
             </row>
             <row align="center">
-              <text class="label" value="&tablePadding.label;"/>
+              <label value="&tablePadding.label;"/>
               <textbox class="narrow" id="PaddingInput" oninput="forceInteger(this.id);"/>
-              <text class="label" value="&tablePxBetwBrdrCellContent.label;"/>
+              <label value="&tablePxBetwBrdrCellContent.label;"/>
             </row>
           </rows>
         </grid>
         </groupbox>
         <!-- Table Alignment and Caption -->
         <hbox flex="1" align="center">
-          <text class="label" value="&tableAlignment.label;"/>
+          <label value="&tableAlignment.label;"/>
           <menulist id="TableAlignList">
             <menupopup>
               <menuitem label="&AlignLeft.label;"   value="left"/>
@@ -116,7 +114,7 @@
             </menupopup>
           </menulist>
           <spacer class="spacer"/>
-          <text class="label" value="&tableCaption.label;"/>
+          <label value="&tableCaption.label;"/>
           <menulist id="TableCaptionList">
             <menupopup>
               <menuitem label="&tableCaptionNone.label;"  value=""/>
@@ -127,15 +125,15 @@
         </hbox>
         <separator class="groove"/>
         <hbox align="center">
-          <text class="label" value="&backgroundColor.label;"/>
+          <label value="&backgroundColor.label;"/>
           <button class="color-button" oncommand="GetColorAndUpdate('tableBackgroundCW');">
             <spacer id="tableBackgroundCW" class="color-well"/>
           </button>
           <spacer class="spacer"/>
-          <text class="label" id="TableInheritColor" value="&tableInheritColor.label;" collapsed="true"/>
+          <label id="TableInheritColor" value="&tableInheritColor.label;" collapsed="true"/>
         </hbox>
         <separator class="groove"/>
-        <hbox flex="1" autostretch="never">
+        <hbox flex="1" align="center">
           <spacer flex="1"/>
           <!-- From EdDialogOvlerlay.xul -->
           <button id="AdvancedEditButton"/>
@@ -163,13 +161,13 @@
           </vbox>
           <spacer class="bigspacer"/>
           <vbox flex="1">
-            <text class="label" value="&applyBeforeChange1.label;"/>
-            <text class="label" value="&applyBeforeChange2.label;"/>
+            <label value="&applyBeforeChange1.label;"/>
+            <label value="&applyBeforeChange2.label;"/>
           </vbox>
         </groupbox>
-        <hbox autostretch="never">
+        <hbox align="center">
           <!-- cell size groupbox -->
-          <groupbox><caption align="left" label="&size.label;"/>
+          <groupbox><caption label="&size.label;"/>
             <grid>
               <columns><column/><column/><column flex="1"/></columns>
               <rows>
@@ -244,11 +242,11 @@
             <spacer id="cellBackgroundCW" class="color-well"/>
           </button>
           <spacer class="spacer"/>
-          <text class="label" id="CellInheritColor" value="&cellInheritColor.label;" collapsed="true"/>
+          <label id="CellInheritColor" value="&cellInheritColor.label;" collapsed="true"/>
         </hbox>
         <separator class="groove"/>
-        <hbox autostretch="never">
-          <html  class="wrap" flex="1" style="width: 1em">&cellUseCheckboxHelp.label;</html>
+        <hbox align="center">
+          <description class="wrap" flex="1" style="width: 1em">&cellUseCheckboxHelp.label;</description>
           <!-- From EdDialogOvlerlay.xul -->
           <button id="AdvancedEditButton2"/>
         </hbox>
diff --git a/mozilla/editor/ui/dialogs/content/EditConflict.xul b/mozilla/editor/ui/dialogs/content/EditConflict.xul
index 10ea48a37b2..b635961bb82 100644
--- a/mozilla/editor/ui/dialogs/content/EditConflict.xul
+++ b/mozilla/editor/ui/dialogs/content/EditConflict.xul
@@ -32,10 +32,8 @@
 
 <window class="dialog" title="&windowTitle.label;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-   xmlns:html="http://www.w3.org/1999/xhtml"
    onload = "Startup()"
-   onunload="PreventCancel()"
-   orient="vertical">
+   onunload="PreventCancel()">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -46,20 +44,20 @@
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
   
-  <text class="label" value ="&conflictWarning.label;"/>
+  <label value ="&conflictWarning.label;"/>
   <spacer class="bigspacer"/>
-  <text class="label" value ="&conflictResolve.label;"/>
+  <label value ="&conflictResolve.label;"/>
   <spacer class="bigspacer"/>
   <hbox flex="1">
     <spacer class="bigspacer"/>
     <button label="&keepCurrentPageButton.label;"
-            flex="1" oncommand="KeepCurrentPage()"/>
+            oncommand="KeepCurrentPage()"/>
     <spacer class="bigspacer"/>
   </hbox>
   <hbox flex="1">
     <spacer class="bigspacer"/>
     <button label="&useOtherPageButton.label;"
-            flex="1" oncommand="UseOtherPage()"/>
+            oncommand="UseOtherPage()"/>
     <spacer class="bigspacer"/>
   </hbox>
 
diff --git a/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul b/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul
index 2a83261c933..1e1afe02de4 100644
--- a/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul
+++ b/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul
@@ -34,10 +34,8 @@
 <!-- WE SHOULD NOT USE ABSOLUTE WITH AND HEIGHT - USE BOXES INSTEAD? -->
 <window class="dialog" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
     onunload="onCancel()"
-    orient="vertical"
     style="width: 32em;">
 
     <!-- Methods common to all editor dialogs -->
@@ -49,15 +47,15 @@
     <broadcaster id="args" value=""/>
     <keyset id="dialogKeys"/>
 
-    <groupbox orient="vertical"><caption align="left" label="&documentTitleTitle.label;"/>
+    <groupbox><caption label="&documentTitleTitle.label;"/>
         <!-- Text labels filled in from editor.properties -->
-        <text id="EnterTitleLabel" class="label"/> 
+        <label id="EnterTitleLabel"/> 
         <textbox id="TitleInput" oninput="TitleChanged();"/>
-        <html id="TitleHelp" class="label wrap" style="width:1em" />
+        <description id="TitleHelp" class="wrap" style="width:1em" />
     </groupbox>
 
-    <groupbox orient="vertical" flex="1"><caption label="&documentCharsetTitle.label;"/>
-        <text class="label" value="&documentCharsetDesc.label;"/>
+    <groupbox flex="1"><caption label="&documentCharsetTitle.label;"/>
+        <label value="&documentCharsetDesc.label;"/>
         <tree class="list" id="CharsetTree" rows="7" flex="1" onselect="SelectCharset();">
             <treecolgroup><treecol flex="1"/></treecolgroup>
         </tree>
diff --git a/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul b/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul
index bf123f70733..157023fc6f5 100644
--- a/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul
+++ b/mozilla/extensions/content-packs/resources/content/pref-contentpacks.xul
@@ -27,11 +27,8 @@
 %prefContentDTD;
 ]>
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        onload="parent.initPanel('chrome://content-packs/content/pref-contentpacks.xul');"
-        orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://content-packs/content/pref-contentpacks.xul');">
 
   <stringbundle id="bundle_contentPack"
                 src="chrome://content-packs/locale/contentpacks.properties"/>
@@ -119,16 +116,16 @@
   ]]>
   </script>
 
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <html>&contentIntro.label;</html>
+  <description>&contentIntro.label;</description>
   <separator class="thin"/>
-  <html>&installedContentPacks.label;</html>
+  <description>&installedContentPacks.label;</description>
   
-  <tree class="inset" id="contentPackTree" flex="1" rows="5" 
+  <tree id="contentPackTree" flex="1" rows="5" 
         ref="urn:mozilla:locale:root" datasources="rdf:chrome"
         sortResource="http://www.mozilla.org/rdf/chrome#name"
-        pref="true" preftype="localizedstring" prefstring="general.useragent.contentlocale" 
+        preftype="localizedstring" prefstring="general.useragent.contentlocale" 
         prefvalue="" prefattribute="prefvalue" wsm_attributes="prefvalue"
         multiple="false" onselect="SelectContentPack();"
         sortDirection="ascending">
@@ -158,6 +155,5 @@
             accesskey="&downloadContentPacks.accesskey;" 
             oncommand="DownloadRegionPacks()"/>
   </hbox>
-
-</window>
+</page>
 
diff --git a/mozilla/extensions/cookie/resources/content/pref-cookies.xul b/mozilla/extensions/cookie/resources/content/pref-cookies.xul
index 1ad0b8a7c18..f31eae7aa39 100644
--- a/mozilla/extensions/cookie/resources/content/pref-cookies.xul
+++ b/mozilla/extensions/cookie/resources/content/pref-cookies.xul
@@ -27,11 +27,8 @@
 
 <!DOCTYPE window SYSTEM "chrome://cookie/locale/pref-cookies.dtd">
 
-<window xmlns:html="http://www.w3.org/1999/xhtml" id="cookieWindow"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="init();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="init();">
 
   <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
@@ -92,51 +89,47 @@
 
   <hbox class="box-smallheader" id="cookieHeader" title="&lHeader;"/>
 
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&cookiePolicy.label;"/>
 
-    <html>&cookieDetails;</html>
+    <description>&cookieDetails;</description>
 
-    <radiogroup id="networkCookieBehaviour" orient="vertical" autostretch="never"
-                pref="true" preftype="int" prefstring="network.cookie.cookieBehavior"
-                prefattribute="value">
-      <radio group="networkCookieBehaviour" value="2" label="&disableCookies.label;"
+    <radiogroup id="networkCookieBehaviour"
+                prefstring="network.cookie.cookieBehavior">
+      <radio value="2" label="&disableCookies.label;"
              accesskey="&disableCookies.accesskey;" oncommand="setDisables();"/>
-      <radio group="networkCookieBehaviour" value="1" label="&accOrgCookiesRadio.label;"
+      <radio value="1" label="&accOrgCookiesRadio.label;"
              accesskey="&accOrgCookiesRadio.accesskey;" oncommand="setDisables();"/>
       <hbox>
-        <radio group="networkCookieBehaviour" value="3" label="&accP3PCookiesRadio.label;"
+        <radio value="3" label="&accP3PCookiesRadio.label;"
                accesskey="&accP3PCookiesRadio.accesskey;" oncommand="setDisables();"/>
-        <button class="dialog" label="&viewP3P.label;" accesskey="&viewP3P.accesskey;" oncommand="viewP3P();"
-                id="p3pDialog" pref="true" preftype="bool"
-                prefstring="pref.advanced.cookies.disable_button.more_info" prefattribute="disabled"/>
+        <button label="&viewP3P.label;" accesskey="&viewP3P.accesskey;" oncommand="viewP3P();"
+                id="p3pDialog"
+                prefstring="pref.advanced.cookies.disable_button.more_info"/>
       </hbox>
-      <radio group="networkCookieBehaviour" value="0" label="&accAllCookiesRadio.label;"
+      <radio value="0" label="&accAllCookiesRadio.label;"
              accesskey="&accAllCookiesRadio.accesskey;" oncommand="setDisables();"/>
     </radiogroup>
 
     <separator/>
 
-    <vbox autostretch="never">
+    <vbox align="start">
       <checkbox id="networkWarnAboutCookies" label="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
-                pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
-                prefattribute="checked"/>
+                prefstring="network.cookie.warnAboutCookies"/>
       <checkbox id="lifetimeEnabled" label="&limitLifetime.label;" accesskey="&limitLifetime.accesskey;"
-                pref="true" preftype="bool" prefstring="network.cookie.lifetime.enabled"
-                prefattribute="checked" oncommand="setDisables();"/>
+                prefstring="network.cookie.lifetime.enabled"
+                oncommand="setDisables();"/>
       <hbox class="indent">
-        <radiogroup id="lifetimeBehavior" orient="vertical" autostretch="never"
-                    pref="true" preftype="int" prefstring="network.cookie.lifetime.behavior"
-                    prefattribute="value">
-          <radio group="lifetimeBehavior" value="0" label="&current.label;" 
+        <radiogroup id="lifetimeBehavior" prefstring="network.cookie.lifetime.behavior">
+          <radio value="0" label="&current.label;" 
                  accesskey="&current.accesskey;"
                  oncommand="setDisables();"/>
           <hbox>
-            <radio group="lifetimeBehavior" value="1" accesskey="&days.accesskey;"
+            <radio value="1" accesskey="&days.accesskey;"
                     oncommand="setDisables();"/>
-            <textbox id="lifetimeDays" pref="true" size="4" prefattribute="value"
+            <textbox id="lifetimeDays" pref="true" size="4"
                      preftype="int" prefstring="network.cookie.lifetime.days"/>
-            <html>&days.label;</html>
+            <description>&days.label;</description>
           </hbox>
         </radiogroup>
       </hbox>
@@ -146,13 +139,12 @@
     <separator/>
 
     <hbox pack="end">
-      <button class="dialog" label="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"
-              id="viewCookieButton" pref="true" preftype="bool"
-              prefstring="pref.advanced.cookies.disable_button.view_cookies" prefattribute="disabled"/>
-      <button class="dialog" label="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"
-              id="moreInformation" pref="true" preftype="bool"
-              prefstring="pref.advanced.cookies.disable_button.more_info" prefattribute="disabled"/>
+      <button label="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"
+              id="viewCookieButton"
+              prefstring="pref.advanced.cookies.disable_button.view_cookies"/>
+      <button label="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"
+              id="moreInformation"
+              prefstring="pref.advanced.cookies.disable_button.more_info"/>
     </hbox>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/cookie/resources/content/pref-images.xul b/mozilla/extensions/cookie/resources/content/pref-images.xul
index 938ee800599..cf8ac46b31d 100644
--- a/mozilla/extensions/cookie/resources/content/pref-images.xul
+++ b/mozilla/extensions/cookie/resources/content/pref-images.xul
@@ -31,11 +31,8 @@
 %prefImagesDTD;
 ]>
 
-<window xmlns:html="http://www.w3.org/1999/xhtml" id="imagesWindow"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="init();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="init();">
           
   <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
@@ -77,58 +74,54 @@
 
   <hbox class="box-smallheader" id="imagesHeader" title="&lHeader;"/>
 
-  <groupbox orient="vertical" id="imagesArea">
+  <groupbox id="imagesArea">
     <caption label="&imageBlocking.label;"/>
 
-    <html>&imageDetails;</html>
+    <description>&imageDetails;</description>
 
-    <radiogroup id="networkImageBehaviour" orient="vertical" autostretch="never"
-                pref="true" preftype="int" prefstring="network.image.imageBehavior"
-                prefattribute="value">
-      <radio group="networkImageBehaviour" value="2" label="&disableImages.label;"
+    <radiogroup id="networkImageBehaviour"
+                prefstring="network.image.imageBehavior">
+      <radio value="2" label="&disableImages.label;"
              accesskey="&disableImages.accesskey;"
              oncommand="setWarnAboutImagesEnabled(false);"/>
-      <radio group="networkImageBehaviour" value="1" label="&accOrgImagesRadio.label;"
+      <radio value="1" label="&accOrgImagesRadio.label;"
              accesskey="&accOrgImagesRadio.accesskey;"
              id="accOrgImages" observes="haveImageBlocking"
              oncommand="setWarnAboutImagesEnabled(true);"/>
-      <radio group="networkImageBehaviour" value="0" label="&accAllImagesRadio.label;"
+      <radio value="0" label="&accAllImagesRadio.label;"
              accesskey="&accAllImagesRadio.accesskey;"
              oncommand="setWarnAboutImagesEnabled(true);"/>
     </radiogroup>
 
     <separator observes="haveImageBlocking"/>
 
-    <hbox autostretch="never">
+    <hbox align="start">
       <checkbox id="networkImageWarnAboutImages" label="&warnAboutImages.label;"
                 accesskey="&warnAboutImages.accesskey;" observes="haveImageBlocking"
-                pref="true" preftype="bool" prefattribute="checked"
                 prefstring="network.image.warnAboutImages"/>
     </hbox>
 
     <separator observes="haveImageBlocking"/>
 
     <hbox pack="end">
-      <button class="dialog" id="viewImages" label="&viewImages.label;"
+      <button id="viewImages" label="&viewImages.label;"
               accesskey="&viewImages.accesskey;" oncommand="viewImages();"
               observes="haveImageBlocking"
-              pref="true" preftype="bool"
-              prefstring="pref.advanced.images.disable_button.view_image" prefattribute="disabled"/>
+              prefstring="pref.advanced.images.disable_button.view_image"/>
     </hbox>
 
   </groupbox>
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&animLoopingTitle.label;"/>
-    <radiogroup id="imageLooping" orient="vertical" autostretch="never"
-                pref="true" preftype="string" prefstring="image.animation_mode"
-                prefattribute="value">
-        <radio group="imageLooping" value="normal" label="&animLoopAsSpecified.label;"
+    <radiogroup id="imageLooping"
+                preftype="string" prefstring="image.animation_mode">
+        <radio value="normal" label="&animLoopAsSpecified.label;"
                accesskey="&animLoopAsSpecified.accesskey;"/>
-        <radio group="imageLooping" value="once" label="&animLoopOnce.label;"
+        <radio value="once" label="&animLoopOnce.label;"
                accesskey="&animLoopOnce.accesskey;"/>
-        <radio group="imageLooping" value="none" label="&animLoopNever.label;"
+        <radio value="none" label="&animLoopNever.label;"
                accesskey="&animLoopNever.accesskey;"/>
     </radiogroup>
   </groupbox>
 
-</window>
+</page>
diff --git a/mozilla/extensions/cview/resources/content/cviewOverlay.xul b/mozilla/extensions/cview/resources/content/cviewOverlay.xul
index edbb14ecfda..35af4385922 100644
--- a/mozilla/extensions/cview/resources/content/cviewOverlay.xul
+++ b/mozilla/extensions/cview/resources/content/cviewOverlay.xul
@@ -33,8 +33,7 @@
 <!DOCTYPE window SYSTEM "chrome://cview/locale/cviewOverlay.dtd" >
 
 <overlay id="CViewTaskMenuID"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script type="application/x-javascript"
   src="chrome://cview/content/cviewOverlay.js"/>
diff --git a/mozilla/extensions/help/resources/content/help.xul b/mozilla/extensions/help/resources/content/help.xul
index d7a52a5d61a..9a05821b3dc 100644
--- a/mozilla/extensions/help/resources/content/help.xul
+++ b/mozilla/extensions/help/resources/content/help.xul
@@ -21,7 +21,6 @@
 
 <window id="help"
         windowtype="mozilla:help"
-        xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&helpWin.ttl;"
         width="640"
diff --git a/mozilla/extensions/help/resources/content/helpMenuOverlay.xul b/mozilla/extensions/help/resources/content/helpMenuOverlay.xul
index 12894cdfbec..5b505642a4c 100644
--- a/mozilla/extensions/help/resources/content/helpMenuOverlay.xul
+++ b/mozilla/extensions/help/resources/content/helpMenuOverlay.xul
@@ -6,7 +6,6 @@
 ]>
 
 <overlay id="helpMenuID"
-         xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
   <menupopup id="helpPopup">
diff --git a/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul b/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
index 40c7548c9e9..ca925c70ef2 100644
--- a/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
+++ b/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
@@ -48,14 +48,14 @@
               <text value="Border Color"/>
               <hbox autostretch="never">
                 <colorpicker id="cprElBorderColor" type="button"
-                  pref="true" preftype="color" prefstring="inspector.blink.border-color" prefattribute="color"/>
+                  preftype="color" prefstring="inspector.blink.border-color" prefattribute="color"/>
               </hbox>
             </row>
             <row autostretch="never">
               <text value="Border Width"/>
               <hbox autostretch="never">
                 <textbox id="txfElBorderWidth" style="width: 4em"
-                  pref="true" preftype="int" prefstring="inspector.blink.border-width" prefattribute="value"/>
+                  preftype="int" prefstring="inspector.blink.border-width" prefattribute="value"/>
                 <text value="(px)"/>
               </hbox>
             </row>
@@ -63,7 +63,7 @@
               <text value="Blink Duration"/>
               <hbox autostretch="never">
                 <textbox id="txfElDuration" style="width: 4em"
-                  pref="true" preftype="int" prefstring="inspector.blink.duration" prefattribute="value"/>
+                  preftype="int" prefstring="inspector.blink.duration" prefattribute="value"/>
                 <text value="(s)"/>
               </hbox>
             </row>
@@ -71,7 +71,7 @@
               <text value="Blink Speed"/>
               <hbox autostretch="never">
                 <textbox id="txfElSpeed" style="width: 4em"
-                  pref="true" preftype="int" prefstring="inspector.blink.speed" prefattribute="value"/>
+                  preftype="int" prefstring="inspector.blink.speed" prefattribute="value"/>
                 <text value="(ms)"/>
                </hbox>
             </row>
@@ -79,7 +79,7 @@
         </grid>
         <hbox autostretch="never">
           <checkbox id="cbElOn" label="Blink Selected Element"
-              pref="true" preftype="bool" prefstring="inspector.blink.on" prefattribute="checked"/>
+              preftype="bool" prefstring="inspector.blink.on" prefattribute="checked"/>
         </hbox>
       </vbox>
     </groupbox>
@@ -98,7 +98,7 @@
     
     <vbox>
       <checkbox id="cbxNavIntegration" label="Add contextual menus to Navigator"
-                pref="true" preftype="bool" prefstring="inspector.hooks.navigator" prefattribute="checked"/>
+                preftype="bool" prefstring="inspector.hooks.navigator" prefattribute="checked"/>
     </vbox>
   </vbox>
 </page>
diff --git a/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul b/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul
index 02e0145b282..0e566e27a63 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul
@@ -34,14 +34,14 @@
       <rows>
         <row id="rwRow1">
           <deck id="rwRow1Text">
-            <text id="txText1Id" value="Id"/>
-            <text id="txText1Tag" value="Tag"/>
-            <text id="txText1Attr" value="Attr"/>
+            <label id="txText1Id" value="Id"/>
+            <label id="txText1Tag" value="Tag"/>
+            <label id="txText1Attr" value="Attr"/>
           </deck>
           <textbox id="tfText1"/>
         </row>
         <row id="rwRow2">
-          <text id="txText2" value="Value"/>
+          <label id="txText2" value="Value"/>
           <textbox id="tfText2"/>
         </row>
       </rows>
@@ -50,17 +50,17 @@
     <hbox valign="top">
       <groupbox id="tbxType">
         <caption label="Search By"/>
-        <radiogroup id="rgType" orient="vertical">
-          <radio group="rgType" id="rdType_id" label="ID" value="id" oncommand="dialog.toggleType('id')"/>
-          <radio group="rgType" id="rdType_tag" label="Tag" value="tag" oncommand="dialog.toggleType('tag')"/>
-          <radio group="rgType" id="rdType_attr" label="Attribute" value="attr" oncommand="dialog.toggleType('attr')"/>
+        <radiogroup id="rgType">
+          <radio id="rdType_id" label="ID" value="id" oncommand="dialog.toggleType('id')"/>
+          <radio id="rdType_tag" label="Tag" value="tag" oncommand="dialog.toggleType('tag')"/>
+          <radio id="rdType_attr" label="Attribute" value="attr" oncommand="dialog.toggleType('attr')"/>
         </radiogroup>
       </groupbox>
       <groupbox id="tbxDirection" hide="true">
         <caption label="Direction"/>
-        <radiogroup id="rgDirection" orient="vertical">
-          <radio id="rdDir_up" group="rgDirection" value="up" label="Up"/>
-          <radio id="rdDir_down" group="rgDirection" value="down" label="Down"/>
+        <radiogroup id="rgDirection">
+          <radio id="rdDir_up" value="up" label="Up"/>
+          <radio id="rdDir_down" value="down" label="Down"/>
         </radiogroup>
       </groupbox>
     </hbox>
diff --git a/mozilla/extensions/inspector/resources/content/viewers/domNode/domNode.xul b/mozilla/extensions/inspector/resources/content/viewers/domNode/domNode.xul
index bd8baadee46..5c074c336c4 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/domNode/domNode.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/domNode/domNode.xul
@@ -9,8 +9,7 @@
 <?xml-stylesheet href="chrome://inspector/skin/viewers/domNode/domNode.css"?>
 
 <page id="winNodeDefault"
-      orient="vertical" style="padding: 10px"
-      xmlns:html="http://www.w3.org/1999/xhtml"
+      style="padding: 10px"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
   <!--============================= SCRIPTS ============================= -->
@@ -43,25 +42,25 @@
         </columns>
         <rows>
           <row>
-            <text value="Node Name:" class="label"/>
+            <label value="Node Name:" />
             <textbox id="tx_nodeName" readonly="true"/>
           </row>
           <row>
-            <text value="Namespace URI:" class="label"/>
+            <label value="Namespace URI:" />
             <textbox id="tx_namespace" readonly="true"/>
           </row>
           <row>
-            <text value="Node Type:" class="label"/>
+            <label value="Node Type:" />
             <textbox id="tx_nodeType" readonly="true"/>
           </row>
           <row>
-            <text value="Node Value:" class="label"/>
+            <text value="Node Value:" />
             <textbox id="tx_nodeValue" readonly="true"/>
           </row>
         </rows>
       </grid>
     
-      <tree id="trAttributes" class="tree-editable inset"
+      <tree id="trAttributes" class="tree-editable"
         flex="1" context="ppAttrContext"
         datasources="rdf:null"
         onafteredit="viewer.cmdSetSelectedAttributeValue(event.editingItem, event.newValue)">
diff --git a/mozilla/extensions/inspector/resources/content/viewers/jsObject/evalExprDialog.xul b/mozilla/extensions/inspector/resources/content/viewers/jsObject/evalExprDialog.xul
index d44b70c6644..c665d67ebdf 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/jsObject/evalExprDialog.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/jsObject/evalExprDialog.xul
@@ -9,8 +9,6 @@
 
 <window id="winEvalExpr" class="dialog" 
         title="Evaluate Expression"
-        orient="vertical"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
   <script type="application/x-javascript" src="chrome://inspector/content/viewers/jsObject/evalExprDialog.js"/>
@@ -27,7 +25,7 @@
   </keyset>
 
   <vbox style="width: 350px;">
-    <html>Enter a javascript expression.  The variable "target" is the object that is currently selected.  Any value that you return will be displayed in the Javascript Object Viewer.</html>
+    <description>Enter a javascript expression.  The variable "target" is the object that is currently selected.  Any value that you return will be displayed in the Javascript Object Viewer.</description>
     
     <textbox id="txfExprInput" value=""/>
     
diff --git a/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul b/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul
index 3a115f71739..db1ecd5b937 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul
@@ -8,8 +8,6 @@
 <?xml-stylesheet href="chrome://inspector/skin/"?>
 
 <page id="winJSObject"
-      orient="vertical"
-      xmlns:html="http://www.w3.org/1999/xhtml"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/x-javascript" src="chrome://inspector/content/viewers/jsObject/jsObject.js"/>
diff --git a/mozilla/extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul b/mozilla/extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul
index 80c51e45bc3..9a34effe81a 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul
@@ -8,8 +8,6 @@
 <?xml-stylesheet href="chrome://inspector/skin/"?>
 
 <page id="winStylesheets"
-      orient="vertical"
-      xmlns:html="http://www.w3.org/1999/xhtml"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
   <script type="application/x-javascript" src="chrome://inspector/content/viewers/stylesheets/stylesheets.js"/>
diff --git a/mozilla/extensions/irc/xul/content/chatzilla.xul b/mozilla/extensions/irc/xul/content/chatzilla.xul
index 3a8f92b3f1c..e66d5ac0482 100644
--- a/mozilla/extensions/irc/xul/content/chatzilla.xul
+++ b/mozilla/extensions/irc/xul/content/chatzilla.xul
@@ -33,10 +33,9 @@
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
 <window id="main-window"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical" onload="onLoad();" onunload="onUnload();"
+        onload="onLoad();" onunload="onUnload();"
         onclose="return onClose();"
         persist="width height" windowtype="irc:chatzilla">
 
@@ -138,16 +137,16 @@
 
 <popupset id="contextMenus">
     <popup id="userlistPopup" oncommand="onUserListPopupClick(event)">
-        <menuitem label="&op.value;" accesskey="&op.accesskey;" code="/op" />
+        <menuitem label="&op.value;" accesskey="&op.accesskey;" code="/op"/>
         <menuitem label="&deop.value;" accesskey="&deop.accesskey;"
-          code="/deop" />
+          code="/deop"/>
         <menuitem label="&voice.value;" accesskey="&voice.accesskey;"
-          code="/voice" />
+          code="/voice"/>
         <menuitem label="&devoice.value;" accesskey="&devoice.accesskey;"
-          code="/devoice" />  
+          code="/devoice"/>  
         <menuitem label="&kick.value;" accesskey="&kick.accesskey;"
-          code="/kick" />
-        <menuitem label="&whois.value;" accesskey="&whois.accesskey;" code="/whois" />
+          code="/kick"/>
+        <menuitem label="&whois.value;" accesskey="&whois.accesskey;" code="/whois"/>
     </popup>
 
     <popup id="outputContext"
@@ -304,7 +303,7 @@
           <template>
             <treechildren flex="1">
               <treeitem uri="..." flex="1">
-                <treerow crop="right">
+                <treerow >
                     <treecell align="center">
                       <image class="op-image"
                         state="rdf:http://home.netscape.com/NC-irc#op"/>
@@ -314,11 +313,11 @@
                         state="rdf:http://home.netscape.com/NC-irc#voice"/>
                     </treecell>
                     <treecell flex="1">
-                      <text class="user-nick"
+                      <label class="user-nick"
                         isop="rdf:http://home.netscape.com/NC-irc#op"
                         isvoice="rdf:http://home.netscape.com/NC-irc#voice"
                         value="rdf:http://home.netscape.com/NC-irc#nick"
-                        flex="1" crop="right"/>
+                        flex="1"/>
                     </treecell>
                 </treerow>
               </treeitem>
@@ -337,7 +336,7 @@
           </treecolgroup>
   
           <treehead>
-            <treerow crop="right">
+            <treerow >
               <treecell id="usercol-op"
                 resource="http://home.netscape.com/NC-irc#op"
                 class="treecell-header" label="O"
@@ -372,12 +371,12 @@
 
     </hbox> <!-- tabpanels-contents-box -->
   
-    <hbox id="tabstrip-box" flex="0" crop="right">
+    <hbox id="tabstrip-box" flex="0" >
       <scrollbox id="view-tabs" persist="collapsed" orient="horizontal"
         flex="1">
 
         <tabs class="tabs-bottom" id="views-tbar-inner" flex="1"
-          crop="right">
+          >
           <tab collapsed="true"/> <!-- dummy tab to keep the freaking xbl from 
                                        causing an exception -->
         </tabs>
@@ -396,66 +395,65 @@
 
 </vbox> <!-- outer-box -->
 
-<toolbox id="status-bar-tbox" crop="right">
+<toolbox id="status-bar-tbox">
   <toolbar id="status-bar-tbar" class="chromeclass-status" persist="collapsed" grippytooltip="aTooltip"
-    grippytooltiptext="&statusBar.tooltip;"
-    crop="right">
-    <hbox class="status-box" flex="20%" crop="right">
-      <vbox class="status-label" crop="right">
-        <text value="&network.label;" crop="right"/>
-        <text value="&channel.label;" crop="right"/>
-        <text value="&topicBy.label;" crop="right"/>
+    grippytooltiptext="&statusBar.tooltip;">
+    <hbox class="status-box" flex="20%" >
+      <vbox class="status-label" >
+        <label value="&network.label;"/>
+        <label value="&channel.label;"/>
+        <label value="&topicBy.label;"/>
       </vbox>
-      <vbox class="status-data" crop="right">
-         <text id="net-name" value="(one)" crop="right"/> 
-         <text id="channel-name" value="(none)" crop="right"/>
-         <text id="channel-topicby" value="(nobody)" crop="right"/>
+      <vbox class="status-data" >
+         <label id="net-name" value="(one)"/> 
+         <label id="channel-name" value="(none)"/>
+         <label id="channel-topicby" value="(nobody)"/>
       </vbox>
       <spacer flex="20%"/>
-      <vbox class="status-label" crop="right">
-         <text value="&server.label;" crop="right"/>
-         <text value="&mode.label;" crop="right"/>
-         <text value="&topic.label;" crop="right"/>
+      <vbox class="status-label" >
+         <label value="&server.label;"/>
+         <label value="&mode.label;"/>
+         <label value="&topic.label;"/>
       </vbox>
-      <vbox flex="80%" crop="right">
-        <hbox flex="1" crop="right">
-          <vbox class="status-data" crop="right">
-            <text id="server-name" value="(none)" crop="right"/>
-            <text id="channel-mode" value="(none)" crop="right"/>
+      <vbox flex="80%" >
+        <hbox flex="1" >
+          <vbox class="status-data" >
+            <label id="server-name" value="(none)"/>
+            <label id="channel-mode" value="(none)"/>
           </vbox>
           <spacer flex="100%"/>
-          <vbox class="status-label" crop="right">
-            <text value="&nickname.label;" crop="right"/>
-            <text value="&users.label;" crop="right"/>
+          <vbox class="status-label" >
+            <label value="&nickname.label;"/>
+            <label value="&users.label;"/>
           </vbox>
-          <vbox class="status-data" crop="right">
-            <text id="server-nick" value="(unknown)" crop="right"/>
-            <text id="channel-users" value="(none)" crop="right"/>
+          <vbox class="status-data" >
+            <label id="server-nick" value="(unknown)"/>
+            <label id="channel-users" value="(none)"/>
           </vbox>
           <spacer flex="100%"/>
-          <vbox class="status-label" crop="right">
-            <text value="&lag.label;" crop="right"/>
-            <text value="&limit.label;" crop="right"/>
+          <vbox class="status-label" >
+            <label value="&lag.label;"/>
+            <label value="&limit.label;"/>
           </vbox>
-          <vbox class="status-data" crop="right">
-            <text id="server-lag" value="-1" crop="right"/>
-            <text id="channel-limit" value="(none)" crop="right"/>
+          <vbox class="status-data" >
+            <label id="server-lag" value="-1"/>
+            <label id="channel-limit" value="(none)"/>
           </vbox>
           <spacer flex="100%"/>
-          <vbox class="status-label" crop="right"
+          <vbox class="status-label" 
             collapsed="true">
-            <text value="&lastPing.label;" crop="right"/>
-            <text value="&key.label;" crop="right"/>
+            <label value="&lastPing.label;"/>
+            <label value="&key.label;"/>
           </vbox>
-          <vbox class="status-data" crop="right"
+          <vbox class="status-data" 
             collapsed="true">
-            <text id="last-ping" value="(never)" crop="right"/>
-          <text id="channel-key" value="(none)" crop="right"/>
+            <label id="last-ping" value="(never)"/>
+          <label id="channel-key" value="(none)"/>
           </vbox>
         </hbox>
-        <hbox flex="1" crop="right">
-          <vbox class="status-data" flex="1" crop="right">
-            <text id="channel-topic" value="(none)" crop="right"/>
+        <hbox flex="1">
+          <vbox class="status-data" flex="1">
+            <label id="channel-topic" value="(none)"/>
           </vbox>
         </hbox>
       </vbox>
diff --git a/mozilla/extensions/irc/xul/content/chatzillaOverlay.xul b/mozilla/extensions/irc/xul/content/chatzillaOverlay.xul
index a2ba307a29f..bdac0fc81c0 100644
--- a/mozilla/extensions/irc/xul/content/chatzillaOverlay.xul
+++ b/mozilla/extensions/irc/xul/content/chatzillaOverlay.xul
@@ -5,8 +5,7 @@
 <!-- This is the overlay that addes "Chatzilla" to the (global) task menu. -->
 
 <overlay id="ChatzillaTaskMenuID"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script type="application/x-javascript" src="chrome://chatzilla/content/chatzillaOverlay.js"/>
 
diff --git a/mozilla/extensions/irc/xul/content/pref-irc.xul b/mozilla/extensions/irc/xul/content/pref-irc.xul
index 168157f85b5..85c23c55ae2 100644
--- a/mozilla/extensions/irc/xul/content/pref-irc.xul
+++ b/mozilla/extensions/irc/xul/content/pref-irc.xul
@@ -26,7 +26,7 @@
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
-        orient="vertical" title="&window.title;"
+        title="&window.title;"
         onload="if( parent.handle ) parent.handle.onpageload( 'pref-irc' ); else parent.queuedTag = 'pref-irc';">
 
   <hbox class="header">  
diff --git a/mozilla/extensions/p3p/resources/content/pref-P3P.xul b/mozilla/extensions/p3p/resources/content/pref-P3P.xul
index 302e526cc42..9546907dc6e 100644
--- a/mozilla/extensions/p3p/resources/content/pref-P3P.xul
+++ b/mozilla/extensions/p3p/resources/content/pref-P3P.xul
@@ -27,13 +27,11 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-P3P.dtd" >
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         class="color-dialog"
-        orient="vertical"
         title="&window.title;"
         onload="parent.initPanel('chrome://communicator/content/pref/pref-P3P.xul');">
 
-  <html:script type="application/x-javascript">
+  <script type="application/x-javascript">
     <![CDATA[
       _elementIDs = ["P3PServiceEnabled",
 
@@ -182,9 +180,9 @@
     ]]>
   </script>
 
-  <html:script type="application/x-javascript" src="chrome://global/content/strres.js" />
-  <html:script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
-  <html:script type="application/x-javascript" src="chrome://communicator/content/pref/pref-P3P.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-P3P.js"/>
 
   <hbox class="box-smallheader" title="&lHeader;"/>
 
@@ -194,56 +192,54 @@
     <checkbox id="P3PServiceEnabled"
               value="&enable.label;"
               oncommand="DoEnableService( )"
-              pref="true" preftype="bool" prefstring="P3P.enabled" prefattribute="checked"/>
+              preftype="bool" prefstring="P3P.enabled" prefattribute="checked"/>
 
       <checkbox id="P3PWarningNotPrivate"
                 value="&warningnotprivate.label;"
                 class="indent"
-                pref="true" preftype="bool" prefstring="P3P.warningnotprivate" prefattribute="checked"/>
+                preftype="bool" prefstring="P3P.warningnotprivate" prefattribute="checked"/>
 
       <checkbox id="P3PWarningPartialPrivacy"
                 value="&warningpartialprivacy.label;"
                 class="indent"
-                pref="true" preftype="bool" prefstring="P3P.warningpartialprivacy" prefattribute="checked"/>
+                preftype="bool" prefstring="P3P.warningpartialprivacy" prefattribute="checked"/>
 
       <checkbox id="P3PWarningPostToNotPrivate"
                 value="&warningposttonotprivate.label;"
                 class="indent"
-                pref="true" preftype="bool" prefstring="P3P.warningposttonotprivate" prefattribute="checked"/>
+                preftype="bool" prefstring="P3P.warningposttonotprivate" prefattribute="checked"/>
 
       <checkbox id="P3PWarningPostToBrokenPolicy"
                 value="&warningposttobrokenpolicy.label;"
                 class="indent"
-                pref="true" preftype="bool" prefstring="P3P.warningposttobrokenpolicy" prefattribute="checked"/>
+                preftype="bool" prefstring="P3P.warningposttobrokenpolicy" prefattribute="checked"/>
 
       <checkbox id="P3PWarningPostToNoPolicy"
                 value="&warningposttonopolicy.label;"
                 class="indent"
-                pref="true" preftype="bool" prefstring="P3P.warningposttonopolicy" prefattribute="checked"/>
+                preftype="bool" prefstring="P3P.warningposttonopolicy" prefattribute="checked"/>
   </groupbox>
 
-  <groupbox orient="vertical">
-    <caption><text value="&selection.label;"/></caption>
-    <html>&selection.desc;</html>
+  <groupbox>
+    <caption value="&selection.label;"/>
+    <description>&selection.desc;</description>
     <radiogroup id="P3PLevel"
-                orient="vertical"
-                pref="true" preftype="int" prefstring="P3P.level" prefattribute="data">
-      <radio data="0"
-             group="P3PLevel"
-             value="&lowlevel.label;"
+                preftype="int" prefstring="P3P.level" prefattribute="data">
+      <radio value="0"
+             label="&lowlevel.label;"
              checked="true"
              oncommand="DoMapLevel();"/>
-      <radio data="1"
+      <radio value="1"
              group="P3PLevel"
-             value="&mediumlevel.label;"
+             label="&mediumlevel.label;"
              oncommand="DoMapLevel();"/>
-      <radio data="2"
+      <radio value="2"
              group="P3PLevel"
-             value="&highlevel.label;"
+             label="&highlevel.label;"
              oncommand="DoMapLevel();"/>
-      <radio data="3" id="custradio"
+      <radio value="3" id="custradio"
              group="P3PLevel"
-             value="&customlevel.label;"
+             label="&customlevel.label;"
              oncommand="DoMapLevel();"/>
       <separator/>
       <hbox>
@@ -454,16 +450,16 @@
             <!-- deck index 1 -->
             <vbox style="width:100px" flex="1">
               <text class="header" value="&superphysical.label;"/>
-              <html>&superphysical.tip;</html>
+              <description>&superphysical.tip;</description>
             </vbox>
 
             <!-- deck index 2 -->
             <vbox style="width:100px">>
-              <text class="header" value="physical"/>
-              <html>&physical.tip;</html>
+              <lable class="header" value="physical"/>
+              <description>&physical.tip;</description>
               <spacer flex="1"/>
               <groupbox orient="horizontal">
-                <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
+                <caption value="&purpose.label;" tooltip="purposetip"/>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -471,27 +467,27 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <groupbox orient="vertical">
-                        <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
-                        <checkbox id="P3PPhysicalAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.admin" prefattribute="checked"
+                      <groupbox>
+                        <caption value="&superadmin.label;" tooltip="superadmintip"/>
+                        <checkbox id="P3PPhysicalAdmin" label="admin" tooltip="admintip"
+                                  preftype="bool" prefstring="P3P.physical.admin" prefattribute="checked"
                                   />
-                        <checkbox id="P3PPhysicalHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.historical" prefattribute="checked"
+                        <checkbox id="P3PPhysicalHistorical" label="historical" tooltip="historicaltip"
+                                  preftype="bool" prefstring="P3P.physical.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
 
-                      <groupbox orient="vertical">
-                        <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
+                      <groupbox>
+                        <caption value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PPhysicalDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PPhysicalPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PPhysicalIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -501,16 +497,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PPhysicalCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PPhysicalTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PPhysicalPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PPhysicalIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -518,13 +514,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PPhysicalCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PPhysicalContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PPhysicalTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -533,7 +529,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PPhysicalOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.physical.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.physical.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -544,7 +540,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PPhysicalSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.physical.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.physical.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -566,10 +562,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PLocationAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PLocationHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -577,13 +573,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PLocationDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PLocationPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PLocationIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -593,16 +589,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PLocationCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PLocationTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PLocationPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PLocationIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -610,13 +606,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PLocationCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PLocationContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PLocationTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -625,7 +621,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PLocationOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.location.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.location.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -636,7 +632,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PLocationSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.location.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.location.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -664,10 +660,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3POnlineAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3POnlineHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -675,13 +671,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3POnlineDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3POnlinePseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3POnlineIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -691,16 +687,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3POnlineCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3POnlineTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3POnlinePseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3POnlineIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -708,13 +704,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3POnlineCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.current" prefattribute="checked"
                                   />
                         <checkbox id="P3POnlineContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3POnlineTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -723,7 +719,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3POnlineOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.online.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.online.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -734,7 +730,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3POnlineSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.online.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.online.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -762,10 +758,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PComputerAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PComputerHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -773,13 +769,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PComputerDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PComputerPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PComputerIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -789,16 +785,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PComputerCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PComputerTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PComputerPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PComputerIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -806,13 +802,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PComputerCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PComputerContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PComputerTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -821,7 +817,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PComputerOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.computer.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.computer.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -832,7 +828,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PComputerSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.computer.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.computer.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -854,10 +850,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PStateAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PStateHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -865,13 +861,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PStateDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PStatePseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PStateIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -881,16 +877,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PStateCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PStateTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PStatePseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PStateIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -898,13 +894,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PStateCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PStateContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PStateTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -913,7 +909,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PStateOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.state.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.state.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -924,7 +920,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PStateSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.state.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.state.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -946,10 +942,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PUniqueIDAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PUniqueIDHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -957,13 +953,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PUniqueIDDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PUniqueIDPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PUniqueIDIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -973,16 +969,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PUniqueIDCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PUniqueIDTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PUniqueIDPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PUniqueIDIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -990,13 +986,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PUniqueIDCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PUniqueIDContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PUniqueIDTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1005,7 +1001,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PUniqueIDOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.uniqueid.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.uniqueid.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1016,7 +1012,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PUniqueIDSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.uniqueid.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.uniqueid.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1038,10 +1034,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PGovernmentAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PGovernmentHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1049,13 +1045,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PGovernmentDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PGovernmentPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PGovernmentIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1065,16 +1061,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PGovernmentCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PGovernmentTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PGovernmentPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PGovernmentIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1082,13 +1078,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PGovernmentCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PGovernmentContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PGovernmentTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1097,7 +1093,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PGovernmentOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.government.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.government.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1108,7 +1104,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PGovernmentSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.government.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.government.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1136,10 +1132,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PPurchaseAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PPurchaseHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1147,13 +1143,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PPurchaseDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PPurchasePseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PPurchaseIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1163,16 +1159,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PPurchaseCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PPurchaseTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PPurchasePseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PPurchaseIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1180,13 +1176,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PPurchaseCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PPurchaseContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PPurchaseTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1195,7 +1191,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PPurchaseOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.purchase.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.purchase.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1206,7 +1202,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PPurchaseSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.purchase.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.purchase.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1234,10 +1230,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PFinancialAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PFinancialHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1245,13 +1241,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PFinancialDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PFinancialPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PFinancialIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1261,16 +1257,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PFinancialCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PFinancialTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PFinancialPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PFinancialIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1278,13 +1274,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PFinancialCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PFinancialContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PFinancialTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1293,7 +1289,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PFinancialOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.financial.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.financial.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1304,7 +1300,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PFinancialSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.financial.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.financial.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1326,10 +1322,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PHealthAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PHealthHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1337,13 +1333,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PHealthDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PHealthPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PHealthIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1353,16 +1349,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PHealthCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PHealthTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PHealthPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PHealthIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1370,13 +1366,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PHealthCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PHealthContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PHealthTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1385,7 +1381,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PHealthOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.health.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.health.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1396,7 +1392,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PHealthSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.health.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.health.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1418,10 +1414,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PPoliticalAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PPoliticalHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1429,13 +1425,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PPoliticalDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PPoliticalPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PPoliticalIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1445,16 +1441,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PPoliticalCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PPoliticalTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PPoliticalPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PPoliticalIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1462,13 +1458,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PPoliticalCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PPoliticalContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PPoliticalTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1477,7 +1473,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PPoliticalOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.political.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.political.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1488,7 +1484,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PPoliticalSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.political.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.political.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1516,10 +1512,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PNavigationAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PNavigationHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1527,13 +1523,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PNavigationDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PNavigationPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PNavigationIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1543,16 +1539,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PNavigationCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PNavigationTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PNavigationPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PNavigationIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1560,13 +1556,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PNavigationCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PNavigationContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PNavigationTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1575,7 +1571,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PNavigationOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.navigation.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.navigation.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1586,7 +1582,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PNavigationSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.navigation.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.navigation.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1608,10 +1604,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PInteractiveAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PInteractiveHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1619,13 +1615,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PInteractiveDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PInteractivePseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PInteractiveIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1635,16 +1631,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PInteractiveCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PInteractiveTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PInteractivePseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PInteractiveIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1652,13 +1648,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PInteractiveCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PInteractiveContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PInteractiveTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1667,7 +1663,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PInteractiveOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.interactive.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.interactive.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1678,7 +1674,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PInteractiveSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.interactive.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.interactive.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1706,10 +1702,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PDemographicAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PDemographicHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1717,13 +1713,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PDemographicDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PDemographicPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PDemographicIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1733,16 +1729,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PDemographicCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PDemographicTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PDemographicPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PDemographicIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1750,13 +1746,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PDemographicCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PDemographicContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PDemographicTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1765,7 +1761,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PDemographicOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.demographic.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.demographic.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1776,7 +1772,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PDemographicSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.demographic.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.demographic.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1798,10 +1794,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PPreferenceAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PPreferenceHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1809,13 +1805,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PPreferenceDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PPreferencePseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PPreferenceIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1825,16 +1821,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PPreferenceCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PPreferenceTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PPreferencePseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PPreferenceIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1842,13 +1838,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PPreferenceCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PPreferenceContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PPreferenceTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1857,7 +1853,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PPreferenceOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.preference.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.preference.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1868,7 +1864,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PPreferenceSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.preference.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.preference.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1896,10 +1892,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3PContentAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3PContentHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1907,13 +1903,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3PContentDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3PContentPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3PContentIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1923,16 +1919,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3PContentCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3PContentTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3PContentPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3PContentIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1940,13 +1936,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3PContentCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.current" prefattribute="checked"
                                   />
                         <checkbox id="P3PContentContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3PContentTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -1955,7 +1951,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3PContentOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.content.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.content.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -1966,7 +1962,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3PContentSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.content.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.content.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
@@ -1994,10 +1990,10 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superadmin.label;" tooltip="superadmintip"/></caption>
                         <checkbox id="P3POtherAdmin" value="admin" tooltip="admintip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.admin" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.admin" prefattribute="checked"
                                   />
                         <checkbox id="P3POtherHistorical" value="historical" tooltip="historicaltip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.historical" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.historical" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -2005,13 +2001,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></caption>
                         <checkbox id="P3POtherDevelop" value="develop" tooltip="developtip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.develop" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.develop" prefattribute="checked"
                                   />
                         <checkbox id="P3POtherPseudo-analysis" value="pseudo-analysis" tooltip="pseudo-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.pseudo-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.pseudo-analysis" prefattribute="checked"
                                   />
                         <checkbox id="P3POtherIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.individual-analysis" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.individual-analysis" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -2021,16 +2017,16 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercustomize.label;" tooltip="supercustomizetip"/></caption>
                         <checkbox id="P3POtherCustomization" value="customization" tooltip="customizationtip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.customization" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.customization" prefattribute="checked"
                                   />
                         <checkbox id="P3POtherTailoring" value="tailoring" tooltip="tailoringtip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.tailoring" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.tailoring" prefattribute="checked"
                                   />
                         <checkbox id="P3POtherPseudo-decision" value="pseudo-decision" tooltip="pseudo-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.pseudo-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.pseudo-decision" prefattribute="checked"
                                   />
                         <checkbox id="P3POtherIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.individual-decision" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.individual-decision" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -2038,13 +2034,13 @@
                       <groupbox orient="vertical">
                         <caption><text value="&supercontact.label;" tooltip="supercontacttip"/></caption>
                         <checkbox id="P3POtherCurrent" value="current" tooltip="currenttip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.current" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.current" prefattribute="checked"
                                   />
                         <checkbox id="P3POtherContact" value="contact" tooltip="contacttip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.contact" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.contact" prefattribute="checked"
                                   />
                         <checkbox id="P3POtherTelemarketing" value="telemarketing" tooltip="telemarketingtip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.telemarketing" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.telemarketing" prefattribute="checked"
                                   />
                         <spacer flex="1"/>
                       </groupbox>
@@ -2053,7 +2049,7 @@
                     <row flex="1">
                       <vbox>
                         <checkbox id="P3POtherOther-purpose" value="other-purpose" tooltip="other-purposetip"
-                                  pref="true" preftype="bool" prefstring="P3P.other.other-purpose" prefattribute="checked"
+                                  preftype="bool" prefstring="P3P.other.other-purpose" prefattribute="checked"
                                   />
                       </vbox>
                     </row>
@@ -2064,7 +2060,7 @@
               <groupbox orient="vertical">
                 <caption><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></caption>
                 <checkbox id="P3POtherSharing" value="&sharing.label;" tooltip="sharingtip"
-                          pref="true" preftype="bool" prefstring="P3P.other.sharing" prefattribute="checked"
+                          preftype="bool" prefstring="P3P.other.sharing" prefattribute="checked"
                           />
               </groupbox>
             </vbox>
diff --git a/mozilla/extensions/venkman/resources/content/venkman-overlay.xul b/mozilla/extensions/venkman/resources/content/venkman-overlay.xul
index 9321c415c90..ae7e54338d1 100644
--- a/mozilla/extensions/venkman/resources/content/venkman-overlay.xul
+++ b/mozilla/extensions/venkman/resources/content/venkman-overlay.xul
@@ -47,8 +47,7 @@
 <!DOCTYPE window SYSTEM "chrome://venkman/locale/venkman-overlay.dtd" >
 
 <overlay id="venkmanTaskMenuID"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script src="chrome://venkman/content/venkman-overlay.js"/>
 
diff --git a/mozilla/extensions/venkman/resources/content/venkman.xul b/mozilla/extensions/venkman/resources/content/venkman.xul
index f0ac7ab775d..e211f9bd2c4 100644
--- a/mozilla/extensions/venkman/resources/content/venkman.xul
+++ b/mozilla/extensions/venkman/resources/content/venkman.xul
@@ -45,8 +45,7 @@
 <?xul-overlay href="chrome://venkman/content/venkman-scripts.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
-<window id="venkman-window" orient="vertical"
-  xmlns:html="http://www.w3.org/1999/xhtml"
+<window id="venkman-window"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="console.onLoad();" onunload="return console.onUnload();"
   width="640" height="480"
@@ -56,7 +55,7 @@
   <overlaytarget id="scripts-overlay-target"/>
   <overlaytarget id="menu-overlay-target"/>
 
-  <box flex="1" orient="vertical">
+  <vbox flex="1">
       <hbox flex="1" id="top-hbox" persist="height">
 
         <vbox flex="1" id="top-left-pane" persist="width">
@@ -162,7 +161,7 @@
         </vbox>
 
       </hbox>
-  </box>
+  </vbox>
 
   <overlaytarget id="statusbar-overlay-target"/>
 
diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.js b/mozilla/extensions/wallet/cookieviewer/CookieViewer.js
index c460edbffe0..9a88ce20ccd 100644
--- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.js
+++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.js
@@ -111,7 +111,6 @@ function Startup()
  
   loadCookies();
   loadPermissions();
-  doSetOKCancel(onOK, null);
   window.sizeToContent();
 }
 
@@ -502,9 +501,9 @@ function DeleteAllImagePermissions() {
 
 /*** =================== GENERAL CODE =================== ***/
 
-// function : <CookieViewer.js>::doOKButton();
+// function : <CookieViewer.js>::onAccept();
 // purpose  : saves the changed settings and closes the dialog.
-function onOK(){
+function onAccept(){
 
   var deletedCookies = [];
   deletedCookies = gone_c.split(",");
diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
index 3b19276b7a2..e4ca0b6860b 100644
--- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
+++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
@@ -29,14 +29,12 @@
 <!-- CHANGE THIS WHEN MOVING FILES -->
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/CookieViewer.dtd" >
 
-<window id="cookieviewer"
-        class="dialog"
+<dialog id="cookieviewer"
         title="&windowtitle.label;"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="width: 30em;"
-        orient="vertical"
-        onload="Startup()">
+        onload="Startup()"
+        ondialogaccept="onAccept();">
 
   <script src="chrome://communicator/content/wallet/CookieViewer.js"/>
   <script src="chrome://global/content/strres.js"/>
@@ -52,9 +50,9 @@
     </tabs>
     <tabpanels id="panel" flex="1">
       <vbox class="tabpanel" id="system" flex="1">
-          <text class="label" value="&div.cookiesonsystem.label;"/>
+          <label value="&div.cookiesonsystem.label;"/>
           <separator class="thin"/>
-          <tree id="cookietree" class="inset" style="height: 10em;"
+          <tree id="cookietree" style="height: 10em;"
             multiple="true" onselect="ViewCookieSelected(event);"
             onclick="ViewCookieSelected(event)" flex="1"
             onkeypress="HandleKeyPress(event)">
@@ -86,51 +84,51 @@
               </columns>
               <rows>
                 <row align="center">
-                  <text value="&props.name.label;"/>
+                  <label value="&props.name.label;"/>
                   <textbox id="ifl_name" readonly="true"/>
                 </row>
                 <row align="center">
-                  <text value="&props.value.label;"/>
+                  <label value="&props.value.label;"/>
                   <textbox id="ifl_value" readonly="true"/>
                 </row>
                 <row align="center">
-                  <text id="ifl_isDomain" value="&props.domain.label;"/>
+                  <label id="ifl_isDomain" value="&props.domain.label;"/>
                   <textbox id="ifl_host" readonly="true"/>
                 </row>
                 <row align="center">
-                  <text value="&props.path.label;"/>
+                  <label value="&props.path.label;"/>
                   <textbox id="ifl_path" readonly="true"/>
                 </row>
                 <row align="center">
-                  <text value="&props.secure.label;"/>
+                  <label value="&props.secure.label;"/>
                   <textbox id="ifl_isSecure" readonly="true"/>
                 </row>
                 <row align="center">
-                  <text value="&props.expires.label;"/>
+                  <label value="&props.expires.label;"/>
                   <textbox id="ifl_expires" readonly="true"/>
                 </row>
               </rows>
             </grid>
           </groupbox>
           <hbox>
-            <button id="removeCookies" class="dialog push" disabled="true"
+            <button id="removeCookies" disabled="true"
                           label="&button.removecookie.label;"
                           oncommand="DeleteCookieSelected();"/>
-            <button id="removeAllCookies" class="dialog push"
+            <button id="removeAllCookies"
                           label="&button.removeallcookies.label;"
                           oncommand="DeleteAllCookies();"/>
             <!--  todo: <button id="restoreCookies" class="dialog push" disabled="true" label="&button.restorecookie.label;" oncommand="RestoreCookies();"/> -->
           </hbox>
           <separator class="thin"/>
-          <hbox autostretch="never">
+          <hbox align="start">
             <checkbox id="checkbox" label="&checkbox.label;" />
           </hbox>
       </vbox>
       
-      <vbox class="tabpanel" id="servers" flex="1">
-          <text class="label" value="&div.bannedservers.label;"/>
+      <vbox id="servers" flex="1">
+          <label value="&div.bannedservers.label;"/>
           <separator class="thin"/>
-          <tree id="cookiepermissionstree" class="inset" flex="1"
+          <tree id="cookiepermissionstree" flex="1"
                 onkeypress="if(event.which == 46) gone_p += DeleteItemSelected('cookiepermissionstree', 'permtree_', 'cookiePermList');"
                 multiple="true" onclick="ViewCookiePermissionSelected();">
             <treecolgroup>
@@ -151,19 +149,19 @@
             <treechildren flex="1" id="cookiePermList"/>
           </tree>
           <hbox>
-            <button id="removePermissions" class="dialog push" disabled="true" 
+            <button id="removePermissions" disabled="true" 
                           label="&removepermission.label;" 
                           oncommand="DeleteCookiePermissionSelected();"/>
-            <button id="removeAllPermissions" class="dialog push"
+            <button id="removeAllPermissions"
                           label="&removeallpermissions.label;" 
                           oncommand="DeleteAllCookiePermissions();"/>
           </hbox>
       </vbox>
 
-      <vbox class="tabpanel" id="images" hidden="true" flex="1">
-          <text class="label" value="&div.bannedimages.label;"/>
+      <vbox id="images" hidden="true" flex="1">
+          <label value="&div.bannedimages.label;"/>
           <separator class="thin"/>
-          <tree id="imagepermissionstree" class="inset" flex="1" style="height: 0px;"
+          <tree id="imagepermissionstree" flex="1" style="height: 0px;"
                 onkeypress="if(event.which == 46) gone_i += DeleteItemSelected('imagepermisionstree', 'imgtree_', 'imagePermList');"
                 multiple="true" onclick="ViewImagePermissionSelected();">
             <treecolgroup>
@@ -184,10 +182,10 @@
             <treechildren flex="1" id="imagePermList"/>
           </tree>
           <hbox>
-            <button id="removeImages" class="dialog push" disabled="true"
+            <button id="removeImages" disabled="true"
                           label="&removeimage.label;" 
                           oncommand="DeleteImagePermissionSelected();"/>
-            <button id="removeAllImages" class="dialog push"
+            <button id="removeAllImages"
                           label="&removeallimages.label;" 
                           oncommand="DeleteAllImagePermissions();"/>
           </hbox>
@@ -195,8 +193,4 @@
 
     </tabpanels>
   </tabbox>
-  
-  <separator class="thin"/>
-  <hbox id="okCancelButtonsRight"/>
-
-</window>
+</dialog>
diff --git a/mozilla/extensions/wallet/editor/WalletAddress.xul b/mozilla/extensions/wallet/editor/WalletAddress.xul
index 90c1a9d3b3f..3716baf1b05 100644
--- a/mozilla/extensions/wallet/editor/WalletAddress.xul
+++ b/mozilla/extensions/wallet/editor/WalletAddress.xul
@@ -30,11 +30,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -47,7 +44,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&address.title;"/>
     <grid class="indent" flex="1">
 
@@ -59,7 +56,7 @@
       <rows>
 
         <row align="center">
-          <html>&addressLine1.label;</html>
+          <description>&addressLine1.label;</description>
           <menulist id="street.line1" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -69,7 +66,7 @@
         </row>
 
         <row align="center">
-          <html>&addressLine2.label;</html>
+          <description>&addressLine2.label;</description>
           <menulist id="street.line2" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -79,7 +76,7 @@
         </row>
 
         <row align="center">
-          <html>&addressLine3.label;</html>
+          <description>&addressLine3.label;</description>
           <menulist id="street.line3" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -89,7 +86,7 @@
         </row>
 
         <row align="center">
-          <html>&addressCity.label;</html>
+          <description>&addressCity.label;</description>
           <menulist id="city" editable="true" autoSelectMenuitem="false"
                      onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -99,7 +96,7 @@
         </row>
 
         <row align="center">
-          <html>&addressState.label;</html>
+          <description>&addressState.label;</description>
           <menulist id="state" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -109,7 +106,7 @@
         </row>
 
         <row align="center">
-          <html>&addressZipcode.label;</html>
+          <description>&addressZipcode.label;</description>
           <hbox>
           <menulist id="postalcode.prefix" editable="true" autoSelectMenuitem="false" flex="55%" width="0"
                     onchange="Append(this)">
@@ -117,7 +114,7 @@
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="postalcode.suffix" editable="true" autoSelectMenuitem="false" flex="45%" width="0"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -128,7 +125,7 @@
         </row>
 
         <row align="center">
-          <html>&addressCountry.label;</html>
+          <description>&addressCountry.label;</description>
           <menulist id="country" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -138,7 +135,7 @@
         </row>
 
         <row align="center">
-          <html>&email.label;</html>
+          <description>&email.label;</description>
           <menulist id="email" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -148,7 +145,7 @@
         </row>
 
         <row align="center">
-          <html>&homepage.label;</html>
+          <description>&homepage.label;</description>
           <menulist id="uri" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
 
@@ -163,5 +160,4 @@
     </grid>
 
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletBilling.xul b/mozilla/extensions/wallet/editor/WalletBilling.xul
index abeb00abfa3..f30863efd33 100644
--- a/mozilla/extensions/wallet/editor/WalletBilling.xul
+++ b/mozilla/extensions/wallet/editor/WalletBilling.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -44,6 +40,5 @@
 
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
-  
 
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletConcatenated.xul b/mozilla/extensions/wallet/editor/WalletConcatenated.xul
index 26accfa9d0b..4a6f4213ec1 100644
--- a/mozilla/extensions/wallet/editor/WalletConcatenated.xul
+++ b/mozilla/extensions/wallet/editor/WalletConcatenated.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,12 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        style="overflow: auto;"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -63,7 +58,7 @@
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
-  <groupbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox align="start" hidden="true">
     <caption label="&concatPrimary.title;"/>
     <grid class="indent" flex="1">
       <columns>
@@ -73,7 +68,7 @@
       <rows>
 
         <row hidden="true" align="center">
-          <html>&concatName.label;</html>
+          <description>&concatName.label;</description>
           <menulist id="name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -83,7 +78,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatZipcode.label;</html>
+          <description>&concatZipcode.label;</description>
           <menulist id="home.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -93,7 +88,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatPhone.label;</html>
+          <description>&concatPhone.label;</description>
           <menulist id="home.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -103,7 +98,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatPhonenumber.label;</html>
+          <description>&concatPhonenumber.label;</description>
           <menulist id="home.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -113,7 +108,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatAltPhone.label;</html>
+          <description>&concatAltPhone.label;</description>
           <menulist id="home.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -123,7 +118,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatAltPhonenumber.label;</html>
+          <description>&concatAltPhonenumber.label;</description>
           <menulist id="home.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -133,7 +128,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatFax.label;</html>
+          <description>&concatFax.label;</description>
           <menulist id="home.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -143,7 +138,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatFaxnumber.label;</html>
+          <description>&concatFaxnumber.label;</description>
           <menulist id="home.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -153,7 +148,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatMobile.label;</html>
+          <description>&concatMobile.label;</description>
           <menulist id="home.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -163,7 +158,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatMobilenumber.label;</html>
+          <description>&concatMobilenumber.label;</description>
           <menulist id="home.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -173,7 +168,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatPager.label;</html>
+          <description>&concatPager.label;</description>
           <menulist id="home.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -183,7 +178,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatPagernumber.label;</html>
+          <description>&concatPagernumber.label;</description>
           <menulist id="home.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -196,7 +191,7 @@
     </grid>
   </groupbox>
 
-  <groupbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox align="start" hidden="true">
     <caption label="&concatShipping.title;"/>
     <grid class="indent">
       <columns>
@@ -206,7 +201,7 @@
       <rows>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoName.label;</html>
+          <description>&concatShiptoName.label;</description>
           <menulist id="shipto.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -216,7 +211,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoZipcode.label;</html>
+          <description>&concatShiptoZipcode.label;</description>
           <menulist id="shipto.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -226,7 +221,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoPhone.label;</html>
+          <description>&concatShiptoPhone.label;</description>
           <menulist id="shipto.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -236,7 +231,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoPhonenumber.label;</html>
+          <description>&concatShiptoPhonenumber.label;</description>
           <menulist id="shipto.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -246,7 +241,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoAltPhone.label;</html>
+          <description>&concatShiptoAltPhone.label;</description>
           <menulist id="shipto.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -256,7 +251,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoAltPhonenumber.label;</html>
+          <description>&concatShiptoAltPhonenumber.label;</description>
           <menulist id="shipto.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -266,7 +261,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoFax.label;</html>
+          <description>&concatShiptoFax.label;</description>
           <menulist id="shipto.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -276,7 +271,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoFaxnumber.label;</html>
+          <description>&concatShiptoFaxnumber.label;</description>
           <menulist id="shipto.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -286,7 +281,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoMobile.label;</html>
+          <description>&concatShiptoMobile.label;</description>
           <menulist id="shipto.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -296,7 +291,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoMobilenumber.label;</html>
+          <description>&concatShiptoMobilenumber.label;</description>
           <menulist id="shipto.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -306,7 +301,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoPager.label;</html>
+          <description>&concatShiptoPager.label;</description>
           <menulist id="shipto.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -316,7 +311,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoPagernumber.label;</html>
+          <description>&concatShiptoPagernumber.label;</description>
           <menulist id="shipto.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -329,7 +324,7 @@
     </grid>
   </groupbox>
 
-  <groupbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox align="start" hidden="true">
     <caption label="&concatBilling.title;"/>
     <grid class="indent">
       <columns>
@@ -339,7 +334,7 @@
       <rows>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoName.label;</html>
+          <description>&concatBilltoName.label;</description>
           <menulist id="billto.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -349,7 +344,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoZipcode.label;</html>
+          <description>&concatBilltoZipcode.label;</description>
           <menulist id="billto.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -359,7 +354,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoPhone.label;</html>
+          <description>&concatBilltoPhone.label;</description>
           <menulist id="billto.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -369,7 +364,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoPhonenumber.label;</html>
+          <description>&concatBilltoPhonenumber.label;</description>
           <menulist id="billto.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -379,7 +374,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoAltPhone.label;</html>
+          <description>&concatBilltoAltPhone.label;</description>
           <menulist id="billto.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -389,7 +384,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoAltPhonenumber.label;</html>
+          <description>&concatBilltoAltPhonenumber.label;</description>
           <menulist id="billto.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -399,7 +394,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoFax.label;</html>
+          <description>&concatBilltoFax.label;</description>
           <menulist id="billto.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -409,7 +404,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoFaxnumber.label;</html>
+          <description>&concatBilltoFaxnumber.label;</description>
           <menulist id="billto.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -419,7 +414,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoMobile.label;</html>
+          <description>&concatBilltoMobile.label;</description>
           <menulist id="billto.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -429,7 +424,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoMobilenumber.label;</html>
+          <description>&concatBilltoMobilenumber.label;</description>
           <menulist id="billto.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -439,7 +434,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoPager.label;</html>
+          <description>&concatBilltoPager.label;</description>
           <menulist id="billto.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -449,7 +444,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoPagernumber.label;</html>
+          <description>&concatBilltoPagernumber.label;</description>
           <menulist id="billto.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -462,7 +457,7 @@
     </grid>
   </groupbox>
 
-  <groupbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox align="start" hidden="true">
     <caption label="&concatOther.title;"/>label
     <grid class="indent">
       <columns>
@@ -472,7 +467,7 @@
       <rows>
 
         <row hidden="true" align="center">
-          <html>&concatCardExpdate.label;</html>
+          <description>&concatCardExpdate.label;</description>
           <menulist id="card.expdate" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -482,7 +477,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatSocSec.label;</html>
+          <description>&concatSocSec.label;</description>
           <menulist id="socsec" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -492,7 +487,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBdate.label;</html>
+          <description>&concatBdate.label;</description>
           <menulist id="bdate" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -502,7 +497,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatAnniv.label;</html>
+          <description>&concatAnniv.label;</description>
           <menulist id="anniv" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -514,5 +509,4 @@
       </rows>
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletCredit.xul b/mozilla/extensions/wallet/editor/WalletCredit.xul
index ffa83e590cf..e338ae1a541 100644
--- a/mozilla/extensions/wallet/editor/WalletCredit.xul
+++ b/mozilla/extensions/wallet/editor/WalletCredit.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -46,7 +42,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&credit.title;"/>
     <grid class="indent" flex="1">
 
@@ -58,7 +54,7 @@
       <rows>
 
         <row align="center">
-          <html>&creditType.label;</html>
+          <description>&creditType.label;</description>
           <menulist id="card.type" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -68,7 +64,7 @@
         </row>
 
         <row align="center">
-          <html>&creditNumber.label;</html>
+          <description>&creditNumber.label;</description>
           <menulist id="card.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -78,16 +74,16 @@
         </row>
 
         <row align="center">
-          <html>&creditExpires.label;</html>
+          <description>&creditExpires.label;</description>
           <hbox align="center">
-            <text value="&creditExpiresMonth.label;" />
+            <label value="&creditExpiresMonth.label;" />
             <menulist id="card.expdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="&creditExpiresYear.label;" />
+            <label value="&creditExpiresYear.label;" />
             <menulist id="card.expdate.year" editable="true" autoSelectMenuitem="false" flex="60%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -98,7 +94,7 @@
         </row>
 
         <row align="center">
-          <html>&creditName.label;</html>
+          <description>&creditName.label;</description>
           <menulist id="card.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -110,5 +106,4 @@
 
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletEditor.js b/mozilla/extensions/wallet/editor/WalletEditor.js
index 556b8e1d8b2..8af47b1cb08 100644
--- a/mozilla/extensions/wallet/editor/WalletEditor.js
+++ b/mozilla/extensions/wallet/editor/WalletEditor.js
@@ -97,12 +97,11 @@ function Startup()
     return; /* user failed to unlock the database */
   }
   ViewSchema(); /* create the display of schemas */
-  doSetOKCancel(onOK, null); /* register the onOK method */
   window.sizeToContent();
 }
 
 /* routine that executes when OK button is pressed */
-function onOK(){
+function onAccept(){
   var i, j, k;
   var output = "OK" + BREAK;
   for (i=0; i<schemasLength; i++) {
diff --git a/mozilla/extensions/wallet/editor/WalletEditor.xul b/mozilla/extensions/wallet/editor/WalletEditor.xul
index 74bc0f1cdc7..5aae1c4716c 100644
--- a/mozilla/extensions/wallet/editor/WalletEditor.xul
+++ b/mozilla/extensions/wallet/editor/WalletEditor.xul
@@ -23,47 +23,43 @@
 
 <!-- CHANGE THIS WHEN MOVING FILES -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!-- CHANGE THIS WHEN MOVING FILES -->
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/WalletEditor.dtd" >
 
-<window id="walleteditor"
-        class="dialog"
+<dialog id="walleteditor"
         title="&windowtitle.label;"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
-        onload="Startup()">
+        onload="Startup()"
+        ondialogaccept="return onAccept();">
 
   <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletEditor.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-  <keyset id="dialogKeys"/>
            
     <vbox id="system" flex="100%">
       <spacer style="height: 7px;"/>
-      <text class="label" value="&div.walletdataonsystem.label;"/>
-      <separator orient="horizontal" class="groove"/>
+      <label value="&div.walletdataonsystem.label;"/>
+      <separator class="groove"/>
       <spacer style="height: 10px;"/>
       <hbox id="system1" flex="100%">
         <spacer style="width: 7px;"/>
         <vbox>
-          <text class="label" value="&treehead.schemaname.label;"/>
-          <tree multiple="true" id="schematree" class="inset"
-             style="height: 250px;" orient="vertical" onclick="ViewEntries();">
+          <label value="&treehead.schemaname.label;"/>
+          <tree multiple="true" id="schematree"
+             style="height: 250px;" onclick="ViewEntries();">
             <treecolgroup>
               <treecol flex="1"/>
             </treecolgroup>
             <treechildren id="schemalist" flex="1"/>
           </tree>
           <hbox>
-            <button id="removeSchema" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteSchema();"/>
-            <button id="addSchema" class="dialog push" disabled="false" label="&button.addschema.label;" oncommand="AddSchema();"/>
+            <button id="removeSchema" disabled="true" label="&button.remove.label;" oncommand="DeleteSchema();"/>
+            <button id="addSchema" label="&button.addschema.label;" oncommand="AddSchema();"/>
           </hbox>
         </vbox>
         <spacer style="width: 7px;"/>
         <vbox>
-          <text class="label" id="entrytext" value2="&treehead.entries.label;" value3="&treehead.entries1.label;"/>
+          <label id="entrytext" value2="&treehead.entries.label;" value3="&treehead.entries1.label;"/>
           <tree multiple="true" id="entrytree" class="inset"
             style="height: 113px;" orient="vertical" onclick="ViewSynonyms();">
             <treecolgroup>
@@ -72,8 +68,8 @@
             <treechildren flex="1" id="entrieslist"/>
           </tree>
           <spacer style="height: 7px;"/>
-          <text class="label" id="synonymtext" value2="&treehead.synonyms.label;" value3="&treehead.synonymsoff.label;" value4="&treehead.synonyms1.label;"/>
-          <tree multiple="true" id="synonymtree" class="inset"
+          <label id="synonymtext" value2="&treehead.synonyms.label;" value3="&treehead.synonymsoff.label;" value4="&treehead.synonyms1.label;"/>
+          <tree multiple="true" id="synonymtree"
             style="height: 113px;" orient="vertical" onclick="SynonymSelected();">
             <treecolgroup>
               <treecol flex="1"/>
@@ -84,23 +80,13 @@
         <spacer style="width: 7px;"/>
         <vbox>
           <spacer style="height: 15px;"/>
-          <button id="removeEntry" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteEntry();"/>
-          <button id="addEntry" class="dialog push" disabled="false" label="&button.addentry.label;" oncommand="AddEntry();"/>
+          <button id="removeEntry" disabled="true" label="&button.remove.label;" oncommand="DeleteEntry();"/>
+          <button id="addEntry" label="&button.addentry.label;" oncommand="AddEntry();"/>
           <spacer style="height: 93px;"/>
-          <button id="removeSynonym" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteSynonym();"/>
-          <button id="addSynonym" class="dialog push" disabled="false" label="&button.addsynonym.label;" oncommand="AddSynonym();"/>
+          <button id="removeSynonym" disabled="true" label="&button.remove.label;" oncommand="DeleteSynonym();"/>
+          <button id="addSynonym" label="&button.addsynonym.label;" oncommand="AddSynonym();"/>
         </vbox>
         <spacer style="width: 7px;"/>
       </hbox>
     </vbox>
-    <separator orient="horizontal" class="groove"/>
-
-  <!-- from dialogOverlay.xul -->
-  <spacer style="height: 5px;"/>
-  <hbox>
-    <spacer flex="100%"/>
-    <hbox id="okCancelButtons"/>
-  </hbox>
-  <spacer style="height: 5px;"/>
-
-</window>
+</dialog>
diff --git a/mozilla/extensions/wallet/editor/WalletEmploy.xul b/mozilla/extensions/wallet/editor/WalletEmploy.xul
index a4f0c018da9..cf6ba8da140 100644
--- a/mozilla/extensions/wallet/editor/WalletEmploy.xul
+++ b/mozilla/extensions/wallet/editor/WalletEmploy.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -45,7 +41,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&employ.title;"/>
     <grid class="indent" flex="1">
 
@@ -57,7 +53,7 @@
       <rows>
 
         <row align="center">
-          <html>&employName.label;</html>
+          <description>&employName.label;</description>
           <menulist id="business.companyname" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -67,7 +63,7 @@
         </row>
 
         <row align="center">
-          <html>&employTitle.label;</html>
+          <description>&employTitle.label;</description>
           <menulist id="business.jobtitle" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -77,7 +73,7 @@
         </row>
 
         <row align="center">
-          <html>&employDepartment.label;</html>
+          <description>&employDepartment.label;</description>
           <menulist id="business.department" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -90,5 +86,4 @@
 
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletMisc.xul b/mozilla/extensions/wallet/editor/WalletMisc.xul
index a6df07ddfa2..155b4fae04c 100644
--- a/mozilla/extensions/wallet/editor/WalletMisc.xul
+++ b/mozilla/extensions/wallet/editor/WalletMisc.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -48,7 +44,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&misc.title;"/>
     <grid class="indent" flex="1">
 
@@ -60,7 +56,7 @@
       <rows>
 
         <row align="center">
-          <html>&miscSS.label;</html>
+          <description>&miscSS.label;</description>
           <hbox>
             <menulist id="socsec.prefix" editable="true" autoSelectMenuitem="false" flex="33%" width="0"
                       onchange="Append(this)">
@@ -68,14 +64,14 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="__"/>
+            <label value="__"/>
             <menulist id="socsec.middle" editable="true" autoSelectMenuitem="false" flex="24%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="__"/>
+            <label value="__"/>
             <menulist id="socsec.suffix" editable="true" autoSelectMenuitem="false" flex="43%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -86,7 +82,7 @@
         </row>
 
         <row align="center">
-          <html>&miscLicense.label;</html>
+          <description>&miscLicense.label;</description>
           <hbox align="center">
             <menulist id="license.number" editable="true" autoSelectMenuitem="false" flex="70" width="0"
                       onchange="Append(this)">
@@ -95,7 +91,7 @@
               </menupopup>
             </menulist>
             <spacer style="width: 5px;"/>
-            <text value="&miscLicenseState.label;" />
+            <label value="&miscLicenseState.label;" />
             <menulist id="license.state" editable="true" autoSelectMenuitem="false" flex="30" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -106,7 +102,7 @@
         </row>
 
         <row align="center">
-          <html>&miscMaiden.label;</html>
+          <description>&miscMaiden.label;</description>
           <menulist id="mothersmaidenname" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -116,23 +112,23 @@
         </row>
 
         <row align="center">
-          <html>&miscBirthday.label;</html>
+          <description>&miscBirthday.label;</description>
           <hbox align="center">
-            <text value="&miscBirthdayMonth.label;" />
+            <label value="&miscBirthdayMonth.label;" />
             <menulist id="bdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="&miscBirthdayDay.label;" />
+            <label value="&miscBirthdayDay.label;" />
             <menulist id="bdate.day" editable="true" autoSelectMenuitem="false" flex="20%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="&miscBirthdayYear.label;" />
+            <label value="&miscBirthdayYear.label;" />
             <menulist id="bdate.year" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -143,23 +139,23 @@
         </row>
 
         <row align="center">
-          <html>&miscAnniv.label;</html>
+          <description>&miscAnniv.label;</description>
           <hbox align="center">
-            <text value="&miscAnnivMonth.label;" />
+            <label value="&miscAnnivMonth.label;" />
             <menulist id="anniv.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="&miscAnnivDay.label;" />
+            <label value="&miscAnnivDay.label;" />
             <menulist id="anniv.day" editable="true" autoSelectMenuitem="false" flex="20%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="&miscAnnivYear.label;" />
+            <label value="&miscAnnivYear.label;" />
             <menulist id="anniv.year" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -173,5 +169,4 @@
 
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletName.xul b/mozilla/extensions/wallet/editor/WalletName.xul
index b53533ee24f..5e58b1cb83b 100644
--- a/mozilla/extensions/wallet/editor/WalletName.xul
+++ b/mozilla/extensions/wallet/editor/WalletName.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -46,7 +42,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&name.title;"/>
     <grid class="indent" flex="1">
 
@@ -58,7 +54,7 @@
       <rows>
 
         <row align="center">
-          <html>&namePrefix.label;</html>
+          <description>&namePrefix.label;</description>
           <menulist id="name.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -68,7 +64,7 @@
         </row>
 
         <row align="center">
-          <html>&nameFirst.label;</html>
+          <description>&nameFirst.label;</description>
           <menulist id="name.first" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -78,7 +74,7 @@
         </row>
 
         <row align="center">
-          <html>&nameMiddle.label;</html>
+          <description>&nameMiddle.label;</description>
           <menulist id="name.middle" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -88,7 +84,7 @@
         </row>
 
         <row align="center">
-          <html>&nameLast.label;</html>
+          <description>&nameLast.label;</description>
           <menulist id="name.last" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -98,7 +94,7 @@
         </row>
 
         <row align="center">
-          <html>&nameSuffix.label;</html>
+          <description>&nameSuffix.label;</description>
           <menulist id="name.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
 
@@ -112,5 +108,4 @@
 
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletOther.xul b/mozilla/extensions/wallet/editor/WalletOther.xul
index abeb00abfa3..f30863efd33 100644
--- a/mozilla/extensions/wallet/editor/WalletOther.xul
+++ b/mozilla/extensions/wallet/editor/WalletOther.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -44,6 +40,5 @@
 
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
-  
 
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletPhone.xul b/mozilla/extensions/wallet/editor/WalletPhone.xul
index 2dac00f67a7..b84d34db27f 100644
--- a/mozilla/extensions/wallet/editor/WalletPhone.xul
+++ b/mozilla/extensions/wallet/editor/WalletPhone.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -49,7 +45,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&phone.title;"/>
     <grid class="indent" flex="1">
 
@@ -68,29 +64,29 @@
       <rows>
 
         <row align="center">
-          <html>&phoneDay.label;</html>
-          <text value="("/>
+          <description>&phoneDay.label;</description>
+          <label value="("/>
           <menulist id="phone.loccode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value=")"/>
+          <label value=")"/>
           <menulist id="phone.number.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="phone.number.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="&phoneDayExt.label;" />
+          <label value="&phoneDayExt.label;" />
           <menulist id="phone.extension" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -100,29 +96,29 @@
         </row>
 
         <row align="center">
-          <html>&phoneEve.label;</html>
-          <text value="("/>
+          <description>&phoneEve.label;</description>
+          <label value="("/>
           <menulist id="altphone.loccode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value=")"/>
+          <label value=")"/>
           <menulist id="altphone.number.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="altphone.number.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="&phoneEveExt.label;" />
+          <label value="&phoneEveExt.label;" />
           <menulist id="altphone.extension" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -132,22 +128,22 @@
         </row>
 
         <row align="center">
-          <html>&phoneFax.label;</html>
-          <text value="("/>
+          <description>&phoneFax.label;</description>
+          <label value="("/>
           <menulist id="fax.loccode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value=")"/>
+          <label value=")"/>
           <menulist id="fax.number.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="fax.number.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -157,22 +153,22 @@
         </row>
 
         <row align="center">
-          <html>&phoneCell.label;</html>
-          <text value="("/>
+          <description>&phoneCell.label;</description>
+          <label value="("/>
           <menulist id="mobile.loccode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value=")"/>
+          <label value=")"/>
           <menulist id="mobile.number.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="mobile.number.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -182,22 +178,22 @@
         </row>
 
         <row align="center">
-          <html>&phonePager.label;</html>
-          <text value="("/>
+          <description>&phonePager.label;</description>
+          <label value="("/>
           <menulist id="pager.loccode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value=")"/>
+          <label value=")"/>
           <menulist id="pager.number.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="pager.number.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -210,5 +206,4 @@
 
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletPrimary.xul b/mozilla/extensions/wallet/editor/WalletPrimary.xul
index abeb00abfa3..0eb7041d80c 100644
--- a/mozilla/extensions/wallet/editor/WalletPrimary.xul
+++ b/mozilla/extensions/wallet/editor/WalletPrimary.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -45,5 +41,4 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletShipping.xul b/mozilla/extensions/wallet/editor/WalletShipping.xul
index abeb00abfa3..0eb7041d80c 100644
--- a/mozilla/extensions/wallet/editor/WalletShipping.xul
+++ b/mozilla/extensions/wallet/editor/WalletShipping.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -45,5 +41,4 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/WalletTree.xul b/mozilla/extensions/wallet/editor/WalletTree.xul
index cc6040082da..f5e2fac471f 100644
--- a/mozilla/extensions/wallet/editor/WalletTree.xul
+++ b/mozilla/extensions/wallet/editor/WalletTree.xul
@@ -27,8 +27,7 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/WalletViewer.dtd">
 
 <overlay id="prefTreeOverlay"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>
 <![CDATA[
diff --git a/mozilla/extensions/wallet/editor/WalletUrlspecific.xul b/mozilla/extensions/wallet/editor/WalletUrlspecific.xul
index ccf35ee81a1..57399ab4602 100644
--- a/mozilla/extensions/wallet/editor/WalletUrlspecific.xul
+++ b/mozilla/extensions/wallet/editor/WalletUrlspecific.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="generate();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="generate();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -84,7 +80,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never" orient="vertical">
+  <groupbox align="start">
     <caption label="&urlspecific.title;"/>
 
     <grid class="indent">
@@ -95,9 +91,9 @@
       </columns>
       <rows>
         <row>
-          <text value="&urlspecificUrl.label;"/>
-          <text value="&urlspecificField.label;"/>
-          <text value="&urlspecificValue.label;"/>
+          <label value="&urlspecificUrl.label;"/>
+          <label value="&urlspecificField.label;"/>
+          <label value="&urlspecificValue.label;"/>
         </row>
       </rows>
     </grid>
diff --git a/mozilla/extensions/wallet/editor/WalletViewer.xul b/mozilla/extensions/wallet/editor/WalletViewer.xul
index da509e0d25d..218efdb9ee6 100644
--- a/mozilla/extensions/wallet/editor/WalletViewer.xul
+++ b/mozilla/extensions/wallet/editor/WalletViewer.xul
@@ -7,11 +7,9 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/WalletViewer.dtd" >
 
 <window id="walletViewer" 
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&windowtitle.label;" 
-        orient="vertical"
         class="dialog"
         persist="screenX screenY width height"
         screenX="24" screenY="24"
@@ -51,7 +49,7 @@
   <hbox flex="1">
     <!-- tree sidebar -->
     <vbox style="width: 0px" flex="3">
-      <tree class="inset" id="panelTree" style="width: 0px" flex="3"/>      
+      <tree id="panelTree" style="width: 0px" flex="3"/>      
       <button id="clearButton" label="&removeall.label;" oncommand="ClearAll()"/>
     </vbox>
     <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="7"/>
diff --git a/mozilla/extensions/wallet/editor/privacy.xul b/mozilla/extensions/wallet/editor/privacy.xul
index 51e14ba8e72..68204d9110d 100644
--- a/mozilla/extensions/wallet/editor/privacy.xul
+++ b/mozilla/extensions/wallet/editor/privacy.xul
@@ -31,10 +31,8 @@
 <window id="privacy"
         class="dialog"
         title="&windowtitle.label;"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="TutorialURL()" 
-        orient="vertical">
+        onload="TutorialURL()" >
 <!-- 
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 -->
@@ -69,7 +67,7 @@
   <spacer style="height: 5px;"/>
   <hbox>
     <spacer flex="100%"/>
-   <button class="right dialog" id="ok" label="&ok;" default="true" oncommand="doOKButton();"/> 
+   <button class="right" id="ok" label="&ok;" default="true" oncommand="doOKButton();"/> 
   </hbox>
   <spacer style="height: 5px;"/>
 
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletAddress.xul b/mozilla/extensions/wallet/editor/resources/content/WalletAddress.xul
index 90c1a9d3b3f..3716baf1b05 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletAddress.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletAddress.xul
@@ -30,11 +30,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -47,7 +44,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&address.title;"/>
     <grid class="indent" flex="1">
 
@@ -59,7 +56,7 @@
       <rows>
 
         <row align="center">
-          <html>&addressLine1.label;</html>
+          <description>&addressLine1.label;</description>
           <menulist id="street.line1" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -69,7 +66,7 @@
         </row>
 
         <row align="center">
-          <html>&addressLine2.label;</html>
+          <description>&addressLine2.label;</description>
           <menulist id="street.line2" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -79,7 +76,7 @@
         </row>
 
         <row align="center">
-          <html>&addressLine3.label;</html>
+          <description>&addressLine3.label;</description>
           <menulist id="street.line3" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -89,7 +86,7 @@
         </row>
 
         <row align="center">
-          <html>&addressCity.label;</html>
+          <description>&addressCity.label;</description>
           <menulist id="city" editable="true" autoSelectMenuitem="false"
                      onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -99,7 +96,7 @@
         </row>
 
         <row align="center">
-          <html>&addressState.label;</html>
+          <description>&addressState.label;</description>
           <menulist id="state" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -109,7 +106,7 @@
         </row>
 
         <row align="center">
-          <html>&addressZipcode.label;</html>
+          <description>&addressZipcode.label;</description>
           <hbox>
           <menulist id="postalcode.prefix" editable="true" autoSelectMenuitem="false" flex="55%" width="0"
                     onchange="Append(this)">
@@ -117,7 +114,7 @@
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="postalcode.suffix" editable="true" autoSelectMenuitem="false" flex="45%" width="0"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -128,7 +125,7 @@
         </row>
 
         <row align="center">
-          <html>&addressCountry.label;</html>
+          <description>&addressCountry.label;</description>
           <menulist id="country" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -138,7 +135,7 @@
         </row>
 
         <row align="center">
-          <html>&email.label;</html>
+          <description>&email.label;</description>
           <menulist id="email" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -148,7 +145,7 @@
         </row>
 
         <row align="center">
-          <html>&homepage.label;</html>
+          <description>&homepage.label;</description>
           <menulist id="uri" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
 
@@ -163,5 +160,4 @@
     </grid>
 
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletBilling.xul b/mozilla/extensions/wallet/editor/resources/content/WalletBilling.xul
index abeb00abfa3..f30863efd33 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletBilling.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletBilling.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -44,6 +40,5 @@
 
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
-  
 
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletConcatenated.xul b/mozilla/extensions/wallet/editor/resources/content/WalletConcatenated.xul
index 26accfa9d0b..4a6f4213ec1 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletConcatenated.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletConcatenated.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,12 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        style="overflow: auto;"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -63,7 +58,7 @@
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
-  <groupbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox align="start" hidden="true">
     <caption label="&concatPrimary.title;"/>
     <grid class="indent" flex="1">
       <columns>
@@ -73,7 +68,7 @@
       <rows>
 
         <row hidden="true" align="center">
-          <html>&concatName.label;</html>
+          <description>&concatName.label;</description>
           <menulist id="name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -83,7 +78,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatZipcode.label;</html>
+          <description>&concatZipcode.label;</description>
           <menulist id="home.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -93,7 +88,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatPhone.label;</html>
+          <description>&concatPhone.label;</description>
           <menulist id="home.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -103,7 +98,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatPhonenumber.label;</html>
+          <description>&concatPhonenumber.label;</description>
           <menulist id="home.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -113,7 +108,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatAltPhone.label;</html>
+          <description>&concatAltPhone.label;</description>
           <menulist id="home.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -123,7 +118,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatAltPhonenumber.label;</html>
+          <description>&concatAltPhonenumber.label;</description>
           <menulist id="home.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -133,7 +128,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatFax.label;</html>
+          <description>&concatFax.label;</description>
           <menulist id="home.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -143,7 +138,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatFaxnumber.label;</html>
+          <description>&concatFaxnumber.label;</description>
           <menulist id="home.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -153,7 +148,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatMobile.label;</html>
+          <description>&concatMobile.label;</description>
           <menulist id="home.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -163,7 +158,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatMobilenumber.label;</html>
+          <description>&concatMobilenumber.label;</description>
           <menulist id="home.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -173,7 +168,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatPager.label;</html>
+          <description>&concatPager.label;</description>
           <menulist id="home.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -183,7 +178,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatPagernumber.label;</html>
+          <description>&concatPagernumber.label;</description>
           <menulist id="home.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -196,7 +191,7 @@
     </grid>
   </groupbox>
 
-  <groupbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox align="start" hidden="true">
     <caption label="&concatShipping.title;"/>
     <grid class="indent">
       <columns>
@@ -206,7 +201,7 @@
       <rows>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoName.label;</html>
+          <description>&concatShiptoName.label;</description>
           <menulist id="shipto.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -216,7 +211,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoZipcode.label;</html>
+          <description>&concatShiptoZipcode.label;</description>
           <menulist id="shipto.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -226,7 +221,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoPhone.label;</html>
+          <description>&concatShiptoPhone.label;</description>
           <menulist id="shipto.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -236,7 +231,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoPhonenumber.label;</html>
+          <description>&concatShiptoPhonenumber.label;</description>
           <menulist id="shipto.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -246,7 +241,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoAltPhone.label;</html>
+          <description>&concatShiptoAltPhone.label;</description>
           <menulist id="shipto.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -256,7 +251,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoAltPhonenumber.label;</html>
+          <description>&concatShiptoAltPhonenumber.label;</description>
           <menulist id="shipto.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -266,7 +261,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoFax.label;</html>
+          <description>&concatShiptoFax.label;</description>
           <menulist id="shipto.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -276,7 +271,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoFaxnumber.label;</html>
+          <description>&concatShiptoFaxnumber.label;</description>
           <menulist id="shipto.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -286,7 +281,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoMobile.label;</html>
+          <description>&concatShiptoMobile.label;</description>
           <menulist id="shipto.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -296,7 +291,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoMobilenumber.label;</html>
+          <description>&concatShiptoMobilenumber.label;</description>
           <menulist id="shipto.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -306,7 +301,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoPager.label;</html>
+          <description>&concatShiptoPager.label;</description>
           <menulist id="shipto.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -316,7 +311,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatShiptoPagernumber.label;</html>
+          <description>&concatShiptoPagernumber.label;</description>
           <menulist id="shipto.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -329,7 +324,7 @@
     </grid>
   </groupbox>
 
-  <groupbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox align="start" hidden="true">
     <caption label="&concatBilling.title;"/>
     <grid class="indent">
       <columns>
@@ -339,7 +334,7 @@
       <rows>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoName.label;</html>
+          <description>&concatBilltoName.label;</description>
           <menulist id="billto.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -349,7 +344,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoZipcode.label;</html>
+          <description>&concatBilltoZipcode.label;</description>
           <menulist id="billto.postalcode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -359,7 +354,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoPhone.label;</html>
+          <description>&concatBilltoPhone.label;</description>
           <menulist id="billto.phone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -369,7 +364,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoPhonenumber.label;</html>
+          <description>&concatBilltoPhonenumber.label;</description>
           <menulist id="billto.phone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -379,7 +374,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoAltPhone.label;</html>
+          <description>&concatBilltoAltPhone.label;</description>
           <menulist id="billto.altphone" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -389,7 +384,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoAltPhonenumber.label;</html>
+          <description>&concatBilltoAltPhonenumber.label;</description>
           <menulist id="billto.altphone.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -399,7 +394,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoFax.label;</html>
+          <description>&concatBilltoFax.label;</description>
           <menulist id="billto.fax" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -409,7 +404,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoFaxnumber.label;</html>
+          <description>&concatBilltoFaxnumber.label;</description>
           <menulist id="billto.fax.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -419,7 +414,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoMobile.label;</html>
+          <description>&concatBilltoMobile.label;</description>
           <menulist id="billto.mobile" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -429,7 +424,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoMobilenumber.label;</html>
+          <description>&concatBilltoMobilenumber.label;</description>
           <menulist id="billto.mobile.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -439,7 +434,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoPager.label;</html>
+          <description>&concatBilltoPager.label;</description>
           <menulist id="billto.pager" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -449,7 +444,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBilltoPagernumber.label;</html>
+          <description>&concatBilltoPagernumber.label;</description>
           <menulist id="billto.pager.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -462,7 +457,7 @@
     </grid>
   </groupbox>
 
-  <groupbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox align="start" hidden="true">
     <caption label="&concatOther.title;"/>label
     <grid class="indent">
       <columns>
@@ -472,7 +467,7 @@
       <rows>
 
         <row hidden="true" align="center">
-          <html>&concatCardExpdate.label;</html>
+          <description>&concatCardExpdate.label;</description>
           <menulist id="card.expdate" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -482,7 +477,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatSocSec.label;</html>
+          <description>&concatSocSec.label;</description>
           <menulist id="socsec" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -492,7 +487,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatBdate.label;</html>
+          <description>&concatBdate.label;</description>
           <menulist id="bdate" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -502,7 +497,7 @@
         </row>
 
         <row hidden="true" align="center">
-          <html>&concatAnniv.label;</html>
+          <description>&concatAnniv.label;</description>
           <menulist id="anniv" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -514,5 +509,4 @@
       </rows>
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletCredit.xul b/mozilla/extensions/wallet/editor/resources/content/WalletCredit.xul
index ffa83e590cf..e338ae1a541 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletCredit.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletCredit.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -46,7 +42,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&credit.title;"/>
     <grid class="indent" flex="1">
 
@@ -58,7 +54,7 @@
       <rows>
 
         <row align="center">
-          <html>&creditType.label;</html>
+          <description>&creditType.label;</description>
           <menulist id="card.type" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -68,7 +64,7 @@
         </row>
 
         <row align="center">
-          <html>&creditNumber.label;</html>
+          <description>&creditNumber.label;</description>
           <menulist id="card.number" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -78,16 +74,16 @@
         </row>
 
         <row align="center">
-          <html>&creditExpires.label;</html>
+          <description>&creditExpires.label;</description>
           <hbox align="center">
-            <text value="&creditExpiresMonth.label;" />
+            <label value="&creditExpiresMonth.label;" />
             <menulist id="card.expdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="&creditExpiresYear.label;" />
+            <label value="&creditExpiresYear.label;" />
             <menulist id="card.expdate.year" editable="true" autoSelectMenuitem="false" flex="60%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -98,7 +94,7 @@
         </row>
 
         <row align="center">
-          <html>&creditName.label;</html>
+          <description>&creditName.label;</description>
           <menulist id="card.name" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -110,5 +106,4 @@
 
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletEmploy.xul b/mozilla/extensions/wallet/editor/resources/content/WalletEmploy.xul
index a4f0c018da9..cf6ba8da140 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletEmploy.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletEmploy.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -45,7 +41,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&employ.title;"/>
     <grid class="indent" flex="1">
 
@@ -57,7 +53,7 @@
       <rows>
 
         <row align="center">
-          <html>&employName.label;</html>
+          <description>&employName.label;</description>
           <menulist id="business.companyname" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -67,7 +63,7 @@
         </row>
 
         <row align="center">
-          <html>&employTitle.label;</html>
+          <description>&employTitle.label;</description>
           <menulist id="business.jobtitle" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -77,7 +73,7 @@
         </row>
 
         <row align="center">
-          <html>&employDepartment.label;</html>
+          <description>&employDepartment.label;</description>
           <menulist id="business.department" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -90,5 +86,4 @@
 
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletMisc.xul b/mozilla/extensions/wallet/editor/resources/content/WalletMisc.xul
index a6df07ddfa2..155b4fae04c 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletMisc.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletMisc.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -48,7 +44,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&misc.title;"/>
     <grid class="indent" flex="1">
 
@@ -60,7 +56,7 @@
       <rows>
 
         <row align="center">
-          <html>&miscSS.label;</html>
+          <description>&miscSS.label;</description>
           <hbox>
             <menulist id="socsec.prefix" editable="true" autoSelectMenuitem="false" flex="33%" width="0"
                       onchange="Append(this)">
@@ -68,14 +64,14 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="__"/>
+            <label value="__"/>
             <menulist id="socsec.middle" editable="true" autoSelectMenuitem="false" flex="24%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="__"/>
+            <label value="__"/>
             <menulist id="socsec.suffix" editable="true" autoSelectMenuitem="false" flex="43%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -86,7 +82,7 @@
         </row>
 
         <row align="center">
-          <html>&miscLicense.label;</html>
+          <description>&miscLicense.label;</description>
           <hbox align="center">
             <menulist id="license.number" editable="true" autoSelectMenuitem="false" flex="70" width="0"
                       onchange="Append(this)">
@@ -95,7 +91,7 @@
               </menupopup>
             </menulist>
             <spacer style="width: 5px;"/>
-            <text value="&miscLicenseState.label;" />
+            <label value="&miscLicenseState.label;" />
             <menulist id="license.state" editable="true" autoSelectMenuitem="false" flex="30" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -106,7 +102,7 @@
         </row>
 
         <row align="center">
-          <html>&miscMaiden.label;</html>
+          <description>&miscMaiden.label;</description>
           <menulist id="mothersmaidenname" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -116,23 +112,23 @@
         </row>
 
         <row align="center">
-          <html>&miscBirthday.label;</html>
+          <description>&miscBirthday.label;</description>
           <hbox align="center">
-            <text value="&miscBirthdayMonth.label;" />
+            <label value="&miscBirthdayMonth.label;" />
             <menulist id="bdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="&miscBirthdayDay.label;" />
+            <label value="&miscBirthdayDay.label;" />
             <menulist id="bdate.day" editable="true" autoSelectMenuitem="false" flex="20%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="&miscBirthdayYear.label;" />
+            <label value="&miscBirthdayYear.label;" />
             <menulist id="bdate.year" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -143,23 +139,23 @@
         </row>
 
         <row align="center">
-          <html>&miscAnniv.label;</html>
+          <description>&miscAnniv.label;</description>
           <hbox align="center">
-            <text value="&miscAnnivMonth.label;" />
+            <label value="&miscAnnivMonth.label;" />
             <menulist id="anniv.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="&miscAnnivDay.label;" />
+            <label value="&miscAnnivDay.label;" />
             <menulist id="anniv.day" editable="true" autoSelectMenuitem="false" flex="20%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <text value="&miscAnnivYear.label;" />
+            <label value="&miscAnnivYear.label;" />
             <menulist id="anniv.year" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
               <menupopup onpopupshowing="Append(this.parentNode)">
@@ -173,5 +169,4 @@
 
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletName.xul b/mozilla/extensions/wallet/editor/resources/content/WalletName.xul
index b53533ee24f..5e58b1cb83b 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletName.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletName.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -46,7 +42,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&name.title;"/>
     <grid class="indent" flex="1">
 
@@ -58,7 +54,7 @@
       <rows>
 
         <row align="center">
-          <html>&namePrefix.label;</html>
+          <description>&namePrefix.label;</description>
           <menulist id="name.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -68,7 +64,7 @@
         </row>
 
         <row align="center">
-          <html>&nameFirst.label;</html>
+          <description>&nameFirst.label;</description>
           <menulist id="name.first" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -78,7 +74,7 @@
         </row>
 
         <row align="center">
-          <html>&nameMiddle.label;</html>
+          <description>&nameMiddle.label;</description>
           <menulist id="name.middle" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -88,7 +84,7 @@
         </row>
 
         <row align="center">
-          <html>&nameLast.label;</html>
+          <description>&nameLast.label;</description>
           <menulist id="name.last" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -98,7 +94,7 @@
         </row>
 
         <row align="center">
-          <html>&nameSuffix.label;</html>
+          <description>&nameSuffix.label;</description>
           <menulist id="name.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
 
@@ -112,5 +108,4 @@
 
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletOther.xul b/mozilla/extensions/wallet/editor/resources/content/WalletOther.xul
index abeb00abfa3..f30863efd33 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletOther.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletOther.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -44,6 +40,5 @@
 
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
-  
 
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletPhone.xul b/mozilla/extensions/wallet/editor/resources/content/WalletPhone.xul
index 2dac00f67a7..b84d34db27f 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletPhone.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletPhone.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -49,7 +45,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never">
+  <groupbox align="start">
     <caption label="&phone.title;"/>
     <grid class="indent" flex="1">
 
@@ -68,29 +64,29 @@
       <rows>
 
         <row align="center">
-          <html>&phoneDay.label;</html>
-          <text value="("/>
+          <description>&phoneDay.label;</description>
+          <label value="("/>
           <menulist id="phone.loccode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value=")"/>
+          <label value=")"/>
           <menulist id="phone.number.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="phone.number.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="&phoneDayExt.label;" />
+          <label value="&phoneDayExt.label;" />
           <menulist id="phone.extension" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -100,29 +96,29 @@
         </row>
 
         <row align="center">
-          <html>&phoneEve.label;</html>
-          <text value="("/>
+          <description>&phoneEve.label;</description>
+          <label value="("/>
           <menulist id="altphone.loccode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value=")"/>
+          <label value=")"/>
           <menulist id="altphone.number.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="altphone.number.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="&phoneEveExt.label;" />
+          <label value="&phoneEveExt.label;" />
           <menulist id="altphone.extension" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -132,22 +128,22 @@
         </row>
 
         <row align="center">
-          <html>&phoneFax.label;</html>
-          <text value="("/>
+          <description>&phoneFax.label;</description>
+          <label value="("/>
           <menulist id="fax.loccode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value=")"/>
+          <label value=")"/>
           <menulist id="fax.number.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="fax.number.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -157,22 +153,22 @@
         </row>
 
         <row align="center">
-          <html>&phoneCell.label;</html>
-          <text value="("/>
+          <description>&phoneCell.label;</description>
+          <label value="("/>
           <menulist id="mobile.loccode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value=")"/>
+          <label value=")"/>
           <menulist id="mobile.number.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="mobile.number.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -182,22 +178,22 @@
         </row>
 
         <row align="center">
-          <html>&phonePager.label;</html>
-          <text value="("/>
+          <description>&phonePager.label;</description>
+          <label value="("/>
           <menulist id="pager.loccode" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value=")"/>
+          <label value=")"/>
           <menulist id="pager.number.prefix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          <text value="__"/>
+          <label value="__"/>
           <menulist id="pager.number.suffix" editable="true" autoSelectMenuitem="false"
                     onchange="Append(this)">
             <menupopup onpopupshowing="Append(this.parentNode)">
@@ -210,5 +206,4 @@
 
     </grid>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletPrimary.xul b/mozilla/extensions/wallet/editor/resources/content/WalletPrimary.xul
index abeb00abfa3..0eb7041d80c 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletPrimary.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletPrimary.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -45,5 +41,4 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletShipping.xul b/mozilla/extensions/wallet/editor/resources/content/WalletShipping.xul
index abeb00abfa3..0eb7041d80c 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletShipping.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletShipping.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -45,5 +41,4 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletTree.xul b/mozilla/extensions/wallet/editor/resources/content/WalletTree.xul
index cc6040082da..f5e2fac471f 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletTree.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletTree.xul
@@ -27,8 +27,7 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/WalletViewer.dtd">
 
 <overlay id="prefTreeOverlay"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>
 <![CDATA[
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul b/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
index ccf35ee81a1..57399ab4602 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
@@ -21,7 +21,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -30,11 +29,8 @@
 %walletviewerDTD;
 ]>
 
-<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="generate();">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="generate();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -84,7 +80,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <groupbox class="tabpanel" autostretch="never" orient="vertical">
+  <groupbox align="start">
     <caption label="&urlspecific.title;"/>
 
     <grid class="indent">
@@ -95,9 +91,9 @@
       </columns>
       <rows>
         <row>
-          <text value="&urlspecificUrl.label;"/>
-          <text value="&urlspecificField.label;"/>
-          <text value="&urlspecificValue.label;"/>
+          <label value="&urlspecificUrl.label;"/>
+          <label value="&urlspecificField.label;"/>
+          <label value="&urlspecificValue.label;"/>
         </row>
       </rows>
     </grid>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletViewer.xul b/mozilla/extensions/wallet/editor/resources/content/WalletViewer.xul
index da509e0d25d..218efdb9ee6 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletViewer.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletViewer.xul
@@ -7,11 +7,9 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/WalletViewer.dtd" >
 
 <window id="walletViewer" 
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&windowtitle.label;" 
-        orient="vertical"
         class="dialog"
         persist="screenX screenY width height"
         screenX="24" screenY="24"
@@ -51,7 +49,7 @@
   <hbox flex="1">
     <!-- tree sidebar -->
     <vbox style="width: 0px" flex="3">
-      <tree class="inset" id="panelTree" style="width: 0px" flex="3"/>      
+      <tree id="panelTree" style="width: 0px" flex="3"/>      
       <button id="clearButton" label="&removeall.label;" oncommand="ClearAll()"/>
     </vbox>
     <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="7"/>
diff --git a/mozilla/extensions/wallet/resources/content/pref-passwords.xul b/mozilla/extensions/wallet/resources/content/pref-passwords.xul
index 144722b8f6b..ebc03f9d947 100644
--- a/mozilla/extensions/wallet/resources/content/pref-passwords.xul
+++ b/mozilla/extensions/wallet/resources/content/pref-passwords.xul
@@ -28,11 +28,8 @@
 <!ENTITY % prefWalletDTD SYSTEM "chrome://wallet/locale/pref-passwords.dtd" >
 %prefWalletDTD;
 ]>
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://wallet/content/pref-passwords.xul');">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://wallet/content/pref-passwords.xul');">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -68,31 +65,30 @@
         
   <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&signonHeader.label;"/>
-    <html flex="1">&signonDescription.label;</html>
-    <hbox autostretch="never">
+    <description flex="1">&signonDescription.label;</description>
+    <hbox align="start">
       <checkbox id="signonRememberSignons" label="&signonEnabled.label;" accesskey="&signonEnabled.accesskey;"
-              pref="true" preftype="bool" prefstring="signon.rememberSignons"
-              prefattribute="checked"/>
+              prefstring="signon.rememberSignons"/>
     </hbox>
     <hbox pack="end">
-      <button class="dialog" label="&viewSignons.label;" accesskey="&viewSignons.accesskey;"
+      <button label="&viewSignons.label;" accesskey="&viewSignons.accesskey;"
               oncommand="viewSignons();"
-              id="viewStoredPassword" pref="true" preftype="bool"
-              prefstring="pref.advanced.password.disable_button.view_stored_password" prefattribute="disabled"/>
+              id="viewStoredPassword"
+              prefstring="pref.advanced.password.disable_button.view_stored_password"/>
     </hbox>
   </groupbox>
 
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&encryptHeader.label;"/>
-    <html flex="1">&encryptDescription.label;</html>
-    <vbox autostretch="never">
+    <description flex="1">&encryptDescription.label;</description>
+    <vbox align="start">
       <checkbox id="encryptEnabled" label="&encryptEnabled.label;" accesskey="&encryptEnabled.accesskey;"
-              pref="true" preftype="bool" prefstring="wallet.crypto"
-              prefattribute="checked" oncommand="initReencryptCallback();"/>
+              prefstring="wallet.crypto"
+              oncommand="initReencryptCallback();"/>
     </vbox>
 
   </groupbox>
 
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/resources/content/pref-wallet.xul b/mozilla/extensions/wallet/resources/content/pref-wallet.xul
index 8845d339878..ce763aedfb1 100644
--- a/mozilla/extensions/wallet/resources/content/pref-wallet.xul
+++ b/mozilla/extensions/wallet/resources/content/pref-wallet.xul
@@ -28,11 +28,8 @@
 <!ENTITY % prefWalletDTD SYSTEM "chrome://wallet/locale/pref-wallet.dtd" >
 %prefWalletDTD;
 ]>
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="color-dialog"
-        orient="vertical"
-        onload="parent.initPanel('chrome://wallet/content/pref-wallet.xul');">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://wallet/content/pref-wallet.xul');">
 
   <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
@@ -56,46 +53,36 @@
         
   <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&walletHeader.label;"/>
-    <html>&walletDescription.label;</html>
+    <description>&walletDescription.label;</description>
 <!--
-    <hbox autostretch="never">
-      <text class="label"
-            for="walletServer"
+    <hbox align="center">
+      <label control="walletServer"
             value="&walletServer.label;"
             accesskey="&walletServer.accesskey;"/>
       <textbox id="walletServer"
-                 flex="1"
-                 pref="true"
-                 preftype="localizedstring"
-                 prefstring="wallet.Server"
-                 prefattribute="value"/>
+               preftype="localizedstring"
+               prefstring="wallet.Server"/>
     </hbox>
 -->
-    <hbox autostretch="never">
+    <hbox align="center">
       <checkbox id="walletCaptureForms"
               label="&walletEnabled.label;"
               accesskey="&walletEnabled.accesskey;"
-              pref="true"
-              preftype="bool"
-              prefstring="wallet.captureForms"
-              prefattribute="checked"/>
+              prefstring="wallet.captureForms"/>
     </hbox>
     <hbox pack="end">
-      <button class="dialog"
-              label="&viewWallet.label;"
+      <button label="&viewWallet.label;"
               accesskey="&viewWallet.accesskey;" 
               oncommand="formShow();"
-              id="viewFormButton" pref="true" preftype="bool"
-              prefstring="pref.advanced.form.disable_button.view_form" prefattribute="disabled"/>
-      <button class="dialog"
-              label="&viewWalletSites.label;"
+              id="viewFormButton"
+              prefstring="pref.advanced.form.disable_button.view_form"/>
+      <button label="&viewWalletSites.label;"
               accesskey="&viewWalletSites.accesskey;" 
               oncommand="viewWalletSites();"
-              id="viewSiteButton" pref="true" preftype="bool"
-              prefstring="pref.advanced.form.disable_button.view_sites" prefattribute="disabled"/>
+              id="viewSiteButton"
+              prefstring="pref.advanced.form.disable_button.view_sites"/>
     </hbox>
   </groupbox>
-
-</window>
+</page>
diff --git a/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul b/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul
index b06a862022c..1993ef5ef21 100644
--- a/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul
+++ b/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul
@@ -141,7 +141,6 @@
              style="display:none;">
       <button class="button-toolbar-4"
               id="formPrefill"
-              crop="right"
               oncommand="formPrefill();"
               label="  &formPrefill.label;  "
               tooltip="aTooltip"
@@ -149,7 +148,6 @@
       <toolbarseparator/>
       <button class="button-toolbar-4"
               id="formCapture"
-              crop="right"
               oncommand="formCapture();"
               label="  &formCapture.label;  "
               tooltip="aTooltip"
@@ -157,7 +155,6 @@
       <toolbarseparator/>
       <button class="button-toolbar-4"
               id="formShow"
-              crop="right"
               oncommand="formShow(); initToolbarItems();"
               label="  &formView.label;  "
               tooltip="aTooltip"
diff --git a/mozilla/extensions/wallet/signonviewer/SignonViewer.js b/mozilla/extensions/wallet/signonviewer/SignonViewer.js
index c7414929ca9..5f5272224e3 100644
--- a/mozilla/extensions/wallet/signonviewer/SignonViewer.js
+++ b/mozilla/extensions/wallet/signonviewer/SignonViewer.js
@@ -54,8 +54,6 @@ function Startup()
   passwordmanager = Components.classes["@mozilla.org/passwordmanager;1"].getService();
   passwordmanager = passwordmanager.QueryInterface(Components.interfaces.nsIPasswordManager);
 
-  doSetOKCancel(onOK, null);  // init ok event handler
-
   // remove wallet functions (unless overruled by the "wallet.enabled" pref)
   try {
     pref = Components.classes["@mozilla.org/preferences-service;1"]
@@ -391,9 +389,9 @@ function DeleteAllNocaptures() {
 
 /*** =================== GENERAL CODE =================== ***/
 
-// function : <SignonViewer>::onOK()
+// function : <SignonViewer>::onAccept()
 // purpose  : dialog confirm & tidy up.
-function onOK()
+function onAccept()
 {
   var deletedSignons = [];
   deletedSignons = goneSS.split(",");
diff --git a/mozilla/extensions/wallet/signonviewer/SignonViewer.xul b/mozilla/extensions/wallet/signonviewer/SignonViewer.xul
index e2d4a56ffd1..9dbb5f75f33 100644
--- a/mozilla/extensions/wallet/signonviewer/SignonViewer.xul
+++ b/mozilla/extensions/wallet/signonviewer/SignonViewer.xul
@@ -29,20 +29,17 @@
 <!-- CHANGE THIS WHEN MOVING FILES -->
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/SignonViewer.dtd" >
 
-<window id="signonviewer"
+<dialog id="signonviewer"
         title="&windowtitle.label;"
         alttitle="&windowalttitle.label;"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical" style="width: 30em!important;"
-        class="dialog"
-        onload="Startup()">
+        style="width: 30em!important;"
+        onload="Startup()"
+        ondialogaccept="return onAccept();">
 
   <script src="chrome://communicator/content/wallet/SignonViewer.js"/>
   <script src="chrome://global/content/strres.js"/>
   <script src="chrome://communicator/content/wallet/nsWalletTreeUtils.js"/>
-
-  <keyset id="dialogKeys"/>
            
   <tabbox id="signonTabbox" flex="1">
     <tabs>
@@ -54,9 +51,9 @@
     <tabpanels id="panel" flex="1">
       <!-- saved signons -->
       <vbox id="savedsignons" flex="1">
-          <html>&spiel.signonsstored.label;</html>
+          <description>&spiel.signonsstored.label;</description>
           <separator class="thin"/>
-          <tree id="signonstree" class="inset" style="height: 20em;"
+          <tree id="signonstree" style="height: 20em;"
                 onclick="HandleEvent(event);" flex="1"
                 multiple="true" onkeypress="HandleEvent(event,0)">
             <treecolgroup>
@@ -78,18 +75,18 @@
           </tree>
           <separator class="thin"/>
           <hbox>
-            <button id="removeSignon" disabled="true" class="dialog push"
+            <button id="removeSignon" disabled="true"
                           label="&remove.label;" oncommand="DeleteSignon();"/>
-            <button id="removeAllSignons" class="dialog push"
+            <button id="removeAllSignons"
                           label="&removeall.label;"
                           oncommand="DeleteAllSignons();"/>
           </hbox>
       </vbox>
       <!-- ignored signon sites -->
       <vbox id="ignoredsites" flex="1">
-          <html>&spiel.signonsnotstored.label;</html>
+          <description>&spiel.signonsnotstored.label;</description>
           <separator class="thin"/>
-          <tree id="ignoretree" class="inset" style="height: 20em;"
+          <tree id="ignoretree" style="height: 20em;"
                 onclick="HandleEvent(event);" flex="1"
                 multiple="true" onkeypress="HandleEvent(event,1)">
             <treecolgroup>
@@ -106,18 +103,18 @@
           </tree>
           <separator class="thin"/>
           <hbox>
-            <button id="removeIgnoredSite" disabled="true" class="dialog push"
+            <button id="removeIgnoredSite" disabled="true"
                           label="&remove.label;" oncommand="DeleteIgnoredSite();"/>
-            <button id="removeAllSites" class="dialog push"
+            <button id="removeAllSites"
                           label="&removeall.label;"
                           oncommand="DeleteAllSites();"/>
           </hbox>
       </vbox>
       <!-- do not preview panel -->
-      <vbox class="tabpanel" id="nopreviewforms" flex="1">
-          <html>&spiel.nopreview.label;</html>
+      <vbox id="nopreviewforms" flex="1">
+          <description>&spiel.nopreview.label;</description>
           <separator class="thin"/>
-          <tree id="nopreviewtree" class="inset" style="height: 20em;" 
+          <tree id="nopreviewtree" style="height: 20em;" 
                 onclick="HandleEvent(event);" flex="1"
                 multiple="true" onkeypress="HandleEvent(event,2)">
             <treecolgroup>
@@ -135,18 +132,18 @@
           </tree>
           <separator class="thin"/>
           <hbox>
-            <button id="removeNoPreview" disabled="true" class="dialog push"
+            <button id="removeNoPreview" disabled="true"
                           label="&remove.label;" oncommand="DeleteNoPreviewForm();"/>
-            <button id="removeAllNopreviews" class="dialog push"
+            <button id="removeAllNopreviews"
                           label="&removeall.label;"
                           oncommand="DeleteAllNopreviews();"/>
           </hbox>
       </vbox>
       <!-- do not capture panel -->
-      <vbox class="tabpanel" id="nocaptureforms" flex="1">
-          <html>&spiel.nocapture.label;</html>
+      <vbox id="nocaptureforms" flex="1">
+          <description>&spiel.nocapture.label;</description>
           <separator class="thin"/>
-          <tree id="nocapturetree" class="inset" style="height: 20em;" 
+          <tree id="nocapturetree" style="height: 20em;" 
                 onclick="HandleEvent(event);" flex="1"
                 multiple="true" onkeypress="HandleEvent(event,3)">
             <treecolgroup>
@@ -163,18 +160,13 @@
           </tree>
           <separator class="thin"/>
           <hbox>
-            <button id="removeNoCapture" disabled="true" class="dialog push"
+            <button id="removeNoCapture" disabled="true"
                           label="&remove.label;" oncommand="DeleteNoCaptureForm();"/>
-            <button id="removeAllNocaptures" class="dialog push"
+            <button id="removeAllNocaptures"
                           label="&removeall.label;"
                           oncommand="DeleteAllNocaptures();"/>
           </hbox>
       </vbox>
     </tabpanels>
-  </tabbox>
-    
-  <separator class="thin"/>
-
-  <hbox id="okCancelButtonsRight"/>
- 
-</window>
+  </tabbox>   
+</dialog>
diff --git a/mozilla/extensions/wallet/walletpreview/WalletPreview.xul b/mozilla/extensions/wallet/walletpreview/WalletPreview.xul
index 2487a1b3859..8c39b197de0 100644
--- a/mozilla/extensions/wallet/walletpreview/WalletPreview.xul
+++ b/mozilla/extensions/wallet/walletpreview/WalletPreview.xul
@@ -28,7 +28,6 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/WalletPreview.dtd" >
 
 <window title="&windowtitle.label;"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         orient="vertical" class="dialog" onload="Startup()">
 
@@ -42,7 +41,7 @@
   
   <spacer/>
   
-  <hbox class="tabpanel inset" flex="1" style="overflow: auto;">
+  <hbox class="inset" flex="1">
     <grid class="indent" flex="1">
       <columns flex="1">
         <column flex="1" crop="right"/>
diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul b/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
index f570780918e..11b3bfcb097 100644
--- a/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@@ -4,10 +4,8 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-addressing.dtd">
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="onLoad();"
-      orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="onLoad();">
 
   <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
   <script type="application/x-javascript">
@@ -30,66 +28,54 @@
     
   <hbox class="box-smallheader" title="&pane.title;"/>
 
-  <groupbox orient="vertical" class="small-margin">
+  <groupbox>
     <caption label="&emailCollectiontitle.label;"/>
-  <html class="small-margin">&emailCollectiontext.label;</html>
-    <vbox autostretch="never" class="indent">
-    <checkbox class="small-margin" id="emailCollectionIncoming" label="&emailCollectionIncomingEnable.label;"
-              pref="true" preftype="bool" prefstring="mail.collect_email_address_incoming"
-              prefattribute="checked"/>
-    <checkbox class="small-margin" id="emailCollectionOutgoing" label="&emailCollectionOutgoingEnable.label;"
-              pref="true" preftype="bool" prefstring="mail.collect_email_address_outgoing"
-              prefattribute="checked"/>
-    <checkbox class="small-margin" id="emailCollectionNewsgroup" label="&emailCollectionNewsgroupEnable.label;"
-              pref="true" preftype="bool" prefstring="mail.collect_email_address_newsgroup"
-              prefattribute="checked"/>
+  <description>&emailCollectiontext.label;</description>
+    <vbox align="start" class="indent">
+    <checkbox id="emailCollectionIncoming" label="&emailCollectionIncomingEnable.label;"
+              prefstring="mail.collect_email_address_incoming"/>
+    <checkbox id="emailCollectionOutgoing" label="&emailCollectionOutgoingEnable.label;"
+              prefstring="mail.collect_email_address_outgoing"/>
+    <checkbox id="emailCollectionNewsgroup" label="&emailCollectionNewsgroupEnable.label;"
+              prefstring="mail.collect_email_address_newsgroup"/>
     </vbox>
-    <hbox autostretch="never" align="center">
-      <checkbox class="small-margin" id="enableCABsizeLimit" label="&useCABSizelimitPart1.label;"
-                pref="true" preftype="bool" prefstring="mail.collect_email_address_enable_size_limit"
-                prefattribute="checked"/>
-      <textbox class="small-margin" id="CABsizeLimit" size="6" pref="true" preftype="int"
-               prefstring="mail.collect_email_address_size_limit" prefattribute="value"/>
-      <text id="useCABSizelimitPart2" class="label small-margin" value="&useCABSizelimitPart2.label;"/>
+    <hbox align="center">
+      <checkbox id="enableCABsizeLimit" label="&useCABSizelimitPart1.label;"
+                prefstring="mail.collect_email_address_enable_size_limit"/>
+      <textbox id="CABsizeLimit" size="6" preftype="int"
+               prefstring="mail.collect_email_address_size_limit"/>
+      <label id="useCABSizelimitPart2" class="small-margin" value="&useCABSizelimitPart2.label;"/>
     </hbox> 
   </groupbox>
 	
-    <groupbox class="small-margin" orient="vertical"  id="addressAutocompletion">
+    <groupbox id="addressAutocompletion">
       <caption label="&addressingTitle.label;"/>
-      <html class="small-margin">&autocompleteText.label;</html>
-      <hbox autostretch="never">
-        <checkbox class="small-margin" id="addressingAutocomplete" label="&addressingEnable.label;"
-          pref="true" preftype="bool" prefstring="mail.enable_autocomplete"
-          prefattribute="checked"/>
+      <description>&autocompleteText.label;</description>
+      <hbox align="center">
+        <checkbox id="addressingAutocomplete" label="&addressingEnable.label;"
+                  prefstring="mail.enable_autocomplete"/>
       </hbox>
-      <hbox autostretch="never">
-        <checkbox class="small-margin" id="autocompleteLDAP" label="&directories.label;" 
-                  pref="true" preftype="bool" 
+      <hbox align="center">
+        <checkbox id="autocompleteLDAP" label="&directories.label;" 
                   prefstring="ldap_2.autoComplete.useDirectory" 
-                  prefattribute="checked" 
                   oncommand="enableAutocomplete();"/>
-        <menulist class="small-margin" id="directoriesList" flex="1"
-                  pref="true" preftype="string" 
-                  prefstring="ldap_2.autoComplete.directoryServer"
-                  prefattribute="value">
+        <menulist id="directoriesList" flex="1"
+                  preftype="string" 
+                  prefstring="ldap_2.autoComplete.directoryServer">
           <menupopup id="directoriesListPopup" 
             onpopupshowing="createDirectoriesList(true);">
           </menupopup>
        </menulist>
-       <button class="small-margin" id="editButton" label="&editDirectories.label;" 
-               pref="true" preftype="bool" 
+       <button id="editButton" label="&editDirectories.label;" 
                prefstring="pref.ldap.disable_button.edit_directories" 
-               prefattribute="disabled"
                oncommand="onEditDirectories();"/>
      </hbox>
      <!--
-     <html class="small-margin">&matchText.label;</html>
-     <hbox autostretch="never">
-       <checkbox class="small-margin" id="autocompleteSkipDirectory"
+     <description>&matchText.label;</description>
+     <hbox align="center">
+       <checkbox id="autocompleteSkipDirectory"
                  label="&skipDirectory.label;" 
-                 pref="true" preftype="bool" 
-                 prefstring="ldap_2.autoComplete.skipDirectoryIfLocalMatchFound"
-                 prefattribute="checked"/>    
+                 prefstring="ldap_2.autoComplete.skipDirectoryIfLocalMatchFound"/>    
      </hbox>
      -->
    </groupbox>
diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul b/mozilla/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
index 3d120327198..85f09f47828 100644
--- a/mozilla/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
+++ b/mozilla/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
@@ -31,7 +31,6 @@
 
 <window id="addDirectory"
         class="dialog" style="width: 30em"
-        orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&newDirectoryTitle.label;"
         onload="Startup();">
@@ -106,8 +105,8 @@
                <row>
                  <label value="&scope.label;" control="scope"/>
                  <radiogroup id="scope" orient="horizontal">
-                   <radio group="scope" id="one" value="1" label="&scopeOneLevel.label;"/>
-                   <radio group="scope" id="sub" value="2" label="&scopeSubtree.label;"/>                
+                   <radio id="one" value="1" label="&scopeOneLevel.label;"/>
+                   <radio id="sub" value="2" label="&scopeSubtree.label;"/>                
                  </radiogroup>
                </row>
                <row>
diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/pref-directory.js b/mozilla/mailnews/addrbook/prefs/resources/content/pref-directory.js
index 327623e8eba..33eb2052846 100644
--- a/mozilla/mailnews/addrbook/prefs/resources/content/pref-directory.js
+++ b/mozilla/mailnews/addrbook/prefs/resources/content/pref-directory.js
@@ -292,7 +292,6 @@ function onInitEditDirectories()
   if (directoriesTree_root) {
     LoadDirectoriesTree(directoriesTree_root);
   }
-  doSetOKCancel(onOK, cancel);
 }
 
 function LoadDirectoriesTree(tree)
@@ -430,7 +429,7 @@ function removeDirectory()
 //  remove all the directories that are selected for deletion from preferences
 //  check if the deleted directory is selected for autocompletion in global
 //  or identity prefs. If so change the pref to ""
-function onOK()
+function onAccept()
 {
   var len = gDeletedDirectories.length;
   if (len) {
@@ -472,10 +471,5 @@ function onOK()
     }
   }
   window.opener.gRefresh = true;
-  window.close();
-}
-
-function cancel()
-{
-  window.close();
-}
+  return true;
+}
\ No newline at end of file
diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul b/mozilla/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
index 606e6b540ff..77fbb5c9234 100644
--- a/mozilla/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
+++ b/mozilla/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
@@ -21,22 +21,19 @@ Rights Reserved.
 
 <?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-directory.dtd">
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-      style="-moz-user-focus: ignore;"
-      title="&window.title;" orient="vertical"
-      onload="onInitEditDirectories();">
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        title="&window.title;"
+        onload="onInitEditDirectories();"
+        ondialogaccept="return onAccept();">
 
   <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
 
-    <html>&directoriesText.label;</html>
+    <description>&directoriesText.label;</description>
     <hbox flex="1">
-      <tree class="inset" id="directoriesTree" flex="1"
+      <tree id="directoriesTree" flex="1"
             datasources="rdf:null" onselect="selectDirectory();">
         <treecolgroup>
           <treecol flex="1"/>
@@ -49,5 +46,4 @@ Rights Reserved.
         <button id="removeButton" label="&deleteDirectory.label;" oncommand="removeDirectory();" disabled="true"/>
       </vbox>
     </hbox>
-    <hbox id="okCancelButtonsRight"/>
-</page>
+</dialog>
diff --git a/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul b/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
index cf65f818444..58d8b4ee087 100644
--- a/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
@@ -28,7 +28,6 @@ Rights Reserved.
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	title="&title.label;"
-        orient="vertical"
         class="dialog"
         onload="abNameOnLoad()"
         style="padding:10px"> 
@@ -41,7 +40,7 @@ Rights Reserved.
 		
 		<spacer flex="1"/>
 
-		<text for="name" style="margin-bottom:.3em" value="&name.label;"/>
+                <label control="name" style="margin-bottom:.3em" value="&name.label;"/>
 		
 		<textbox tabindex="0" id="name" style="width: 100%"/>
 		
diff --git a/mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul b/mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul
index 4be587bea52..c48589ae7ac 100644
--- a/mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul
@@ -46,34 +46,34 @@ Rights Reserved.
 			<!-- ** Name Tab ** -->
 			<vbox index="name" flex="1">
 				
-				<groupbox orient="vertical" flex="1">
+				<groupbox flex="1">
 					<caption label="&Name.box;"/>
 		
 					<vbox style="width:100%">
 						<hbox>
 							<spacer flex="1"/>
-							<text for="FirstName" value="&FirstName.label;" class="CardEditLabel"/>
+                                                        <label control="FirstName" value="&FirstName.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="FirstName" flex="1" oninput="GenerateDisplayName()"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="LastName" value="&LastName.label;" class="CardEditLabel"/>
+                                                        <label control="LastName" value="&LastName.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="LastName" flex="1" oninput="GenerateDisplayName()"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="DisplayName" value="&DisplayName.label;" class="CardEditLabel"/>
+                                                        <label control="DisplayName" value="&DisplayName.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="DisplayName" flex="1" oninput="DisplayNameChanged()"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="NickName" value="&NickName.label;" class="CardEditLabel"/>
+                                                        <label control="NickName" value="&NickName.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="NickName" flex="1"/>
 							</hbox>
@@ -81,27 +81,27 @@ Rights Reserved.
 					</vbox>
 				</groupbox>
 
-				<groupbox orient="vertical" flex="1">
+				<groupbox flex="1">
 					<caption label="&Internet.box;"/>
 		
 					<vbox style="width:100%">
 						<hbox>
 							<spacer flex="1"/>
-							<text for="PrimaryEmail" value="&PrimaryEmail.label;" class="CardEditLabel"/>
+                                                        <label control="PrimaryEmail" value="&PrimaryEmail.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="PrimaryEmail" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="SecondEmail" value="&SecondEmail.label;" class="CardEditLabel"/>
+                                                        <label control="SecondEmail" value="&SecondEmail.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="SecondEmail" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<vbox valign="middle">
-							<text for="PreferMailFormatPopup" value="&PreferMailFormat.label;"/>
+                                                        <label control="PreferMailFormatPopup" value="&PreferMailFormat.label;"/>
 							</vbox>
 							<menulist id="PreferMailFormatPopup">
 								<menupopup>
@@ -114,41 +114,41 @@ Rights Reserved.
 					</vbox>
 				</groupbox>
 
-				<groupbox orient="vertical" flex="1">
+				<groupbox flex="1">
 					<caption label="&Phones.box;"/>
 		
 					<vbox style="width:100%">
 						<hbox>
 							<spacer flex="1"/>
-							<text for="WorkPhone" value="&WorkPhone.label;" class="CardEditLabel"/>
+                                                        <label control="WorkPhone" value="&WorkPhone.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkPhone" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="HomePhone" value="&HomePhone.label;" class="CardEditLabel"/>
+                                                        <label control="HomePhone" value="&HomePhone.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomePhone" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="FaxNumber" value="&FaxNumber.label;" class="CardEditLabel"/>
+                                                        <label control="FaxNumber" value="&FaxNumber.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="FaxNumber" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="PagerNumber" value="&PagerNumber.label;" class="CardEditLabel"/>
+                                                        <label control="PagerNumber" value="&PagerNumber.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="PagerNumber" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="CellularNumber" value="&CellularNumber.label;" class="CardEditLabel"/>
+                                                        <label control="CellularNumber" value="&CellularNumber.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="CellularNumber" flex="1"/>
 							</hbox>
@@ -160,52 +160,52 @@ Rights Reserved.
 			<!-- ** Address Tab ** -->
 			<vbox index="address" flex="1">
 				
-				<groupbox orient="vertical" flex="1">
+				<groupbox flex="1">
 					<caption label="&Home.box;"/>
 		
 					<vbox style="width:100%">
 		
 						<hbox>
 							<spacer flex="1"/>
-							<text for="HomeAddress" value="&HomeAddress.label;" class="CardEditLabel"/>
+                                                        <label control="HomeAddress" value="&HomeAddress.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomeAddress" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="HomeAddress2" value="&HomeAddress2.label;" class="CardEditLabel"/>
+                                                        <label control="HomeAddress2" value="&HomeAddress2.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomeAddress2" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="HomeCity" value="&HomeCity.label;" class="CardEditLabel"/>
+                                                        <label control="HomeCity" value="&HomeCity.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomeCity" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="HomeState" value="&HomeState.label;" class="CardEditLabel"/>
+                                                        <label control="HomeState" value="&HomeState.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomeState" flex="1"/>
 								<spacer class="stateZipSpacer"/>
-								<text for="HomeZipCode" value="&HomeZipCode.label;" class="CardEditLabel"/>
+                                                                <label control="HomeZipCode" value="&HomeZipCode.label;" class="CardEditLabel"/>
 								<textbox id="HomeZipCode" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="HomeCountry" value="&HomeCountry.label;" class="CardEditLabel"/>
+                                                        <label control="HomeCountry" value="&HomeCountry.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomeCountry" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="WebPage2" value="&HomeWebPage.label;" class="CardEditLabel"/>
+                                                        <label control="WebPage2" value="&HomeWebPage.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WebPage2" flex="1"/>
 							</hbox>
@@ -213,73 +213,73 @@ Rights Reserved.
 					</vbox>
 				</groupbox>
 
-				<groupbox orient="vertical" style="width:100%">
+				<groupbox style="width:100%">
 					<caption label="&Work.box;"/>
 		
 					<vbox style="width:100%">
 		
 						<hbox>
 							<spacer flex="1"/>
-							<text for="JobTitle" value="&JobTitle.label;" class="CardEditLabel"/>
+                                                        <label control="JobTitle" value="&JobTitle.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="JobTitle" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="Department" value="&Department.label;" class="CardEditLabel"/>
+                                                        <label control="Department" value="&Department.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="Department" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="Company" value="&Company.label;" class="CardEditLabel"/>
+                                                        <label control="Company" value="&Company.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="Company" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="WorkAddress" value="&WorkAddress.label;" class="CardEditLabel"/>
+                                                        <label control="WorkAddress" value="&WorkAddress.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkAddress" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="WorkAddress2" value="&WorkAddress2.label;" class="CardEditLabel"/>
+                                                        <label control="WorkAddress2" value="&WorkAddress2.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkAddress2" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="WorkCity" value="&WorkCity.label;" class="CardEditLabel"/>
+                                                        <label control="WorkCity" value="&WorkCity.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkCity" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="WorkState" value="&WorkState.label;" class="CardEditLabel"/>
+                                                        <label control="WorkState" value="&WorkState.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkState" flex="1"/>
 								<spacer class="stateZipSpacer"/>
-								<text for="WorkZipCode" value="&WorkZipCode.label;" class="CardEditLabel"/>
+                                                                <label control="WorkZipCode" value="&WorkZipCode.label;" class="CardEditLabel"/>
 								<textbox id="WorkZipCode" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="WorkCountry" value="&WorkCountry.label;" class="CardEditLabel"/>
+                                                        <label control="WorkCountry" value="&WorkCountry.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkCountry" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
 							<spacer flex="1"/>
-							<text for="WebPage1" value="&WorkWebPage.label;" class="CardEditLabel"/>
+                                                        <label control="WebPage1" value="&WorkWebPage.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WebPage1" flex="1"/>
 							</hbox>
@@ -294,24 +294,24 @@ Rights Reserved.
 				
 				<vbox class="alignBoxWithFieldset">
 					<hbox flex="1">
-						<text for="Custom1" value="&Custom1.label;" class="CardEditLabel"/>
+                                                <label control="Custom1" value="&Custom1.label;" class="CardEditLabel"/>
 						<textbox id="Custom1" flex="1"/>
 					</hbox>
 					<hbox flex="1">
-						<text for="Custom2" value="&Custom2.label;" class="CardEditLabel"/>
+                                                <label control="Custom2" value="&Custom2.label;" class="CardEditLabel"/>
 						<textbox id="Custom2" flex="1"/>
 					</hbox>
 					<hbox flex="1">
-						<text for="Custom3" value="&Custom3.label;" class="CardEditLabel"/>
+                                                <label control="Custom3" value="&Custom3.label;" class="CardEditLabel"/>
 						<textbox id="Custom3" flex="1"/>
 					</hbox>
 					<hbox flex="1">
-						<text for="Custom4" value="&Custom4.label;" class="CardEditLabel"/>
+                                                <label control="Custom4" value="&Custom4.label;" class="CardEditLabel"/>
 						<textbox id="Custom4" flex="1"/>
 					</hbox>
 				</vbox>
 
-				<groupbox orient="vertical" style="width:100%">
+				<groupbox style="width:100%">
 					<caption label="&Notes.box;"/>
 		
 					<vbox style="width:100%">
diff --git a/mozilla/mailnews/addrbook/resources/content/abCardViewOverlay.xul b/mozilla/mailnews/addrbook/resources/content/abCardViewOverlay.xul
index 5c58275517b..857ee92b028 100644
--- a/mozilla/mailnews/addrbook/resources/content/abCardViewOverlay.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abCardViewOverlay.xul
@@ -31,41 +31,41 @@ Rights Reserved.
 	
 	<vbox id="CardViewInnerBox" flex="1">
 		
-		<html hide="true" id="CardTitle"/>
+		<description hide="true" id="CardTitle"/>
 
 		<hbox style="width:100%" flex="1">
 			
 			<vbox flex="1" style="width:200px">
 				<vbox id="cvbName" class="cardViewGroup">
-					<html class="CardViewHeading" hide="true" id="cvhName"/>
-					<html class="CardViewText" hide="true" id="cvDisplayName"/>
-					<html class="CardViewText" hide="true" id="cvNickname"/>
-					<html class="CardViewLink" hide="true" id="cvEmail1Box">
+					<description class="CardViewHeading" hide="true" id="cvhName"/>
+                                        <description class="CardViewText" hide="true" id="cvDisplayName"/>
+                                        <description class="CardViewText" hide="true" id="cvNickname"/>
+                                        <description class="CardViewLink" hide="true" id="cvEmail1Box">
 						<html:p><html:a href="" id="cvEmail1"/>
 					</html:p></html>
-					<html class="CardViewLink" hide="true" id="cvEmail2Box">
+                                        <description class="CardViewLink" hide="true" id="cvEmail2Box">
 						<html:p><html:a href="" id="cvEmail2"/>
-					</html:p></html>
+                                        </html:p></description>
 				</vbox>
 				
 				<vbox id="cvbHome" class="cardViewGroup">
-					<html class="CardViewHeading" hide="true" id="cvhHome">&home.heading;</html>
-					<html class="CardViewText" hide="true" id="cvHomeAddress"/>
-					<html class="CardViewText" hide="true" id="cvHomeAddress2"/>
-					<html class="CardViewText" hide="true" id="cvHomeCityStZip"/>
-					<html class="CardViewText" hide="true" id="cvHomeCountry"/>
-					<html class="CardViewLink" hide="true" id="cvHomeWebPageBox">
+                                        <description class="CardViewHeading" hide="true" id="cvhHome">&home.heading;</description>
+                                        <description class="CardViewText" hide="true" id="cvHomeAddress"/>
+                                        <description class="CardViewText" hide="true" id="cvHomeAddress2"/>
+                                        <description class="CardViewText" hide="true" id="cvHomeCityStZip"/>
+                                        <description class="CardViewText" hide="true" id="cvHomeCountry"/>
+                                        <description class="CardViewText" hide="true" id="cvHomeWebPageBox">
 						<html:p><html:a onclick="return openLink('cvHomeWebPage');" href="" id="cvHomeWebPage"/>
-					</html:p></html>
+                                        </html:p></description>
 				</vbox>
 
 				<vbox id="cvbOther" class="cardViewGroup">
-					<html class="CardViewHeading" hide="true" id="cvhOther">&other.heading;</html>
-					<html class="CardViewText" hide="true" id="cvCustom1"/>
-					<html class="CardViewText" hide="true" id="cvCustom2"/>
-					<html class="CardViewText" hide="true" id="cvCustom3"/>
-					<html class="CardViewText" hide="true" id="cvCustom4"/>
-					<html class="CardViewText" hide="true" id="cvNotes"/>
+                                        <description class="CardViewHeading" hide="true" id="cvhOther">&other.heading;</description>
+                                        <description class="CardViewText" hide="true" id="cvCustom1"/>
+                                        <description class="CardViewText" hide="true" id="cvCustom2"/>
+                                        <description class="CardViewText" hide="true" id="cvCustom3"/>
+                                        <description class="CardViewText" hide="true" id="cvCustom4"/>
+                                        <description class="CardViewText" hide="true" id="cvNotes"/>
 				</vbox>
 			</vbox>
 			
@@ -73,26 +73,26 @@ Rights Reserved.
 
 			<vbox flex="1" style="width:200px">
 				<vbox id="cvbPhone" class="cardViewGroup">
-					<html class="CardViewHeading" hide="true" id="cvhPhone">&phone.heading;</html>
-					<html class="CardViewText" hide="true" id="cvPhWork"/>
-					<html class="CardViewText" hide="true" id="cvPhHome"/>
-					<html class="CardViewText" hide="true" id="cvPhFax"/>
-					<html class="CardViewText" hide="true" id="cvPhCellular"/>
-					<html class="CardViewText" hide="true" id="cvPhPager"/>
+                                        <description class="CardViewHeading" hide="true" id="cvhPhone">&phone.heading;</description>
+                                        <description class="CardViewText" hide="true" id="cvPhWork"/>
+                                        <description class="CardViewText" hide="true" id="cvPhHome"/>
+                                        <description class="CardViewText" hide="true" id="cvPhFax"/>
+                                        <description class="CardViewText" hide="true" id="cvPhCellular"/>
+                                        <description class="CardViewText" hide="true" id="cvPhPager"/>
 				</vbox>
 				
 				<vbox id="cvbWork" class="cardViewGroup">
-					<html class="CardViewHeading" hide="true" id="cvhWork">&work.heading;</html>
-					<html class="CardViewText" hide="true" id="cvJobTitle"/>
-					<html class="CardViewText" hide="true" id="cvDepartment"/>
-					<html class="CardViewText" hide="true" id="cvCompany"/>
-					<html class="CardViewText" hide="true" id="cvWorkAddress"/>
-					<html class="CardViewText" hide="true" id="cvWorkAddress2"/>
-					<html class="CardViewText" hide="true" id="cvWorkCityStZip"/>
-					<html class="CardViewText" hide="true" id="cvWorkCountry"/>
-					<html class="CardViewLink" hide="true" id="cvWorkWebPageBox">
+                                        <description class="CardViewHeading" hide="true" id="cvhWork">&work.heading;</html>
+                                        <description class="CardViewText" hide="true" id="cvJobTitle"/>
+                                        <description class="CardViewText" hide="true" id="cvDepartment"/>
+                                        <description class="CardViewText" hide="true" id="cvCompany"/>
+                                        <description class="CardViewText" hide="true" id="cvWorkAddress"/>
+                                        <description class="CardViewText" hide="true" id="cvWorkAddress2"/>
+                                        <description class="CardViewText" hide="true" id="cvWorkCityStZip"/>
+                                        <description class="CardViewText" hide="true" id="cvWorkCountry"/>
+                                        <description class="CardViewLink" hide="true" id="cvWorkWebPageBox">
 						<html:p><html:a onclick="return openLink('cvWorkWebPage');" href="" id="cvWorkWebPage"/>
-					</html:p></html>
+                                        </html:p></description>
 				</vbox>
 			</vbox>
 
diff --git a/mozilla/mailnews/addrbook/resources/content/abEditCardDialog.xul b/mozilla/mailnews/addrbook/resources/content/abEditCardDialog.xul
index 1bd6cc5b6ac..349bb737a34 100644
--- a/mozilla/mailnews/addrbook/resources/content/abEditCardDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abEditCardDialog.xul
@@ -25,19 +25,12 @@ Rights Reserved.
 <?xul-overlay href="chrome://messenger/content/addressbook/abCardOverlay.xul"?>
 
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    id="abcardWindow"
-		onload="OnLoadEditCard()"
-		class="dialog"
-		orient="vertical">
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="abcardWindow"
+        onload="OnLoadEditCard()">
 
   <stringbundleset id="stringbundleset"/>
+  <vbox id="editcard"/>	
 
-	<keyset id="dialogKeys"/>
-
-	<vbox id="editcard"/>
-	
-	<hbox id="okCancelButtons"/>
-
-</window>
+</dialog>
 
diff --git a/mozilla/mailnews/addrbook/resources/content/abEditListDialog.xul b/mozilla/mailnews/addrbook/resources/content/abEditListDialog.xul
index 4ed54fe3c59..31b8a05e7ff 100644
--- a/mozilla/mailnews/addrbook/resources/content/abEditListDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abEditListDialog.xul
@@ -21,28 +21,18 @@ Rights Reserved.
 
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/addressbook/abListOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-		title="&mailListWindow.title;"
-		class="dialog"
-		onload="OnLoadEditList()"
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        title="&mailListWindow.title;"
+        onload="OnLoadEditList()"
+        ondialogaccept="return EditListOKButton();"
         ondragover="return DragOverTree(event);"
-        ondragdrop="return DropOnAddressListTree(event);"
-		orient="vertical">
+        ondragdrop="return DropOnAddressListTree(event);">
 
   <stringbundleset id="stringbundleset"/>
-
-	<keyset id="dialogKeys"/>
-
-	<vbox id="editlist"/>
-		
-	<spacer style="height:1em"/>
-		
-	<hbox id="okCancelButtons"/>
-
-</window>
+  <vbox id="editlist"/>		
+</dialog>
diff --git a/mozilla/mailnews/addrbook/resources/content/abListOverlay.xul b/mozilla/mailnews/addrbook/resources/content/abListOverlay.xul
index 9350be4612f..0e1eb2aa238 100644
--- a/mozilla/mailnews/addrbook/resources/content/abListOverlay.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abListOverlay.xul
@@ -64,7 +64,7 @@ Rights Reserved.
 	<spacer style="height:0.1em"/>
 	<hbox  flex="100%">
 		<vbox flex="80%">
-			<tree id="addressListTree" class="inset"
+			<tree id="addressListTree"
 				  rows="8"
 				  onclick="awClickEmptySpace(event.target, true)">
 
diff --git a/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js b/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js
index 21b57ad5229..06da4793c09 100644
--- a/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js
+++ b/mozilla/mailnews/addrbook/resources/content/abMailListDialog.js
@@ -185,8 +185,6 @@ function OnLoadMailList()
 {
   //XXX: gAddressBookBundle is set in 2 places because of different callers
   gAddressBookBundle = document.getElementById("bundle_addressBook");
-  doSetOKCancel(MailListOKButton, 0);
-
   var selectedAB;
   if (window.arguments && window.arguments[0])
   {
@@ -246,7 +244,6 @@ function OnLoadEditList()
 {
   //XXX: gAddressBookBundle is set in 2 places because of different callers
   gAddressBookBundle = document.getElementById("bundle_addressBook");
-  doSetOKCancel(EditListOKButton, 0);
 
   parentURI  = window.arguments[0].abURI;
   var listUri  = window.arguments[0].listURI;
diff --git a/mozilla/mailnews/addrbook/resources/content/abMailListDialog.xul b/mozilla/mailnews/addrbook/resources/content/abMailListDialog.xul
index debc3a98c12..9dbc926de70 100644
--- a/mozilla/mailnews/addrbook/resources/content/abMailListDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abMailListDialog.xul
@@ -26,21 +26,18 @@ Rights Reserved.
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
 
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:nc="http://home.netscape.com/NC-rdf#"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     title="&mailListWindow.title;"
-    class="dialog"
+    ondialogaccept="return MailListOKButton();"
     onload="OnLoadMailList()"
-        ondragover="return DragOverTree(event);"
-        ondragdrop="return DropOnAddressListTree(event);"
-    orient="vertical">
+    ondragover="return DragOverTree(event);"
+    ondragdrop="return DropOnAddressListTree(event);">
 
   <stringbundleset id="stringbundleset"/>
 
-  <keyset id="dialogKeys"/>
-
-  <hbox autostretch="never" valign="center">
+  <hbox align="center" valign="center">
     <label control="abPopup" value="&addToAddressBook.label;" accesskey="&addToAddressBook.accesskey;"/>
     <menulist id="abPopup">
       <menupopup id="abPopup-menupopup" ref="moz-abdirectory://" datasources="rdf:addressdirectory">
@@ -58,9 +55,5 @@ Rights Reserved.
   <spacer style="height:1em"/>
 
   <vbox id="editlist"/>
-    
-  <spacer style="height:1em"/>
-    
-  <hbox id="okCancelButtons"/>
 
-</window>
+</dialog>
diff --git a/mozilla/mailnews/addrbook/resources/content/abNewCardDialog.xul b/mozilla/mailnews/addrbook/resources/content/abNewCardDialog.xul
index 23e4db4f63f..fa48033606b 100644
--- a/mozilla/mailnews/addrbook/resources/content/abNewCardDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abNewCardDialog.xul
@@ -32,16 +32,15 @@ Rights Reserved.
     id="abcardWindow"
     title="&editcardWindow.title;"
     onload="OnLoadNewCard()"
-    class="dialog"
-    orient="vertical">
+    class="dialog">
 
   <stringbundleset id="stringbundleset"/>
 
   <keyset id="dialogKeys"/>
 
-  <hbox autostretch="never" valign="center">
+  <hbox align="center" valign="center">
 
-    <text for="abPopup" value="&chooseAddressBook.label;"/>
+    <label control="abPopup" value="&chooseAddressBook.label;"/>
     <menulist id="abPopup">
       <menupopup id="abPopup-menupopup" ref="moz-abdirectory://" datasources="rdf:addressdirectory">
         <template> 
diff --git a/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul b/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
index a939e68ff9e..6eefc6f1ffe 100644
--- a/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
@@ -30,12 +30,11 @@ Rights Reserved.
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abSelectAddressesDialog.dtd">
 
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&selectAddressWindow.title;"
         class="dialog"
         width="680" height="480"
-        onload="OnLoadSelectAddress()"
-        orient="vertical">
+        onload="OnLoadSelectAddress()">
 
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   <stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
@@ -72,11 +71,11 @@ Rights Reserved.
           <!-- Box that holds (to,cc,bcc buttons) -->
           <hbox id="addToBucketButtonBox">
             <spacer flex="50%"/>
-            <button id="toButton" label="&toButton.label;" class="dialog" oncommand="SelectAddressToButton()"/> 
+            <button id="toButton" label="&toButton.label;" oncommand="SelectAddressToButton()"/> 
             <spacer class="middle-button-spacer"/>
-            <button id="ccButton" label="&ccButton.label;" class="dialog" oncommand="SelectAddressCcButton()"/> 
+            <button id="ccButton" label="&ccButton.label;" oncommand="SelectAddressCcButton()"/> 
             <spacer class="middle-button-spacer"/>
-            <button id="bccButton" label="&bccButton.label;" class="dialog" oncommand="SelectAddressBccButton()"/>  
+            <button id="bccButton" label="&bccButton.label;" oncommand="SelectAddressBccButton()"/>  
             <spacer flex="50%"/>
           </hbox>
         </vbox>
@@ -100,9 +99,9 @@ Rights Reserved.
     <vbox id="rightColumnButtonBox">
       <vbox flex="50%">
         <spacer class="third-column-spacer"/>
-        <button id="new" label="&newButton.label;" class="dialog" tooltip="aTooltip" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard('dirTree')"/> 
+        <button id="new" label="&newButton.label;" tooltip="aTooltip" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard('dirTree')"/> 
         <spacer class="third-column-spacer"/>
-        <button id="edit" label="&editButton.label;" class="dialog" tooltip="aTooltip" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditCard()"/> 
+        <button id="edit" label="&editButton.label;" tooltip="aTooltip" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditCard()"/> 
         <spacer flex="100%"/>
       </vbox>
       <vbox flex="50%">
diff --git a/mozilla/mailnews/addrbook/resources/content/addressbook.xul b/mozilla/mailnews/addrbook/resources/content/addressbook.xul
index 9e44aaa430a..fa4896898ea 100644
--- a/mozilla/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mozilla/mailnews/addrbook/resources/content/addressbook.xul
@@ -38,13 +38,11 @@ Rights Reserved.
 %brandDTD;
 ]>
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     id="addressbookWindow"
     height="450"
     width="750"
-    orient="vertical"
     title="&addressbookWindow.title;"
     windowtype="mail:addressbook"
     persist="width height screenX screenY sizemode"
@@ -238,7 +236,7 @@ Rights Reserved.
         <button id="button_search" class="other28" align="top" label="&searchButton.label;" disabled="true" tooltip="aTooltip" tooltiptext="&searchButton.tooltip;" oncommand="AbSearch()"/-->
      </hbox>
 
-     <hbox id="throbber-box" autostretch="never">
+     <hbox id="throbber-box" align="center">
       <button id="navigator-throbber" oncommand='goClickThrobber("addressbook.throbber.url")' tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
         <observes element="broadcaster_throbber" attribute="busy"/>
       </button>
diff --git a/mozilla/mailnews/base/prefs/resources/content/AccountManager.xul b/mozilla/mailnews/base/prefs/resources/content/AccountManager.xul
index 30495413f0b..7ddda31832d 100644
--- a/mozilla/mailnews/base/prefs/resources/content/AccountManager.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/AccountManager.xul
@@ -6,9 +6,8 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/AccountManager.dtd" >
 <window id="account-manager" 
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    title="&accountManagerTitle.label;"
-        orient="vertical"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&accountManagerTitle.label;"
         class="dialog"
         width="620" height="470"
         persist="screenX screenY width height"
@@ -28,7 +27,6 @@
       <tree datasources="rdf:msgaccountmanager" style="width:0px" flex="1"
             containment="http://home.netscape.com/NC-rdf#Settings"
             onselect="onAccountClick(event.target)" id="accounttree"
-            class="inset"
             sortResource="http://home.netscape.com/NC-rdf#Name?sort=true"
             sortDirection="ascending"
             ref="msgaccounts:/">
@@ -52,20 +50,15 @@
         </template>
       </tree>
       <button label="&newAccountButton.label;" oncommand="onNewAccount(event);" id="newAccountButton"
-              pref="true" preftype="bool" prefattribute="disabled"
               prefstring="mail.accountmanager.accounts"/>
       <button label="&setDefaultButton.label;" oncommand="onSetDefault(event);" disabled="true" id="setDefaultButton"
-              pref="true" preftype="bool" prefattribute="disabled"
               prefstring="mail.disable_button.set_default_account"/>
   
-      <hbox >
         <!-- taking out for PR2
-          <button class="dialog" disabled="true" label="&duplicateButton.label;" id="duplicateButton" oncommand="onDuplicateAccount();" flex="50%"/>
+          <button disabled="true" label="&duplicateButton.label;" id="duplicateButton" oncommand="onDuplicateAccount();"/>
         -->
-        <button class="dialog" disabled="true" label="&deleteButton.label;" oncommand="onDeleteAccount(event);" id="deleteButton" flex="50%"
-                pref="true" preftype="bool" prefattribute="disabled"
+        <button disabled="true" label="&deleteButton.label;" oncommand="onDeleteAccount(event);" id="deleteButton"
                 prefstring="mail.disable_button.delete_account"/>
-      </hbox>
     </vbox>
   
     <iframe id="contentFrame" name="contentFrame" flex="6" style="width: 0px"/>
diff --git a/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul b/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul
index b40d255f397..8f7faee6f8f 100644
--- a/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul
@@ -25,7 +25,7 @@ Rights Reserved.
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/AccountWizard.dtd" >
 
-<window id="account-wizard-dialog" xmlns:html="http://www.w3.org/1999/xhtml"
+<window id="account-wizard-dialog"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     title="&windowTitle.label;"
     height="400" width="500" class="color-dialog"
diff --git a/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.js b/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.js
index e47fa51607e..4cc5e9947ea 100644
--- a/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.js
+++ b/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.js
@@ -51,8 +51,6 @@ function onLoad(event)
     var server = window.arguments[0].server;
  
     initializeDialog(server);
-
-    doSetOKCancel(onOk, 0);
 }
 
 function initializeDialog(server)
@@ -62,7 +60,7 @@ function initializeDialog(server)
     initSmtpSettings(server);
 }
 
-function onOk()
+function onAccept()
 {
     // if we didn't have an SMTP server to initialize with,
     // we must be creating one.
@@ -76,5 +74,5 @@ function onOk()
     }
 
     window.arguments[0].result = true;
-    window.close();
+    return true;
 }
diff --git a/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.xul b/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
index 964dddac320..ffbd806649f 100644
--- a/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
@@ -32,18 +32,12 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/SmtpServerEdit.dtd">
 
-<window class="dialog"
-  title="&smtpEditTitle.label;"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  orient="vertical"
-  onload="onLoad();"
->
+<dialog title="&smtpEditTitle.label;"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="onLoad();"
+        ondialogaccept="return onAccept();">
 
 <script type="application/x-javascript" src="SmtpServerEdit.js"/>
-<keyset id="dialogKeys"/>
 <vbox id="smtpServerEditor"/>
-<separator/>
-<hbox id="okCancelButtonsRight"/>
-
-</window>
+</dialog>
diff --git a/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.xul b/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.xul
index 3e9dcaf0b05..df76a5c801b 100644
--- a/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/SmtpServerList.xul
@@ -29,26 +29,21 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/SmtpServerList.dtd">
 
-<window class="dialog"
-  title="&smtpListTitle.label;"
+<dialog title="&smtpListTitle.label;"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  orient="vertical"
   onload="onLoad();"
-  style="width: 30em;"
->
+  style="width: 30em;">
 
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 <script type="application/x-javascript" src="SmtpServerList.js"/>
 
-<keyset id="dialogKeys"/>
-
-<html flex="1">&smtpListDesc.label;</html>
+<description flex="1">&smtpListDesc.label;</description>
 
 <separator class="thin"/>
 
 <hbox>
-  <tree id="smtpTree" onselect="onSelectionChange(event);" class="inset" flex="1" style="height: 0px;">
+  <tree id="smtpTree" onselect="onSelectionChange(event);" flex="1" style="height: 0px;">
     <treecolgroup>
       <treecol flex="1"/>
     </treecolgroup>
@@ -68,6 +63,4 @@
 
 <separator/>
 
-<hbox id="okCancelButtonsRight" />
-
-</window>
+</dialog>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-addressing.xul b/mozilla/mailnews/base/prefs/resources/content/am-addressing.xul
index 49a4c09ad21..1448988f4a0 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-addressing.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-addressing.xul
@@ -32,30 +32,28 @@ Contributors:
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-addressing.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      xmlns:html="http://www.w3.org/1999/xhtml"
-      onload="onLoad();"
-      orient="vertical">
+      onload="onLoad();">
   <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/am-addressing.js"/>
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-  <text hidden="true" wsm_persist="true" id="identity.directoryServer"
+  <label hidden="true" wsm_persist="true" id="identity.directoryServer"
         pref="true" preftype="string" prefattribute="value"
         prefstring="mail.identity.%identitykey%.directoryServer"/>
-  <text hidden="true" wsm_persist="true" id="identity.overrideGlobalPref"
+  <label hidden="true" wsm_persist="true" id="identity.overrideGlobalPref"
         pref="true" preftype="bool" prefattribute="value"
         prefstring="mail.identity.%identitykey%.overrideGlobal_Pref"/>
-  <text hidden="true" wsm_persist="true" id="overrideGlobalPref" value=""/>
-  <text hidden="true" wsm_persist="true" id="directoryServer" value=""/>
+  <label hidden="true" wsm_persist="true" id="overrideGlobalPref" value=""/>
+  <label hidden="true" wsm_persist="true" id="directoryServer" value=""/>
   <hbox class="box-smallheader" title="&addressing.label;"/>
   
   <separator class="thin"/>
   <vbox flex="1">
-    <html>&addressingText.label;</html>
-	<radiogroup orient="vertical" class="indent" id="ldapAutocomplete" wsm_persist="true" oncommand="enabling();">
+    <description>&addressingText.label;</description>
+	<radiogroup class="indent" id="ldapAutocomplete" wsm_persist="true" oncommand="enabling();">
       <observes element="identity.overrideGlobalPref" attribute="disabled"/>
-      <radio group="ldapAutocomplete" id="useGlobalPref" value="0" label="&useGlobal.label;"/>
-      <hbox autostretch="never">
-        <radio group="ldapAutocomplete" id="directories" value="1" label="&directories.label;"/>
+      <radio id="useGlobalPref" value="0" label="&useGlobal.label;"/>
+      <hbox align="center">
+        <radio id="directories" value="1" label="&directories.label;"/>
         <menulist id="directoriesList" wsm_persist="true" flex="1">
           <menupopup onpopupshowing="createDirectoriesList(false);" id="directoriesListPopup"/>
         </menulist>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-advanced.xul b/mozilla/mailnews/base/prefs/resources/content/am-advanced.xul
index d995dd19bd8..94971df383c 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-advanced.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-advanced.xul
@@ -4,9 +4,6 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical">
+<page  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-
-</page>
+</page>
\ No newline at end of file
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-copies.xul b/mozilla/mailnews/base/prefs/resources/content/am-copies.xul
index 28c27edc619..79fcf3f9167 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-copies.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-copies.xul
@@ -6,10 +6,8 @@
 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd" >
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.onPanelLoaded('am-copies.xul');"
-      orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.onPanelLoaded('am-copies.xul');">
 
   <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
@@ -20,62 +18,60 @@
   
   <broadcaster id="broadcaster_doFcc"/>
 
-  <text hidden="true" wsm_persist="true" id="identity.fccFolder"
+  <label hidden="true" wsm_persist="true" id="identity.fccFolder"
                 pref="true" preftype="string" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.fcc_folder"/>
-  <text hidden="true" wsm_persist="true" id="identity.draftFolder"
+  <label hidden="true" wsm_persist="true" id="identity.draftFolder"
                 pref="true" preftype="string" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.draft_folder"/>
-  <text hidden="true" wsm_persist="true" id="identity.stationeryFolder"
+  <label hidden="true" wsm_persist="true" id="identity.stationeryFolder"
                 pref="true" preftype="string" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.stationary_folder"/>
-  <text hidden="true" wsm_persist="true" id="identity.email"/>
+  <label hidden="true" wsm_persist="true" id="identity.email"/>
   
-  <text hidden="true" wsm_persist="true" id="identity.fccFolderPickerMode"
+  <label hidden="true" wsm_persist="true" id="identity.fccFolderPickerMode"
                 pref="true" preftype="int" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.fcc_folder_picker_mode"/>
-  <text hidden="true" wsm_persist="true" id="identity.draftsFolderPickerMode"
+  <label hidden="true" wsm_persist="true" id="identity.draftsFolderPickerMode"
                 pref="true" preftype="int" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.drafts_folder_picker_mode"/>
-  <text hidden="true" wsm_persist="true" id="identity.tmplFolderPickerMode"
+  <label hidden="true" wsm_persist="true" id="identity.tmplFolderPickerMode"
                 pref="true" preftype="int" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.tmpl_folder_picker_mode"/>
 
   <hbox class="box-smallheader" title="&copyAndFolderTitle.label;"/>
   
-  <groupbox orient="vertical" class="small-margin">
+  <groupbox>
     <caption label="&sendingPrefix.label;"/>
 
-    <hbox autostretch="never">
+    <hbox align="center">
       <checkbox wsm_persist="true" id="identity.doFcc" label="&fccMailFolder.label;" 
-                pref="true" preftype="bool" prefattribute="value"
+                prefattribute="value"
                 prefstring="mail.identity.%identitykey%.fcc"
                 oncommand="setupFccItems();"/>
     </hbox>
-      <radiogroup id="doFcc" orient="vertical">
+      <radiogroup id="doFcc">
       <grid class="specialFolderPickerGrid">
         <columns>
           <column flex="1"/>
           <column flex="2"/>
         </columns>
         <rows>
-          <row autostretch="never">
-            <radio group="doFcc" id="fcc_selectAccount" 
+          <row align="center">
+            <radio id="fcc_selectAccount" 
                    value="0" label="&sentFolderOn.label;"
                    oncommand="setPickersState('msgFccAccountPicker', 'msgFccFolderPicker', event)" 
                    observes="broadcaster_doFcc"/>
   	    <menulist id="msgFccAccountPicker"
-                      class="small-margin"
 	              oncommand="noteSelectionChange('fcc_selectAccount')" 
 	              flex="1" observes="broadcaster_doFcc"/>
           </row> 
-          <row autostretch="never">
-            <radio group="doFcc" id="fcc_selectFolder" 
+          <row align="center">
+            <radio id="fcc_selectFolder" 
 	           value="1" label="&otherFolder.label;"
                    oncommand="setPickersState('msgFccFolderPicker', 'msgFccAccountPicker', event)" 
                    observes="broadcaster_doFcc"/>
   	    <menulist id="msgFccFolderPicker" 
-                      class="small-margin"
 	              oncommand="noteSelectionChange('fcc_selectFolder')" 
 		      flex="1" observes="broadcaster_doFcc"/>
           </row>
@@ -83,93 +79,89 @@
       </grid>
     </radiogroup>
 
-    <hbox autostretch="never">
+    <hbox align="center">
       <checkbox wsm_persist="true" id="identity.bccSelf" before="&bccAccount.label; &lt;" after="&gt;"
-                pref="true" preftype="bool" prefattribute="value"
+                prefattribute="value"
                 prefstring="mail.identity.%identitykey%.bcc_self"/>
     </hbox>
     
-    <hbox autostretch="never">
+    <hbox align="center">
       <checkbox wsm_persist="true" id="identity.bccOthers" label="&bccAddress.label;"
-                pref="true" preftype="bool" prefattribute="value"
+                prefattribute="value"
                 prefstring="mail.identity.%identitykey%.bcc_other"/>
       <textbox wsm_persist="true" id="identity.bccList" flex="1"
-               pref="true" preftype="string" prefattribute="value"
+               preftype="string"
                prefstring="mail.identity.%identitykey%.bcc_other_list"/>
     </hbox>
 
   </groupbox>
   
-  <groupbox orient="vertical" class="small-margin">
+  <groupbox>
     <caption label="&specialFoldersTitle.label;"/>
 
-    <hbox autostretch="never">
-      <text class="label" value="&keepDrafts.label;"/>
+    <hbox align="center">
+      <label value="&keepDrafts.label;"/>
     </hbox>
     
-    <radiogroup id="messageDrafts" orient="vertical">
+    <radiogroup id="messageDrafts">
       <grid class="specialFolderPickerGrid">
         <columns>
           <column flex="1"/>
           <column flex="2"/>
         </columns>
         <rows>
-          <row autostretch="never">
-            <radio group="messageDrafts" id="draft_selectAccount" 
+          <row align="center">
+            <radio id="draft_selectAccount" 
                    oncommand="setPickersState('msgDraftsAccountPicker', 'msgDraftsFolderPicker', event)"
                    value="0" label="&draftsFolderOn.label;"/>
  	    <menulist id="msgDraftsAccountPicker" 
-                      class="small-margin"
 	              oncommand="noteSelectionChange('draft_selectAccount')"
                       flex="1"/>
           </row> 
-          <row autostretch="never">
-            <radio group="messageDrafts" id="draft_selectFolder" 
+          <row align="center">
+            <radio id="draft_selectFolder" 
                    oncommand="setPickersState('msgDraftsFolderPicker', 'msgDraftsAccountPicker', event)"
                    value="1" label="&otherFolder.label;"/>
   	    <menulist id="msgDraftsFolderPicker"
-                      class="small-margin"
                       oncommand="noteSelectionChange('draft_selectFolder')" 
                       flex="1"/>
           </row>
         </rows>
       </grid>
     </radiogroup>
-    <hbox autostretch="never">
-      <text class="label" value="&keepTempltes.label;"/>
+    <hbox align="center">
+      <label value="&keepTempltes.label;"/>
     </hbox>
 	
-    <radiogroup id="messageTemplates" orient="vertical">
+    <radiogroup id="messageTemplates">
       <grid class="specialFolderPickerGrid">
         <columns>
           <column flex="1"/>
           <column flex="2"/>
         </columns>
         <rows>
-          <row autostretch="never">
-            <radio group="messageTemplates" id="tmpl_selectAccount" 
+          <row align="center">
+            <radio id="tmpl_selectAccount" 
                    oncommand="setPickersState('msgStationeryAccountPicker', 'msgStationeryFolderPicker', event)"
                    value="0" label="&templatesFolderOn.label;"/>
   	    <menulist id="msgStationeryAccountPicker"
-                      class="small-margin"
                       oncommand="noteSelectionChange('tmpl_selectAccount')" 
                       flex="1"/>
           </row> 
-          <row autostretch="never">
-            <radio group="messageTemplates" id="tmpl_selectFolder" 
+          <row align="center">
+            <radio id="tmpl_selectFolder" 
                    oncommand="setPickersState('msgStationeryFolderPicker', 'msgStationeryAccountPicker', event)"
                   value="1" label="&otherFolder.label;"/>
             <menulist id="msgStationeryFolderPicker"
-                      class="small-margin"
                       oncommand="noteSelectionChange('tmpl_selectFolder')" 
                       flex="1"/>
           </row>
         </rows>
       </grid>
     </radiogroup>
-    <hbox autostretch="never">
+    <hbox align="center">
       <checkbox wsm_persist="true" id="identity.showSaveMsgDlg" label="&saveMessageDlg.label;"
-                pref="true" preftype="bool" prefattribute="value"
+                prefattribute="value"
                 prefstring="mail.identity.%identitykey%.showSaveMsgDlg"/>
     </hbox>
   </groupbox>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-identity-advanced.xul b/mozilla/mailnews/base/prefs/resources/content/am-identity-advanced.xul
index 695915e7b8b..d046b059fb4 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-identity-advanced.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-identity-advanced.xul
@@ -30,15 +30,14 @@
 <page
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&identityAdvanced.label;"
-  orient="vertical"
   onload="onLoad();">
 
   <script type="application/x-javascript" src="am-identity-advanced.js"/>
   
-  <html style="width: 20em; ">&smtpDesc.label;</html>
+  <description style="width: 20em; ">&smtpDesc.label;</description>
   <separator class="thin"/>
-  <hbox autostretch="never">
-    <text value="&smtpName.label;" class="label" for="smtpServerList"/>
+  <hbox align="center">
+    <label value="&smtpName.label;" control="smtpServerList"/>
     <menulist datasources="rdf:smtp"
               containment="http://home.netscape.com/NC-rdf#child"
               ref="NC:smtpservers"
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul b/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul
index bd9bd6787b6..92f3d9853db 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul
@@ -6,19 +6,17 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-imap-advanced.dtd" >
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       style="padding: 10px"
       title="&imapAdvanced.label;"
-      onload="onLoad();"
-      orient="vertical">
+      onload="onLoad();">
 
 <keyset id="dialogKeys"/>
 
 <script src="am-imap-advanced.js"/>
 
 <hbox>
-  <text value="&serverDirectory.label;" class="label"/>
+  <label value="&serverDirectory.label;"/>
   <textbox imap_persist="true" id="serverDirectory"/>
 </hbox>
 
@@ -28,7 +26,7 @@
 
 <separator class="groove"/>
 
-<html>&namespaceDesc.label;</html>
+<description>&namespaceDesc.label;</description>
 <grid>
   <columns>
     <column/>
@@ -38,17 +36,17 @@
   <rows>
     <row>
       <separator class="indent"/>
-      <text for="personalNamespace" class="label" value="&personalNamespace.label;"/>
+      <label control="personalNamespace" value="&personalNamespace.label;"/>
       <textbox imap_persist="true" id="personalNamespace" />
     </row>
     <row>
       <separator class="indent"/>
-      <text for="publicNamespace" class="label" value="&publicNamespace.label;"/>
+      <label control="publicNamespace" value="&publicNamespace.label;"/>
       <textbox imap_persist="true" id="publicNamespace"/>
     </row>
     <row>
       <separator class="indent"/>
-      <text for="otherUsersNamespace" class="label" value="&otherUsersNamespace.label;"/>
+      <label control="otherUsersNamespace" value="&otherUsersNamespace.label;"/>
       <textbox imap_persist="true" id="otherUsersNamespace"/>
     </row>
   </rows>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-main.xul b/mozilla/mailnews/base/prefs/resources/content/am-main.xul
index 8c2e94b8ae5..38f7714ac3a 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-main.xul
@@ -6,30 +6,26 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-main.dtd" >
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      flex="1"
-      onload="parent.onPanelLoaded('am-main.xul');"
-      orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.onPanelLoaded('am-main.xul');">
 
     <stringbundle id="bundle_prefutilities" src="chrome://communicator/locale/pref/prefutilities.properties"/>
     <script type="application/x-javascript" src="chrome://messenger/content/am-main.js"/>
 
     <hbox class="box-smallheader" title="&accountTitle.label;"/>
     
-    <html>&accountSettingsDesc.label;</html>
-    <hbox autostretch="never">
-      <text class="label" value="&accountName.label;" for="server.prettyName"/>
-      <textbox wsm_persist="true" size="30" id="server.prettyName" flex="1"
-               pref="true" preftype="string" prefattribute="value"
+    <description>&accountSettingsDesc.label;</description>
+    <hbox align="center">
+      <label value="&accountName.label;" control="server.prettyName"/>
+      <textbox wsm_persist="true" size="30" id="server.prettyName"
                prefstring="mail.server.%serverkey%.name"/>
     </hbox>
     
     <separator class="thin"/>
     
-    <groupbox orient="vertical" flex="1" style="width: 20em !important;">
+    <groupbox flex="1" style="width: 20em !important;">
       <caption label="&identityTitle.label;"/>
-      <html>&identityDesc.label;</html>
+      <description>&identityDesc.label;</description>
       <separator class="thin"/>
       <grid flex="1">
         <columns>
@@ -37,54 +33,48 @@
           <column flex="1"/>
         </columns>
         <rows>
-          <row autostretch="never">
-            <text class="label" value="&name.label;" for="identity.fullName"/>
+          <row align="center">
+            <label value="&name.label;" control="identity.fullName"/>
             <textbox wsm_persist="true" id="identity.fullName" size="30"
-                     pref="true" preftype="string" prefattribute="value"
                      prefstring="mail.identity.%identitykey%.fullName"/>
           </row>
-          <row autostretch="never">
-            <text class="label" value="&email.label;" for="identity.email"/>
+          <row align="center">
+            <label value="&email.label;" control="identity.email"/>
             <textbox wsm_persist="true" id="identity.email" 
-                     pref="true" preftype="string" prefattribute="value"
                      prefstring="mail.identity.%identitykey%.useremail"/>
           </row>
-          <row autostretch="never">
-            <text class="label" value="&replyTo.label;" for="identity.replyTo"/>
+          <row align="center">
+            <label value="&replyTo.label;" control="identity.replyTo"/>
             <textbox wsm_persist="true" id="identity.replyTo"
-                     pref="true" preftype="string" prefattribute="value"
                      prefstring="mail.identity.%identitykey%.reply_to"/>
           </row>
-          <row autostretch="never">
-            <text class="label" value="&organization.label;" for="identity.organization"/>
+          <row align="center">
+            <label value="&organization.label;" control="identity.organization"/>
             <textbox wsm_persist="true" id="identity.organization"
-                     pref="true" preftype="string" prefattribute="value"
                      prefstring="mail.identity.%identitykey%.organization"/>
           </row>
         </rows>
       </grid>
 
-      <hbox autostretch="never">
+      <hbox align="center">
         <checkbox wsm_persist="true" id="identity.attachSignature" label="&signature.label;" flex="1"
-                  pref="true" preftype="bool" prefattribute="value"
+                  prefattribute="value"
                   prefstring="mail.identity.%identitykey%.attach_signature"/>
       </hbox>
-      <hbox autostretch="never" class="indent">
-        <textbox wsm_persist="true" id="identity.signature" datatype="nsILocalFile" flex="1" name="identity.signature"
-                 pref="true" preftype="string" prefattribute="value"
+      <hbox align="center" class="indent">
+        <textbox wsm_persist="true" id="identity.signature" datatype="nsILocalFile" name="identity.signature"
                  prefstring="mail.identity.%identitykey%.sig_file"/>
-        <button class="dialog push" name="browse" type="button" label="&choose.label;"  
+        <button class="push" name="browse" label="&choose.label;"  
                 oncommand="selectFile()"
                 wsm_persist="true" id="identity.sigbrowsebutton"
-                pref="true" preftype="bool" prefattribute="disabled"
                 prefstring="mail.identity.%identitykey%.sigbrowse.disable"/>
       </hbox>
 
       <separator class="thin"/>
       
-      <hbox autostretch="never">
+      <hbox align="center">
         <checkbox wsm_persist="true" id="identity.composeHtml" label="&useHtml.label;"
-                  pref="true" preftype="bool" prefattribute="value"
+                  prefattribute="value"
                   prefstring="mail.identity.%identitykey%.compose_html"/>
       </hbox>
 
@@ -94,9 +84,8 @@
         <spacer flex="1"/>
         <button oncommand="onAdvanced();" label="&advancedButton.label;"
                 wsm_persist="true" id="identity.advancedbutton"
-                pref="true" preftype="bool" prefattribute="disabled"
                 prefstring="mail.identity.%identitykey%.advanced.disable"/>
-        <text hidden="true" wsm_persist="true" id="identity.smtpServerKey" />
+        <label hidden="true" wsm_persist="true" id="identity.smtpServerKey" />
       </hbox>
 
     </groupbox>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-offline.xul b/mozilla/mailnews/base/prefs/resources/content/am-offline.xul
index c5834da8a7f..0aa3c03e042 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-offline.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-offline.xul
@@ -30,9 +30,7 @@ Contributors:
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-offline.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      xmlns:html="http://www.w3.org/1999/xhtml"
-      onload="parent.onPanelLoaded('am-offline.xul');"
-      orient="vertical">
+      onload="parent.onPanelLoaded('am-offline.xul');">
  
     <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/> 
 
@@ -44,15 +42,15 @@ Contributors:
     <broadcaster id="bc_keepMsg"/>
     <broadcaster id="bc_removeBody"/>
 
-    <text hidden="true" wsm_persist="true" id="server.type"/>  
+    <label hidden="true" wsm_persist="true" id="server.type"/>  
 
     <hbox id="headertitle" class="box-smallheader"/>
 
-    <groupbox orient="vertical" id="offline.titlebox"  hidable="true" hidefor="pop3">
+    <groupbox id="offline.titlebox"  hidable="true" hidefor="pop3">
       <caption label="&offlineGroupTitle.label;"/>
 
-    <html iscontrolcontainer="true" hidable="true" hidefor="pop3,nntp">&offlineImapDesc.label;</html>
-    <html iscontrolcontainer="true" hidable="true" hidefor="pop3,imap">&offlineNntpDesc.label;</html>
+    <description iscontrolcontainer="true" hidable="true" hidefor="pop3,nntp">&offlineImapDesc.label;</description>
+    <description iscontrolcontainer="true" hidable="true" hidefor="pop3,imap">&offlineNntpDesc.label;</description>
 
     <checkbox iscontrolcontainer="true" hidable="true" hidefor="pop3,nntp" 
               id="offline.downloadBodiesOnGetNewMail" wsm_persist="true" 
@@ -65,7 +63,7 @@ Contributors:
 
     <separator class="thin" hidable="true" hidefor="pop3,nntp"/>
 
-    <html iscontrolcontainer="true" hidable="true" hidefor="pop3,nntp">&selectButtonDesc.label;</html>
+    <description iscontrolcontainer="true" hidable="true" hidefor="pop3,nntp">&selectButtonDesc.label;</description>
 
     <hbox iscontrolcontainer="true" hidable="true" hidefor="pop3" align="right">
         <button label="&offlineSelect.label;" oncommand="onClickSelect()" id="selectFolderButton"/>
@@ -74,42 +72,42 @@ Contributors:
     </groupbox>    
     
     <separator class="thin"/>
-    <groupbox orient="vertical" id="diskspace.titlebox">
+    <groupbox id="diskspace.titlebox">
       <caption label="&diskspaceGroupTitle.label;"/>
 
-    <html iscontrolcontainer="true" hidable="true" hidefor="pop3">&offlineMsg.label;</html>
-    <html iscontrolcontainer="true" hidable="true" hidefor="imap,nntp">&offlinePopDesc.label;</html>
+    <description iscontrolcontainer="true" hidable="true" hidefor="pop3">&offlineMsg.label;</description>
+    <description iscontrolcontainer="true" hidable="true" hidefor="imap,nntp">&offlinePopDesc.label;</description>
 
-    <hbox autostretch="never" align="center">
+    <hbox align="center">
         <checkbox  wsm_persist="true" id="offline.notDownload"
             label="&offlineNotDownload.label;" accesskey="&offlineNotDownload.accesskey;" oncommand="onCheckItem('bc_notDownload', 'offline.notDownload');"/>
         <textbox wsm_persist="true" id="offline.notDownloadMin" size="5" value="50"  observes="bc_notDownload"/> 
-        <text class="label" value="&kb.label;"/>
+        <label value="&kb.label;"/>
     </hbox>
         
     <checkbox iscontrolcontainer="true" hidable="true" hidefor="pop3,imap" 
          wsm_persist="true" id="nntp.downloadUnread" label="&nntpDownloadUnread.label;" accesskey="&nntpDownloadUnread.accesskey;"/>
-    <hbox iscontrolcontainer="true" align="center" hidable="true" hidefor="pop3,imap" autostretch="never">
+    <hbox iscontrolcontainer="true" align="center" hidable="true" hidefor="pop3,imap">
         <checkbox wsm_persist="true" id="nntp.downloadMsg" label="&nntpDownloadMsg.label;" accesskey="&nntpDownloadMsg.accesskey;" oncommand="onCheckItem('bc_downloadMsg', 'nntp.downloadMsg');"/>
         <textbox wsm_persist="true" id="nntp.downloadMsgMin" size="5" value="30" observes="bc_downloadMsg"/>
-        <text class="label" value="&daysAgo.label;"/>
+        <label value="&daysAgo.label;"/>
     </hbox>
 
     <separator/>
-    <vbox iscontrolcontainer="true" hidable="true" hidefor="pop3,imap"  autostretch="never">  
-    <html class="desc">&nntpCleanup.label;</html>
+    <vbox iscontrolcontainer="true" hidable="true" hidefor="pop3,imap" align="start">  
+    <description class="desc">&nntpCleanup.label;</description>
 
-    <radiogroup orient="vertical"  wsm_persist="true" id="nntp.keepMsg" pref="true" preftype="int" prefattribute="data">
+    <radiogroup wsm_persist="true" id="nntp.keepMsg">
         <hbox flex="1" align="center">
-            <radio group="nntp.keepMsg" wsm_persist="true" id="nntp.keepOldMsg" data="2" label="&nntpKeepMsg.label;" oncommand="onCheckKeepMsg();"/>
+            <radio wsm_persist="true" id="nntp.keepOldMsg" value="2" label="&nntpKeepMsg.label;" oncommand="onCheckKeepMsg();"/>
             <textbox wsm_persist="true" id="nntp.keepOldMsgMin" size="5" value="30" observes="bc_keepMsg"/>
-            <text class="label" value="&days.label;"/>
+            <label value="&days.label;"/>
         </hbox>
-        <radio group="nntp.keepMsg" wsm_persist="true" id="nntp.keepAllMsg" data="1" label="&nntpKeepAll.label;" oncommand="onCheckKeepMsg();"/>
+        <radio wsm_persist="true" id="nntp.keepAllMsg" value="1" label="&nntpKeepAll.label;" oncommand="onCheckKeepMsg();"/>
         <hbox flex="1" align="center">
-            <radio group="nntp.keepMsg" wsm_persist="true" id="nntp.keepNewMsg" data="3" label="&nntpKeepNew.label;" oncommand="onCheckKeepMsg();"/>
+            <radio wsm_persist="true" id="nntp.keepNewMsg" value="3" label="&nntpKeepNew.label;" oncommand="onCheckKeepMsg();"/>
             <textbox wsm_persist="true" id="nntp.keepNewMsgMin" size="5" value="30" observes="bc_keepMsg"/>
-            <text class="label" value="&message.label;"/>
+            <label value="&message.label;"/>
         </hbox>
     </radiogroup>
 
@@ -117,7 +115,7 @@ Contributors:
     <hbox flex="1" align="center">
         <checkbox wsm_persist="true" id="nntp.removeBody" label="&nntpRemoveBody.label;" oncommand="onCheckItem('bc_removeBody','nntp.removeBody');"/>
         <textbox wsm_persist="true" id="nntp.removeBodyMin" size="5" value="30" observes="bc_removeBody"/>
-        <text class="label" value="&days.label;"/>
+        <label value="&days.label;"/>
     </hbox>
     </vbox>
     </groupbox>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-prefs.js b/mozilla/mailnews/base/prefs/resources/content/am-prefs.js
index 9bbdcacd07a..9327b01ef3d 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-prefs.js
+++ b/mozilla/mailnews/base/prefs/resources/content/am-prefs.js
@@ -87,10 +87,9 @@ function getAccountValueIsLocked(element)
     nsPrefBranch = prefService.getBranch(null);
   }
 
-
-  if (element.getAttribute("pref") == "true" ) {
+  var prefstring = element.getAttribute("prefstring");
+  if (prefstring) {
     preftype    = element.getAttribute("preftype");
-    prefstring  = element.getAttribute("prefstring");
     prefstr = substPrefTokens(prefstring, element);
     // see if the prefstring is locked
     if (prefstr) {
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-server-top.xul b/mozilla/mailnews/base/prefs/resources/content/am-server-top.xul
index f80e13c7908..43695d28385 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-server-top.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-server-top.xul
@@ -4,8 +4,6 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 </page>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-server.xul b/mozilla/mailnews/base/prefs/resources/content/am-server.xul
index 4a7708d1e6a..d7b76c775a3 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-server.xul
@@ -32,9 +32,7 @@ Contributors:
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      xmlns:html="http://www.w3.org/1999/xhtml"
-      onload="parent.onPanelLoaded('am-server.xul');"
-      orient="vertical">
+      onload="parent.onPanelLoaded('am-server.xul');">
 
   <script type="application/x-javascript" src="chrome://messenger/content/am-server.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
@@ -42,7 +40,7 @@ Contributors:
 
   <broadcaster id="broadcaster_doBiff"/>
   
-  <text hidden="true" wsm_persist="true" id="server.type"/>
+  <label hidden="true" wsm_persist="true" id="server.type"/>
 
   <hbox class="box-smallheader" title="&serverSettings.label;"/>
 
@@ -52,35 +50,33 @@ Contributors:
       <column/>
     </columns>
     <rows>      
-      <row autostretch="never">
-        <text class="label" value="&serverType.label;"/>
-        <text class="label" id="servertype.verbose"/>
+      <row align="center">
+        <label value="&serverType.label;"/>
+        <label id="servertype.verbose"/>
       </row>
-      <row autostretch="never">
-            <text class="label" value="&serverName.label;"/>
+      <row align="center">
+            <label value="&serverName.label;"/>
             <textbox wsm_persist="true" size="25" id="server.realHostName"
-                  pref="true" preftype="string" prefattribute="value"
-                  prefstring="mail.server.%serverkey%.realhostname"/>
+                     prefstring="mail.server.%serverkey%.realhostname"/>
       </row>
-      <row autostretch="never">
-        <hbox iscontrolcontainer="true" autostretch="never">
-            <text hidable="true" hidefor="nntp" class="label" id="userNameLabel" 
+      <row align="center">
+        <hbox iscontrolcontainer="true" align="center">
+            <label hidable="true" hidefor="nntp" id="userNameLabel" 
                   value="&userName.label;"/>
         </hbox>
-        <hbox iscontrolcontainer="true" autostretch="never">
+        <hbox iscontrolcontainer="true" align="center">
             <textbox hidable="true" hidefor="nntp" wsm_persist="true"
                      size="25" id="server.realUsername"
-                     pref="true" preftype="string" prefattribute="value"
                      prefstring="mail.server.%serverkey%.realusername"/>
         </hbox>
       </row>
       <row>
-        <hbox autostretch="never">
-            <text class="label" value="&port.label;"/>
+        <hbox align="center">
+            <label value="&port.label;"/>
         </hbox>
-        <hbox autostretch="never">
-            <textbox autostretch="never" wsm_persist="true" size="5" id="server.port"
-                     pref="true" preftype="int" prefattribute="value"
+        <hbox align="center">
+            <textbox wsm_persist="true" size="5" id="server.port"
+                     preftype="int"
                      prefstring="mail.server.%serverkey%.port"/>
         </hbox>
       </row>
@@ -94,52 +90,51 @@ Contributors:
   <vbox flex="1">
   <checkbox iscontrolcontainer="true" wsm_persist="true" id="server.isSecure"
             label="&isSecure.label;" oncommand="secureSelect();"
-            pref="true" preftype="bool" prefattribute="value"
+            prefattribute="value"
             prefstring="mail.server.%serverkey%.isSecure"/>
   <checkbox iscontrolcontainer="true" hidable="true" wsm_persist="true"
             id="server.loginAtStartUp" hidefor="nntp"
             label="&loginAtStartup.label;"
-            pref="true" preftype="bool" prefattribute="value"
+            prefattribute="value"
             prefstring="mail.server.%serverkey%.login_at_startup"/>
 <!--
   <checkbox iscontrolcontainer="true" hidable="true" wsm_persist="true" id="server.rememberPassword" hidefor="nntp"
             value="&savePassword.label;"/>
 -->
-  <hbox autostretch="never" align="center">
+  <hbox align="center">
     <checkbox wsm_persist="true" id="server.doBiff" label="&biffStart.label;"
               oncommand="setupBiffUI();"
-              pref="true" preftype="bool" prefattribute="value"
+              prefattribute="value"
               prefstring="mail.server.%serverkey%.check_new_mail"/>
     <textbox wsm_persist="true" id="server.biffMinutes" size="3" 
              observes="broadcaster_doBiff"
-             pref="true" preftype="int" prefattribute="value"
+             preftype="int"
              prefstring="mail.server.%serverkey%.check_time"/>
-    <text class="label" id="biffEnd" for="server.biffMinutes" value="&biffEnd.label;"
+    <label id="biffEnd" control="server.biffMinutes" value="&biffEnd.label;"
            observes="broadcaster_doBiff"/>
   </hbox>
   <!-- POP3 -->
-  <vbox iscontrolcontainer="true" autostretch="never">
+  <vbox iscontrolcontainer="true" align="start">
     <checkbox hidable="true" class="indent" hidefor="imap,nntp"
               wsm_persist="true" id="server.downloadOnBiff"
               label="&downloadOnBiff.label;" observes="broadcaster_doBiff"
-              pref="true" preftype="bool" prefattribute="value"
+              prefattribute="value"
               prefstring="mail.server.%serverkey%.download_on_biff"/>
 
     <checkbox wsm_persist="true" id="pop3.leaveMessagesOnServer"
               label="&leaveOnServer.label;" oncommand="setupMailOnServerUI();"
-              pref="true" preftype="bool" prefattribute="value"
+              prefattribute="value"
               prefstring="mail.server.%serverkey%.leave_on_server"/>
 
     <checkbox wsm_persist="true" id="pop3.deleteMailLeftOnServer" class="indent"
               label="&deleteOnServer.label;"
-              pref="true" preftype="bool" prefattribute="value"
+              prefattribute="value"
               prefstring="mail.server.%serverkey%.delete_mail_left_on_server"/>
   </vbox>
   <!-- IMAP -->
-  <hbox iscontrolcontainer="true" autostretch="never">
-    <text class="label" value="&deleteMessagePrefix.label;"/>
+  <hbox iscontrolcontainer="true" align="center">
+    <label value="&deleteMessagePrefix.label;"/>
     <menulist hidable="true" hidefor="pop3,nntp" wsm_persist="true" id="imap.deleteModel"
-              pref="true" preftype="int" prefattribute="value"
               prefstring="mail.server.%serverkey%.delete_model">
       <menupopup>
         <menuitem value="1" label="&modelMoveToTrash.label;"/>
@@ -153,11 +148,11 @@ Contributors:
 
   <checkbox hidable="true" hidefor="pop3,nntp" wsm_persist="true" id="imap.cleanupInboxOnExit"
             label="&expungeOnExit.label;" iscontrolcontainer="true"
-            pref="true" preftype="bool" prefattribute="value"
+            prefattribute="value"
             prefstring="mail.server.%serverkey%.cleanup_inbox_on_exit"/>
   <checkbox hidable="true" hidefor="nntp" wsm_persist="true" id="server.emptyTrashOnExit" 
             label="&emptyTrashOnExit.label;" iscontrolcontainer="true"
-            pref="true" preftype="bool" prefattribute="value"
+            prefattribute="value"
             prefstring="mail.server.%serverkey%.empty_trash_on_exit"/>
 
   <hbox iscontrolcontainer="true" flex="1">
@@ -166,22 +161,21 @@ Contributors:
       <button label="&advancedButton.label;"
               oncommand="openImapAdvanced(event);"
               wsm_persist="true" id="server.advancedbutton" 
-              pref="true" preftype="bool" prefattribute="disabled" 
               prefstring="mail.server.%serverkey%.advanced.disable"/>
     </hbox>
 
     <checkbox hidable="true" hidefor="pop3,nntp" hidden="true" wsm_persist="true" id="imap.dualUseFolders"
-              pref="true" preftype="bool" prefattribute="value"
+              prefattribute="value"
               prefstring="mail.server.%serverkey%.dual_use_folders"/>
     <checkbox hidden="true" wsm_persist="true" id="imap.usingSubscription"
-              pref="true" preftype="bool" prefattribute="value"
+              prefattribute="value"
               prefstring="mail.server.%serverkey%.using_subscription"/>
-    <text hidden="true" wsm_persist="true" id="imap.personalNamespace"/>
-    <text hidden="true" wsm_persist="true" id="imap.publicNamespace"/>
-    <text hidden="true" wsm_persist="true" id="imap.otherUsersNamespace"/>
-    <text hidden="true" wsm_persist="true" id="imap.serverDirectory"/>
+    <label hidden="true" wsm_persist="true" id="imap.personalNamespace"/>
+    <label hidden="true" wsm_persist="true" id="imap.publicNamespace"/>
+    <label hidden="true" wsm_persist="true" id="imap.otherUsersNamespace"/>
+    <label hidden="true" wsm_persist="true" id="imap.serverDirectory"/>
     <checkbox hidden="true" wsm_persist="true" id="imap.overrideNamespaces"
-              pref="true" preftype="bool" prefattribute="value"
+              prefattribute="value"
               prefstring="mail.server.%serverkey%.override_namespaces"/>
   </hbox>
 
@@ -189,25 +183,25 @@ Contributors:
   <hbox iscontrolcontainer="true">
     <checkbox hidable="true" hidefor="pop3,imap" wsm_persist="true" id="nntp.notifyOn"
               label="&maxMessagesStart.label;"
-              pref="true" preftype="bool" prefattribute="value"
+              prefattribute="value"
               prefstring="mail.server.%serverkey%.notify.on"/>
-    <hbox iscontrolcontainer="true" autostretch="never">
+    <hbox iscontrolcontainer="true" align="center">
       <textbox wsm_persist="true" id="nntp.maxArticles" size="6"
-               pref="true" preftype="int" prefattribute="value"
+               preftype="int"
                prefstring="mail.server.%serverkey%.max_articles"/>
-      <text class="label" for="nntp.maxArticles" value="&maxMessagesEnd.label;"/>
+      <label control="nntp.maxArticles" value="&maxMessagesEnd.label;"/>
     </hbox>
   </hbox>
 <!-- take out for now - bug 45079
     <hbox iscontrolcontainer="true" flex="100%">
-      <groupbox orient="vertical">
-         <caption class="header label" label="&abbreviate.label;"/>
+      <groupbox>
+         <caption class="header" label="&abbreviate.label;"/>
 
-         <radiogroup hidable="true" hidefor="pop3,imap" orient="vertical" wsm_persist="true"
+         <radiogroup hidable="true" hidefor="pop3,imap" wsm_persist="true"
                      id="nntp.abbreviate">
-           <radio group="nntp.abbreviate" wsm_persist="true" value="true"
+           <radio wsm_persist="true" value="true"
                   label="&abbreviateOn.label;"/>
-           <radio group="nntp.abbreviate" wsm_persist="true" value="false" 
+           <radio wsm_persist="true" value="false" 
                   label="&abbreviateOff.label;"/>
          </radiogroup>
       </groupbox>
@@ -215,20 +209,18 @@ Contributors:
 -->
 
   <vbox iscontrolcontainer="true">
-    <text class="label" value="&newsrcFilePath.label;" for="nntp.newsrcFilePath"/>
+    <label value="&newsrcFilePath.label;" control="nntp.newsrcFilePath"/>
     <textbox hidable="true" hidefor="imap,pop3" wsm_persist="true" id="nntp.newsrcFilePath"
                datatype="nsIFileSpec"
-               pref="true" preftype="string" prefattribute="value"
                prefstring="mail.server.%serverkey%.newsrc.file"/>
   </vbox>
   </vbox>
   </groupbox>
   <spacer flex="100%"/>
     <vbox>
-    <text class="label" value="&localPath.label;" for="server.localPath"/>
+    <label value="&localPath.label;" control="server.localPath"/>
     <textbox wsm_persist="true" id="server.localPath"
             datatype="nsIFileSpec"
-            pref="true" preftype="string" prefattribute="value"
             prefstring="mail.server.%serverkey%.directory"/>
     </vbox>
 </page>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul b/mozilla/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
index 56c8ec72957..17aa317f41f 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
@@ -7,34 +7,30 @@
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      xmlns:html="http://www.w3.org/1999/xhtml"
-      onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');"
-      orient="vertical">
+      onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');">
 
   <script src="chrome://messenger/content/am-serverwithnoidentities.js"/>
 
   <hbox class="box-smallheader" title="&accountTitle.label;"/>
 
-  <html class="secDesc">&accountSettingsDesc.label;</html>
+  <description class="secDesc">&accountSettingsDesc.label;</description>
   <grid>
     <columns>
       <column flex="1"/>
       <column flex="2"/>
     </columns>
     <rows>
-      <row  autostretch="never">
-        <text class="label" value="&accountName.label;" for="server.prettyName"/>
+      <row align="center">
+        <label value="&accountName.label;" control="server.prettyName"/>
         <textbox wsm_persist="true" size="30" id="server.prettyName"
-                 pref="true" preftype="string" prefattribute="value"
                  prefstring="mail.server.%serverkey%.name"/>
       </row>
     </rows>
   </grid>
   <spacer flex="1"/>
   <vbox>
-    <text value="&localPath.label;"/>
+    <label value="&localPath.label;"/>
     <textbox wsm_persist="true" size="60" id="server.localPath" datatype="nsIFileSpec"
-             pref="true" preftype="string" prefattribute="value"
              prefstring="mail.server.%serverkey%.directory"/>
   </vbox>
 </page>
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-smtp.xul b/mozilla/mailnews/base/prefs/resources/content/am-smtp.xul
index b581d552ad6..facb456a996 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-smtp.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-smtp.xul
@@ -7,19 +7,16 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  flex="100%"
-  onload="onLoad();"
-  orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="onLoad();">
 
   <script type="application/x-javascript" src="am-smtp.js"/>
 
   <hbox class="box-smallheader" title="&smtpServer.label;"/>
 
-  <groupbox orient="vertical">
+  <groupbox>
 
-  <html>&smtpDesc.label;</html>
+  <description>&smtpDesc.label;</description>
 
   <separator/>
 
@@ -31,7 +28,6 @@
     <spacer flex="1"/>
     <button label="&advanced.label;" oncommand="onAdvanced(event);"
             wsm_persist="true" id="smtp.advancedbutton" 
-            pref="true" preftype="bool" prefattribute="disabled" 
             prefstring="mail.smtpserver.%serverkey%.advanced.disable"/>
   </hbox>
   
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-accname.xul b/mozilla/mailnews/base/prefs/resources/content/aw-accname.xul
index 4c2c9b2e68b..b9709d04ff3 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-accname.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-accname.xul
@@ -26,9 +26,7 @@ Rights Reserved.
 
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-accname.dtd" >
-<page id="accnamepage" 
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical"
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.wizardManager.onPageLoad('accname');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
@@ -40,10 +38,10 @@ Rights Reserved.
   <separator/>
   
   <vbox class="box-wizardcontent" flex="1">
-    <html>&accnameDesc.label;</html>
+    <description>&accnameDesc.label;</description>
     <separator class="thin"/>
-    <hbox autostretch="never">
-      <text class="label" value="&accnameLabel.label;" for="prettyName" style="width: 8em;"/>
+    <hbox align="center">
+      <label value="&accnameLabel.label;" control="prettyName" style="width: 8em;"/>
       <textbox id="prettyName" size="40" wsm_persist="true" flex="1"/>
     </hbox>
   </vbox>
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-accounttype.xul b/mozilla/mailnews/base/prefs/resources/content/aw-accounttype.xul
index 8dd8d4471da..8333c85f819 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-accounttype.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-accounttype.xul
@@ -28,8 +28,7 @@ Rights Reserved.
 <page id="accounttype" 
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:nc="http://home.netscape.com/NC-rdf#"
-    onload="dump('** acctype onload\n'); parent.wizardManager.onPageLoad('accounttype');"
-    orient="vertical"
+    onload="parent.wizardManager.onPageLoad('accounttype');"
     onunload="onUnload();">
 
   <script src="aw-accounttype.js"/>
@@ -40,12 +39,11 @@ Rights Reserved.
   
   <vbox class="box-wizardcontent" flex="1">
 
-    <html class="desc">&accountTypeDesc.label;</html>
-    <html class="desc">&accountTypeDirections.label;</html>
+    <description class="desc">&accountTypeDesc.label;</description>
+    <description class="desc">&accountTypeDirections.label;</description>
     <separator/>
-    <radiogroup orient="vertical" 
-                name="acctyperadio" id="acctyperadio" >
-      <radio id="mailaccount" group="acctyperadio" value="mailaccount"
+    <radiogroup name="acctyperadio" id="acctyperadio" >
+      <radio id="mailaccount" value="mailaccount"
              wsm_persist="true"
              label="&accountTypeMail.label;"/>
   
@@ -55,14 +53,13 @@ Rights Reserved.
            ref="NC:ispinfo">
         <template>
           <rule nc:wizardShow="true">
-            <radio group="acctyperadio" uri="..."
-                      wsm_persist="true"
-                      value="rdf:http://home.netscape.com/NC-rdf#wizardShortName"
-                      label="rdf:http://home.netscape.com/NC-rdf#wizardLongName"/>
+            <radio uri="..." wsm_persist="true"
+                   value="rdf:http://home.netscape.com/NC-rdf#wizardShortName"
+                   label="rdf:http://home.netscape.com/NC-rdf#wizardLongName"/>
           </rule>
        </template>
       </vbox>
-      <radio group="acctyperadio" id="newsaccount" value="newsaccount"
+      <radio descriptionid="newsaccount" value="newsaccount"
              wsm_persist="true"
              label="&accountTypeNews.label;"/>
     </radiogroup>
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-done.xul b/mozilla/mailnews/base/prefs/resources/content/aw-done.xul
index 0a7207c9857..cf91278ed88 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-done.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-done.xul
@@ -26,7 +26,6 @@ Rights Reserved.
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-done.dtd" >
 <page id="done" 
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical"
       onload="parent.wizardManager.onPageLoad('done');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
@@ -38,7 +37,7 @@ Rights Reserved.
   
   <vbox class="box-wizardcontent" flex="1">
 
-    <html>&completionText.label;</html>
+    <description>&completionText.label;</description>
 
     <separator class="thin"/>
 
@@ -48,42 +47,42 @@ Rights Reserved.
         <column flex="1"/>
       </columns>
       <rows>
-        <row autostretch="never" id="account.name">
-          <text class="label" flex="1" id="account.name.label" value="&accountNamePrefix.label;"/>
-          <text class="label" id="account.name.text"/>
+        <row align="center" id="account.name">
+          <label flex="1" id="account.name.label" value="&accountNamePrefix.label;"/>
+          <label id="account.name.text"/>
         </row>
-        <row autostretch="never" id="server.username">
-          <text class="label" flex="1" id="server.username.label" value="&userNamePrefix.label;"/>
-          <text class="label" id="server.username.text"/>
+        <row align="center" id="server.username">
+          <label flex="1" id="server.username.label" value="&userNamePrefix.label;"/>
+          <label id="server.username.text"/>
         </row>
-        <row autostretch="never" id="identity.email">
-          <text class="label" flex="1" id="identity.email.label" value="&emailPrefix.label;"/>
-          <text class="label" id="identity.email.text"/>
+        <row align="center" id="identity.email">
+          <label flex="1" id="identity.email.label" value="&emailPrefix.label;"/>
+          <label id="identity.email.text"/>
         </row>
-        <row autostretch="never" id="server.name">
-          <text class="label" flex="1" id="server.name.label" value="&serverNamePrefix.label;"/>
-          <text class="label" id="server.name.text"/>
+        <row align="center" id="server.name">
+          <label flex="1" id="server.name.label" value="&serverNamePrefix.label;"/>
+          <label id="server.name.text"/>
         </row>
-        <row autostretch="never" id="server.type">
-          <text class="label" flex="1" id="server.type.label" value="&serverTypePrefix.label;"/>
-          <text class="label" id="server.type.text"/>
+        <row align="center" id="server.type">
+          <label flex="1" id="server.type.label" value="&serverTypePrefix.label;"/>
+          <label id="server.type.text"/>
         </row>
-        <row autostretch="never" id="newsServer.name">
-          <text class="label" flex="1" id="newsServer.name.label" value="&newsServerNamePrefix.label;"/>
-          <text class="label" id="newsServer.name.text"/>
+        <row align="center" id="newsServer.name">
+          <label flex="1" id="newsServer.name.label" value="&newsServerNamePrefix.label;"/>
+          <label id="newsServer.name.text"/>
         </row>
-        <row autostretch="never" id="smtpServer.name">
-          <text class="label" flex="1" id="smtpServer.name.label" value="&smtpServerNamePrefix.label;"/>
-          <text class="label" id="smtpServer.name.text"/>
+        <row align="center" id="smtpServer.name">
+          <label flex="1" id="smtpServer.name.label" value="&smtpServerNamePrefix.label;"/>
+          <label id="smtpServer.name.text"/>
         </row>
       </rows>
     </grid>
-    <!-- <html>&setupAnother.label;</html> -->
+    <!-- <description>&setupAnother.label;</description> -->
     <separator/>
-    <html>&clickFinish.label;</html>
+    <description>&clickFinish.label;</description>
     <!--
       <hbox>
-        <button class="dialog push" label="&setupAnotherButton.label;" oncommand="setupAnother(event);"/>
+        <button label="&setupAnotherButton.label;" oncommand="setupAnother(event);"/>
       </hbox>
     -->
   </vbox>
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-identity.xul b/mozilla/mailnews/base/prefs/resources/content/aw-identity.xul
index 452920418d8..fa26dde8b0e 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-identity.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-identity.xul
@@ -25,9 +25,7 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-identity.dtd" >
-<page id="identitypage" 
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical"
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.wizardManager.onPageLoad('identity');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
@@ -38,13 +36,13 @@ Rights Reserved.
   
   <separator/>
   <vbox class="box-wizardcontent" flex="1">
-    <html>&identityDesc.label;</html>
+    <description>&identityDesc.label;</description>
     <separator/>
-    <html>&fullnameDesc.label; &fullnameExample.label;</html>
+    <description>&fullnameDesc.label; &fullnameExample.label;</description>
     <separator class="thin"/>
-    <hbox autostretch="never">
-      <text class="awIdentityLabel" for="fullName" value="&fullnameLabel.label;"/>
-      <textbox mailtype="identity" wsm_persist="true" name="fullName" id="fullName" flex="6"/>
+    <hbox align="center">
+      <label class="awIdentityLabel" control="fullName" value="&fullnameLabel.label;"/>
+      <textbox mailtype="identity" wsm_persist="true" name="fullName" id="fullName"/>
     </hbox>
     <separator/>  
     <grid>
@@ -53,14 +51,14 @@ Rights Reserved.
       </columns>
       <rows>
         <row>
-          <html id="emailDescText"/> 
+          <description id="emailDescText"/> 
         </row>
         <separator class="thin"/>
         <row>
-          <hbox autostretch="never">
-            <text class="awIdentityLabel" id="emailFieldLabel" value="&emailLabel.label;"/>
+          <hbox align="center">
+            <label class="awIdentityLabel" id="emailFieldLabel" value="&emailLabel.label;"/>
             <textbox wsm_persist="true" mailtype="identity" name="email" id="email" flex="6"/>
-            <text id="postEmailText"/>
+            <label id="postEmailText"/>
           </hbox>
         </row>
       </rows>
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-login.xul b/mozilla/mailnews/base/prefs/resources/content/aw-login.xul
index 07feeba5f64..96579010466 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-login.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-login.xul
@@ -25,9 +25,7 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-login.dtd" >
-<page id="loginpage" 
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical"
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.wizardManager.onPageLoad('login');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
@@ -39,10 +37,10 @@ Rights Reserved.
   <separator/>
   
   <vbox class="box-wizardcontent" flex="1">
-    <html>&usernameDesc.label; &usernameExample.label;</html>
+    <description>&usernameDesc.label; &usernameExample.label;</description>
     <separator class="thin"/>
-    <hbox autostretch="never">
-      <text class="label" value="&usernameLabel.label;" for="username" style="width: 8em;"/>
+    <hbox align="center">
+      <label value="&usernameLabel.label;" control="username" style="width: 8em;"/>
       <textbox id="username" wsm_persist="true" flex="1"/>
     </hbox>
 <!--
@@ -50,14 +48,14 @@ Rights Reserved.
     
     <groupbox>
       <caption label="&passwordTitle.label;"/>
-      <html>&savePasswordDesc.label;</html>
-      <html>&savePasswordLabel.label;</html>
+      <description>&savePasswordDesc.label;</description>
+      <description>&savePasswordLabel.label;</description>
       <checkbox wsm_persist="true" oncommand="onSavePassword(event.target)"
                 id="rememberPassword"/>
       <vbox class="indent">
-        <text class="label" value="&passwordDesc.label;"/>
-        <hbox autostretch="never">
-          <text class="label" value="&passwordLabel.label;" for="password"/>
+        <label value="&passwordDesc.label;"/>
+        <hbox align="center">
+          <label value="&passwordLabel.label;" control="password"/>
           <textbox type="password" id="password" wsm_persist="true"/>
         </hbox>
       </vbox>
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-newsserver.xul b/mozilla/mailnews/base/prefs/resources/content/aw-newsserver.xul
index 1fba6c3f127..9661a235a14 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-newsserver.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-newsserver.xul
@@ -25,9 +25,7 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-server.dtd" >
-<page id="serverpage" 
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical"
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.wizardManager.onPageLoad('newsserver');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
@@ -40,10 +38,10 @@ Rights Reserved.
  
   <vbox class="box-wizardcontent" flex="1">
 
-    <html>&newsServerNameDesc.label;</html>
+    <description>&newsServerNameDesc.label;</description>
     <separator class="thin"/>
-    <hbox autostretch="never">
-      <text class="label" for="hostname" value="&incomingServerLabel.label;" style="width: 8em;"/>
+    <hbox align="center">
+      <label control="hostname" value="&incomingServerLabel.label;" style="width: 8em;"/>
       <textbox id="hostname" wsm_persist="true" flex="1"/>
     </hbox>
   
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-server.xul b/mozilla/mailnews/base/prefs/resources/content/aw-server.xul
index 8215be12265..98f4451bc3f 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-server.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-server.xul
@@ -25,9 +25,7 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-server.dtd" >
-<page id="serverpage" 
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      orient="vertical"
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.wizardManager.onPageLoad('server');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
@@ -40,38 +38,38 @@ Rights Reserved.
   
   <vbox class="box-wizardcontent" flex="1">
 
-    <groupbox orient="vertical">
+    <groupbox>
       <caption label="&incomingServerTitle.label;"/>
-      <html>&incomingServerTypeDesc.label;</html>
+      <description>&incomingServerTypeDesc.label;</description>
       <separator class="thin"/>
-      <hbox autostretch="never">
+      <hbox align="center">
         <!-- The initial value for the servertype radiogroup is set in onInit() -->
         <radiogroup id="servertype" wsm_persist="true">
-            <radio group="servertype" value="pop3" id="pop3" label="&popType.label;" wsm_persist="true"/>
-            <radio group="servertype" value="imap" id="imap" label="&imapType.label;" wsm_persist="true"/>
+            <radio value="pop3" id="pop3" label="&popType.label;" wsm_persist="true"/>
+            <radio value="imap" id="imap" label="&imapType.label;" wsm_persist="true"/>
         </radiogroup>
       </hbox>
       <separator/>
-      <html>&incomingServerNameDesc.label;</html>
+      <description>&incomingServerNameDesc.label;</description>
       <separator class="thin"/>
-      <hbox autostretch="never">
-        <text class="label" style="width: 8em;" value="&incomingServerLabel.label;" for="hostname"/>
+      <hbox align="center">
+        <label style="width: 8em;" value="&incomingServerLabel.label;" control="hostname"/>
         <textbox wsm_persist="true" id="hostname" flex="1"/>
       </hbox>
     </groupbox>
 
-    <groupbox orient="vertical" id="noSmtp">
+    <groupbox id="noSmtp">
       <caption label="&smtpServerTitle.label;"/>
-      <html>&smtpServerDesc.label;</html>
+      <description>&smtpServerDesc.label;</description>
       <separator class="thin"/>
-      <hbox autostretch="never">
-        <text class="label" value="&smtpServerLabel.label;" for="smtphostname" style="width: 8em;"/>
+      <hbox align="center">
+        <label value="&smtpServerLabel.label;" control="smtphostname" style="width: 8em;"/>
         <textbox id="smtphostname" wsm_persist="true" flex="1"/>
       </hbox>
     </groupbox>
 
-    <groupbox id="haveSmtp" orient="vertical">
-      <html id="smtpStaticText" style="width: 200px;">&haveSmtp1.label;</html>
+    <groupbox id="haveSmtp">
+      <description id="smtpStaticText" style="width: 200px;">&haveSmtp1.label;</description>
     </groupbox>
   </vbox>
   
diff --git a/mozilla/mailnews/base/prefs/resources/content/custreceipt.xul b/mozilla/mailnews/base/prefs/resources/content/custreceipt.xul
index b3813634afc..d4b537852eb 100644
--- a/mozilla/mailnews/base/prefs/resources/content/custreceipt.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/custreceipt.xul
@@ -6,18 +6,15 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/custreceipt.dtd">
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    title="&window.title;"
-    class="dialog"
-    orient="vertical">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&window.title;"
+        class="dialog">
 
   <vbox style="width:100%">
   <hbox style="width:100%">
       <spacer flex="1"/>
-     <text class="label" value="&notInToCc.label;" accesskey="&notInToCc.accesskey;" for="NotInToCc"/>
-      <menulist id="NotInToCc" pref="true" preftype="int" prefstring="mail.mdn.report.not_in_to_cc"
-                prefattribute="value">
+     <label value="&notInToCc.label;" accesskey="&notInToCc.accesskey;" control="NotInToCc"/>
+      <menulist id="NotInToCc" prefstring="mail.mdn.report.not_in_to_cc">
         <menupopup>
           <menuitem value="0" label="&neverSend.label;"/>
           <menuitem value="1" label="&automatically.label;"/>
@@ -28,9 +25,8 @@
 
   <hbox style="width:100%">
       <spacer flex="1"/>
-      <text class="label" value="&outside.label;" accesskey="&outside.accesskey;" for="OutsideDomain"/>
-      <menulist id="OutsideDomain" pref="true" preftype="int" prefstring="mail.mdn.report.outside_domain"
-                prefattribute="value">
+      <label value="&outside.label;" accesskey="&outside.accesskey;" control="OutsideDomain"/>
+      <menulist id="OutsideDomain" prefstring="mail.mdn.report.outside_domain">
         <menupopup>
           <menuitem value="0" label="&neverSend.label;"/>
           <menuitem value="1" label="&automatically.label;"/>
@@ -41,9 +37,8 @@
 
   <hbox style="width:100%">
       <spacer flex="1"/>
-     <text class="label" value="&other.label;" accesskey="&other.accesskey;" for="Other"/>
-      <menulist id="Other" pref="true" preftype="int" prefstring="mail.mdn.report.other"
-                prefattribute="value">
+     <label value="&other.label;" accesskey="&other.accesskey;" for="Other"/>
+      <menulist id="Other" prefstring="mail.mdn.report.other">
         <menupopup>
           <menuitem value="0" label="&neverSend.label;"/>
           <menuitem value="1" label="&automatically.label;"/>
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul b/mozilla/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul
index f369c2ddb11..c1c30acd4fc 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul
@@ -15,10 +15,9 @@
          
   <!-- advanced settings -->
   <vbox id="contentEnablingBox">
-    <checkbox class="indent" id="javascriptAllowMailNews" position="3"
+    <checkbox id="javascriptAllowMailNews" position="3"
               label="&enbJsCheckMailNews.label;" accesskey="&enbJsCheckMailNews.accesskey;"
-              pref="true" preftype="bool" prefstring="javascript.allow.mailnews"
-              prefattribute="checked"/>
+              prefstring="javascript.allow.mailnews"/>
   </vbox>
     
          
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul b/mozilla/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul
index 075195b4088..a001ccb4ea2 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul
@@ -17,7 +17,7 @@
   <groupbox id="generalStartupPreferences">
     <checkbox id="generalStartupMail" wsm_persist="true" position="2"
               label="&mesCheck.label;" accesskey="&mesCheck.accesskey;"
-              pref="true" preftype="bool" prefstring="general.startup.mail"
+              preftype="bool" prefstring="general.startup.mail"
               prefattribute="checked"/>         
   </groupbox>        
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
index c566b075825..a9e0bc9da6b 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -27,10 +27,8 @@ Contributor(s):
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-mailnews.dtd">
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="Init();"
-      orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="Init();">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -43,51 +41,47 @@ Contributor(s):
   
   <hbox class="box-smallheader" title="&pane.title;"/>
 
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&windowSettings.label;"/>
     
-    <hbox autostretch="never">
-      <text class="label" value="&selectWindowLayout.label;"/>
+    <hbox align="center">
+      <label value="&selectWindowLayout.label;"/>
       <spacer flex="1"/>
-      <radiogroup id="mailPaneConfig" pref="true" preftype="int" prefstring="mail.pane_config" orient="horizontal"
-                  prefattribute="value">
-        <radio group="mailPaneConfig" class="iconic" value="0" id="classic"/>
-        <radio group="mailPaneConfig" class="iconic" value="1" id="wide"/>
+      <radiogroup id="mailPaneConfig" prefstring="mail.pane_config" orient="horizontal">
+        <radio class="iconic" value="0" id="classic"/>
+        <radio class="iconic" value="1" id="wide"/>
       </radiogroup>
     </hbox>
     
-    <html>&chooseExp.label;</html>
+    <description>&chooseExp.label;</description>
 
     <separator class="thin"/>
-    <hbox autostretch="never">
+    <hbox align="center">
       <checkbox id="mailnewsConfirmMoveFoldersToTrash" label="&confirmMove.label;"
-                pref="true" preftype="bool" prefstring="mailnews.confirm.moveFoldersToTrash"
-                prefattribute="checked"/>
+                prefstring="mailnews.confirm.moveFoldersToTrash"/>
     </hbox>
-    <hbox autostretch="never" id="mapi"/>
+    <hbox align="start" id="mapi"/>
 
   </groupbox>
 
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&messengerStartPage.label;"/>
-      <hbox autostretch="never">
-        <checkbox allowevents="true" id="mailnewsStartPageEnabled" label="&enableStartPage.label;"
-                  pref="true" preftype="bool" prefstring="mailnews.start_page.enabled"
-                  prefattribute="checked"/>
+      <hbox align="center">
+        <checkbox id="mailnewsStartPageEnabled" label="&enableStartPage.label;"
+                  prefstring="mailnews.start_page.enabled"/>
       </hbox>
 
       <separator class="thin"/>
 
-      <hbox autostretch="never">
-        <text class="label" value="&location.label;" accesskey="&location.accesskey;" 
-                   for="mailnews.start_page.url"/>
-        <textbox id="mailnewsStartPageUrl" flex="1" pref="true" preftype="localizedstring"
-                 prefstring="mailnews.start_page.url" prefattribute="value"/>
+      <hbox align="center">
+        <label value="&location.label;" accesskey="&location.accesskey;" 
+               control="mailnews.start_page.url"/>
+        <textbox id="mailnewsStartPageUrl" preftype="localizedstring"
+                 prefstring="mailnews.start_page.url"/>
       </hbox>
 
     <hbox pack="end">
-      <button class="dialog" label="&useDefault.label;" accesskey="&useDefault.accesskey;"
-              id="resetHomePageButton"
+      <button label="&useDefault.label;" accesskey="&useDefault.accesskey;"
               oncommand="setHomePageToDefaultPage('mailnewsStartPageUrl');">
         <observes element="mailnewsStartPageUrl" attribute="disabled"/>
       </button>
@@ -96,13 +90,12 @@ Contributor(s):
   </groupbox>
   
   <!-- Sound notification for new mail -->    
-        <groupbox orient="vertical">
+        <groupbox>
     <caption label="&newMessage.label;"/>
-    <hbox autostretch="never">
-            <checkbox allowevents="true" id="newMailNotification" label="&playSound.label;"
-                pref="true" preftype="bool" prefstring="mail.biff.play_sound"
-                prefattribute="checked" accesskey="&playSound.accesskey;" />
-          </hbox>              
-        </groupbox>
-  
+    <hbox align="center">
+      <checkbox id="newMailNotification" label="&playSound.label;"
+                prefstring="mail.biff.play_sound"
+                accesskey="&playSound.accesskey;" />
+    </hbox>              
+        </groupbox> 
 </page>
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul b/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
index 4620f75cf93..d484f5773ab 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
@@ -4,10 +4,8 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-receipts.dtd">
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');"
-      orient="vertical">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');">
 
   <script type="application/x-javascript">
   <![CDATA[
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
index 6ba37dd8afb..66828426dac 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@@ -8,11 +8,8 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-viewing_messages.dtd">
 
-<page xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://messenger/content/pref-viewing_messages.xul');"
-      orient="vertical">
-  <popupset id="aTooltipSet"/>
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://messenger/content/pref-viewing_messages.xul');">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -42,27 +39,26 @@
 
   <hbox class="box-smallheader" title="&pane.title;"/>
 
-  <groupbox orient="vertical" class="small-margin">
+  <groupbox>
     <caption label="&displayWidth.label;"/>
 
-      <html class="small-margin">&plainText.label;</html>
+      <description>&plainText.label;</description>
     
     <hbox class="indent">
       <radiogroup id="mailFixedWidthMessages" 
-                  pref="true" preftype="bool" prefstring="mail.fixed_width_messages"
-                  prefattribute="value">
-        <radio class="small-margin" group="mailFixedWidthMessages" value="true" label="&fixedWidth.label;"/>
-        <radio class="small-margin"  group="mailFixedWidthMessages" value="false" label="&variableWidth.label;"/>                
+                  preftype="bool" prefstring="mail.fixed_width_messages">
+        <radio value="true" label="&fixedWidth.label;"/>
+        <radio value="false" label="&variableWidth.label;"/>                
       </radiogroup>
     </hbox>
 
     <separator class="thin"/>
 
-  <html class="small-margin">&displayText.label;</html>
-    <hbox class="indent" autostretch="never">
-      <text class="label small-margin" value="&style.label;" accesskey="&style.accesskey;" for="mailQuotedStyle"/>
-      <menulist class="small-margin" id="mailQuotedStyle" pref="true" preftype="int" prefstring="mail.quoted_style"
-                prefattribute="value" flex="1" style="width: 0px;">
+  <description>&displayText.label;</description>
+    <hbox class="indent" align="center">
+      <label value="&style.label;" accesskey="&style.accesskey;" control="mailQuotedStyle"/>
+      <menulist id="mailQuotedStyle" prefstring="mail.quoted_style"
+                flex="1">
         <menupopup>
           <menuitem value="0" label="&regular.label;"/>
           <menuitem value="1" label="&bold.label;"/>
@@ -71,9 +67,9 @@
         </menupopup>
       </menulist>
 
-      <text class="label small-margin" value="&size.label;" accesskey="&size.accesskey;" for="mailQuotedSize"/>
-      <menulist class="small-margin"  id="mailQuotedSize" pref="true" preftype="int" prefstring="mail.quoted_size"
-                prefattribute="value" flex="1" style="width: 0px;">
+      <label value="&size.label;" accesskey="&size.accesskey;" control="mailQuotedSize"/>
+      <menulist id="mailQuotedSize" prefstring="mail.quoted_size"
+                flex="1" style="width: 0px;">
         <menupopup>
           <menuitem value="0" label="&regular.label;"/>
           <menuitem value="1" label="&bigger.label;"/>
@@ -81,37 +77,34 @@
         </menupopup>
       </menulist>
       
-      <text class="label small-margin" value="&color.label;" accesskey="&color.accesskey;"/>
-      <colorpicker class="small-margin" type="button" id="citationmenu" palettename="standard" onchange="setColorWell(this);"/>
+      <label value="&color.label;" accesskey="&color.accesskey;"/>
+      <colorpicker type="button" id="citationmenu" palettename="standard" onchange="setColorWell(this);"/>
       <broadcaster id="mailCitationColor" pref="true" preftype="color" prefstring="mail.citation_color" prefattribute="value" wsm_attributes="value"/>
     </hbox>    
 
-  <html class="small-margin">&viewingPlainText.label;</html>
-    <vbox autostretch="never" class="indent">
-      <checkbox class="small-margin"  id="wrapLongLines" label="&wrapInMsg.label;"
-                pref="true" preftype="bool" prefstring="mail.wrap_long_lines" 
-                prefattribute="checked"/>
-      <checkbox class="iconic small-margin" id="displayGlyph" label="&convertEmoticons.label;"
-                pref="true" preftype="bool" prefstring="mail.display_glyph"
-                prefattribute="checked"/>   
-      <hbox autostretch="never" class="indent">
-           <text value="&example1.label;" class="label"/>
+  <description>&viewingPlainText.label;</description>
+    <vbox align="start" class="indent">
+      <checkbox id="wrapLongLines" label="&wrapInMsg.label;"
+                prefstring="mail.wrap_long_lines" />
+      <checkbox class="iconic" id="displayGlyph" label="&convertEmoticons.label;"
+                prefstring="mail.display_glyph"/>   
+      <hbox align="center" class="indent">
+           <label value="&example1.label;"/>
            <image class="smileface"/>
-           <text value="&example2.label;"/>
+           <label value="&example2.label;"/>
       </hbox>
     
     </vbox>
   </groupbox>
 
-  <groupbox orient="vertical" autostretch="never" class="small-margin">
+  <groupbox align="start">
     <caption label="&languagesTitle.label;"/>
-    <html class="small-margin">&coding.label;</html>
-    <hbox autostretch="never">
-      <text class="label"  for="sendDefaultCharsetList"
-            value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;"/>
-        <menulist class="small-margin" id="sendDefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
-                pref="true" preftype="localizedstring" prefstring="mailnews.view_default_charset"
-                prefattribute="value">
+    <description>&coding.label;</description>
+    <hbox align="center">
+      <label control="sendDefaultCharsetList"
+             value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;"/>
+        <menulist id="sendDefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
+                preftype="localizedstring" prefstring="mailnews.view_default_charset">
         <template>
           <menupopup>
             <menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
@@ -119,9 +112,7 @@
         </template>
       </menulist> 
     </hbox>      
-    <checkbox class="small-margin" id="forceCharsetOverride" label="&forceCharsetOverride.label;"
-              pref="true" preftype="bool" prefstring="mailnews.force_charset_override" 
-              prefattribute="checked"/>
-  </groupbox>
-    
+    <checkbox id="forceCharsetOverride" label="&forceCharsetOverride.label;"
+              prefstring="mailnews.force_charset_override"/>
+  </groupbox>   
 </page>
diff --git a/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.xul b/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
index 7efee5dce0b..94079de86aa 100644
--- a/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
@@ -26,50 +26,48 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/smtpEditOverlay.dtd">
 
-<overlay  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script src="smtpEditOverlay.js"/>
 
   <vbox id="smtpServerEditor">
-    <hbox autostretch="never">
-      <text class="label" value="&serverName.label;"/>
-      <textbox wsm_persist="true" id="smtp.hostname" flex="1"
-               pref="true" preftype="string" prefattribute="value"
+    <hbox align="center">
+      <label value="&serverName.label;"/>
+      <textbox id="smtp.hostname" flex="1"
+               preftype="string"
                prefstring="mail.smtpserver.%serverkey%.hostname"/>
     </hbox>
     <!-- use a grid here when it's implemented -->
     <vbox>
       <!-- This hidden one will hold the integer version
            of smtp.useUsername -->
-      <text hidden="true" id="smtp.authMethod" wsm_persist="true"/>
-      <hbox autostretch="never">
-      <checkbox id="smtp.useUsername" label="&alwaysUseUsername.label;" wsm_persist="true"
+      <label hidden="true" id="smtp.authMethod"/>
+      <hbox align="center">
+      <checkbox id="smtp.useUsername" label="&alwaysUseUsername.label;"
                 oncommand="onUseUsername(event.target,true);"
-                pref="true" preftype="bool" prefattribute="value"
+                prefattribute="value"
                 prefstring="mail.smtpserver.%serverkey%.use_username"/>
       </hbox>                
       <vbox style="margin-left: 2em">
-        <hbox autostretch="never">
-          <text id="smtpusernamelabel" class="label" value="&userName.label;"/>
-          <textbox wsm_persist="true" id="smtp.username" flex="1"
-                   pref="true" preftype="string" prefattribute="value"
+        <hbox align="center">
+          <label id="smtpusernamelabel" value="&userName.label;"/>
+          <textbox id="smtp.username" flex="1"
+                   preftype="string"
                    prefstring="mail.smtpserver.%serverkey%.username"/>
         </hbox>
       </vbox>
      </vbox>
-     <hbox autostretch="never">
-  <text class="label" value="&isSecure.label;"/>
+     <hbox align="center">
+       <label value="&isSecure.label;"/>
      </hbox>
-     <radiogroup id="smtp.trySSL" wsm_persist="true"
-                 pref="true" preftype="int" prefattribute="value"
+     <radiogroup id="smtp.trySSL"
                  prefstring="mail.smtpserver.%serverkey%.try_ssl">
        <hbox style="margin-left: 2em">
-         <radio group="smtp.trySSL" value="0" label="&neverSecure.label;" id="smtp.neverSecure"/>
-         <radio group="smtp.trySSL" value="1" label="&sometimesSecure.label;" id="smtp.sometimesSecure"/>
-         <radio group="smtp.trySSL" value="2" label="&alwaysSecure.label;" id="smtp.alwaysSecure"/>
+         <radio value="0" label="&neverSecure.label;" id="smtp.neverSecure"/>
+         <radio value="1" label="&sometimesSecure.label;" id="smtp.sometimesSecure"/>
+         <radio value="2" label="&alwaysSecure.label;" id="smtp.alwaysSecure"/>
        </hbox>
      </radiogroup>
   </vbox>
-
 </overlay>
diff --git a/mozilla/mailnews/base/resources/content/folderPane.xul b/mozilla/mailnews/base/resources/content/folderPane.xul
index a4c594064d5..567f6ea13e1 100644
--- a/mozilla/mailnews/base/resources/content/folderPane.xul
+++ b/mozilla/mailnews/base/resources/content/folderPane.xul
@@ -28,10 +28,8 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/folderpane.dtd">
 
-<overlay
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <outliner id="folderOutliner"
             flex="1"
diff --git a/mozilla/mailnews/base/resources/content/folderProps.xul b/mozilla/mailnews/base/resources/content/folderProps.xul
index 0b37f2b2312..2d382da6987 100644
--- a/mozilla/mailnews/base/resources/content/folderProps.xul
+++ b/mozilla/mailnews/base/resources/content/folderProps.xul
@@ -29,11 +29,10 @@
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/folderProps.dtd">
 
 <window
-  xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&folderProps.windowtitle.label;"
   onload="folderPropsOnLoad()" style="width: 36em;"
-  class="dialog" orient="vertical">
+  class="dialog">
  
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"></script>
   <script type="application/x-javascript" src="chrome://messenger/content/folderProps.js"></script>
@@ -53,14 +52,14 @@
   </tabs>
   <tabpanels id="folderPropTabPanel">
     <vbox>
-      <hbox id="nameBox" autostretch="never">
-        <text class="label" value="&folderProps.name.label;" for="name"/>
-        <textbox flex="1" id="name" readonly="true" />
+      <hbox id="nameBox" align="center">
+        <label value="&folderProps.name.label;" for="name"/>
+        <textbox id="name" readonly="true" />
       </hbox>
       
       <vbox>
-        <hbox autostretch="never" valign="middle">
-          <text class="label" value="&folderCharsetTab.label;" for="folderCharSetList"/>
+        <hbox align="center" valign="middle">
+          <label value="&folderCharsetTab.label;" control="folderCharSetList"/>
           <menulist id="folderCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"> 
             <template>
               <menupopup>
@@ -73,7 +72,7 @@
       </vbox>
     </vbox>
  
-    <vbox hidable="true" hidefor="pop3,none" valign="top" autostretch="never">
+    <vbox hidable="true" hidefor="pop3,none" valign="top" align="start">
       <vbox>
         <checkbox iscontrolcontainer="true" hidable="true"  
                   wsm_persist="true" id="offline.selectForOfflineFolder"  
@@ -83,10 +82,10 @@
                   hidefor="imap" label="&selectofflineNewsgroup.check.label;" />
       </vbox>
       <button iscontrolcontainer="true" hidable="true" label="&offlineFolder.button.label;" 
-              class="dialog" oncommand="onOfflineFolderDownload();" 
+              oncommand="onOfflineFolderDownload();" 
               id="offline.offlineFolderDownloadButton" hidefor="nntp" orient="right"/>
       <button iscontrolcontainer="true" hidable="true" label="&offlineNewsgroup.button.label;" 
-              class="dialog" oncommand="onOfflineFolderDownload();" 
+              oncommand="onOfflineFolderDownload();" 
               id="offline.offlineNewsgroupDownloadButton" hidefor="imap" orient="right"/>
     </vbox>
   </tabpanels>
diff --git a/mozilla/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul b/mozilla/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
index 66ff719ce3e..8f8ec30e553 100644
--- a/mozilla/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
@@ -2,8 +2,7 @@
 <!-- mac version of platformMailnewsOverlay.xul -->
 
 <overlay id="platformMailnewsOverlay"
-		 xmlns:html="http://www.w3.org/1999/xhtml"
-		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- Delete Key -->
 	<key id="cmd_shiftDelete" keycode="VK_BACK"  xulkey="false" modifiers="shift"/>
diff --git a/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul b/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
index bde8ee49916..683a5aa7eb9 100644
--- a/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
+++ b/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
@@ -42,14 +42,12 @@ Rights Reserved.
         
 <window id="messengerWindow"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         title="&messengerWindow.title;"
         titlemodifier="&titleModifier.label;"
         titlemenuseparator="&titleSeperator.label;"
         onload="OnLoadMessenger()"
         onunload="OnUnloadMessenger()"
-        orient="vertical"
         width="750"
         height="500"
         screenX="10" screenY="10"
diff --git a/mozilla/mailnews/base/resources/content/mailWidgets.xml b/mozilla/mailnews/base/resources/content/mailWidgets.xml
index b5c7a33cee9..ffbfd9810dd 100644
--- a/mozilla/mailnews/base/resources/content/mailWidgets.xml
+++ b/mozilla/mailnews/base/resources/content/mailWidgets.xml
@@ -564,7 +564,7 @@
               var node = children[i];
               var stringTag = node.getAttribute("stringTag");
               if (stringTag) {
-                var attr = (node.tagName == "text") ? "value" : "label";
+                var attr = (node.tagName == "label") ? "value" : "label";
                 node.setAttribute(attr, bundle.GetStringFromName(stringTag));
               }
             }
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 55363ce1c5d..120fc9168e0 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -1369,7 +1369,7 @@ Rights Reserved.
       </toolbarbutton>
       <toolbarbutton class="toolbarbutton-1" id="button-stop" label="&stopButton.label;"  tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" oncommand="MsgStop();"/>
       <spacer flex="1"/>
-            <hbox id="throbber-box" autostretch="never">
+            <hbox id="throbber-box" align="center">
                 <button id="navigator-throbber" oncommand='goClickThrobber("messenger.throbber.url")' tooltip="aTooltip" tooltiptext="&throbber.tooltip;"/>
             </hbox>
     </hbox>
@@ -1377,7 +1377,7 @@ Rights Reserved.
 </toolbox>
 
 <hbox id="searchBox" persist="collapsed" align="center">
-  <text id="searchCriteria" class="label" value="&SearchSubjectOrSender.label;"/>
+  <label id="searchCriteria" value="&SearchSubjectOrSender.label;"/>
   <textbox id="searchInput" flex ="1" oninput = "onSearchInput(event);" />
   <button id="advancedButton" label="&advancedButton.label;" tooltip="aTooltip" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"/>
 </hbox>
diff --git a/mozilla/mailnews/base/resources/content/messageWindow.xul b/mozilla/mailnews/base/resources/content/messageWindow.xul
index 54a3164005d..37326fe94eb 100644
--- a/mozilla/mailnews/base/resources/content/messageWindow.xul
+++ b/mozilla/mailnews/base/resources/content/messageWindow.xul
@@ -37,14 +37,12 @@ Rights Reserved.
                     
 <window id="messengerWindow"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         title="&messengerWindow.title;"
         titlemodifier="&titleModifier.label;"
         titlemenuseparator="&titleSeperator.label;"
         onload="OnLoadMessageWindow()"
         onunload="OnUnloadMessageWindow()"
-        orient="vertical"
         width="750"
         height="500"
         persist="width height screenX screenY sizemode"
diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul
index 62a79d142dd..dcf6ae696e6 100644
--- a/mozilla/mailnews/base/resources/content/messenger.xul
+++ b/mozilla/mailnews/base/resources/content/messenger.xul
@@ -42,14 +42,12 @@ Rights Reserved.
 
 <window id="messengerWindow"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         title="&messengerWindow.title;"
         titlemodifier="&titleModifier.label;"
         titlemenuseparator="&titleSeperator.label;"
         onload="OnLoadMessenger()"
         onunload="OnUnloadMessenger()"
-        orient="vertical"
         width="750"
         height="500"
         screenX="10" screenY="10"
diff --git a/mozilla/mailnews/base/resources/content/msgAccountCentral.xul b/mozilla/mailnews/base/resources/content/msgAccountCentral.xul
index 985e44beaca..5b568f6424c 100644
--- a/mozilla/mailnews/base/resources/content/msgAccountCentral.xul
+++ b/mozilla/mailnews/base/resources/content/msgAccountCentral.xul
@@ -31,7 +31,6 @@ Rights Reserved.
 
 
 <page
-  xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="OnInit();">
@@ -57,38 +56,38 @@ Rights Reserved.
 
     <rows>
       <row id="acctCentralHeaderRow">
-        <text class="label" id="AccountCentralTitle"/>
+        <label id="AccountCentralTitle"/>
       </row>
       <separator/>
 
       <row id="EmailHeader" class="acctCentralTitleRow">
         <hbox class="acctCentralRowTitleBox">
-          <html>&emailSectionHdr.label;</html> 
+          <description>&emailSectionHdr.label;</description> 
         </hbox>
       </row>
       <separator id="EmailHeader.separator" class="thin"/>
       <row id="ReadMessages" class="acctCentralRow">
         <hbox> 
-          <text class="acctCentralText acctCentralLinkText" value="&readMsgsLink.label;" onclick="ReadMessages();"/> 
+          <label class="acctCentralText acctCentralLinkText" value="&readMsgsLink.label;" onclick="ReadMessages();"/> 
         </hbox>
       </row>
       <separator id="ReadMessages.separator" class="thin"/>
       <row id="ComposeMessage" class="acctCentralRow">
         <hbox> 
-          <text class="acctCentralText acctCentralLinkText" value="&composeMsgLink.label;" onclick="ComposeAMessage();"/> 
+          <label class="acctCentralText acctCentralLinkText" value="&composeMsgLink.label;" onclick="ComposeAMessage();"/> 
         </hbox> 
       </row>
       <separator id="ComposeMessage.separator" class="thin"/>
 
       <row id="NewsHeader" class="acctCentralTitleRow">
         <hbox class="acctCentralRowTitleBox">
-          <html>&newsSectionHdr.label;</html> 
+          <description>&newsSectionHdr.label;</description> 
         </hbox>
       </row>
       <separator id="NewsHeader.separator" class="thin"/>
       <row id="SubscribeNewsgroups" class="acctCentralRow">
         <hbox> 
-          <text class="acctCentralText acctCentralLinkText" value="&subscribeNewsLink.label;" onclick="SubscribeNewsgroups();"/> 
+          <label class="acctCentralText acctCentralLinkText" value="&subscribeNewsLink.label;" onclick="SubscribeNewsgroups();"/> 
         </hbox> 
       </row>
       <separator id="SubscribeNewsgroups.separator" class="thin"/>
@@ -99,19 +98,19 @@ Rights Reserved.
 
       <row id="AccountsHeader" class="acctCentralTitleRow">
         <hbox class="acctCentralRowTitleBox">
-          <html>&accountsSectionHdr.label;</html> 
+          <description>&accountsSectionHdr.label;</description> 
         </hbox>
       </row>
       <separator id="AccountsHeader.separator" class="thin"/>
       <row id="AccountSettings" class="acctCentralRow">
         <hbox> 
-          <text class="acctCentralText acctCentralLinkText" value="&settingsLink.label;" onclick="ViewSettings(null);"/> 
+          <label class="acctCentralText acctCentralLinkText" value="&settingsLink.label;" onclick="ViewSettings(null);"/> 
         </hbox> 
       </row>
       <separator id="AccountSettings.separator" class="thin"/>
       <row id="CreateAccount" class="acctCentralRow">
         <hbox> 
-          <text class="acctCentralText acctCentralLinkText" value="&newAcctLink.label;" onclick="CreateNewAccount();"/> 
+          <label class="acctCentralText acctCentralLinkText" value="&newAcctLink.label;" onclick="CreateNewAccount();"/> 
         </hbox> 
       </row>
       <separator id="CreateAccount.separator" class="thin"/>
@@ -122,25 +121,25 @@ Rights Reserved.
 
       <row id="AdvancedFeaturesHeader" class="acctCentralTitleRow">
         <hbox class="acctCentralRowTitleBox">
-          <html>&advFeaturesSectionHdr.label;</html> 
+          <description>&advFeaturesSectionHdr.label;</description> 
         </hbox> 
       </row>
       <separator id="AdvancedFeaturesHeader.separator" class="thin"/>
       <row id="SearchMessages" class="acctCentralRow">
         <hbox> 
-          <text class="acctCentralText acctCentralLinkText" value="&searchMsgsLink.label;" onclick="SearchMessages();"/> 
+          <label class="acctCentralText acctCentralLinkText" value="&searchMsgsLink.label;" onclick="SearchMessages();"/> 
         </hbox> 
       </row>
       <separator id="SearchMessages.separator" class="thin"/>
       <row id="CreateFilters" class="acctCentralRow">
         <hbox> 
-          <text class="acctCentralText acctCentralLinkText" value="&filtersLink.label;" onclick="CreateMsgFilters();"/> 
+          <label class="acctCentralText acctCentralLinkText" value="&filtersLink.label;" onclick="CreateMsgFilters();"/> 
         </hbox> 
       </row>
       <separator id="CreateFilters.separator" class="thin"/>
       <row id="OfflineSettings" class="acctCentralRow">
         <hbox> 
-          <text class="acctCentralText acctCentralLinkText" value="&offlineLink.label;" onclick="ViewSettings('am-offline.xul');"/> 
+          <label class="acctCentralText acctCentralLinkText" value="&offlineLink.label;" onclick="ViewSettings('am-offline.xul');"/> 
         </hbox> 
       </row>
       <separator id="OfflineSettings.separator" class="thin"/>
diff --git a/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul b/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul
index 5ba1bf168ae..f157c48985d 100644
--- a/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul
@@ -49,7 +49,7 @@ Rights Reserved.
 </popup>
 
 <popup id="attachmentTreeTooltip" class="tooltip" onpopupshowing="return FillInAttachmentTooltip(document.tooltipNode);" > 
-    <text id="attachmentTreeTooltipText"/>
+    <label id="attachmentTreeTooltipText"/>
 </popup>
 
 <hbox id="msgHeaderView" persist="state">
@@ -63,21 +63,21 @@ Rights Reserved.
       
     <column id="collapsedsubjectBox" collapsed="true" crop="right" flex="1">
       <hbox>  
-        <text class="collapsedHeaderDisplayName" value="&subjectField.label;"/>
-        <text id="collapsedsubjectValue" class="collapsedHeaderValue" crop="right" flex="1"/>
+        <label class="collapsedHeaderDisplayName" value="&subjectField.label;"/>
+        <label id="collapsedsubjectValue" class="collapsedHeaderValue" crop="right" flex="1"/>
       </hbox>
 	</column>
 
     <column id="collapsedfromBox" collapsed="true">
       <hbox>
-        <text class="collapsedHeaderDisplayName" value="&fromField.label;"/>          
+        <label class="collapsedHeaderDisplayName" value="&fromField.label;"/>          
         <mail-emailaddress id="collapsedfromValue" flex="1"/>
       </hbox>
     </column>
 
     <column id = "collapseddateBox" collapsed="true">
       <hbox style="text-align: right;">
-        <text id="collapseddateValue" class="collapsedHeaderValue"/>
+        <label id="collapseddateValue" class="collapsedHeaderValue"/>
       </hbox>
     </column>
 
@@ -108,12 +108,12 @@ Rights Reserved.
 
    <vbox id="editMessageBox" class="header-part1" collapsed="true">
      <spacer class="buttonSpacer"/> 
-     <button id="editMessageButton" label="&editMessage.label;" orient="right" onclick="MsgComposeDraftMessage()"/>
+     <button id="editMessageButton" label="&editMessage.label;" oncommand="MsgComposeDraftMessage()"/>
      <spacer class="buttonSpacer"/> 
    </vbox> 
 
    <hbox id="expandedAttachmentBox" class="header-part1">
-     <text class="label" id="attachmentText" value="&attachmentsTree.label;" crop="right"/>
+     <label id="attachmentText" value="&attachmentsTree.label;" crop="right"/>
        <tree id="attachmentTree" class="inset" flex="2" onclick="attachmentTreeClick(event);" context="attachmentTreeContext">
          <treecolgroup>
            <treecol flex="1"/>
diff --git a/mozilla/mailnews/base/resources/content/msgPrintEngine.xul b/mozilla/mailnews/base/resources/content/msgPrintEngine.xul
index 57652597589..41b3865f788 100644
--- a/mozilla/mailnews/base/resources/content/msgPrintEngine.xul
+++ b/mozilla/mailnews/base/resources/content/msgPrintEngine.xul
@@ -34,24 +34,22 @@ Rights Reserved.
                      
 <window id="printEngineWin"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
-		    title="&printEngine.title;"
+        title="&printEngine.title;"
         titlemodifier="&titleModifier.label;"
         titlemenuseparator="&titleSeperator.label;"
-		    onload="OnLoadPrintEngine()"
-		    onunload="OnUnloadPrintEngine()"
-		    orient="vertical"
+        onload="OnLoadPrintEngine()"
+        onunload="OnUnloadPrintEngine()"
         width="150"
         height="250"
         screenX="10000"
         screenY="10000"
-		    windowtype="mail:printEngine">
+        windowtype="mail:printEngine">
 
 <!-- XXX: utilityOverlay.xul uses strres.js - once it is converted, this should be  removed-->
-<html:script src="chrome://global/content/strres.js"/>
-<html:script src="chrome://messenger/content/msgPrintEngine.js"/>
+<script src="chrome://global/content/strres.js"/>
+<script src="chrome://messenger/content/msgPrintEngine.js"/>
 
   <!-- The main display frame -->
-  <html:iframe id="printengine" style="height: 0px" flex="1" name="printengine" type="content" src="about:blank" />
+  <iframe id="printengine" style="height: 0px" flex="1" name="printengine" type="content" src="about:blank" />
 </window>
diff --git a/mozilla/mailnews/base/resources/content/msgSelectOffline.xul b/mozilla/mailnews/base/resources/content/msgSelectOffline.xul
index 453ff54ae73..b0d37640029 100644
--- a/mozilla/mailnews/base/resources/content/msgSelectOffline.xul
+++ b/mozilla/mailnews/base/resources/content/msgSelectOffline.xul
@@ -30,14 +30,11 @@ Contributors:
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/msgSynchronize.dtd" >
-<window	xmlns:nc="http://home.netscape.com/NC-rdf#"
-        xmlns:html="http://www.w3.org/1999/xhtml"
+<dialog	xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="select-offline" 
         title="&MsgSelect.label;"
-        orient="vertical"
-        class="dialog"
         width="450" height="400"
         persist="width height"
         onload="selectOnLoad();">
@@ -53,7 +50,7 @@ Contributors:
 <script type="application/x-javascript" src="chrome://messenger/content/msgSynchronize.js"/>
 	
     <keyset id="keyset"/>
-    <html class="desc">&MsgSelectDesc.label;</html>
+    <description class="desc">&MsgSelectDesc.label;</description>
 
     <grid flex="1">
 
@@ -119,7 +116,4 @@ Contributors:
     </row>
     </rows>
     </grid>
-
-    <separator/>
-    <hbox id="okCancelButtonsRight"/>
-</window>
+</dialog>
diff --git a/mozilla/mailnews/base/resources/content/msgSynchronize.xul b/mozilla/mailnews/base/resources/content/msgSynchronize.xul
index 542dbe00f1c..433caf48dbd 100644
--- a/mozilla/mailnews/base/resources/content/msgSynchronize.xul
+++ b/mozilla/mailnews/base/resources/content/msgSynchronize.xul
@@ -33,7 +33,6 @@ Contributors:
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="msg-synchronizer" 
         title="&MsgSynchronize.label;"
-        orient="vertical"
         class="dialog"
         width="380" height="295"
         onload="OnLoad();">
@@ -45,11 +44,11 @@ Contributors:
 <script type="application/x-javascript" src="chrome://messenger/content/msgSynchronize.js"/>
 
     <keyset id="keyset"/>
-    <text hidden="true" wsm_persist="true" id="server.type"/>
+    <label hidden="true" wsm_persist="true" id="server.type"/>
 
-    <html class="desc">&MsgSyncDesc.label;</html>
+    <description class="desc">&MsgSyncDesc.label;</description>
     <separator class="thin"/>
-    <text class="label" value="&MsgSyncDirections.label;"/>
+    <label value="&MsgSyncDirections.label;"/>
 
     <vbox class="indent">
         <checkbox id="syncMail" hidable="true" hidefor="pop3" label="&syncTypeMail.label;"/>
@@ -61,10 +60,10 @@ Contributors:
     </vbox>
     <separator class="thin"/>
     <hbox align="right">
-        <button id="select" class="dialog" label="&selectButton.label;"  oncommand="OnSelect();"/>
+        <button id="select" label="&selectButton.label;"  oncommand="OnSelect();"/>
     </hbox>
 
     <separator/>
-    <hbox id="okCancelButtonsRight" flex="1" autostretch="never"/>
+    <hbox id="okCancelButtonsRight" flex="1"/>
 
 </window>
diff --git a/mozilla/mailnews/base/resources/content/newFolderDialog.xul b/mozilla/mailnews/base/resources/content/newFolderDialog.xul
index a7e88c4c79c..d7727503c70 100644
--- a/mozilla/mailnews/base/resources/content/newFolderDialog.xul
+++ b/mozilla/mailnews/base/resources/content/newFolderDialog.xul
@@ -32,7 +32,6 @@
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&newFolderDialog.title;"
-        orient="vertical"
         class="dialog"
         onload="onLoad();">
 
@@ -46,27 +45,27 @@
 
     <spacer flex="1"/>
 
-    <text value="&name.label;" class="label" accesskey="&name.accesskey;" for="name"/>
+    <label value="&name.label;" accesskey="&name.accesskey;" for="name"/>
     <textbox tabindex="0" id="name" oninput="doEnabling();"/>
 
     <separator/>
 
-    <text value="&description.label;" class="label" accesskey="&description.accesskey;" for="msgNewFolderPicker"/>
+    <label value="&description.label;" accesskey="&description.accesskey;" for="msgNewFolderPicker"/>
 
-    <menulist id="msgNewFolderPicker" oncommand="doEnabling();" crop="right"/>
+    <menulist id="msgNewFolderPicker" oncommand="doEnabling();"/>
 
     <vbox hidden="true" id="newFolderTypeBox">
 
       <separator class="thin"/>
 
-      <text value="&folderRestriction1.label;"/>
-      <text value="&folderRestriction2.label;"/>
+      <label value="&folderRestriction1.label;"/>
+      <label value="&folderRestriction2.label;"/>
 
       <separator class="thin"/>
 
       <radiogroup id="folderGroup">
-        <radio group="folderGroup" oncommand="onFoldersOnly();" label="&foldersOnly.label;"/>
-        <radio group="folderGroup" oncommand="onMessagesOnly();" label="&messagesOnly.label;" checked="true"/>
+        <radio oncommand="onFoldersOnly();" label="&foldersOnly.label;"/>
+        <radio oncommand="onMessagesOnly();" label="&messagesOnly.label;" checked="true"/>
         <spacer flex="100%"/>
       </radiogroup>
 
diff --git a/mozilla/mailnews/base/resources/content/renameFolderDialog.xul b/mozilla/mailnews/base/resources/content/renameFolderDialog.xul
index 7ee74fad219..027b813dc43 100644
--- a/mozilla/mailnews/base/resources/content/renameFolderDialog.xul
+++ b/mozilla/mailnews/base/resources/content/renameFolderDialog.xul
@@ -32,7 +32,6 @@
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&renameFolderDialog.title;"
-        orient="vertical"
         class="dialog"
         onload="onLoad();">
 
@@ -46,7 +45,7 @@
 
     <spacer flex="100%"/>
 
-    <text value="&rename.label;" class="label" accesskey="&rename.accesskey;" for="name"/>
+    <label value="&rename.label;" accesskey="&rename.accesskey;" control="name"/>
     <textbox tabindex="0" id="name" oninput="doEnabling();"/>
 
     <spacer flex="100%"/>
diff --git a/mozilla/mailnews/base/resources/content/subscribe.js b/mozilla/mailnews/base/resources/content/subscribe.js
index 081d11cb9e5..d186fc82d4b 100644
--- a/mozilla/mailnews/base/resources/content/subscribe.js
+++ b/mozilla/mailnews/base/resources/content/subscribe.js
@@ -187,8 +187,6 @@ function SubscribeOnLoad()
   msgWindow.statusFeedback = gStatusFeedback;
   msgWindow.SetDOMWindow(window);
 
-  doSetOKCancel(subscribeOK,subscribeCancel);
-
 	// look in arguments[0] for parameters
 	if (window.arguments && window.arguments[0]) {
 		if ( window.arguments[0].okCallback ) {
diff --git a/mozilla/mailnews/base/resources/content/subscribe.xul b/mozilla/mailnews/base/resources/content/subscribe.xul
index 304b4ccbd70..bede528d2f2 100644
--- a/mozilla/mailnews/base/resources/content/subscribe.xul
+++ b/mozilla/mailnews/base/resources/content/subscribe.xul
@@ -27,18 +27,16 @@ Rights Reserved.
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/subscribe.dtd">
 
 
-<window xmlns:NC="http://home.netscape.com/NC-rdf#" 
+<dialog xmlns:NC="http://home.netscape.com/NC-rdf#" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&subscribeDialog.title;"
-        orient="vertical"
-        class="dialog"
         width="500"
         height="400"
-        id="subscribeWindow"
         persist="width height screenX screenY"
         onload="SubscribeOnLoad()"
         onunload="SubscribeOnUnload()"
-        onclose="Stop()">
+        ondialogaccept="return subscribeOK();"
+        ondialogcancel="return subscribeCancel();">
         
 <stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
@@ -47,8 +45,6 @@ Rights Reserved.
 <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/subscribe.js"/>
 
-  <keyset id="dialogKeys"/>
-
   <grid flex="1" style="width: 40em; height: 25em;">
     <columns>
       <column flex="1"/>
@@ -96,7 +92,7 @@ Rights Reserved.
       <row flex="1">
       <deck id="subscribedeck" selectedIndex="0">
       <hbox id="normalview">
-        <tree class="inset" flex="1"
+        <tree flex="1"
               id="subscribetree"
               datasources="rdf:null"
               multiple="true"
@@ -144,10 +140,10 @@ Rights Reserved.
      </hbox>
      </deck>
         <vbox>
-          <button id="subscribe" class="dialog" label="&subscribeButton.label;" oncommand="SetSubscribeState(true)"/>
-          <button id="unsubscribe" class="dialog" label="&unsubscribeButton.label;" oncommand="SetSubscribeState(false)"/>
-          <button id="refresh" class="dialog" label="&refreshButton.label;" oncommand="Refresh()"/>
-          <button id="stop" class="dialog" label="&stopButton.label;" oncommand="Stop()"/>
+          <button id="subscribe" label="&subscribeButton.label;" oncommand="SetSubscribeState(true)"/>
+          <button id="unsubscribe" label="&unsubscribeButton.label;" oncommand="SetSubscribeState(false)"/>
+          <button id="refresh" label="&refreshButton.label;" oncommand="Refresh()"/>
+          <button id="stop" label="&stopButton.label;" oncommand="Stop()"/>
           <spacer flex="1"/>
         </vbox>
       </row>
@@ -156,9 +152,4 @@ Rights Reserved.
       </row>
     </rows>
   </grid>
-  
-  <separator/>
-
-  <hbox id="okCancelButtonsRight"/>
-
-</window>
+</dialog>
diff --git a/mozilla/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul b/mozilla/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul
index c68792e123d..48089fef375 100644
--- a/mozilla/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul
@@ -2,8 +2,7 @@
 <!-- unix version of platformMailnewsOverlay.xul -->
 
 <overlay id="platformMailnewsOverlay"
-		 xmlns:html="http://www.w3.org/1999/xhtml"
-		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- Delete Key -->
 	<key id="cmd_shiftDelete" keycode="VK_DELETE"  xulkey="false" modifiers="shift"/>
diff --git a/mozilla/mailnews/base/resources/content/win/platformMailnewsOverlay.xul b/mozilla/mailnews/base/resources/content/win/platformMailnewsOverlay.xul
index 2fea33c916c..417b1e76df3 100644
--- a/mozilla/mailnews/base/resources/content/win/platformMailnewsOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/win/platformMailnewsOverlay.xul
@@ -2,8 +2,7 @@
 <!-- win version of platformMailnewsOverlay.xul -->
 
 <overlay id="platformMailnewsOverlay"
-		 xmlns:html="http://www.w3.org/1999/xhtml"
-		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- Delete Key -->
 	<key id="cmd_shiftDelete" keycode="VK_DELETE"  xulkey="false" modifiers="shift"/>
diff --git a/mozilla/mailnews/base/search/resources/content/CustomHeaders.xul b/mozilla/mailnews/base/search/resources/content/CustomHeaders.xul
index 431dabdbac3..8ef64ba2f92 100644
--- a/mozilla/mailnews/base/search/resources/content/CustomHeaders.xul
+++ b/mozilla/mailnews/base/search/resources/content/CustomHeaders.xul
@@ -27,7 +27,6 @@ Original Contributor(s): Navin Gupta <naving@netscape.com>
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/CustomHeaders.dtd">
 <window class="dialog" id="customHeaders"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  orient="vertical"
   windowtype="mailnews:customheaders"
   onload="onLoad();"
   width="300"
@@ -47,15 +46,15 @@ Original Contributor(s): Navin Gupta <naving@netscape.com>
     </columns>
     <rows>
       <row>
-        <html>&newMsgHeader.label;</html>
+        <description>&newMsgHeader.label;</description>
       </row>
       <row>
-        <textbox flex="50%" id="headerInput"/>
+        <textbox id="headerInput"/>
       </row>
 
       <row flex="1">
         <vbox>
-          <tree id="headerTree" class="inset" flex="1" onclick="updateButtons();">
+          <tree id="headerTree" flex="1" onclick="updateButtons();">
             <treechildren id="headerList" flex="1"/>
           </tree>
         </vbox>
diff --git a/mozilla/mailnews/base/search/resources/content/FilterEditor.js b/mozilla/mailnews/base/search/resources/content/FilterEditor.js
index bb7fd047758..696b0e13ba1 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterEditor.js
+++ b/mozilla/mailnews/base/search/resources/content/FilterEditor.js
@@ -122,7 +122,6 @@ function filterEditorOnLoad()
       gFilterNameElement.value = name;
     }
     gFilterNameElement.focus();
-    doSetOKCancel(onOk, onCancel);
     moveToAlertPosition();
 }
 
@@ -131,7 +130,7 @@ function onEnterInSearchTerm()
   // do nothing.  onOk() will get called since this is a dialog
 }
 
-function onOk()
+function onAccept()
 {
     if (duplicateFilterNameExists(gFilterNameElement.value))
     {
@@ -146,24 +145,24 @@ function onOk()
             );
         }
 
-        return;
+        return false;
     }
 
 
-    if (!saveFilter()) return;
+    if (!saveFilter()) return false;
 
     // parent should refresh filter list..
     // this should REALLY only happen when some criteria changes that
     // are displayed in the filter dialog, like the filter name
     window.arguments[0].refresh = true;
-    window.close();
+    return true;
 }
 
 function onCancel()
 {
   if (top.okCallback)
     top.okCallback();
-  window.close();
+  return true;
 }
 
 function duplicateFilterNameExists(filterName)
@@ -230,6 +229,7 @@ function initializeDialog(filter)
             gActionPriority.selectedItem = selectedPriority;
         }
     }
+
     else if (filter.action == nsMsgFilterAction.Label) {
       var selectedLabel;
       // initialize label
@@ -240,8 +240,6 @@ function initializeDialog(filter)
         }
     }
 
-
-
     var scope = getScope(filter);
     setSearchScope(scope);
     initializeSearchRows(scope, filter.searchTerms);
diff --git a/mozilla/mailnews/base/search/resources/content/FilterEditor.xul b/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
index 38b9de9b519..658be4e6f0b 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
@@ -31,17 +31,16 @@ Contributor(s):
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/FilterEditor.dtd">
 
-<window class="dialog"
-  id="FilterEditor"
+<dialog id="FilterEditor"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&window.title;"
-  orient="vertical"
   windowtype="mailnews:filtereditor"
   width="510" height="360"
   persist="width height screenX screenY"
   onload="filterEditorOnLoad();"
-  onclose="onCancel();">
+  ondialogaccept="return onAccept();"
+  ondialogcancel="return onCancel();">
 
   <dummy class="usesMailWidgets"/>
   <stringbundleset id="stringbundleset">
@@ -53,10 +52,8 @@ Contributor(s):
   <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/FilterEditor.js"/>
 
-  <keyset id="dialogKeys"/>
-  
-  <hbox autostretch="never">
-    <text class="label" value="&filterName.label;"/>
+  <hbox align="start">
+    <label value="&filterName.label;"/>
     <textbox flex="50%" id="filterName"/>
     <spacer flex="50%"/>
   </hbox>
@@ -64,15 +61,15 @@ Contributor(s):
   <separator/>
 
   <vbox flex="1">
-    <text class="label" value="&conditionDesc.label;"/>
+    <label value="&conditionDesc.label;"/>
     <vbox id="searchTermListBox" flex="1"/>
   </vbox>
 
   <separator/>
 
   <vbox>
-    <text class="label" value="&filterActionDesc.label;" autostretch="never"/>
-    <hbox autostretch="never">
+    <label value="&filterActionDesc.label;"/>
+    <hbox align="start">
       <menulist class="indent" id="actionMenu" oncommand="onActionChanged(event)">
         <menupopup>
           <menuitem value="1" actionvalueindex="0" label="&moveToFolder.label;"/>
@@ -106,7 +103,7 @@ Contributor(s):
             <menuitem value="5" label="&fifthLabelCmd.label;"/>
           </menupopup>
         </menulist>
-        <text id="actionValueNone"/>
+        <label id="actionValueNone"/>
       </deck>
       <spacer flex="100%"/>
       <button id="newFolderButton" label="&newFolderButton.label;" 
@@ -116,6 +113,4 @@ Contributor(s):
 
   <separator/>
 
-  <hbox id="okCancelButtonsRight"/>
-
-</window>
+</dialog>
diff --git a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
index 12b4a48d801..073e818247d 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
@@ -31,7 +31,6 @@ Contributor(s):  H
 <window class="dialog" id="filterListDialog"
   xmlns:nc="http://home.netscape.com/NC-rdf#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  orient="vertical"
   windowtype="mailnews:filterlist"
   onload="onLoad();"
   width="440"
@@ -44,8 +43,8 @@ Contributor(s):  H
 
   <keyset id="dialogKeys"/>
 
-  <hbox autostretch="never">
-    <text class="label" value="&filtersForPrefix.label;"/>
+  <hbox align="center">
+    <label value="&filtersForPrefix.label;"/>
       <menulist oncommand="onServerClick(event);" id="serverMenu">
         <menupopup datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
                    containment="http://home.netscape.com/NC-rdf#child" ref="msgaccounts:/">
@@ -73,13 +72,13 @@ Contributor(s):  H
         <separator/>
       </row>
       <row>
-        <html>&filterHeader.label;</html>
+        <description>&filterHeader.label;</description>
       </row>
       
       
       <row flex="1">
         <vbox>
-          <tree id="filterTree" class="inset" flex="1"
+          <tree id="filterTree" flex="1"
                 onselect="onFilterSelect(event);"
                 ondblclick="onFilterDoubleClick(event);"
                 datasources="rdf:msgfilters rdf:msgaccountmanager"
diff --git a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
index 1acb153e327..633fb5d7c3c 100644
--- a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
@@ -27,22 +27,18 @@ Rights Reserved.
 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/SearchDialog.dtd" >
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:nc="http://home.netscape.com/NC-rdf#"
-    onload="searchOnLoad();"
-    onunload="searchOnUnload();"
-    onclose="onSearchStop();"
-    windowtype="mailnews:search"
-    title="&searchDialogTitle.label;"
-    width="640" height="470"
-    persist="screenX screenY width height"
-    class="color-dialog"
-    orient="vertical">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:nc="http://home.netscape.com/NC-rdf#"
+        onload="searchOnLoad();"
+        onunload="searchOnUnload();"
+        onclose="onSearchStop();"
+        windowtype="mailnews:search"
+        title="&searchDialogTitle.label;"
+        width="640" height="470"
+        persist="screenX screenY width height">
 
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
@@ -73,16 +69,16 @@ Rights Reserved.
   <dummy class="usesMailWidgets"/>
   <vbox flex="1">
     
-    <groupbox orient="vertical" flex="1">
+    <groupbox flex="1">
       <caption label="&conditions.label;"/>
-      <hbox autostretch="never">
-        <text class="label" value="&searchHeading.label;"/>
+      <hbox align="center">
+        <label value="&searchHeading.label;"/>
         <menulist id="searchableFolders" flex="2"/>
         <spacer flex="1"/>
           <checkbox id="checkSearchSubFolders" label="&searchSubfolders.label;" checked="true"/>
       </hbox>
       <separator/>
-      <text class="label" value="&conditionDesc.label;"/>
+      <label value="&conditionDesc.label;"/>
 
       <hbox flex="1">
         <vbox id="searchTermListBox" flex="1"/>
@@ -183,5 +179,4 @@ Rights Reserved.
   </groupbox>
   </vbox>
   <statusbar id="status-bar"/>
-  
 </window>
diff --git a/mozilla/mailnews/base/search/resources/content/searchTermOverlay.xul b/mozilla/mailnews/base/search/resources/content/searchTermOverlay.xul
index d5498b6f0ad..4f78582a670 100644
--- a/mozilla/mailnews/base/search/resources/content/searchTermOverlay.xul
+++ b/mozilla/mailnews/base/search/resources/content/searchTermOverlay.xul
@@ -33,13 +33,13 @@
 
     <radiogroup id="booleanAndGroup" orient="horizontal"
                 selectedItem="or" oncommand="booleanChanged(event);">
-      <radio group="booleanAndGroup" value="and" label="&matchAll.label;"/>
-      <radio group="booleanAndGroup" checked="true" value="or" label="&matchAny.label;"/>
+      <radio value="and" label="&matchAll.label;"/>
+      <radio selected="true" value="or" label="&matchAny.label;"/>
     </radiogroup>
     
     <hbox flex="1">
       <hbox id="searchterms"/>
-      <tree class="inset" flex="1" id="searchTermTree">
+      <tree flex="1" id="searchTermTree">
         <treecolgroup>
           <treecol flex="1"/>
           <treecol flex="4"/>
diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul b/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
index c1361d488da..875f528070b 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
+++ b/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@@ -1,19 +1,12 @@
 <?xml version="1.0"?>
 
 <?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
-
-<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/pref-composing_messages.dtd">
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="parent.initPanel('chrome://messenger/content/messengercompose/pref-composing_messages.xul');"
-        orient="vertical"
-        class="color-dialog">
-
-  <popupset id="aTooltipSet"/>
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="parent.initPanel('chrome://messenger/content/messengercompose/pref-composing_messages.xul');">
     
   <script type="application/x-javascript">
   <![CDATA[
@@ -59,29 +52,27 @@
     
   <hbox class="box-smallheader" title="&pane.title;"/>
 
-  <groupbox orient="vertical">
+  <groupbox>
     <caption label="&forwardReply.label;"/>
     
-    <hbox autostretch="never">
-      <text class="label" value="&forwardMsg.label;" accesskey="&forwardMsg.accesskey;"/>
+    <hbox align="center">
+      <label value="&forwardMsg.label;" accesskey="&forwardMsg.accesskey;"/>
       <menulist id="forwardMessageMode" 
-                pref="true" preftype="int" prefstring="mail.forward_message_mode"
-                prefattribute="value">
+                prefstring="mail.forward_message_mode">
         <menupopup>
           <menuitem value="2" label="&inline.label;" accesskey="&inline.accesskey;"/>
           <menuitem value="0" label="&asAttachment.label;" accesskey="&asAttachment.accesskey;"/>
         </menupopup>
       </menulist>
     </hbox>
-    <hbox autostretch="never">
+    <hbox align="center">
       <checkbox id="autoQuote" label="&autoQuote.label;" 
-                pref="true" preftype="bool" prefstring="mail.auto_quote"
-                prefattribute="checked" oncommand="doEnabling();"/>
+                prefstring="mail.auto_quote"
+                oncommand="doEnabling();"/>
     </hbox>
-    <hbox class="indent" autostretch="never" id="thenBox">
-      <text class="label" value="&then.label;" accesskey="&then.accesskey;" for="replyOnTop"/>
-      <menulist id="replyOnTop" pref="true" preftype="int" prefstring="mailnews.reply_on_top"
-                prefattribute="value">
+    <hbox class="indent" align="center" id="thenBox">
+      <label value="&then.label;" accesskey="&then.accesskey;" control="replyOnTop"/>
+      <menulist id="replyOnTop" preftype="int" prefstring="mailnews.reply_on_top">
         <menupopup>
           <menuitem value="1" label="&aboveQuote.label;" accesskey="&aboveQuote.accesskey;"/>
           <menuitem value="0" label="&belowQuote.label;" accesskey="&belowQuote.accesskey;"/>
@@ -92,29 +83,26 @@
   </groupbox>
 
   <!-- Composing Mail -->
-  <groupbox orient="vertical" autostretch="never">
+  <groupbox align="start">
     <caption label="&sendingMessagesHeader.label;"/>
         
     <checkbox id="spellCheckBeforeSend" label="&spellCheck.label;"
-              pref="true" preftype="bool" prefstring="mail.SpellCheckBeforeSend"
-              prefattribute="checked"/>
+              prefstring="mail.SpellCheckBeforeSend"/>
   
-  <checkbox id="strictlyMime" label="&useMIME.label;"
-                pref="true" preftype="bool" prefstring="mail.strictly_mime"
-                prefattribute="checked"/>
+    <checkbox id="strictlyMime" label="&useMIME.label;"
+              prefstring="mail.strictly_mime"/>
     
-	<hbox autostretch="never" align="center">
-	<text class="label" value="&wrapOutMsg.label;" accesskey="&wrapOutMsg.accesskey;" for="wrapLength"/>
-    <textbox id="wrapLength" size="3" pref="true" preftype="int"
+	<hbox align="center">
+        <label value="&wrapOutMsg.label;" accesskey="&wrapOutMsg.accesskey;" control="wrapLength"/>
+    <textbox id="wrapLength" size="3" preftype="int"
                prefstring="mailnews.wraplength" prefattribute="value"/>
-    <text class="label" value="&char.label;"/>
+    <label value="&char.label;"/>
   </hbox>
 
-   <hbox autostretch="never">
-    <text class="label" value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;" for="sendDefaultCharsetList"/>
+   <hbox align="center">
+    <label value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;" page="sendDefaultCharsetList"/>
     <menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
-              pref="true" preftype="localizedstring" prefstring="mailnews.send_default_charset"
-              prefattribute="value">
+              preftype="localizedstring" prefstring="mailnews.send_default_charset">
       <template>
         <menupopup>
           <menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
@@ -125,14 +113,13 @@
   </groupbox>
   
 <!--
-  <groupbox orient="vertical" autostretch="never">
+  <groupbox align="start">
   <caption label="&languages.label;"/>
 
-   <hbox autostretch="never">
-    <text class="label" value="&sendDefaultCharset.label;" for="sendDefaultCharsetList"/>
+   <hbox align="center">
+    <label value="&sendDefaultCharset.label;" control="sendDefaultCharsetList"/>
     <menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
-              pref="true" preftype="localizedstring" prefstring="mailnews.send_default_charset"
-              prefattribute="value">
+              preftype="localizedstring" prefstring="mailnews.send_default_charset">
       <template>
         <menupopup>
           <menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
@@ -142,8 +129,4 @@
     </hbox> 
   </groupbox>
 -->
-              
-      
-
-    
-</window>
+</page>
diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul b/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul
index 936a21776e3..0736be38539 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul
@@ -4,11 +4,8 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/pref-formatting.dtd">
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="Init()"
-        orient="vertical"
-        class="color-dialog">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="Init()">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -25,13 +22,11 @@
         dualerr="&dualEntryError.label;"/>
 
   <broadcaster  id="mailhtmldomain" 
-                pref="true"
                 preftype="string" 
                 prefstring="mailnews.html_domains"
                 prefattribute="value"
                 wsm_attributes="value"/>
   <broadcaster  id="mailplaintextdomain" 
-                pref="true"
                 preftype="string" 
                 prefstring="mailnews.plaintext_domains"
                 prefattribute="value"
@@ -39,29 +34,28 @@
   
   <hbox class="box-smallheader" title="&pane.title;"/>
 
-  <html>&sendMaildesc.label;</html>
+  <description>&sendMaildesc.label;</description>
 
-  <radiogroup id="mailDefaultHTMLAction" orient="vertical" autostretch="never"
-                pref="true" preftype="int" prefstring="mail.default_html_action"
-                prefattribute="value">
-    <radio group="mailDefaultHTMLAction" value="0" label="&askMe.label;"/>
-    <radio group="mailDefaultHTMLAction" value="1" label="&convertPlain.label;"/>                
-    <radio group="mailDefaultHTMLAction" value="2" label="&sendHTML.label;"/>
-    <radio group="mailDefaultHTMLAction" value="3" label="&sendBoth.label;"/>
+  <radiogroup id="mailDefaultHTMLAction"
+              prefstring="mail.default_html_action">
+    <radio value="0" label="&askMe.label;"/>
+    <radio value="1" label="&convertPlain.label;"/>                
+    <radio value="2" label="&sendHTML.label;"/>
+    <radio value="3" label="&sendBoth.label;"/>
   </radiogroup>
     
-  <html>&override.label;</html>
+  <description>&override.label;</description>
 
-  <groupbox orient="vertical" flex="1">
+  <groupbox flex="1">
     <caption label="&domain.title;"/>
 
-    <html>&domaindesc.label;</html>
+    <description>&domaindesc.label;</description>
 
     <hbox flex="1">
       <vbox id="html_box" flex="1">
-        <html>&HTMLdomaintitle.label;</html>
+        <description>&HTMLdomaintitle.label;</description>
         <hbox flex="1">
-          <tree class="inset" id="html_domains" flex="1"
+          <tree id="html_domains" flex="1"
             datasources="rdf:null" multiple="true"
             onkeypress="if (event.keyCode == 8 || event.keyCode == 46) RemoveDomains(htmlobj);">
             <treecolgroup>
@@ -70,19 +64,19 @@
             <treechildren id="html_domains_root" flex="1"/>
           </tree>
           <vbox>
-            <button class="dialog" label="&AddButton.label;" oncommand="AddDomain(htmlobj);">
+            <button label="&AddButton.label;" oncommand="AddDomain(htmlobj);">
               <observes element="mailhtmldomain" attribute="disabled"/>
             </button>
-            <button class="dialog" label="&DeleteButton.label;" oncommand="RemoveDomains(htmlobj);">
+            <button label="&DeleteButton.label;" oncommand="RemoveDomains(htmlobj);">
               <observes element="mailhtmldomain" attribute="disabled"/>
             </button>
           </vbox>
         </hbox>
       </vbox>
       <vbox id="plaintext_box" flex="1">
-        <html>&PlainTexttitle.label;</html>
+        <description>&PlainTexttitle.label;</description>
         <hbox flex="1">
-          <tree class="inset" id="plaintext_domains" flex="1"
+          <tree id="plaintext_domains" flex="1"
             datasources="rdf:null" multiple="true"
             onkeypress="if (event.keyCode == 8 || event.keyCode == 46) RemoveDomains(plainobj);">
             <treecolgroup>
@@ -91,10 +85,10 @@
             <treechildren id="plaintext_domains_root" flex="1"/>
           </tree>
           <vbox>
-            <button class="dialog" label="&AddButton.label;" oncommand="AddDomain(plainobj);">
+            <button label="&AddButton.label;" oncommand="AddDomain(plainobj);">
               <observes element="mailplaintextdomain" attribute="disabled"/>
             </button>
-            <button class="dialog" label="&DeleteButton.label;" oncommand="RemoveDomains(plainobj);">
+            <button label="&DeleteButton.label;" oncommand="RemoveDomains(plainobj);">
               <observes element="mailplaintextdomain" attribute="disabled"/>
             </button>
           </vbox>
@@ -102,4 +96,4 @@
       </vbox>
     </hbox>
   </groupbox>
-</window>
+</page>
diff --git a/mozilla/mailnews/compose/resources/content/MsgAttachPage.xul b/mozilla/mailnews/compose/resources/content/MsgAttachPage.xul
index 295514b2d92..e82a0afc660 100644
--- a/mozilla/mailnews/compose/resources/content/MsgAttachPage.xul
+++ b/mozilla/mailnews/compose/resources/content/MsgAttachPage.xul
@@ -9,7 +9,6 @@
 <window title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
-    orient="vertical"
     class="dialog"> 
 
 <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgAttachPage.js"/> 
@@ -19,7 +18,7 @@
     <spacer style="height:0.5em" />
 	<hbox>
         <spacer style="width:10px" />
-		<text value="Web Page (URL):"/>
+                <label value="Web Page (URL):"/>
 		<textbox id="attachurl" align="bottom" style="min-width:200px; padding-bottom:0px" />
         <spacer style="width:10px" />
 	</hbox>
diff --git a/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.xul b/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.xul
index edc39ba4d29..10bc0aeee82 100644
--- a/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.xul
+++ b/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.xul
@@ -43,7 +43,7 @@ Rights Reserved.
     <treechildren flex="1" id="addressWidgetBody">
       <treeitem>
         <treerow>
-          <treecell class="treecell-addressingWidget" allowevents="true" autostretch="always">
+          <treecell class="treecell-addressingWidget" allowevents="true">
             <menulist id="msgRecipientType#1" class="aw-menulist menulist-compact" flex="1"
                       onclick="awNotAnEmptyArea(event)" disableonsend="true"
                       oncommand="awSetAutoComplete(this.id.slice(this.id.lastIndexOf('#') + 1));">
@@ -58,8 +58,8 @@ Rights Reserved.
             </menulist>
           </treecell>
           <treecell class="treecell-addressingWidget" autostretch="never">
-            <textbox id="msgRecipient#1" class="plain textbox-addressingWidget"
-                     type="autocomplete" allowevents="true" flex="1" 
+            <textbox id="msgRecipient#1" class="textbox-addressingWidget"
+                     type="autocomplete" allowevents="true" flex="1"
                      searchSessions="addrbook" timeout="300" maxrows="4" 
                      autoFill="true" autoFillAfterMatch="true" forceComplete="true"
                      minResultsForPopup="3" 
diff --git a/mozilla/mailnews/compose/resources/content/askSendFormat.xul b/mozilla/mailnews/compose/resources/content/askSendFormat.xul
index 24332be75b3..bc3ff9a6989 100644
--- a/mozilla/mailnews/compose/resources/content/askSendFormat.xul
+++ b/mozilla/mailnews/compose/resources/content/askSendFormat.xul
@@ -9,12 +9,8 @@
 <window id="askSendFormat"
     title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()"
-    orient="vertical"
-    class="dialog"
-    style="-moz-user-input: ignore"
-    >
+    class="dialog">
 
 <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/askSendFormat.js"/>
 
@@ -28,29 +24,29 @@
         </vbox>
         <spacer style="width:10px"/>
         <vbox flex="1">
-            <html>&recipient.label;</html>
+            <description>&recipient.label;</description>
             <deck id="mailSendFormatExplanation">
-                <vbox><html>&convertibleDefault.label;</html></vbox>  <!-- Hack: <vbox> is a workaround for bug 44513. -->
-                <vbox><html>&convertibleYes.label;</html></vbox>
-                <vbox><html>&convertibleAltering.label;</html></vbox>
-                <vbox><html>&convertibleNo.label;</html></vbox>
+                <vbox><description>&convertibleDefault.label;</description></vbox>  <!-- Hack: <vbox> is a workaround for bug 44513. -->
+                <vbox><description>&convertibleYes.label;</description></vbox>
+                <vbox><description>&convertibleAltering.label;</description></vbox>
+                <vbox><description>&convertibleNo.label;</description></vbox>
             </deck>
-            <html>&question.label;</html>
+            <description>&question.label;</description>
             <spacer style="height:1em"/>
 
-      <radiogroup id="mailDefaultHTMLAction" orient="vertical" autostretch="never">
+      <radiogroup id="mailDefaultHTMLAction">
          <hbox>
-                <radio group="mailDefaultHTMLAction" id="SendPlainTextAndHtml" value="0" label="&plainTextAndHtml.label;"/>
-                <html id="plainTextAndHtmlRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</html>
+                <radio id="SendPlainTextAndHtml" value="0" label="&plainTextAndHtml.label;"/>
+                <description id="plainTextAndHtmlRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</description>
                 <!-- Hack: box and html are workarounds for bug 49623 -->
                </hbox>
          <hbox>
-        <radio group="mailDefaultHTMLAction" id="SendPlainTextOnly" value="1" label="&plainTextOnly.label;"/>
-                <html id="plainTextOnlyRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</html>
+        <radio id="SendPlainTextOnly" value="1" label="&plainTextOnly.label;"/>
+                <description id="plainTextOnlyRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</description>
                </hbox>
          <hbox>
-        <radio group="mailDefaultHTMLAction" id="SendHtmlOnly" value="2" label="&htmlOnly.label;"/>
-                <html id="htmlOnlyRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</html>
+        <radio id="SendHtmlOnly" value="2" label="&htmlOnly.label;"/>
+                <description id="htmlOnlyRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</description>
                </hbox>
       </radiogroup>
 
diff --git a/mozilla/mailnews/compose/resources/content/mailComposeBindings.xml b/mozilla/mailnews/compose/resources/content/mailComposeBindings.xml
index b57f666b21f..814bb1cca09 100644
--- a/mozilla/mailnews/compose/resources/content/mailComposeBindings.xml
+++ b/mozilla/mailnews/compose/resources/content/mailComposeBindings.xml
@@ -8,9 +8,9 @@ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <binding id="fromMenuitem"
 extends="chrome://global/content/bindings/menu.xml#menuitem">
     <content autostretch="never" excludes="template,observes,menupopup">
-      <xul:text class="composemenu-text" inherits="value=label,accesskey,crop"
+      <xul:label class="composemenu-text" inherits="value=label,accesskey,crop"
 crop="right"/>
-      <xul:text class="composemenu-text-2" inherits="value=accountname"
+      <xul:label class="composemenu-text-2" inherits="value=accountname"
 crop="right"/>
     </content>
   </binding>
diff --git a/mozilla/mailnews/compose/resources/content/messengercompose.xul b/mozilla/mailnews/compose/resources/content/messengercompose.xul
index 44a432e755e..cfaf759bb2d 100644
--- a/mozilla/mailnews/compose/resources/content/messengercompose.xul
+++ b/mozilla/mailnews/compose/resources/content/messengercompose.xul
@@ -54,7 +54,6 @@
         onclose="return DoCommandClose()"
         title="&msgComposeWindow.title;"
         windowtype="msgcompose"
-        orient="vertical"
         width="640" height="480"
         persist="screenX screenY width height sizemode"> 
 
@@ -384,7 +383,7 @@
                tooltip="aTooltip" tooltiptext="&saveButton.tooltip;" 
                command="cmd_saveDefault"/>
        <spacer flex="1"/>
-       <hbox id="throbber-box" autostretch="never">
+       <hbox id="throbber-box" align="center">
          <button id="navigator-throbber" 
                oncommand="goClickThrobber('compose.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
            <observes element="broadcaster_throbber" attribute="busy"/>
@@ -396,22 +395,22 @@
     <toolbar id="MsgHeadersToolbar" persist="collapsed" tborient="vertical" tbalign="stretch" flex="1" grippytooltip="aTooltip" grippytooltiptext="&addressBar.tooltip;">
       <hbox id="msgheaderstoolbar-box" flex="1">
         <vbox flex="75">
-          <hbox autostretch="never">
-            <text class="label" value="&fromAddr.label;"/>
+          <hbox align="center">
+            <label value="&fromAddr.label;"/>
             <menulist id="msgIdentity" label="..." flex="1" oncommand="LoadIdentity(false);">
               <menupopup id="msgIdentityPopup"/>
             </menulist>
           </hbox> 
           <tree id="addressingWidgetTree" flex="1"/>
-          <hbox autostretch="never">
-            <text class="label" value="&subject.label;" accesskey="&subject.accesskey;"/>
+          <hbox align="center">
+            <label value="&subject.label;" accesskey="&subject.accesskey;"/>
             <textbox id="msgSubject" flex="1" class="toolbar" onkeyup="SetComposeWindowTitle(event.which);" disableonsend="true"
                        onkeypress="subjectKeyPress(event);" onchange="contentChanged=true;"/>
           </hbox>
         </vbox>
         <splitter id="attachmentbucket-sizer" collapse="after"/>
         <vbox flex="25">
-          <text class="label" id="attachmentBucketText" value="&attachments.label;" crop="right"
+          <label id="attachmentBucketText" value="&attachments.label;" crop="right"
                 accesskey="&attachments.accesskey;"/>
           <tree id="attachmentBucket" class="inset toolbar" flex="1" style="height: 0px; width: 0px;"
                 dragdroptree="true"
diff --git a/mozilla/mailnews/compose/resources/content/sendProgress.xul b/mozilla/mailnews/compose/resources/content/sendProgress.xul
index 623b476a4c5..da05f3f9cd6 100644
--- a/mozilla/mailnews/compose/resources/content/sendProgress.xul
+++ b/mozilla/mailnews/compose/resources/content/sendProgress.xul
@@ -30,10 +30,8 @@ Contributor(s):
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/sendProgress.dtd">
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
-  		  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
-        orient="vertical"
         title="&sendWindow.title;"
         style="width: 36em;"
         onload="onLoad()"
@@ -64,24 +62,24 @@ Contributor(s):
       <rows>
         <row>
           <hbox pack="end">
-            <text class="label" value="&status;"/>
+            <label value="&status;"/>
           </hbox>
-          <text class="label" id="dialog.status"/>
+          <label id="dialog.status"/>
         </row>
         <row class="thin-separator">             
           <hbox pack="end">
-            <text class="label" value="&progress;"/>
+            <label value="&progress;"/>
           </hbox>
           <progressmeter id="dialog.progress" mode="normal" value="0"/>
           <hbox pack="end">
-            <text class="label" id="dialog.progressText"/>
+            <label id="dialog.progressText"/>
           </hbox>
         </row>
       </rows>
     </grid>
     <separator/>
     <hbox id="CancelButton" pack="end">
-      <button class="dialog" id="cancel" label="&dialogCancel.label;" oncommand="doCancelButton()"/>
+      <button id="cancel" label="&dialogCancel.label;" oncommand="doCancelButton()"/>
     </hbox>
 
 </window>
diff --git a/mozilla/mailnews/import/resources/content/fieldMapImport.xul b/mozilla/mailnews/import/resources/content/fieldMapImport.xul
index f97f477d61f..4d8afdf925f 100644
--- a/mozilla/mailnews/import/resources/content/fieldMapImport.xul
+++ b/mozilla/mailnews/import/resources/content/fieldMapImport.xul
@@ -28,11 +28,10 @@ Rights Reserved.
 
 
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&fieldMapImport.title;"
-    class="dialog"
-        onload="OnLoadFieldMapImport()"
-        orient="vertical">
+        class="dialog"
+        onload="OnLoadFieldMapImport()">
 
   <script type="application/x-javascript" src="chrome://messenger/content/fieldMapImport.js"/>
 
@@ -64,13 +63,13 @@ Rights Reserved.
 
   <hbox>
     <spacer flex="50%"/>
-    <button class="dialog" id="previous" oncommand="OnPreviousRecord()" label="&fieldMapImport.previous;"/>
+    <button id="previous" oncommand="OnPreviousRecord()" label="&fieldMapImport.previous;"/>
     <spacer style="width: 2em"/>
-    <text value="&fieldMapImport.recordNumber;"/>
+    <label value="&fieldMapImport.recordNumber;"/>
     <spacer style="width: 1em"/>
-    <text id="recordNumber"/>
+    <label id="recordNumber"/>
     <spacer style="width: 2em"/>
-    <button class="dialog" id="next" oncommand="OnNextRecord()" label="&fieldMapImport.next;"/>
+    <button id="next" oncommand="OnNextRecord()" label="&fieldMapImport.next;"/>
     <spacer flex="50%"/>    
   </hbox>
 
diff --git a/mozilla/mailnews/import/resources/content/importDialog.xul b/mozilla/mailnews/import/resources/content/importDialog.xul
index 2a2d983a6a6..9aafe5bda8d 100644
--- a/mozilla/mailnews/import/resources/content/importDialog.xul
+++ b/mozilla/mailnews/import/resources/content/importDialog.xul
@@ -32,8 +32,8 @@ Rights Reserved.
 
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="OnLoadImportDialog()" class="color-dialog"
-        orient="vertical" style="width: 40em;"
+        onload="OnLoadImportDialog()"
+        style="width: 40em;"
         title="&importDialog.windowTitle;">
 
   <stringbundle id="bundle_importMsgs" src="chrome://messenger/locale/importMsgs.properties"/>
@@ -47,57 +47,57 @@ Rights Reserved.
 
   <deck id="stateDeck" selectedIndex="0">
     <vbox class="wizard-box">
-      <html>&importDescription.label;</html>
-      <html>&importDescription2.label;</html>
+      <description>&importDescription.label;</description>
+      <description>&importDescription2.label;</description>
       <separator/>
-      <html>&select.label;</html>
+      <description>&select.label;</description>
       <separator class="thin"/>
-      <radiogroup id="importFields" orient="vertical" class="indent" autostretch="never">
-        <radio group="importFields" value="addressbook" id="addressbookRadio" label="&importDialog.addressbookTitle;"/>
-        <radio group="importFields" value="mail" id="mailRadio" label="&importDialog.mailTitle;"/>
-        <radio group="importFields" value="settings" id="settingsRadio" label="&importDialog.settingsTitle;"/>
+      <radiogroup id="importFields" class="indent">
+        <radio value="addressbook" id="addressbookRadio" label="&importDialog.addressbookTitle;"/>
+        <radio value="mail" id="mailRadio" label="&importDialog.mailTitle;"/>
+        <radio value="settings" id="settingsRadio" label="&importDialog.settingsTitle;"/>
       </radiogroup>
     </vbox>
     <vbox class="wizard-box">
-      <html>&selectDescription.label;</html>
-      <tree class="inset" id="moduleList" flex="3" onselect="ImportSelectionChanged(); enableAdvance();" 
+      <description>&selectDescription.label;</description>
+      <tree id="moduleList" flex="3" onselect="ImportSelectionChanged(); enableAdvance();" 
             style="height: 0px;">
         <treecolgroup>
           <treecol flex="1"/>
         </treecolgroup>
         <treechildren id="bucketBody" flex="1"/>
       </tree>
-      <html id="description" class="box-padded" flex="1"/>
+      <description id="description" class="box-padded" flex="1"/>
     </vbox>
     <vbox class="wizard-box">
       <spacer flex="1"/>
-      <groupbox orient="vertical">
+      <groupbox>
         <caption id="progressTitle" label="&title.label;"/>
-        <text class="label indent" id="progressStatus" value="&processing.label;"/>
+        <label class="indent" id="progressStatus" value="&processing.label;"/>
         <vbox class="box-padded">
           <progressmeter id="progressMeter" mode="normal" value="5"/>
         </vbox>
       </groupbox>
     </vbox>
     <vbox class="wizard-box">
-      <html id="status"/>
-      <hbox style="overflow: auto" class="inset color-window" flex="1">
-        <html id="results" flex="1"/>
+      <description id="status"/>
+      <hbox style="overflow: auto" class="inset" flex="1">
+        <description id="results" flex="1"/>
       </hbox>
     </vbox>
     <vbox class="wizard-box">
-      <html>&FieldDiscInputText1.label;</html>
-      <html>&FieldDiscInputText2.label;</html>
+      <description>&FieldDiscInputText1.label;</description>
+      <description>&FieldDiscInputText2.label;</description>
       <separator/>
       <separator class="thin"/>
-      <radiogroup id="homeorwork" orient="vertical" class="indent" autostretch="never">
-        <radio group="homeorwork" value="Home" id="homeRadio" label="&importDialog.homeTitle;"/>
-        <radio group="homeorwork" value="Work" id="workRadio" label="&importDialog.workTitle;"/>
+      <radiogroup id="homeorwork" class="indent">
+        <radio value="Home" id="homeRadio" label="&importDialog.homeTitle;"/>
+        <radio value="Work" id="workRadio" label="&importDialog.workTitle;"/>
       </radiogroup>
          <separator/>
          <separator/>
-         <html>&FieldDiscWarning.label;</html>
-         <text id="warning" flex="1"/>
+         <description>&FieldDiscWarning.label;</description>
+         <label id="warning" flex="1"/>
     </vbox>
   </deck>
 
diff --git a/mozilla/mailnews/import/resources/content/importProgress.xul b/mozilla/mailnews/import/resources/content/importProgress.xul
index 750363e87b2..05b35feb036 100644
--- a/mozilla/mailnews/import/resources/content/importProgress.xul
+++ b/mozilla/mailnews/import/resources/content/importProgress.xul
@@ -29,16 +29,15 @@ Rights Reserved.
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
-        onload="OnLoadProgressDialog()"
-        orient="vertical">
+        onload="OnLoadProgressDialog()">
 
   <script type="application/x-javascript" src="chrome://messenger/content/importProgress.js"/>
 
 	<keyset id="dialogKeys"/>
 
-	<text class="header" id="progressTitle" value="&title.label;"/>
+        <description class="header" id="progressTitle" value="&title.label;"/>
 	
-	<text class="label" id="progressStatus" value="&processing.label;" flex="1"/>
+        <description id="progressStatus" value="&processing.label;" flex="1"/>
 				
 	<progressmeter id="progressMeter" mode="normal" value="5" flex="1"/>
 
diff --git a/mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.xul b/mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.xul
index 9a9047af374..5cc65874d15 100644
--- a/mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.xul
+++ b/mozilla/mailnews/mapi/resources/content/pref-mailnewsOverlay.xul
@@ -35,7 +35,7 @@ Contributor(s):
   ]]>
 </script>         
 <script type="application/x-javascript" src="chrome://messenger/content/pref-mailnewsOverlay.js"/>
-<hbox autostretch="never" id="mapi">
+<hbox align="center" id="mapi">
   <checkbox id="mailnewsEnableMapi" label="&enableMapi.label;"
             accesskey="&enableMapi.accesskey;" 
             initFunc="mailnewsOverlayInit();"/>
diff --git a/mozilla/mailnews/news/resources/content/downloadheaders.xul b/mozilla/mailnews/news/resources/content/downloadheaders.xul
index 64e1454e8b0..6ceab8807eb 100644
--- a/mozilla/mailnews/news/resources/content/downloadheaders.xul
+++ b/mozilla/mailnews/news/resources/content/downloadheaders.xul
@@ -30,8 +30,7 @@ Contributor(s):
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/downloadheaders.dtd">
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="dialog" style="max-width: 27em; -moz-user-focus: ignore !important"
-        orient="vertical"
+        class="dialog" style="max-width: 27em;"
         onload="OnLoad()">
 
   <stringbundle id="bundle_news" src="chrome://messenger/locale/news.properties"/>
@@ -39,20 +38,20 @@ Contributor(s):
 
   <keyset id="dialogKeys"/>
   
-  <html class="header" style="width: 25em; max-width: 25em;" id="newsgroupLabel"/> 
-  <html style="width: 25em; max-width: 25em;" id="info"/>
+  <description class="header" style="width: 25em; max-width: 25em;" id="newsgroupLabel"/> 
+  <description style="width: 25em; max-width: 25em;" id="info"/>
   <separator class="thin"/>
   <vbox class="indent">
-    <radiogroup orient="vertical" id="downloadGroup" autostretch="never">
-      <radio group="downloadGroup" id="all" label="&all.label;" oncommand="setupDownloadUI(false);"/> 
+    <radiogroup id="downloadGroup">
+      <radio id="all" label="&all.label;" oncommand="setupDownloadUI(false);"/> 
       <separator class="thin"/>
-      <hbox autostretch="never" valign="middle">
-        <radio group="downloadGroup" id="some" checked="true" label="&download.label;" oncommand="setupDownloadUI(true);"/>
+      <hbox align="center" valign="middle">
+        <radio id="some" checked="true" label="&download.label;" oncommand="setupDownloadUI(true);"/>
         <textbox id="number" size="7"/>
-        <text class="label" value="&headers.label;" />
+        <description value="&headers.label;" />
       </hbox>
     </radiogroup>
-    <hbox class="indent" autostretch="never">
+    <hbox class="indent" align="start">
       <checkbox id="markread" label="&mark.label;"/>
     </hbox>
   </vbox>
diff --git a/mozilla/themes/classic/communicator/bookmarks/mac/platformBookmarks.css b/mozilla/themes/classic/communicator/bookmarks/mac/platformBookmarks.css
index 433f11a9518..6f55d3f52c9 100644
--- a/mozilla/themes/classic/communicator/bookmarks/mac/platformBookmarks.css
+++ b/mozilla/themes/classic/communicator/bookmarks/mac/platformBookmarks.css
@@ -8,6 +8,7 @@
       border-bottom       : 1px solid #DDDDDD;
       border-left         : 1px solid #9D9D9D;
       border-right        : 1px solid #FFFFFF;
+      margin              : 0px 0px 0px 0px !important;
     }
 
   .bookmarks-window-tree > .tree-container-treerows
diff --git a/mozilla/themes/classic/communicator/bookmarks/win/platformBookmarks.css b/mozilla/themes/classic/communicator/bookmarks/win/platformBookmarks.css
index dc0c3bd650d..8c4792a82c9 100644
--- a/mozilla/themes/classic/communicator/bookmarks/win/platformBookmarks.css
+++ b/mozilla/themes/classic/communicator/bookmarks/win/platformBookmarks.css
@@ -10,6 +10,7 @@
       border-bottom       : none;
       border-left         : 1px solid ThreeDShadow;
       border-right        : 1px solid ThreeDHighlight;
+      margin              : 0px 0px 0px 0px !important;
     }
 
   .bookmarks-window-tree > .tree-container-treerows
diff --git a/mozilla/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml b/mozilla/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml
index 666fe1f336a..de5200daad6 100644
--- a/mozilla/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml
+++ b/mozilla/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml
@@ -24,7 +24,7 @@
     <content>
       <xul:hbox class="panelheader-box-1" flex="1">
         <xul:image class="panelheader-image" inherits="src"/>
-        <xul:text class="panelheader-icon" inherits="value=label,crop"/>
+        <xul:label class="panelheader-icon" inherits="value=label,crop"/>
       </xul:hbox>
     </content>
   </binding>
diff --git a/mozilla/themes/classic/communicator/sidebar/win/sidebar.css b/mozilla/themes/classic/communicator/sidebar/win/sidebar.css
index 5d341115113..c4e14c11feb 100644
--- a/mozilla/themes/classic/communicator/sidebar/win/sidebar.css
+++ b/mozilla/themes/classic/communicator/sidebar/win/sidebar.css
@@ -174,4 +174,8 @@
       border-right          : 1px solid ThreeDShadow;
     }  
 
-    
+  .panelheader-text
+    {
+      margin                : 0px 0px 0px 0px !important;
+    }
+    
\ No newline at end of file
diff --git a/mozilla/themes/classic/communicator/sidebar/win/sidebarBindings.xml b/mozilla/themes/classic/communicator/sidebar/win/sidebarBindings.xml
index 1118a8d314c..c72e16dc0b4 100644
--- a/mozilla/themes/classic/communicator/sidebar/win/sidebarBindings.xml
+++ b/mozilla/themes/classic/communicator/sidebar/win/sidebarBindings.xml
@@ -11,7 +11,7 @@
           <xul:image class="panelheader-grippy-icon" inherits="selected"/>
           <xul:image class="panelheader-image" inherits="src"/>
           <xul:vbox flex="1">
-            <xul:text class="panelheader-icon" inherits="value=label" crop="right"/>
+            <xul:label class="panelheader-text" inherits="value=label" crop="right"/>
           </xul:vbox>
           <xul:spacer flex="1"/>
         </xul:hbox>
diff --git a/mozilla/themes/classic/communicator/win/communicator.css b/mozilla/themes/classic/communicator/win/communicator.css
index 373ee9bbe19..024c3039509 100644
--- a/mozilla/themes/classic/communicator/win/communicator.css
+++ b/mozilla/themes/classic/communicator/win/communicator.css
@@ -44,6 +44,7 @@
 .sidebarTree
   {
     border                : none;
+    margin                : 0px 0px 0px 0px !important;
   }
 
 .sidebarTree > .tree-container-treerows
diff --git a/mozilla/themes/classic/global/mac/buttonBindings.xml b/mozilla/themes/classic/global/mac/buttonBindings.xml
index 94afa214972..a9c2aa0bbe6 100644
--- a/mozilla/themes/classic/global/mac/buttonBindings.xml
+++ b/mozilla/themes/classic/global/mac/buttonBindings.xml
@@ -67,7 +67,7 @@
     <content>
       <xul:vbox flex="1" align="center">
         <xul:image class="simplebutton-icon" inherits="src,disabled"/>
-        <xul:text class="simplebutton-text" inherits="value=label,accesskey,crop,disabled"/>
+        <xul:label class="simplebutton-text" inherits="value=label,accesskey,crop,disabled"/>
         <children/>
       </xul:vbox>
     </content>
diff --git a/mozilla/themes/classic/global/mac/classicBindings.xml b/mozilla/themes/classic/global/mac/classicBindings.xml
index 88a58a580fd..1044906a96a 100644
--- a/mozilla/themes/classic/global/mac/classicBindings.xml
+++ b/mozilla/themes/classic/global/mac/classicBindings.xml
@@ -7,8 +7,8 @@
   <binding id="textdisabled" extends="xul:text">
     <content>
       <xul:stack>
-        <xul:text class="text-bottom" inherits="value,accesskey,crop"/>
-        <xul:text class="text-top" inherits="value,accesskey,crop"/>
+        <xul:label class="text-bottom" inherits="value,accesskey,crop"/>
+        <xul:label class="text-top" inherits="value,accesskey,crop"/>
       </xul:stack>
     </content>
   </binding>
@@ -37,11 +37,11 @@
       <xul:hbox flex="1" class="radio-internal-box" align="center">
         <xul:hbox class="radio-checkmark-box-1" align="center" inherits="disabled">
           <xul:hbox class="radio-checkmark-box-2" align="center" flex="1">
-            <xul:image class="radio-check" inherits="checked,disabled"/>
+            <xul:image class="radio-check" inherits="selected,disabled"/>
           </xul:hbox>
         </xul:hbox>
         <xul:image class="radio-icon" inherits="src,disabled"/>
-        <xul:html class="radio-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
+        <xul:description class="radio-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
       </xul:hbox>
     </content>
   </binding>
@@ -55,7 +55,7 @@
           </xul:hbox>
         </xul:hbox>
         <xul:image class="checkbox-icon" inherits="src,disabled"/>
-        <xul:html class="checkbox-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
+        <xul:description class="checkbox-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
       </xul:hbox>
     </content>
   </binding>
@@ -146,7 +146,7 @@
     <content>
       <xul:hbox class="treeheader-box" flex="1" align="center">
         <xul:image class="treeheader-icon" inherits="src,loading"/>
-        <xul:text class="treeheader-text" inherits="value=label,crop" crop="right"/>
+        <xul:label class="treeheader-text" inherits="value=label,crop" crop="right"/>
       </xul:hbox>
     </content>
   </binding>
@@ -156,7 +156,7 @@
       <xul:spacer class="tab-image-left" inherits="selected"/>
       <xul:hbox flex="1" class="tab-image-middle" align="center" inherits="selected">
         <xul:image class="tab-left"/>
-        <xul:text flex="1" inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
+        <xul:label flex="1" inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
       </xul:hbox>
       <xul:spacer class="tab-image-right" inherits="selected"/>
     </content>
@@ -179,7 +179,7 @@
           <xul:image inherits="src" class="box-header-icon"/>
         </xul:hbox>
         <xul:hbox class="box-header-text-box" align="center">
-          <xul:text class="box-header-text" inherits="value=title"/>
+          <xul:label class="box-header-text" inherits="value=title"/>
         </xul:hbox>
         <xul:spacer flex="1"/>
       </xul:hbox>
@@ -190,7 +190,7 @@
     <content>
       <xul:hbox align="center" flex="1">
         <xul:image class="toolbarbutton-left-icon" inherits="src,disabled"/>
-        <xul:text class="toolbarbutton-left-text" inherits="value=label,crop"/>
+        <xul:label class="toolbarbutton-left-text" inherits="value=label,crop"/>
       </xul:hbox>
     </content>
   </binding>  
@@ -199,7 +199,7 @@
     <content>
       <xul:vbox flex="1" align="center">
         <xul:image class="toolbarbutton-top-icon" inherits="src,disabled"/>
-        <xul:text class="toolbarbutton-top-text" inherits="value=label,crop"/>
+        <xul:label class="toolbarbutton-top-text" inherits="value=label,crop"/>
       </xul:vbox>
     </content>
   </binding>  
diff --git a/mozilla/themes/classic/global/mac/menulistBindings.xml b/mozilla/themes/classic/global/mac/menulistBindings.xml
index 62f9976f4a6..46afdcad056 100644
--- a/mozilla/themes/classic/global/mac/menulistBindings.xml
+++ b/mozilla/themes/classic/global/mac/menulistBindings.xml
@@ -22,7 +22,7 @@
 
         <xul:hbox class="menulist-text-box" align="center">
          <xul:image class="menulist-icon-mid" inherits="src"/>
-         <xul:text class="menulist-text-mid" inherits="disabled,value=label,crop,accesskey" crop="right" flex="1"/>
+         <xul:label class="menulist-text-mid" inherits="disabled,value=label,crop,accesskey" crop="right" flex="1"/>
        </xul:hbox>
      </xul:stack>
       
@@ -43,7 +43,7 @@
       <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
         <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
         <xul:spacer flex="1"/>
-        <xul:text class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
+        <xul:label class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
       </xul:hbox>
 	  <children includes="menupopup"/>
     </content>
diff --git a/mozilla/themes/classic/global/mac/radio.css b/mozilla/themes/classic/global/mac/radio.css
index 4cbd707c09d..10db8270a66 100644
--- a/mozilla/themes/classic/global/mac/radio.css
+++ b/mozilla/themes/classic/global/mac/radio.css
@@ -33,17 +33,17 @@
       list-style-image: none;
     }
 
-  radio[checked="true"] > .internal-box > .checkmark-box > image 
+  radio[selected="true"] > .internal-box > .checkmark-box > image 
     {
       list-style-image: url(chrome://global/skin/check-radio-check.gif);
     }
   
-  radio[checked="true"][disabled="true"] > .internal-box > .checkmark-box > image
+  radio[selected="true"][disabled="true"] > .internal-box > .checkmark-box > image
     {
       list-style-image: url(chrome://global/skin/check-radio-check-disable.gif);
     }
 
-  radio[checked="true"]:hover:active > .internal-box > .checkmark-box > image
+  radio[selected="true"]:hover:active > .internal-box > .checkmark-box > image
     {
   	  list-style-image: url(chrome://global/skin/check-radio-check-active.gif);  
     }
diff --git a/mozilla/themes/classic/global/win/buttonBindings.xml b/mozilla/themes/classic/global/win/buttonBindings.xml
index 5bf0549d3c9..bd6d3669647 100644
--- a/mozilla/themes/classic/global/win/buttonBindings.xml
+++ b/mozilla/themes/classic/global/win/buttonBindings.xml
@@ -27,7 +27,7 @@
     <content>
       <xul:vbox flex="1" align="center">
         <xul:image class="simplebutton-icon" inherits="src,disabled"/>
-        <xul:text class="simplebutton-text" inherits="value=label,accesskey,crop,disabled"/>
+        <xul:label class="simplebutton-text" inherits="value=label,accesskey,crop,disabled"/>
       </xul:vbox>
     </content>
   </binding>
diff --git a/mozilla/themes/classic/global/win/classicBindings.xml b/mozilla/themes/classic/global/win/classicBindings.xml
index 83b6e9370ca..0c2e05a8a0a 100644
--- a/mozilla/themes/classic/global/win/classicBindings.xml
+++ b/mozilla/themes/classic/global/win/classicBindings.xml
@@ -7,8 +7,8 @@
   <binding id="textdisabled" extends="xul:text">
     <content>
       <xul:stack>
-        <xul:text class="text-bottom" inherits="value,accesskey,crop"/>
-        <xul:text class="text-top" inherits="value,accesskey,crop"/>
+        <xul:label class="text-bottom" inherits="value,accesskey,crop"/>
+        <xul:label class="text-top" inherits="value,accesskey,crop"/>
       </xul:stack>
     </content>
   </binding>
@@ -38,12 +38,12 @@
       <xul:hbox flex="1" class="radio-internal-box" align="center">
         <xul:hbox class="radio-checkmark-box-1" align="center" inherits="disabled">
           <xul:hbox class="radio-checkmark-box-2" align="center" flex="1">
-            <xul:image class="radio-check" inherits="checked,disabled"/>
+            <xul:image class="radio-check" inherits="selected,disabled"/>
           </xul:hbox>
         </xul:hbox>
         <xul:hbox class="radio-text-container" flex="1" align="center">
           <xul:image class="radio-icon" inherits="src,disabled"/>
-          <xul:html class="radio-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
+          <xul:label class="radio-text" inherits="xbl:text=label,accesskey,crop,disabled" flex="1"/>
         </xul:hbox>          
       </xul:hbox>
     </content>
@@ -58,7 +58,7 @@
           </xul:hbox>
         </xul:hbox>
         <xul:image class="checkbox-icon" inherits="src,disabled"/>
-        <xul:html class="checkbox-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
+        <xul:label class="checkbox-text" inherits="xbl:text=label,accesskey,crop,disabled" flex="1"/>
       </xul:hbox>
     </content>
   </binding>
@@ -112,8 +112,8 @@
         <xul:image/>
       </xul:vbox>
       <xul:spacer class="menuitem-iconic-spacer"/>
-      <xul:text class="menu-iconic-text" flex="1" align="left" inherits="value=label,accesskey,crop" crop="right"/>
-      <xul:text class="menu-iconic-accel" inherits="value=acceltext"/>
+      <xul:label class="menu-iconic-text" flex="1" align="left" inherits="value=label,accesskey,crop" crop="right"/>
+      <xul:label class="menu-iconic-accel" inherits="value=acceltext"/>
     </content>
   </binding>
 
@@ -122,8 +122,8 @@
       <xul:hbox class="largeheader-box" flex="1">
         <xul:vbox class="largeheader-text-container">
           <xul:spacer flex="1"/>
-          <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
-          <xul:html class="largeheader-desc-text" inherits="value=description"/>
+          <xul:label class="largeheader-header-text" inherits="value=title" crop="right"/>
+          <xul:label class="largeheader-desc-text" inherits="value=description"/>
           <xul:spacer flex="1"/>
         </xul:vbox>
         <xul:spacer flex="1"/>
@@ -138,7 +138,7 @@
     <content>
       <xul:hbox flex="1" align="center">
         <xul:image class="toolbarbutton-left-icon" inherits="src,disabled"/>
-        <xul:text class="toolbarbutton-left-text" inherits="value=label,crop"/>
+        <xul:label class="toolbarbutton-left-text" inherits="value=label,crop"/>
       </xul:hbox>
     </content>
   </binding>  
@@ -147,7 +147,7 @@
     <content>
       <xul:vbox flex="1" align="center">
         <xul:image class="toolbarbutton-top-icon" inherits="src,disabled"/>
-        <xul:text class="toolbarbutton-top-text" inherits="value=label,crop"/>
+        <xul:label class="toolbarbutton-top-text" inherits="value=label,crop"/>
       </xul:vbox>
     </content>
   </binding>  
@@ -164,8 +164,8 @@
   <binding id="disabled-text" extends="xul:stack">
     <content>
       <xul:stack class="disabled-text-stack">
-        <xul:text class="disabled-text-bottom"/>
-        <xul:text class="disabled-text-top"/>
+        <xul:label class="disabled-text-bottom"/>
+        <xul:label class="disabled-text-top"/>
       </xul:stack>        
     </content>  
   </binding>
diff --git a/mozilla/themes/classic/global/win/formatting.css b/mozilla/themes/classic/global/win/formatting.css
index 70e160dafdd..e7280dc9054 100644
--- a/mozilla/themes/classic/global/win/formatting.css
+++ b/mozilla/themes/classic/global/win/formatting.css
@@ -1,17 +1,3 @@
-/* colors */
-
-.color-dialog
-  {
-    background-color      : -moz-Dialog;
-    color                 : -moz-DialogText;
-  }
-  
-.color-window
-  {
-    background-color      : Window;
-    color                 : WindowText;
-  }
-
 /* inset areas */
 .inset
   {
@@ -115,10 +101,6 @@
 
 /** text formatting rules **/
 /* label (with margins) */
-  text.label 
-    {
-      margin              : 1px 5px 2px 6px;
-    }
 
 /** Reduced Margin for some UI **/
   .small-margin
@@ -128,26 +110,24 @@
     
   .plain 
     {
-      margin: 0px;
+      margin: 0px !important;
       border: none;
       padding: 0px;
     }
 
-  text[disabled="true"] 
+  label[disabled="true"] 
     {
       color                 : GrayText;
     }    
     
-  html, description
+  description
     {
       margin              : 1px 5px 4px 5px;
-      cursor              : default;
     }
 
   label
     {
       margin              : 1px 5px 2px 6px;
-      cursor              : default;
     }
 
   .header 
@@ -227,3 +207,8 @@
     {
       border                : 1px solid ThreeDDarkShadow;
     }   
+
+  .caption-text
+    {
+      margin: 0px 2px 0px 1px !important;
+    }
\ No newline at end of file
diff --git a/mozilla/themes/classic/global/win/menu.css b/mozilla/themes/classic/global/win/menu.css
index 9d120e61aae..682e40601e9 100644
--- a/mozilla/themes/classic/global/win/menu.css
+++ b/mozilla/themes/classic/global/win/menu.css
@@ -106,28 +106,28 @@ popup > menuitem[menuactive="true"]
 
 .menu-iconic-text
   {
-    margin                : 2px 2px 2px 0px;
+    margin                : 2px 2px 2px 0px !important;
   }
 
 .menu-text 
   {
-    margin                : 2px 2px 2px 23px;
+    margin                : 2px 2px 2px 23px !important;
   }
 
 .menu-accel 
   {
-    margin                : 2px 14px 2px 10px;
+    margin                : 2px 14px 2px 10px !important;
   }
 
 .menu-iconic-accel 
   {
-    margin                : 2px 14px 2px 4px;
+    margin                : 2px 14px 2px 4px !important;
   }
 
 .menubar-text 
   {
     color                 : inherit;
-    margin-right          : 2px;
+    margin                : 0px 2px 0px 0px !important;
   }
 
 menuitem[checked="true"] 
@@ -205,8 +205,8 @@ menuitem[checked="true"][type="radio"][menuactive="true"]
   menulist > menupopup > menu > .menu-iconic-text,
   menulist > menupopup > menu > .menu-iconic-accel
     {
-      margin-top          : 0px;
-      margin-bottom       : 0px;
+      margin-top          : 0px !important;
+      margin-bottom       : 0px !important;
     }
 
   menulist > menupopup > menuitem[menuactive="true"]
diff --git a/mozilla/themes/classic/global/win/menulist.css b/mozilla/themes/classic/global/win/menulist.css
index 0a17d23377d..9f2ee58964e 100644
--- a/mozilla/themes/classic/global/win/menulist.css
+++ b/mozilla/themes/classic/global/win/menulist.css
@@ -49,7 +49,7 @@
   .menulist-text 
     {
       padding             : 0px 2px 0px 2px;
-      margin              : 0px;
+      margin              : 0px 0px 0px 0px !important;
     }
     
 /* drop marker display frame */
@@ -123,7 +123,7 @@
     
   .menulist-compact-text
     {
-      margin-right        : 3px;
+      margin        : 0px 3px 0px 0px !important;
     }  
 
   .menulist-compact:hover:active,
diff --git a/mozilla/themes/classic/global/win/menulistBindings.xml b/mozilla/themes/classic/global/win/menulistBindings.xml
index 91b622e3c1c..f9de7d611c4 100644
--- a/mozilla/themes/classic/global/win/menulistBindings.xml
+++ b/mozilla/themes/classic/global/win/menulistBindings.xml
@@ -11,7 +11,7 @@
       <xul:hbox class="menulist-internal-box" flex="1">
         <xul:hbox class="menulist-display-box" flex="1" align="center">
           <xul:image class="menulist-icon" inherits="src"/>
-          <xul:text class="menulist-text" inherits="value=label,crop,accesskey" crop="right" flex="1"/>
+          <xul:label class="menulist-text" inherits="value=label,crop,accesskey" crop="right" flex="1"/>
         </xul:hbox>
         <xul:hbox class="menulist-dropmarker-box-1" inherits="open">
           <xul:hbox class="menulist-dropmarker-box-2" flex="1" align="center" pack="center" inherits="open">
@@ -55,7 +55,7 @@
       <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
         <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
         <xul:spacer flex="1"/>
-        <xul:text class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
+        <xul:label class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
       </xul:hbox>
     <children includes="menupopup"/>
     </content>
diff --git a/mozilla/themes/classic/global/win/outliner.css b/mozilla/themes/classic/global/win/outliner.css
index 3ccfdb8d078..36e3177de0d 100644
--- a/mozilla/themes/classic/global/win/outliner.css
+++ b/mozilla/themes/classic/global/win/outliner.css
@@ -188,3 +188,7 @@ outlinerbody:-moz-outliner-twisty(open) {
 outlinerbody:-moz-outliner-indentation {
   width: 16px;
 }
+
+.outlinercol-text {
+  margin: 0px 0px 0px 0px !important;
+}
\ No newline at end of file
diff --git a/mozilla/themes/classic/global/win/radio.css b/mozilla/themes/classic/global/win/radio.css
index 3b06afb494c..64631b9703b 100644
--- a/mozilla/themes/classic/global/win/radio.css
+++ b/mozilla/themes/classic/global/win/radio.css
@@ -43,12 +43,12 @@
       list-style-image    : none;
     }
 
-  .radio-check[checked="true"]
+  .radio-check[selected="true"]
     {
       list-style-image    : url(chrome://global/skin/check-radio.gif);
     }
   
-  .radio-check[checked="true"][disabled="true"]
+  .radio-check[selected="true"][disabled="true"]
     {
       list-style-image    : url(chrome://global/skin/check-radio-disabled.gif);
     }
diff --git a/mozilla/themes/classic/global/win/tabbox.css b/mozilla/themes/classic/global/win/tabbox.css
index 487d3590367..c7f826c1c29 100644
--- a/mozilla/themes/classic/global/win/tabbox.css
+++ b/mozilla/themes/classic/global/win/tabbox.css
@@ -13,7 +13,7 @@ tabs + tabpanels {
 }
 
 /* bottom tabs */
-tabbox[orient="vertical"] > tabpanels {
+tabbox > tabpanels {
   border-top: 1px solid ThreeDHighlight;
   border-bottom: none;
   border-left: 1px solid ThreeDHighlight;
@@ -49,12 +49,12 @@ tabpanels.light {
 /* tabs-spacer ========================== */
 
 /* top tabs */
-tabbox[orient="vertical"] > tabs > .tabs-spacer {
+tabbox > tabs > .tabs-spacer {
   border-bottom: 1px solid ThreeDHighlight;
 }
 
 /* bottom tabs */
-tabbox[orient="vertical"] > tabpanels + tabs > .tabs-spacer {
+tabbox > tabpanels + tabs > .tabs-spacer {
   border-top: 1px solid ThreeDShadow !important;
   border-bottom: none;
 }
diff --git a/mozilla/themes/classic/global/win/tree.css b/mozilla/themes/classic/global/win/tree.css
index 33f6b172a7b..25fd0c0e5c5 100644
--- a/mozilla/themes/classic/global/win/tree.css
+++ b/mozilla/themes/classic/global/win/tree.css
@@ -14,7 +14,8 @@ tree
     border-bottom         : 1px solid ThreeDHighlight;                          
     border-left           : 1px solid ThreeDShadow; 
     background-color      : -moz-Field;
-    color                 : -moz-FieldText;    
+    color                 : -moz-FieldText;
+    margin                : 1px 5px 2px 5px;
   }
 
 .tree-container-treerows[dragover="true"][dragdroptree="true"]
@@ -36,11 +37,6 @@ tree
     padding               : 1px;
   }  
   
-tree.inset
-  {
-    margin                : 1px 5px 2px 5px;
-  }
-
 treeitem[selected="true"] > treerow
   {
     color                 : -moz-DialogText;
@@ -115,6 +111,11 @@ tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow
     padding               : 0px 4px 0px 4px;
   }
 
+.tree-header-text
+  {
+    margin                : 0px 0px 0px 0px !important;
+  }
+
 .treecell-header-image-box 
   {
     padding               : 0px 1px 0px 1px;
@@ -268,3 +269,7 @@ treerow[mode="inline-edit"]
     margin-left           : 0px;
   }
 
+.tree-cell-text
+  {
+    margin: 0px 0px 0px 0px !important;
+  }
diff --git a/mozilla/themes/classic/messenger/addressbook/win/addressbook.css b/mozilla/themes/classic/messenger/addressbook/win/addressbook.css
index ab4841a4b7c..99ab5a677e9 100644
--- a/mozilla/themes/classic/messenger/addressbook/win/addressbook.css
+++ b/mozilla/themes/classic/messenger/addressbook/win/addressbook.css
@@ -238,6 +238,7 @@ html|p {
 
 #dirTree, #resultsTree { 
   border: none;
+  margin: 0px 0px 0px 0px !important;
 }
 
 #resultsTree {
diff --git a/mozilla/themes/classic/messenger/mac/messageHeader.css b/mozilla/themes/classic/messenger/mac/messageHeader.css
index 062f81db895..47c26c52034 100644
--- a/mozilla/themes/classic/messenger/mac/messageHeader.css
+++ b/mozilla/themes/classic/messenger/mac/messageHeader.css
@@ -78,6 +78,7 @@ mail-emailaddress {
   text-decoration: underline;
   cursor: pointer;
   min-height: 16px;
+  margin: 0px 0px 0px 0px;
 }
 
 .showMoreAddressesButton {
@@ -138,7 +139,7 @@ label.headerValue   { white-space: normal; min-width: 50px; margin: 0px;}
   width: 12em
 }
 
-text.collapsedHeaderDisplayName 
+label.collapsedHeaderDisplayName 
 { 
   font-weight: bold; 
   margin-left: .7em;
diff --git a/mozilla/themes/classic/messenger/win/messageHeader.css b/mozilla/themes/classic/messenger/win/messageHeader.css
index b0ce6454567..cac091c0292 100644
--- a/mozilla/themes/classic/messenger/win/messageHeader.css
+++ b/mozilla/themes/classic/messenger/win/messageHeader.css
@@ -88,12 +88,13 @@ mail-emailaddress
     -moz-box-pack: end;
   }
 
-.emailDisplayButton 
+label.emailDisplayButton 
   {
     color                 : blue;
     text-decoration       : underline;
     cursor                : pointer;
-    min-height: 16px;
+    min-height            : 16px;
+    margin                : 0px !important;
   }
 
 .showMoreAddressesButton 
@@ -110,19 +111,17 @@ label.headerValue
   { 
     white-space           : normal;
     min-width             : 50px; 
-    margin                : 0px;
   }
 
-.subjectvalue  
+label.subjectvalue  
   { 
     font-weight           : bold; 
   }
 
-.headerdisplayname 
+label.headerdisplayname 
   { 
     font-weight           : bold; 
-    margin-right          : 0.5em; 
-    margin-left           : 0.5em; 
+    margin                : 0em 0.5em 0em 0.5em !important;
     min-height: 16px;
   }
   
@@ -166,10 +165,9 @@ label.headerValue
   width: 12em;
 }
 
-text.collapsedHeaderDisplayName 
+label.collapsedHeaderDisplayName 
 { 
   font-weight: bold; 
-  margin-left: .7em;
   min-height: 16px;
 }
 
diff --git a/mozilla/themes/modern/communicator/dialog/dialogBindings.xml b/mozilla/themes/modern/communicator/dialog/dialogBindings.xml
index a9cf4b0e02c..3d117fed339 100644
--- a/mozilla/themes/modern/communicator/dialog/dialogBindings.xml
+++ b/mozilla/themes/modern/communicator/dialog/dialogBindings.xml
@@ -8,9 +8,9 @@
     <content>
       <xul:hbox class="box-smallheader-text-container" align="center" flex="1">
         <children/>
-        <xul:text class="box-smallheader-left" inherits="value=title"/>
+        <xul:label class="box-smallheader-left" inherits="value=title"/>
         <xul:spacer flex="1"/>
-        <xul:text class="box-smallheader-right" inherits="value=description"/>
+        <xul:label class="box-smallheader-right" inherits="value=description"/>
       </xul:hbox>
     </content>
   </binding>
@@ -20,8 +20,8 @@
       <xul:hbox class="largeheader-box" flex="1">
         <xul:vbox class="largeheader-text-container">
           <xul:spacer flex="1"/>
-          <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
-          <xul:html class="largeheader-desc-text" inherits="value=description"/>
+          <xul:label class="largeheader-header-text" inherits="value=title" crop="right"/>
+          <xul:description class="largeheader-desc-text" inherits="value=description"/>
           <children/>
           <xul:spacer flex="1"/>
         </xul:vbox>
diff --git a/mozilla/themes/modern/communicator/sidebar/sidebarBindings.xml b/mozilla/themes/modern/communicator/sidebar/sidebarBindings.xml
index c1dde10239b..c106c412ce0 100644
--- a/mozilla/themes/modern/communicator/sidebar/sidebarBindings.xml
+++ b/mozilla/themes/modern/communicator/sidebar/sidebarBindings.xml
@@ -21,7 +21,7 @@
         </xul:vbox>
       
         <xul:vbox class="sidebar-tab-text-box">
-          <xul:text class="sidebar-tab-text" inherits="value=label" crop="right"/>
+          <xul:label class="sidebar-tab-text" inherits="value=label" crop="right"/>
         </xul:vbox>
       </xul:stack>
       
@@ -39,7 +39,7 @@
   <binding id="sidebarheader">
     <content>
       <xul:hbox class="sidebarheader-internal-box" flex="1" align="center">
-        <xul:text class="sidebar-header-text" inherits="value=label,crop" crop="right" flex="1"/>
+        <xul:label class="sidebar-header-text" inherits="value=label,crop" crop="right" flex="1"/>
         <xul:hbox>
           <children/>
         </xul:hbox>
diff --git a/mozilla/themes/modern/global/formatting.css b/mozilla/themes/modern/global/formatting.css
index 00caec2020c..8917d33e31b 100644
--- a/mozilla/themes/modern/global/formatting.css
+++ b/mozilla/themes/modern/global/formatting.css
@@ -40,16 +40,6 @@
 
 /* ::::: colors ::::: */
 
-.color-dialog {
-  background-color: #C7D0D9;
-  color: #000000;
-}
-  
-.color-window {
-  background-color: #C7D0D9;
-  color: #000000;
-}
-
 /* ::::: inset areas ::::: */
 
 .inset {
@@ -133,9 +123,6 @@ separator[orient="vertical"].groove-thin {
 /* ::::: text formatting rules ::::: */
 
 /* ..... label (with margins) ..... */
-text.label {
-  margin: 1px 5px 2px 5px;
-}
     
 /* reduced margin for some UI */
 .small-margin {
@@ -143,23 +130,21 @@ text.label {
 }
 
 .plain {
-  margin: 0px;
+  margin: 0px !important;
   border: none;
   padding: 0px;
 }
 
-text[disabled="true"] {
+label[disabled="true"] {
   color: #9FA6AE;
 }    
     
-html, description {
+description {
   margin: 1px 5px 4px 5px;
-  cursor: default;
 }
 
 label {
   margin: 1px 5px 2px 5px;
-  cursor: default;
 }
 
 .header {
diff --git a/mozilla/themes/modern/global/globalBindings.xml b/mozilla/themes/modern/global/globalBindings.xml
index d1f73730277..fa1f2a4f0e2 100644
--- a/mozilla/themes/modern/global/globalBindings.xml
+++ b/mozilla/themes/modern/global/globalBindings.xml
@@ -2,7 +2,6 @@
 
 <bindings id="globalBindings"
           xmlns="http://www.mozilla.org/xbl"
-          xmlns:html="http://www.w3.org/1999/xhtml"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- :::/ toolbar \ ::::::::::::::::::::::::::::::::::::::::::::::::::: -->
@@ -116,7 +115,7 @@
 
         <xul:hbox class="menulist-text-box" align="center">
           <xul:image class="menulist-icon-mid" inherits="src"/>
-          <xul:text class="menulist-text-mid" inherits="value=label,crop,accesskey" crop="right" flex="1"/>
+          <xul:label class="menulist-text-mid" inherits="value=label,crop,accesskey" crop="right" flex="1"/>
         </xul:hbox>
       </xul:stack>
       
@@ -154,7 +153,7 @@
       <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
         <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
         <xul:spacer flex="1"/>
-        <xul:text class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
+        <xul:label class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
       </xul:hbox>
       <children includes="menupopup"/>
     </content>
@@ -184,7 +183,7 @@
     <content>
       <xul:vbox class="treecell-header-box" flex="1" align="center">
         <xul:image class="tree-header-image" inherits="src"/>
-        <xul:text class="tree-header-text" inherits="crop,value=label" flex="1" crop="right"/>
+        <xul:label class="tree-header-text" inherits="crop,value=label" flex="1" crop="right"/>
         <xul:image class="tree-header-sortdirection"/>
       </xul:vbox>
     </content>
@@ -249,7 +248,7 @@
         <xul:spacer class="tab-mid-top" inherits="selected"/>
         <xul:hbox class="tab-mid-mid" align="center" pack="center" flex="1">
   	      <xul:image class="tab-icon"/>
-      	  <xul:text flex="1" inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
+          <xul:label flex="1" inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
         </xul:hbox>
         <xul:spacer class="tab-mid-btm" inherits="selected"/>
       </xul:vbox>
diff --git a/mozilla/themes/modern/global/menu.css b/mozilla/themes/modern/global/menu.css
index e73310bca23..1b273a3db20 100644
--- a/mozilla/themes/modern/global/menu.css
+++ b/mozilla/themes/modern/global/menu.css
@@ -54,12 +54,12 @@ menuitem[menuactive="true"][disabled="true"] {
 .menu-iconic-left,
 .menu-iconic-text,
 .menu-iconic-accel {
-  margin: 0px 2px 0px 0px;
+  margin: 0px 2px 0px 0px !important;
   color: inherit;
 }
 
 .menu-text {
-  margin-left: 18px;
+  margin-left: 18px !important;
   font-weight: inherit;
 }
 
@@ -119,7 +119,7 @@ menubar > menu[menuactive="true"][open="true"] {
 }
 
 .menubar-text {
-  margin-right: 2px;
+  margin: 0px 2px 0px 0px !important;
   color: inherit;
 }
 
diff --git a/mozilla/themes/modern/global/menulist.css b/mozilla/themes/modern/global/menulist.css
index 353b5f3c241..53f5f060eb2 100644
--- a/mozilla/themes/modern/global/menulist.css
+++ b/mozilla/themes/modern/global/menulist.css
@@ -315,7 +315,7 @@ menulist[editable="true"]:focus > .menulist-editable-box {
 }
 
 .menulist-compact-text {
-  margin-right: 3px;
+  margin: 0px 3px 0px 0px !important;
 }  
     
 .menulist-compact-internal-box {
diff --git a/mozilla/themes/modern/global/radio.css b/mozilla/themes/modern/global/radio.css
index 846c3de11a8..ccaa8deecc2 100644
--- a/mozilla/themes/modern/global/radio.css
+++ b/mozilla/themes/modern/global/radio.css
@@ -87,16 +87,16 @@ radio[disabled="true"]:hover:active > .internal-box > .checkmark-box > .checkbox
 
 /* ..... checked state ..... */
 
-radio[checked="true"] > .internal-box > .checkmark-box > .checkbox-check {
+radio[selected="true"] > .internal-box > .checkmark-box > .checkbox-check {
   list-style-image: url("chrome://global/skin/radio/radio-check.gif");
 }
   
-radio[checked="true"][disabled="true"] > .internal-box > .checkmark-box > .checkbox-check,
-radio[checked="true"][disabled="true"]:hover:active > .internal-box > .checkmark-box > .checkbox-check {
+radio[selected="true"][disabled="true"] > .internal-box > .checkmark-box > .checkbox-check,
+radio[selected="true"][disabled="true"]:hover:active > .internal-box > .checkmark-box > .checkbox-checked {
   list-style-image: url("chrome://global/skin/radio/radio-dis-check.gif");
 }
 
-radio[checked="true"]:hover:active > .internal-box > .checkmark-box > .checkbox-check {
+radio[selected="true"]:hover:active > .internal-box > .checkmark-box > .checkbox-check {
   list-style-image: url("chrome://global/skin/radio/radio-act-check.gif");  
 }
 
diff --git a/mozilla/themes/modern/global/tree.css b/mozilla/themes/modern/global/tree.css
index e8676cc4bba..295250d0df4 100644
--- a/mozilla/themes/modern/global/tree.css
+++ b/mozilla/themes/modern/global/tree.css
@@ -30,20 +30,16 @@
 /* ::::: tree ::::: */
 
 tree {
-  border: none;
-  border-spacing: 0px;
-  background-color: #FFFFFF;
-}
-
-tree.inset {
   margin: 2px 4px;
   border-top: 1px solid #BEC3D3 !important;
   border-right: 1px solid #F8FAFE !important;
   border-bottom: 1px solid #F8FAFE !important;
   border-left: 1px solid #BEC3D3 !important;
+  border-spacing: 0px;
+  background-color: #FFFFFF;
 }
 
-tree.inset > .tree-container-treerows {
+tree > .tree-container-treerows {
   border: 1px solid #5D616E;
 }
 
diff --git a/mozilla/themes/modern/messenger/messageHeader.css b/mozilla/themes/modern/messenger/messageHeader.css
index a9021f042ae..83d02bfe4a2 100644
--- a/mozilla/themes/modern/messenger/messageHeader.css
+++ b/mozilla/themes/modern/messenger/messageHeader.css
@@ -101,6 +101,7 @@ label.headerValue {
   min-height: 16px;
   color: #424F63;
   text-decoration: underline;
+  margin: 0px 0px 0px 0px;
 }
 
 .emailDisplayButton:hover {