diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul
index 81d1bb68c02..c182b3c646a 100644
--- a/mozilla/editor/ui/composer/content/editor.xul
+++ b/mozilla/editor/ui/composer/content/editor.xul
@@ -166,7 +166,7 @@
 
   <!-- toolbar filled out from editorOverlay -->
   <!-- add  class="standard" for dark blue background (icons need rework first) -->
-  <toolbar class="toolbar-primary" id="EditToolbar" persist="collapsed" tbautostretch="always">
+  <toolbar class="toolbar-primary" id="EditToolbar" persist="collapsed" tbalign="stretch">
     <button id="newButton"/>
     <button id="openButton"/>
     <button id="saveButton"/>
@@ -186,7 +186,7 @@
       </button>
     </hbox> 
   </toolbar>
-  <toolbar id="FormatToolbar" persist="collapsed" tbautostretch="never">
+  <toolbar id="FormatToolbar" persist="collapsed" tbalign="center">
     <!-- We need this else menulists get stretched -->
     <hbox autostretch="never">
       <!-- from editorOverlay -->
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.xul b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
index 243d69347d2..d412dd8ec6a 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
@@ -60,7 +60,7 @@
     <grid>
       <columns><column/><column/><column flex="1"/></columns>
       <rows>
-        <row valign="middle" autostretch="never">
+        <row align="center">
           <text class = "label" 
             for   = "srcInput"
             value = "&locationEditField.label;"
@@ -73,7 +73,7 @@
           <!-- from EdDialogOverlay.xul -->
           <button id="ChooseFile"/>
         </row>
-        <row valign="middle" autostretch="never">
+        <row align="center">
           <text class = "label"
             id      = "altTextLabel" 
             for     = "altTextInput"
@@ -89,17 +89,16 @@
     <spring class="spacer"/>
   </groupbox>
   <spring class="spacer"/>
-  <hbox valign="middle" autostretch="never"> 
+  <hbox align="center"> 
     <button 
       class   = "dialog" 
       id      = "MoreFewerButton" 
-      align   = "left" 
       oncommand = "onMoreFewer()" 
       tooltip = "aTooltip" tooltiptext = "&MoreFewerButton.tooltip;"
       persist = "more"/>
     <spring class="spacer"/>
     <groupbox style="padding: 4px">
-      <hbox id="preview-image-box" valign="middle" autostretch="never">
+      <hbox id="preview-image-box" align="center">
         <spring flex="1"/>
         <html id="preview-image-holder"/>
         <spring flex="1"/>
@@ -162,7 +161,7 @@
             <columns><column/><column/><column flex="1"/></columns>
             <rows>
               <!--//////  IMAGE WIDTH  //////-->
-              <row valign="middle" autostretch="never">
+              <row align="center">
                 <text class = "label" 
                   id    = "widthLabel"
                   for   = "widthInput"
@@ -177,7 +176,7 @@
                 <!-- contents are appended by JS -->
               </row>
               <!--////// IMAGE HEIGHT //////-->
-              <row valign="middle" autostretch="never">
+              <row align="center">
                 <text class = "label" 
                   id    = "heightLabel"
                   for   = "heightInput"
@@ -228,7 +227,7 @@
           <label id="alignLabel" value="&alignment.label;"/>
           <spring class="spacer"/>
           <menulist id="alignTypeSelect" class="align-menu">
-            <menupopup valign="middle">
+            <menupopup>
               <menuitem class="align-menu" value="top" label="&topPopup.value;"/>
               <menuitem class="align-menu" value="center" label="&centerPopup.value;"/>
               <menuitem class="align-menu" value="bottom" label="&bottomPopup.value;"/>
@@ -245,7 +244,7 @@
           <grid>
             <columns><column/><column/><column/></columns>
             <rows>
-              <row valign="middle" autostretch="never">
+              <row align="center">
                 <text 
                   class = "label align-right" 
                   id    = "leftrightLabel"
@@ -259,7 +258,7 @@
                   id    = "leftrighttypeLabel"
                   value = "&pixelsPopup.value;" />
               </row>
-              <row valign="middle" autostretch="never">
+              <row align="center">
                 <text 
                   class = "label align-right" 
                   id    = "topbottomLabel"
@@ -273,7 +272,7 @@
                   id    = "topbottomtypeLabel"
                   value = "&pixelsPopup.value;" />
               </row>
-              <row valign="middle" autostretch="never">
+              <row align="center">
                 <text class = "label align-right" 
                   id    = "borderLabel"
                   value = "&borderEditField.label;"/>
diff --git a/mozilla/extensions/help/resources/content/help.xul b/mozilla/extensions/help/resources/content/help.xul
index 07c055bb6a2..6989b573bef 100644
--- a/mozilla/extensions/help/resources/content/help.xul
+++ b/mozilla/extensions/help/resources/content/help.xul
@@ -32,7 +32,7 @@
 	id="helpToolbar" 
 	grippytooltip="aTooltip" 
 	grippytooltiptext="The Help Toolbar"
-        tbautostretch="always" 
+        tbalign="stretch" 
 	persist="collapsed">
 
         <button id="helpBackButton"
diff --git a/mozilla/extensions/inspector/resources/content/inspector.xml b/mozilla/extensions/inspector/resources/content/inspector.xml
index 158c83f2ff4..8de4078d050 100644
--- a/mozilla/extensions/inspector/resources/content/inspector.xml
+++ b/mozilla/extensions/inspector/resources/content/inspector.xml
@@ -164,7 +164,7 @@
   <binding id="panel" extends="chrome://inspector/content/inspector.xml#base">
     <content orient="vertical">
       <xul:toolbox class="viewer-pane-toolbox" inherits="disabled">
-        <xul:toolbar class="viewer-pane-header" tbautostretch="never" inherits="disabled">
+        <xul:toolbar class="viewer-pane-header" tbalign="center" inherits="disabled">
           <xul:menubutton anonid="viewer-list" class="viewer-list button-toolbar" disabled="true"/>
           <xul:text anonid="viewer-title" class="viewer-title label toolbar" flex="1"/>
           <xul:menubutton anonid="viewer-menu" class="viewer-menu button-toolbar" disabled="true"/>
diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp
index 4dcf46ac76f..22d9be6c4b8 100644
--- a/mozilla/layout/generic/nsGfxScrollFrame.cpp
+++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp
@@ -411,7 +411,7 @@ nsGfxScrollFrame::CreateAnonymousContent(nsIPresContext* aPresContext,
 
   nsCOMPtr<nsIContent> content;
   elementFactory->CreateInstanceByTag(nodeInfo, getter_AddRefs(content));
-  content->SetAttribute(kNameSpaceID_None, nsHTMLAtoms::align,
+  content->SetAttribute(kNameSpaceID_None, nsXULAtoms::orient,
                         NS_LITERAL_STRING("horizontal"), PR_FALSE);
 
   content->SetAttribute(kNameSpaceID_None, nsXULAtoms::collapsed,
@@ -422,7 +422,7 @@ nsGfxScrollFrame::CreateAnonymousContent(nsIPresContext* aPresContext,
   // create vertical scrollbar
   content = nsnull;
   elementFactory->CreateInstanceByTag(nodeInfo, getter_AddRefs(content));
-  content->SetAttribute(kNameSpaceID_None, nsHTMLAtoms::align,
+  content->SetAttribute(kNameSpaceID_None, nsXULAtoms::orient,
                         NS_LITERAL_STRING("vertical"), PR_FALSE);
 
   content->SetAttribute(kNameSpaceID_None, nsXULAtoms::collapsed,
diff --git a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
index 4dcf46ac76f..22d9be6c4b8 100644
--- a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
+++ b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
@@ -411,7 +411,7 @@ nsGfxScrollFrame::CreateAnonymousContent(nsIPresContext* aPresContext,
 
   nsCOMPtr<nsIContent> content;
   elementFactory->CreateInstanceByTag(nodeInfo, getter_AddRefs(content));
-  content->SetAttribute(kNameSpaceID_None, nsHTMLAtoms::align,
+  content->SetAttribute(kNameSpaceID_None, nsXULAtoms::orient,
                         NS_LITERAL_STRING("horizontal"), PR_FALSE);
 
   content->SetAttribute(kNameSpaceID_None, nsXULAtoms::collapsed,
@@ -422,7 +422,7 @@ nsGfxScrollFrame::CreateAnonymousContent(nsIPresContext* aPresContext,
   // create vertical scrollbar
   content = nsnull;
   elementFactory->CreateInstanceByTag(nodeInfo, getter_AddRefs(content));
-  content->SetAttribute(kNameSpaceID_None, nsHTMLAtoms::align,
+  content->SetAttribute(kNameSpaceID_None, nsXULAtoms::orient,
                         NS_LITERAL_STRING("vertical"), PR_FALSE);
 
   content->SetAttribute(kNameSpaceID_None, nsXULAtoms::collapsed,
diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
index 19e0659d366..51906611088 100644
--- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
@@ -360,7 +360,7 @@ nsBoxFrameInner::CacheAttributes()
   printf("\n");
    */
 
-  mValign = nsBoxFrame::vAlign_Middle;
+  mValign = nsBoxFrame::vAlign_Top;
   mHalign = nsBoxFrame::hAlign_Left;
 
   PRBool orient = PR_FALSE;
@@ -441,9 +441,6 @@ nsBoxFrame::GetInitialHAlignment(nsBoxFrame::Halignment& aHalign)
     if (value.EqualsIgnoreCase("left")) {
         aHalign = nsBoxFrame::hAlign_Left;
         return PR_TRUE;
-    } else if (value.EqualsIgnoreCase("center")) {
-        aHalign = nsBoxFrame::hAlign_Center;
-        return PR_TRUE;
     } else if (value.EqualsIgnoreCase("right")) {
         aHalign = nsBoxFrame::hAlign_Right;
         return PR_TRUE;
@@ -1234,7 +1231,7 @@ nsBoxFrame::AttributeChanged(nsIPresContext* aPresContext,
         aAttribute == nsXULAtoms::autostretch) {
 
         if (aAttribute == nsXULAtoms::orient || aAttribute == nsXULAtoms::debug || aAttribute == nsHTMLAtoms::align || aAttribute == nsHTMLAtoms::valign) {
-          mInner->mValign = nsBoxFrame::vAlign_Middle;
+          mInner->mValign = nsBoxFrame::vAlign_Top;
           mInner->mHalign = nsBoxFrame::hAlign_Left;
 
           PRBool orient = PR_TRUE;
diff --git a/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul b/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul
index f50f2bd8d50..2b1c3f1c0c7 100644
--- a/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul
@@ -52,7 +52,7 @@ Rights Reserved.
 <hbox id="msgHeaderView" persist="state">
 <grid id="collapsedHeaderView" class="header-part1" flex="1" collapsed="true">
   <columns>
-    <column class="collapsedToggleHdrBox" autostretch="never" >
+    <column class="collapsedToggleHdrBox" align="center" pack="center">
       <image id="toggleHeaderView" class="collapsedHeaderViewButton"
           onclick="ToggleHeaderView();"/>
     </column>
@@ -86,7 +86,7 @@ Rights Reserved.
 <hbox id="expandedHeaderView" class="header-part1" flex="1" collapsed="true">
   <vbox flex="1">
     <hbox id="expandedsubjectBox" class="headerBox" collapsed="true">
-      <hbox class="headerValueBox" autostretch="never">
+      <hbox class="headerValueBox" align="center">
         <image id="toggleHeaderView" class="expandHeaderViewButton" 
           onclick="ToggleHeaderView();"/>
         <spring flex="1"/>
@@ -117,7 +117,7 @@ Rights Reserved.
 		</hbox>
 
     <hbox id="expandedtoBox" class="headerBox" collapsed="true">
-      <hbox class="headerValueBox" autostretch="never">
+      <hbox class="headerValueBox" align="center">
         <image class="showMoreAddressesButton" id="expandedtoToggleIcon" 
              onclick="ToggleLongShortAddresses('expandedtoToggleIcon','expandedtoValue', 'expandedtoValueLong');"/>
         <text class="headerdisplayname" value="&toField.label;"/>
@@ -127,7 +127,7 @@ Rights Reserved.
 		</hbox>
 			
     <hbox id="expandedccBox" class="headerBox" collapsed="true">
-      <hbox class="headerValueBox" autostretch="never">
+      <hbox class="headerValueBox" align="center">
          <image class="showMoreAddressesButton" id="expandedccToggleIcon"
              onclick="ToggleLongShortAddresses('expandedccToggleIcon', 'expandedccValue', 'expandedccValueLong');"/>
          <text class="headerdisplayname" value="&ccField.label;"/>
@@ -137,7 +137,7 @@ Rights Reserved.
 	  </hbox>
 
      <hbox id="expandedbccBox" class="headerBox" collapsed="true">
-      <hbox class="headerValueBox" autostretch="never">
+      <hbox class="headerValueBox" align="center">
          <image class="showMoreAddressesButton" id="expandedbccToggleIcon"
              onclick="ToggleLongShortAddresses('expandedbccToggleIcon', 'expandedbccValue', 'expandedbccValueLong');"/>
          <text class="headerdisplayname" value="&bccField.label;"/>
diff --git a/mozilla/mailnews/compose/resources/content/messengercompose.xul b/mozilla/mailnews/compose/resources/content/messengercompose.xul
index c489a3416f9..3a886c51963 100644
--- a/mozilla/mailnews/compose/resources/content/messengercompose.xul
+++ b/mozilla/mailnews/compose/resources/content/messengercompose.xul
@@ -386,7 +386,7 @@
        </hbox>
     </toolbar>
   
-    <toolbar id="MsgHeadersToolbar" persist="collapsed" tborient="vertical" tbautostretch="always" flex="1">
+    <toolbar id="MsgHeadersToolbar" persist="collapsed" tborient="vertical" tbalign="stretch" flex="1">
       <hbox id="msgheaderstoolbar-box" flex="1">
         <vbox flex="75">
           <hbox autostretch="never">
diff --git a/mozilla/themes/classic/communicator/mac/button.css b/mozilla/themes/classic/communicator/mac/button.css
index 18217169963..69cd0bde026 100644
--- a/mozilla/themes/classic/communicator/mac/button.css
+++ b/mozilla/themes/classic/communicator/mac/button.css
@@ -42,7 +42,7 @@
   .button-toolbar-2 > .button-internal-box
     {
       padding             : 2px 6px 2px 5px;
-      text-align          : center;
+      -moz-box-pack       : center;
       border              : 1px solid transparent;
     }    
   
@@ -50,7 +50,7 @@
     {
       border              : 1px solid transparent;
       padding			  : 0px 1px;
-      text-align          : center;
+      -moz-box-pack          : center;
     }
   
   .button-toolbar[value] > .button-internal-box > .button-text-container
@@ -144,7 +144,7 @@
   .button-toolbar-2 > .button-internal-box > .button-text-container,
   .button-toolbar-4 > .button-internal-box > .button-text-container
     {
-      text-align          : center;
+      -moz-box-pack       : center;
     }
   
   .button-toolbar-4 > .button-internal-box > .button-icon
diff --git a/mozilla/themes/classic/communicator/mac/prefpanels.css b/mozilla/themes/classic/communicator/mac/prefpanels.css
index 5a961e68c8b..fd6bffab74f 100644
--- a/mozilla/themes/classic/communicator/mac/prefpanels.css
+++ b/mozilla/themes/classic/communicator/mac/prefpanels.css
@@ -19,10 +19,12 @@
 #previewImageContainer {
   overflow: hidden; 
   height: 92px; 
-  max-width: 360px; 
   background-color: #000000; 
   padding: 2px;
+}
 
+#previewImage {
+  max-width: 387px; 
 }
   
 /**
diff --git a/mozilla/themes/classic/communicator/menubuttonBindings.xml b/mozilla/themes/classic/communicator/menubuttonBindings.xml
index f7d1e30cf89..b153bce0317 100644
--- a/mozilla/themes/classic/communicator/menubuttonBindings.xml
+++ b/mozilla/themes/classic/communicator/menubuttonBindings.xml
@@ -10,7 +10,7 @@
     <content>
       <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
                   inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,label,crop,accesskey,disabled"/>
-      <xul:hbox class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle" flex="1">
+      <xul:hbox class="menubutton-dual-dropmarker-box" align="center" flex="1">
         <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
       </xul:hbox>
       <children includes="menupopup"/>
@@ -20,7 +20,7 @@
   <binding id="menubutton-toolbar-single"
            extends="chrome://global/content/bindings/menubutton.xml#menubutton-single-left">
     <content>
-      <xul:hbox class="menubutton-toolbar-single-internal-box" flex="1" autostretch="never">
+      <xul:hbox class="menubutton-toolbar-single-internal-box" flex="1" align="center">
         <xul:image class="menubutton-toolbar-single-icon" inherits="src,disabled"/>
         <xul:text class="menubutton-toolbar-single-text" inherits="value=label,accesskey,crop,disabled,dragover-top" flex="1"/>
         <xul:image class="menubutton-toolbar-single-dropmarker" inherits="menubuttontype,disabled"/>
@@ -32,10 +32,10 @@
   <binding id="menubutton-toolbar-single-ile" display="xul:menu"
            extends="chrome://global/content/bindings/general.xml#inline-edit-base">
     <content>
-      <xul:hbox class="menubutton-toolbar-single-internal-box" flex="1" autostretch="never">
+      <xul:hbox class="menubutton-toolbar-single-internal-box" flex="1" align="center">
         <xul:image class="menubutton-toolbar-single-icon" inherits="src,disabled"/>
         <xul:hbox class="menubutton-toolbar-single-ile-text-container" 
-                  flex="1" ileattr="text-container" autostretch="never">
+                  flex="1" ileattr="text-container" align="center">
           <xul:text class="menubutton-toolbar-single-ile-text" 
                     inherits="value=label,accesskey,crop,disabled,dragover-top" 
                     ileattr="text" rootcontent="menubutton" flex="1"/>
diff --git a/mozilla/themes/classic/communicator/sidebar/mac/customize.css b/mozilla/themes/classic/communicator/sidebar/mac/customize.css
index 5a7fb0b3c86..29dfda00691 100644
--- a/mozilla/themes/classic/communicator/sidebar/mac/customize.css
+++ b/mozilla/themes/classic/communicator/sidebar/mac/customize.css
@@ -98,5 +98,5 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-p
 }
 
 box#reorder {
-  text-align: center;
+  -moz-box-pack: center;
 }
diff --git a/mozilla/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml b/mozilla/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml
index 9253284991a..d037884d7a9 100644
--- a/mozilla/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml
+++ b/mozilla/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml
@@ -6,26 +6,26 @@
 
   <binding id="sidebar-splitter" extends="xul:splitter">
     <content>
-      <xul:box class="sidebar-splitter-topright-cap" orient="vertical">
+      <xul:vbox class="sidebar-splitter-topright-cap">
         <xul:spring flex="1"/>
-      </xul:box>
+      </xul:vbox>
       <xul:spring flex="1"/>
-      <xul:box>
+      <xul:hbox>
         <children/>
-      </xul:box>
+      </xul:hbox>
       <xul:spring flex="1"/>
-      <xul:box class="sidebar-splitter-bottomright-cap" orient="vertical">
+      <xul:vbox class="sidebar-splitter-bottomright-cap">
         <xul:spring flex="100%"/>
-      </xul:box>
+      </xul:vbox>
     </content>
   </binding>
   
   <binding id="panelheader" extends="xul:button">
     <content>
-      <xul:box class="panelheader-box-1" flex="1">
+      <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:box>
+      </xul:hbox>
     </content>
   </binding>
           
diff --git a/mozilla/themes/classic/communicator/sidebar/win/customize.css b/mozilla/themes/classic/communicator/sidebar/win/customize.css
index 706b0c22c78..87e163d00dc 100644
--- a/mozilla/themes/classic/communicator/sidebar/win/customize.css
+++ b/mozilla/themes/classic/communicator/sidebar/win/customize.css
@@ -75,5 +75,5 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-p
 }
 
 box#reorder {
-  text-align: center;
+  -moz-box-pack: center;
 }
diff --git a/mozilla/themes/classic/communicator/sidebar/win/sidebarBindings.xml b/mozilla/themes/classic/communicator/sidebar/win/sidebarBindings.xml
index fcbaaa8a7b8..2ea62452105 100644
--- a/mozilla/themes/classic/communicator/sidebar/win/sidebarBindings.xml
+++ b/mozilla/themes/classic/communicator/sidebar/win/sidebarBindings.xml
@@ -6,17 +6,17 @@
   
   <binding id="panelheader" extends="xul:button">
     <content>
-      <xul:box class="panelheader-box-1" inherits="selected" flex="1">
-        <xul:box class="panelheader-box-2" autostretch="never" flex="1">
+      <xul:hbox class="panelheader-box-1" inherits="selected" flex="1">
+        <xul:hbox class="panelheader-box-2" align="center" flex="1">
           <xul:image class="panelheader-grippy-icon" inherits="selected"/>
           <xul:image class="panelheader-image" inherits="src"/>
-          <xul:box orient="vertical" flex="1">
+          <xul:vbox flex="1">
             <xul:text class="panelheader-icon" inherits="value=label" crop="right"/>
-          </xul:box>
+          </xul:vbox>
           <xul:spring flex="1"/>
-        </xul:box>
-        <xul:box class="panelheader-texture"/>
-      </xul:box>
+        </xul:hbox>
+        <xul:hbox class="panelheader-texture"/>
+      </xul:hbox>
     </content>
   </binding>
 </bindings>          
\ No newline at end of file
diff --git a/mozilla/themes/classic/communicator/win/button.css b/mozilla/themes/classic/communicator/win/button.css
index 2f558e6f8ae..fb6a88401c4 100644
--- a/mozilla/themes/classic/communicator/win/button.css
+++ b/mozilla/themes/classic/communicator/win/button.css
@@ -24,7 +24,6 @@
   .button-toolbar-2 > .button-internal-box
     {
       padding             : 2px 7px 2px 6px;
-      text-align          : center;
       border              : 1px solid transparent;
       color               : inherit;
       background-color    : -moz-Dialog;
@@ -78,12 +77,6 @@
       border              : 1px solid transparent !important;
     }
 
-  .button-toolbar-1 > .button-internal-box > .button-text-container,
-  .button-toolbar-2 > .button-internal-box > .button-text-container
-    {
-      text-align          : center;
-    }
-          
 /**
  * Standard Toolbar Buttons
  *   for secondary command toolbars, e.g. formatting toolbar 
@@ -196,7 +189,6 @@
       color               : inherit;
       padding             : 0px;
       border              : 1px solid transparent;
-      text-align          : center;
     }
   
   .button-toolbar-4:hover
@@ -230,11 +222,6 @@
       border-bottom       : 1px solid ThreeDHighlight !important;
     }
 
-  .button-toolbar-4 > .button-internal-box > .button-text-container
-    {
-      text-align          : center;
-    }
-    
   .button-toolbar-4[disabled="true"] > .button-internal-box,
   .button-toolbar-4[disabled="true"]:hover > .button-internal-box,
   .button-toolbar-4[disabled="true"]:hover:active > .button-internal-box
diff --git a/mozilla/themes/classic/communicator/win/prefpanels.css b/mozilla/themes/classic/communicator/win/prefpanels.css
index 1136ab08d14..48384cc7a91 100644
--- a/mozilla/themes/classic/communicator/win/prefpanels.css
+++ b/mozilla/themes/classic/communicator/win/prefpanels.css
@@ -18,12 +18,14 @@
 #previewImageContainer {
   overflow: hidden; 
   height: 92px; 
-  max-width: 360px; 
   background-color: #000000; 
   padding: 2px;
+}
+
+#previewImage {
+  max-width: 387px; 
+}
 
-} 
- 
 /**
  * File icon (32x32)
  **/
diff --git a/mozilla/themes/classic/editor/EditorDialog.css b/mozilla/themes/classic/editor/EditorDialog.css
index 51b64de25b2..49d0d80f4df 100644
--- a/mozilla/themes/classic/editor/EditorDialog.css
+++ b/mozilla/themes/classic/editor/EditorDialog.css
@@ -66,10 +66,6 @@ groupbox {
   width: 3em;
 }
 
-.align-right {
-  text-align: right;
-}
-
 .wrap {
  width: 1em;
 }
diff --git a/mozilla/themes/classic/editor/EditorToolbars.css b/mozilla/themes/classic/editor/EditorToolbars.css
index f7a81a1c3da..93ab2418014 100644
--- a/mozilla/themes/classic/editor/EditorToolbars.css
+++ b/mozilla/themes/classic/editor/EditorToolbars.css
@@ -803,7 +803,6 @@ button.edit-mode[selected="1"]:hover:active
     border                : 1px inset white;
     margin                : 0px;
     padding               : 2px;
-    text-align            : center;
   }
 
 .color-button 
diff --git a/mozilla/themes/classic/editor/mac/EditorDialog.css b/mozilla/themes/classic/editor/mac/EditorDialog.css
index f5f9f39b808..efb8c1ea44a 100644
--- a/mozilla/themes/classic/editor/mac/EditorDialog.css
+++ b/mozilla/themes/classic/editor/mac/EditorDialog.css
@@ -66,10 +66,6 @@ groupbox {
   width: 3em;
 }
 
-.align-right {
-  text-align: right;
-}
-
 .wrap {
  width: 1em;
 }
diff --git a/mozilla/themes/classic/editor/mac/EditorToolbars.css b/mozilla/themes/classic/editor/mac/EditorToolbars.css
index 60b44bf8c1d..f6dfcee7d2b 100644
--- a/mozilla/themes/classic/editor/mac/EditorToolbars.css
+++ b/mozilla/themes/classic/editor/mac/EditorToolbars.css
@@ -834,7 +834,6 @@ button.edit-mode[selected="1"]:hover:active
     border                : 1px inset white;
     margin                : 0px;
     padding               : 2px;
-    text-align            : center;
   }
 
 .color-button 
diff --git a/mozilla/themes/classic/editor/mac/resources.xml b/mozilla/themes/classic/editor/mac/resources.xml
index 38daf025a9d..471bea18b10 100644
--- a/mozilla/themes/classic/editor/mac/resources.xml
+++ b/mozilla/themes/classic/editor/mac/resources.xml
@@ -7,36 +7,31 @@
          
  <binding id="resource_bundle_editor" extends="" >
    <resources>
-     <!-- begin resources -->
-
-     <image src="chrome://editor/skin/images/newfile-hover.gif" />
-     <image src="chrome://editor/skin/images/newfile-hover-active.gif" />
-     <image src="chrome://editor/skin/images/openfile-hover.gif" />
-     <image src="chrome://editor/skin/images/openfile-hover-active.gif" />
-     <image src="chrome://editor/skin/images/savefile-disabled.gif" />
-     <image src="chrome://editor/skin/images/savefile-hover.gif" />
-     <image src="chrome://editor/skin/images/savefile-hover-active.gif" />
-     <image src="chrome://editor/skin/images/savefile-hover.gif" />
-     <image src="chrome://editor/skin/images/savefile-hover-active.gif" />
-     <image src="chrome://editor/skin/images/preview-hover.gif" />
-     <image src="chrome://editor/skin/images/preview-hover-active.gif" />
-     <image src="chrome://editor/skin/images/print-hover.gif" />
-     <image src="chrome://editor/skin/images/print-hover-active.gif" />
-     <image src="chrome://editor/skin/images/link-hover.gif" />
-     <image src="chrome://editor/skin/images/link-hover-active.gif" />
-     <image src="chrome://editor/skin/images/image-hover.gif" />
-     <image src="chrome://editor/skin/images/image-hover-active.gif" />
-     <image src="chrome://editor/skin/images/anchor-hover.gif" />
-     <image src="chrome://editor/skin/images/anchor-hover-active.gif" />
-     <image src="chrome://editor/skin/images/hline-hover.gif" />
-     <image src="chrome://editor/skin/images/hline-hover-active.gif" />
-     <image src="chrome://editor/skin/images/table-hover.gif" />
-     <image src="chrome://editor/skin/images/table-hover-active.gif" />
-     <image src="chrome://editor/skin/images/spell-hover.gif" />
-     <image src="chrome://editor/skin/images/spell-hover-active.gif" />
-
-
-     <!-- end resources -->
+     <image src="chrome://editor/skin/images/newfile-hover.gif"/>
+     <image src="chrome://editor/skin/images/newfile-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/openfile-hover.gif"/>
+     <image src="chrome://editor/skin/images/openfile-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/savefile-disabled.gif"/>
+     <image src="chrome://editor/skin/images/savefile-hover.gif"/>
+     <image src="chrome://editor/skin/images/savefile-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/savefile-hover.gif"/>
+     <image src="chrome://editor/skin/images/savefile-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/preview-hover.gif"/>
+     <image src="chrome://editor/skin/images/preview-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/print-hover.gif"/>
+     <image src="chrome://editor/skin/images/print-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/link-hover.gif"/>
+     <image src="chrome://editor/skin/images/link-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/image-hover.gif"/>
+     <image src="chrome://editor/skin/images/image-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/anchor-hover.gif"/>
+     <image src="chrome://editor/skin/images/anchor-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/hline-hover.gif"/>
+     <image src="chrome://editor/skin/images/hline-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/table-hover.gif"/>
+     <image src="chrome://editor/skin/images/table-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/spell-hover.gif"/>
+     <image src="chrome://editor/skin/images/spell-hover-active.gif"/>
    </resources>	
   </binding>
           
diff --git a/mozilla/themes/classic/editor/win/EditorDialog.css b/mozilla/themes/classic/editor/win/EditorDialog.css
index 8c57e6b98a6..8521b7d1191 100644
--- a/mozilla/themes/classic/editor/win/EditorDialog.css
+++ b/mozilla/themes/classic/editor/win/EditorDialog.css
@@ -66,10 +66,6 @@ groupbox {
   width: 3em;
 }
 
-.align-right {
-  text-align: right;
-}
-
 .wrap {
  width: 1em;
 }
diff --git a/mozilla/themes/classic/editor/win/EditorToolbars.css b/mozilla/themes/classic/editor/win/EditorToolbars.css
index 67abd143b47..ff89717058e 100644
--- a/mozilla/themes/classic/editor/win/EditorToolbars.css
+++ b/mozilla/themes/classic/editor/win/EditorToolbars.css
@@ -823,7 +823,6 @@ button.edit-mode[selected="1"]:hover:active
     border                : 1px inset white;
     margin                : 0px;
     padding               : 2px;
-    text-align            : center;
   }
 
 .color-button 
diff --git a/mozilla/themes/classic/editor/win/resources.xml b/mozilla/themes/classic/editor/win/resources.xml
index 38daf025a9d..471bea18b10 100644
--- a/mozilla/themes/classic/editor/win/resources.xml
+++ b/mozilla/themes/classic/editor/win/resources.xml
@@ -7,36 +7,31 @@
          
  <binding id="resource_bundle_editor" extends="" >
    <resources>
-     <!-- begin resources -->
-
-     <image src="chrome://editor/skin/images/newfile-hover.gif" />
-     <image src="chrome://editor/skin/images/newfile-hover-active.gif" />
-     <image src="chrome://editor/skin/images/openfile-hover.gif" />
-     <image src="chrome://editor/skin/images/openfile-hover-active.gif" />
-     <image src="chrome://editor/skin/images/savefile-disabled.gif" />
-     <image src="chrome://editor/skin/images/savefile-hover.gif" />
-     <image src="chrome://editor/skin/images/savefile-hover-active.gif" />
-     <image src="chrome://editor/skin/images/savefile-hover.gif" />
-     <image src="chrome://editor/skin/images/savefile-hover-active.gif" />
-     <image src="chrome://editor/skin/images/preview-hover.gif" />
-     <image src="chrome://editor/skin/images/preview-hover-active.gif" />
-     <image src="chrome://editor/skin/images/print-hover.gif" />
-     <image src="chrome://editor/skin/images/print-hover-active.gif" />
-     <image src="chrome://editor/skin/images/link-hover.gif" />
-     <image src="chrome://editor/skin/images/link-hover-active.gif" />
-     <image src="chrome://editor/skin/images/image-hover.gif" />
-     <image src="chrome://editor/skin/images/image-hover-active.gif" />
-     <image src="chrome://editor/skin/images/anchor-hover.gif" />
-     <image src="chrome://editor/skin/images/anchor-hover-active.gif" />
-     <image src="chrome://editor/skin/images/hline-hover.gif" />
-     <image src="chrome://editor/skin/images/hline-hover-active.gif" />
-     <image src="chrome://editor/skin/images/table-hover.gif" />
-     <image src="chrome://editor/skin/images/table-hover-active.gif" />
-     <image src="chrome://editor/skin/images/spell-hover.gif" />
-     <image src="chrome://editor/skin/images/spell-hover-active.gif" />
-
-
-     <!-- end resources -->
+     <image src="chrome://editor/skin/images/newfile-hover.gif"/>
+     <image src="chrome://editor/skin/images/newfile-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/openfile-hover.gif"/>
+     <image src="chrome://editor/skin/images/openfile-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/savefile-disabled.gif"/>
+     <image src="chrome://editor/skin/images/savefile-hover.gif"/>
+     <image src="chrome://editor/skin/images/savefile-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/savefile-hover.gif"/>
+     <image src="chrome://editor/skin/images/savefile-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/preview-hover.gif"/>
+     <image src="chrome://editor/skin/images/preview-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/print-hover.gif"/>
+     <image src="chrome://editor/skin/images/print-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/link-hover.gif"/>
+     <image src="chrome://editor/skin/images/link-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/image-hover.gif"/>
+     <image src="chrome://editor/skin/images/image-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/anchor-hover.gif"/>
+     <image src="chrome://editor/skin/images/anchor-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/hline-hover.gif"/>
+     <image src="chrome://editor/skin/images/hline-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/table-hover.gif"/>
+     <image src="chrome://editor/skin/images/table-hover-active.gif"/>
+     <image src="chrome://editor/skin/images/spell-hover.gif"/>
+     <image src="chrome://editor/skin/images/spell-hover-active.gif"/>
    </resources>	
   </binding>
           
diff --git a/mozilla/themes/classic/global/mac/autocomplete.css b/mozilla/themes/classic/global/mac/autocomplete.css
index 1a4f6bbc4c0..cb3fba6cf83 100644
--- a/mozilla/themes/classic/global/mac/autocomplete.css
+++ b/mozilla/themes/classic/global/mac/autocomplete.css
@@ -59,6 +59,7 @@ html|*.textbox-input
 
 .autocomplete-outliner 
   {
+    border                 : none;
     background-color       : transparent !important;
   }
 
diff --git a/mozilla/themes/classic/global/mac/button.css b/mozilla/themes/classic/global/mac/button.css
index 83440ef9c15..b9329cf0de5 100644
--- a/mozilla/themes/classic/global/mac/button.css
+++ b/mozilla/themes/classic/global/mac/button.css
@@ -195,7 +195,6 @@ button:hover:active {
   }
 
   .button-text-box {
-    text-align        : center;
     padding           : 1px 0px 1px 0px;
   }
 
diff --git a/mozilla/themes/classic/global/mac/buttonBindings.xml b/mozilla/themes/classic/global/mac/buttonBindings.xml
index 0df46700568..df22f2cf2b8 100644
--- a/mozilla/themes/classic/global/mac/buttonBindings.xml
+++ b/mozilla/themes/classic/global/mac/buttonBindings.xml
@@ -7,109 +7,108 @@
 
   <binding id="buttonleft" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-box-1" autostretch="never" flex="1">
-        <xul:box class="button-box-2" autostretch="never" flex="1">
+      <xul:hbox class="button-box-1" align="center" flex="1">
+        <xul:hbox class="button-box-2" align="center" flex="1">
           <xul:image class="button-icon" inherits="src"/>
-          <xul:box class="button-box-text" flex="1" autostretch="never">
+          <xul:hbox class="button-box-text" flex="1" align="center">
             <xul:text class="button-text" inherits="disabled,value=label,accesskey,crop"/>
             <children/>
-          </xul:box>
-        </xul:box>
-      </xul:box>
+          </xul:hbox>
+        </xul:hbox>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="buttonright" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-box-1" autostretch="never" flex="1">
-        <xul:box class="button-box-2" autostretch="never" flex="1">
-          <xul:box class="button-box-text" flex="1" autostretch="never">
+      <xul:hbox class="button-box-1" align="center" flex="1">
+        <xul:hbox class="button-box-2" align="center" flex="1">
+          <xul:hbox class="button-box-text" flex="1" align="center">
             <xul:text class="button-text" inherits="disabled,value=label,accesskey,crop"/>
             <children/>
-          </xul:box>
+          </xul:hbox>
           <xul:image class="button-icon" inherits="src"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:hbox>
     </content>
   </binding>
   
   <binding id="buttontop" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-box-1" autostretch="never" flex="1">
-        <xul:box class="button-box-2" autostretch="never" flex="1" orient="vertical" align="center">
+      <xul:hbox class="button-box-1" align="center" flex="1">
+        <xul:vbox class="button-box-2" flex="1" align="center">
           <xul:image class="button-icon" inherits="src"/>
-          <xul:box class="button-box-text" flex="1" autostretch="never">
+          <xul:hbox class="button-box-text" flex="1" align="center">
             <xul:text class="button-text" inherits="disabled,value=label,accesskey,crop"/>
             <children/>
-          </xul:box>
-        </xul:box>
-      </xul:box>
+          </xul:hbox>
+        </xul:vbox>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="buttonbottom" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-box-1" autostretch="never" flex="1">
-        <xul:box class="button-box-2" autostretch="never" flex="1" orient="vertical" align="center">
-          <xul:box class="button-box-text" flex="1" autostretch="never">
+      <xul:hbox class="button-box-1" align="center" flex="1">
+        <xul:vbox class="button-box-2" flex="1" align="center">
+          <xul:hbox class="button-box-text" flex="1" align="center">
             <xul:text class="button-text" inherits="disabled,value=label,accesskey,crop"/>
             <children/>
-          </xul:box>
+          </xul:hbox>
           <xul:image class="button-icon" inherits="src"/>
-        </xul:box>
-      </xul:box>
+        </xul:vbox>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="exit-button" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-        <xul:spring class="button-image-left" inherits="default,disabled"/>
-      <xul:box flex="1" class="button-image-middle" inherits="default,disabled" orient="vertical" align="center">
+      <xul:spring class="button-image-left" inherits="default,disabled"/>
+      <xul:vbox flex="1" class="button-image-middle" inherits="default,disabled" align="center">
         <xul:spring flex="1" class="button-top-spring"/>
-        <xul:box flex="1">
+        <xul:hbox flex="1">
           <xul:image class="button-icon" inherits="src"/>
-          <xul:box class="button-text-box" flex="1">
-          <xul:text inherits="disabled,valu=labele,crop,accesskey"/>
-          </xul:box>
+          <xul:hbox class="button-text-box" flex="1">
+            <xul:text inherits="disabled,valu=labele,crop,accesskey"/>
+          </xul:hbox>
           <children/>
-        </xul:box>
+        </xul:hbox>
         <xul:spring flex="1" class="button-bottom-spring"/>
-      </xul:box>
+      </xul:vbox>
       <xul:spring class="button-image-right" inherits="default,disabled"/>
     </content>
   </binding>
 
   <binding id="nine-slice-button" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-box-left" inherits="default,disabled" orient="vertical">
+      <xul:vbox class="button-box-left" inherits="default,disabled">
         <xul:spring class="button-left-top" inherits="default,disabled"/>
         <xul:spring class="button-left-mid" inherits="default,disabled" flex="1"/>
         <xul:spring class="button-left-btm" inherits="default,disabled"/>
-      </xul:box>
+      </xul:vbox>
       
       <xul:stack class="button-stack" flex="1">
-        <xul:box class="button-box-mid" inherits="default,disabled" orient="vertical">
+        <xul:vbox class="button-box-mid" inherits="default,disabled">
            <xul:spring class="button-mid-top" inherits="default,disabled"/>
-           <xul:box class="button-mid-mid" inherits="default,disabled" flex="1"/>
+           <xul:spring class="button-mid-mid" inherits="default,disabled" flex="1"/>
            <xul:spring class="button-mid-btm" inherits="default,disabled"/>
-        </xul:box>
+        </xul:vbox>
 
-        <xul:box class="button-text-box" autostretch="never">
+        <xul:hbox class="button-text-box" align="center">
          <xul:image class="button-icon-mid" inherits="src"/>
          <xul:text class="button-text-mid" inherits="default,disabled,value=label,crop,accesskey"/>
          <children/>
-       </xul:box>
+       </xul:hbox>
      </xul:stack>
       
-      <xul:box class="button-box-right" inherits="default,disabled" orient="vertical">
+      <xul:vbox class="button-box-right" inherits="default,disabled">
         <xul:spring class="button-right-top" inherits="default,disabled"/>
         <xul:spring class="button-right-mid" inherits="default,disabled" flex="1"/>
         <xul:spring class="button-right-btm" inherits="default,disabled"/>
-      </xul:box>
+      </xul:vbox>
     <children includes="menupopup"/>
     </content>
     <resources>
-    	<!-- just active states, there is no 'hover' for buttons in this skin -->
     	<image src="chrome://global/skin/button-active-left-top.gif" />
     	<image src="chrome://global/skin/button-active-left-mid.gif" />
     	<image src="chrome://global/skin/button-active-left-btm.gif" />
@@ -128,19 +127,17 @@
     	<image src="chrome://global/skin/button-def-active-right-top.gif" />
     	<image src="chrome://global/skin/button-def-active-right-mid.gif" />
     	<image src="chrome://global/skin/button-def-active-right-btm.gif" />
-    	
-    	<!-- end resources -->
     </resources>
-    
-    
   </binding>
 
 
   <binding id="simplebutton" extends="chrome://global/content/bindings/button.xml#button-base">
-    <content orient="vertical" autostretch="never" align="center">
-      <xul:image class="simplebutton-icon" inherits="src,disabled"/>
-      <xul:text class="simplebutton-text" inherits="value=label,accesskey,crop,disabled"/>
-      <children/>
+    <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"/>
+        <children/>
+      </xul:vbox>
     </content>
   </binding>
 
diff --git a/mozilla/themes/classic/global/mac/classicBindings.xml b/mozilla/themes/classic/global/mac/classicBindings.xml
index fa856fb30d9..5d98e41cf71 100644
--- a/mozilla/themes/classic/global/mac/classicBindings.xml
+++ b/mozilla/themes/classic/global/mac/classicBindings.xml
@@ -14,19 +14,19 @@
   </binding>
 
   <binding id="toolbargrippy" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
-    <content orient="vertical">
-      <xul:box autostretch="never" halign="center">
+    <content>
+      <xul:hbox align="center">
         <xul:image class="toolbargrippy-twisty"/>
-      </xul:box>
+      </xul:hbox>
       <xul:spring class="toolbargrippy-texture" flex="1"/>
     </content>
   </binding>
 
   <binding id="toolbargrippy-collapsed" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
     <content>
-      <xul:box autostretch="never" halign="center">
+      <xul:hbox align="center">
         <xul:image class="toolbargrippy-twisty-collapsed"/>
-      </xul:box>
+      </xul:hbox>
       <xul:spring class="toolbargrippy-texture-collapsed" flex="1"/>
     </content>
   </binding>
@@ -34,47 +34,47 @@
   
   <binding id="radio" extends="chrome://global/content/bindings/radio.xml#radio">
     <content>
-      <xul:box flex="1" class="radio-internal-box" autostretch="never" valign="middle">
-        <xul:box class="radio-checkmark-box-1" autostretch="never" inherits="disabled">
-          <xul:box class="radio-checkmark-box-2" autostretch="never" flex="1">
+      <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:box>
-        </xul:box>
+          </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">
           <children/>
         </xul:html>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="checkbox" extends="chrome://global/content/bindings/checkbox.xml#checkbox">
     <content>
-      <xul:box flex="1" class="checkbox-internal-box" autostretch="never" valign="middle">
-        <xul:box class="checkbox-checkmark-box-1" autostretch="never" inherits="disabled">
-          <xul:box class="checkbox-checkmark-box-2" autostretch="never" flex="1">
+      <xul:hbox flex="1" class="checkbox-internal-box" align="center" valign="middle">
+        <xul:hbox class="checkbox-checkmark-box-1" align="center" inherits="disabled">
+          <xul:hbox class="checkbox-checkmark-box-2" align="center" flex="1">
             <xul:image class="checkbox-check" inherits="checked,disabled"/>
-          </xul:box>
-        </xul:box>
+          </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">
           <children/>
         </xul:html>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 
 <binding id="thumb" extends="chrome://global/content/bindings/scrollbar.xml#thumb">
     <content>
-      <xul:box class="thumb-border" orient="vertical" flex="1">
+      <xul:vbox class="thumb-border" flex="1">
         <xul:spring flex="1"/>
-        <xul:box>
-            <xul:spring flex="1"/>
-        <xul:image inherits="src"/>
+        <xul:hbox>
+          <xul:spring flex="1"/>
+          <xul:image inherits="src"/>
+          <xul:spring flex="1"/>
+        </xul:hbox>
         <xul:spring flex="1"/>
-      </xul:box>
-        <xul:spring flex="1"/>
-      </xul:box>
+      </xul:vbox>
     </content>
   </binding>
 
@@ -106,36 +106,36 @@
   
   <binding id="grippy" extends="chrome://global/content/bindings/splitter.xml#grippy">
     <content>
-      <xul:box class="grippy-box" flex="1">
+      <xul:hbox class="grippy-box" flex="1">
         <xul:image class="grippy-image" inherits="src" />
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
   
   <binding id="double-box">
     <content>
-      <xul:box class="db-internal-box" flex="1">
+      <xul:hbox class="db-internal-box" flex="1">
         <children/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
   
   <binding id="treeheader" 
            extends="chrome://global/content/bindings/tree.xml#treecell-header">
     <content>
-      <xul:box class="treeheader-box" flex="1" autostretch="never">
+      <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:box>
+      </xul:hbox>
     </content>
   </binding>
   
   <binding id="menubutton-icon"
            extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-icon-box">
+      <xul:hbox class="menubutton-icon-box">
         <xul:image inherits="src" class="menubutton-icon-image"/>
-      </xul:box>
+      </xul:hbox>
     <children includes="menupopup"/>
     </content>
   </binding>
@@ -143,9 +143,9 @@
   <binding id="menubutton-icon-nostretch"
            extends="chrome://global/content/bindings/tree.xml#treecell-header">
     <content>
-      <xul:box class="menubutton-icon-box" autostretch="never">
+      <xul:hbox class="menubutton-icon-box" align="center">
         <xul:image inherits="src" class="menubutton-icon-image"/>
-      </xul:box>
+      </xul:hbox>
     <children includes="menupopup"/>
     </content>
   </binding>
@@ -153,10 +153,10 @@
   <binding id="tab" extends="chrome://global/content/bindings/tabbox.xml#tab">
     <content>
       <xul:spring class="tab-image-left" inherits="selected"/>
-      <xul:box flex="1" class="tab-image-middle" orient="horizontal" align="center" inherits="selected" autostretch="never">
+      <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:box>
+      </xul:hbox>
       <xul:spring class="tab-image-right" inherits="selected"/>
     </content>
   </binding>
@@ -164,58 +164,62 @@
   <binding id="tabs" extends="chrome://global/content/bindings/tabbox.xml#tabs">
     <content>
       <xul:spring class="tab-border-top-left-cap"/>
-    <xul:spring class="tab-border-top-left"/>
-    <xul:box inherits="align">
-      <children/>
-    </xul:box>
-    <xul:spring class="tab-border-top-right" flex="1"/>
-    <xul:spring class="tab-border-top-right-cap"/>
-  </content>
+      <xul:spring class="tab-border-top-left"/>
+      <xul:box inherits="orient,align,pack">
+        <children/>
+      </xul:box>
+      <xul:spring class="tab-border-top-right" flex="1"/>
+      <xul:spring class="tab-border-top-right-cap"/>
+    </content>
   </binding>
   
   <binding id="largeheader" extends="chrome://communicator/content/dialogBindings.xml#largeheader">
     <content>
-      <xul:box class="box-header-header" flex="1" autostretch="never">
-        <xul:box class="box-header-icon-box" autostretch="never">
+      <xul:hbox class="box-header-header" flex="1" align="center">
+        <xul:hbox class="box-header-icon-box" align="center">
           <xul:image inherits="src" class="box-header-icon"/>
-        </xul:box>
-        <xul:box autostretch="never" class="box-header-text-box">
+        </xul:hbox>
+        <xul:hbox class="box-header-text-box" align="center">
           <xul:text class="box-header-text" inherits="value=title"/>
-        </xul:box>
+        </xul:hbox>
         <xul:spring flex="1"/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>  
 
   <binding id="toolbarbutton-left" extends="chrome://global/content/bindings/button.xml#buttonleft">
-    <content autostretch="never">
-      <xul:image class="toolbarbutton-left-icon" inherits="src,disabled"/>
-      <xul:text class="toolbarbutton-left-text" inherits="value=label,crop"/>
+    <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:hbox>
     </content>
   </binding>  
 
   <binding id="toolbarbutton-top" extends="chrome://global/content/bindings/button.xml#buttontop">
-    <content autostretch="never" orient="vertical">
-      <xul:image class="toolbarbutton-top-icon" inherits="src,disabled"/>
-      <xul:text class="toolbarbutton-top-text" inherits="value=label,crop"/>
+    <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:vbox>
     </content>
   </binding>  
   
-    <binding id="autocomplete-history-button" extends="xul:box">
+  <binding id="autocomplete-history-button">
     <content>
-      <xul:box class="autocomplete-history-button-internal-box" autostretch="never">
+      <xul:hbox class="autocomplete-history-button-internal-box" align="center">
         <children/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="menubutton-single" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-single-internal-box" flex="1">
+      <xul:hbox class="menubutton-single-internal-box" flex="1">
         <xul:button class="menubutton-single-button" flex="1" inherits="open,label,disabled">
           <xul:image class="menubutton-single-dropmarker" inherits="open,disabled"/>
         </xul:button>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
diff --git a/mozilla/themes/classic/global/mac/menu.css b/mozilla/themes/classic/global/mac/menu.css
index 4abd6a1299e..6778ce11701 100644
--- a/mozilla/themes/classic/global/mac/menu.css
+++ b/mozilla/themes/classic/global/mac/menu.css
@@ -76,7 +76,7 @@ popup > menuitem[menuactive="true"][disabled="true"]
   {
     margin                : -1px 3px 1px 6px;
     width                 : 8px;
-    text-align            : center;
+    -moz-box-pack         : center;
     list-style-image      : url("chrome://global/skin/menu-arrow.gif");
   }
 
@@ -85,7 +85,7 @@ popup > menuitem[menuactive="true"][disabled="true"]
     color                 : inherit;
     margin                : 0px 5px 0px 1px;
     width                 : 11px;
-    text-align            : center;
+   -moz-box-pack          : center;
     list-style-image      : inherit;
     padding-left          : 16px;
   }
@@ -96,7 +96,7 @@ menuitem[type="checkbox"] > .menu-iconic-left, menuitem[type="radio"] > .menu-ic
     color                 : inherit;
     margin                : 0px 10px 0px 0px;
     width                 : 11px;
-    text-align            : center;
+    -moz-box-pack         : center;
     list-style-image      : inherit;
     padding-left		  : 2px;
   }
diff --git a/mozilla/themes/classic/global/mac/menulist.css b/mozilla/themes/classic/global/mac/menulist.css
index b09503db545..a0fb397eb62 100644
--- a/mozilla/themes/classic/global/mac/menulist.css
+++ b/mozilla/themes/classic/global/mac/menulist.css
@@ -97,8 +97,6 @@
     padding-left    : 3px;
     padding-right   : 2px;
     padding-top     : 3px;
-    /**  padding-bottom  : 1px; **/
-    text-align      : center;
   }
 
   .menulist-right-btm {
diff --git a/mozilla/themes/classic/global/mac/menulistBindings.xml b/mozilla/themes/classic/global/mac/menulistBindings.xml
index 5f564aa8307..95d1c230895 100644
--- a/mozilla/themes/classic/global/mac/menulistBindings.xml
+++ b/mozilla/themes/classic/global/mac/menulistBindings.xml
@@ -7,44 +7,44 @@
 
   <binding id="nine-slice-menulist" extends="chrome://global/content/bindings/menulist.xml#menulist">
   	<content>
-      <xul:box class="menulist-box-left" inherits="disabled" orient="vertical">
+      <xul:vbox class="menulist-box-left" inherits="disabled">
         <xul:spring class="menulist-left-top" inherits="disabled"/>
         <xul:spring class="menulist-left-mid" inherits="disabled" flex="1"/>
         <xul:spring class="menulist-left-btm" inherits="disabled"/>
-      </xul:box>
+      </xul:vbox>
 
       <xul:stack class="menulist-stack" flex="1">
-        <xul:box class="menulist-box-mid" inherits="disabled" orient="vertical">
+        <xul:vbox class="menulist-box-mid" inherits="disabled">
            <xul:spring class="menulist-mid-top" inherits="disabled"/>
-           <xul:box class="menulist-mid-mid" inherits="disabled" flex="1"/>
+           <xul:spring class="menulist-mid-mid" inherits="disabled" flex="1"/>
            <xul:spring class="menulist-mid-btm" inherits="disabled"/>
-        </xul:box>
+        </xul:vbox>
 
-        <xul:box class="menulist-text-box" autostretch="never">
+        <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" flex="1"/>
-       </xul:box>
+       </xul:hbox>
      </xul:stack>
       
-      <xul:box class="menulist-box-right" inherits="disabled" orient="vertical">
-    		<xul:box class="menulist-right-mid" inherits="disabled" flex="1">
-      		<xul:box class="menulist-right-mid2" inherits="disabled" flex="1" align="center">
+      <xul:vbox class="menulist-box-right" inherits="disabled">
+    		<xul:hbox class="menulist-right-mid" inherits="disabled" flex="1">
+      		<xul:hbox class="menulist-right-mid2" inherits="disabled" flex="1" align="center" pack="center">
         		<xul:image class="menulist-dropmarker" inherits="disabled"/>
-          </xul:box>
-        </xul:box>
+          </xul:hbox>
+        </xul:hbox>
         <xul:spring class="menulist-right-btm" inherits="disabled"/>
-      </xul:box>
+      </xul:vbox>
 	  <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="menulist-compact" extends="chrome://global/content/bindings/menulist.xml#menulist">
     <content flex="1">
-      <xul:box class="menulist-compact-internal-box" flex="1" align="center">
+      <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
         <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
         <xul:spring flex="1"/>
         <xul:text class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
-      </xul:box>
+      </xul:hbox>
 	  <children includes="menupopup"/>
     </content>
   </binding>
@@ -53,17 +53,17 @@
    
   <binding id="menulist-editable" extends="chrome://global/content/bindings/menulist.xml#menulist-editable">
     <content>
-      <xul:box class="menulist-internal-box" flex="1">
-        <xul:box class="menulist-display-box" flex="1" valign="middle" autostretch="never">
+      <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"/>
           <html:input type="text" class="menulist-editable-text" inherits="value=label,accesskey" flex="1"/>
-        </xul:box>
-        <xul:box class="menulist-dropmarker-box-1" valign="middle" inherits="open">
-          <xul:box class="menulist-dropmarker-box-2" flex="1" autostretch="never" valign="middle" inherits="open">
+        </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">
             <xul:image class="menulist-dropmarker" inherits="disabled"/>
-          </xul:box>
-        </xul:box>
-      </xul:box>
+          </xul:hbox>
+        </xul:hbox>
+      </xul:hbox>
 	  <children includes="menupopup"/>
     </content>
   </binding>
diff --git a/mozilla/themes/classic/global/mac/scrollbox.css b/mozilla/themes/classic/global/mac/scrollbox.css
index ef4e231fbf1..684359cfc75 100644
--- a/mozilla/themes/classic/global/mac/scrollbox.css
+++ b/mozilla/themes/classic/global/mac/scrollbox.css
@@ -10,11 +10,12 @@
 }
 
 autorepeatbutton {
+  -moz-box-align: center;
+  -moz-box-pack: center;
   margin: 1px 2px 2px 1px;
   border: 1px solid transparent;
   padding: 1px;
   height: 1em;  
-  text-align: left;
 }
 
 autorepeatbutton:hover {
diff --git a/mozilla/themes/classic/global/mac/splitter.css b/mozilla/themes/classic/global/mac/splitter.css
index 331abb2cb91..fe69ddac5ee 100644
--- a/mozilla/themes/classic/global/mac/splitter.css
+++ b/mozilla/themes/classic/global/mac/splitter.css
@@ -4,7 +4,6 @@ splitter
   {
     cursor                : e-resize;
     background-color      : #DDDDDD;
-    text-align			  : center;
     border-right          : 1px solid #000000;
   }
 
diff --git a/mozilla/themes/classic/global/mac/toolbar.css b/mozilla/themes/classic/global/mac/toolbar.css
index 5e184e6e3bf..f7fd41c1745 100644
--- a/mozilla/themes/classic/global/mac/toolbar.css
+++ b/mozilla/themes/classic/global/mac/toolbar.css
@@ -46,6 +46,7 @@ menubar > toolbargrippy
 toolbargrippy
   {
     -moz-binding          : url("chrome://global/skin/classicBindings.xml#toolbargrippy");
+    -moz-box-orient       : vertical;
     background-color      : #DDDDDD;
     border-left           : 1px solid #FFFFFF;
     border-top            : 1px solid #FFFFFF;
diff --git a/mozilla/themes/classic/global/menubuttonBindings.xml b/mozilla/themes/classic/global/menubuttonBindings.xml
index 7f71c18614a..3b459e292bb 100644
--- a/mozilla/themes/classic/global/menubuttonBindings.xml
+++ b/mozilla/themes/classic/global/menubuttonBindings.xml
@@ -6,36 +6,40 @@
           
   <binding id="menubutton-toolbar-top">
     <content>
-     <xul:box class="classic-simplebutton-box" autostretch="never" flex="1">
+     <xul:hbox class="classic-simplebutton-box" align="center" flex="1">
         <xul:button class="classic-simplebutton" allowevents="true" flex="1"
                   inherits="label,src,accesskey,crop,disabled,oncommand=buttonaction" 
                   onmousedown="this.parentNode.setAttribute('buttondown','true');"
                   onmouseup="this.parentNode.removeAttribute('buttondown');"
                   onmouseover="this.parentNode.setAttribute('buttonover','true');"
                   onmouseout="this.parentNode.removeAttribute('buttonover');"/>
-       </xul:box>
-       <xul:box class="classic-dropmarker-box" autostretch="never" valign="middle" inherits="disabled">
+       </xul:hbox>
+       <xul:hbox class="classic-dropmarker-box" align="center" inherits="disabled">
           <xul:image class="classic-dropmarker" inherits="disabled"/>
-       </xul:box>
+       </xul:hbox>
      <children includes="menupopup"/>
     </content>
   </binding>
   
   <binding id="buttonleft" extends="chrome://global/content/bindings/button.xml#base-button">
-    <content autostretch="never">
-      <xul:image class="classic-simplebutton-icon" inherits="src"/>
-      <xul:box orient="vertical" class="classic-simplebutton-textbox" autostretch="never" flex="1">
-        <xul:text class="classic-simplebutton-text" inherits="value=label,accesskey,crop"/>
-      </xul:box>
+    <content>
+      <xul:hbox align="center" flex="1">
+        <xul:image class="classic-simplebutton-icon" inherits="src"/>
+        <xul:vbox class="classic-simplebutton-textbox" align="center" flex="1">
+          <xul:text class="classic-simplebutton-text" inherits="value=label,accesskey,crop"/>
+        </xul:vbox>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="buttontop" extends="chrome://global/content/bindings/button.xml#base-button">
-    <content orient="vertical" autostretch="never" halign="middle">
-      <xul:image class="classic-simplebutton-icon" inherits="src"/>
-      <xul:box orient="vertical" class="classic-simplebutton-textbox" autostretch="never" flex="1">
-        <xul:text class="classic-simplebutton-text" inherits="value=label,accesskey,crop"/>
-      </xul:box>
+    <content>
+      <xul:vbox flex="1" align="center">
+        <xul:image class="classic-simplebutton-icon" inherits="src"/>
+        <xul:vbox class="classic-simplebutton-textbox" align="center" flex="1">
+          <xul:text class="classic-simplebutton-text" inherits="value=label,accesskey,crop"/>
+        </xul:vbox>
+      </xul:vbox>
     </content>
   </binding>
   
diff --git a/mozilla/themes/classic/global/win/autocomplete.css b/mozilla/themes/classic/global/win/autocomplete.css
index e0fe0168352..2211f30384e 100644
--- a/mozilla/themes/classic/global/win/autocomplete.css
+++ b/mozilla/themes/classic/global/win/autocomplete.css
@@ -73,6 +73,7 @@ textbox[type="autocomplete"]
 
 .autocomplete-outliner 
   {
+    border                 : none;
     background-color       : transparent !important;
   }
 
@@ -83,6 +84,11 @@ textbox[type="autocomplete"]
     padding                : 0px !important;
   }
 
+.autocomplete-outlinerbody:-moz-outliner-cell-text 
+  {
+    padding-left: 8px;
+  }
+
 .autocomplete-outlinerbody:-moz-outliner-row(menuactive) 
   {
     background-color       : Highlight;
diff --git a/mozilla/themes/classic/global/win/button.css b/mozilla/themes/classic/global/win/button.css
index dd7d5944c1f..100665ee188 100644
--- a/mozilla/themes/classic/global/win/button.css
+++ b/mozilla/themes/classic/global/win/button.css
@@ -82,7 +82,7 @@
   .button-box-text,
   button[disabled]:focus > .button-box-1 > .button-box-2 > .button-box-text
     {
-      text-align          : center;
+      -moz-box-pack       : center;
       padding             : 0px 3px 1px 2px;
       border              : 1px solid ThreeDFace;
       margin              : 1px;
diff --git a/mozilla/themes/classic/global/win/buttonBindings.xml b/mozilla/themes/classic/global/win/buttonBindings.xml
index 6aab6833449..3396b58b2b8 100644
--- a/mozilla/themes/classic/global/win/buttonBindings.xml
+++ b/mozilla/themes/classic/global/win/buttonBindings.xml
@@ -6,64 +6,66 @@
 
   <binding id="buttonleft" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-box-1" flex="1">
-        <xul:box class="button-box-2" autostretch="never" flex="1">
+      <xul:hbox class="button-box-1" flex="1">
+        <xul:hbox class="button-box-2" align="center" flex="1">
           <xul:image class="button-icon" inherits="src"/>
-          <xul:box class="button-box-text" flex="1" autostretch="never">
+          <xul:hbox class="button-box-text" flex="1" align="center">
             <xul:text class="button-text" inherits="disabled,value=label,accesskey,crop"/>
             <children/>
-          </xul:box>
-        </xul:box>
-      </xul:box>
+          </xul:hbox>
+        </xul:hbox>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="buttonright" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-box-1" flex="1">
-        <xul:box class="button-box-2" autostretch="never" flex="1">
-          <xul:box class="button-box-text" flex="1" autostretch="never">
+      <xul:hbox class="button-box-1" flex="1">
+        <xul:hbox class="button-box-2" align="center" flex="1">
+          <xul:hbox class="button-box-text" flex="1" align="center">
             <xul:text class="button-text" inherits="disabled,value=label,accesskey,crop"/>
             <children/>
-          </xul:box>
+          </xul:hbox>
           <xul:image class="button-icon" inherits="src"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:hbox>
     </content>
   </binding>
   
   <binding id="buttontop" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-box-1" flex="1">
-        <xul:box class="button-box-2" autostretch="never" flex="1" orient="vertical" align="center">
+      <xul:hbox class="button-box-1" flex="1">
+        <xul:vbox class="button-box-2" align="center" flex="1">
           <xul:image class="button-icon" inherits="src"/>
-          <xul:box class="button-box-text" flex="1" autostretch="never">
+          <xul:hbox class="button-box-text" flex="1" align="center">
             <xul:text class="button-text" inherits="disabled,value=label,accesskey,crop"/>
             <children/>
-          </xul:box>
-        </xul:box>
-      </xul:box>
+          </xul:hbox>
+        </xul:vbox>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="buttonbottom" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-box-1" flex="1">
-        <xul:box class="button-box-2" autostretch="never" flex="1" orient="vertical" align="center">
-          <xul:box class="button-box-text" flex="1" autostretch="never">
+      <xul:hbox class="button-box-1" flex="1">
+        <xul:vbox class="button-box-2" align="center" flex="1">
+          <xul:hbox class="button-box-text" flex="1" align="center">
             <xul:text class="button-text" inherits="disabled,value=label,accesskey,crop"/>
             <children/>
-          </xul:box>
+          </xul:hbox>
           <xul:image class="button-icon" inherits="src"/>
-        </xul:box>
-      </xul:box>
+        </xul:vbox>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="simplebutton" extends="chrome://global/content/bindings/button.xml#button-base">
-    <content orient="vertical" autostretch="never" align="center">
-      <xul:image class="simplebutton-icon" inherits="src,disabled"/>
-      <xul:text class="simplebutton-text" inherits="value=label,accesskey,crop,disabled"/>
+    <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:vbox>
     </content>
   </binding>
   
diff --git a/mozilla/themes/classic/global/win/classicBindings.xml b/mozilla/themes/classic/global/win/classicBindings.xml
index 3b4bdcd573e..b5643c0bf46 100644
--- a/mozilla/themes/classic/global/win/classicBindings.xml
+++ b/mozilla/themes/classic/global/win/classicBindings.xml
@@ -15,19 +15,19 @@
 
   <binding id="toolbargrippy"
            extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
-    <content orient="vertical">
-      <xul:box autostretch="never" halign="center">
+    <content>
+      <xul:hbox align="center" pack="center">
         <xul:image class="toolbargrippy-twisty"/>
-      </xul:box>
+      </xul:hbox>
       <xul:spring class="toolbargrippy-texture" flex="1"/>
     </content>
   </binding>
 
   <binding id="toolbargrippy-collapsed" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
     <content>
-      <xul:box autostretch="never" halign="center">
+      <xul:hbox align="center" pack="center">
         <xul:image class="toolbargrippy-twisty-collapsed"/>
-      </xul:box>
+      </xul:hbox>
       <xul:spring class="toolbargrippy-texture-collapsed" flex="1"/>
     </content>
   </binding>
@@ -35,53 +35,53 @@
   
   <binding id="radio" extends="chrome://global/content/bindings/radio.xml#radio">
     <content>
-      <xul:box flex="1" class="radio-internal-box" autostretch="never" valign="middle">
-        <xul:box class="radio-checkmark-box-1" autostretch="never" inherits="disabled">
-          <xul:box class="radio-checkmark-box-2" autostretch="never" flex="1">
+      <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:box>
-        </xul:box>
-        <xul:box class="radio-text-container" flex="1" autostretch="never">
+          </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">
             <children/>
           </xul:html>
-        </xul:box>          
-      </xul:box>
+        </xul:hbox>          
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="checkbox" extends="chrome://global/content/bindings/checkbox.xml#checkbox">
     <content>
-      <xul:box flex="1" class="checkbox-internal-box" autostretch="never" valign="middle">
-        <xul:box class="checkbox-checkmark-box-1" autostretch="never" inherits="disabled">
-          <xul:box class="checkbox-checkmark-box-2" autostretch="never" flex="1">
+      <xul:hbox flex="1" class="checkbox-internal-box" align="center">
+        <xul:hbox class="checkbox-checkmark-box-1" align="center" inherits="disabled">
+          <xul:hbox class="checkbox-checkmark-box-2" align="center" flex="1">
             <xul:image class="checkbox-check" inherits="checked,disabled"/>
-          </xul:box>
-        </xul:box>
+          </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">
           <children/>
         </xul:html>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="thumb" extends="chrome://global/content/bindings/scrollbar.xml#thumb">
     <content>
-      <xul:box class="thumb-box" autostretch="never" orient="vertical" flex="1">
+      <xul:vbox class="thumb-box" align="center" flex="1">
         <xul:spring class="thumb-spring" flex="1"/>
-      </xul:box>
+      </xul:vbox>
     </content>
   </binding>
 
   <binding id="scrollbar" extends="chrome://global/content/bindings/scrollbar.xml#scrollbar">
     <content>
-      <xul:scrollbarbutton type="decrement" inherits="sborient=align"/>
+      <xul:scrollbarbutton type="decrement" inherits="sborient=orient"/>
       <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">
-        <xul:thumb inherits="align,src" flex="1"/>
+        <xul:thumb inherits="src" flex="1"/>
       </xul:slider>
-      <xul:scrollbarbutton type="increment" inherits="sborient=align"/>
+      <xul:scrollbarbutton type="increment" inherits="sborient=orient"/>
     </content>
   </binding>
   
@@ -96,67 +96,72 @@
   
   <binding id="grippy" extends="chrome://global/content/bindings/splitter.xml#grippy">
     <content>
-      <xul:box class="grippy-box" flex="1">
+      <xul:hbox class="grippy-box" flex="1">
         <xul:image class="grippy-image" inherits="src" />
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
   
   <binding id="double-box">
     <content>
-      <xul:box class="db-internal-box" flex="1">
+      <xul:hbox class="db-internal-box" flex="1">
         <children/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="menuitem-iconic" extends="chrome://global/content/bindings/menu.xml#menuitem-iconic">
     <content>
-      <xul:box class="menu-iconic-left" orient="vertical" autostretch="never" inherits="selected,menuactive,disabled,checked">
+      <xul:vbox class="menu-iconic-left" align="center" inherits="selected,menuactive,disabled,checked">
         <xul:image/>
-      </xul:box>
+      </xul:vbox>
       <xul:spring class="menuitem-iconic-spring"/>
       <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"/>
     </content>
   </binding>
 
-  <binding id="largeheader" extends="xul:box">
+  <binding id="largeheader">
     <content>
-      <xul:box class="largeheader-box" flex="1">
-        <xul:box class="largeheader-text-container" orient="vertical">
+      <xul:hbox class="largeheader-box" flex="1">
+        <xul:vbox class="largeheader-text-container">
           <xul:spring flex="1"/>
           <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
           <xul:html class="largeheader-desc-text" inherits="value=description"/>
           <xul:spring flex="1"/>
-        </xul:box>
+        </xul:vbox>
         <xul:spring flex="1"/>
-        <xul:box class="largeheader-icon-container" autostretch="never">
+        <xul:hbox class="largeheader-icon-container" align="center">
           <xul:image class="largeheader-icon" inherits="src"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="toolbarbutton-left" extends="chrome://global/content/bindings/button.xml#buttonleft">
-    <content autostretch="never">
-      <xul:image class="toolbarbutton-left-icon" inherits="src,disabled"/>
-      <xul:text class="toolbarbutton-left-text" inherits="value=label,crop"/>
+    <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:hbox>
     </content>
   </binding>  
 
   <binding id="toolbarbutton-top" extends="chrome://global/content/bindings/button.xml#buttontop">
-    <content autostretch="never" orient="vertical">
-      <xul:image class="toolbarbutton-top-icon" inherits="src,disabled"/>
-      <xul:text class="toolbarbutton-top-text" inherits="value=label,crop"/>
+    <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:vbox>
     </content>
   </binding>  
   
-  <binding id="splitter-hack" extends="chrome://global/content/bindings/splitter.xml#splitter">
+  <binding id="splitter"
+           extends="chrome://global/content/bindings/splitter.xml#splitter">
     <content>
-      <xul:box class="splitter-hack-box" flex="1" autostretch="never">
+      <xul:hbox class="splitter-internal-box" flex="1" pack="center" align="center">
         <children/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 
@@ -169,25 +174,21 @@
     </content>  
   </binding>
 
-  <binding id="autostretch-never" extends="xul:box">
-    <content autostretch="never"/>
-  </binding>
-  
-  <binding id="autocomplete-history-button" extends="xul:box">
+  <binding id="autocomplete-history-button">
     <content>
-      <xul:box class="autocomplete-history-button-internal-box" autostretch="never">
+      <xul:hbox class="autocomplete-history-button-internal-box" align="center">
         <children/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="menubutton-single" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-single-internal-box" flex="1">
+      <xul:hbox class="menubutton-single-internal-box" flex="1">
         <xul:button class="menubutton-single-button" flex="1" inherits="open,label,disabled">
           <xul:image class="menubutton-single-dropmarker" inherits="open,disabled"/>
         </xul:button>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
diff --git a/mozilla/themes/classic/global/win/global.css b/mozilla/themes/classic/global/win/global.css
index 77ad29c89b9..b1900e162f6 100644
--- a/mozilla/themes/classic/global/win/global.css
+++ b/mozilla/themes/classic/global/win/global.css
@@ -78,11 +78,9 @@
       -moz-binding          : url("chrome://global/skin/classicBindings.xml#grippy");
     }
     
-  window[orient="vertical"] > splitter,
-  box[orient="vertical"] > splitter,
-  vbox > splitter
+  splitter
     {
-      -moz-binding        : url("chrome://global/skin/classicBindings.xml#splitter-hack");
+      -moz-binding        : url("chrome://global/skin/classicBindings.xml#splitter");
     }
 
   tabs 
diff --git a/mozilla/themes/classic/global/win/menu.css b/mozilla/themes/classic/global/win/menu.css
index 44248351a04..888cb3db0d5 100644
--- a/mozilla/themes/classic/global/win/menu.css
+++ b/mozilla/themes/classic/global/win/menu.css
@@ -80,7 +80,6 @@ popup > menuitem[menuactive="true"]
   {
     margin                : 0px 4px 0px 6px;
     width                 : 8px;
-    text-align            : center;
     list-style-image      : url("chrome://global/skin/menu-arrow.gif");
   }
 
@@ -89,7 +88,6 @@ popup > menuitem[menuactive="true"]
     color                 : inherit;
     margin                : 0px 4px 0px 3px;
     width                 : 16px;
-    text-align            : center;
     list-style-image      : inherit;
   }
 
diff --git a/mozilla/themes/classic/global/win/menulistBindings.xml b/mozilla/themes/classic/global/win/menulistBindings.xml
index a9da39810c2..4b2158b8f26 100644
--- a/mozilla/themes/classic/global/win/menulistBindings.xml
+++ b/mozilla/themes/classic/global/win/menulistBindings.xml
@@ -8,17 +8,17 @@
   <binding id="menulist"
            extends="chrome://global/content/bindings/menulist.xml#menulist">
     <content>
-      <xul:box class="menulist-internal-box" flex="1">
-        <xul:box class="menulist-display-box" flex="1" valign="middle" autostretch="never">
+      <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,accesskey" crop="right" flex="1"/>
-        </xul:box>
-        <xul:box class="menulist-dropmarker-box-1" valign="middle" inherits="open">
-          <xul:box class="menulist-dropmarker-box-2" flex="1" autostretch="never" valign="middle" inherits="open">
+        </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">
             <xul:image class="menulist-dropmarker" inherits="disabled"/>
-          </xul:box>
-        </xul:box>
-      </xul:box>
+          </xul:hbox>
+        </xul:hbox>
+      </xul:hbox>
     <children includes="menupopup"/>
     </content>
   </binding>
@@ -26,17 +26,17 @@
   <binding id="menulist-editable"
            extends="chrome://global/content/bindings/menulist.xml#menulist-editable">
     <content>
-      <xul:box class="menulist-internal-box" flex="1">
-        <xul:box class="menulist-display-box" flex="1" valign="middle" autostretch="never">
+      <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"/>
           <html:input type="text" class="menulist-editable-text" inherits="value=label,accesskey" flex="1"/>
-        </xul:box>
-        <xul:box class="menulist-dropmarker-box-1" valign="middle" inherits="open">
-          <xul:box class="menulist-dropmarker-box-2" flex="1" autostretch="never" valign="middle" inherits="open">
+        </xul:hbox>
+        <xul:hbox class="menulist-dropmarker-box-1" valign="middle" inherits="open">
+          <xul:hbox class="menulist-dropmarker-box-2" flex="1" align="center" pack="center" inherits="open">
             <xul:image class="menulist-dropmarker" inherits="disabled"/>
-          </xul:box>
-        </xul:box>
-      </xul:box>
+          </xul:hbox>
+        </xul:hbox>
+      </xul:hbox>
     <children includes="menupopup"/>
     </content>
   </binding>
@@ -44,19 +44,19 @@
   <binding id="menulistpopup"
            extends="chrome://global/content/bindings/popup.xml#popup">
     <content>
-      <xul:box class="menulistpopup-internal-box" orient="vertical" flex="1" style="overflow: auto">
+      <xul:vbox class="menulistpopup-internal-box" flex="1" style="overflow: auto">
         <children/>
-      </xul:box>
+      </xul:vbox>
     </content>
   </binding>
    
   <binding id="menulist-compact" extends="chrome://global/content/bindings/menulist.xml#menulist">
-    <content flex="1">
-      <xul:box class="menulist-compact-internal-box" flex="1" autostretch="never">
+    <content>
+      <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
         <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
         <xul:spring flex="1"/>
         <xul:text class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
-      </xul:box>
+      </xul:hbox>
     <children includes="menupopup"/>
     </content>
   </binding>
diff --git a/mozilla/themes/classic/global/win/scrollbars.css b/mozilla/themes/classic/global/win/scrollbars.css
index 1efe932b7b2..82aa4415e42 100644
--- a/mozilla/themes/classic/global/win/scrollbars.css
+++ b/mozilla/themes/classic/global/win/scrollbars.css
@@ -7,7 +7,7 @@ scrollbar
     -moz-binding          : url("chrome://global/skin/classicBindings.xml#scrollbar");
     cursor                : default;
   }
-
+  
 /********* XP Scrollbar *********/
 
 thumb 
diff --git a/mozilla/themes/classic/global/win/scrollbox.css b/mozilla/themes/classic/global/win/scrollbox.css
index 96279edb9b0..efa88fd4b94 100644
--- a/mozilla/themes/classic/global/win/scrollbox.css
+++ b/mozilla/themes/classic/global/win/scrollbox.css
@@ -13,11 +13,12 @@
 
 autorepeatbutton 
   {
+    -moz-box-align        : center;
+    -moz-box-pack         : center;
     margin                : 1px 2px 2px 1px;
     border                : 1px solid transparent;
     padding               : 1px;
     height                : 1em;  
-    text-align            : center;
   }
 
 autorepeatbutton:hover 
diff --git a/mozilla/themes/classic/global/win/splitter.css b/mozilla/themes/classic/global/win/splitter.css
index 94c1660119a..27e184f2c05 100644
--- a/mozilla/themes/classic/global/win/splitter.css
+++ b/mozilla/themes/classic/global/win/splitter.css
@@ -10,7 +10,6 @@
     {
       cursor                : e-resize;
       background-color      : -moz-Dialog;
-      text-align	    	: center;
     }
   
   grippy, grippy[collapse="before"]
@@ -66,11 +65,6 @@
     
 /* Grippy alignment */
 
-  splitter[orient="vertical"][autostretch="never"] 
-    {
-      text-align          : center;
-    }
-
 /* Vertical splitter (between two boxes, horizontally stacked), collapse to left */
   window > splitter > grippy,
   box > splitter > grippy,
diff --git a/mozilla/themes/classic/global/win/tabBindings.xml b/mozilla/themes/classic/global/win/tabBindings.xml
index bb118a9832e..718be9e033c 100644
--- a/mozilla/themes/classic/global/win/tabBindings.xml
+++ b/mozilla/themes/classic/global/win/tabBindings.xml
@@ -6,18 +6,18 @@
 
   <binding id="tabs" extends="chrome://global/content/bindings/tabbox.xml#tabs">
     <content>
-      <xul:box class="tabcontainer">
-	      <children/>
-      </xul:box>
-	    <xul:spring class="tabs-spring" flex="1"/>
+      <xul:hbox class="tabcontainer">
+        <children/>
+      </xul:hbox>
+      <xul:spring class="tabs-spring" flex="1"/>
     </content>
   </binding>
 
   <binding id="tabpanels" extends="chrome://global/content/bindings/tabbox.xml#tabpanels">
     <content>
-  	  <xul:box class="tabpanels-inner-box" flex="1">
+      <xul:hbox class="tabpanels-inner-box" flex="1">
         <children/> 
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 
diff --git a/mozilla/themes/classic/global/win/toolbar.css b/mozilla/themes/classic/global/win/toolbar.css
index 20ea31fd841..1fd604a8031 100644
--- a/mozilla/themes/classic/global/win/toolbar.css
+++ b/mozilla/themes/classic/global/win/toolbar.css
@@ -37,6 +37,7 @@ menubar
 
 toolbargrippy
   {
+    -moz-box-orient       : vertical;
     border-left           : 1px solid ThreeDHighlight;
     border-top            : 1px solid ThreeDHighlight;
     border-right          : 1px solid ThreeDShadow;
diff --git a/mozilla/themes/classic/messenger/addressbook/mac/resources.xml b/mozilla/themes/classic/messenger/addressbook/mac/resources.xml
index 4e079e90ec9..edbe674dcda 100644
--- a/mozilla/themes/classic/messenger/addressbook/mac/resources.xml
+++ b/mozilla/themes/classic/messenger/addressbook/mac/resources.xml
@@ -1,29 +1,23 @@
 <?xml version="1.0"?>
-<bindings id="resourcesBindings"
-          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">
-          
-         
- <binding id="resource_bundle_addressbook" extends="" >
-   <resources>
-    <!-- begin resources -->
-    	<image src="chrome://messenger/skin/addressbook/newcard-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/newcard-hover-active.gif" />
-    	<image src="chrome://messenger/skin/addressbook/newlist-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/newlist-hover-active.gif" />
-    	<image src="chrome://messenger/skin/addressbook/person-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/person-hover-active.gif" />
-    	<image src="chrome://messenger/skin/addressbook/newmsg-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/newmsg-hover-active.gif" />
-    	<image src="chrome://messenger/skin/addressbook/trash-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/trash-hover-active.gif" />
-    	<image src="chrome://global/skin/stop-hover.gif" />
-    	<image src="chrome://global/skin/stop-hover-active.gif" />
-    	<image src="chrome://messenger/skin/addressbook/searchold-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/searchold-hover-active.gif" />
 
-   	<!-- end resources -->
+<bindings id="resourcesBindings" xmlns="http://www.mozilla.org/xbl">
+         
+ <binding id="resource_bundle_addressbook">
+   <resources>
+      <image src="chrome://messenger/skin/addressbook/newcard-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/newcard-hover-active.gif"/>
+      <image src="chrome://messenger/skin/addressbook/newlist-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/newlist-hover-active.gif"/>
+      <image src="chrome://messenger/skin/addressbook/person-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/person-hover-active.gif"/>
+      <image src="chrome://messenger/skin/addressbook/newmsg-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/newmsg-hover-active.gif"/>
+      <image src="chrome://messenger/skin/addressbook/trash-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/trash-hover-active.gif"/>
+      <image src="chrome://global/skin/stop-hover.gif"/>
+      <image src="chrome://global/skin/stop-hover-active.gif"/>
+      <image src="chrome://messenger/skin/addressbook/searchold-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/searchold-hover-active.gif"/>
    </resources>	
   </binding>
           
diff --git a/mozilla/themes/classic/messenger/addressbook/win/resources.xml b/mozilla/themes/classic/messenger/addressbook/win/resources.xml
index 4e079e90ec9..f5dc0bedcab 100644
--- a/mozilla/themes/classic/messenger/addressbook/win/resources.xml
+++ b/mozilla/themes/classic/messenger/addressbook/win/resources.xml
@@ -1,29 +1,23 @@
 <?xml version="1.0"?>
-<bindings id="resourcesBindings"
-          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">
-          
-         
- <binding id="resource_bundle_addressbook" extends="" >
-   <resources>
-    <!-- begin resources -->
-    	<image src="chrome://messenger/skin/addressbook/newcard-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/newcard-hover-active.gif" />
-    	<image src="chrome://messenger/skin/addressbook/newlist-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/newlist-hover-active.gif" />
-    	<image src="chrome://messenger/skin/addressbook/person-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/person-hover-active.gif" />
-    	<image src="chrome://messenger/skin/addressbook/newmsg-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/newmsg-hover-active.gif" />
-    	<image src="chrome://messenger/skin/addressbook/trash-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/trash-hover-active.gif" />
-    	<image src="chrome://global/skin/stop-hover.gif" />
-    	<image src="chrome://global/skin/stop-hover-active.gif" />
-    	<image src="chrome://messenger/skin/addressbook/searchold-hover.gif" />
-    	<image src="chrome://messenger/skin/addressbook/searchold-hover-active.gif" />
 
-   	<!-- end resources -->
+<bindings id="resourcesBindings" xmlns="http://www.mozilla.org/xbl">
+         
+  <binding id="resource_bundle_addressbook">
+    <resources>
+      <image src="chrome://messenger/skin/addressbook/newcard-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/newcard-hover-active.gif"/>
+      <image src="chrome://messenger/skin/addressbook/newlist-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/newlist-hover-active.gif"/>
+      <image src="chrome://messenger/skin/addressbook/person-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/person-hover-active.gif"/>
+      <image src="chrome://messenger/skin/addressbook/newmsg-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/newmsg-hover-active.gif"/>
+      <image src="chrome://messenger/skin/addressbook/trash-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/trash-hover-active.gif"/>
+      <image src="chrome://global/skin/stop-hover.gif"/>
+      <image src="chrome://global/skin/stop-hover-active.gif"/>
+      <image src="chrome://messenger/skin/addressbook/searchold-hover.gif"/>
+      <image src="chrome://messenger/skin/addressbook/searchold-hover-active.gif"/>
    </resources>	
   </binding>
           
diff --git a/mozilla/themes/classic/messenger/mac/msgAccountCentral.css b/mozilla/themes/classic/messenger/mac/msgAccountCentral.css
index 24af556da8d..92069895eb0 100644
--- a/mozilla/themes/classic/messenger/mac/msgAccountCentral.css
+++ b/mozilla/themes/classic/messenger/mac/msgAccountCentral.css
@@ -34,7 +34,6 @@
   margin-left: 5px;
   margin-right: 5px;
   margin-top: 5px;
-  text-align: left;
 }
 
 .acctCentralRow
diff --git a/mozilla/themes/classic/messenger/mac/msgHdrViewOverlay.css b/mozilla/themes/classic/messenger/mac/msgHdrViewOverlay.css
index 82fdaffa86f..0368132f682 100644
--- a/mozilla/themes/classic/messenger/mac/msgHdrViewOverlay.css
+++ b/mozilla/themes/classic/messenger/mac/msgHdrViewOverlay.css
@@ -43,7 +43,7 @@ mail-emailaddress {
 .buttonTopSpacer     { height: .3em; }
 .buttonSpacer        { width: .5em; }
 .headerBox              { overflow: hidden; min-width:50px;}
-.headerValueBox { width: 7.7em; text-align: right;}
+.headerValueBox { width: 7.7em; -moz-box-pack: end;}
 
 #addToAddressBookButton {
 	list-style-image:url("chrome://messenger/skin/addtoab.gif");
@@ -71,7 +71,7 @@ mail-emailaddress {
 
 .emailDisplayImage
 {
-  align: right;
+  -moz-box-pack: end;
 }
 
 .emailDisplayButton {
@@ -134,7 +134,7 @@ text.headerValue
 /* ::::: collapsed view styles ::::: */
 
 #collapsedAttachmentBox {
-  text-align: center;
+  -moz-box-pack: center;
 }
 #collapseddateValue
 {
diff --git a/mozilla/themes/classic/messenger/mac/resources.xml b/mozilla/themes/classic/messenger/mac/resources.xml
index 068db56e280..8bc60bbcc03 100644
--- a/mozilla/themes/classic/messenger/mac/resources.xml
+++ b/mozilla/themes/classic/messenger/mac/resources.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0"?>
-<bindings id="resourcesBindings"
-          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">
-          
+<bindings id="resourcesBindings" xmlns="http://www.mozilla.org/xbl">
          
- <binding id="resource_bundle_messenger" extends="">
+ <binding id="resource_bundle_messenger">
    <resources>
     	<image src="chrome://messenger/skin/getmsg-disabled.gif"/>
     	<image src="chrome://messenger/skin/getmsg-hover.gif"/>
@@ -50,15 +46,10 @@
     	<image src="chrome://global/skin/stop-disabled.gif"/>
     	<image src="chrome://global/skin/stop-hover.gif"/>
     	<image src="chrome://global/skin/stop-hover-active.gif"/>
-
-
-
-    	
-    	<!-- end resources -->
    </resources>	
   </binding>
      
-  <binding id="resource_bundle_messengercompose" extends="">
+  <binding id="resource_bundle_messengercompose">
      <resources>
     	<image src="chrome://messenger/skin/messengercompose/send-hover.gif"/>
     	<image src="chrome://messenger/skin/messengercompose/send-hover-active.gif"/>
@@ -75,10 +66,7 @@
     	<image src="chrome://messenger/skin/messengercompose/savemsg-hover-active.gif"/>
     	<image src="chrome://global/skin/stop-hover.gif"/>
     	<image src="chrome://global/skin/stop-hover-active.gif"/>
-     
      </resources>
-  
-  
-  
   </binding>        
+
 </bindings>          
\ No newline at end of file
diff --git a/mozilla/themes/classic/messenger/win/messenger.css b/mozilla/themes/classic/messenger/win/messenger.css
index 50801e91103..e029144ecf4 100644
--- a/mozilla/themes/classic/messenger/win/messenger.css
+++ b/mozilla/themes/classic/messenger/win/messenger.css
@@ -359,7 +359,6 @@ menu.push {
   border: 1px outset ThreeDFace;
   padding: 2px;
   margin: 2px;
-  text-align: center;
   background-color: inherit;
   background-image: inherit;
 }
diff --git a/mozilla/themes/classic/messenger/win/msgAccountCentral.css b/mozilla/themes/classic/messenger/win/msgAccountCentral.css
index abb322bc834..2a82964c515 100644
--- a/mozilla/themes/classic/messenger/win/msgAccountCentral.css
+++ b/mozilla/themes/classic/messenger/win/msgAccountCentral.css
@@ -34,7 +34,6 @@
   margin-left: 5px;
   margin-right: 5px;
   margin-top: 5px;
-  text-align: left;
 }
 
 .acctCentralRow
diff --git a/mozilla/themes/classic/messenger/win/msgHdrViewOverlay.css b/mozilla/themes/classic/messenger/win/msgHdrViewOverlay.css
index e21d670722d..5eb1ddf1ee8 100644
--- a/mozilla/themes/classic/messenger/win/msgHdrViewOverlay.css
+++ b/mozilla/themes/classic/messenger/win/msgHdrViewOverlay.css
@@ -54,7 +54,7 @@ mail-emailaddress
 .headerValueBox 
   { 
     width                 : 7.7em;
-    text-align            : right;
+    -moz-box-pack         : end;
   }
 
 .headerBox              
@@ -90,7 +90,7 @@ mail-emailaddress
 
 .emailDisplayImage
   {
-    text-align: right;
+    -moz-box-pack: end;
   }
 
 .emailDisplayButton 
@@ -164,7 +164,7 @@ text.headerValue
 /* ::::: collapsed view styles ::::: */
 
 #collapsedAttachmentBox {
-  text-align: center;
+  -moz-box-pack: center;
 }
 
 #collapseddateValue
diff --git a/mozilla/themes/classic/messenger/win/resources.xml b/mozilla/themes/classic/messenger/win/resources.xml
index 068db56e280..6fc4253fd66 100644
--- a/mozilla/themes/classic/messenger/win/resources.xml
+++ b/mozilla/themes/classic/messenger/win/resources.xml
@@ -4,81 +4,72 @@
           xmlns:html="http://www.w3.org/1999/xhtml"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
           
-         
- <binding id="resource_bundle_messenger" extends="">
+ <binding id="resource_bundle_messenger">
    <resources>
-    	<image src="chrome://messenger/skin/getmsg-disabled.gif"/>
-    	<image src="chrome://messenger/skin/getmsg-hover.gif"/>
-    	<image src="chrome://messenger/skin/getmsg-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/newmsg.gif"/>
-    	<image src="chrome://messenger/skin/newmsg-disabled.gif"/>
-    	<image src="chrome://messenger/skin/newmsg-hover.gif"/>
-    	<image src="chrome://messenger/skin/newmsg-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/mark.gif"/>
-    	<image src="chrome://messenger/skin/mark-disabled.gif"/>
-    	<image src="chrome://messenger/skin/mark-hover.gif"/>
-    	<image src="chrome://messenger/skin/mark-clicked.gif"/>
-    	<image src="chrome://messenger/skin/reply.gif"/>
-    	<image src="chrome://messenger/skin/reply-disabled.gif"/>
-    	<image src="chrome://messenger/skin/reply-hover.gif"/>
-    	<image src="chrome://messenger/skin/reply-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/replyall.gif"/>
-    	<image src="chrome://messenger/skin/replyall-disabled.gif"/>
-    	<image src="chrome://messenger/skin/replyall-hover.gif"/>
-    	<image src="chrome://messenger/skin/replyall-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/forward.gif"/>
-    	<image src="chrome://messenger/skin/forward-disabled.gif"/>
-    	<image src="chrome://messenger/skin/forward-hover.gif"/>
-    	<image src="chrome://messenger/skin/forward-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/file.gif"/>
-    	<image src="chrome://messenger/skin/file-disabled.gif"/>
-    	<image src="chrome://messenger/skin/file-hover.gif"/>
-    	<image src="chrome://messenger/skin/file-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/next.gif"/>
-    	<image src="chrome://messenger/skin/next-disabled.gif"/>
-    	<image src="chrome://messenger/skin/next-hover.gif"/>
-    	<image src="chrome://messenger/skin/next-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/trash.gif"/>
-    	<image src="chrome://messenger/skin/trash-disabled.gif"/>
-    	<image src="chrome://messenger/skin/trash-hover.gif"/>
-    	<image src="chrome://messenger/skin/trash-hover-active.gif"/>
-    	<image src="chrome://global/skin/print.gif"/>
-    	<image src="chrome://global/skin/print-disabled.gif"/>
-    	<image src="chrome://global/skin/print-hover.gif"/>
-    	<image src="chrome://global/skin/print-hover-active.gif"/>
-    	<image src="chrome://global/skin/stop.gif"/>
-    	<image src="chrome://global/skin/stop-disabled.gif"/>
-    	<image src="chrome://global/skin/stop-hover.gif"/>
-    	<image src="chrome://global/skin/stop-hover-active.gif"/>
-
-
-
-    	
-    	<!-- end resources -->
+      <image src="chrome://messenger/skin/getmsg-disabled.gif"/>
+      <image src="chrome://messenger/skin/getmsg-hover.gif"/>
+      <image src="chrome://messenger/skin/getmsg-hover-active.gif"/>
+      <image src="chrome://messenger/skin/newmsg.gif"/>
+      <image src="chrome://messenger/skin/newmsg-disabled.gif"/>
+      <image src="chrome://messenger/skin/newmsg-hover.gif"/>
+      <image src="chrome://messenger/skin/newmsg-hover-active.gif"/>
+      <image src="chrome://messenger/skin/mark.gif"/>
+      <image src="chrome://messenger/skin/mark-disabled.gif"/>
+      <image src="chrome://messenger/skin/mark-hover.gif"/>
+      <image src="chrome://messenger/skin/mark-clicked.gif"/>
+      <image src="chrome://messenger/skin/reply.gif"/>
+      <image src="chrome://messenger/skin/reply-disabled.gif"/>
+      <image src="chrome://messenger/skin/reply-hover.gif"/>
+      <image src="chrome://messenger/skin/reply-hover-active.gif"/>
+      <image src="chrome://messenger/skin/replyall.gif"/>
+      <image src="chrome://messenger/skin/replyall-disabled.gif"/>
+      <image src="chrome://messenger/skin/replyall-hover.gif"/>
+      <image src="chrome://messenger/skin/replyall-hover-active.gif"/>
+      <image src="chrome://messenger/skin/forward.gif"/>
+      <image src="chrome://messenger/skin/forward-disabled.gif"/>
+      <image src="chrome://messenger/skin/forward-hover.gif"/>
+      <image src="chrome://messenger/skin/forward-hover-active.gif"/>
+      <image src="chrome://messenger/skin/file.gif"/>
+      <image src="chrome://messenger/skin/file-disabled.gif"/>
+      <image src="chrome://messenger/skin/file-hover.gif"/>
+      <image src="chrome://messenger/skin/file-hover-active.gif"/>
+      <image src="chrome://messenger/skin/next.gif"/>
+      <image src="chrome://messenger/skin/next-disabled.gif"/>
+      <image src="chrome://messenger/skin/next-hover.gif"/>
+      <image src="chrome://messenger/skin/next-hover-active.gif"/>
+      <image src="chrome://messenger/skin/trash.gif"/>
+      <image src="chrome://messenger/skin/trash-disabled.gif"/>
+      <image src="chrome://messenger/skin/trash-hover.gif"/>
+      <image src="chrome://messenger/skin/trash-hover-active.gif"/>
+      <image src="chrome://global/skin/print.gif"/>
+      <image src="chrome://global/skin/print-disabled.gif"/>
+      <image src="chrome://global/skin/print-hover.gif"/>
+      <image src="chrome://global/skin/print-hover-active.gif"/>
+      <image src="chrome://global/skin/stop.gif"/>
+      <image src="chrome://global/skin/stop-disabled.gif"/>
+      <image src="chrome://global/skin/stop-hover.gif"/>
+      <image src="chrome://global/skin/stop-hover-active.gif"/>
    </resources>	
   </binding>
      
-  <binding id="resource_bundle_messengercompose" extends="">
-     <resources>
-    	<image src="chrome://messenger/skin/messengercompose/send-hover.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/send-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/address-disabled.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/address-hover.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/address-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/attach-hover.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/attach-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/quote-hover.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/quote-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/spelling-hover.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/spelling-hover-active.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/savemsg-hover.gif"/>
-    	<image src="chrome://messenger/skin/messengercompose/savemsg-hover-active.gif"/>
-    	<image src="chrome://global/skin/stop-hover.gif"/>
-    	<image src="chrome://global/skin/stop-hover-active.gif"/>
-     
-     </resources>
-  
-  
-  
+  <binding id="resource_bundle_messengercompose">
+    <resources>
+      <image src="chrome://messenger/skin/messengercompose/send-hover.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/send-hover-active.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/address-disabled.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/address-hover.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/address-hover-active.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/attach-hover.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/attach-hover-active.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/quote-hover.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/quote-hover-active.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/spelling-hover.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/spelling-hover-active.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/savemsg-hover.gif"/>
+      <image src="chrome://messenger/skin/messengercompose/savemsg-hover-active.gif"/>
+      <image src="chrome://global/skin/stop-hover.gif"/>
+      <image src="chrome://global/skin/stop-hover-active.gif"/>
+    </resources>
   </binding>        
+
 </bindings>          
\ No newline at end of file
diff --git a/mozilla/themes/classic/navigator/mac/resources.xml b/mozilla/themes/classic/navigator/mac/resources.xml
index 53c04364727..3b8b5936303 100644
--- a/mozilla/themes/classic/navigator/mac/resources.xml
+++ b/mozilla/themes/classic/navigator/mac/resources.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0"?>
-<bindings id="NavigatorResourcesBindings"
-          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">
-          
-         
- <binding id="resource_bundle_navigator" extends="" >
-   <resources>
-     <!-- begin resources -->
 
+<bindings id="NavigatorResourcesBindings" xmlns="http://www.mozilla.org/xbl">
+          
+ <binding id="resource_bundle_navigator">
+   <resources>
      <image src="chrome://navigator/skin/back-hover.gif" />
      <image src="chrome://navigator/skin/back-hover-active.gif" />
      <image src="chrome://navigator/skin/forward-hover.gif" />
@@ -19,9 +14,6 @@
      <image src="chrome://navigator/skin/reload-hover-active.gif" />
      <image src="chrome://global/skin/print-hover.gif" />
      <image src="chrome://global/skin/print-hover-active.gif" />
-
-
-     <!-- end resources -->
    </resources>	
   </binding>
           
diff --git a/mozilla/themes/classic/navigator/win/navigator.css b/mozilla/themes/classic/navigator/win/navigator.css
index 06e0c0788d2..8f3a7295b37 100644
--- a/mozilla/themes/classic/navigator/win/navigator.css
+++ b/mozilla/themes/classic/navigator/win/navigator.css
@@ -179,7 +179,7 @@
   
 #nav-bar-inner
   {
-    -moz-binding          : url("chrome://global/skin/classicBindings.xml#autostretch-never");
+    -moz-box-align        : center;
     min-width             : 0px;
     margin                : 8px 0px 8px 6px;
   }
diff --git a/mozilla/themes/modern/communicator/brand/brandBindings.xml b/mozilla/themes/modern/communicator/brand/brandBindings.xml
index 89a8d93bc7a..29b71cf6db9 100644
--- a/mozilla/themes/modern/communicator/brand/brandBindings.xml
+++ b/mozilla/themes/modern/communicator/brand/brandBindings.xml
@@ -6,7 +6,7 @@
 
   <binding id="throbber" extends="chrome://global/content/bindings/general.xml#basetext">
   	<content>
-      <xul:image class="throbber-icon" inherits="src" autostretch="never"/>
+      <xul:image class="throbber-icon" inherits="src"/>
     </content>
   </binding>
 
@@ -16,7 +16,7 @@
        	<xul:spring class="throbber-groove-top"/>
     	  <xul:hbox class="throbber-middle">
       	  <xul:spring class="throbber-groove-left"/>
-    	  	<xul:image class="throbber-icon" inherits="src" autostretch="never"/>
+    	  	<xul:image class="throbber-icon" inherits="src"/>
     	  	<xul:spring class="throbber-groove-right"/>
     	  </xul:hbox>
     	  <xul:spring class="throbber-groove-bottom"/>
diff --git a/mozilla/themes/modern/communicator/button.css b/mozilla/themes/modern/communicator/button.css
index 7d485c604ca..e735601db30 100644
--- a/mozilla/themes/modern/communicator/button.css
+++ b/mozilla/themes/modern/communicator/button.css
@@ -114,7 +114,6 @@
   min-width: 0px;
   font: message-box;
   font-size: smaller;
-  text-align: center;
 }
     
 .button-toolbar-1,
@@ -148,10 +147,6 @@
   color: #FFFFFF;
 }
     
-.button-toolbar-2 > .button-internal-box > .button-icon-box {
-  text-align: center;
-}
-
 .button-toolbar-2[disabled="true"],
 .button-toolbar-2[disabled="true"]:hover,
 .button-toolbar-2[disabled="true"]:hover:active {
@@ -207,10 +202,6 @@ menubutton.button-toolbar-4 {
 
 /* ::::: shared text wrapping frame ::::: */
 
-.button-text-container {
-  text-align: center;
-}
-
 .button-text {
   padding: 0px 2px 0px 2px;
 }
diff --git a/mozilla/themes/modern/communicator/dialog/dialogBindings.xml b/mozilla/themes/modern/communicator/dialog/dialogBindings.xml
index dd4e1e4f850..edc364c7499 100644
--- a/mozilla/themes/modern/communicator/dialog/dialogBindings.xml
+++ b/mozilla/themes/modern/communicator/dialog/dialogBindings.xml
@@ -6,30 +6,30 @@
 
   <binding id="smallheader" extends="chrome://communicator/content/dialogBindings.xml#smallheader">
     <content>
-      <xul:box class="box-smallheader-text-container" autostretch="never" flex="1">
+      <xul:hbox class="box-smallheader-text-container" align="center" flex="1">
         <children/>
         <xul:text class="box-smallheader-left" inherits="value=title"/>
         <xul:spring flex="1"/>
         <xul:text class="box-smallheader-right" inherits="value=description"/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
   
  <binding id="largeheader" extends="xul:box">
     <content>
-      <xul:box class="largeheader-box" flex="1">
-        <xul:box class="largeheader-text-container" orient="vertical">
+      <xul:hbox class="largeheader-box" flex="1">
+        <xul:vbox class="largeheader-text-container">
           <xul:spring flex="1"/>
           <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
           <xul:html class="largeheader-desc-text" inherits="value=description"/>
           <children/>
           <xul:spring flex="1"/>
-        </xul:box>
+        </xul:vbox>
         <xul:spring flex="1"/>
-        <xul:box class="largeheader-icon-container" autostretch="never">
+        <xul:hbox class="largeheader-icon-container" align="center">
           <xul:image class="largeheader-icon" inherits="src"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:hbox>
     </content>
   </binding>
   
diff --git a/mozilla/themes/modern/communicator/prefpanels.css b/mozilla/themes/modern/communicator/prefpanels.css
index 816c5ddf2cb..a05237b5e56 100644
--- a/mozilla/themes/modern/communicator/prefpanels.css
+++ b/mozilla/themes/modern/communicator/prefpanels.css
@@ -44,7 +44,6 @@
   max-width: 387px; 
 }
 
-
 /* ::::: Fonts ::::: */
 
 #sizeVar,
diff --git a/mozilla/themes/modern/communicator/sidebar/customize.css b/mozilla/themes/modern/communicator/sidebar/customize.css
index 3d27d1a4c06..6b0ce036649 100644
--- a/mozilla/themes/modern/communicator/sidebar/customize.css
+++ b/mozilla/themes/modern/communicator/sidebar/customize.css
@@ -20,10 +20,6 @@
  * Contributor(s): 
  */
 
-#reorder {
-  text-align: center;
-}
-
 #other-panels {
   min-width: 180px;
 }
diff --git a/mozilla/themes/modern/communicator/sidebar/sidebarBindings.xml b/mozilla/themes/modern/communicator/sidebar/sidebarBindings.xml
index 9337c54e16b..7ca2e3c5536 100644
--- a/mozilla/themes/modern/communicator/sidebar/sidebarBindings.xml
+++ b/mozilla/themes/modern/communicator/sidebar/sidebarBindings.xml
@@ -20,9 +20,9 @@
           <xul:spring class="sidebar-tab-mid-btm" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
         </xul:vbox>
       
-        <xul:box class="sidebar-tab-text-box">
+        <xul:vbox class="sidebar-tab-text-box">
           <xul:text class="sidebar-tab-text" inherits="value=label" crop="right"/>
-        </xul:box>
+        </xul:vbox>
       </xul:stack>
       
       <xul:vbox class="sidebar-tab-right">
@@ -38,12 +38,12 @@
 
   <binding id="sidebarheader">
     <content>
-      <xul:box class="sidebarheader-internal-box" flex="1" autostretch="never">
+      <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:box>
+        <xul:hbox>
           <children/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:hbox>
     </content>
   </binding>
     
diff --git a/mozilla/themes/modern/communicator/toolbar/toolbarBindings.xml b/mozilla/themes/modern/communicator/toolbar/toolbarBindings.xml
index 7d03775ff49..700597e17fd 100644
--- a/mozilla/themes/modern/communicator/toolbar/toolbarBindings.xml
+++ b/mozilla/themes/modern/communicator/toolbar/toolbarBindings.xml
@@ -9,7 +9,7 @@
       <xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
           tbattr="toolbar-grippy" class="toolbar-primary-grippy"/>
       <xul:hbox class="toolbar-holder" flex="1">
-        <xul:box class="toolbar-primary-icon"/>
+        <xul:hbox class="toolbar-primary-icon"/>
         <xul:stack class="toolbar-primary-mid" flex="1">
           <xul:hbox class="toolbar-primary-mid-2" flex="1">
             <xul:vbox class="toolbar-primary-mid-bg" flex="1">
@@ -22,10 +22,10 @@
               <xul:spring class="toolbar-primary-right-btm"/> 
             </xul:vbox>
           </xul:hbox>
-          <xul:box class="toolbar-primary-mid-fg"
+          <xul:hbox class="toolbar-primary-mid-fg"
                    inherits="collapsed,last-toolbar,orient=tborient">
             <children/>
-          </xul:box>
+          </xul:hbox>
         </xul:stack>
       </xul:hbox>
     </content>
diff --git a/mozilla/themes/modern/communicator/widgetBindings.xml b/mozilla/themes/modern/communicator/widgetBindings.xml
index 37b11fd9520..810c02cc8df 100644
--- a/mozilla/themes/modern/communicator/widgetBindings.xml
+++ b/mozilla/themes/modern/communicator/widgetBindings.xml
@@ -6,14 +6,14 @@
    
   <binding id="button-toolbar-2" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-  	  <xul:box class="button-internal-box" orient="vertical" flex="1">
-        <xul:box class="button-icon-box" autostretch="never">
+  	  <xul:vbox class="button-internal-box" flex="1">
+        <xul:hbox class="button-icon-box" pack="center">
           <xul:image class="button-icon" inherits="src"/>
-        </xul:box>
-        <xul:box class="button-text-container" autostretch="never" flex="1">
+        </xul:hbox>
+        <xul:hbox class="button-text-container" flex="1" pack="center">
           <xul:text class="button-text" inherits="value=label,accesskey,crop,dragover-top"/>          	
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:vbox>
       <children includes="menupopup"/>
     </content>
   </binding>
@@ -24,9 +24,9 @@
       <xul:stack class="menubutton-dual-stack">
         <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
                     inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,label,crop,accesskey,disabled"/>
-        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" flex="1">
+        <xul:hbox class="menubutton-dual-dropmarker-box" pack="center" flex="1">
           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
-        </xul:box>
+        </xul:hbox>
       </xul:stack>
       <children includes="menupopup"/>
     </content>
@@ -38,9 +38,9 @@
       <xul:stack class="menubutton-dual-stack">
         <xul:button class="menubutton-dual-button button-toolbar-2 top" allowevents="true" 
                     inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,label,crop,accesskey,disabled"/>
-        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" flex="1">
+        <xul:hbox class="menubutton-dual-dropmarker-box" pack="center" flex="1">
           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
-        </xul:box>
+        </xul:hbox>
       </xul:stack>
       <children includes="menupopup"/>
     </content>
@@ -49,11 +49,11 @@
   <binding id="menubutton-toolbar-single"
            extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-internal-box" flex="1" autostretch="never">
+      <xul:hbox class="menubutton-internal-box" flex="1" align="center">
         <xul:image class="menubutton-icon" inherits="src,disabled"/>
         <xul:text class="menubutton-text" inherits="value=label,accesskey,crop,disabled,dragover-top" flex="1"/>
         <xul:image class="menubutton-dropmarker" inherits="menubuttontype,disabled"/>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
@@ -61,10 +61,10 @@
   <binding id="menubutton-toolbar-single-ile" display="xul:menu"
            extends="chrome://global/content/bindings/general.xml#inline-edit-base">
     <content>
-      <xul:hbox class="menubutton-internal-box" flex="1" autostretch="never">
+      <xul:hbox class="menubutton-internal-box" flex="1" align="center">
         <xul:image class="menubutton-single-icon" inherits="src,disabled"/>
         <xul:hbox class="menubutton-toolbar-single-ile-text-container" 
-                  flex="1" ileattr="text-container" autostretch="never">
+                  flex="1" ileattr="text-container" align="center">
           <xul:text class="menubutton-text" 
                     inherits="value=label,accesskey,crop,disabled,dragover-top" 
                     ileattr="text" rootcontent="menubutton" flex="1"/>
diff --git a/mozilla/themes/modern/editor/EditorDialog.css b/mozilla/themes/modern/editor/EditorDialog.css
index 59246397c0c..4411265ba46 100644
--- a/mozilla/themes/modern/editor/EditorDialog.css
+++ b/mozilla/themes/modern/editor/EditorDialog.css
@@ -65,10 +65,6 @@
   width: 3em;
 }
 
-.align-right {
-  text-align: right;
-}
-
 .wrap {
   width: 1em;
 }
diff --git a/mozilla/themes/modern/editor/EditorToolbars.css b/mozilla/themes/modern/editor/EditorToolbars.css
index 2041ae7afa1..87b0f04961e 100644
--- a/mozilla/themes/modern/editor/EditorToolbars.css
+++ b/mozilla/themes/modern/editor/EditorToolbars.css
@@ -747,7 +747,3 @@
   width: 1em;
 }
 
-.center {
-  text-align: center;
-}
-
diff --git a/mozilla/themes/modern/global/autocomplete.css b/mozilla/themes/modern/global/autocomplete.css
index 429e830a8da..c7451a62369 100644
--- a/mozilla/themes/modern/global/autocomplete.css
+++ b/mozilla/themes/modern/global/autocomplete.css
@@ -47,7 +47,7 @@ html|*.textbox-input {
 /* ::::: history button ::::: */
 
 .autocomplete-history-button {
-  -moz-binding: url("chrome://global/skin/globalBindings.xml#autostretch-never");
+  -moz-box-align: center;
   margin: 1px 3px 3px 0px;
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
 }
diff --git a/mozilla/themes/modern/global/button.css b/mozilla/themes/modern/global/button.css
index da41de1d820..71aaef05feb 100644
--- a/mozilla/themes/modern/global/button.css
+++ b/mozilla/themes/modern/global/button.css
@@ -45,7 +45,6 @@ button {
 
 .button-text-box {
   padding: 3px 2px 3px 2px;
-  text-align: center;
 }
 
 .button-text-mid,
diff --git a/mozilla/themes/modern/global/checkbox.css b/mozilla/themes/modern/global/checkbox.css
index 65d79e55348..93ad19d91d7 100644
--- a/mozilla/themes/modern/global/checkbox.css
+++ b/mozilla/themes/modern/global/checkbox.css
@@ -63,8 +63,7 @@ checkbox > .internal-box > .checkmark-box {
 /* ::::: icon and label ::::: */
 
 checkbox[label] > .internal-box > .checkbox-label {
-  margin: 0px 0px 2px 0px;
-  padding: 1px;
+  margin: 2px 5px !important;
 }
 
 checkbox > .internal-box > .checkbox-icon {
diff --git a/mozilla/themes/modern/global/globalBindings.xml b/mozilla/themes/modern/global/globalBindings.xml
index 2d96b12f345..c4497193450 100644
--- a/mozilla/themes/modern/global/globalBindings.xml
+++ b/mozilla/themes/modern/global/globalBindings.xml
@@ -8,17 +8,17 @@
   <!-- :::/ toolbar \ ::::::::::::::::::::::::::::::::::::::::::::::::::: -->
 
   <binding id="toolbargrippy" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
-    <content orient="vertical">
-      <xul:box class="toolbargrippy-top"/>
+    <content>
+      <xul:spring class="toolbargrippy-top"/>
       <xul:spring class="toolbargrippy-mid" flex="1"/>
-      <xul:box class="toolbargrippy-btm"/>
+      <xul:spring class="toolbargrippy-btm"/>
     </content>
   </binding>
 
   <binding id="toolbargrippy-collapsed" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
     <content>
-      <xul:box class="toolbargrippy-collapsed-left"/>
-      <xul:box class="toolbargrippy-collapsed-right" flex="1"/>
+      <xul:spring class="toolbargrippy-collapsed-left"/>
+      <xul:spring class="toolbargrippy-collapsed-right" flex="1"/>
     </content>
   </binding>
 
@@ -26,31 +26,32 @@
 
   <binding id="button" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-box-left" inherits="default,disabled" orient="vertical">
+      <xul:vbox class="button-box-left" inherits="default,disabled">
         <xul:spring class="button-left-top" inherits="default,disabled"/>
         <xul:spring class="button-left-mid" inherits="default,disabled" flex="1"/>
         <xul:spring class="button-left-btm" inherits="default,disabled"/>
-      </xul:box>
+      </xul:vbox>
       
       <xul:stack class="button-stack" flex="1">
-        <xul:box class="button-box-mid" inherits="default,disabled" orient="vertical">
+        <xul:vbox class="button-box-mid" inherits="default,disabled">
            <xul:spring class="button-mid-top" inherits="default,disabled"/>
-           <xul:box class="button-mid-mid" inherits="default,disabled" flex="1"/>
+           <xul:spring class="button-mid-mid" inherits="default,disabled" flex="1"/>
            <xul:spring class="button-mid-btm" inherits="default,disabled"/>
-        </xul:box>
+        </xul:vbox>
 
-        <xul:box class="button-text-box" align="center">
-         <xul:image class="button-icon-mid" inherits="src"/>
-         <xul:text class="button-text-mid" inherits="default,value=label,crop,accesskey"/>
-         <children/>
-       </xul:box>
-     </xul:stack>
+        <xul:hbox class="button-text-box" align="center" pack="center">
+          <xul:image class="button-icon-mid" inherits="src"/>
+          <xul:text class="button-text-mid" inherits="default,value=label,crop,accesskey"/>
+          <children/>
+        </xul:hbox>
+      </xul:stack>
       
-      <xul:box class="button-box-right" inherits="default,disabled" orient="vertical">
+      <xul:vbox class="button-box-right" inherits="default,disabled">
         <xul:spring class="button-right-top" inherits="default,disabled"/>
         <xul:spring class="button-right-mid" inherits="default,disabled" flex="1"/>
         <xul:spring class="button-right-btm" inherits="default,disabled"/>
-      </xul:box>
+      </xul:vbox>
+      
       <children includes="menupopup"/>
     </content>
 
@@ -76,72 +77,72 @@
 
   <binding id="menulist" extends="chrome://global/content/bindings/menulist.xml#menulist">
   	<content>
-      <xul:box class="menulist-box-left" inherits="disabled" orient="vertical">
+      <xul:vbox class="menulist-box-left" inherits="disabled">
         <xul:spring class="menulist-left-top" inherits="disabled"/>
         <xul:spring class="menulist-left-mid" inherits="disabled" flex="1"/>
         <xul:spring class="menulist-left-btm" inherits="disabled"/>
-      </xul:box>
+      </xul:vbox>
 
       <xul:stack class="menulist-stack" flex="1">
-        <xul:box class="menulist-box-mid" inherits="disabled" orient="vertical">
+        <xul:vbox class="menulist-box-mid" inherits="disabled">
            <xul:spring class="menulist-mid-top" inherits="disabled"/>
-           <xul:box class="menulist-mid-mid" inherits="disabled" flex="1"/>
+           <xul:spring class="menulist-mid-mid" inherits="disabled" flex="1"/>
            <xul:spring class="menulist-mid-btm" inherits="disabled"/>
-        </xul:box>
+        </xul:vbox>
 
-        <xul:box 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:box>
-     </xul:stack>
+        <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:hbox>
+      </xul:stack>
       
-      <xul:box class="menulist-box-right" inherits="disabled" orient="vertical">
+      <xul:vbox class="menulist-box-right" inherits="disabled">
         <xul:stack flex="1">
-          <xul:box orient="vertical">
+          <xul:vbox>
         		<xul:spring class="menulist-right-top" inherits="disabled"/>
             <xul:spring class="menulist-right-mid" inherits="disabled" flex="1"/>
             <xul:spring class="menulist-right-btm" inherits="disabled"/>
-          </xul:box>
-          <xul:box class="menulist-dropmarker-box" align="center">
+          </xul:vbox>
+          <xul:hbox class="menulist-dropmarker-box" align="center" pack="center">
             <xul:image class="menulist-dropmarker" inherits="disabled"/>
-          </xul:box>
+          </xul:hbox>
         </xul:stack>
-      </xul:box>
+      </xul:vbox>
       <children includes="menupopup"/>
     </content>
   </binding>
   
   <binding id="menulist-editable" extends="chrome://global/content/bindings/menulist.xml#menulist-editable">
   	<content>
-      <xul:box flex="1" class="menulist-editable-box">
+      <xul:hbox flex="1" class="menulist-editable-box">
         <xul:image class="menu-icon" inherits="src"/>
         <html:input type="text" class="menulist-editable-text" flex="1" inherits="value=label,disabled"/>
-        <xul:box class="menu-dropmarker-box" align="center">
+        <xul:hbox class="menu-dropmarker-box" align="center">
           <xul:image class="menu-dropmarker"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="menulist-compact" extends="chrome://global/content/bindings/menulist.xml#menulist">
     <content flex="1">
-      <xul:box class="menulist-compact-internal-box" flex="1" align="center">
+      <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
         <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
         <xul:spring flex="1"/>
         <xul:text class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="menubutton-single" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-single-internal-box" flex="1">
+      <xul:hbox class="menubutton-single-internal-box" flex="1">
         <xul:button class="menubutton-single-button" flex="1" inherits="open,label,disabled">
           <xul:image class="menubutton-single-dropmarker" inherits="open,disabled"/>
         </xul:button>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
@@ -150,29 +151,29 @@
            extends="chrome://global/content/bindings/progressmeter.xml#progressmeter">
     <content>
       <xul:progressbar class="progressmeter-progressbar" inherits="value,mode,statusbar" flex="1">
-        <xul:box class="progress-bar" inherits="mode"/>
-        <xul:box class="progress-remainder" inherits="mode"/>
+        <xul:spring class="progress-bar" inherits="mode"/>
+        <xul:spring class="progress-remainder" inherits="mode"/>
       </xul:progressbar>
     </content>
   </binding>
   
   <binding id="splitter"
            extends="chrome://global/content/bindings/splitter.xml#splitter">
-    <content autostretch="always">
-      <xul:box class="splitter-internal-box" flex="1" autostretch="never">
+    <content>
+      <xul:hbox class="splitter-internal-box" flex="1" align="center" pack="center">
         <children/>
-      </xul:box>
+      </xul:hbox>
   	</content>
   </binding>
 
   <binding id="treecell-header"
            extends="chrome://global/content/bindings/tree.xml#treecell-header">
     <content>
-      <xul:box class="treecell-header-box" flex="1" autostretch="never" valign="middle">
+      <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:image class="tree-header-sortdirection"/>
-      </xul:box>
+      </xul:vbox>
     </content>
   </binding>
   
@@ -180,14 +181,16 @@
 
   <binding id="thumb-vertical"
            extends="chrome://global/content/bindings/scrollbar.xml#thumb">
-    <content orient="vertical">
-      <xul:spring class="thumb-vert-spring-top"/>
-      <xul:box flex="1" class="thumb-vert-box-middle" orient="vertical">
-        <xul:spring flex="1"/>
-        <xul:spring class="thumb-vert-grippy"/>
-        <xul:spring flex="1"/>
-      </xul:box>
-      <xul:spring class="thumb-vert-spring-bottom"/>
+    <content>
+      <xul:vbox flex="1">
+        <xul:spring class="thumb-vert-spring-top"/>
+        <xul:vbox flex="1" class="thumb-vert-box-middle">
+          <xul:spring flex="1"/>
+          <xul:spring class="thumb-vert-grippy"/>
+          <xul:spring flex="1"/>
+        </xul:vbox>
+        <xul:spring class="thumb-vert-spring-bottom"/>
+      </xul:vbox>
     </content>
   </binding>
 
@@ -195,11 +198,11 @@
            extends="chrome://global/content/bindings/scrollbar.xml#thumb">
     <content>
       <xul:spring class="thumb-horz-spring-left"/>
-      <xul:box flex="1" class="thumb-horz-box-middle">
+      <xul:hbox flex="1" class="thumb-horz-box-middle">
         <xul:spring flex="1"/>
         <xul:spring class="thumb-horz-grippy"/>
         <xul:spring flex="1"/>
-      </xul:box>
+      </xul:hbox>
       <xul:spring class="thumb-horz-spring-right"/>
     </content>
   </binding>
@@ -224,24 +227,24 @@
 
   <binding id="tab" extends="chrome://global/content/bindings/tabbox.xml#tab">
     <content orient="horizontal">
-      <xul:box class="tab-image-left" orient="vertical">
-        <xul:spring class="tab-image-left-top" inherits="selected"/>
-        <xul:spring class="tab-image-left-mid" inherits="selected" flex="1"/>
-        <xul:spring class="tab-image-left-btm" inherits="selected"/>
-      </xul:box>
-      <xul:box flex="1" class="tab-image-mid" orient="vertical" inherits="selected">
-        <xul:box class="tab-image-mid-top" inherits="selected"/>
-        <xul:box class="tab-image-mid-mid" orient="horizontal" align="center" autostretch="never" flex="1">
-  	      <xul:image class="tab-left"/>
+      <xul:vbox class="tab-left">
+        <xul:spring class="tab-left-top" inherits="selected"/>
+        <xul:spring class="tab-left-mid" inherits="selected" flex="1"/>
+        <xul:spring class="tab-left-btm" inherits="selected"/>
+      </xul:vbox>
+      <xul:vbox flex="1" class="tab-mid" inherits="selected">
+        <xul:spring 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:box>
-        <xul:box class="tab-image-mid-btm" inherits="selected"/>
-      </xul:box>
-      <xul:box class="tab-image-right" orient="vertical">
-        <xul:spring class="tab-image-right-top" inherits="selected"/>
-        <xul:spring class="tab-image-right-mid" inherits="selected" flex="1"/>
-        <xul:spring class="tab-image-right-btm" inherits="selected"/>
-      </xul:box>
+        </xul:hbox>
+        <xul:spring class="tab-mid-btm" inherits="selected"/>
+      </xul:vbox>
+      <xul:vbox class="tab-right">
+        <xul:spring class="tab-right-top" inherits="selected"/>
+        <xul:spring class="tab-right-mid" inherits="selected" flex="1"/>
+        <xul:spring class="tab-right-btm" inherits="selected"/>
+      </xul:vbox>
     </content>
   </binding>
   
@@ -249,25 +252,21 @@
     <content>
       <xul:spring class="tabs-left-cap"/>
   	  <xul:spring class="tabs-left"/>
-  	  <xul:box class="tabs-mid" inherits="align">
+  	  <xul:hbox class="tabs-mid">
   		  <children/>
-  	  </xul:box>
+  	  </xul:hbox>
   	  <xul:spring class="tabs-right" flex="1"/>
   	  <xul:spring class="tabs-right-cap"/>
   	</content>
   </binding>
 
   <binding id="row-iconic" extends="xul:row">
-    <content autostretch="never">
-      <xul:hbox autostretch="never">
+    <content>
+      <xul:hbox align="center">
         <xul:image class="row-iconic-icon"/>
         <children/>
       </xul:hbox>
     </content>
   </binding>
 
-  <binding id="autostretch-never" extends="xul:box">
-    <content autostretch="never"/>
-  </binding>
-
 </bindings>
diff --git a/mozilla/themes/modern/global/menu.css b/mozilla/themes/modern/global/menu.css
index c0143bae62f..e73310bca23 100644
--- a/mozilla/themes/modern/global/menu.css
+++ b/mozilla/themes/modern/global/menu.css
@@ -71,7 +71,6 @@ menuitem[menuactive="true"][disabled="true"] {
 .menu-iconic-left {
   width: 16px;
   list-style-image: inherit;
-  text-align: center;
 }
 
 .menu-iconic-accel {
@@ -84,7 +83,6 @@ menuitem[menuactive="true"][disabled="true"] {
 .menu-right {
   margin: 0px 0px 0px 6px;
   width: 8px;
-  text-align: center;
   list-style-image: url("chrome://global/skin/menu/menu-arrow.gif");
 }
 
diff --git a/mozilla/themes/modern/global/menulist.css b/mozilla/themes/modern/global/menulist.css
index 09973e76035..f6bc162baa1 100644
--- a/mozilla/themes/modern/global/menulist.css
+++ b/mozilla/themes/modern/global/menulist.css
@@ -45,7 +45,6 @@ menulist {
 
 .menulist-text-box {
   padding: 3px 2px 3px 2px;
-  text-align: left;
 }
 
 .menulist-icon-mid {
@@ -118,10 +117,6 @@ menulist:focus {
   height: 8px;
 }
 
-.menulist-dropmarker-box {
-  text-align: center;
-}
-
 /* ..... active state ..... */
   
 menulist:hover:active, 
diff --git a/mozilla/themes/modern/global/radio.css b/mozilla/themes/modern/global/radio.css
index 73e8e94f6b4..846c3de11a8 100644
--- a/mozilla/themes/modern/global/radio.css
+++ b/mozilla/themes/modern/global/radio.css
@@ -61,8 +61,7 @@ radio > .internal-box > .checkmark-box {
 
 radio[label] > .internal-box > .checkbox-label,
 radio.iconic > .internal-box > .icon {
-  margin: 0px 0px 0px 0px;
-  padding: 0px 2px 0px 0px;
+  margin: 2px 5px !important;
 }
 
 radio.iconic > .internal-box > .checkbox-label {
diff --git a/mozilla/themes/modern/global/scrollbars-mini.css b/mozilla/themes/modern/global/scrollbars-mini.css
index 6ebb1245cd1..474f9adbee4 100644
--- a/mozilla/themes/modern/global/scrollbars-mini.css
+++ b/mozilla/themes/modern/global/scrollbars-mini.css
@@ -40,7 +40,7 @@ slider {
   background: url("chrome://global/skin/scrollbar/mini-slider-hrz-mid.gif") repeat-x;
 }
 
-slider[align="vertical"] {
+slider[orient="vertical"] {
   border-top: 0px;
   border-bottom: 0px;
   width: 8px;
@@ -96,7 +96,7 @@ thumb:active > .thumb-horz-box-middle > .thumb-horz-grippy {
 
 /* ::::: thumb (vertical) ::::: */
 
-thumb[align="vertical"] {
+thumb[orient="vertical"] {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#thumb-vertical");
 }
 
@@ -159,11 +159,11 @@ scrollbarbutton[type="increment"]:hover:active {
    list-style-image: url("chrome://global/skin/scrollbar/mini-btn-rit-act.gif")
 }
 
-scrollbar[align="vertical"] > scrollbarbutton[type="increment"] {
+scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
    list-style-image: url("chrome://global/skin/scrollbar/mini-btn-dn.gif")
 }
 
-scrollbar[align="vertical"] > scrollbarbutton[type="increment"]:hover:active {
+scrollbar[orient="vertical"] > scrollbarbutton[type="increment"]:hover:active {
    list-style-image: url("chrome://global/skin/scrollbar/mini-btn-dn-act.gif")
 }
 
@@ -177,10 +177,10 @@ scrollbarbutton[type="decrement"]:hover:active {
    list-style-image: url("chrome://global/skin/scrollbar/mini-btn-lft-act.gif")
 }
 
-scrollbar[align="vertical"] > scrollbarbutton[type="decrement"] {
+scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
    list-style-image: url("chrome://global/skin/scrollbar/mini-btn-up.gif")
 }
 
-scrollbar[align="vertical"] > scrollbarbutton[type="decrement"]:hover:active {
+scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"]:hover:active {
    list-style-image: url("chrome://global/skin/scrollbar/mini-btn-up-act.gif")
 }
diff --git a/mozilla/themes/modern/global/scrollbars.css b/mozilla/themes/modern/global/scrollbars.css
index 1bfec182a70..c1483ff8620 100644
--- a/mozilla/themes/modern/global/scrollbars.css
+++ b/mozilla/themes/modern/global/scrollbars.css
@@ -41,7 +41,7 @@ slider {
   background: url("chrome://global/skin/scrollbar/slider-hrz-mid.gif") repeat-x;
 }
 
-slider[align="vertical"] {
+slider[orient="vertical"] {
   border-top: 0px;
   border-bottom: 0px;
   width: 14px;
@@ -95,7 +95,7 @@ thumb:active > .thumb-horz-box-middle > .thumb-horz-grippy {
 
 /* ::::: thumb (vertical) ::::: */
 
-thumb[align="vertical"] {
+thumb[orient="vertical"] {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#thumb-vertical");
 }
 
@@ -158,11 +158,11 @@ scrollbarbutton[type="increment"]:hover:active {
    list-style-image: url("chrome://global/skin/scrollbar/btn-rit-act.gif")
 }
 
-scrollbar[align="vertical"] > scrollbarbutton[type="increment"] {
+scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
    list-style-image: url("chrome://global/skin/scrollbar/btn-dn.gif")
 }
 
-scrollbar[align="vertical"] > scrollbarbutton[type="increment"]:hover:active {
+scrollbar[orient="vertical"] > scrollbarbutton[type="increment"]:hover:active {
    list-style-image: url("chrome://global/skin/scrollbar/btn-dn-act.gif")
 }
 
@@ -176,10 +176,10 @@ scrollbarbutton[type="decrement"]:hover:active {
    list-style-image: url("chrome://global/skin/scrollbar/btn-lft-act.gif")
 }
 
-scrollbar[align="vertical"] > scrollbarbutton[type="decrement"] {
+scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
    list-style-image: url("chrome://global/skin/scrollbar/btn-up.gif")
 }
 
-scrollbar[align="vertical"] > scrollbarbutton[type="decrement"]:hover:active {
+scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"]:hover:active {
    list-style-image: url("chrome://global/skin/scrollbar/btn-up-act.gif")
 }
diff --git a/mozilla/themes/modern/global/scrollbox.css b/mozilla/themes/modern/global/scrollbox.css
index d06f02cd62f..97abf6f272e 100644
--- a/mozilla/themes/modern/global/scrollbox.css
+++ b/mozilla/themes/modern/global/scrollbox.css
@@ -30,11 +30,12 @@
 /* ::::: auto-repeat button ::::: */
  
 autorepeatbutton {
+  -moz-box-align: center;
+  -moz-box-pack: center;
   margin: 1px 2px 2px 1px;
   border: 1px solid transparent;
   padding: 3px;
   height: 1em;  
-  text-align: center;
 }
 
 autorepeatbutton:hover {
diff --git a/mozilla/themes/modern/global/splitter.css b/mozilla/themes/modern/global/splitter.css
index 36c3b510b13..183835581f0 100644
--- a/mozilla/themes/modern/global/splitter.css
+++ b/mozilla/themes/modern/global/splitter.css
@@ -43,7 +43,6 @@ splitter {
   border-right: 1px solid #A5ABB0;
   border-bottom: 1px solid #A5ABB0;
   min-width: 5px;
-/*  background: url("chrome://global/skin/splitter/splitter-vrt-mid.gif") repeat-y;*/
 }
 
 /* ::::: splitter (horizontal) ::::: */
@@ -58,7 +57,6 @@ box[orient="vertical"] > splitter {
   border-bottom: 1px solid #000000;
   border-left: none;
   min-width: 1px;
-  text-align: center;
 }
 
 rows > splitter > .splitter-internal-box,
@@ -66,7 +64,6 @@ window[orient="vertical"] > splitter > .splitter-internal-box,
 vbox > splitter > .splitter-internal-box,
 box[orient="vertical"] > splitter > .splitter-internal-box {
   min-height: 5px;
-/*  background: url("chrome://global/skin/splitter/splitter-hrz-mid.gif") repeat-x;*/
 }
   
 /* ::::: splitter grippy ::::: */
diff --git a/mozilla/themes/modern/global/tabbox.css b/mozilla/themes/modern/global/tabbox.css
index b903e33bece..2c3c48b8abd 100644
--- a/mozilla/themes/modern/global/tabbox.css
+++ b/mozilla/themes/modern/global/tabbox.css
@@ -68,52 +68,52 @@ tab {
   font: menu;
 }
 
-.tab-image-left {
+.tab-left {
   width: 5px;
 }
 
-.tab-image-left-top {
+.tab-left-top {
   background: url("chrome://global/skin/tabcontrol/tab-usel-lft-top.gif") no-repeat;
   height: 15px;
 }
 
-.tab-image-left-mid {
+.tab-left-mid {
   background: url("chrome://global/skin/tabcontrol/tab-usel-lft-mid.gif") repeat-y;
 }
 
-.tab-image-left-btm {
+.tab-left-btm {
   background: url("chrome://global/skin/tabcontrol/tab-usel-lft-btm.gif") no-repeat;
   height: 2px;
 }
 
-.tab-image-mid {
+.tab-mid {
   background: url("chrome://global/skin/tabcontrol/tab-usel-mid-top.gif") repeat-x top;
   background-color: #8B9AAD;
 }
 
-.tab-image-mid-mid {
+.tab-mid-mid {
   padding: 1px 0px 1px 0px;
 }
 
-.tab-image-mid-btm {
+.tab-mid-btm {
   background: url("chrome://global/skin/tabcontrol/tab-usel-mid-btm.gif") repeat-x;
   height: 2px;
 }
 
-.tab-image-right {
+.tab-right {
   width: 5px;
 }
 
-.tab-image-right-top {
+.tab-right-top {
   background: url("chrome://global/skin/tabcontrol/tab-usel-rit-top.gif") no-repeat;
   height: 14px;
 }
 
-.tab-image-right-mid {
+.tab-right-mid {
   background: url("chrome://global/skin/tabcontrol/tab-usel-rit-mid.gif") repeat-y;
 }
 
-.tab-image-right-btm {
+.tab-right-btm {
   background: url("chrome://global/skin/tabcontrol/tab-usel-rit-btm.gif") no-repeat;
   height: 2px;
 }
@@ -128,29 +128,29 @@ tab:hover:active {
   color: #FFFFFF;
 }
 
-tab:hover:active > .tab-image-left > .tab-image-left-top { 
+tab:hover:active > .tab-left > .tab-left-top { 
   background-image: url("chrome://global/skin/tabcontrol/tab-act-lft-top.gif");
 }
 
-tab:hover:active > .tab-image-left > .tab-image-left-mid { 
+tab:hover:active > .tab-left > .tab-left-mid { 
   background-image: url("chrome://global/skin/tabcontrol/tab-act-lft-mid.gif");
 }
 
-tab:hover:active > .tab-image-mid { 
+tab:hover:active > .tab-mid { 
   margin-top: 1px;
   background-image: url("chrome://global/skin/tabcontrol/tab-act-mid-top.gif");
   background-color: #8B9AAD;
 }
 
-tab:hover:active > .tab-image-mid > .tab-image-mid-mid { 
+tab:hover:active > .tab-mid > .tab-mid-mid { 
   padding: 1px 0px 0px 0px;
 }
 
-tab:hover:active > box > .tab-image-right-top { 
+tab:hover:active > .tab-right > .tab-right-top { 
   background-image: url("chrome://global/skin/tabcontrol/tab-act-rit-top.gif");
 }
 
-tab:hover:active > box > .tab-image-right-mid { 
+tab:hover:active > .tab-right > .tab-right-mid { 
   background-image: url("chrome://global/skin/tabcontrol/tab-act-rit-mid.gif");
 }
 
@@ -161,52 +161,52 @@ tab[selected="1"], tab:hover:active[selected="1"] {
   color: #000000;
 }
 
-.tab-image-left-top[selected="true"],
-tab:hover:active[selected="true"] > box > .tab-image-left-top { 
+.tab-left-top[selected="true"],
+tab:hover:active[selected="true"] > .tab-left > .tab-left-top { 
   background-image: url("chrome://global/skin/tabcontrol/tab-sel-lft-top.gif");
 }
 
-.tab-image-left-mid[selected="true"],
-tab:hover:active[selected="true"] > box > .tab-image-left-mid { 
+.tab-left-mid[selected="true"],
+tab:hover:active[selected="true"] > .tab-left > .tab-left-mid { 
   background-image: url("chrome://global/skin/tabcontrol/tab-sel-lft-mid.gif");
 }
 
-.tab-image-left-btm[selected="true"],
-tab:hover:active[selected="true"] > box > .tab-image-left-btm { 
+.tab-left-btm[selected="true"],
+tab:hover:active[selected="true"] > .tab-left > .tab-left-btm { 
   background-image: url("chrome://global/skin/tabcontrol/tab-sel-lft-btm.gif");
 }
 
-.tab-image-mid[selected="true"],
-tab:hover:active[selected="true"] > .tab-image-mid { 
+.tab-mid[selected="true"],
+tab:hover:active[selected="true"] > .tab-mid { 
   margin-top: 0px;
   background-image: url("chrome://global/skin/tabcontrol/tab-sel-mid-top.gif");
   background-color: #C7D0D9;
 }
 
-.tab-image-mid-mid[selected="true"],
-tab:hover:active[selected="true"] > box > .tab-image-mid-mid { 
+.tab-mid-mid[selected="true"],
+tab:hover:active[selected="true"] > .tab-mid > .tab-mid-mid { 
   padding: 1px 0px 1px 0px;
 }
 
 
-.tab-image-mid-btm[selected="true"],
-tab:hover:active[selected="true"] > box > .tab-image-mid-btm { 
+.tab-mid-btm[selected="true"],
+tab:hover:active[selected="true"] > .tab-mid > .tab-mid-btm { 
   background-image: none;
   background-color: #C7D0D9;
 }
 
-.tab-image-right-top[selected="true"],
-tab:hover:active[selected="true"] > box > .tab-image-right-top { 
+.tab-right-top[selected="true"],
+tab:hover:active[selected="true"] > .tab-right > .tab-right-top { 
   background-image: url("chrome://global/skin/tabcontrol/tab-sel-rit-top.gif");
 }
 
-.tab-image-right-mid[selected="true"],
-tab:hover:active[selected="true"] > box > .tab-image-right-mid { 
+.tab-right-mid[selected="true"],
+tab:hover:active[selected="true"] > .tab-right > .tab-right-mid { 
   background-image: url("chrome://global/skin/tabcontrol/tab-sel-rit-mid.gif");
 }
 
-.tab-image-right-btm[selected="true"],
-tab:hover:active[selected="true"] > box >  .tab-image-right-btm { 
+.tab-right-btm[selected="true"],
+tab:hover:active[selected="true"] > .tab-right >  .tab-right-btm { 
   background-image: url("chrome://global/skin/tabcontrol/tab-sel-rit-btm.gif");
 }
 
@@ -219,122 +219,122 @@ tab:hover:active[selected="true"] > box >  .tab-image-right-btm {
   min-height: 21px;
 }
  
-.tab-bottom > .tab-image-left > .tab-image-left {
+.tab-bottom > .tab-left > .tab-left {
   width: 5px;
 }
 
-.tab-bottom > .tab-image-left > .tab-image-left-top {
+.tab-bottom > .tab-left > .tab-left-top {
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-usel-lft-btm.gif");
   height: 2px;
 }
 
-.tab-bottom > .tab-image-left > .tab-image-left-btm {
+.tab-bottom > .tab-left > .tab-left-btm {
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-usel-lft-top.gif");
   height: 15px;
 }
 
-.tab-bottom > .tab-image-mid {
+.tab-bottom > .tab-mid {
   background: url("chrome://global/skin/tabcontrol/tab-bot-usel-mid-top.gif") repeat-x bottom;
   background-color: #8B9AAD;
 }
 
-.tab-bottom > .tab-image-mid > .tab-image-mid-top {
+.tab-bottom > .tab-mid > .tab-mid-top {
   background: url("chrome://global/skin/tabcontrol/tab-bot-usel-mid-btm.gif") repeat-x;
   height: 2px;
 }
 
-.tab-bottom > .tab-image-mid > .tab-image-mid-mid {
+.tab-bottom > .tab-mid > .tab-mid-mid {
   padding: 1px 0px 1px 0px;
 }
 
-.tab-bottom > .tab-image-mid > .tab-image-mid-btm {
+.tab-bottom > .tab-mid > .tab-mid-btm {
   background: none;
   height: none;
 }
 
-.tab-bottom > .tab-image-right {
+.tab-bottom > .tab-right {
   width: 5px;
 }
 
-.tab-bottom > .tab-image-right > .tab-image-right-top {
+.tab-bottom > .tab-right > .tab-right-top {
   background: url("chrome://global/skin/tabcontrol/tab-bot-usel-rit-btm.gif") no-repeat;
   height: 2px;
 }
 
-.tab-bottom > .tab-image-right > .tab-image-right-btm {
+.tab-bottom > .tab-right > .tab-right-btm {
   background: url("chrome://global/skin/tabcontrol/tab-bot-usel-rit-top.gif") no-repeat;
   height: 14px;
 }
 
 /* ..... active state ..... */
 
-.tab-bottom:hover:active > .tab-image-left > .tab-image-left-top { 
+.tab-bottom:hover:active > .tab-left > .tab-left-top { 
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-usel-lft-btm.gif");
 }
 
-.tab-bottom:hover:active > .tab-image-left > .tab-image-left-btm { 
+.tab-bottom:hover:active > .tab-left > .tab-left-btm { 
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-act-lft-top.gif");
 }
 
-.tab-bottom:hover:active > .tab-image-mid { 
+.tab-bottom:hover:active > .tab-mid { 
   margin: 0px 0px 1px 0px;
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-act-mid-top.gif");
 }
 
-.tab-bottom:hover:active > .tab-image-mid > .tab-image-mid-mid { 
+.tab-bottom:hover:active > .tab-mid > .tab-mid-mid { 
   padding: 0px 0px 1px 0px;
 }
 
-.tab-bottom:hover:active > .tab-image-right > .tab-image-right-top { 
+.tab-bottom:hover:active > .tab-right > .tab-right-top { 
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-usel-rit-btm.gif");
 }
 
-.tab-bottom:hover:active > .tab-image-right > .tab-image-right-btm { 
+.tab-bottom:hover:active > .tab-right > .tab-right-btm { 
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-act-rit-top.gif");
 }
 
 /* ..... selected state ..... */
 
-.tab-bottom[selected="true"] > .tab-image-left > .tab-image-left-top,
-.tab-bottom:hover:active[selected="true"] > .tab-image-left > .tab-image-left-top { 
+.tab-bottom[selected="true"] > .tab-left > .tab-left-top,
+.tab-bottom:hover:active[selected="true"] > .tab-left > .tab-left-top { 
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-sel-lft-btm.gif");
 }
 
-.tab-bottom[selected="true"] > .tab-image-left > .tab-image-left-btm,
-.tab-bottom:hover:active[selected="true"] > .tab-image-left > .tab-image-left-btm { 
+.tab-bottom[selected="true"] > .tab-left > .tab-left-btm,
+.tab-bottom:hover:active[selected="true"] > .tab-left > .tab-left-btm { 
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-sel-lft-top.gif");
 }
 
-.tab-bottom[selected="true"] > .tab-image-mid,
-.tab-bottom:hover:active[selected="true"] > .tab-image-mid { 
+.tab-bottom[selected="true"] > .tab-mid,
+.tab-bottom:hover:active[selected="true"] > .tab-mid { 
   margin: 0px;
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-sel-mid-top.gif");
   background-color: #C7D0D9;
 }
 
-.tab-bottom[selected="true"] > .tab-image-mid > .tab-image-mid-top,
-.tab-bottom:hover:active[selected="true"] > .tab-image-mid > .tab-image-mid-top { 
+.tab-bottom[selected="true"] > .tab-mid > .tab-mid-top,
+.tab-bottom:hover:active[selected="true"] > .tab-mid > .tab-mid-top { 
   background-image: none;
   background-color: #C7D0D9;
 }
 
-.tab-bottom[selected="true"] > .tab-image-mid > .tab-image-mid-mid,
-.tab-bottom:hover:active[selected="true"] > .tab-image-mid > .tab-image-mid-mid { 
+.tab-bottom[selected="true"] > .tab-mid > .tab-mid-mid,
+.tab-bottom:hover:active[selected="true"] > .tab-mid > .tab-mid-mid { 
   padding: 1px 0px 1px 0px;
 }
 
-.tab-bottom[selected="true"] > .tab-image-mid > .tab-image-mid-btm,
-.tab-bottom:hover:active[selected="true"] > .tab-image-mid > .tab-image-mid-btm { 
+.tab-bottom[selected="true"] > .tab-mid > .tab-mid-btm,
+.tab-bottom:hover:active[selected="true"] > .tab-mid > .tab-mid-btm { 
   background: none;
 }
 
-.tab-bottom[selected="true"] > .tab-image-right > .tab-image-right-top,
-.tab-bottom:hover:active[selected="true"] > .tab-image-right > .tab-image-right-top { 
+.tab-bottom[selected="true"] > .tab-right > .tab-right-top,
+.tab-bottom:hover:active[selected="true"] > .tab-right > .tab-right-top { 
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-sel-rit-btm.gif");
 }
 
-.tab-bottom[selected="true"] > .tab-image-right > .tab-image-right-btm,
-.tab-bottom:hover:active[selected="true"] > .tab-image-right > .tab-image-right-btm { 
+.tab-bottom[selected="true"] > .tab-right > .tab-right-btm,
+.tab-bottom:hover:active[selected="true"] > .tab-right > .tab-right-btm { 
   background-image: url("chrome://global/skin/tabcontrol/tab-bot-sel-rit-top.gif");
 }
 
diff --git a/mozilla/themes/modern/global/toolbar.css b/mozilla/themes/modern/global/toolbar.css
index 0ab36946ccd..535c9f5a681 100644
--- a/mozilla/themes/modern/global/toolbar.css
+++ b/mozilla/themes/modern/global/toolbar.css
@@ -71,6 +71,7 @@ menubar > .toolbar-holder {
 /* ::::: toolbargrippy ::::: */
  
 toolbargrippy {
+  -moz-box-orient: vertical;
   width: 12px;
   background-image: url("chrome://global/skin/toolbar/tbgrip-mid.gif");
 }
diff --git a/mozilla/themes/modern/messenger/messenger.css b/mozilla/themes/modern/messenger/messenger.css
index 507f6a282ad..263c58ca7fd 100644
--- a/mozilla/themes/modern/messenger/messenger.css
+++ b/mozilla/themes/modern/messenger/messenger.css
@@ -334,7 +334,6 @@ menu.push {
   border: 1px outset #B4C3D4;
   padding: 2px;
   background: transparent;
-  text-align: center;
 }
 
 menu.push:hover:active,
@@ -399,7 +398,7 @@ statusbarpanel,
 }
 
 #threadpane-splitter,
-#threadpane-splitter > box {
+#threadpane-splitter > .splitter-internal-box {
   border-top: none;
   border-left: none;
   border-right: none;
@@ -415,16 +414,16 @@ statusbarpanel,
 }
 
 .gray-vertical-splitter,
-.gray-vertical-splitter > box {
+.gray-vertical-splitter > .splitter-internal-box {
   border-right: none;
 }
 
-.gray-vertical-splitter > box {
+.gray-vertical-splitter > .splitter-internal-box {
   border-bottom: none;
 }
 
 #sidebar-panels-splitter,
-#sidebar-panels-splitter > box {
+#sidebar-panels-splitter > .splitter-internal-box {
   border-top: none;
 }
 
diff --git a/mozilla/themes/modern/messenger/msgAccountCentral.css b/mozilla/themes/modern/messenger/msgAccountCentral.css
index fea4ceb659e..50d704ce280 100644
--- a/mozilla/themes/modern/messenger/msgAccountCentral.css
+++ b/mozilla/themes/modern/messenger/msgAccountCentral.css
@@ -44,7 +44,6 @@ separator.thin {
   padding: 10px 0px 10px 10px;
   font-size: 180%;
   font-weight: bold;
-  text-align: left;
 }
 
 .acctCentralRow {
diff --git a/mozilla/themes/modern/messenger/msgHdrViewOverlay.css b/mozilla/themes/modern/messenger/msgHdrViewOverlay.css
index cb9f78799e9..71a32797334 100644
--- a/mozilla/themes/modern/messenger/msgHdrViewOverlay.css
+++ b/mozilla/themes/modern/messenger/msgHdrViewOverlay.css
@@ -41,7 +41,7 @@
 
 .headerValueBox {
   width: 7.7em;
-  text-align: right;
+  -moz-box-pack: end;
 }
 
 /* ::::: msg header buttons ::::: */
@@ -117,7 +117,7 @@ mail-emailaddress {
 }
 
 .emailDisplayImage {
-  text-align: right;
+  -moz-box-pack: end;
 }
 
 /* ::::: email address twisty ::::: */
@@ -148,7 +148,7 @@ mail-emailaddress {
 /* ::::: collapsed view styles ::::: */
 
 #collapsedAttachmentBox {
-  text-align: center;
+  -moz-box-pack: center;
 }
 
 #collapseddateValue {
diff --git a/mozilla/themes/modern/navigator/navigator.css b/mozilla/themes/modern/navigator/navigator.css
index 1e337545511..db9b6f92ab1 100644
--- a/mozilla/themes/modern/navigator/navigator.css
+++ b/mozilla/themes/modern/navigator/navigator.css
@@ -155,7 +155,6 @@
 }
 
 .toolbar-primary-mid-fg {
-  -moz-binding: url("chrome://global/skin/globalBindings.xml#autostretch-never");
   -moz-box-align: start;
 }
 
@@ -164,7 +163,6 @@
 }
 
 #nav-bar-buttons {
-  margin-top: -1px;
   margin-left: 5px;
 }
 
diff --git a/mozilla/themes/modern/navigator/navigatorBindings.xml b/mozilla/themes/modern/navigator/navigatorBindings.xml
index e0bdaaf3e25..4b5a7b6a5d1 100644
--- a/mozilla/themes/modern/navigator/navigatorBindings.xml
+++ b/mozilla/themes/modern/navigator/navigatorBindings.xml
@@ -6,47 +6,47 @@
 
   <!-- :::/ navbar \ ::::::::::::::::::::::::::::::::::::::::::::::::::: -->
 
-  <binding id="nav-bar-inner" extends="xul:box">
+  <binding id="nav-bar-inner">
     <content>
-      <xul:box class="navbar-inner-groove-lft" orient="vertical">
+      <xul:vbox class="navbar-inner-groove-lft">
         <xul:spring class="navbar-inner-groove-lft-top"/>
         <xul:spring class="navbar-inner-groove-lft-mid" flex="1"/>
         <xul:spring class="navbar-inner-groove-lft-btm"/>
-      </xul:box>
-      <xul:box flex="1" class="navbar-inner-border-outer">
-        <xul:box flex="1" class="navbar-inner-border-middle">
-          <xul:box flex="1" class="navbar-inner-border-inner" autostretch="never">
+      </xul:vbox>
+      <xul:hbox flex="1" class="navbar-inner-border-outer">
+        <xul:hbox flex="1" class="navbar-inner-border-middle">
+          <xul:hbox flex="1" class="navbar-inner-border-inner" align="center">
             <children/>
-          </xul:box>
-        </xul:box>
-      </xul:box>
-      <xul:box class="navbar-inner-groove-rit" orient="vertical">
+          </xul:hbox>
+        </xul:hbox>
+      </xul:hbox>
+      <xul:vbox class="navbar-inner-groove-rit">
         <xul:spring class="navbar-inner-groove-rit-top"/>
         <xul:spring class="navbar-inner-groove-rit-mid" flex="1"/>
         <xul:spring class="navbar-inner-groove-rit-btm"/>
-      </xul:box>
+      </xul:vbox>
     </content>
   </binding>
   
-  <binding id="urlbar-group" extends="xul:box">
+  <binding id="urlbar-group">
     <content>
-      <xul:box class="urlbar-lft" orient="vertical">
+      <xul:vbox class="urlbar-lft">
         <xul:spring class="urlbar-lft-top"/>
         <xul:spring class="urlbar-lft-mid" flex="1"/>
         <xul:spring class="urlbar-lft-btm"/>
-      </xul:box>
-      <xul:box flex="1" class="urlbar-mid" orient="vertical">
+      </xul:vbox>
+      <xul:vbox flex="1" class="urlbar-mid">
         <xul:spring class="urlbar-mid-top"/>
-        <xul:box class="urlbar-mid-mid" flex="1">
+        <xul:hbox class="urlbar-mid-mid" flex="1">
           <children/>
-        </xul:box>
+        </xul:hbox>
         <xul:spring class="urlbar-mid-btm"/>
-      </xul:box>
-      <xul:box class="urlbar-rit" orient="vertical">
+      </xul:vbox>
+      <xul:vbox class="urlbar-rit">
         <xul:spring class="urlbar-rit-top"/>
         <xul:spring class="urlbar-rit-mid" flex="1"/>
         <xul:spring class="urlbar-rit-btm"/>
-      </xul:box>
+      </xul:vbox>
     </content>
   </binding>
 
diff --git a/mozilla/xpfe/browser/resources/content/fastnav.xul b/mozilla/xpfe/browser/resources/content/fastnav.xul
index b711e5d1fcd..2d4fc4e3e34 100644
--- a/mozilla/xpfe/browser/resources/content/fastnav.xul
+++ b/mozilla/xpfe/browser/resources/content/fastnav.xul
@@ -50,7 +50,7 @@ Contributor(s): ______________________________________. -->
 
   <toolbox id="navigator-toolbox" class="toolbox-top" deferattached="true">
     <toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar" persist="collapsed" 
-             tbautostretch="always">
+             tbalign="stretch">
       <hbox id="nav-bar-buttons">
         <menubutton id="back-button" label="&backButton.label;" tooltiptext="&backButton.tooltip;"
                     oncommand="gotoHistoryIndex(event);" buttonaction="BrowserBack();" context="backMenu"
@@ -107,7 +107,7 @@ Contributor(s): ______________________________________. -->
         </menupopup>
       </menubutton>
 
-      <hbox id="throbber-box" autostretch="never">
+      <hbox id="throbber-box" align="center">
         <button id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;"/>
       </hbox>
     </toolbar>
diff --git a/mozilla/xpfe/browser/resources/content/navWidgetBindings.xml b/mozilla/xpfe/browser/resources/content/navWidgetBindings.xml
index 5107cb4578b..35ba7ce87d5 100644
--- a/mozilla/xpfe/browser/resources/content/navWidgetBindings.xml
+++ b/mozilla/xpfe/browser/resources/content/navWidgetBindings.xml
@@ -8,7 +8,7 @@
 
   <binding id="urlbar" extends="xul:box">
     <content flex="1">  
-      <xul:box class="urlbar-container" autostretch="never" flex="1">
+      <xul:box class="urlbar-container" align="center" flex="1">
         <xul:box class="urlbar-pre-buttons">
           <children includes="button"/>
         </xul:box>
@@ -45,7 +45,7 @@
 
   <binding id="menulist-editable" extends="chrome://global/content/bindings/menulist.xml#menulist">
     <content>
-      <xul:box autostretch="never" valign="middle" flex="1" class="menulist-container">
+      <xul:box align="center" flex="1" class="menulist-container">
         <xul:image class="menulist-icon" inherits="src" emattr="icon"/>
         <xul:textbox class="menulist-editable-textbox plain" flex="1" emattr="field"
                        inherits="autocomplete,searchSessionType,timeout,tooltip=fieldtooltip,tooltiptext=fieldtooltiptext,value"/>
diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 48854ca7fde..d5048f9f060 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -136,7 +136,7 @@ Contributor(s): ______________________________________. -->
     <menubar id="main-menubar" persist="collapsed"/>
 
     <toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar" persist="collapsed" 
-             tbautostretch="always">
+             tbalign="stretch">
       <hbox id="nav-bar-buttons">
         <menubutton id="back-button" label="&backButton.label;" tooltiptext="&backButton.tooltip;"
                     oncommand="gotoHistoryIndex(event);" buttonaction="BrowserBack();" context="backMenu"
@@ -196,7 +196,7 @@ Contributor(s): ______________________________________. -->
         </menupopup>
       </menubutton>
 
-      <hbox id="throbber-box" autostretch="never">
+      <hbox id="throbber-box" align="center">
         <button id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;"/>
       </hbox>
     </toolbar>
@@ -206,7 +206,7 @@ Contributor(s): ______________________________________. -->
              ondragdrop="nsDragAndDrop.drop(event, personalToolbarObserver);"
              ondraggesture="nsDragAndDrop.startDrag(event, personalToolbarObserver);"
              ondragexit="nsDragAndDrop.dragExit(event, personalToolbarObserver);"
-             tbautostretch="always">
+             tbalign="stretch">
 
       <button class="button-toolbar bookmark-item" id="home-button" label="&homeButton.label;"
               tooltip="aTooltip" persist="hidden"
diff --git a/mozilla/xpfe/browser/samples/colorpicker.xul b/mozilla/xpfe/browser/samples/colorpicker.xul
index 509a7878ca9..d0ce24bdb31 100644
--- a/mozilla/xpfe/browser/samples/colorpicker.xul
+++ b/mozilla/xpfe/browser/samples/colorpicker.xul
@@ -94,7 +94,7 @@
 <!-- ColorPicker #1 -->
 <hbox id="box1">
 <menu id="menu1">
-  <button id="button1" label="text1" class="popup" align="right"/>
+  <button id="button1" label="text1" class="popup"/>
   <html:div id="colorWell1" style="width:30px; background-color:white"/>
   <menupopup id="popup1">
     <colorpicker id="cp1" palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
@@ -106,7 +106,7 @@
 <html:hr/>
 <hbox id="box2">
 <menu id="menu2">
-  <button id="button2" label="text2" class="popup" align="right"/>
+  <button id="button2" label="text2" class="popup"/>
   <html:div id="colorWell2" style="width:30px; background-color:white"/>
   <menupopup id="popup2">
     <colorpicker id="cp2" palettename="gray" onclick="setColorWell(this.parentNode.parentNode);"/>
@@ -118,7 +118,7 @@
 <html:hr/>
 <hbox id="box3">
 <menu id="menu3">
-  <button id="button3" label="text3" class="popup" align="right"/>
+  <button id="button3" label="text3" class="popup"/>
   <html:div id="colorWell3" style="width:30px; background-color:white"/>
   <menupopup id="popup3">
     <colorpicker id="cp3" palettename="web" onclick="setColorWell(this.parentNode.parentNode);"/>
diff --git a/mozilla/xpfe/browser/samples/tab.xul b/mozilla/xpfe/browser/samples/tab.xul
index b4253d50385..c277c541cf1 100644
--- a/mozilla/xpfe/browser/samples/tab.xul
+++ b/mozilla/xpfe/browser/samples/tab.xul
@@ -59,13 +59,13 @@ xmlns:html="http://www.w3.org/1999/xhtml"
         
                   <spring flex="100%"/>
 
-            <button src="resource:/res/throbber/anims00.gif" align="right"/>
+            <button src="resource:/res/throbber/anims00.gif"/>
     
         </toolbar>
 
         <toolbar>
-          <button align="right" src="resource:/res/toolbar/location.gif" label="Mozilla" />
-          <button align="right" src="resource:/res/toolbar/location.gif" label="ABC News"/>
+          <button src="resource:/res/toolbar/location.gif" label="Mozilla" />
+          <button src="resource:/res/toolbar/location.gif" label="ABC News"/>
         </toolbar>
       </toolbox>
 
diff --git a/mozilla/xpfe/browser/samples/widgets.xul b/mozilla/xpfe/browser/samples/widgets.xul
index 36df8fbf79b..190a6668375 100644
--- a/mozilla/xpfe/browser/samples/widgets.xul
+++ b/mozilla/xpfe/browser/samples/widgets.xul
@@ -51,27 +51,27 @@
   ]]>
   </script>              
               
-  <hbox autostretch="never" valign="center">
+  <hbox align="center">
     <text class="label" value="Foo Label 1:" for="nerp1"/>
     <textbox flex="1" id="nerp1" disabled="true" value="disabled"/>
     <button label="Test Property APIs" oncommand="testProperty('nerp1');"/>
   </hbox>
-  <hbox autostretch="never" valign="center">
+  <hbox align="center">
     <text class="label" value="Foo Label 2:" for="nerp2"/>
     <textbox flex="1" id="nerp2" readonly="true" value="readonly"/>
     <button label="Test Property APIs" oncommand="testProperty('nerp2');"/>
   </hbox>
-  <hbox autostretch="never" valign="center">
+  <hbox align="center">
     <text class="label" value="Foo Label 2:" for="nerp2r"/>
     <textbox flex="1" id="nerp2r" readonly="true" disabled="true" value="readonly disabled"/>
     <button label="Test Property APIs" oncommand="testProperty('nerp2r');"/>
   </hbox>
-  <hbox autostretch="never" valign="center">
+  <hbox align="center">
     <text class="label" value="Foo Label 3:" for="nerp3"/>
     <textbox flex="1" id="nerp3" value="regular"/>
     <button label="Test Property APIs" oncommand="testProperty('nerp3');"/>
   </hbox>
-  <hbox autostretch="never" valign="center">
+  <hbox align="center">
     <text class="label" value="Foo Label 5:" for="nerp4"/>
     <menubutton label="regular menubutton">
       <menupopup>
@@ -89,7 +89,7 @@
     </menubutton>    
   </hbox>
   
-  <hbox autostretch="never" valign="center">
+  <hbox align="center">
     <text class="label" value="Foo Label 5:" for="nerp4"/>
     <menulist label="regular menulist">
       <menupopup>
@@ -111,7 +111,7 @@
     <text class="label" value="Foo Label 4:"/>
     <vbox flex="1">
       <textbox flex="1"/>
-      <vbox autostretch="never">
+      <vbox align="center">
         <hbox flex="1">
           <checkbox label="Checkbox 1" id="checkbox1"/>
           <spring flex="1"/>
@@ -135,7 +135,7 @@
 
   <separator/>
   
-  <hbox autostretch="never" valign="center">
+  <hbox align="center">
     <text class="label" value="Foo Label 7:"/>
     <button label="Standard XUL Button"/>
     <button class="dialog" label="Dialog XUL Button"/>
@@ -188,7 +188,7 @@
   </script>
   
   
-  <hbox autostretch="never" valign="center">
+  <hbox align="center">
     <progressmeter id="normal" mode="normal" flex="1"/>
     <button label="Advance Progress" oncommand="advanceProgress();"/>
   </hbox>
diff --git a/mozilla/xpfe/communicator/resources/content/dialogBindings.xml b/mozilla/xpfe/communicator/resources/content/dialogBindings.xml
index 507983cc27d..8188142511b 100644
--- a/mozilla/xpfe/communicator/resources/content/dialogBindings.xml
+++ b/mozilla/xpfe/communicator/resources/content/dialogBindings.xml
@@ -7,7 +7,7 @@
 
   <binding id="smallheader">
     <content>
-      <xul:box class="box-smallheader-box toolbar-primary" autostretch="never" flex="1">
+      <xul:box class="box-smallheader-box toolbar-primary" align="center" flex="1">
         <xul:text class="box-smallheader-left" inherits="value=title"/>
         <xul:spring flex="1"/>
         <xul:text class="box-smallheader-right" inherits="value=description"/>
@@ -23,11 +23,11 @@
 
   <binding id="largeheader">
     <content>
-      <xul:box class="box-header-header toolbar-primary" flex="1" autostretch="never">
-        <xul:box class="box-header-circle-box" autostretch="never">
+      <xul:box class="box-header-header toolbar-primary" flex="1" align="center">
+        <xul:box class="box-header-circle-box" align="center">
           <xul:image inherits="src" class="box-header-circle"/>
         </xul:box>
-        <xul:box autostretch="never" class="box-header-text-box">
+        <xul:box align="center" class="box-header-text-box">
           <xul:text class="box-header-text" inherits="value"/>
         </xul:box>
         <xul:spring flex="1"/>
diff --git a/mozilla/xpfe/communicator/resources/content/openLocation.xul b/mozilla/xpfe/communicator/resources/content/openLocation.xul
index 9f067376d06..a748f72d9c6 100644
--- a/mozilla/xpfe/communicator/resources/content/openLocation.xul
+++ b/mozilla/xpfe/communicator/resources/content/openLocation.xul
@@ -64,7 +64,7 @@
       <html>&enter.label;</html>
       <separator class="thin"/>
 
-      <hbox autostretch="never">
+      <hbox align="center">
         <textbox id="dialog.input" flex="1" type="autocomplete"
                     searchSessions="history" timeout="50" maxrows="6"
                     oninput="doEnabling();">
@@ -75,7 +75,7 @@
         </textbox>
         <button label="&chooseFile.label;" oncommand="onChooseFile();"/>
       </hbox>
-      <hbox autostretch="never" valign="center">
+      <hbox align="center">
         <text class="label" value="&openWhere.label;"/>
         <menulist id="openAppList">
           <menupopup>
diff --git a/mozilla/xpfe/communicator/resources/content/taskbarOverlay.xul b/mozilla/xpfe/communicator/resources/content/taskbarOverlay.xul
index 5dfbebf5881..55c6498fdb1 100644
--- a/mozilla/xpfe/communicator/resources/content/taskbarOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/taskbarOverlay.xul
@@ -71,7 +71,7 @@
     <spring class="taskbarspacer" flex="9"/>
   </hbox>
     
-  <hbox id="taskbarGotoMenuBox" align="right" flex="1">
+  <hbox id="taskbarGotoMenuBox" flex="1">
     <!-- The "Open Windows" menu uses the window mediator
          to display all of the open windows -->
     <menubutton oncommand="ShowWindowFromResource(event.target)"
diff --git a/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul b/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul
index b7b0de2532c..7d9456b6dcc 100644
--- a/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul
@@ -83,7 +83,7 @@
     
    
    
-    <hbox id="taskbarGotoMenuBox" align="right"/>
+    <hbox id="taskbarGotoMenuBox"/>
     
     
   
diff --git a/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.css b/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.css
index 39c83ef91b1..99a3de0324e 100644
--- a/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.css
+++ b/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.css
@@ -9,4 +9,4 @@
 
 .autocomplete-result-popup {
   display: -moz-popup !important;
-}
\ No newline at end of file
+}
diff --git a/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml b/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml
index ff952628e9b..e5f93c42352 100644
--- a/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml
+++ b/mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml
@@ -18,22 +18,22 @@
     </resources>
 
     <content>
-      <xul:box class="autocomplete-internal-box textbox-internal-box" flex="1">
-        <xul:box class="autocomplete-icon-box" autostretch="never" inherits="userAction">
+      <xul:hbox class="autocomplete-internal-box textbox-internal-box" flex="1">
+        <xul:hbox class="autocomplete-icon-box" align="center" inherits="userAction">
           <children includes="image">
             <xul:image class="autocomplete-icon" allowevents="true"/>
           </children>
-        </xul:box>
+        </xul:hbox>
 
-        <xul:box class="autocomplete-textbox-container" autostretch="never" flex="1" allowevents="true">
+        <xul:hbox class="autocomplete-textbox-container" align="center" flex="1" allowevents="true">
           <html:input anonid="textbox" class="autocomplete-textbox textbox-input" flex="1"
                       inherits="onfocus,onblur,value,type,maxlength,disabled,size,readonly,userAction"/>
-        </xul:box>
+        </xul:hbox>
                             
-        <xul:box class="autocomplete-history-button" inherits="open,hidden=hideHistory">
+        <xul:hbox class="autocomplete-history-button" inherits="open,hidden=hideHistory">
           <xul:image class="autocomplete-history-image"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:hbox>
 
       <xul:popupset anonid="popupset" ignorekeys="true">
         <xul:popup anonid="popup" class="autocomplete-result-popup" inherits="for=id,nomatch"/>
@@ -1078,11 +1078,11 @@
     </resources>
 
     <content>
-      <xul:box class="autocomplete-result-box" flex="1">
+      <xul:hbox class="autocomplete-result-box" flex="1">
         <xul:outliner anonid="outliner" class="autocomplete-outliner" flex="1">
           <xul:outlinerbody anonid="outlinerbody" class="autocomplete-outlinerbody" flex="1"/>
         </xul:outliner>
-      </xul:box>
+      </xul:hbox>
     </content>
     
     <implementation>
@@ -1239,13 +1239,15 @@
       <stylesheet src="chrome://global/skin/autocomplete.css"/>
     </resources>
 
-    <content orient="vertical">
-      <xul:box class="autocomplete-outliner-cols">
-        <children includes="outlinercol"/>
-      </xul:box>
-      <xul:outlinerrows class="autocomplete-outlinerrows outliner-rows" inherits="hidescrollbar" flex="1">
-        <children/>
-      </xul:outlinerrows>
+    <content>
+      <xul:vbox flex="1">
+        <xul:hbox class="autocomplete-outliner-cols">
+          <children includes="outlinercol"/>
+        </xul:hbox>
+        <xul:outlinerrows class="autocomplete-outlinerrows outliner-rows" inherits="hidescrollbar" flex="1">
+          <children/>
+        </xul:outlinerrows>
+      </xul:vbox>
     </content>
 
     <implementation>
@@ -1296,17 +1298,17 @@
     </handlers>
   </binding>
 
-  <binding id="autocomplete-outlinerrows" extends="xul:box">
+  <binding id="autocomplete-outlinerrows">
     <resources>
       <stylesheet src="chrome://global/content/autocomplete.css"/>
       <stylesheet src="chrome://global/skin/autocomplete.css"/>
     </resources>
 
     <content onmousedown="event.preventDefault()">
-      <xul:box flex="1" class="outliner-bodybox">
+      <xul:hbox flex="1" class="outliner-bodybox">
         <children/>
-      </xul:box>
-      <xul:scrollbar inherits="hidescrollbar" align="vertical" class="outliner-scrollbar"/>
+      </xul:hbox>
+      <xul:scrollbar inherits="hidescrollbar" orient="vertical" class="outliner-scrollbar"/>
     </content>
   </binding>
 
@@ -1324,9 +1326,9 @@
     </resources>
 
     <content>
-      <xul:box class="autocomplete-result-box autocomplete-history-box" orient="vertical" flex="1">
+      <xul:vbox class="autocomplete-result-box autocomplete-history-box" flex="1">
         <children/>
-      </xul:box>
+      </xul:vbox>
     </content>
   </binding>
 
diff --git a/mozilla/xpfe/components/bookmarks/resources/addBookmark.xul b/mozilla/xpfe/components/bookmarks/resources/addBookmark.xul
index d29190548ba..805dddab08a 100644
--- a/mozilla/xpfe/components/bookmarks/resources/addBookmark.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/addBookmark.xul
@@ -65,7 +65,7 @@
       <column flex="1"/>
     </columns>
     <rows>
-      <row autostretch="never">
+      <row align="center">
         <text class="label" value="&name.label;" accesskey="&name.accesskey;" for="name"/>
         <textbox id="name"/>
         <spring/>
@@ -75,7 +75,7 @@
         <separator class="thin"/>
         <spring/>
       </row>
-      <row autostretch="never">
+      <row align="center">
         <text class="label" value="&url.label;" accesskey="&url.accesskey;" for="url"/>
         <textbox id="url" oninput="onLocationInput();"/>
         <spring/>
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
index 2324feab007..c40b4ca92c8 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -102,8 +102,10 @@
           <treeitem uri="rdf:*"
                     rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
             <treerow>
-              <treecell autostretch="never"><treeindentation/>
-                        <separator class="groove" flex="1"/></treecell>
+              <treecell align="center">
+                <treeindentation/>
+                <separator class="groove" flex="1"/>
+              </treecell>
             </treerow>
           </treeitem>     
         </treechildren>
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-props.xul b/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
index d83ede36b14..269a213c053 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
@@ -57,7 +57,7 @@
     <tabpanels>
       <vbox>
         <separator class="thin"/>
-        <hbox autostretch="never" valign="top">
+        <hbox align="start">
           <image class="message-icon"/>
           <separator class="thin" orient="vertical"/>
           <html flex="1">&generaldesc.label;</html>
@@ -96,7 +96,7 @@
       
       <vbox>
         <separator class="thin"/>
-        <hbox autostretch="never">
+        <hbox align="center">
           <image id="schedule-icon"/>
           <separator class="thin" orient="vertical"/>
           <html flex="1">&schedule.description;</html>
@@ -112,7 +112,7 @@
                 <column flex="1"/>
               </columns>
               <rows>
-                <row autostretch="never">
+                <row align="center">
                   <text class="label" value="&when.label;" for="dayRange"/>
                   <hbox>
                     <menulist id="dayRange" oncommand="dayRangeChange(this);">
@@ -133,10 +133,10 @@
                     </menulist>
                   </hbox>
                 </row>
-                <row autostretch="never">
+                <row align="center">
                   <text id="startHourRangeLabel" class="label" 
                         value="&from.label;" for="startHourRange"/>
-                  <hbox autostretch="never">
+                  <hbox align="center">
                     <menulist id="startHourRange" oncommand="setEndHourRange()">
                       <menupopup>
                         <menuitem value="0" label="&midnight.label;"/>
@@ -197,10 +197,10 @@
                     </menulist>
                   </hbox>
                 </row>
-                <row autostretch="never">
+                <row align="center">
                   <text id="durationLabel" class="label" 
                         value="&every.label;" for="duration"/>
-                  <hbox autostretch="never">
+                  <hbox align="center">
               	    <textbox id="duration" size="4" value="60" />
       	            <text id="durationSubLabel" class="label" value="&minutes.label;" />
                   </hbox>
@@ -215,7 +215,7 @@
           
       <vbox>
         <separator class="thin"/>
-        <hbox autostretch="never" valign="top">
+        <hbox align="start">
           <image id="notification-icon"/>
           <separator class="thin" orient="vertical"/>
           <html flex="1">&notification.description;</html>
@@ -223,12 +223,14 @@
         <separator class="thin"/>
         <hbox class="box-padded">
           <spring flex="1"/>
-          <groupbox orient="vertical" autostretch="never">
+          <groupbox>
             <label value="&notifications.legend.label;" />
-            <checkbox id="bookmarkIcon" label="&notification.icon.label;" />
-            <checkbox id="showAlert" label="&notification.alert.label;" />
-            <checkbox id="openWindow" label="&notification.window.label;" />
-            <checkbox id="playSound" label="&notification.sound.label;" />
+            <vbox align="start">
+              <checkbox id="bookmarkIcon" label="&notification.icon.label;" />
+              <checkbox id="showAlert" label="&notification.alert.label;" />
+              <checkbox id="openWindow" label="&notification.window.label;" />
+              <checkbox id="playSound" label="&notification.sound.label;" />
+            </vbox>
           </groupbox>
           <spring flex="1"/>
         </hbox>
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
index 5ffe09fefb3..c0cb4304e4c 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -230,7 +230,7 @@
       <menu id="menu_Help"/>
     </menubar>
 
-    <toolbar id="command-toolbar" tbautostretch="always" grippy="false">
+    <toolbar id="command-toolbar" tbalign="stretch" grippy="false">
       <button class="button-toolbar" id="newfolder" label="&command.newFolder.label;" 
               command="cmd_newfolder"/>
       <button class="button-toolbar" id="newseparator" label="&command.newSeparator.label;" 
@@ -266,14 +266,16 @@
           <treeitem uri="rdf:*"
                     rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
             <treerow>
-              <treecell autostretch="never"><treeindentation/>
-                        <separator class="groove" flex="1"/></treecell>
-              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
-              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
-              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
-              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
-              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
-              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
+              <treecell align="center">
+                <treeindentation/>
+                <separator class="groove" flex="1"/>
+              </treecell>
+              <treecell align="center"><separator class="groove" flex="1"/></treecell>
+              <treecell align="center"><separator class="groove" flex="1"/></treecell>
+              <treecell align="center"><separator class="groove" flex="1"/></treecell>
+              <treecell align="center"><separator class="groove" flex="1"/></treecell>
+              <treecell align="center"><separator class="groove" flex="1"/></treecell>
+              <treecell align="center"><separator class="groove" flex="1"/></treecell>
             </treerow>
           </treeitem>     
         </treechildren>
@@ -381,7 +383,7 @@
                   onclick="return TriStateColumnSort('LastModifiedDate');" 
                   observes="LastModifiedDate" />
         <treecell class="treecell-header" allowevents="true" id="popupCell">
-          <menu class="treecell-popupcell-menu" autostretch="never">
+          <menu class="treecell-popupcell-menu" align="center" pack="center">
             <menupopup popupanchor="bottomright" popupalign="topright"
                       oncreate="BuildTreePopup(document.getElementById('theColumns'), 
                                                document.getElementById('headRow'), this,
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.xul
index 4649ddff9c3..3994421d08c 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.xul
@@ -91,8 +91,10 @@
           <treeitem uri="rdf:*"
                     rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
             <treerow>
-              <treecell autostretch="never"><treeindentation/>
-                        <separator class="groove" flex="1"/></treecell>
+              <treecell align="center">
+                <treeindentation/>
+                <separator class="groove" flex="1"/>
+              </treecell>
             </treerow>
           </treeitem>     
         </treechildren>
diff --git a/mozilla/xpfe/components/bookmarks/resources/findBookmark.xul b/mozilla/xpfe/components/bookmarks/resources/findBookmark.xul
index 73d16768c5f..def49a4f61f 100644
--- a/mozilla/xpfe/components/bookmarks/resources/findBookmark.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/findBookmark.xul
@@ -48,7 +48,7 @@
   <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/findBookmark.js"/>
 
   <text class="label" value="&search.for.label;"/>
-  <hbox autostretch="never" valign="middle">
+  <hbox align="center">
     <menulist id="matchList" class="menulist-toolbar">
       <menupopup>
         <menuitem value="http://home.netscape.com/NC-rdf#Name" label="&search.name.label;"/>
diff --git a/mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul
index c7ed46d2ce1..7507f1d5e85 100644
--- a/mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul
@@ -89,14 +89,14 @@
   <groupbox orient="vertical">
     <label value="&filingBookmarks.label;"/>
     <html flex="1">&autoFile.label;</html>
-    <hbox autostretch="never">
+    <hbox align="center">
       <checkbox id="enableAutoFile" label="&enableAutoFile.label;"
                 pref="true" preftype="bool" prefstring="browser.bookmarks.add_without_dialog"
-                prefattribute="checked" valign="top"/>
+                prefattribute="checked"/>
     </hbox>
     <separator/>
     <html flex="1">&defaultFolder.label;</html>
-    <hbox autostretch="never">
+    <hbox align="center">
       <textbox readonly="true" id="defaultFolder" crop="right" flex="1"/>
       <button label="&chooseDefaultFolder.label;" accesskey="&chooseDefaultFolder.accesskey;"
               oncommand="chooseDefaultFolder();"
@@ -105,13 +105,15 @@
     </hbox>
   </groupbox>
 
-  <groupbox orient="vertical" autostretch="never">
+  <groupbox>
     <label value="&extendedDataViews.label;"/>
-    <html>&extendedDataExplanation.label;</html>
-    <checkbox id="showExtendedData" label="&showExtendedData.label;"
-              accesskey="&showExtendedData.accesskey;"
-              pref="true" preftype="bool" prefstring="browser.bookmarks.show_extended_data"
-              prefattribute="checked"/>
+    <vbox align="start">
+      <html>&extendedDataExplanation.label;</html>
+      <checkbox id="showExtendedData" label="&showExtendedData.label;"
+                accesskey="&showExtendedData.accesskey;"
+                pref="true" preftype="bool" prefstring="browser.bookmarks.show_extended_data"
+                prefattribute="checked"/>
+    </vbox>
   </groupbox>              
 
 
diff --git a/mozilla/xpfe/components/console/resources/content/consoleBindings.xml b/mozilla/xpfe/components/console/resources/content/consoleBindings.xml
index 703f431a446..6b572612889 100644
--- a/mozilla/xpfe/components/console/resources/content/consoleBindings.xml
+++ b/mozilla/xpfe/components/console/resources/content/consoleBindings.xml
@@ -10,7 +10,7 @@
     <content>  
       <xul:stringbundle src="chrome://global/locale/console.properties" role="string-bundle"/>
       <xul:box class="console-box-internal" flex="1">
-        <xul:box class="console-rows" orient="vertical" flex="1" role="console-rows"/>
+        <xul:vbox class="console-rows" flex="1" role="console-rows"/>
       </xul:box>
     </content>
   
@@ -344,11 +344,11 @@
   <binding id="error" extends="xul:box">
     <content>
       <xul:box class="console-row-internal-box" flex="1">
-        <xul:box class="console-row-icon" autostretch="never" inherits="selected">
+        <xul:box class="console-row-icon" align="center" inherits="selected">
           <xul:image class="console-icon" inherits="src,type"/>
         </xul:box>
-        <xul:box class="console-row-content" inherits="selected" orient="vertical" flex="1">
-          <xul:box class="console-row-msg" autostretch="never" valign="top">
+        <xul:vbox class="console-row-content" inherits="selected" flex="1">
+          <xul:box class="console-row-msg" align="start">
             <xul:text class="label" inherits="value=typetext"/>
             <xul:html class="console-error-msg" inherits="value=msg" flex="1"/>
           </xul:box>
@@ -359,15 +359,15 @@
             <xul:text class="label" value="&errLine.label;"/>
             <xul:text class="label" inherits="value=line" flex="1"/>
           </xul:box>
-          <xul:box class="console-row-code" inherits="selected,hidden=hideCode" orient="vertical">
+          <xul:vbox class="console-row-code" inherits="selected,hidden=hideCode">
             <xul:text class="monospace console-code" inherits="value=code"/>
             <xul:box inherits="hidden=hideCaret">
               <xul:text class="monospace console-dots" inherits="value=errorDots"/>
               <xul:text class="monospace console-caret" inherits="value=errorCaret"/>
               <xul:spring flex="1"/>
             </xul:box>
-          </xul:box>
-        </xul:box>
+          </xul:vbox>
+        </xul:vbox>
       </xul:box>
     </content>
 
@@ -403,14 +403,14 @@
   <binding id="message" extends="xul:box">
     <content>
       <xul:box class="console-internal-box" flex="1">
-        <xul:box class="console-row-icon" autostretch="never">
+        <xul:box class="console-row-icon" align="center">
           <xul:image class="console-icon" inherits="src,type"/>
         </xul:box>
-        <xul:box class="console-row-content" inherits="selected" orient="vertical" flex="1">
-          <xul:box class="console-row-msg" orient="vertical" flex="1">
+        <xul:vbox class="console-row-content" inherits="selected" flex="1">
+          <xul:vbox class="console-row-msg" flex="1">
             <xul:html class="console-msg-text" inherits="value=msg" flex="1"/>
-          </xul:box>
-        </xul:box>
+          </xul:vbox>
+        </xul:vbox>
       </xul:box>
     </content>
 
diff --git a/mozilla/xpfe/components/filepicker/res/content/filepicker.xul b/mozilla/xpfe/components/filepicker/res/content/filepicker.xul
index 58ef804e0fd..b28e30a5a72 100644
--- a/mozilla/xpfe/components/filepicker/res/content/filepicker.xul
+++ b/mozilla/xpfe/components/filepicker/res/content/filepicker.xul
@@ -46,7 +46,7 @@
 <script type="application/x-javascript" src="chrome://global/content/filepicker.js"/>
 <keyset id="dialogKeys"/>
 
-<hbox autostretch="never">
+<hbox align="center">
   <text value="&lookInMenuList.label;"/>
   <menulist id="lookInMenuList" flex="1" oncommand="onDirectoryChanged(event.target);" crop="left">
     <menupopup id="lookInMenu"/>
diff --git a/mozilla/xpfe/components/find/resources/finddialog.xul b/mozilla/xpfe/components/find/resources/finddialog.xul
index 3cfe2d104f3..bdff59cb2ab 100644
--- a/mozilla/xpfe/components/find/resources/finddialog.xul
+++ b/mozilla/xpfe/components/find/resources/finddialog.xul
@@ -55,12 +55,12 @@ Contributor(s):
     </columns>
     <rows>
       <row>
-        <vbox valign="middle">   <!-- we should use 'baseline' here -->
-          <text class="label" value="&findField.label;" valign="bottom"/>
-        </vbox>
-        <vbox valign="middle">
+        <hbox align="center">
+          <text class="label" value="&findField.label;"/>
+        </hbox>
+        <hbox align="center">
           <textbox id="dialog.findKey" flex="1" oninput="doEnabling();"/>
-        </vbox>
+        </hbox>
       </row>
       <row>
         <spring/>
diff --git a/mozilla/xpfe/components/find/resources/replacedialog.xul b/mozilla/xpfe/components/find/resources/replacedialog.xul
index 5c44f1a23b2..a95032a5bea 100644
--- a/mozilla/xpfe/components/find/resources/replacedialog.xul
+++ b/mozilla/xpfe/components/find/resources/replacedialog.xul
@@ -54,7 +54,7 @@ Contributor(s): Kin Blas <kin@netscape.com>
     <vbox>
       <textbox id="dialog.findKey" oninput="doEnabling();"/>
       <textbox id="dialog.replaceKey" oninput="doEnabling();"/>
-      <vbox autostretch="never">
+      <vbox align="start">
         <checkbox id="dialog.caseSensitive" label="&caseSensitiveCheckbox.label;"/>
         <checkbox id="dialog.wrap" label="&wrapCheckbox.label;"/>
         <checkbox id="dialog.searchBackwards" label="&backwardsCheckbox.label;"/>
diff --git a/mozilla/xpfe/components/history/resources/findHistory.xul b/mozilla/xpfe/components/history/resources/findHistory.xul
index 9aeda7f70dc..89bfcf2adf3 100644
--- a/mozilla/xpfe/components/history/resources/findHistory.xul
+++ b/mozilla/xpfe/components/history/resources/findHistory.xul
@@ -45,7 +45,7 @@
   <script type="application/x-javascript" src="chrome://communicator/content/history/findHistory.js"/>
 
   <text class="label" value="&search.for.label;"/>
-  <hbox autostretch="never" valign="middle">
+  <hbox align="center">
     <menulist id="matchList">
       <menupopup>
         <menuitem value="Name" label="&search.name.label;"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index 13530b3c9cf..446ce60cc90 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -153,9 +153,9 @@
 
   <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <groupbox orient="vertical" id="advancedSettings">
+  <groupbox orient="vertical" id="advancedSettings" align="start">
     <label value="&advancedTitle.label;"/>
-    <vbox autostretch="never" id="contentEnablingBox">
+    <vbox align="start" id="contentEnablingBox">
       <checkbox id="advancedJavaAllow" label="&enbJavaCheck.label;" accesskey="&enbJavaCheck.accesskey;"
                 pref="true" preftype="bool" prefstring="security.enable_java"
                 prefattribute="checked"/>
@@ -168,7 +168,7 @@
       <html>&description.label;</html>
       <separator/>
     </vbox>
-    <vbox autostretch="never">
+    <vbox align="start">
       <checkbox id="advancedMailFTP" label="&sendAddFtpCheck.label;" accesskey="&sendAddFtpCheck.accesskey;"
                 pref="true" preftype="bool" prefstring="advanced.mailftp"
                 prefattribute="checked" oncommand="ftpCheck();"/>
@@ -183,7 +183,7 @@
   </groupbox>
   <groupbox orient="vertical" id="perfSettings">
    <label id="perfLabel" value="&perfTitle.label;"/>
-    <vbox id="perfBox" autostretch="never">
+    <vbox id="perfBox" align="start">
       <checkbox id="enableTurbo" label="&enableTurbo.label;" accesskey="&enableTurboCheck.accesskey;"/>
     </vbox>
   </groupbox>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
index 1ead024dd9a..c63b398b28b 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@@ -81,22 +81,20 @@
           
   <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <groupbox id="generalStartupPreferences" orient="vertical" autostretch="never">
+  <groupbox id="generalStartupPreferences" orient="vertical" align="start">
     <label value="&onStartLegend.label;"/>
-    
     <!-- XXX remove when navigator overlays.rdf works -->
     <checkbox id="generalStartupBrowser" wsm_persist="true"
               label="&navCheck.label;" accesskey="&navCheck.accesskey;"
               pref="true" preftype="bool" prefstring="general.startup.browser"
               prefattribute="checked"/>
     <!-- XXX -->
-    
   </groupbox>
   
   <!-- displaying none for beta -->
   <groupbox id="toolbarStyleBox" orient="vertical" style="display: none;">
     <label value="&showToolsLegend.label;"/>
-    <radiogroup id="toolbarStyle" orient="vertical" autostretch="never"
+    <radiogroup id="toolbarStyle" orient="vertical" align="start"
                 pref="true" preftype="int" prefstring="browser.chrome.toolbar_style"
                 prefattribute="value" wsm_persist="true">
       <radio group="toolbarStyle" value="2" label="&picsNtextRadio.label;" accesskey="&picsNtextRadio.accesskey;"/>
@@ -105,7 +103,7 @@
     </radiogroup>
   </groupbox>
 
-  <vbox class="box-padded" autostretch="never">
+  <vbox class="box-padded" align="start">
     <separator class="thin" />
 
     <checkbox id="showHideTooltips" label="&showHideTooltips.label;"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
index 1301f15b265..d5f0007a0e9 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
@@ -278,7 +278,7 @@
   
   <keyset id="dialogKeys"/>
   
-  <hbox autostretch="never">
+  <hbox align="center">
     <image id="contentTypeImage"/>
     <text class="label" id="contentType" crop="right"/>
   </hbox>
@@ -296,11 +296,11 @@
     </columns>
     
     <rows>
-      <row autostretch="never">
+      <row align="center">
         <text class="label" value="&extension.label;"/>
         <text class="label" id="extension"/>
       </row>
-      <row autostretch="never">
+      <row align="center">
         <text class="label" value="&mimetype.label;" accesskey="&mimetype.accesskey;"
               for="mimeType"/>
         <textbox id="mimeType" flex="1"/>
@@ -314,17 +314,17 @@
     <label value="&handledby.label;"/>
     
     <radiogroup id="handler" orient="vertical">
-      <vbox autostretch="never">
+      <vbox align="start">
 <!-- Turn this off since we can't make it work yet
         <radio value="4" group="handler" label="&useDefault.label;" accesskey="&useDefault.accesskey;" oncommand="doEnabling();"/>
 -->
         <radio value="1" group="handler" label="&saveToDisk.label;" accesskey="&saveToDisk.accesskey;" oncommand="doEnabling();"/>
       </vbox>
-      <hbox autostretch="never">
+      <hbox align="center">
         <radio value="2" group="handler" label="&application.label;" accesskey="&application.accesskey;" oncommand="doEnabling();"/>
         <textbox id="appPath" flex="1" onchange="selectAppRadio();"/>
       </hbox>
-      <hbox autostretch="never" halign="right">
+      <hbox align="center" pack="end">
         <button label="&browse.label;" accesskey="&browse.accesskey;"
                 oncommand="chooseApp();"/>
       </hbox>
@@ -332,7 +332,7 @@
     
   </groupbox>              
 
-  <hbox autostretch="never">
+  <hbox align="center">
     <checkbox id="askBeforeOpen" label="&askBeforeOpen.label;" accesskey="&askBeforeOpen.accesskey;"/>         
   </hbox>
   
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
index bff095b927b..14d9b6d78c9 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
@@ -126,7 +126,7 @@
     <label value="&fileOpening.label;"/>
     <html flex="1">&resetText.label;</html>
     <separator orient="vertical"/>
-    <hbox autostretch="never">
+    <hbox align="center">
       <button label="&resetButton.label;" oncommand="clearRememberedSettings();"/>
     </hbox>
   </groupbox>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
index 4294316c0cc..c7567789503 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -57,9 +57,9 @@
       </columns>
       
       <rows>
-        <row autostretch="never" valign="middle">
+        <row align="center">
           <text class="label" value="&memCache.label;" accesskey="&memCache.accesskey;" for="browserCacheMemoryCache"/>
-          <hbox autostretch="never" valign="middle">
+          <hbox align="center">
             <textbox id="browserCacheMemoryCache" size="8" pref="true" preftype="int"
                        prefstring="browser.cache.memory.capacity" prefattribute="value"/>
             <text class="label" value="&kbyes;"/>
@@ -69,9 +69,9 @@
                   id="clearMemCache" pref="true" preftype="bool"
                   prefstring="pref.advanced.cache.disable_button.clear_memory" prefattribute="disabled"/>
         </row>
-        <row autostretch="never" valign="middle">
+        <row align="center">
           <text class="label" value="&diskCache.label;" accesskey="&diskCache.accesskey;" for="browserCacheDiskCache"/>
-          <hbox autostretch="never" valign="middle">
+          <hbox align="center">
             <textbox id="browserCacheDiskCache" size="8" pref="true" preftype="int"
                        prefstring="browser.cache.disk.capacity" prefattribute="value"/>
             <text class="label" value="&kbyes;"/>
@@ -87,8 +87,8 @@
     <separator class="thin"/>
     
     <html>&docCache;</html>
-    <vbox autostretch="never" class="indent">
-      <radiogroup id="browserCacheCheckDocFrequency" orient="vertical" autostretch="never"
+    <vbox align="start" class="indent">
+      <radiogroup id="browserCacheCheckDocFrequency" orient="vertical" align="start"
                   pref="true" preftype="int" prefstring="browser.cache.check_doc_frequency"
                   prefattribute="value">
         <radio group="browserCacheCheckDocFrequency" value="1" label="&everyTimeRadio.label;" accesskey="&everyTimeRadio.accesskey;"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-calibrate-screen.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-calibrate-screen.xul
index a16b092ec17..44eb019f017 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-calibrate-screen.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-calibrate-screen.xul
@@ -51,7 +51,7 @@
       
     <separator class="thin"/>
       
-    <hbox align="center" autostretch="never" valign="middle">
+    <hbox align="center" align="center">
       <textbox id="horizSize" size="5"/>
       <menulist id="units" persist="value">
         <menupopup>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul
index 922850bd324..e40568a15cb 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul
@@ -57,7 +57,7 @@
         <treechildren id="available_charsets_root" flex="1"/>
       </tree> 
       <separator class="thin"/>
-      <hbox autostretch="never">
+      <hbox align="center">
         <button id="add_button" oncommand="AddAvailableCharset();" class="dialog"
                 label="&charset.customize.add.label;" disabled="true"/>
       </hbox>
@@ -76,7 +76,7 @@
         <treechildren id="active_charsets_root" flex="1"/>
       </tree>
       <separator class="thin"/>
-      <hbox autostretch="never">
+      <hbox align="center">
         <button id="remove_button" oncommand="RemoveActiveCharset();"
                 class="dialog" disabled="true"
                 label="&charset.customize.remove.label;"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
index 2c60b781d1f..a78af9a93b1 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -60,7 +60,7 @@
         <data id="background" pref="true" preftype="color" prefstring="browser.display.background_color" prefattribute="value" wsm_attributes="value"/>
       </hbox>
       <separator class="thin"/>
-      <hbox autostretch="never">
+      <hbox align="center">
         <checkbox id="browserUseSystemColors" label="&useSystemColors.label;" accesskey="&useSystemColors.accesskey;"
                 pref="true" preftype="bool" prefstring="browser.display.use_system_colors" prefattribute="checked"/>
       </hbox>
@@ -81,7 +81,7 @@
         <data id="visitedLinks" pref="true" preftype="string" prefstring="browser.visited_color" prefattribute="value" wsm_attributes="value"/>
       </hbox>
       <separator class="thin"/>
-      <hbox autostretch="never">
+      <hbox align="center">
         <checkbox id="browserUnderlineAnchors" label="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
                   pref="true" preftype="bool" prefstring="browser.underline_anchors" prefattribute="checked"/>
       </hbox>
@@ -91,7 +91,7 @@
   <groupbox orient="vertical">
     <html>&someProvColors;</html>
   
-    <radiogroup id="browserUseDocumentColors" orient="vertical" autostretch="never" 
+    <radiogroup id="browserUseDocumentColors" orient="vertical" align="start" 
                 pref="true" preftype="bool" prefstring="browser.display.use_document_colors"
                 prefattribute="value">
       <radio group="browserUseDocumentColors" value="true" label="&alwaysUseDocumentColors.label;" accesskey="&alwaysUseDocumentColors.accesskey;"/>
@@ -102,7 +102,7 @@
 
   <groupbox orient="vertical">
       <label value="&viewsource;"/>
-      <hbox autostretch="never">
+      <hbox align="center">
         <checkbox id="syntaxHighlight" label="&syntaxHighlight.label;" accesskey="&syntaxHighlight.accesskey;"
                   pref="true" preftype="bool" prefstring="view_source.syntax_highlight" prefattribute="checked"/>
       </hbox>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
index fbec5109c3a..a71c33293f7 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
@@ -43,7 +43,7 @@
         
   <hbox class="box-smallheader" title="&lHeader;"/>
   
-  <groupbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" align="start">
     <label value="&widgetRendering.label;"/>
     <checkbox id="nglayoutDebugWindow" label="&debugWindow.label;"
               pref="true" preftype="bool" prefstring="nglayout.widget.debugWindow"
@@ -55,7 +55,7 @@
 
   <!-- nothing on this page has accesskeys because this is a temporary debug
        panel and you can damn well click the widgets! -->
-  <groupbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" align="start">
     <label value="&debugMiscellaneous.label;"/>
     <checkbox id="browserDOMWindowDumpEnabled" label="&debugEnableDump.label;"
               pref="true" preftype="bool" prefstring="browser.dom.window.dump.enabled"
@@ -86,12 +86,12 @@
         </columns>
         
         <rows>
-          <row autostretch="never">
+          <row align="center">
             <text class="label" value="&acceleratorKey.label;" for="acceleratorKeyValue"/>
             <textbox id="acceleratorKeyValue" pref="true" preftype="int"
               prefstring="ui.key.accelKey" prefattribute="value" size="5"/>
           </row>
-          <row autostretch="never">
+          <row align="center">
             <text class="label" value="&menuAccessKey.label;" for="menuAccessKeyValue"/>
             <textbox id="menuAccessKeyValue" pref="true" preftype="int"
               prefstring="ui.key.menuAccessKey" prefattribute="value" size="5"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug1.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug1.xul
index 1b52d3716a9..1527a6a6ac9 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug1.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug1.xul
@@ -49,7 +49,7 @@
   <!-- Event Debugging -->  
   <groupbox orient="vertical">
     <label value="&debugEventDebugging.label;"/>
-    <vbox autostretch="never">
+    <vbox align="start">
       <checkbox id="nglayoutDebugPaintFlashing" label="&debugPaintFlashing.label;"
                 pref="true" preftype="bool" prefstring="nglayout.debug.paint_flashing"
                 prefattribute="checked"/>
@@ -74,7 +74,7 @@
   <!-- Reflow events -->
   <groupbox orient="vertical">
     <label value="&debugReflowEvents.label;"/>
-    <vbox autostretch="never">
+    <vbox align="start">
       <checkbox id="layoutReflowShowFrameCounts" label="&debugReflowShowFrameCounts.label;"
                 pref="true" preftype="bool" prefstring="layout.reflow.showframecounts"
                 prefattribute="checked"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug2.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug2.xul
index eb70d5e4015..109acd3d922 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug2.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug2.xul
@@ -46,7 +46,7 @@
 
   <groupbox orient="vertical">
     <label value="&debugNetworking.label;"/>
-    <vbox autostretch="never">
+    <vbox align="start">
       <checkbox id="browserEnableKeepAlive" label="&debugEnableKeepAlive.label;"
                 pref="true" preftype="bool" prefstring="network.http.keep-alive"
                 prefattribute="checked"/>
@@ -69,7 +69,7 @@
 
   <groupbox orient="vertical">
     <label value="&debugCache.label;"/>
-    <vbox autostretch="never">
+    <vbox align="start">
     <checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;"
               pref="true" preftype="bool" prefstring="nglayout.debug.disable_xul_cache"
               prefattribute="checked"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index 7a882ae714d..7d749a22141 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -73,8 +73,8 @@
       </columns>
       
       <rows>
-        <row autostretch="never" valign="middle">
-          <hbox autostretch="never" halign="right">
+        <row align="center">
+          <hbox align="center">
             <text class="label small-margin" 
                   value="&proportional.label;" 
                   accesskey="&proportional.accesskey;" 
@@ -118,8 +118,8 @@
         <row>
           <separator class="thin"/>
         </row>
-        <row autostretch="never" valign="middle">
-          <hbox autostretch="never" halign="right">
+        <row align="center">
+          <hbox align="center" pack="end">
             <text class="label small-margin" 
                   value="&serif.label;" 
                   accesskey="&serif.accesskey;" 
@@ -130,8 +130,8 @@
           </menulist>
           <spring/>
         </row>
-        <row autostretch="never" valign="middle">
-          <hbox autostretch="never" halign="right">
+        <row align="center">
+          <hbox align="center" pack="end">
             <text class="label small-margin" 
                   value="&sans-serif.label;" 
                   accesskey="&sans-serif.accesskey;" 
@@ -142,8 +142,8 @@
           </menulist>
           <spring/>
         </row>
-        <row autostretch="never" valign="middle">
-          <hbox autostretch="never" halign="right">
+        <row align="center">
+          <hbox align="center" pack="end">
             <text class="label small-margin" 
                   value="&cursive.label;" 
                   accesskey="&cursive.accesskey;" 
@@ -154,8 +154,8 @@
           </menulist>
           <spring/>
         </row>
-        <row autostretch="never" valign="middle">
-          <hbox autostretch="never" halign="right">
+        <row align="center">
+          <hbox align="center" pack="end">
             <text class="label small-margin" 
                   value="&fantasy.label;" 
                   accesskey="&fantasy.accesskey;" 
@@ -166,8 +166,8 @@
           </menulist>
           <spring/>
         </row>
-        <row autostretch="never" valign="middle">
-          <hbox autostretch="never" halign="right">
+        <row align="center">
+          <hbox align="center" pack="end">
             <text class="label small-margin" 
                   value="&monospace.label;" 
                   accesskey="&monospace.accesskey;" 
@@ -209,7 +209,7 @@
 
   <separator class="thin"/>
   
-  <hbox autostretch="never">
+  <hbox align="center">
     <!-- Unchecking this removes the ability to select dynamic fonts -->
     <checkbox id="browserUseDocumentFonts" 
               clas="small-margin"
@@ -219,7 +219,7 @@
 
   <separator class="thin"/>
   
-  <hbox autostretch="never" valign="middle">
+  <hbox align="center">
     <text class="label small-margin" 
           value="&resolution.label;" 
           accesskey="&resolution.accesskey;" 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
index fe054c82f14..e7ba62fee21 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
@@ -107,7 +107,7 @@
   <groupbox orient="vertical">
     <label value="&header3.label;"/>
     <html>&historyPages.label;</html>
-    <hbox autostretch="never">
+    <hbox align="center">
       <text class="label" value="&pageHis.label;" accesskey="&pageHis.accesskey;" for="histDay"/>
       <textbox id="histDay" size="3" wsm_persist="true"
                  pref="true" preftype="int" prefstring="browser.history_expire_days"
@@ -124,9 +124,9 @@
   <!-- no honey, I haven't been viewing porn, honest! -->
   <groupbox orient="vertical">
     <label value="&locationBarHistory.label;"/>
-    <hbox autostretch="never">
+    <hbox align="center">
       <html flex="1">&clearLocationBar.label;</html>
-      <hbox autostretch="never" halign="right">
+      <hbox align="center" pack="end">
         <button class="dialog" id="ClearUrlBarHistoryButton" label="&clearLocationBarButton.label;" accesskey="&clearLocationBarButton.accesskey;"
          oncommand="prefClearUrlbarHistory();"
          pref="true" preftype="bool"
@@ -140,7 +140,7 @@
   <groupbox orient="vertical">
     <label value="&shistory.label;"/>
     <html>&shistoryDescription1.label;</html>
-    <hbox autostretch="never">
+    <hbox align="center">
       <text class="label" value="&shistoryDescription2.label;" accesskey="&shistory.accesskey;" for="shistMax"/>
       <textbox id="shistMax" size="3" wsm_persist="true"
                   pref="true" preftype="int" prefstring="browser.sessionhistory.max_entries"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
index f893872b033..9e7b5688bb8 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
@@ -53,7 +53,7 @@
     <treechildren id="available_languages_root" flex="1"/>
   </tree>
 
-  <hbox autostretch="never">
+  <hbox align="center">
     <text class="label" value="&languages.customize.others.label;" for="languages.other"/>
     <textbox id="languages.other" size="6" />
     <text class="label" value="&languages.customize.others.examples;" for="languages.other"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
index 934abe7edb0..07cdbcc8814 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
@@ -89,7 +89,7 @@
       </vbox>
     </hbox>
   </groupbox>
-  <groupbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" align="start">
     <label value="&languages.customize.Charset.grouplabel;"/>
     <text class="label" value="&languages.customize.DefaultCharset.label;" for="DefaultCharsetList"/>
     <menulist id="DefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
index daf4ba43528..609a84a8a3a 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@@ -87,14 +87,10 @@
 
   <hbox class="box-smallheader" title="&title.label;"/>
 
-    <vbox>
-      <hbox valign="bottom" autostretch="never">
-        <vbox>
-          <text class="label" value="&mouseWheelPanel.label;" accesskey="&mouseWheelPanel.accesskey;" 
-                for="mouseWheelMode"/>
-        </vbox>
-      </hbox>
-    </vbox>
+    <hbox align="center">
+      <text class="label" value="&mouseWheelPanel.label;" accesskey="&mouseWheelPanel.accesskey;" 
+            for="mouseWheelMode"/>
+    </hbox>
 
     <separator class="thin"/>
   
@@ -117,13 +113,13 @@
     <deck id="modifierDeck" class="indent">
       
       <!-- no key modifiers -->
-      <radiogroup id="mousewheelWithNoKeyAction" orient="vertical" autostretch="never"
+      <radiogroup id="mousewheelWithNoKeyAction" orient="vertical" align="start"
                   pref="true" preftype="int" prefstring="mousewheel.withnokey.action" 
                   prefattribute="value">
-        <hbox autostretch="never" valign="top">
+        <hbox align="start">
           <radio group="mousewheelWithNoKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-          <vbox autostretch="never">
-            <hbox autostretch="never">
+          <vbox align="start">
+            <hbox align="center">
               <textbox id="mousewheelWithNoKeyNumlines" size="3" 
                          pref="true" preftype="int" prefstring="mousewheel.withnokey.numlines"
                          prefattribute="value"/>
@@ -140,13 +136,13 @@
       </radiogroup>
         
       <!-- alt modifiers -->
-      <radiogroup id="mousewheelWithAltKeyAction" orient="vertical" autostretch="never" 
+      <radiogroup id="mousewheelWithAltKeyAction" orient="vertical" align="start" 
                   pref="true" preftype="int" prefstring="mousewheel.withaltkey.action" 
                   prefattribute="value">
-        <hbox autostretch="never" valign="top">
+        <hbox align="start">
           <radio group="mousewheelWithAltKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-          <vbox autostretch="never">
-            <hbox autostretch="never">
+          <vbox align="start">
+            <hbox align="center">
               <textbox id="mousewheelWithAltKeyNumlines" size="3" 
                          pref="true" preftype="int" prefstring="mousewheel.withaltkey.numlines"
                          prefattribute="value"/>
@@ -163,13 +159,13 @@
       </radiogroup>
   
       <!-- ctrl modifiers -->
-      <radiogroup id="mousewheelWithCtrlKeyAction" orient="vertical" autostretch="never"
+      <radiogroup id="mousewheelWithCtrlKeyAction" orient="vertical" align="start"
                   pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.action" 
                   prefattribute="value">
-        <hbox autostretch="never" valign="top">
+        <hbox align="start">
           <radio group="mousewheelWithCtrlKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-          <vbox autostretch="never">
-            <hbox autostretch="never">
+          <vbox align="start">
+            <hbox align="center">
               <textbox id="mousewheelWithCtrlKeyNumlines" size="3" 
                          pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.numlines"
                          prefattribute="value"/>
@@ -186,13 +182,13 @@
       </radiogroup>
   
       <!-- shift modifiers -->
-      <radiogroup id="mousewheelWithShiftKeyAction" orient="vertical" autostretch="never"
+      <radiogroup id="mousewheelWithShiftKeyAction" orient="vertical" align="start"
                   pref="true" preftype="int" prefstring="mousewheel.withshiftkey.action" 
                   prefattribute="value">
-        <hbox autostretch="never" valign="top">
+        <hbox align="start">
           <radio group="mousewheelWithShiftKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-          <vbox autostretch="never">
-            <hbox autostretch="never">
+          <vbox align="start">
+            <hbox align="center">
               <textbox id="mousewheelWithShiftKeyNumlines" size="3" 
                          pref="true" preftype="int" prefstring="mousewheel.withshiftkey.numlines"
                          prefattribute="value"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index 283149acc9c..bd598ef3eb4 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -51,7 +51,7 @@
   <groupbox>
     <label value="&navRadio;"/>
     
-    <radiogroup id="startupPage" autostretch="never" orient="vertical"
+    <radiogroup id="startupPage" align="start" orient="vertical"
                 pref="true" preftype="int" prefstring="browser.startup.page"
                 prefattribute="value">
       <radio group="startupPage" value="0" label="&blankPageRadio.label;" accesskey="&blankPageRadio.accesskey;"/>
@@ -62,31 +62,33 @@
   </groupbox>
 
   <!-- homepage specification -->
-  <groupbox orient="vertical">
+  <groupbox>
     <label value="&header2.label;"/>
-    <html>&homePageIntro.label;</html>
-    <hbox autostretch="never">
-      <text class="label" value="&location.label;" accesskey="&location.accesskey;" for="browserStartupHomepage"/>
-      <textbox id="browserStartupHomepage" type="autocomplete" flex="1" wsm_persist="true" 
-                 searchSessions="history" timeout="50" maxrows="6"
-                 pref="true" preftype="string" prefstring="browser.startup.homepage"
-                 prefattribute="value"/>  <!-- we may wish to change this to data
-                                               when we support fancy formatted local filenames -->
-    </hbox>
-    <hbox autostretch="never" halign="right">
-      <button class="dialog" label="&useCurrent.label;" accesskey="&useCurrent.accesskey;"
-              oncommand="setHomePageToCurrentPage();"
-              id="browserUseCurrent" pref="true" preftype="bool"
-              prefstring="pref.browser.homepage.disable_button.current_page" prefattribute="disabled"/>
-      <button class="dialog" label="&browseFile.label;" accesskey="&browseFile.accesskey;"
-              oncommand="selectFile();"
-              id="browserChooseFile" pref="true" preftype="bool"
-              prefstring="pref.browser.homepage.disable_button.select_file" prefattribute="disabled"/>
-    </hbox>
+    <vbox flex="1">
+      <html>&homePageIntro.label;</html>
+      <hbox align="center">
+        <text class="label" value="&location.label;" accesskey="&location.accesskey;" for="browserStartupHomepage"/>
+        <textbox id="browserStartupHomepage" type="autocomplete" flex="1" wsm_persist="true" 
+                   searchSessions="history" timeout="50" maxrows="6"
+                   pref="true" preftype="string" prefstring="browser.startup.homepage"
+                   prefattribute="value"/>  <!-- we may wish to change this to data
+                                                 when we support fancy formatted local filenames -->
+      </hbox>
+      <hbox align="center" pack="end">
+        <button class="dialog" label="&useCurrent.label;" accesskey="&useCurrent.accesskey;"
+                oncommand="setHomePageToCurrentPage();"
+                id="browserUseCurrent" pref="true" preftype="bool"
+                prefstring="pref.browser.homepage.disable_button.current_page" prefattribute="disabled"/>
+        <button class="dialog" label="&browseFile.label;" accesskey="&browseFile.accesskey;"
+                oncommand="selectFile();"
+                id="browserChooseFile" pref="true" preftype="bool"
+                prefstring="pref.browser.homepage.disable_button.select_file" prefattribute="disabled"/>
+      </hbox>
+    </vbox>
   </groupbox>
   
   <!-- toolbar buttons customization -->
-  <groupbox flex="1" orient="horizontal" id="prefShowButtons">
+  <groupbox flex="1" id="prefShowButtons">
     <label value="&toolbarIntro.label;"/>
     <vbox>
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
index 2a91e50f8c4..a84a22acd23 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
@@ -50,7 +50,7 @@
     <label value="&rHeader;"/>
 
   <text value="&textStart;"/>
-    <radiogroup id="offlineStartupstate" orient="vertical" autostretch="never"
+    <radiogroup id="offlineStartupstate" orient="vertical" align="start"
                 pref="true" preftype="int" prefstring="offline.startup_state"
                 prefattribute="value">
     <radio class="small-margin" group="offlineStartupstate" value="0" label="&radioAskMode;"/>
@@ -59,7 +59,7 @@
 
   <separator class="thin"/>
   <text value="&textGoingOnline;"/>
-    <radiogroup id="whengoingOnlinestate" orient="vertical" autostretch="never"
+    <radiogroup id="whengoingOnlinestate" orient="vertical" align="start"
                 pref="true" preftype="int" prefstring="offline.send.unsent_messages"
                 prefattribute="value">
     <radio class="small-margin" group="whengoingOnlinestate" value="0" label="&radioAskUnsent;"/>
@@ -69,7 +69,7 @@
 
   <separator class="thin"/>
   <text value="&textGoingOffline;"/>
-     <radiogroup id="whengoingOfflinestate" orient="vertical" autostretch="never"
+     <radiogroup id="whengoingOfflinestate" orient="vertical" align="start"
                 pref="true" preftype="int" prefstring="offline.download.download_messages"
                 prefattribute="value">
     <radio class="small-margin" group="whengoingOfflinestate" value="0" label="&radioAskDownload;"/>
@@ -81,7 +81,7 @@
 
 <groupbox orient="vertical">
     <label value="&Diskspace;"/>	    
-    <hbox autostretch="never">
+    <hbox align="center">
         <checkbox id="offlineCompactFolder" label="&offlineCompact.label;" accesskey="&offlineCompact.accesskey;"
             pref="true" preftype="bool" prefstring="mail.prompt_purge_threshhold" prefattribute="checked"/> 
         <textbox id="offlineCompactFolderMin" size="5" value="100" 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-policies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-policies.xul
index ac2a7c61e93..414a9cd7d4d 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-policies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-policies.xul
@@ -81,7 +81,7 @@
       <html id="description"></html>
     </hbox>
   
-    <hbox autostretch="never">
+    <hbox align="center">
       <button class="dialog" label="&settings.label;" accesskey="&settings.accesskey;"
               oncommand="settings();"/>
     </hbox>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
index e70f365639b..0e218905a27 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@@ -58,7 +58,7 @@
     <radiogroup id="networkProxyType" orient="vertical"
                 pref="true" preftype="int" prefstring="network.proxy.type"
                 prefattribute="value">
-      <vbox autostretch="never">
+      <vbox align="start">
         <radio group="networkProxyType" value="0" label="&directTypeRadio.label;" accesskey="&directTypeRadio.accesskey;"                oncommand="DoEnabling();"/>
         <radio group="networkProxyType" value="1" label="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;"                oncommand="DoEnabling();"/>
       </vbox>
@@ -69,9 +69,9 @@
         </columns>
         
         <rows>
-          <row autostretch="never">
+          <row align="center">
               <text class="label" value="&ftp.label;" accesskey="&ftp.accesskey;" for="networkProxyFTP"/>
-            <hbox autostretch="never">
+            <hbox align="center">
               <textbox id="networkProxyFTP" pref="true" preftype="string" prefstring="network.proxy.ftp"
                          prefattribute="value" flex="1"/>
               <text class="label" value="&port.label;" accesskey="&FTPport.accesskey;" for="networkProxyFTP_Port"/>
@@ -79,9 +79,9 @@
                          prefattribute="value" size="5"/>
             </hbox>
           </row>
-          <row autostretch="never">
+          <row align="center">
             <text class="label" value="&gopher.label;" accesskey="&gopher.accesskey;" for="networkProxyGopher"/>
-            <hbox autostretch="never">
+            <hbox align="center">
               <textbox id="networkProxyGopher" pref="true" preftype="string" prefstring="network.proxy.gopher"
                          prefattribute="value" flex="1"/>
               <!-- gopher port doesn't have an accesskey because the window needs a redesign - bbaetz -->
@@ -90,9 +90,9 @@
                          prefattribute="value" size="5"/>
             </hbox>
           </row>
-          <row autostretch="never">
+          <row align="center">
             <text class="label" value="&http.label;" accesskey="&http.accesskey;" for="networkProxyHTTP"/>
-            <hbox autostretch="never">
+            <hbox align="center">
               <textbox id="networkProxyHTTP" pref="true" preftype="string" prefstring="network.proxy.http"
                          prefattribute="value" flex="1"/>
               <text class="label" value="&port.label;" accesskey="&HTTPport.accesskey;" for="networkProxyHTTP_Port"/>
@@ -100,9 +100,9 @@
                          prefattribute="value" size="5"/>
             </hbox>
           </row>
-          <row autostretch="never">
+          <row align="center">
             <text class="label" value="&ssl.label;" accesskey="&ssl.accesskey;" for="networkProxySSL"/>
-            <hbox autostretch="never">
+            <hbox align="center">
               <textbox id="networkProxySSL" pref="true" preftype="string" prefstring="network.proxy.ssl"
                          prefattribute="value" flex="1"/>
               <text class="label" value="&port.label;" accesskey="&SSLport.accesskey;" for="networkProxySSL_Port"/>
@@ -110,9 +110,9 @@
                          prefattribute="value" size="5"/>
             </hbox>
           </row>
-          <row autostretch="never">
+          <row align="center">
             <text class="label" value="&socks.label;" accesskey="&socks.accesskey;" for="networkProxySOCKS"/>
-            <hbox autostretch="never">
+            <hbox align="center">
               <textbox id="networkProxySOCKS" pref="true" preftype="string" prefstring="network.proxy.socks"
                        prefattribute="value" flex="1"/>
             <text class="label" value="&port.label;" accesskey="&SOCKSport.accesskey;" for="networkProxySOCKS_Port"/>
@@ -120,7 +120,7 @@
                        prefattribute="value" size="5"/>
             </hbox>
           </row>
-          <row autostretch="never"> 
+          <row align="center"> 
             <text class="label" value="&noproxy.label;" accesskey="&noproxy.accesskey;" for="networkProxyNone"/>
             <textbox id="networkProxyNone" pref="true" preftype="string" prefstring="network.proxy.no_proxies_on"
                        prefattribute="value"/>
@@ -131,7 +131,7 @@
           </row>
         </rows>
       </grid>
-      <hbox autostretch="never">
+      <hbox align="center">
         <radio group="networkProxyType" value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"                        oncommand="DoEnabling();"/>
       </hbox>
       <hbox class="indent" flex="1">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-search.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-search.xul
index 80bd9931cd8..e5bec6e4750 100755
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-search.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-search.xul
@@ -42,7 +42,7 @@
   <groupbox>
     <label value="&legendHeader;"/>
 
-    <hbox autostretch="never" valign="middle">
+    <hbox align="center">
       <text class="label" value="&defaultSearchEngine.label;" accesskey="&defaultSearchEngine.accesskey;" for="engineList"/>
       <menulist id="engineList" ref="NC:SearchEngineRoot" datasources="rdf:internetsearch"
               sortResource="http://home.netscape.com/NC-rdf#Name" sortDirection="ascending"
@@ -71,7 +71,7 @@
 
   <groupbox orient="vertical">
     <label value="&sidebarSearchTabPref.label;"/>
-    <radiogroup orient="vertical" autostretch="never"
+    <radiogroup orient="vertical" align="start"
         id="sidebarSearchMode"
         pref="true"
         preftype="int"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
index 7d8a369857c..d58fa28b3de 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -209,7 +209,7 @@
           </vbox>
         </row>
         <row>
-          <hbox autostretch="never">
+          <hbox align="center">
             <text class="label small-margin" id="domainText" value="&domain.label;" accesskey="&domain.accesskey;" for="addDomain"/>
             <textbox class="small-margin" id="addDomain" flex="1" oninput="doButtonEnabling();"
                      prefstring="pref.browser.smartbrowsing.disable_textbox.add" prefattribute="disabled"/>
@@ -231,7 +231,7 @@
 
     <html class="small-margin">&internetKeywordsDescription.label;</html>
     
-    <hbox autostretch="never">
+    <hbox align="center">
       <checkbox class="small-margin" id="browserGoBrowsingEnabled" label="&keywordsEnabled.label;" accesskey="&keywordsEnabled.accesskey;"
                 pref="true" preftype="bool" prefstring="keyword.enabled"
                 prefattribute="checked"/>
@@ -246,7 +246,7 @@
   <groupbox orient="vertical">
     <label value="&autoCompleteHeader.label;"/>
       <html class="small-margin">&autoCompleteDescription.label;</html>
-      <hbox autostretch="never">
+      <hbox align="center">
         <checkbox class="small-margin" id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
                   pref="true" preftype="bool" prefstring="browser.urlbar.autocomplete.enabled"
                   prefattribute="checked"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
index 49abf597cbd..c8739fac79a 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@@ -19,7 +19,7 @@
         
   <hbox class="box-smallheader" title="&lHeader;"/>
     
-  <groupbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" align="start">
     <label value="&smartTitle.label;"/>
     <checkbox id="XPInstallEnabled" label="&enableSU.label;" accesskey="&enableSU.accesskey;"
               pref="true" preftype="bool" prefstring="xpinstall.enabled"
@@ -27,7 +27,7 @@
   </groupbox>
 
 <!--
-  <groupbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" align="start">
     <label value="Installed Packages"/>
   
     <script>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
index e628aab3b19..d4d79771736 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
@@ -86,15 +86,15 @@
   <hbox flex="1">
     <vbox flex="1">
       <text class="label header" id="displayName" value=""/>
-      <hbox autostretch="never">
+      <hbox align="center">
         <text class="label" value="&author.label;"/>
         <text class="label" id="author"/>
       </hbox>
       <html id="description" flex="1"/>
     </vbox>
-    <vbox align="top">
+    <vbox>
       <button id="applySkin" label="&selectSkin.label;" accesskey="&selectSkin.accesskey;" oncommand="applySkin();"/>
-    <button id="uninstallSkin" label="&uninstallSkin.label;" oncommand="uninstallSkin();"/>
+      <button id="uninstallSkin" label="&uninstallSkin.label;" oncommand="uninstallSkin();"/>
     </vbox>
   </hbox>
   
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
index c88fcc30963..bdfe8fad20d 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
@@ -140,7 +140,7 @@
     <separator/>
 
     <!-- Misc -->
-    <hbox autostretch="never">
+    <hbox align="center">
         <checkbox id="showDialog" label="&showDialog.label;" accesskey="&showDialog.accesskey;"/>     
     </hbox>
     <spring flex="1"/>
diff --git a/mozilla/xpfe/components/search/resources/find.xul b/mozilla/xpfe/components/search/resources/find.xul
index f83a9871862..b95e0aede3b 100644
--- a/mozilla/xpfe/components/search/resources/find.xul
+++ b/mozilla/xpfe/components/search/resources/find.xul
@@ -11,7 +11,7 @@
 
   <script type="application/x-javascript" src="chrome://communicator/content/search/find.js"/>
 
-  <hbox autostretch="never" halign="left">
+  <hbox align="center">
     <text class="label" value="&search1.label;"/>
     <menulist id="datasource">
       <menupopup>
@@ -22,7 +22,7 @@
     <text class="label" value="&search2.label;"/>
   </hbox>
   
-  <hbox autostretch="never" halign="left">
+  <hbox align="center">
     <menulist id="match">
       <menupopup>
         <menuitem label="&name.label;" value="http://home.netscape.com/NC-rdf#Name"/>
@@ -45,7 +45,7 @@
     <button label="&search.button.label;" oncommand="doFind();"/>
   </hbox>          
           
-  <hbox autostretch="never" halign="left">
+  <hbox align="center">
     <button id="SaveSearch" disabled="true" label="&save.button.label;" oncommand="saveSearch();"/>
   </hbox>
 
diff --git a/mozilla/xpfe/components/search/resources/findresults.xul b/mozilla/xpfe/components/search/resources/findresults.xul
index c4efd862b19..ce3d8288668 100644
--- a/mozilla/xpfe/components/search/resources/findresults.xul
+++ b/mozilla/xpfe/components/search/resources/findresults.xul
@@ -27,7 +27,7 @@
         <treeitem uri="...">
           <treerow>
             <treecell>
-              <html:hr width="75%" align="center" size="1" />
+              <html:hr width="75%" size="1" />
             </treecell>
           </treerow>
         </treeitem>   
@@ -40,16 +40,16 @@
           <treerow>
             <treecell>
               <treeindentation />
-              <button label="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
+              <button label="rdf:http://home.netscape.com/NC-rdf#Name"/>
             </treecell>
             <treecell>
-              <button label="rdf:http://home.netscape.com/NC-rdf#URL" align="left" style="list-style-image: none;" />
+              <button label="rdf:http://home.netscape.com/NC-rdf#URL" style="list-style-image: none;" />
             </treecell>
             <treecell>
-              <button label="rdf:http://home.netscape.com/NC-rdf#ShortcutURL" align="left" style="list-style-image: none;" />
+              <button label="rdf:http://home.netscape.com/NC-rdf#ShortcutURL" style="list-style-image: none;" />
             </treecell>
             <treecell>
-              <button label="rdf:http://home.netscape.com/NC-rdf#Description" align="left" style="list-style-image: none;" />
+              <button label="rdf:http://home.netscape.com/NC-rdf#Description" style="list-style-image: none;" />
             </treecell>
           </treerow>
         </treeitem>
@@ -79,6 +79,6 @@ the scrollbar is visible. Yes, I know this is not necessary for win32 or gtk, bu
 use this area for information (maybe full URL of selected item or the like) in the future.
 -->
   <hbox id="status-bar" style="min-height:15px; max-height:15px;">
-    <button class="status-bar" align="left" label=""/>
+    <button class="status-bar" label=""/>
   </hbox>
 </window>
diff --git a/mozilla/xpfe/components/search/resources/internetresults.xul b/mozilla/xpfe/components/search/resources/internetresults.xul
index 9b1c2c68966..490e712ae81 100644
--- a/mozilla/xpfe/components/search/resources/internetresults.xul
+++ b/mozilla/xpfe/components/search/resources/internetresults.xul
@@ -26,7 +26,7 @@
     <text value="&results.header.label;"/>
   </hbox>
 
-  <hbox id="engineTabs" autostretch="never"
+  <hbox id="engineTabs" align="center"
         ref="NC:SearchResultsSitesRoot" datasources="rdf:internetsearch" 
         style="overflow: none; min-width: 1px;">
     <template>
@@ -156,7 +156,7 @@
 
   </tree>
 
-  <splitter id="results-splitter" persist="state" collapse="after" orient="vertical" autostretch="never">
+  <splitter id="results-splitter" persist="state" collapse="after" orient="vertical">
     <grippy/>
   </splitter>
   <hbox class="double-box-top" flex="1">
diff --git a/mozilla/xpfe/components/search/resources/search-editor.xul b/mozilla/xpfe/components/search/resources/search-editor.xul
index 472728da689..e82a5040af4 100644
--- a/mozilla/xpfe/components/search/resources/search-editor.xul
+++ b/mozilla/xpfe/components/search/resources/search-editor.xul
@@ -86,7 +86,7 @@
     <separator class="groove" orient="vertical" style="width: 0px;"/>
         
     <vbox flex="1">
-      <hbox autostretch="never">
+      <hbox align="center">
         <text class="label" value="&category.label;"/>
         <menulist id="categoryList" ref="NC:SearchCategoryRoot" datasources="rdf:null" flex="1">
           <template>
diff --git a/mozilla/xpfe/components/search/resources/search-panel.xul b/mozilla/xpfe/components/search/resources/search-panel.xul
index 9b1f28b173d..c4cbf0ebc98 100644
--- a/mozilla/xpfe/components/search/resources/search-panel.xul
+++ b/mozilla/xpfe/components/search/resources/search-panel.xul
@@ -50,16 +50,16 @@
  
   <vbox flex="1">
     <vbox class="box-padded outset-top-bottom">
-      <hbox autostretch="never">
+      <hbox align="center">
         <textbox id="sidebar-search-text" flex="1"
                    onkeypress="if (event.keyCode == 13) doSearch();"
                    oninput="doEnabling();" />
         <button id="searchButton" label="&search.button.label;"
                 disabled="true" oncommand="doSearch();"/>
       </hbox>
-      <vbox autostretch="never">
+      <vbox align="start">
         <vbox id="basicBox">
-          <hbox autostretch="never">
+          <hbox align="center">
             <text class="label" value="&using.label;" />
             <menulist id="basicEngineMenu"
                       ref="NC:SearchEngineRoot"
@@ -77,8 +77,8 @@
             </menulist>
           </hbox>
         </vbox>
-        <vbox id="categoryBox" autostretch="never">
-          <hbox autostretch="never">
+        <vbox id="categoryBox" align="start">
+          <hbox align="center">
             <text class="label" value="&within.label;" />
             <menulist id="categoryList" ref="NC:SearchCategoryRoot"
                       datasources="rdf:null" oncommand="switchTab(1);" >
@@ -183,7 +183,7 @@
               <treechildren>
                 <treeitem uri="...">
                   <treerow>
-                    <treecell autostretch="never" flex="1">
+                    <treecell align="center" flex="1">
                       <checkbox oncommand="saveEngines();" allowevents="true"
                                 loading="rdf:http://home.netscape.com/NC-rdf#loading"
                                 src="rdf:http://home.netscape.com/NC-rdf#Icon"
diff --git a/mozilla/xpfe/components/sidebar/resources/customize.xul b/mozilla/xpfe/components/sidebar/resources/customize.xul
index 3490813ebb9..582c4cccff2 100644
--- a/mozilla/xpfe/components/sidebar/resources/customize.xul
+++ b/mozilla/xpfe/components/sidebar/resources/customize.xul
@@ -162,7 +162,7 @@
     <separator orient="vertical" class="thin"/>
 
     <!-- The 'reorder' buttons -->
-    <vbox id="reorder" autostretch="never">
+    <vbox id="reorder">
       <spring flex="1"/>
       <button oncommand="MoveUp();" id="up" class="dialog" 
         label="&sidebar.customize.up.label;"/>
diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarBindings.xml b/mozilla/xpfe/components/sidebar/resources/sidebarBindings.xml
index 00a6b0860df..42660c5f9b2 100644
--- a/mozilla/xpfe/components/sidebar/resources/sidebarBindings.xml
+++ b/mozilla/xpfe/components/sidebar/resources/sidebarBindings.xml
@@ -5,34 +5,26 @@
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-<!--
-  <binding id="texttab">
-    <content>
-      <xul:box allowevents="true" class="texttab-internal-box" flex="1">
-        <xul:text inherits="value=label,accesskey,crop"/>
-      </xul:box>
-    </content>
-  </binding>
-  -->
-  
   <binding id="texttab">
     <content>
       <xul:image class="box-texttab-left"/>
-      <xul:box class="box-texttab-text-container" orient="vertical" inherits="value"
-                autostretch="always" flex="1">
+      <xul:vbox class="box-texttab-text-container" inherits="value" flex="1">
         <xul:spring flex="1"/>
         <xul:text class="box-texttab-text" inherits="value=label" crop="right"/>
         <xul:spring flex="1"/>
-      </xul:box>
+      </xul:vbox>
       <xul:image class="box-texttab-right"/>
       <xul:spring class="box-texttab-right-space"/>
     </content>
   </binding>
 
   <binding id="sidebar-header-box" extends="xul:box">
-    <content autostretch="never" valign="middle">
+    <content align="center">
       <xul:text class="sidebar-header-text" inherits="value=label,crop" crop="right" flex="1"/>
-      <xul:box><children/></xul:box>
+      <xul:box>
+        <children/>
+      </xul:box>
     </content>
-  </binding>  
+  </binding>
+  
 </bindings>
diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
index 613636664ad..dbbf1594926 100644
--- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
+++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
@@ -100,7 +100,7 @@
       <vbox id="sidebar-panels"
         datasources="rdf:null"
         ref="urn:sidebar:current-panel-list" 
-        persist='last-selected-panel height collapsed' flex="1*"
+        persist="last-selected-panel height collapsed" flex="1*"
         onclick="return contentAreaClick(event);"
         ondraggesture="nsDragAndDrop.startDrag(event, contentAreaDNDObserver);">
         <template id="sidebar-template">
@@ -121,12 +121,12 @@
             </bindings>
             <action>
               <hbox uri="?panel" class="box-texttab texttab-sidebar"
-                oncommand="SidebarSelectPanel(this,false,false)" align="left"
+                oncommand="SidebarSelectPanel(this,false,false)"
                 hidden="true" label="?title" exclude="?exclude" context="sidebarPopup" />
-              <vbox uri="?panel" flex='1*' hidden="true"
+              <vbox uri="?panel" flex="1*" hidden="true"
                 loadstate="never loaded">
-                <vbox flex='1' class="iframe-panel loadarea">
-                  <hbox flex="1" autostretch="never">
+                <vbox flex="1" class="iframe-panel loadarea">
+                  <hbox flex="1" align="center">
                     <image class="image-panel-loading"/>
                     <text class="text-panel-loading"
                       value="&sidebar.loading.label;"/>
@@ -135,9 +135,9 @@
                   </hbox>
                   <spring flex="100%"/>
                 </vbox>
-                <iframe class="iframe-panel" flex='1*' src="about:blank"
+                <iframe class="iframe-panel" flex="1*" src="about:blank"
                   hidden="true" collapsed="true" content="?content"/>
-                <iframe class="iframe-panel" flex='1*' src="about:blank"
+                <iframe class="iframe-panel" flex="1*" src="about:blank"
                   hidden="true" collapsed="true" content="?content" type="content" context="contentAreaContextMenu"/>
               </vbox>
             </action>
@@ -156,7 +156,7 @@
 
   <!-- Splitter on the right of sidebar -->
   <splitter id="sidebar-splitter" collapse="before" persist="state hidden"
-    class="chromeclass-extrachrome sidebar-splitter" autostretch="never"
+    class="chromeclass-extrachrome sidebar-splitter" align="center"
     orient="vertical"
     onmouseup="SidebarFinishClick();">
     <grippy class="sidebar-splitter-grippy"
diff --git a/mozilla/xpfe/components/ucth/resources/helperAppDldProgress.xul b/mozilla/xpfe/components/ucth/resources/helperAppDldProgress.xul
index 592348cc09d..138320a8fbd 100644
--- a/mozilla/xpfe/components/ucth/resources/helperAppDldProgress.xul
+++ b/mozilla/xpfe/components/ucth/resources/helperAppDldProgress.xul
@@ -69,53 +69,53 @@ Contributor(s):
       
       <rows>
         <row>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&location;"/>
           </hbox>
           <textbox id="dialog.location" class="scrollfield" readonly="" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&saving;"/>
           </hbox>
           <textbox id="dialog.fileName" class="scrollfield" readonly="" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&status;"/>
           </hbox>
           <text class="label" id="dialog.status" value="&#160;" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&timeLeft;"/>
           </hbox>
           <text class="label" id="dialog.timeLeft" value="&#160;"/>
         </row>
         <separator class="thin"/>
         <row>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&timeElapsed;"/>
           </hbox>
           <text class="label" id="dialog.timeElapsed" value="&#160;"/>
         </row>
         <separator class="thin"/>
         <row>             
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&progress;"/>
           </hbox>
           <progressmeter id="dialog.progress" mode="normal" value="0"/>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" id="dialog.progressText" value="&#160;"/>
           </hbox>
         </row>
         <separator/>
       </rows>
     </grid>
-    <hbox autostretch="never">
+    <hbox align="center">
       <checkbox id="keepProgressDialogUp" label="&keepProgressDialogUpMsg.label;"/>
     </hbox>
 
diff --git a/mozilla/xpfe/components/ucth/resources/helperAppLauncher.xul b/mozilla/xpfe/components/ucth/resources/helperAppLauncher.xul
index b65c164c428..b0e3ee52aaa 100644
--- a/mozilla/xpfe/components/ucth/resources/helperAppLauncher.xul
+++ b/mozilla/xpfe/components/ucth/resources/helperAppLauncher.xul
@@ -63,7 +63,7 @@
             <separator orient="horizontal" class="thin"/>
             <radiogroup id="mode" orient="vertical" oncommand="window.dialog.toggleChoice()">
                 <vbox>
-                    <hbox autostretch="never">
+                    <hbox align="center">
                         <radio id="runApp"
                                group="mode"
                                label="&runApp.label;"
@@ -79,7 +79,7 @@
                     </hbox>
                 </vbox>
                 <vbox>
-                    <hbox autostretch="never">
+                    <hbox align="center">
                         <radio id="saveToDisk"
                                group="mode"
                                label="&saveToDisk.label;"
@@ -88,7 +88,7 @@
                  </vbox>
             </radiogroup>
             <separator orient="horizontal" class="thin"/>
-            <hbox autostretch="never">
+            <hbox align="center">
                 <checkbox id="alwaysAskMe" label="&alwaysAskMe.label;" accesskey="&alwaysAskMe.accesskey;"/>
             </hbox>
         </vbox>
diff --git a/mozilla/xpfe/components/ucth/resources/unknownContent.xul b/mozilla/xpfe/components/ucth/resources/unknownContent.xul
index ab0d266922d..f7a3ad5ad33 100644
--- a/mozilla/xpfe/components/ucth/resources/unknownContent.xul
+++ b/mozilla/xpfe/components/ucth/resources/unknownContent.xul
@@ -23,7 +23,7 @@
 
   <hbox>
     <separator orient="vertical" class="thin"/>
-    <vbox autostretch="never" valign="top">
+    <vbox align="start">
       <image class="message-icon" id="fileIcon"/>
     </vbox>
     <separator orient="vertical" class="thin"/>
@@ -36,7 +36,7 @@
     
   <separator class="groove"/>
     
-  <hbox autostretch="never">
+  <hbox align="center">
     <button class="dialog" id="dialog.more" label="&dialogMore.label;" oncommand="more()"/>
     <spring flex="1"/>
     <hbox id="okCancelButtons"/>
diff --git a/mozilla/xpfe/components/xfer/resources/downloadProgress.xul b/mozilla/xpfe/components/xfer/resources/downloadProgress.xul
index 05ad688896f..7402aea2454 100644
--- a/mozilla/xpfe/components/xfer/resources/downloadProgress.xul
+++ b/mozilla/xpfe/components/xfer/resources/downloadProgress.xul
@@ -68,35 +68,35 @@ Contributor(s):
       
       <rows>
         <row>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&location;"/>
           </hbox>
           <textbox id="dialog.location" class="scrollfield" readonly="" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&saving;"/>
           </hbox>
           <textbox id="dialog.fileName" class="scrollfield" readonly="" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&status;"/>
           </hbox>
           <text class="label" id="dialog.status" value="&#160;" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&timeLeft;"/>
           </hbox>
           <text class="label" id="dialog.timeLeft" value="&#160;"/>
         </row>
         <separator class="thin"/>
         <row>
-          <hbox autostretch="never" halign="right">
+          <hbox align="center" pack="end">
             <text class="label" value="&timeElapsed;"/>
           </hbox>
           <text class="label" id="dialog.timeElapsed" value="&#160;"/>
diff --git a/mozilla/xpfe/global/resources/content/about.xul b/mozilla/xpfe/global/resources/content/about.xul
index 3877159ffcb..83e105ceb21 100644
--- a/mozilla/xpfe/global/resources/content/about.xul
+++ b/mozilla/xpfe/global/resources/content/about.xul
@@ -54,7 +54,7 @@ Contributor(s): Michael Lowe <michael.lowe@bigfoot.com> -->
 
 <hbox style="margin-top: 1em;">
   <spring flex="100%"/>
-  <button id="ok" label="&okButton.label;" default="true" align="right" onclick="doOKButton()"/>
+  <button id="ok" label="&okButton.label;" default="true" onclick="doOKButton()"/>
 </hbox>
 
 </vbox>
diff --git a/mozilla/xpfe/global/resources/content/bindings/button.xml b/mozilla/xpfe/global/resources/content/bindings/button.xml
index 23c1280bccc..fe4693d48bb 100644
--- a/mozilla/xpfe/global/resources/content/bindings/button.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/button.xml
@@ -12,48 +12,48 @@
 
   <binding id="buttonleft" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-internal-box" autostretch="never" flex="1">
+      <xul:hbox class="button-internal-box" align="center" flex="1">
         <xul:image class="button-icon" inherits="src"/>
-        <xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
+        <xul:hbox class="button-text-container" align="center" flex="1">
           <xul:text class="button-text" inherits="value=label,accesskey,crop,dragover-top"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="buttontop" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-internal-box" orient="vertical" autostretch="never" flex="1">
+      <xul:vbox class="button-internal-box" align="center" flex="1">
         <xul:image class="button-icon" inherits="src"/>
-        <xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
+        <xul:hbox class="button-text-container" align="center" pack="center" flex="1">
           <xul:text class="button-text" inherits="value=label,accesskey,crop,dragover-top"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:vbox>
       <children includes="menupopup"/>
     </content>
   </binding>
   
   <binding id="buttonright" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-internal-box" inherits="orient" autostretch="never" flex="1">
-        <xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
+      <xul:hbox class="button-internal-box" align="center" flex="1">
+        <xul:hbox class="button-text-container" align="center" pack="center" flex="1">
           <xul:text class="button-text" inherits="value=label,accesskey,crop,dragover-top"/>
-        </xul:box>
+        </xul:hbox>
         <xul:image class="button-icon" inherits="src"/>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="buttonbottom" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:box class="button-internal-box" orient="vertical" autostretch="never" flex="1">
-        <xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
+      <xul:vbox class="button-internal-box" align="center" flex="1">
+        <xul:hbox class="button-text-container" align="center" pack="center" flex="1">
           <xul:text class="button-text" inherits="value=label,accesskey,crop,dragover-top"/>
-        </xul:box>
+        </xul:hbox>
         <xul:image class="button-icon" inherits="src"/>
-      </xul:box>
+      </xul:vbox>
       <children includes="menupopup"/>
     </content>
   </binding>
diff --git a/mozilla/xpfe/global/resources/content/bindings/checkbox.xml b/mozilla/xpfe/global/resources/content/bindings/checkbox.xml
index 38d4504614e..cedae6e22ac 100644
--- a/mozilla/xpfe/global/resources/content/bindings/checkbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/checkbox.xml
@@ -12,15 +12,15 @@
 
   <binding id="checkbox-baseline" extends="chrome://global/content/bindings/general.xml#basetext">
     <content>
-      <xul:box flex="1" class="internal-box" autostretch="never" valign="top">
-        <xul:box class="checkmark-box" autostretch="never">
+      <xul:hbox flex="1" class="internal-box" align="center">
+        <xul:hbox class="checkmark-box" align="center">
           <xul:image class="checkbox-check"/>
-        </xul:box>
+        </xul:hbox>
         <xul:image class="checkbox-icon" inherits="src"/>
         <xul:html class="checkbox-label" inherits="value=label,accesskey,crop" flex="1">
           <children/>
         </xul:html>
-      </xul:box>
+      </xul:hbox>
     </content>
     
     <implementation>
diff --git a/mozilla/xpfe/global/resources/content/bindings/colorpicker.xml b/mozilla/xpfe/global/resources/content/bindings/colorpicker.xml
index 4e1b037c7c5..6eb0a7c777f 100644
--- a/mozilla/xpfe/global/resources/content/bindings/colorpicker.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/colorpicker.xml
@@ -10,9 +10,9 @@
     </resources>
     
     <content>
-      <xul:box flex="1" orient="vertical">
+      <xul:vbox flex="1">
 
-        <xul:box orient="horizontal">
+        <xul:hbox>
           <xul:spring class="colorpickertile cp-light" style="background-color: #FFFFFF" color="#FFFFFF"/>
           <xul:spring class="colorpickertile cp-light" style="background-color: #FFCCCC" color="#FFCCCC"/>
           <xul:spring class="colorpickertile cp-light" style="background-color: #FFCC99" color="#FFCC99"/>
@@ -23,8 +23,8 @@
           <xul:spring class="colorpickertile cp-light" style="background-color: #CCFFFF" color="#CCFFFF"/>
           <xul:spring class="colorpickertile cp-light" style="background-color: #CCCCFF" color="#CCCCFF"/>
           <xul:spring class="colorpickertile cp-light" style="background-color: #FFCCFF" color="#FFCCFF"/>
-        </xul:box>
-        <xul:box orient="horizontal">
+        </xul:hbox>
+        <xul:hbox>
           <xul:spring class="colorpickertile" style="background-color: #CCCCCC" color="#CCCCCC"/>
           <xul:spring class="colorpickertile" style="background-color: #FF6666" color="#FF6666"/>
           <xul:spring class="colorpickertile" style="background-color: #FFCC33" color="#FFCC33"/>
@@ -35,8 +35,8 @@
           <xul:spring class="colorpickertile cp-light" style="background-color: #66FFFF" color="#66FFFF"/>
           <xul:spring class="colorpickertile" style="background-color: #9999FF" color="#9999FF"/>
           <xul:spring class="colorpickertile" style="background-color: #FF99FF" color="#FF99FF"/>
-        </xul:box>
-        <xul:box orient="horizontal">
+        </xul:hbox>
+        <xul:hbox>
           <xul:spring class="colorpickertile" style="background-color: #C0C0C0" color="#C0C0C0"/>
           <xul:spring class="colorpickertile" style="background-color: #FF0000" color="#FF0000"/>
           <xul:spring class="colorpickertile" style="background-color: #FF9900" color="#FF9900"/>
@@ -47,8 +47,8 @@
           <xul:spring class="colorpickertile" style="background-color: #33CCFF" color="#33CCFF"/>
           <xul:spring class="colorpickertile" style="background-color: #6666CC" color="#6666CC"/>
           <xul:spring class="colorpickertile" style="background-color: #CC66CC" color="#CC66CC"/>
-        </xul:box>
-        <xul:box orient="horizontal">
+        </xul:hbox>
+        <xul:hbox>
           <xul:spring class="colorpickertile" style="background-color: #999999" color="#999999"/>
           <xul:spring class="colorpickertile" style="background-color: #CC0000" color="#CC0000"/>
           <xul:spring class="colorpickertile" style="background-color: #FF6600" color="#FF6600"/>
@@ -59,8 +59,8 @@
           <xul:spring class="colorpickertile" style="background-color: #3366FF" color="#3366FF"/>
           <xul:spring class="colorpickertile" style="background-color: #6633FF" color="#6633FF"/>
           <xul:spring class="colorpickertile" style="background-color: #CC33CC" color="#CC33CC"/>
-        </xul:box>
-        <xul:box orient="horizontal">
+        </xul:hbox>
+        <xul:hbox>
           <xul:spring class="colorpickertile" style="background-color: #666666" color="#666666"/>
           <xul:spring class="colorpickertile" style="background-color: #990000" color="#990000"/>
           <xul:spring class="colorpickertile" style="background-color: #CC6600" color="#CC6600"/>
@@ -71,8 +71,8 @@
           <xul:spring class="colorpickertile" style="background-color: #3333FF" color="#3333FF"/>
           <xul:spring class="colorpickertile" style="background-color: #6600CC" color="#6600CC"/>
           <xul:spring class="colorpickertile" style="background-color: #993399" color="#993399"/>
-        </xul:box>
-        <xul:box orient="horizontal">
+        </xul:hbox>
+        <xul:hbox>
           <xul:spring class="colorpickertile" style="background-color: #333333" color="#333333"/>
           <xul:spring class="colorpickertile" style="background-color: #660000" color="#660000"/>
           <xul:spring class="colorpickertile" style="background-color: #993300" color="#993300"/>
@@ -83,8 +83,8 @@
           <xul:spring class="colorpickertile" style="background-color: #000099" color="#000099"/>
           <xul:spring class="colorpickertile" style="background-color: #333399" color="#333399"/>
           <xul:spring class="colorpickertile" style="background-color: #663366" color="#663366"/>
-        </xul:box>
-        <xul:box orient="horizontal">
+        </xul:hbox>
+        <xul:hbox>
           <xul:spring class="colorpickertile" style="background-color: #000000" color="#000000"/>
           <xul:spring class="colorpickertile" style="background-color: #330000" color="#330000"/>
           <xul:spring class="colorpickertile" style="background-color: #663300" color="#663300"/>
@@ -95,8 +95,8 @@
           <xul:spring class="colorpickertile" style="background-color: #000066" color="#000066"/>
           <xul:spring class="colorpickertile" style="background-color: #330099" color="#330099"/>
           <xul:spring class="colorpickertile" style="background-color: #330033" color="#330033"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:vbox>
       <!-- Something to take tab focus
       <button style="border : 0px; width: 0px; height: 0px;"/>
       -->
@@ -405,9 +405,9 @@
     </resources>
     
     <content>
-      <xul:box class="colorpicker-button-internal-box" allowevents="true" flex="1">
+      <xul:hbox class="colorpicker-button-internal-box" allowevents="true" flex="1">
 
-        <xul:box class="colorpicker-button-colorbox" role="colorbox" flex="1"/>
+        <xul:hbox class="colorpicker-button-colorbox" role="colorbox" flex="1"/>
 
         <xul:popupset>
           <xul:popup class="colorpicker-button-menupopup" role="colorpopup"
@@ -420,7 +420,7 @@
   
            </xul:popup>
          </xul:popupset>
-      </xul:box>
+      </xul:hbox>
     </content>
     
     <implementation>
diff --git a/mozilla/xpfe/global/resources/content/bindings/general.xml b/mozilla/xpfe/global/resources/content/bindings/general.xml
index 4d1d9bc42b2..051f32940da 100644
--- a/mozilla/xpfe/global/resources/content/bindings/general.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/general.xml
@@ -173,11 +173,11 @@
   <!-- inline editable buttons -->
   <binding id="buttonleft-ile" extends="chrome://global/content/bindings/general.xml#inline-edit-base">
     <content>
-      <xul:hbox class="button-internal-box" autostretch="never" flex="1">
+      <xul:hbox class="button-internal-box" align="center" flex="1">
         <xul:image class="button-icon" inherits="src"/>
-        <xul:vbox class="button-text-container" autostretch="never" flex="1" ileattr="text-container">
+        <xul:hbox class="button-text-container" pack="center" flex="1" ileattr="text-container">
           <xul:text class="button-text" inherits="value=label,accesskey,crop,dragover-top" ileattr="text" rootcontent="button"/>
-        </xul:vbox>
+        </xul:hbox>
       </xul:hbox>
       <children includes="menupopup"/>
     </content>
@@ -210,9 +210,11 @@
   </binding>
 
   <binding id="statusbar-panel" extends="xul:button">
-    <content autostretch="never" valign="middle">
-      <xul:image class="statusbar-panel-icon" inherits="src"/>
-      <xul:text class="statusbar-panel-text" inherits="value=label,crop" crop="right" flex="1"/>
+    <content>
+      <xul:hbox align="center" flex="1">
+        <xul:image class="statusbar-panel-icon" inherits="src"/>
+        <xul:text class="statusbar-panel-text" inherits="value=label,crop" crop="right" flex="1"/>
+      </xul:hbox>
     </content>
 
     <implementation>
diff --git a/mozilla/xpfe/global/resources/content/bindings/groupbox.xml b/mozilla/xpfe/global/resources/content/bindings/groupbox.xml
index b3f428c5ccd..2fce31848a2 100644
--- a/mozilla/xpfe/global/resources/content/bindings/groupbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/groupbox.xml
@@ -12,23 +12,23 @@
 
   <binding id="groupbox" extends="chrome://global/content/bindings/titledbox.xml#groupbox-base">
     <content>
-      <xul:box class="groupbox-title" autostretch="never" orient="vertical">
+      <xul:hbox class="groupbox-title" align="center" pack="start">
         <children includes="label"/>
-      </xul:box>
-      <xul:box flex="1" class="groupbox-body" inherits="orient,autostretch,align,valign">
+      </xul:hbox>
+      <xul:box flex="1" class="groupbox-body" inherits="orient,align,pack">
         <children/>
       </xul:box>
-    </content>    
+    </content>
   </binding>
 
   <!-- titledbox included for backwards compatibility purposes; to be removed at a later date -->
 
   <binding id="titledbox" extends="chrome://global/content/bindings/titledbox.xml#groupbox-base">
     <content>
-      <xul:box class="groupbox-title" autostretch="never" orient="vertical">
+      <xul:hbox class="groupbox-title" align="center">
         <children includes="label"/>
-      </xul:box>
-      <xul:box flex="1" class="groupbox-body" inherits="orient,autostretch,align,valign">
+      </xul:hbox>
+      <xul:box flex="1" class="groupbox-body" inherits="orient,align,pack">
         <children/>
       </xul:box>
     </content>    
diff --git a/mozilla/xpfe/global/resources/content/bindings/menu.xml b/mozilla/xpfe/global/resources/content/bindings/menu.xml
index c3a749297df..14d0767f394 100644
--- a/mozilla/xpfe/global/resources/content/bindings/menu.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/menu.xml
@@ -12,11 +12,11 @@
 
   <binding id="menu" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
     <content>
-      <xul:text class="menu-text" flex="1" align="left" inherits="value=label,accesskey,crop" crop="right"/>
+      <xul:text class="menu-text" flex="1" inherits="value=label,accesskey,crop" crop="right"/>
       <xul:text class="menu-accel" inherits="value=acceltext"/>
-      <xul:box align="center" class="menu-right" inherits="menuactive,disabled">
+      <xul:hbox align="center" class="menu-right" inherits="menuactive,disabled">
         <xul:image/>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
     
@@ -28,7 +28,7 @@
 
   <binding id="menuitem" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
     <content>
-      <xul:text class="menu-text" flex="1" align="left" inherits="value=label,accesskey,crop" crop="right"/>
+      <xul:text class="menu-text" flex="1" inherits="value=label,accesskey,crop" crop="right"/>
       <xul:text class="menu-accel" inherits="value=acceltext"/>
     </content>
     
@@ -55,11 +55,11 @@
 
   <binding id="menuitem-iconic" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
     <content>
-      <xul:box class="menu-iconic-left" orient="vertical" align="center"
+      <xul:hbox class="menu-iconic-left" align="center" pack="center"
                inherits="selected,menuactive,disabled,checked">
         <xul:image inherits="src"/>
-      </xul:box>
-      <xul:text class="menu-iconic-text" flex="1" align="left" inherits="value=label,accesskey,crop" crop="right"/>
+      </xul:hbox>
+      <xul:text class="menu-iconic-text" flex="1" inherits="value=label,accesskey,crop" crop="right"/>
       <xul:text class="menu-iconic-accel" inherits="value=acceltext"/>
     </content>
     
@@ -71,14 +71,14 @@
 
   <binding id="menu-iconic" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
     <content>
-      <xul:box class="menu-iconic-left" orient="vertical" align="center">
+      <xul:hbox class="menu-iconic-left" align="center" pack="center">
         <xul:image inherits="src"/>
-      </xul:box>
-      <xul:text class="menu-iconic-text" flex="1" align="left" inherits="value=label,accesskey,crop" crop="right"/>
+      </xul:hbox>
+      <xul:text class="menu-iconic-text" flex="1" inherits="value=label,accesskey,crop" crop="right"/>
       <xul:text class="menu-iconic-accel" inherits="value=acceltext"/>
-      <xul:box orient="vertical" align="center" class="menu-right" inherits="menuactive,disabled">
+      <xul:hbox class="menu-right" inherits="menuactive,disabled" align="center" pack="center">
         <xul:image/>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup|template"/>
     </content>
     
diff --git a/mozilla/xpfe/global/resources/content/bindings/menubutton.xml b/mozilla/xpfe/global/resources/content/bindings/menubutton.xml
index cecee05ac3c..e6baa6525c1 100644
--- a/mozilla/xpfe/global/resources/content/bindings/menubutton.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/menubutton.xml
@@ -12,101 +12,101 @@
 
   <binding id="menubutton-single-right" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-internal-box" autostretch="never">
+      <xul:hbox class="menubutton-internal-box" align="center">
         <xul:text class="menubutton-single-text" inherits="value=label,crop,accesskey"/>
         <xul:image class="menubutton-single-icon"/>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup|template"/>
     </content>
   </binding>
 
   <binding id="menubutton-single-left" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-internal-box" autostretch="never">
+      <xul:hbox class="menubutton-internal-box" align="center">
         <xul:image class="menubutton-single-icon"/>
         <xul:text class="menubutton-single-text" inherits="value=label,crop,accesskey"/>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup|template"/>
     </content>
   </binding>
   
   <binding id="menubutton-single-top" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="button-internal-box" autostretch="never" orient="vertical" flex="1">
+      <xul:vbox class="button-internal-box" align="center" flex="1">
         <xul:image class="menubutton-single-icon"/>
         <xul:text class="menubutton-single-text" inherits="value=label,crop,accesskey"/>
-      </xul:box>
+      </xul:vbox>
       <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="menubutton-single-bottom" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="button-internal-box" autostretch="never" orient="vertical" flex="1">
+      <xul:vbox class="button-internal-box" align="center" flex="1">
         <xul:text class="menubutton-single-text" inherits="value=label,crop,accesskey"/>
         <xul:image class="menubutton-single-icon"/>
-      </xul:box>
+      </xul:vbox>
       <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="menubutton-icon" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-icon-internal-box" autostretch="never">
+      <xul:hbox class="menubutton-icon-internal-box" align="center">
         <xul:image class="menubutton-icon-icon" inherits="src"/>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
   
   <binding id="menubutton-dual-top" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-internal-box">
+      <xul:vbox class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button top" allowevents="true" 
                     inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,label,crop,accesskey"/>
-        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
+        <xul:hbox class="menubutton-dual-dropmarker-box" align="center" pack="center">
           <xul:image class="menubutton-dropmarker"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:vbox>
       <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="menubutton-dual-left" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-internal-box">
+      <xul:hbox class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button left" allowevents="true" 
                     inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,label,crop,accesskey"/>
-        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
+        <xul:hbox class="menubutton-dual-dropmarker-box" align="center" pack="center">
           <xul:image class="menubutton-dropmarker"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="menubutton-dual-right" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-internal-box">
+      <xul:hbox class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button right" allowevents="true" 
                     inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,label,crop,accesskey"/>
-        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
+        <xul:hbox class="menubutton-dual-dropmarker-box" align="center" pack="center">
           <xul:image class="menubutton-dropmarker"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
 
   <binding id="menubutton-dual-bottom" extends="chrome://global/content/bindings/menubutton.xml#menubutton-base">
     <content>
-      <xul:box class="menubutton-internal-box">
+      <xul:vbox class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button bottom" allowevents="true" 
                     inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,label,crop,accesskey"/>
-        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
+        <xul:hbox class="menubutton-dual-dropmarker-box" align="center" pack="center">
           <xul:image class="menubutton-dropmarker"/>
-        </xul:box>
-      </xul:box>
+        </xul:hbox>
+      </xul:vbox>
       <children includes="menupopup"/>
     </content>
   </binding>
@@ -118,9 +118,9 @@
                   onmouseover="this.parentNode.buttonover = true;"
                   onmouseout="this.parentNode.buttonover = false;"
                   onmousedown="this.parentNode.buttondown = true; this.parentNode.captureMouseUp();"/>
-      <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle" inherits="disabled">
+      <xul:hbox class="menubutton-dual-dropmarker-box" align="center" inherits="disabled">
         <xul:image class="menubutton-dropmarker" inherits="disabled"/>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
     
@@ -202,9 +202,9 @@
                   onmouseout="this.parentNode.buttonover = false;"
                   onmousedown="this.parentNode.buttondown = true;"
                   onmouseup="this.parentNode.buttondown = false;"/>
-      <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle" inherits="disabled">
+      <xul:hbox class="menubutton-dual-dropmarker-box" align="center" inherits="disabled">
         <xul:image class="menubutton-dropmarker" inherits="disabled"/>
-      </xul:box>
+      </xul:hbox>
       <children includes="menupopup"/>
     </content>
   </binding>
diff --git a/mozilla/xpfe/global/resources/content/bindings/menulist.xml b/mozilla/xpfe/global/resources/content/bindings/menulist.xml
index 2a43c15d621..8e6851c347c 100644
--- a/mozilla/xpfe/global/resources/content/bindings/menulist.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/menulist.xml
@@ -163,12 +163,12 @@
 
   <binding id="menulist-editable" extends="chrome://global/content/bindings/menulist.xml#menulist">
     <content>
-      <xul:box flex="1" class="menulist-editable-box">
+      <xul:hbox flex="1" class="menulist-editable-box" align="center">
         <xul:image class="menu-icon" inherits="src"/>
         <html:input type="text" flex="1" class="menulist-editable-text" allowevents="true"
                     inherits="value=label,disabled"/>
         <xul:image class="menu-dropmarker"/>
-      </xul:box>
+      </xul:hbox>
     
       <children includes="menupopup"/>
     </content>
diff --git a/mozilla/xpfe/global/resources/content/bindings/outliner.xml b/mozilla/xpfe/global/resources/content/bindings/outliner.xml
index 38036deb143..985cffa2187 100644
--- a/mozilla/xpfe/global/resources/content/bindings/outliner.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/outliner.xml
@@ -13,10 +13,10 @@
 
   <binding id="outliner" extends="chrome://global/content/bindings/outliner.xml#outliner-base">
     <content orient="vertical">
-      <xul:box class="outliner-columns">
+      <xul:hbox class="outliner-columns">
         <children includes="outlinercol|splitter"/>
         <xul:outlinercol class="outliner-columnpicker" fixed="true"/>
-      </xul:box>
+      </xul:hbox>
       <xul:outlinerrows class="outliner-rows" flex="1">
         <children/>
       </xul:outlinerrows>
@@ -412,10 +412,10 @@
     </resources>
 
     <content>
-      <xul:box flex="1" class="outliner-bodybox">
+      <xul:hbox flex="1" class="outliner-bodybox">
         <children/>
-      </xul:box>
-      <xul:scrollbar align="vertical" class="outliner-scrollbar"/>
+      </xul:hbox>
+      <xul:scrollbar orient="vertical" class="outliner-scrollbar"/>
     </content>
   </binding>
 
@@ -517,11 +517,11 @@
 
   <binding id="outlinercol" extends="chrome://global/content/bindings/outliner.xml#outliner-base">
     <content>
-      <xul:box class="outlinercol-box" flex="1" autostretch="never">
+      <xul:hbox class="outlinercol-box" flex="1" align="center">
         <xul:image class="outliner-image" inherits="src"/>
         <xul:text class="outlinercol-text" inherits="crop,value=label" flex="1" crop="right"/>
         <xul:image class="outlinercol-sortdirection"/>
-      </xul:box>
+      </xul:hbox>
     </content>
     <handlers>
       <handler event="click" button="0" action="if (event.originalTarget == this) { this.parentNode.outlinerBoxObject.view.cycleHeader(this.id, this); }"/>
@@ -530,9 +530,9 @@
 
   <binding id="outlinercol-image" extends="chrome://global/content/bindings/outliner.xml#outliner-base">
     <content>
-      <xul:box class="outlinercol-image-box" flex="1" autostretch="never">
+      <xul:hbox class="outlinercol-image-box" flex="1" align="center">
         <xul:image class="outlinercol-icon" inherits="src"/>
-      </xul:box>
+      </xul:hbox>
     </content>
     <handlers>
       <handler event="click" button="0" action="this.parentNode.outlinerBoxObject.view.cycleHeader(this.id, this)"/>
@@ -541,7 +541,7 @@
 
   <binding id="columnpicker" extends="chrome://global/content/bindings/outliner.xml#outliner-base">
     <content>
-      <xul:menu class="outliner-colpicker-menu" autostretch="never" allowevents="true">
+      <xul:menu class="outliner-colpicker-menu" align="center" allowevents="true">
         <xul:image class="outliner-colpicker-icon"/>
         <xul:menupopup popupanchor="bottomright" popupalign="topright"
                   oncreate="this.parentNode.parentNode.buildPopup(this);"/>
diff --git a/mozilla/xpfe/global/resources/content/bindings/popup.xml b/mozilla/xpfe/global/resources/content/bindings/popup.xml
index 86db98fe290..f288f3a845e 100644
--- a/mozilla/xpfe/global/resources/content/bindings/popup.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/popup.xml
@@ -99,9 +99,15 @@
 
   <binding id="tooltips" extends="chrome://global/content/bindings/popup.xml#popup">
     <content>
-      <xul:box class="popup-internal-box" orient="vertical" flex="1">
+      <xul:vbox class="popup-internal-box" flex="1">
         <children/>
-      </xul:box>
+      </xul:vbox>
+    </content>
+  </binding>
+  
+  <binding id="titletip" extends="chrome://global/content/bindings/popup.xml#popup">
+    <content>
+      <xul:text inherits="value=label"/>
     </content>
   </binding>
   
@@ -172,7 +178,7 @@
   <!-- Right horizontal resizer -->
   <binding id="r-resizer" extends="xul:box"> <!-- extends="chrome://global/content/bindings/popup.xml#resizerbase"> -->
     <content>
-      <xul:box class="b-resizer-box" flex="1"/>
+      <xul:hbox class="b-resizer-box" flex="1"/>
     </content>
     <!--
     <implementation>
@@ -206,7 +212,7 @@
   <!-- Bottom vertical resizer -->
   <binding id="b-resizer" extends="xul:box"> <!-- extends="chrome://global/content/bindings/popup.xml#resizerbase"> -->
     <content>
-      <xul:box class="b-resizer-box" flex="1"/>
+      <xul:hbox class="b-resizer-box" flex="1"/>
     </content>
     <!--
     <implementation>
@@ -240,9 +246,9 @@
   <!-- Right/Bottom diagonal resizer -->
   <binding id="rb-resizer" extends="xul:box"> <!-- extends="chrome://global/content/bindings/popup.xml#resizerbase"> -->
     <content>
-      <xul:box class="rb-resizer-box" autostretch="never" flex="1">
+      <xul:hbox class="rb-resizer-box" align="center" flex="1">
         <xul:image class="rb-resizer-image"/>
-      </xul:box>
+      </xul:hbox>
     </content>
     <!--
     <implementation>
@@ -280,12 +286,12 @@
   
   <binding id="titlebar" extends="xul:box"> <!-- extends="chrome://global/content/bindings/popup.xml#resizerbase"> -->
     <content>
-      <xul:box class="titlebar-box" flex="1">
-        <xul:box class="titlebar-title-box" flex="1"  tooltip="aTooltip" tooltiptext="Click and drag to float">
+      <xul:hbox class="titlebar-box" flex="1">
+        <xul:hbox class="titlebar-title-box" flex="1" tooltip="aTooltip" tooltiptext="Click and drag to float">
           <xul:text class="titlebar-title" inherits="value=title" flex="1" crop="right"/>
-        </xul:box>
+        </xul:hbox>
         <xul:button class="popupClose" tooltip="aTooltip" tooltiptext="Close"/>
-      </xul:box>
+      </xul:hbox>
     </content>
     <!--
     <implementation>
@@ -504,43 +510,45 @@
   </binding>
 
   <binding id="floater-normal" extends="chrome://global/content/bindings/popup.xml#floater-base">
-    <xbl:content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" >
-      <box class="floater-box" orient="vertical" flex="1">
+    <content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" >
+      <vbox class="floater-box" flex="1">
         <box class="floater-box-top">
           <titlebar flex="1" inherits="title"/>
         </box>
         <box class="floater-box-center" flex="1">
           <box class="floater-children" flex="1"> 
-            <xbl:children/>
+            <children/>
           </box>
         </box>
         <box class="floater-box-bottom">
           <resizer direction="bottom" flex="1"/>
           <resizer direction="bottomright" tooltip="aTooltip" tooltiptext="Click and drag to resize"/>
         </box>
-      </box>
-    </xbl:content>
+      </vbox>
+    </content>
   </binding>
 
   <binding id="floater-dock-left" extends="chrome://global/content/bindings/popup.xml#floater-base">
-    <xbl:content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" >
-      <box class="floater-box" orient="vertical" flex="1">
+    <content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" >
+      <vbox class="floater-box" flex="1">
         <box class="floater-box-top">
           <titlebar flex="1" inherits="title"/>
         </box>
         <box class="floater-box-center" flex="1">
           <box class="floater-children" flex="1"> 
-            <xbl:children/>
+            <children/>
           </box>
           <resizer direction="right" tooltip="aTooltip" tooltiptext="Click and drag to resize"/>
         </box>
-      </box>
-    </xbl:content>
+      </vbox>
+    </content>
   </binding>  
   
   <binding id="close-button" extends="chrome://global/content/bindings/button.xml#button-base">
-    <content autostretch="never">
-      <xul:image class="close-button-x"/>
+    <content>
+      <xul:hbox align="center" flex="1">
+        <xul:image class="close-button-x"/>
+      </xul:hbox>
     </content>
   </binding>
 
diff --git a/mozilla/xpfe/global/resources/content/bindings/progressmeter.xml b/mozilla/xpfe/global/resources/content/bindings/progressmeter.xml
index ca68c252114..c8b548d2252 100644
--- a/mozilla/xpfe/global/resources/content/bindings/progressmeter.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/progressmeter.xml
@@ -4,25 +4,25 @@
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <binding id="progressmeter" extends="xul:box">
+  <binding id="progressmeter">
     <resources>
       <stylesheet src="chrome://global/skin/progressmeter.css"/>
     </resources>
 
     <content>
-      <xul:box class="progressmeter-internal-box" flex="1">
+      <xul:hbox class="progressmeter-internal-box" flex="1">
         <xul:stack class="progressmeter-stack" flex="1">
           <xul:progressbar class="progressmeter-progressbar" inherits="value,statusbar">
-            <xul:box class="progress-bar"/>
-            <xul:box class="progress-remainder"/>
+            <xul:spring class="progress-bar"/>
+            <xul:spring class="progress-remainder"/>
           </xul:progressbar>
-          <xul:box>
+          <xul:hbox>
             <xul:spring flex="1"/>
             <xul:text class="progress-text" inherits="value=label"/>
             <xul:spring flex="1"/>
-          </xul:box>
+          </xul:hbox>
         </xul:stack>
-      </xul:box>
+      </xul:hbox>
     </content>
     
     <implementation>
diff --git a/mozilla/xpfe/global/resources/content/bindings/scrollbar.xml b/mozilla/xpfe/global/resources/content/bindings/scrollbar.xml
index b3dd6c109ce..005ec8f946a 100644
--- a/mozilla/xpfe/global/resources/content/bindings/scrollbar.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/scrollbar.xml
@@ -6,13 +6,13 @@
   
   <binding id="scrollbar">
     <content>
-      <xul:scrollbarbutton sbattr="scrollbar-up-top" type="decrement" inherits="sborient=align"/>
-      <xul:scrollbarbutton sbattr="scrollbar-down-top" type="increment" collapsed="true" inherits="sborient=align"/>
-      <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment,align">
-        <xul:thumb sbattr="scrollbar-thumb" inherits="align,src" flex="1"/>
+      <xul:scrollbarbutton sbattr="scrollbar-up-top" type="decrement" inherits="sborient=orient"/>
+      <xul:scrollbarbutton sbattr="scrollbar-down-top" type="increment" collapsed="true" inherits="sborient=orient"/>
+      <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment,orient">
+        <xul:thumb sbattr="scrollbar-thumb" inherits="orient,src" flex="1"/>
       </xul:slider>
-      <xul:scrollbarbutton sbattr="scrollbar-up-bottom" type="decrement" collapsed="true" inherits="sborient=align"/>
-      <xul:scrollbarbutton sbattr="scrollbar-down-bottom" type="increment" inherits="sborient=align"/>
+      <xul:scrollbarbutton sbattr="scrollbar-up-bottom" type="decrement" collapsed="true" inherits="sborient=orient"/>
+      <xul:scrollbarbutton sbattr="scrollbar-down-bottom" type="increment" inherits="sborient=orient"/>
     </content>
     
     <implementation>
@@ -86,11 +86,11 @@
 
   <binding id="slider">
     <content>
-      <xul:thumb inherits="align,src" flex="1"/>
+      <xul:thumb inherits="orient,src" flex="1"/>
     </content>
   </binding>
 
-  <binding id="thumb" extends="xul:box">
+  <binding id="thumb">
     <content>
       <xul:spring flex="1"/>
       <xul:image inherits="src"/>
@@ -100,9 +100,9 @@
 
   <binding id="scrollbarbutton">
     <content>
-      <xul:box class="scrollbarbutton-box" flex="1">
+      <xul:hbox class="scrollbarbutton-box" flex="1">
         <xul:image class="scrollbarbutton-icon" inherits="src"/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 </bindings>
diff --git a/mozilla/xpfe/global/resources/content/bindings/scrollbox.xml b/mozilla/xpfe/global/resources/content/bindings/scrollbox.xml
index c7e2a5adab9..3bff0385b56 100644
--- a/mozilla/xpfe/global/resources/content/bindings/scrollbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/scrollbox.xml
@@ -12,7 +12,7 @@
 
   <binding id="scrollbox" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
     <content>
-      <xul:box class="scrollbox-innerbox" inherits="orient,autostretch,align,valign">
+      <xul:box class="scrollbox-innerbox" inherits="orient,align,pack">
         <children/>
       </xul:box>
     </content>
@@ -34,13 +34,13 @@
           button2.removeAttribute('collapsed');
           "
       >
-        <xul:autorepeatbutton autostretch="never" class="up" collapsed="true"
+        <xul:autorepeatbutton class="up" collapsed="true"
                               oncommand="parentNode.childNodes[1].boxObject.QueryInterface(
                                          Components.interfaces.nsIScrollBoxObject).scrollByIndex(-1);"/>
         <xul:scrollbox orient="vertical" flex="1">
           <children/>
         </xul:scrollbox>
-        <xul:autorepeatbutton autostretch="never" class="down" collapsed="true" 
+        <xul:autorepeatbutton class="down" collapsed="true" 
                               oncommand="parentNode.childNodes[1].boxObject.QueryInterface(
                                          Components.interfaces.nsIScrollBoxObject).scrollByIndex(1);"/>
       </xul:vbox>
diff --git a/mozilla/xpfe/global/resources/content/bindings/spinbuttons.xml b/mozilla/xpfe/global/resources/content/bindings/spinbuttons.xml
index d03bd26ee36..987bcb853a9 100644
--- a/mozilla/xpfe/global/resources/content/bindings/spinbuttons.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/spinbuttons.xml
@@ -33,7 +33,7 @@
 
   <binding id="spinbuttons-baseline">
     <content>
-      <xul:vbox flex="1" autostretch="never">
+      <xul:vbox flex="1" align="center">
         <xul:image inherits="onclick=onup" id="upButton" class="up"/>
         <xul:image inherits="onclick=ondown" id="downButton" class="down"/>
       </xul:vbox>
diff --git a/mozilla/xpfe/global/resources/content/bindings/tabbox.xml b/mozilla/xpfe/global/resources/content/bindings/tabbox.xml
index a2adf94b676..a7e898c8d32 100644
--- a/mozilla/xpfe/global/resources/content/bindings/tabbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/tabbox.xml
@@ -157,10 +157,10 @@
   <binding id="tab" display="xul:button"
            extends="chrome://global/content/bindings/tabbox.xml#tab-base">
     <content>
-      <xul:box class="tab-box" flex="1" autostretch="never" orient="horizontal">
+      <xul:hbox class="tab-box" flex="1" align="center">
         <xul:image class="tab-image" inherits="src"/>
         <xul:text class="tab-text" inherits="value=label,accesskey,crop,disabled"/>
-      </xul:box>
+      </xul:hbox>
     </content>
     
     <implementation>
diff --git a/mozilla/xpfe/global/resources/content/bindings/text.xml b/mozilla/xpfe/global/resources/content/bindings/text.xml
index 62fac9cfb05..0d2077b6e67 100644
--- a/mozilla/xpfe/global/resources/content/bindings/text.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/text.xml
@@ -20,9 +20,9 @@
   
   <binding id="text-editable-edit" extends="xul:box">
     <content>
-      <xul:box flex="1">
+      <xul:hbox flex="1">
         <html:input type="text" inherits="value,type,maxlength,disabled,size,readonly"/>
-      </xul:box>
+      </xul:hbox>
     </content>
     <handlers>
       <handler event="blur" action="this.setAttribute('mode','display');"/>
diff --git a/mozilla/xpfe/global/resources/content/bindings/textbox.xml b/mozilla/xpfe/global/resources/content/bindings/textbox.xml
index 1628a8db144..b2de0fe80e9 100644
--- a/mozilla/xpfe/global/resources/content/bindings/textbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/textbox.xml
@@ -16,9 +16,9 @@
     </resources>
     
     <content context="_child">
-      <xul:box class="textbox-internal-box" flex="1">
+      <xul:hbox class="textbox-internal-box" flex="1">
         <html:input class="textbox-input" flex="1" inherits="onfocus,onblur,value,type,maxlength,disabled,size,readonly"/>
-      </xul:box>
+      </xul:hbox>
       <xul:popupset>
         <xul:popup oncreate="this.parentNode.parentNode.doPopupItemEnabling(this); this.focus();">
           <xul:menuitem label="&undoCmd.label;" accesskey="&undoCmd.accesskey;" cmd="cmd_undo" oncommand="
@@ -159,9 +159,9 @@
 
   <binding id="textarea" extends="chrome://global/content/bindings/textbox.xml#textbox">
     <content context="_child">
-      <xul:box class="textarea-internal-box" flex="1">
+      <xul:hbox class="textarea-internal-box" flex="1">
         <html:textarea class="textbox-textarea" flex="1" inherits="onfocus,onblur,value,disabled,rows,cols,readonly"/>
-      </xul:box>
+      </xul:hbox>
       <xul:popupset>
         <xul:popup oncreate="this.parentNode.parentNode.doPopupItemEnabling(this); this.focus();">
           <xul:menuitem label="&undoCmd.label;" accesskey="&undoCmd.accesskey;" cmd="cmd_undo" oncommand="
diff --git a/mozilla/xpfe/global/resources/content/bindings/titledbox.xml b/mozilla/xpfe/global/resources/content/bindings/titledbox.xml
index b3f428c5ccd..2fce31848a2 100644
--- a/mozilla/xpfe/global/resources/content/bindings/titledbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/titledbox.xml
@@ -12,23 +12,23 @@
 
   <binding id="groupbox" extends="chrome://global/content/bindings/titledbox.xml#groupbox-base">
     <content>
-      <xul:box class="groupbox-title" autostretch="never" orient="vertical">
+      <xul:hbox class="groupbox-title" align="center" pack="start">
         <children includes="label"/>
-      </xul:box>
-      <xul:box flex="1" class="groupbox-body" inherits="orient,autostretch,align,valign">
+      </xul:hbox>
+      <xul:box flex="1" class="groupbox-body" inherits="orient,align,pack">
         <children/>
       </xul:box>
-    </content>    
+    </content>
   </binding>
 
   <!-- titledbox included for backwards compatibility purposes; to be removed at a later date -->
 
   <binding id="titledbox" extends="chrome://global/content/bindings/titledbox.xml#groupbox-base">
     <content>
-      <xul:box class="groupbox-title" autostretch="never" orient="vertical">
+      <xul:hbox class="groupbox-title" align="center">
         <children includes="label"/>
-      </xul:box>
-      <xul:box flex="1" class="groupbox-body" inherits="orient,autostretch,align,valign">
+      </xul:hbox>
+      <xul:box flex="1" class="groupbox-body" inherits="orient,align,pack">
         <children/>
       </xul:box>
     </content>    
diff --git a/mozilla/xpfe/global/resources/content/bindings/toolbar.xml b/mozilla/xpfe/global/resources/content/bindings/toolbar.xml
index c1ab13de9e9..87bdd879a95 100644
--- a/mozilla/xpfe/global/resources/content/bindings/toolbar.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/toolbar.xml
@@ -12,13 +12,13 @@
 
   <binding id="toolbox" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base">
     <content orient="vertical">
-      <xul:box orient="vertical" flex="1" class="toolbar-internal-box">
+      <xul:vbox flex="1" class="toolbar-internal-box">
         <children/>
-      </xul:box>
-      <xul:box tbattr="collapsed-tray-holder" class="collapsed-tray-holder" moz-collapsed="true">
-        <xul:box tbattr="collapsed-tray" class="collapsed-tray"/>
+      </xul:vbox>
+      <xul:hbox tbattr="collapsed-tray-holder" class="collapsed-tray-holder" moz-collapsed="true">
+        <xul:hbox tbattr="collapsed-tray" class="collapsed-tray"/>
         <xul:spring flex="1" class="collapsed-tray-spring"/>
-      </xul:box>
+      </xul:hbox>
     </content>
     
     <implementation>
@@ -142,10 +142,10 @@
       <xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
                          tbattr="toolbar-grippy"
                          class="toolbar-grippy"/>
-      <xul:box flex="1" class="toolbar-holder" autostretch="never"
-               inherits="collapsed,last-toolbar,orient=tborient,autostretch=tbautostretch">
+      <xul:hbox flex="1" class="toolbar-holder" align="center"
+               inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
         <children/>
-      </xul:box>
+      </xul:hbox>
     </content>
     
     <implementation>
@@ -178,9 +178,9 @@
     <content>
       <xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
                          tbattr="toolbar-grippy" class="toolbar-grippy"/>
-      <xul:box flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar" autostretch="never">
+      <xul:hbox flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar" align="center">
         <children/>
-      </xul:box>
+      </xul:hbox>
     </content>
     
     <implementation>
diff --git a/mozilla/xpfe/global/resources/content/bindings/tree.xml b/mozilla/xpfe/global/resources/content/bindings/tree.xml
index f3ff8f87cf5..9d1bd7c0fe2 100644
--- a/mozilla/xpfe/global/resources/content/bindings/tree.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/tree.xml
@@ -460,10 +460,10 @@
       <xul:treeindentation/>
       <xul:image class="tree-cell-twisty" twisty="true" inherits="hidden=notwisty" allowevents="true"/>
       <xul:image class="tree-cell-primary-icon-inline-edit-folder" inherits="src"/>
-      <xul:box class="inline-edit-cell-box" flex="1" ileattr="text-container">
+      <xul:hbox class="inline-edit-cell-box" flex="1" ileattr="text-container">
         <xul:text class="inline-edit-cell-text" ileattr="text" rootcontent="treecell"
                   inherits="crop,value=label,align,mode" flex="1" crop="right"/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
   
@@ -477,10 +477,10 @@
     <content>
       <xul:treeindentation/>
       <xul:image class="tree-cell-primary-icon" inherits="src"/>
-      <xul:box class="inline-edit-cell-box" flex="1" ileattr="text-container">
+      <xul:hbox class="inline-edit-cell-box" flex="1" ileattr="text-container">
         <xul:text class="tree-cell-text" ileattr="text" rootcontent="treecell"
                   inherits="crop,value=label,align,mode" flex="1" crop="right"/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
   
@@ -492,10 +492,10 @@
     </resources>
 
     <content>
-      <xul:box class="inline-edit-cell-box" flex="1" ileattr="text-container">
+      <xul:hbox class="inline-edit-cell-box" flex="1" ileattr="text-container">
         <xul:text class="tree-cell-text" ileattr="text" rootcontent="treecell" 
                   inherits="crop,value=label,align,mode" flex="1" crop="right"/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 
@@ -515,20 +515,20 @@
   <binding id="treecell-header"
            extends="chrome://global/content/bindings/tree.xml#tree-base">
     <content>
-      <xul:box class="treecell-header-box" flex="1" align="center">
+      <xul:hbox 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,disabled" flex="1" crop="right"/>
         <xul:image class="tree-header-sortdirection"/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
 
   <binding id="treecell-header-image"
            extends="chrome://global/content/bindings/tree.xml#tree-base">
     <content>
-      <xul:box class="treecell-header-image-box" flex="1" align="center">
+      <xul:hbox class="treecell-header-image-box" flex="1" align="center">
         <xul:image class="tree-header-image" inherits="src"/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
   
diff --git a/mozilla/xpfe/global/resources/content/bindings/wizard.xml b/mozilla/xpfe/global/resources/content/bindings/wizard.xml
index 162a25bf7fb..863cafa63a9 100644
--- a/mozilla/xpfe/global/resources/content/bindings/wizard.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/wizard.xml
@@ -12,14 +12,14 @@
   
   <binding id="wizard" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
     <content width="500" height="380" persist="x y width height">
-      <xul:box class="wizard-header" anonid="Header"/>
+      <xul:hbox class="wizard-header" anonid="Header"/>
       
       <xul:deck class="wizard-page-box" deck="true" flex="1" anonid="Deck">
         <children includes="wizardpage"/>
       </xul:deck>
       <children/>
       
-      <xul:box class="wizard-buttons" anonid="Buttons" inherits="pagestep,firstpage,lastpage"/>
+      <xul:hbox class="wizard-buttons" anonid="Buttons" inherits="pagestep,firstpage,lastpage"/>
     </content>
     
     <implementation>
@@ -428,9 +428,9 @@
         <xul:hbox class="wizard-buttons-btm">
           <xul:spring flex="1"/>
           <xul:button class="wizard-button wizard-nav-button" wizardbutton="back"/>
-          <xul:box class="wizard-label-box" autostretch="never">
+          <xul:hbox class="wizard-label-box" align="center">
             <xul:text class="wizard-page-label" inherits="value=pagestep"/>
-          </xul:box>
+          </xul:hbox>
           <xul:button class="wizard-button wizard-nav-button" wizardbutton="next" default="true" inherits="disabled=lastpage"/> 
         </xul:hbox>
       </xul:vbox>
diff --git a/mozilla/xpfe/global/resources/content/commonDialog.xul b/mozilla/xpfe/global/resources/content/commonDialog.xul
index f01c2a78a66..23743bb7731 100644
--- a/mozilla/xpfe/global/resources/content/commonDialog.xul
+++ b/mozilla/xpfe/global/resources/content/commonDialog.xul
@@ -16,7 +16,7 @@
   <keyset id="dialogKeys"/>
 
   <hbox flex="1">
-    <hbox autostretch="never" valign="top">
+    <hbox align="start">
       <image id="info.icon" class="spaced"/>
     </hbox>
     <separator orient="vertical" class="thin"/>
@@ -45,7 +45,7 @@
       <spring flex="1"/>
       
       <!-- checkbox -->
-      <hbox id="checkboxContainer" collapsed="true" autostretch="never">
+      <hbox id="checkboxContainer" collapsed="true" align="middle">
         <checkbox id="checkbox" oncommand="onCheckboxClick(this);" style="max-width: 40em;"/>
       </hbox>
     </vbox>
diff --git a/mozilla/xpfe/global/resources/content/dialogBindings.xml b/mozilla/xpfe/global/resources/content/dialogBindings.xml
index c51b57db69c..43c1d9d138c 100644
--- a/mozilla/xpfe/global/resources/content/dialogBindings.xml
+++ b/mozilla/xpfe/global/resources/content/dialogBindings.xml
@@ -7,11 +7,11 @@
 
   <binding id="smallheader">
     <content>
-      <xul:box class="toolbar-primary" autostretch="never" flex="1">
+      <xul:hbox class="toolbar-primary" align="center" flex="1">
         <xul:text class="box-smallheader-left" inherits="value=title"/>
         <xul:spring flex="1"/>
         <xul:text class="box-smallheader-right" inherits="value=description"/>
-      </xul:box>
+      </xul:hbox>
     </content>
     <implementation>
       <property name="title" onset="this.setAttribute('title',val); return val;"
@@ -23,23 +23,23 @@
 
   <binding id="largeheader">
     <content>
-      <xul:box class="box-header-header toolbar-primary" flex="1" autostretch="never">
+      <xul:hbox class="box-header-header toolbar-primary" flex="1" align="center">
         <xul:image inherits="src" class="box-header-circle"/>
-        <xul:box autostretch="never" class="box-header-text-box">
+        <xul:hbox align="center" class="box-header-text-box">
           <xul:text class="box-header-text" inherits="value"/>
-        </xul:box>
+        </xul:hbox>
         <xul:spring flex="1"/>
-      </xul:box>
+      </xul:hbox>
     </content>
   </binding>
   
   <binding id="status">
     <content>
-      <xul:box class="box-status-bg toolbar-standard" flex="1">
+      <xul:hbox class="box-status-bg toolbar-standard" flex="1" align="center">
         <xul:text class="box-status-text" inherits="label"/>
         <xul:spring flex="1"/>
         <xul:text class="box-status-progress" inherits="value=progress"/>
-      </xul:box>  
+      </xul:hbox>  
     </content>
   </binding>
   
diff --git a/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
index 315fbfc2461..aa4b0d37b27 100644
--- a/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
@@ -47,7 +47,7 @@
     <spring flex="1"/>
   </hbox>
 
-  <hbox id="okCancelButtonsRight" halign="right">
+  <hbox id="okCancelButtonsRight">
     <spring flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/> 
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/> 
@@ -55,7 +55,7 @@
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
   </hbox>
   
-  <hbox id="okCancelHelpButtonsRight" halign="right">
+  <hbox id="okCancelHelpButtonsRight">
     <spring flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
diff --git a/mozilla/xpfe/global/resources/content/unix/printdialog.xul b/mozilla/xpfe/global/resources/content/unix/printdialog.xul
index be8b73d4c76..77ca9c57fb0 100644
--- a/mozilla/xpfe/global/resources/content/unix/printdialog.xul
+++ b/mozilla/xpfe/global/resources/content/unix/printdialog.xul
@@ -54,10 +54,10 @@ Contributor(s): Masaki Katakai <katakai@japan.sun.com>
           </radiogroup>
       </row>
       <row>
-        <text id="cmdLabel" class="label" value="&cmdInput.label;" flex ="1" align="left"/>
+        <text id="cmdLabel" class="label" value="&cmdInput.label;" flex ="1"/>
         <textbox id="cmdInput" flex ="1"/>
       </row>
-      <row valign="baseline">
+      <row align="baseline">
         <text id="fileLabel" class="label" value="&fileInput.label;"/>
         <hbox>
           <textbox id="fileInput" flex ="1" onblur="stripTrailingWhitespace(this)"/>
@@ -92,7 +92,7 @@ Contributor(s): Masaki Katakai <katakai@japan.sun.com>
         <text class="label" value="&printrangeGroup.label;" flex ="1"/>
         <radiogroup id="printrangeGroup" orient="vertical">
           <radio group = "printrangeGroup" id = "allpagesRadio" label = "&allpagesRadio.label;" onclick = "doPrintRange(0);"/>
-          <hbox autostretch="never">
+          <hbox align="center">
             <radio group = "printrangeGroup" id = "rangeRadio" label = "&rangeRadio.label;" onclick = "doPrintRange(1);"/>
             <text class = "label" id = "frompageLabel" for = "frompageInput" value = "&frompageInput.label;" />
             <textbox id = "frompageInput" style = "width:5em;" onkeyup="checkValid(this.id)"/>
@@ -113,19 +113,19 @@ Contributor(s): Masaki Katakai <katakai@japan.sun.com>
       <row>
         <text class="label" value="&marginInput.label;" flex ="1"/>
         <hbox>
-          <hbox autostretch="never">
+          <hbox align="center">
             <text class = "label" id = "topLabel" for = "topInput" value = "&topInput.label;" />
             <textbox id = "topInput" style = "width:5em;" onkeyup="checkValid(this.id)"/>
           </hbox>
-          <hbox autostretch="never">
+          <hbox align="center">
             <text class = "label" id = "bottomLabel" for = "bottomInput" value = "&bottomInput.label;" />
             <textbox id = "bottomInput" style = "width:5em;" onkeyup="checkValid(this.id)"/>
           </hbox>
-          <hbox autostretch="never">
+          <hbox align="center">
             <text class = "label" id = "leftLabel" for = "leftInput" value = "&leftInput.label;" />
             <textbox id = "leftInput" style = "width:5em;" onkeyup="checkValid(this.id)"/>
           </hbox>
-          <hbox autostretch="never">
+          <hbox align="center">
             <text class = "label" id = "rightLabel" for = "rightInput" value = "&rightInput.label;" />
             <textbox id = "rightInput" style = "width:5em;" onkeyup="checkValid(this.id)"/>
           </hbox>
diff --git a/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
index 4fac66b4e2c..eeeb0217d4e 100644
--- a/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
@@ -48,7 +48,7 @@
   </hbox>
 
 
-  <hbox id="okCancelButtonsRight" halign="right">
+  <hbox id="okCancelButtonsRight">
     <spring flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/> 
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/> 
@@ -56,7 +56,7 @@
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
   </hbox>
   
-  <hbox id="okCancelHelpButtonsRight" halign="right">
+  <hbox id="okCancelHelpButtonsRight">
     <spring flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
diff --git a/mozilla/xpfe/global/resources/content/wizardOverlay.xul b/mozilla/xpfe/global/resources/content/wizardOverlay.xul
index fbf3aa85d87..7d86022d6c0 100644
--- a/mozilla/xpfe/global/resources/content/wizardOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/wizardOverlay.xul
@@ -12,8 +12,8 @@
     <spring flex="100%"/>
     <button class="dialog" id="wiz-cancel-button" label="&cancelButton.label;" oncommand="wizardManager.onCancel();" />
     <spring flex="20%"/>
-    <button class="dialog" id="wiz-back-button" label="&backButton.label;" oncommand="wizardManager.onBack();" align="left" />
-    <button class="dialog right" id="wiz-next-button" label="&nextButton.label;" oncommand="wizardManager.onNext();" align="right" />
+    <button class="dialog" id="wiz-back-button" label="&backButton.label;" oncommand="wizardManager.onBack();"/>
+    <button class="dialog right" id="wiz-next-button" label="&nextButton.label;" oncommand="wizardManager.onNext();"/>
     <spring flex="5%"/>
     <button class="dialog" id="wiz-finish-button" label="&finishButton.label;" oncommand="wizardManager.onFinish();" />
     <spring flex="5%"/>
